diff options
Diffstat (limited to 'src/windows')
30 files changed, 28 insertions, 29 deletions
diff --git a/src/windows/guildsettings/auditlogpane.cpp b/src/windows/guildsettings/auditlogpane.cpp index 868a18f..53bfd15 100644 --- a/src/windows/guildsettings/auditlogpane.cpp +++ b/src/windows/guildsettings/auditlogpane.cpp @@ -1,5 +1,4 @@ #include "auditlogpane.hpp" -#include "abaddon.hpp" using namespace std::string_literals; diff --git a/src/windows/guildsettings/auditlogpane.hpp b/src/windows/guildsettings/auditlogpane.hpp index ac12321..dc44d8f 100644 --- a/src/windows/guildsettings/auditlogpane.hpp +++ b/src/windows/guildsettings/auditlogpane.hpp @@ -1,5 +1,4 @@ #pragma once -#include <gtkmm.h> #include "discord/objects.hpp" class GuildSettingsAuditLogPane : public Gtk::ScrolledWindow { diff --git a/src/windows/guildsettings/banspane.cpp b/src/windows/guildsettings/banspane.cpp index d4b002c..bfc7331 100644 --- a/src/windows/guildsettings/banspane.cpp +++ b/src/windows/guildsettings/banspane.cpp @@ -1,5 +1,4 @@ #include "banspane.hpp" -#include "abaddon.hpp" // gtk_list_store_set_value: assertion 'column >= 0 && column < priv->n_columns' failed // dont care to figure out why this happens cuz it doesnt seem to break anything diff --git a/src/windows/guildsettings/banspane.hpp b/src/windows/guildsettings/banspane.hpp index b2420a9..d50b372 100644 --- a/src/windows/guildsettings/banspane.hpp +++ b/src/windows/guildsettings/banspane.hpp @@ -1,5 +1,4 @@ #pragma once -#include <gtkmm.h> #include "discord/snowflake.hpp" #include "discord/ban.hpp" diff --git a/src/windows/guildsettings/emojispane.cpp b/src/windows/guildsettings/emojispane.cpp index bdab6b8..c86ea64 100644 --- a/src/windows/guildsettings/emojispane.cpp +++ b/src/windows/guildsettings/emojispane.cpp @@ -1,5 +1,4 @@ #include "emojispane.hpp" -#include "abaddon.hpp" #include "components/cellrendererpixbufanimation.hpp" GuildSettingsEmojisPane::GuildSettingsEmojisPane(Snowflake guild_id) diff --git a/src/windows/guildsettings/emojispane.hpp b/src/windows/guildsettings/emojispane.hpp index 1c0edd1..43676c2 100644 --- a/src/windows/guildsettings/emojispane.hpp +++ b/src/windows/guildsettings/emojispane.hpp @@ -1,5 +1,4 @@ #pragma once -#include <gtkmm.h> #include "discord/emoji.hpp" class GuildSettingsEmojisPane : public Gtk::Box { diff --git a/src/windows/guildsettings/infopane.cpp b/src/windows/guildsettings/infopane.cpp index a27c1a8..e52e27d 100644 --- a/src/windows/guildsettings/infopane.cpp +++ b/src/windows/guildsettings/infopane.cpp @@ -1,5 +1,4 @@ #include "infopane.hpp" -#include "abaddon.hpp" #include <filesystem> GuildSettingsInfoPane::GuildSettingsInfoPane(Snowflake id) diff --git a/src/windows/guildsettings/infopane.hpp b/src/windows/guildsettings/infopane.hpp index d779b99..4d4e87e 100644 --- a/src/windows/guildsettings/infopane.hpp +++ b/src/windows/guildsettings/infopane.hpp @@ -1,5 +1,4 @@ #pragma once -#include <gtkmm.h> #include "discord/guild.hpp" class GuildSettingsInfoPane : public Gtk::Grid { diff --git a/src/windows/guildsettings/invitespane.cpp b/src/windows/guildsettings/invitespane.cpp index 2d737e9..4426f6a 100644 --- a/src/windows/guildsettings/invitespane.cpp +++ b/src/windows/guildsettings/invitespane.cpp @@ -1,5 +1,4 @@ #include "invitespane.hpp" -#include "abaddon.hpp" GuildSettingsInvitesPane::GuildSettingsInvitesPane(Snowflake id) : GuildID(id) diff --git a/src/windows/guildsettings/invitespane.hpp b/src/windows/guildsettings/invitespane.hpp index 5268d68..24086ca 100644 --- a/src/windows/guildsettings/invitespane.hpp +++ b/src/windows/guildsettings/invitespane.hpp @@ -1,5 +1,4 @@ #pragma once -#include <gtkmm.h> #include "discord/objects.hpp" class GuildSettingsInvitesPane : public Gtk::ScrolledWindow { diff --git a/src/windows/guildsettings/memberspane.cpp b/src/windows/guildsettings/memberspane.cpp index 973e380..64c28cb 100644 --- a/src/windows/guildsettings/memberspane.cpp +++ b/src/windows/guildsettings/memberspane.cpp @@ -1,5 +1,4 @@ #include "memberspane.hpp" -#include "abaddon.hpp" GuildSettingsMembersPane::GuildSettingsMembersPane(Snowflake id) : Gtk::Box(Gtk::ORIENTATION_VERTICAL) diff --git a/src/windows/guildsettings/memberspane.hpp b/src/windows/guildsettings/memberspane.hpp index 01398da..3aa558a 100644 --- a/src/windows/guildsettings/memberspane.hpp +++ b/src/windows/guildsettings/memberspane.hpp @@ -1,6 +1,5 @@ #pragma once #include <unordered_set> -#include <gtkmm.h> #include "discord/member.hpp" #include "discord/guild.hpp" #include "components/lazyimage.hpp" diff --git a/src/windows/guildsettings/rolespane.cpp b/src/windows/guildsettings/rolespane.cpp index d4fa7c0..158fa11 100644 --- a/src/windows/guildsettings/rolespane.cpp +++ b/src/windows/guildsettings/rolespane.cpp @@ -1,5 +1,4 @@ #include "rolespane.hpp" -#include "abaddon.hpp" GuildSettingsRolesPane::GuildSettingsRolesPane(Snowflake id) : Gtk::Box(Gtk::ORIENTATION_HORIZONTAL) diff --git a/src/windows/guildsettings/rolespane.hpp b/src/windows/guildsettings/rolespane.hpp index 2999f32..82594d4 100644 --- a/src/windows/guildsettings/rolespane.hpp +++ b/src/windows/guildsettings/rolespane.hpp @@ -1,5 +1,4 @@ #pragma once -#include <gtkmm.h> #include <unordered_map> #include "discord/guild.hpp" #include "components/draglistbox.hpp" diff --git a/src/windows/guildsettingswindow.cpp b/src/windows/guildsettingswindow.cpp index 1e3395d..3f19100 100644 --- a/src/windows/guildsettingswindow.cpp +++ b/src/windows/guildsettingswindow.cpp @@ -1,5 +1,4 @@ #include "guildsettingswindow.hpp" -#include "abaddon.hpp" GuildSettingsWindow::GuildSettingsWindow(Snowflake id) : m_main(Gtk::ORIENTATION_VERTICAL) diff --git a/src/windows/guildsettingswindow.hpp b/src/windows/guildsettingswindow.hpp index b591640..0b1ab97 100644 --- a/src/windows/guildsettingswindow.hpp +++ b/src/windows/guildsettingswindow.hpp @@ -1,5 +1,4 @@ #pragma once -#include <gtkmm.h> #include "discord/snowflake.hpp" #include "guildsettings/infopane.hpp" #include "guildsettings/banspane.hpp" diff --git a/src/windows/mainwindow.cpp b/src/windows/mainwindow.cpp index c80dfda..73b78de 100644 --- a/src/windows/mainwindow.cpp +++ b/src/windows/mainwindow.cpp @@ -1,5 +1,4 @@ #include "mainwindow.hpp" -#include "abaddon.hpp" MainWindow::MainWindow() : m_main_box(Gtk::ORIENTATION_VERTICAL) @@ -262,8 +261,10 @@ void MainWindow::SetupMenu() { m_menu_file.set_submenu(m_menu_file_sub); m_menu_file_reload_css.set_label("Reload CSS"); m_menu_file_clear_cache.set_label("Clear file cache"); + m_menu_file_dump_ready.set_label("Dump ready message"); m_menu_file_sub.append(m_menu_file_reload_css); m_menu_file_sub.append(m_menu_file_clear_cache); + m_menu_file_sub.append(m_menu_file_dump_ready); m_menu_view.set_label("View"); m_menu_view.set_submenu(m_menu_view_sub); @@ -272,6 +273,12 @@ void MainWindow::SetupMenu() { m_menu_view_threads.set_label("Threads"); m_menu_view_mark_guild_as_read.set_label("Mark Server as Read"); m_menu_view_mark_guild_as_read.add_accelerator("activate", m_accels, GDK_KEY_Escape, Gdk::SHIFT_MASK, Gtk::ACCEL_VISIBLE); + m_menu_view_channels.set_label("Channels"); + m_menu_view_channels.add_accelerator("activate", m_accels, GDK_KEY_L, Gdk::CONTROL_MASK, Gtk::ACCEL_VISIBLE); + m_menu_view_channels.set_active(true); + m_menu_view_members.set_label("Members"); + m_menu_view_members.add_accelerator("activate", m_accels, GDK_KEY_M, Gdk::CONTROL_MASK, Gtk::ACCEL_VISIBLE); + m_menu_view_members.set_active(true); #ifdef WITH_LIBHANDY m_menu_view_go_back.set_label("Go Back"); m_menu_view_go_forward.set_label("Go Forward"); @@ -282,6 +289,8 @@ void MainWindow::SetupMenu() { m_menu_view_sub.append(m_menu_view_pins); m_menu_view_sub.append(m_menu_view_threads); m_menu_view_sub.append(m_menu_view_mark_guild_as_read); + m_menu_view_sub.append(m_menu_view_channels); + m_menu_view_sub.append(m_menu_view_members); #ifdef WITH_LIBHANDY m_menu_view_sub.append(m_menu_view_go_back); m_menu_view_sub.append(m_menu_view_go_forward); @@ -334,6 +343,10 @@ void MainWindow::SetupMenu() { Abaddon::Get().GetImageManager().ClearCache(); }); + m_menu_file_dump_ready.signal_toggled().connect([this]() { + Abaddon::Get().GetDiscordClient().SetDumpReady(m_menu_file_dump_ready.get_active()); + }); + m_menu_discord_add_recipient.signal_activate().connect([this] { m_signal_action_add_recipient.emit(GetChatActiveChannel()); }); @@ -361,6 +374,14 @@ void MainWindow::SetupMenu() { } }); + m_menu_view_channels.signal_activate().connect([this]() { + m_channel_list.set_visible(m_menu_view_channels.get_active()); + }); + + m_menu_view_members.signal_activate().connect([this]() { + m_members.GetRoot()->set_visible(m_menu_view_members.get_active()); + }); + #ifdef WITH_LIBHANDY m_menu_view_go_back.signal_activate().connect([this] { GoBack(); diff --git a/src/windows/mainwindow.hpp b/src/windows/mainwindow.hpp index d4013dc..90e49b4 100644 --- a/src/windows/mainwindow.hpp +++ b/src/windows/mainwindow.hpp @@ -3,8 +3,11 @@ #include "components/chatwindow.hpp" #include "components/memberlist.hpp" #include "components/friendslist.hpp" +<<<<<<< HEAD #include "components/voiceinfobox.hpp" #include <gtkmm.h> +======= +>>>>>>> master class MainWindow : public Gtk::Window { public: @@ -76,6 +79,7 @@ private: Gtk::Menu m_menu_file_sub; Gtk::MenuItem m_menu_file_reload_css; Gtk::MenuItem m_menu_file_clear_cache; + Gtk::CheckMenuItem m_menu_file_dump_ready; Gtk::MenuItem m_menu_view; Gtk::Menu m_menu_view_sub; @@ -83,6 +87,8 @@ private: Gtk::MenuItem m_menu_view_pins; Gtk::MenuItem m_menu_view_threads; Gtk::MenuItem m_menu_view_mark_guild_as_read; + Gtk::CheckMenuItem m_menu_view_channels; + Gtk::CheckMenuItem m_menu_view_members; #ifdef WITH_LIBHANDY Gtk::MenuItem m_menu_view_go_back; Gtk::MenuItem m_menu_view_go_forward; diff --git a/src/windows/pinnedwindow.cpp b/src/windows/pinnedwindow.cpp index a5484e3..467c2e3 100644 --- a/src/windows/pinnedwindow.cpp +++ b/src/windows/pinnedwindow.cpp @@ -1,5 +1,4 @@ #include "pinnedwindow.hpp" -#include "abaddon.hpp" PinnedWindow::PinnedWindow(const ChannelData &data) : ChannelID(data.ID) { diff --git a/src/windows/pinnedwindow.hpp b/src/windows/pinnedwindow.hpp index cf2ec3c..dd90a77 100644 --- a/src/windows/pinnedwindow.hpp +++ b/src/windows/pinnedwindow.hpp @@ -1,5 +1,4 @@ #pragma once -#include <gtkmm.h> #include "discord/errors.hpp" #include "discord/channel.hpp" #include "discord/message.hpp" diff --git a/src/windows/profile/mutualfriendspane.cpp b/src/windows/profile/mutualfriendspane.cpp index ca36e1d..e9f465b 100644 --- a/src/windows/profile/mutualfriendspane.cpp +++ b/src/windows/profile/mutualfriendspane.cpp @@ -1,5 +1,4 @@ #include "mutualfriendspane.hpp" -#include "abaddon.hpp" MutualFriendItem::MutualFriendItem(const UserData &user) : Gtk::Box(Gtk::ORIENTATION_HORIZONTAL) { diff --git a/src/windows/profile/mutualfriendspane.hpp b/src/windows/profile/mutualfriendspane.hpp index ef41aa6..5f2c964 100644 --- a/src/windows/profile/mutualfriendspane.hpp +++ b/src/windows/profile/mutualfriendspane.hpp @@ -1,5 +1,4 @@ #pragma once -#include <gtkmm.h> #include "discord/objects.hpp" class MutualFriendItem : public Gtk::Box { diff --git a/src/windows/profile/mutualguildspane.cpp b/src/windows/profile/mutualguildspane.cpp index 6c14fc4..ff3f0c1 100644 --- a/src/windows/profile/mutualguildspane.cpp +++ b/src/windows/profile/mutualguildspane.cpp @@ -1,5 +1,4 @@ #include "mutualguildspane.hpp" -#include "abaddon.hpp" MutualGuildItem::MutualGuildItem(const MutualGuildData &guild) : Gtk::Box(Gtk::ORIENTATION_HORIZONTAL) diff --git a/src/windows/profile/mutualguildspane.hpp b/src/windows/profile/mutualguildspane.hpp index 9bdd97e..33a4af9 100644 --- a/src/windows/profile/mutualguildspane.hpp +++ b/src/windows/profile/mutualguildspane.hpp @@ -1,5 +1,4 @@ #pragma once -#include <gtkmm.h> #include "discord/objects.hpp" class MutualGuildItem : public Gtk::Box { diff --git a/src/windows/profile/userinfopane.cpp b/src/windows/profile/userinfopane.cpp index b62da93..b6f0d59 100644 --- a/src/windows/profile/userinfopane.cpp +++ b/src/windows/profile/userinfopane.cpp @@ -1,6 +1,5 @@ #include "userinfopane.hpp" #include <unordered_set> -#include "abaddon.hpp" ConnectionItem::ConnectionItem(const ConnectionData &conn) : m_box(Gtk::ORIENTATION_HORIZONTAL) diff --git a/src/windows/profile/userinfopane.hpp b/src/windows/profile/userinfopane.hpp index 90a4d55..d83557b 100644 --- a/src/windows/profile/userinfopane.hpp +++ b/src/windows/profile/userinfopane.hpp @@ -1,5 +1,4 @@ #pragma once -#include <gtkmm.h> #include "discord/objects.hpp" class ConnectionItem : public Gtk::EventBox { diff --git a/src/windows/profilewindow.cpp b/src/windows/profilewindow.cpp index d73731d..3d5f140 100644 --- a/src/windows/profilewindow.cpp +++ b/src/windows/profilewindow.cpp @@ -1,5 +1,4 @@ #include "profilewindow.hpp" -#include "abaddon.hpp" ProfileWindow::ProfileWindow(Snowflake user_id) : ID(user_id) diff --git a/src/windows/profilewindow.hpp b/src/windows/profilewindow.hpp index 3d8199b..2052e7b 100644 --- a/src/windows/profilewindow.hpp +++ b/src/windows/profilewindow.hpp @@ -1,5 +1,4 @@ #pragma once -#include <gtkmm.h> #include "discord/snowflake.hpp" #include "profile/userinfopane.hpp" #include "profile/mutualguildspane.hpp" diff --git a/src/windows/threadswindow.cpp b/src/windows/threadswindow.cpp index 62cae19..247edf6 100644 --- a/src/windows/threadswindow.cpp +++ b/src/windows/threadswindow.cpp @@ -1,5 +1,4 @@ #include "threadswindow.hpp" -#include "abaddon.hpp" ThreadsWindow::ThreadsWindow(const ChannelData &channel) : m_channel_id(channel.ID) diff --git a/src/windows/threadswindow.hpp b/src/windows/threadswindow.hpp index 276e067..f644e35 100644 --- a/src/windows/threadswindow.hpp +++ b/src/windows/threadswindow.hpp @@ -1,5 +1,4 @@ #pragma once -#include <gtkmm.h> #include "discord/objects.hpp" class ActiveThreadsList : public Gtk::ScrolledWindow { |