Buttons toggle - Cleaning code - Fixing Icons

src/common/config.cpp

@@ -436,7 +436,7 @@ void setVblankDiv(u32 value) {
 void setIsFullscreen(bool enable) {
     isFullscreen = enable;
 }
-void setShowLabelsUnderIcons(bool enable) {
+static void setShowLabelsUnderIcons(bool enable) {
     showLabelsUnderIcons = enable;
 }
 

src/qt_gui/main_window.cpp

@@ -145,40 +145,29 @@ void MainWindow::toggleLabelsUnderIcons() {
     bool showLabels = ui->toggleLabelsAct->isChecked();
     Config::setShowLabelsUnderIcons();
     UpdateToolbarLabels();
+    if (isGameRunning) {
+        UpdateToolbarButtons();
+    }
 }
 
 void MainWindow::toggleFullscreen() {
     SDL_Event event;
     SDL_memset(&event, 0, sizeof(event));
     event.type = SDL_EVENT_TOGGLE_FULLSCREEN;
-
     SDL_PushEvent(&event);
 }
 
-void MainWindow::AddUiWidgets() {
+QWidget* MainWindow::createButtonWithLabel(QPushButton* button, const QString& labelText,
-    // add toolbar widgets
+                                           bool showLabel) {
-    QApplication::setStyle("Fusion");
-    ui->toolBar->setObjectName("mw_toolbar");
-
-    ui->toolBar->clear();
-
-    QWidget* toolbarContainer = new QWidget(this);
-    QHBoxLayout* mainLayout = new QHBoxLayout(toolbarContainer);
-    mainLayout->setContentsMargins(5, 5, 5, 5);
-    mainLayout->setSpacing(15);
-
-    bool showLabels = ui->toggleLabelsAct->isChecked();
-    QPalette palette = qApp->palette();
-
-    auto createButtonWithLabel = [&](QPushButton* button, const QString& labelText) {
     QWidget* container = new QWidget(this);
     QVBoxLayout* layout = new QVBoxLayout(container);
-        layout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
+    layout->setAlignment(Qt::AlignCenter | Qt::AlignBottom);
     layout->setContentsMargins(0, 0, 0, 0);
     layout->addWidget(button);
 
-        if (showLabels) {
+    QLabel* label = nullptr;
-            QLabel* label = new QLabel(labelText, this);
+    if (showLabel && ui->toggleLabelsAct->isChecked()) {
+        label = new QLabel(labelText, this);
         label->setAlignment(Qt::AlignCenter | Qt::AlignBottom);
         layout->addWidget(label);
         button->setToolTip("");
@@ -187,51 +176,96 @@ void MainWindow::AddUiWidgets() {
     }
 
     container->setLayout(layout);
+    container->setProperty("buttonLabel", QVariant::fromValue(label));
     return container;
-    };
+}
 
-    auto createLine = [this]() {
+void MainWindow::AddUiWidgets() {
-        QFrame* line = new QFrame(this);
+    // add toolbar widgets
-        line->setFrameShape(QFrame::VLine);
+    QApplication::setStyle("Fusion");
-        line->setFrameShadow(QFrame::Sunken);
+    ui->toolBar->clear();
-        line->setFixedWidth(2);
+
-        return line;
+    QWidget* toolbarContainer = new QWidget(this);
-    };
+    QHBoxLayout* mainLayout = new QHBoxLayout(toolbarContainer);
+    mainLayout->setSpacing(2);
+    bool showLabels = ui->toggleLabelsAct->isChecked();
 
     QWidget* buttonGroup = new QWidget(this);
     QHBoxLayout* buttonLayout = new QHBoxLayout(buttonGroup);
-    buttonLayout->setContentsMargins(0, 0, 0, 0);
+    buttonLayout->setSpacing(2);
-    buttonLayout->setSpacing(15);
 
-    buttonLayout->addWidget(createButtonWithLabel(ui->playButton, tr("Play")));
+    buttonLayout->addWidget(createButtonWithLabel(ui->playButton, tr("Play"), showLabels));
-    buttonLayout->addWidget(createButtonWithLabel(ui->pauseButton, tr("Pause")));
+    buttonLayout->addWidget(createButtonWithLabel(ui->pauseButton, tr("Pause"), false));
-    buttonLayout->addWidget(createButtonWithLabel(ui->stopButton, tr("Stop")));
+    buttonLayout->addWidget(createButtonWithLabel(ui->stopButton, tr("Stop"), showLabels));
-    buttonLayout->addWidget(createButtonWithLabel(ui->settingsButton, tr("Settings")));
+    buttonLayout->addWidget(createButtonWithLabel(ui->settingsButton, tr("Settings"), showLabels));
-    buttonLayout->addWidget(createButtonWithLabel(ui->fullscreenButton, tr("Full Screen")));
+    buttonLayout->addWidget(
-    buttonLayout->addWidget(createButtonWithLabel(ui->controllerButton, tr("Controllers")));
+        createButtonWithLabel(ui->fullscreenButton, tr("Full Screen"), showLabels));
-    buttonLayout->addWidget(createButtonWithLabel(ui->keyboardButton, tr("Keyboard")));
+    buttonLayout->addWidget(
-    buttonLayout->addWidget(createButtonWithLabel(ui->refreshButton, tr("Refresh List")));
+        createButtonWithLabel(ui->controllerButton, tr("Controllers"), showLabels));
+    buttonLayout->addWidget(createButtonWithLabel(ui->keyboardButton, tr("Keyboard"), showLabels));
+    buttonLayout->addWidget(
+        createButtonWithLabel(ui->refreshButton, tr("Refresh List"), showLabels));
 
     QWidget* searchSliderContainer = new QWidget(this);
     QHBoxLayout* searchSliderLayout = new QHBoxLayout(searchSliderContainer);
-    searchSliderLayout->setContentsMargins(0, 0, 0, 0);
-    searchSliderLayout->setSpacing(10);
-
     searchSliderLayout->addWidget(ui->sizeSliderContainer);
     searchSliderLayout->addWidget(ui->mw_searchbar);
     searchSliderContainer->setLayout(searchSliderLayout);
 
     buttonLayout->addWidget(searchSliderContainer);
-
     mainLayout->addWidget(buttonGroup);
-    toolbarContainer->setLayout(mainLayout);
     ui->toolBar->addWidget(toolbarContainer);
+
+    ui->playButton->setVisible(true);
+    ui->pauseButton->setVisible(false);
 }
 
 void MainWindow::UpdateToolbarLabels() {
     AddUiWidgets();
 }
 
+void MainWindow::UpdateToolbarButtons() {
+    // add toolbar widgets for when game is running
+    bool showLabels = ui->toggleLabelsAct->isChecked();
+
+    ui->toolBar->clear();
+
+    QWidget* toolbarContainer = new QWidget(this);
+    QHBoxLayout* mainLayout = new QHBoxLayout(toolbarContainer);
+    mainLayout->setSpacing(2);
+
+    QWidget* buttonGroup = new QWidget(this);
+    QHBoxLayout* buttonLayout = new QHBoxLayout(buttonGroup);
+    buttonLayout->setSpacing(2);
+
+    ui->playButton->setVisible(false);
+    ui->pauseButton->setVisible(true);
+
+    buttonLayout->addWidget(createButtonWithLabel(ui->playButton, tr("Play"), false));
+    buttonLayout->addWidget(createButtonWithLabel(ui->pauseButton, tr("Pause"), showLabels));
+    buttonLayout->addWidget(createButtonWithLabel(ui->stopButton, tr("Stop"), showLabels));
+    buttonLayout->addWidget(createButtonWithLabel(ui->settingsButton, tr("Settings"), showLabels));
+    buttonLayout->addWidget(
+        createButtonWithLabel(ui->fullscreenButton, tr("Full Screen"), showLabels));
+    buttonLayout->addWidget(
+        createButtonWithLabel(ui->controllerButton, tr("Controllers"), showLabels));
+    buttonLayout->addWidget(createButtonWithLabel(ui->keyboardButton, tr("Keyboard"), showLabels));
+    buttonLayout->addWidget(
+        createButtonWithLabel(ui->refreshButton, tr("Refresh List"), showLabels));
+
+    QWidget* searchSliderContainer = new QWidget(this);
+    QHBoxLayout* searchSliderLayout = new QHBoxLayout(searchSliderContainer);
+    searchSliderLayout->addWidget(ui->sizeSliderContainer);
+    searchSliderLayout->addWidget(ui->mw_searchbar);
+    searchSliderContainer->setLayout(searchSliderLayout);
+
+    buttonLayout->addWidget(searchSliderContainer);
+    mainLayout->addWidget(buttonGroup);
+    toolbarContainer->setLayout(mainLayout);
+
+    ui->toolBar->addWidget(toolbarContainer);
+}
+
 void MainWindow::CreateDockWindows() {
     // place holder widget is needed for good health they say :)
     QWidget* phCentralWidget = new QWidget(this);
@@ -827,6 +861,8 @@ void MainWindow::StartGame() {
             return;
         }
         StartEmulator(path);
+
+        UpdateToolbarButtons();
     }
 }
 

src/qt_gui/main_window.h

@@ -5,6 +5,7 @@
 
 #include <QActionGroup>
 #include <QDragEnterEvent>
+#include <QProcess>
 #include <QTranslator>
 
 #include "background_music_player.h"
@@ -39,6 +40,7 @@ public:
     void InstallDirectory();
     void StartGame();
     void PauseGame();
+    bool showLabels;
 
 private Q_SLOTS:
     void ConfigureGuiFromSettings();
@@ -54,6 +56,8 @@ private:
     Ui_MainWindow* ui;
     void AddUiWidgets();
     void UpdateToolbarLabels();
+    void UpdateToolbarButtons();
+    QWidget* createButtonWithLabel(QPushButton* button, const QString& labelText, bool showLabel);
     void CreateActions();
     void toggleFullscreen();
     void CreateRecentGameActions();