Minki/abaddon
1
0
Fork 0
mirror of https://github.com/uowuo/abaddon.git synced 2024-11-10 06:00:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into voice

Browse Source
This commit is contained in:
ouwou 2023-05-14 20:15:15 -04:00
commit 80a146350e
4 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
res/res/hypesquadbravery.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

11
src/abaddon.cpp
View File

@ -286,6 +286,8 @@ int Abaddon::StartGTK() {
m_main_window->GetChatWindow()->signal_action_reaction_remove().connect(sigc::mem_fun(*this, &Abaddon::ActionReactionRemove));
ActionReloadCSS();
AttachCSSMonitor();
if (m_settings.GetSettings().HideToTray) {
m_tray = Gtk::StatusIcon::create("discord");
m_tray->signal_activate().connect(sigc::mem_fun(*this, &Abaddon::on_tray_click));
@ -719,6 +721,15 @@ void Abaddon::LoadState() {
}
}
void Abaddon::AttachCSSMonitor() {
const auto path = GetCSSPath("/" + GetSettings().MainCSS);
const auto file = Gio::File::create_for_path(path);
m_main_css_monitor = file->monitor_file();
m_main_css_monitor->signal_changed().connect([this](const auto &file, const auto &other_file, Gio::FileMonitorEvent event) {
ActionReloadCSS();
});
}
void Abaddon::ManageHeapWindow(Gtk::Window *window) {
window->signal_hide().connect([this, window]() {
delete window;

3
src/abaddon.hpp
View File

@ -129,6 +129,9 @@ protected:
void SaveState();
void LoadState();
void AttachCSSMonitor();
Glib::RefPtr<Gio::FileMonitor> m_main_css_monitor;
Snowflake m_shown_user_menu_id;
Snowflake m_shown_user_menu_guild_id;

2
src/discord/objects.cpp
View File

@ -542,7 +542,7 @@ void from_json(const nlohmann::json &j, VerificationFieldObject &m) {
}
void from_json(const nlohmann::json &j, VerificationGateInfoObject &m) {
JS_O("description", m.Description);
JS_ON("description", m.Description);
JS_O("form_fields", m.VerificationFields);
JS_O("version", m.Version);
JS_O("enabled", m.Enabled);