Sneederix/sneedmc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

change: move demo action to "Play offline" menu

Browse Source 
Signed-off-by: flow <flowlnlnln@gmail.com>
This commit is contained in:
flow 2022-09-15 18:24:21 -03:00
parent 777be6a48d
commit 11216d200c
1 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
launcher/ui/MainWindow.cpp
View File

@ -793,7 +793,6 @@ public:
instanceToolBar->addAction(actionLaunchInstance); instanceToolBar->addAction(actionLaunchInstance);
instanceToolBar->addAction(actionLaunchInstanceOffline); instanceToolBar->addAction(actionLaunchInstanceOffline);
instanceToolBar->addAction(actionLaunchInstanceDemo);
instanceToolBar->addAction(actionKillInstance); instanceToolBar->addAction(actionKillInstance);
instanceToolBar->addSeparator(); instanceToolBar->addSeparator();
@ -1199,7 +1198,6 @@ void MainWindow::updateToolsMenu()
{ {
QToolButton *launchButton = dynamic_cast<QToolButton*>(ui->instanceToolBar->widgetForAction(ui->actionLaunchInstance)); QToolButton *launchButton = dynamic_cast<QToolButton*>(ui->instanceToolBar->widgetForAction(ui->actionLaunchInstance));
QToolButton *launchOfflineButton = dynamic_cast<QToolButton*>(ui->instanceToolBar->widgetForAction(ui->actionLaunchInstanceOffline)); QToolButton *launchOfflineButton = dynamic_cast<QToolButton*>(ui->instanceToolBar->widgetForAction(ui->actionLaunchInstanceOffline));
QToolButton *launchDemoButton = dynamic_cast<QToolButton*>(ui->instanceToolBar->widgetForAction(ui->actionLaunchInstanceDemo));
bool currentInstanceRunning = m_selectedInstance && m_selectedInstance->isRunning(); bool currentInstanceRunning = m_selectedInstance && m_selectedInstance->isRunning();
@ -1209,10 +1207,8 @@ void MainWindow::updateToolsMenu()
QMenu *launchMenu = ui->actionLaunchInstance->menu(); QMenu *launchMenu = ui->actionLaunchInstance->menu();
QMenu *launchOfflineMenu = ui->actionLaunchInstanceOffline->menu(); QMenu *launchOfflineMenu = ui->actionLaunchInstanceOffline->menu();
QMenu *launchDemoMenu = ui->actionLaunchInstanceDemo->menu();
launchButton->setPopupMode(QToolButton::MenuButtonPopup); launchButton->setPopupMode(QToolButton::MenuButtonPopup);
launchOfflineButton->setPopupMode(QToolButton::MenuButtonPopup); launchOfflineButton->setPopupMode(QToolButton::MenuButtonPopup);
launchDemoButton->setPopupMode(QToolButton::MenuButtonPopup);
if (launchMenu) if (launchMenu)
{ {
launchMenu->clear(); launchMenu->clear();
@ -1228,21 +1224,13 @@ void MainWindow::updateToolsMenu()
{ {
launchOfflineMenu = new QMenu(this); launchOfflineMenu = new QMenu(this);
} }
if (launchDemoMenu) {
launchDemoMenu->clear();
}
else
{
launchDemoMenu = new QMenu(this);
}
QAction *normalLaunch = launchMenu->addAction(tr("Launch")); QAction *normalLaunch = launchMenu->addAction(tr("Launch"));
normalLaunch->setShortcut(QKeySequence::Open); normalLaunch->setShortcut(QKeySequence::Open);
QAction *normalLaunchOffline = launchOfflineMenu->addAction(tr("Launch Offline")); QAction *normalLaunchOffline = launchOfflineMenu->addAction(tr("Launch Offline"));
normalLaunchOffline->setShortcut(QKeySequence(tr("Ctrl+Shift+O"))); normalLaunchOffline->setShortcut(QKeySequence(tr("Ctrl+Shift+O")));
QAction *normalLaunchDemo = launchDemoMenu->addAction(tr("Launch Demo")); QAction *normalLaunchDemo = launchOfflineMenu->addAction(tr("Launch Demo"));
normalLaunchDemo->setShortcut(QKeySequence(tr("Ctrl+Alt+O"))); normalLaunchDemo->setShortcut(QKeySequence(tr("Ctrl+Alt+O")));
if (m_selectedInstance) if (m_selectedInstance)
{ {
normalLaunch->setEnabled(m_selectedInstance->canLaunch()); normalLaunch->setEnabled(m_selectedInstance->canLaunch());
@ -1268,28 +1256,23 @@ void MainWindow::updateToolsMenu()
QString profilersTitle = tr("Profilers"); QString profilersTitle = tr("Profilers");
launchMenu->addSeparator()->setText(profilersTitle); launchMenu->addSeparator()->setText(profilersTitle);
launchOfflineMenu->addSeparator()->setText(profilersTitle); launchOfflineMenu->addSeparator()->setText(profilersTitle);
launchDemoMenu->addSeparator()->setText(profilersTitle);
for (auto profiler : APPLICATION->profilers().values()) for (auto profiler : APPLICATION->profilers().values())
{ {
QAction *profilerAction = launchMenu->addAction(profiler->name()); QAction *profilerAction = launchMenu->addAction(profiler->name());
QAction *profilerOfflineAction = launchOfflineMenu->addAction(profiler->name()); QAction *profilerOfflineAction = launchOfflineMenu->addAction(profiler->name());
QAction *profilerDemoAction = launchDemoMenu->addAction(profiler->name());
QString error; QString error;
if (!profiler->check(&error)) if (!profiler->check(&error))
{ {
profilerAction->setDisabled(true); profilerAction->setDisabled(true);
profilerOfflineAction->setDisabled(true); profilerOfflineAction->setDisabled(true);
profilerDemoAction->setDisabled(true);
QString profilerToolTip = tr("Profiler not setup correctly. Go into settings, \"External Tools\"."); QString profilerToolTip = tr("Profiler not setup correctly. Go into settings, \"External Tools\".");
profilerAction->setToolTip(profilerToolTip); profilerAction->setToolTip(profilerToolTip);
profilerOfflineAction->setToolTip(profilerToolTip); profilerOfflineAction->setToolTip(profilerToolTip);
profilerDemoAction->setToolTip(profilerToolTip);
} }
else if (m_selectedInstance) else if (m_selectedInstance)
{ {
profilerAction->setEnabled(m_selectedInstance->canLaunch()); profilerAction->setEnabled(m_selectedInstance->canLaunch());
profilerOfflineAction->setEnabled(m_selectedInstance->canLaunch()); profilerOfflineAction->setEnabled(m_selectedInstance->canLaunch());
profilerDemoAction->setEnabled(m_selectedInstance->canLaunch());
connect(profilerAction, &QAction::triggered, [this, profiler]() connect(profilerAction, &QAction::triggered, [this, profiler]()
{ {
@ -1299,21 +1282,15 @@ void MainWindow::updateToolsMenu()
{ {
APPLICATION->launch(m_selectedInstance, false, false, profiler.get()); APPLICATION->launch(m_selectedInstance, false, false, profiler.get());
}); });
connect(profilerDemoAction, &QAction::triggered, [this, profiler]()
{
APPLICATION->launch(m_selectedInstance, false, true, profiler.get());
});
} }
else else
{ {
profilerAction->setDisabled(true); profilerAction->setDisabled(true);
profilerOfflineAction->setDisabled(true); profilerOfflineAction->setDisabled(true);
profilerDemoAction->setDisabled(true);
} }
} }
ui->actionLaunchInstance->setMenu(launchMenu); ui->actionLaunchInstance->setMenu(launchMenu);
ui->actionLaunchInstanceOffline->setMenu(launchOfflineMenu); ui->actionLaunchInstanceOffline->setMenu(launchOfflineMenu);
ui->actionLaunchInstanceDemo->setMenu(launchDemoMenu);
} }
void MainWindow::repopulateAccountsMenu() void MainWindow::repopulateAccountsMenu()