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

Use TranslatedAction instead of QAction for menu bar actions

Browse Source
This commit is contained in:
Kenneth Chew 2022-04-16 13:35:13 -04:00
parent a549828655
commit 9bad83a551
No known key found for this signature in database
GPG Key ID: F17D3E14A07739DA
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
launcher/ui/MainWindow.cpp
View File

@ -249,10 +249,10 @@ public:
QMenu *viewMenu; QMenu *viewMenu;
QMenu *profileMenu; QMenu *profileMenu;
QAction *actionCloseWindow; TranslatedAction actionCloseWindow;
QAction *actionOpenWiki; TranslatedAction actionOpenWiki;
QAction *actionNewsMenuBar; TranslatedAction actionNewsMenuBar;
TranslatedToolbar mainToolBar; TranslatedToolbar mainToolBar;
TranslatedToolbar instanceToolBar; TranslatedToolbar instanceToolBar;
@ -473,11 +473,10 @@ public:
MainWindow->addToolBar(Qt::TopToolBarArea, mainToolBar); MainWindow->addToolBar(Qt::TopToolBarArea, mainToolBar);
} }
void createMenuBar(MainWindow *MainWindow) void createMenuBar(QMainWindow *MainWindow)
{ {
menuBar = new QMenuBar(MainWindow); menuBar = new QMenuBar(MainWindow);
menuBar->setVisible(APPLICATION->settings()->get("MenuBarInsteadOfToolBar").toBool()); menuBar->setVisible(APPLICATION->settings()->get("MenuBarInsteadOfToolBar").toBool());
createMenuActions(MainWindow);
fileMenu = menuBar->addMenu(tr("&File")); fileMenu = menuBar->addMenu(tr("&File"));
fileMenu->addAction(actionAddInstance); fileMenu->addAction(actionAddInstance);
@ -533,18 +532,27 @@ public:
void createMenuActions(MainWindow *MainWindow) void createMenuActions(MainWindow *MainWindow)
{ {
actionCloseWindow = new QAction(tr("Close &Window"), MainWindow); actionCloseWindow = TranslatedAction(MainWindow);
actionCloseWindow->setObjectName(QStringLiteral("actionCloseWindow"));
actionCloseWindow.setTextId(QT_TRANSLATE_NOOP("MainWindow", "Close &Window"));
actionCloseWindow.setTooltipId(QT_TRANSLATE_NOOP("MainWindow", "Close the current window"));
actionCloseWindow->setShortcut(QKeySequence::Close); actionCloseWindow->setShortcut(QKeySequence::Close);
actionCloseWindow->setStatusTip(tr("Close the current window"));
connect(actionCloseWindow, &QAction::triggered, APPLICATION, &Application::closeCurrentWindow); connect(actionCloseWindow, &QAction::triggered, APPLICATION, &Application::closeCurrentWindow);
all_actions.append(&actionCloseWindow);
actionOpenWiki = new QAction(tr("%1 He&lp").arg(BuildConfig.LAUNCHER_NAME), MainWindow); actionOpenWiki = TranslatedAction(MainWindow);
actionOpenWiki->setStatusTip(tr("Open the %1 wiki").arg(BuildConfig.LAUNCHER_NAME)); actionOpenWiki->setObjectName(QStringLiteral("actionOpenWiki"));
actionOpenWiki.setTextId(QT_TRANSLATE_NOOP("MainWindow", "%1 He&lp"));
actionOpenWiki.setTooltipId(QT_TRANSLATE_NOOP("MainWindow", "Open the %1 wiki"));
connect(actionOpenWiki, &QAction::triggered, MainWindow, &MainWindow::on_actionOpenWiki_triggered); connect(actionOpenWiki, &QAction::triggered, MainWindow, &MainWindow::on_actionOpenWiki_triggered);
all_actions.append(&actionOpenWiki);
actionNewsMenuBar = new QAction(tr("&%1 &News").arg(BuildConfig.LAUNCHER_NAME), MainWindow); actionNewsMenuBar = TranslatedAction(MainWindow);
actionNewsMenuBar->setStatusTip(tr("Open the development blog to read more news about %1.").arg(BuildConfig.LAUNCHER_NAME)); actionNewsMenuBar->setObjectName(QStringLiteral("actionNewsMenuBar"));
actionNewsMenuBar.setTextId(QT_TRANSLATE_NOOP("MainWindow", "%1 &News"));
actionNewsMenuBar.setTooltipId(QT_TRANSLATE_NOOP("MainWindow", "Open the %1 wiki"));
connect(actionNewsMenuBar, &QAction::triggered, MainWindow, &MainWindow::on_actionMoreNews_triggered); connect(actionNewsMenuBar, &QAction::triggered, MainWindow, &MainWindow::on_actionMoreNews_triggered);
all_actions.append(&actionNewsMenuBar);
} }
// "Instance actions" are actions that require an instance to be selected (i.e. "new instance" is not here) // "Instance actions" are actions that require an instance to be selected (i.e. "new instance" is not here)
@ -790,9 +798,10 @@ public:
#endif #endif
createMainToolbarActions(MainWindow); createMainToolbarActions(MainWindow);
createMenuActions(dynamic_cast<class MainWindow *>(MainWindow));
createInstanceActions(MainWindow); createInstanceActions(MainWindow);
createMenuBar(dynamic_cast<class MainWindow *>(MainWindow)); createMenuBar(MainWindow);
createMainToolbar(MainWindow); createMainToolbar(MainWindow);