summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2017-12-06 02:01:42 +0100
committerPetr Mrázek <peterix@gmail.com>2017-12-06 02:01:42 +0100
commit57accb1cbb4a2deee050ded9f541faeacfbcc787 (patch)
treeca328a9f9c0cd4097866fc8e5b5ee622e110371a
parent6d034bda825c506bede7bf0229f47095222edfc2 (diff)
downloadMultiMC-57accb1cbb4a2deee050ded9f541faeacfbcc787.tar
MultiMC-57accb1cbb4a2deee050ded9f541faeacfbcc787.tar.gz
MultiMC-57accb1cbb4a2deee050ded9f541faeacfbcc787.tar.lz
MultiMC-57accb1cbb4a2deee050ded9f541faeacfbcc787.tar.xz
MultiMC-57accb1cbb4a2deee050ded9f541faeacfbcc787.zip
NOISSUE Reorder and reword main toolbar actions to save space
``` Folder, Help, Check for Updates, Settings -> Folders, Settings, Help, Update ```
-rw-r--r--application/MainWindow.cpp30
1 files changed, 10 insertions, 20 deletions
diff --git a/application/MainWindow.cpp b/application/MainWindow.cpp
index 9f9772c8..83e6b227 100644
--- a/application/MainWindow.cpp
+++ b/application/MainWindow.cpp
@@ -293,6 +293,15 @@ public:
foldersButtonAction->setDefaultWidget(foldersMenuButton);
mainToolBar->addAction(foldersButtonAction);
+ actionSettings = TranslatedAction(MainWindow);
+ actionSettings->setObjectName(QStringLiteral("actionSettings"));
+ actionSettings->setIcon(MMC->getThemedIcon("settings"));
+ actionSettings->setMenuRole(QAction::PreferencesRole);
+ actionSettings.setTextId(QT_TRANSLATE_NOOP("MainWindow", "Settings"));
+ actionSettings.setTooltipId(QT_TRANSLATE_NOOP("MainWindow", "Change settings."));
+ all_actions.append(&actionSettings);
+ mainToolBar->addAction(actionSettings);
+
helpMenu = new QMenu(MainWindow);
helpMenu->setToolTipsVisible(true);
@@ -341,36 +350,17 @@ public:
helpButtonAction->setDefaultWidget(helpMenuButton);
mainToolBar->addAction(helpButtonAction);
-/*
- actionRefresh = TranslatedAction(MainWindow);
- actionRefresh->setObjectName(QStringLiteral("actionRefresh"));
- actionRefresh->setIcon(MMC->getThemedIcon("refresh"));
- actionRefresh.setTextId(QT_TRANSLATE_NOOP("MainWindow", "Refresh"));
- actionRefresh.setTooltipId(QT_TRANSLATE_NOOP("MainWindow", "Reload the instance list."));
- all_actions.append(&actionRefresh);
- mainToolBar->addAction(actionRefresh);
-*/
-
if(BuildConfig.UPDATER_ENABLED)
{
actionCheckUpdate = TranslatedAction(MainWindow);
actionCheckUpdate->setObjectName(QStringLiteral("actionCheckUpdate"));
actionCheckUpdate->setIcon(MMC->getThemedIcon("checkupdate"));
- actionCheckUpdate.setTextId(QT_TRANSLATE_NOOP("MainWindow", "Check for Updates"));
+ actionCheckUpdate.setTextId(QT_TRANSLATE_NOOP("MainWindow", "Update"));
actionCheckUpdate.setTooltipId(QT_TRANSLATE_NOOP("MainWindow", "Check for new updates for MultiMC."));
all_actions.append(&actionCheckUpdate);
mainToolBar->addAction(actionCheckUpdate);
}
- actionSettings = TranslatedAction(MainWindow);
- actionSettings->setObjectName(QStringLiteral("actionSettings"));
- actionSettings->setIcon(MMC->getThemedIcon("settings"));
- actionSettings->setMenuRole(QAction::PreferencesRole);
- actionSettings.setTextId(QT_TRANSLATE_NOOP("MainWindow", "Settings"));
- actionSettings.setTooltipId(QT_TRANSLATE_NOOP("MainWindow", "Change settings."));
- all_actions.append(&actionSettings);
- mainToolBar->addAction(actionSettings);
-
mainToolBar->addSeparator();
actionPatreon = TranslatedAction(MainWindow);