forked from OpenGamers/abaddon
fix menu bar updates again (fixes #61)
This commit is contained in:
parent
5670dfc1d5
commit
47545d9d32
@ -154,6 +154,8 @@ int Abaddon::StartGTK() {
|
|||||||
|
|
||||||
m_gtk_app->signal_shutdown().connect(sigc::mem_fun(*this, &Abaddon::OnShutdown), false);
|
m_gtk_app->signal_shutdown().connect(sigc::mem_fun(*this, &Abaddon::OnShutdown), false);
|
||||||
|
|
||||||
|
m_main_window->UpdateMenus();
|
||||||
|
|
||||||
m_main_window->show();
|
m_main_window->show();
|
||||||
return m_gtk_app->run(*m_main_window);
|
return m_gtk_app->run(*m_main_window);
|
||||||
}
|
}
|
||||||
@ -173,11 +175,13 @@ void Abaddon::LoadFromSettings() {
|
|||||||
|
|
||||||
void Abaddon::StartDiscord() {
|
void Abaddon::StartDiscord() {
|
||||||
m_discord.Start();
|
m_discord.Start();
|
||||||
|
m_main_window->UpdateMenus();
|
||||||
}
|
}
|
||||||
|
|
||||||
void Abaddon::StopDiscord() {
|
void Abaddon::StopDiscord() {
|
||||||
m_discord.Stop();
|
m_discord.Stop();
|
||||||
SaveState();
|
SaveState();
|
||||||
|
m_main_window->UpdateMenus();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Abaddon::IsDiscordActive() const {
|
bool Abaddon::IsDiscordActive() const {
|
||||||
@ -535,6 +539,7 @@ void Abaddon::ActionSetToken() {
|
|||||||
m_main_window->UpdateComponents();
|
m_main_window->UpdateComponents();
|
||||||
GetSettings().DiscordToken = m_discord_token;
|
GetSettings().DiscordToken = m_discord_token;
|
||||||
}
|
}
|
||||||
|
m_main_window->UpdateMenus();
|
||||||
}
|
}
|
||||||
|
|
||||||
void Abaddon::ActionJoinGuildDialog() {
|
void Abaddon::ActionJoinGuildDialog() {
|
||||||
@ -595,6 +600,8 @@ void Abaddon::ActionChannelOpened(Snowflake id) {
|
|||||||
ShowGuildVerificationGateDialog(*channel->GuildID);
|
ShowGuildVerificationGateDialog(*channel->GuildID);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
m_main_window->UpdateMenus();
|
||||||
}
|
}
|
||||||
|
|
||||||
void Abaddon::ActionChatLoadHistory(Snowflake id) {
|
void Abaddon::ActionChatLoadHistory(Snowflake id) {
|
||||||
|
@ -142,6 +142,11 @@ void MainWindow::UpdateChatReactionRemove(Snowflake id, const Glib::ustring &par
|
|||||||
m_chat.UpdateReactions(id);
|
m_chat.UpdateReactions(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void MainWindow::UpdateMenus() {
|
||||||
|
OnDiscordSubmenuPopup();
|
||||||
|
OnViewSubmenuPopup();
|
||||||
|
}
|
||||||
|
|
||||||
void MainWindow::OnDiscordSubmenuPopup() {
|
void MainWindow::OnDiscordSubmenuPopup() {
|
||||||
auto &discord = Abaddon::Get().GetDiscordClient();
|
auto &discord = Abaddon::Get().GetDiscordClient();
|
||||||
auto channel_id = GetChatActiveChannel();
|
auto channel_id = GetChatActiveChannel();
|
||||||
@ -237,12 +242,6 @@ void MainWindow::SetupMenu() {
|
|||||||
m_menu_bar.append(m_menu_view);
|
m_menu_bar.append(m_menu_view);
|
||||||
m_menu_bar.show_all();
|
m_menu_bar.show_all();
|
||||||
|
|
||||||
m_menu_bar.signal_event().connect([this](GdkEvent *ev) -> bool {
|
|
||||||
OnViewSubmenuPopup();
|
|
||||||
OnDiscordSubmenuPopup();
|
|
||||||
return false;
|
|
||||||
});
|
|
||||||
|
|
||||||
m_menu_discord_connect.signal_activate().connect([this] {
|
m_menu_discord_connect.signal_activate().connect([this] {
|
||||||
m_signal_action_connect.emit();
|
m_signal_action_connect.emit();
|
||||||
});
|
});
|
||||||
|
@ -23,6 +23,7 @@ public:
|
|||||||
Snowflake GetChatOldestListedMessage();
|
Snowflake GetChatOldestListedMessage();
|
||||||
void UpdateChatReactionAdd(Snowflake id, const Glib::ustring ¶m);
|
void UpdateChatReactionAdd(Snowflake id, const Glib::ustring ¶m);
|
||||||
void UpdateChatReactionRemove(Snowflake id, const Glib::ustring ¶m);
|
void UpdateChatReactionRemove(Snowflake id, const Glib::ustring ¶m);
|
||||||
|
void UpdateMenus();
|
||||||
|
|
||||||
ChannelList *GetChannelList();
|
ChannelList *GetChannelList();
|
||||||
ChatWindow *GetChatWindow();
|
ChatWindow *GetChatWindow();
|
||||||
|
Loading…
Reference in New Issue
Block a user