Merge pull request #724 from leo78913/dot-ui-mainwindow

Closes https://github.com/PrismLauncher/PrismLauncher/issues/594
Closes https://github.com/PrismLauncher/PrismLauncher/issues/69
Closes https://github.com/PrismLauncher/PrismLauncher/issues/473

1 files changed, 12 insertions, 14 deletions

diff --git a/launcher/ui/MainWindow.h b/launcher/ui/MainWindow.h
index a36257a7..3a42c34e 100644
--- a/launcher/ui/MainWindow.h
+++ b/launcher/ui/MainWindow.h
@@ -60,13 +60,16 @@ class BaseProfilerFactory;
 class InstanceView;
 class KonamiCode;
 class InstanceTask;
+class LabeledToolButton;
 
+namespace Ui
+{
+class MainWindow;
+}
 class MainWindow : public QMainWindow
 {
     Q_OBJECT
 
-    class Ui;
-
 public:
     explicit MainWindow(QWidget *parent = 0);
     ~MainWindow();
@@ -106,10 +109,6 @@ private slots:
     void on_actionChangeInstGroup_triggered();
 
     void on_actionChangeInstIcon_triggered();
-    void on_changeIconButton_clicked(bool)
-    {
-        on_actionChangeInstIcon_triggered();
-    }
 
     void on_actionViewInstanceFolder_triggered();
 
@@ -155,10 +154,6 @@ private slots:
     void on_actionExportInstance_triggered();
 
     void on_actionRenameInstance_triggered();
-    void on_renameButton_clicked(bool)
-    {
-        on_actionRenameInstance_triggered();
-    }
 
     void on_actionEditInstance_triggered();
 
@@ -221,24 +216,27 @@ private:
     void updateInstanceToolIcon(QString new_icon);
     void setSelectedInstanceById(const QString &id);
     void updateStatusCenter();
+    void setInstanceActionsEnabled(bool enabled);
 
     void runModalTask(Task *task);
     void instanceFromInstanceTask(InstanceTask *task);
     void finalizeInstance(InstancePtr inst);
 
 private:
-    std::unique_ptr<Ui> ui;
-
+    Ui::MainWindow *ui;
     // these are managed by Qt's memory management model!
     InstanceView *view = nullptr;
     InstanceProxyModel *proxymodel = nullptr;
     QToolButton *newsLabel = nullptr;
     QLabel *m_statusLeft = nullptr;
     QLabel *m_statusCenter = nullptr;
-    QMenu *accountMenu = nullptr;
-    QToolButton *accountMenuButton = nullptr;
+    LabeledToolButton *changeIconButton = nullptr;
+    LabeledToolButton *renameButton = nullptr;
+    QToolButton *helpMenuButton = nullptr;
     KonamiCode * secretEventFilter = nullptr;
 
+    std::shared_ptr<Setting> instanceToolbarSetting = nullptr;
+
     unique_qobject_ptr<NewsChecker> m_newsChecker;
 
     InstancePtr m_selectedInstance;