From 9f66990af2cea19e4f9ebe04cd61e85d1afeb6c1 Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Mon, 5 Jul 2021 01:58:32 -0400 Subject: remove reload settings menu item cuz it doesnt do anything --- abaddon.cpp | 5 ----- abaddon.hpp | 1 - windows/mainwindow.cpp | 10 ---------- windows/mainwindow.hpp | 6 +----- 4 files changed, 1 insertion(+), 21 deletions(-) diff --git a/abaddon.cpp b/abaddon.cpp index 4e900dc..a34ec2c 100644 --- a/abaddon.cpp +++ b/abaddon.cpp @@ -98,7 +98,6 @@ int Abaddon::StartGTK() { m_main_window->signal_action_reload_css().connect(sigc::mem_fun(*this, &Abaddon::ActionReloadCSS)); m_main_window->signal_action_join_guild().connect(sigc::mem_fun(*this, &Abaddon::ActionJoinGuildDialog)); m_main_window->signal_action_set_status().connect(sigc::mem_fun(*this, &Abaddon::ActionSetStatus)); - m_main_window->signal_action_reload_settings().connect(sigc::mem_fun(*this, &Abaddon::ActionReloadSettings)); m_main_window->signal_action_add_recipient().connect(sigc::mem_fun(*this, &Abaddon::ActionAddRecipient)); m_main_window->signal_action_view_pins().connect(sigc::mem_fun(*this, &Abaddon::ActionViewPins)); @@ -636,10 +635,6 @@ bool Abaddon::ShowConfirm(const Glib::ustring &prompt, Gtk::Window *window) { return dlg.run() == Gtk::RESPONSE_OK; } -void Abaddon::ActionReloadSettings() { - m_settings.Reload(); -} - void Abaddon::ActionReloadCSS() { try { Gtk::StyleContext::remove_provider_for_screen(Gdk::Screen::get_default(), m_css_provider); diff --git a/abaddon.hpp b/abaddon.hpp index 1d14c33..aebb9e1 100644 --- a/abaddon.hpp +++ b/abaddon.hpp @@ -50,7 +50,6 @@ public: bool ShowConfirm(const Glib::ustring &prompt, Gtk::Window *window = nullptr); - void ActionReloadSettings(); void ActionReloadCSS(); ImageManager &GetImageManager(); diff --git a/windows/mainwindow.cpp b/windows/mainwindow.cpp index 4d6a1dc..35846b7 100644 --- a/windows/mainwindow.cpp +++ b/windows/mainwindow.cpp @@ -32,10 +32,8 @@ MainWindow::MainWindow() m_menu_file.set_label("File"); m_menu_file.set_submenu(m_menu_file_sub); - m_menu_file_reload_settings.set_label("Reload Settings"); m_menu_file_reload_css.set_label("Reload CSS"); m_menu_file_clear_cache.set_label("Clear file cache"); - m_menu_file_sub.append(m_menu_file_reload_settings); m_menu_file_sub.append(m_menu_file_reload_css); m_menu_file_sub.append(m_menu_file_clear_cache); @@ -76,10 +74,6 @@ MainWindow::MainWindow() m_signal_action_set_status.emit(); }); - m_menu_file_reload_settings.signal_activate().connect([this] { - m_signal_action_reload_settings.emit(); - }); - m_menu_file_clear_cache.signal_activate().connect([this] { Abaddon::Get().GetImageManager().ClearCache(); }); @@ -312,10 +306,6 @@ MainWindow::type_signal_action_set_status MainWindow::signal_action_set_status() return m_signal_action_set_status; } -MainWindow::type_signal_action_reload_settings MainWindow::signal_action_reload_settings() { - return m_signal_action_reload_settings; -} - MainWindow::type_signal_action_add_recipient MainWindow::signal_action_add_recipient() { return m_signal_action_add_recipient; } diff --git a/windows/mainwindow.hpp b/windows/mainwindow.hpp index 25c1acb..fa3d331 100644 --- a/windows/mainwindow.hpp +++ b/windows/mainwindow.hpp @@ -41,9 +41,8 @@ public: typedef sigc::signal type_signal_action_reload_css; typedef sigc::signal type_signal_action_join_guild; typedef sigc::signal type_signal_action_set_status; - typedef sigc::signal type_signal_action_reload_settings; typedef sigc::signal type_signal_action_add_recipient; // channel id - typedef sigc::signal type_signal_action_view_pins; // channel id + typedef sigc::signal type_signal_action_view_pins; // channel id type_signal_action_connect signal_action_connect(); type_signal_action_disconnect signal_action_disconnect(); @@ -51,7 +50,6 @@ public: type_signal_action_reload_css signal_action_reload_css(); type_signal_action_join_guild signal_action_join_guild(); type_signal_action_set_status signal_action_set_status(); - type_signal_action_reload_settings signal_action_reload_settings(); type_signal_action_add_recipient signal_action_add_recipient(); type_signal_action_view_pins signal_action_view_pins(); @@ -62,7 +60,6 @@ protected: type_signal_action_reload_css m_signal_action_reload_css; type_signal_action_join_guild m_signal_action_join_guild; type_signal_action_set_status m_signal_action_set_status; - type_signal_action_reload_settings m_signal_action_reload_settings; type_signal_action_add_recipient m_signal_action_add_recipient; type_signal_action_view_pins m_signal_action_view_pins; @@ -92,7 +89,6 @@ protected: Gtk::MenuItem m_menu_file; Gtk::Menu m_menu_file_sub; - Gtk::MenuItem m_menu_file_reload_settings; Gtk::MenuItem m_menu_file_reload_css; Gtk::MenuItem m_menu_file_clear_cache; -- cgit v1.2.3