fix conflicts with develop

1 files changed, 37 insertions, 14 deletions

diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index f34cf1ab..f016dc76 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -238,6 +238,9 @@ public:
     TranslatedAction actionREDDIT;
     TranslatedAction actionAbout;
 
+    TranslatedAction actionNoAccountsAdded;
+    TranslatedAction actionNoDefaultAccount;
+
     QVector<TranslatedToolButton *> all_toolbuttons;
 
     QWidget *centralWidget = nullptr;
@@ -746,6 +749,9 @@ public:
         // disabled until we have an instance selected
         instanceToolBar->setEnabled(false);
         instanceToolBar->setMovable(true);
+        // Qt doesn't like vertical moving toolbars, so we have to force them...
+        // See https://github.com/PolyMC/PolyMC/issues/493
+        connect(instanceToolBar, &QToolBar::orientationChanged, [=](Qt::Orientation){ instanceToolBar->setOrientation(Qt::Vertical); });
         instanceToolBar->setAllowedAreas(Qt::LeftToolBarArea | Qt::RightToolBarArea);
         instanceToolBar->setToolButtonStyle(Qt::ToolButtonTextOnly);
         instanceToolBar->setFloatable(false);
@@ -828,7 +834,7 @@ public:
         QMetaObject::connectSlotsByName(MainWindow);
     } // setupUi
 
-    void retranslateUi(QMainWindow *MainWindow)
+    void retranslateUi(MainWindow *MainWindow)
     {
         QString winTitle = tr("%1 - Version %2", "Launcher - Version X").arg(BuildConfig.LAUNCHER_DISPLAYNAME, BuildConfig.printableVersionString());
         MainWindow->setWindowTitle(winTitle);
@@ -848,6 +854,12 @@ public:
         // submenu buttons
         foldersMenuButton->setText(tr("Folders"));
         helpMenuButton->setText(tr("Help"));
+
+        // playtime counter
+        if (MainWindow->m_statusCenter)
+        {
+            MainWindow->updateStatusCenter();
+        }
     } // retranslateUi
 };
 
@@ -950,6 +962,8 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new MainWindow
     ui->mainToolBar->addWidget(spacer);
 
     accountMenu = new QMenu(this);
+    // Use undocumented property... https://stackoverflow.com/questions/7121718/create-a-scrollbar-in-a-submenu-qt
+    accountMenu->setStyleSheet("QMenu { menu-scrollable: 1; }");
 
     repopulateAccountsMenu();
 
@@ -1252,10 +1266,14 @@ void MainWindow::repopulateAccountsMenu()
 
     if (accounts->count() <= 0)
     {
-        QAction *action = new QAction(tr("No accounts added!"), this);
-        action->setEnabled(false);
-        accountMenu->addAction(action);
-        ui->profileMenu->addAction(action);
+        ui->all_actions.removeAll(&ui->actionNoAccountsAdded);
+        ui->actionNoAccountsAdded = TranslatedAction(this);
+        ui->actionNoAccountsAdded->setObjectName(QStringLiteral("actionNoAccountsAdded"));
+        ui->actionNoAccountsAdded.setTextId(QT_TRANSLATE_NOOP("MainWindow", "No accounts added!"));
+        ui->actionNoAccountsAdded->setEnabled(false);
+        accountMenu->addAction(ui->actionNoAccountsAdded);
+        ui->profileMenu->addAction(ui->actionNoAccountsAdded);
+        ui->all_actions.append(&ui->actionNoAccountsAdded);
     }
     else
     {
@@ -1295,18 +1313,23 @@ void MainWindow::repopulateAccountsMenu()
     accountMenu->addSeparator();
     ui->profileMenu->addSeparator();
 
-    QAction *action = new QAction(tr("No Default Account"), this);
-    action->setCheckable(true);
-    action->setIcon(APPLICATION->getThemedIcon("noaccount"));
-    action->setData(-1);
-    action->setShortcut(QKeySequence(tr("Ctrl+0")));
+    ui->all_actions.removeAll(&ui->actionNoDefaultAccount);
+    ui->actionNoDefaultAccount = TranslatedAction(this);
+    ui->actionNoDefaultAccount->setObjectName(QStringLiteral("actionNoDefaultAccount"));
+    ui->actionNoDefaultAccount.setTextId(QT_TRANSLATE_NOOP("MainWindow", "No Default Account"));
+    ui->actionNoDefaultAccount->setCheckable(true);
+    ui->actionNoDefaultAccount->setIcon(APPLICATION->getThemedIcon("noaccount"));
+    ui->actionNoDefaultAccount->setData(-1);
+    ui->actionNoDefaultAccount->setShortcut(QKeySequence(tr("Ctrl+0")));
     if (!defaultAccount) {
-        action->setChecked(true);
+        ui->actionNoDefaultAccount->setChecked(true);
     }
 
-    accountMenu->addAction(action);
-    ui->profileMenu->addAction(action);
-    connect(action, SIGNAL(triggered(bool)), SLOT(changeActiveAccount()));
+    accountMenu->addAction(ui->actionNoDefaultAccount);
+    ui->profileMenu->addAction(ui->actionNoDefaultAccount);
+    connect(ui->actionNoDefaultAccount, SIGNAL(triggered(bool)), SLOT(changeActiveAccount()));
+    ui->all_actions.append(&ui->actionNoDefaultAccount);
+    ui->actionNoDefaultAccount.retranslate();
 
     accountMenu->addSeparator();
     ui->profileMenu->addSeparator();