fix more menu stuff

also reformat

1 files changed, 37 insertions, 35 deletions

diff --git a/src/windows/mainwindow.hpp b/src/windows/mainwindow.hpp
index 5e48f8a..465564e 100644
--- a/src/windows/mainwindow.hpp
+++ b/src/windows/mainwindow.hpp
@@ -28,40 +28,9 @@ public:
     ChatWindow *GetChatWindow();
     MemberList *GetMemberList();
 
-public:
-    typedef sigc::signal<void> type_signal_action_connect;
-    typedef sigc::signal<void> type_signal_action_disconnect;
-    typedef sigc::signal<void> type_signal_action_set_token;
-    typedef sigc::signal<void> type_signal_action_reload_css;
-    typedef sigc::signal<void> type_signal_action_join_guild;
-    typedef sigc::signal<void> type_signal_action_set_status;
-    // this should probably be removed
-    typedef sigc::signal<void, Snowflake> type_signal_action_add_recipient; // channel id
-    typedef sigc::signal<void, Snowflake> type_signal_action_view_pins;     // channel id
-    typedef sigc::signal<void, Snowflake> type_signal_action_view_threads;  // channel id
-
-    type_signal_action_connect signal_action_connect();
-    type_signal_action_disconnect signal_action_disconnect();
-    type_signal_action_set_token signal_action_set_token();
-    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_add_recipient signal_action_add_recipient();
-    type_signal_action_view_pins signal_action_view_pins();
-    type_signal_action_view_threads signal_action_view_threads();
-
-protected:
-    type_signal_action_connect m_signal_action_connect;
-    type_signal_action_disconnect m_signal_action_disconnect;
-    type_signal_action_set_token m_signal_action_set_token;
-    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_add_recipient m_signal_action_add_recipient;
-    type_signal_action_view_pins m_signal_action_view_pins;
-    type_signal_action_view_threads m_signal_action_view_threads;
+private:
+    void SetupMenu();
 
-protected:
     Gtk::Box m_main_box;
     Gtk::Box m_content_box;
     Gtk::Paned m_chan_content_paned;
@@ -85,7 +54,7 @@ protected:
     Gtk::MenuItem m_menu_discord_join_guild;
     Gtk::MenuItem m_menu_discord_set_status;
     Gtk::MenuItem m_menu_discord_add_recipient; // move me somewhere else some day
-    void OnDiscordSubmenuPopup(const Gdk::Rectangle *flipped_rect, const Gdk::Rectangle *final_rect, bool flipped_x, bool flipped_y);
+    void OnDiscordSubmenuPopup();
 
     Gtk::MenuItem m_menu_file;
     Gtk::Menu m_menu_file_sub;
@@ -99,5 +68,38 @@ protected:
     Gtk::MenuItem m_menu_view_threads;
     Gtk::MenuItem m_menu_view_mark_guild_as_read;
     Gtk::MenuItem m_menu_view_mark_all_as_read;
-    void OnViewSubmenuPopup(const Gdk::Rectangle *flipped_rect, const Gdk::Rectangle *final_rect, bool flipped_x, bool flipped_y);
+    void OnViewSubmenuPopup();
+
+public:
+    typedef sigc::signal<void> type_signal_action_connect;
+    typedef sigc::signal<void> type_signal_action_disconnect;
+    typedef sigc::signal<void> type_signal_action_set_token;
+    typedef sigc::signal<void> type_signal_action_reload_css;
+    typedef sigc::signal<void> type_signal_action_join_guild;
+    typedef sigc::signal<void> type_signal_action_set_status;
+    // this should probably be removed
+    typedef sigc::signal<void, Snowflake> type_signal_action_add_recipient; // channel id
+    typedef sigc::signal<void, Snowflake> type_signal_action_view_pins;     // channel id
+    typedef sigc::signal<void, Snowflake> type_signal_action_view_threads;  // channel id
+
+    type_signal_action_connect signal_action_connect();
+    type_signal_action_disconnect signal_action_disconnect();
+    type_signal_action_set_token signal_action_set_token();
+    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_add_recipient signal_action_add_recipient();
+    type_signal_action_view_pins signal_action_view_pins();
+    type_signal_action_view_threads signal_action_view_threads();
+
+private:
+    type_signal_action_connect m_signal_action_connect;
+    type_signal_action_disconnect m_signal_action_disconnect;
+    type_signal_action_set_token m_signal_action_set_token;
+    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_add_recipient m_signal_action_add_recipient;
+    type_signal_action_view_pins m_signal_action_view_pins;
+    type_signal_action_view_threads m_signal_action_view_threads;
 };