celisej567/abaddon
1
0
Fork 0
mirror of https://github.com/celisej567/abaddon.git synced 2026-09-13 20:18:50 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

center dialogs and fix warning

Browse Source
This commit is contained in:
ouwou
2021-04-12 03:00:31 -04:00
parent bf9b053d36
commit 15d0a45627
5 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
abaddon.cpp
View File

@@ -74,12 +74,14 @@ int Abaddon::StartGTK() {
m_css_provider = Gtk::CssProvider::create();
m_css_provider->signal_parsing_error().connect([this](const Glib::RefPtr<const Gtk::CssSection> &section, const Glib::Error &error) {
Gtk::MessageDialog dlg(*m_main_window, "css failed parsing (" + error.what() + ")", false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true);
dlg.set_position(Gtk::WIN_POS_CENTER);
dlg.run();
});
m_main_window = std::make_unique<MainWindow>();
m_main_window->set_title(APP_TITLE);
m_main_window->UpdateComponents();
m_main_window->set_position(Gtk::WIN_POS_CENTER);
// crashes for some stupid reason if i put it somewhere else
SetupUserMenu();
@@ -116,16 +118,19 @@ int Abaddon::StartGTK() {
if (!m_settings.IsValid()) {
Gtk::MessageDialog dlg(*m_main_window, "The settings file could not be created!", false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true);
dlg.set_position(Gtk::WIN_POS_CENTER);
dlg.run();
}
if (!m_emojis.Load()) {
Gtk::MessageDialog dlg(*m_main_window, "The emoji file couldn't be loaded!", false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true);
dlg.set_position(Gtk::WIN_POS_CENTER);
dlg.run();
}
if (!m_discord.IsStoreValid()) {
Gtk::MessageDialog dlg(*m_main_window, "The Discord cache could not be created!", false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true);
dlg.set_position(Gtk::WIN_POS_CENTER);
dlg.run();
return 1;
}
@@ -307,6 +312,7 @@ void Abaddon::ShowGuildVerificationGateDialog(Snowflake guild_id) {
const auto cb = [this](bool success) {
if (!success) {
Gtk::MessageDialog dlg(*m_main_window, "Failed to accept the verification gate.", false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true);
dlg.set_position(Gtk::WIN_POS_CENTER);
dlg.run();
}
};
@@ -622,6 +628,7 @@ void Abaddon::ActionReloadCSS() {
Gtk::StyleContext::add_provider_for_screen(Gdk::Screen::get_default(), m_css_provider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
} catch (Glib::Error &e) {
Gtk::MessageDialog dlg(*m_main_window, "css failed to load (" + e.what() + ")", false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true);
dlg.set_position(Gtk::WIN_POS_CENTER);
dlg.run();
}
}

1
windows/guildsettings/banspane.cpp
View File

@@ -96,6 +96,7 @@ void GuildSettingsBansPane::OnMenuUnban() {
auto cb = [this](bool success) {
if (!success) {
Gtk::MessageDialog dlg("Failed to unban user", false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true);
dlg.set_position(Gtk::WIN_POS_CENTER);
dlg.run();
}
};

2
windows/guildsettings/emojispane.cpp
View File

@@ -178,6 +178,7 @@ void GuildSettingsEmojisPane::OnEditName(Snowflake id, const std::string &name)
const auto cb = [this](bool success) {
if (!success) {
Gtk::MessageDialog dlg("Failed to set emoji name", false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK);
dlg.set_position(Gtk::WIN_POS_CENTER);
dlg.run();
}
};
@@ -200,6 +201,7 @@ void GuildSettingsEmojisPane::OnMenuDelete() {
const auto cb = [this](bool success) {
if (!success) {
Gtk::MessageDialog dlg("Failed to delete emoji", false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK);
dlg.set_position(Gtk::WIN_POS_CENTER);
dlg.run();
}
};

2
windows/guildsettings/infopane.cpp
View File

@@ -103,6 +103,7 @@ void GuildSettingsInfoPane::UpdateGuildName() {
if (!success) {
m_guild_name.set_text(Abaddon::Get().GetDiscordClient().GetGuild(GuildID)->Name);
Gtk::MessageDialog dlg("Failed to set guild name", false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true);
dlg.set_position(Gtk::WIN_POS_CENTER);
dlg.run();
}
};
@@ -116,6 +117,7 @@ void GuildSettingsInfoPane::UpdateGuildIconFromData(const std::vector<uint8_t> &
auto cb = [this](bool success) {
if (!success) {
Gtk::MessageDialog dlg("Failed to set guild icon", false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true);
dlg.set_position(Gtk::WIN_POS_CENTER);
dlg.run();
}
};

4
windows/guildsettings/invitespane.cpp
View File

@@ -54,11 +54,12 @@ void GuildSettingsInvitesPane::AppendInvite(const InviteData &invite) {
if (invite.Inviter.has_value())
row[m_columns.m_col_inviter] = invite.Inviter->Username + "#" + invite.Inviter->Discriminator;
if (invite.MaxAge.has_value())
if (invite.MaxAge.has_value()) {
if (*invite.MaxAge == 0)
row[m_columns.m_col_expires] = "Never";
else
row[m_columns.m_col_expires] = FormatISO8601(*invite.CreatedAt, *invite.MaxAge);
}
row[m_columns.m_col_uses] = *invite.Uses;
if (*invite.MaxUses == 0)
@@ -99,6 +100,7 @@ void GuildSettingsInvitesPane::OnMenuDelete() {
auto cb = [this](const bool success) {
if (!success) {
Gtk::MessageDialog dlg("Failed to delete invite", false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true);
dlg.set_position(Gtk::WIN_POS_CENTER);
dlg.run();
}
};