mirrors/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-08-09 01:29:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Qt: fix update menu for linux

Browse source
This commit is contained in:
Megamouse 2020-07-08 21:49:01 +02:00
commit e09c4b72c8
2 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

24
rpcs3/rpcs3qt/main_window.cpp
View file

@ -181,10 +181,7 @@ void main_window::Init()
// RPCS3 Updater // RPCS3 Updater
QMenuBar *corner_bar = new QMenuBar(ui->menuBar); QMenu* download_menu = new QMenu(tr("Update Available!"));
QMenu *download_menu = new QMenu(tr("Update Available!"), corner_bar);
corner_bar->addMenu(download_menu);
QAction *download_action = new QAction(tr("Download Update"), download_menu); QAction *download_action = new QAction(tr("Download Update"), download_menu);
connect(download_action, &QAction::triggered, this, [this] connect(download_action, &QAction::triggered, this, [this]
@ -193,15 +190,32 @@ void main_window::Init()
}); });
download_menu->addAction(download_action); download_menu->addAction(download_action);
#ifdef _WIN32
// Use a menu at the top right corner to indicate the new version.
QMenuBar *corner_bar = new QMenuBar(ui->menuBar);
m_download_menu_action = corner_bar->addMenu(download_menu);
ui->menuBar->setCornerWidget(corner_bar); ui->menuBar->setCornerWidget(corner_bar);
ui->menuBar->cornerWidget()->setVisible(false); ui->menuBar->cornerWidget()->setVisible(false);
#else
// Append a menu to the right of the regular menus to indicate the new version.
// Some distros just can't handle corner widgets at the moment.
m_download_menu_action = ui->menuBar->addMenu(download_menu);
#endif
ASSERT(m_download_menu_action);
m_download_menu_action->setVisible(false);
connect(&m_updater, &update_manager::signal_update_available, this, [this](bool update_available) connect(&m_updater, &update_manager::signal_update_available, this, [this](bool update_available)
{ {
if (ui->menuBar->cornerWidget()) if (ui->menuBar && ui->menuBar->cornerWidget())
{ {
ui->menuBar->cornerWidget()->setVisible(update_available); ui->menuBar->cornerWidget()->setVisible(update_available);
} }
if (m_download_menu_action)
{
m_download_menu_action->setVisible(update_available);
}
}); });
#if defined(_WIN32) || defined(__linux__) #if defined(_WIN32) || defined(__linux__)

1
rpcs3/rpcs3qt/main_window.h
View file

@ -167,4 +167,5 @@ private:
std::shared_ptr<persistent_settings> m_persistent_settings; std::shared_ptr<persistent_settings> m_persistent_settings;
update_manager m_updater; update_manager m_updater;
QAction* m_download_menu_action = nullptr;
}; };