Refactoring LaunchWidget

Author: MahBoiDeveloper

src/GUI/BaseConfigurationDialog.cpp

@@ -1,47 +1,57 @@
 #include <QDialogButtonBox>
 #include <QRadioButton>
 #include <QPushButton>
+#include <QButtonGroup>
 #include <QVBoxLayout>
 #include <QPixmap>
+#include <QCheckBox>
 
 #include "../Registry.hpp"
 #include "CreationDialog.hpp"
 
-CreationDialog::CreationDialog(QWidget* parent) : BaseConfigurationDialog(parent)
+CreationDialog::CreationDialog(QWidget* parent) : QDialog(parent)
 {
+    QDialogButtonBox* btnbxOkAndCancel = new QDialogButtonBox();
+    btnbxOkAndCancel->setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+    btnbxOkAndCancel->button(QDialogButtonBox::Ok)->setText(tr("START"));
+    btnbxOkAndCancel->button(QDialogButtonBox::Cancel)->setText(tr("BACK"));
+    connect(btnbxOkAndCancel, &QDialogButtonBox::rejected, this, [=, this] { emit btnBackClicked(); });
+    connect(btnbxOkAndCancel, &QDialogButtonBox::accepted, this, [=, this] { emit btnStartClicked(); });
+
     // configure game buttons
-    QRadioButton* generalsButton = new QRadioButton(
+    QRadioButton* rbxGenerals = new QRadioButton(
                 QString::fromStdString(Registry::ToString(Registry::Games::Generals)));
-    generalsButton->setDisabled(true);
+    rbxGenerals->setDisabled(true);
+    QFont rbxGeneralsFont = rbxGenerals->font();
+    rbxGeneralsFont.setStrikeOut(true);
+    rbxGenerals->setFont(rbxGeneralsFont);
 
-    QRadioButton* zeroHourButton = new QRadioButton(
+    QRadioButton* rbxZeroHour = new QRadioButton(
                 QString::fromStdString(Registry::ToString(Registry::Games::GeneralsZeroHour)));
 
-    buttonsGroup.setExclusive(true);
-    zeroHourButton->setChecked(true);
-    buttonsGroup.addButton(generalsButton);
-    buttonsGroup.addButton(zeroHourButton);
+    QButtonGroup* btngRadioboxes = new QButtonGroup();
+
+    btngRadioboxes->setExclusive(true);
+    rbxZeroHour->setChecked(true);
+    btngRadioboxes->addButton(rbxGenerals);
+    btngRadioboxes->addButton(rbxZeroHour);
     QVBoxLayout* ltChoiseGame = new QVBoxLayout();
-    ltChoiseGame->addWidget(generalsButton);
-    ltChoiseGame->addWidget(zeroHourButton);
+    ltChoiseGame->addWidget(rbxGenerals);
+    ltChoiseGame->addWidget(rbxZeroHour);
 
     // configure save option
-    saveToGameBox.setText(tr("Save hotkeys dirrectly to the game."));
+    QCheckBox* chkSaveToGame = new QCheckBox();
+    chkSaveToGame->setText(tr("Save hotkeys dirrectly to the game."));
 
     // configure dialog view
     QVBoxLayout* ltMainBlock = new QVBoxLayout();
     ltMainBlock->setAlignment(Qt::Alignment::enum_type::AlignCenter);
     ltMainBlock->addStretch(5);
     ltMainBlock->addLayout(ltChoiseGame);
     ltMainBlock->addStretch(2);
-    ltMainBlock->addWidget(&saveToGameBox);
+    ltMainBlock->addWidget(chkSaveToGame);
     ltMainBlock->addStretch(5);
-    ltMainBlock->addWidget(&dialogButtons, 0, Qt::AlignCenter);
+    ltMainBlock->addWidget(btnbxOkAndCancel, 0, Qt::AlignCenter);
     ltMainBlock->addStretch(1);
     setLayout(ltMainBlock);
 }
-
-QVariant CreationDialog::CreateConfigurationData()
-{
-    return QVariant("Creator widget data.");
-}

src/GUI/BaseConfigurationDialog.hpp

@@ -1,14 +1,12 @@
 #pragma once
-#include <QCheckBox>
-#include "BaseConfigurationDialog.hpp"
+#include <QDialog>
 
-class CreationDialog : public BaseConfigurationDialog
+class CreationDialog : public QDialog
 {
     Q_OBJECT
-private: // Data
-    QCheckBox saveToGameBox;
-
-public: // Method
+public: // Methods
     CreationDialog(QWidget* parent = nullptr);
-    QVariant CreateConfigurationData() override;
+signals:
+    void btnBackClicked();
+    void btnStartClicked();
 };

src/GUI/CreationDialog.cpp

@@ -21,9 +21,6 @@ GreetingWidget::GreetingWidget(QWidget* parent) : QWidget(parent)
     QVBoxLayout* ltLanguages    = nullptr;
     QVBoxLayout* ltMain         = nullptr;
 
-    // Makes greeting window unresizeable and equal to the size of the background file
-    setFixedSize(795, 440);
-    
     // Add "New Project" and "Load Project" buttons to the window
     btnNewProject = new QPushButton(tr("NEW") + '\n' + tr("PROJECT"));
     btnNewProject->setFixedSize(PROGRAM_CONSTANTS->START_BUTTON_SIZE);

src/GUI/CreationDialog.hpp

@@ -7,14 +7,14 @@
 
 LaunchWidget::LaunchWidget(QWidget* parent) : QStackedWidget(parent)
 {
-    // MainLaunchWidget settings
+    // Makes window unresizeable and equal to the size of the background
     setFixedSize(795, 440);
     setWindowFlags(windowFlags() |  Qt::MSWindowsFixedSizeDialogHint);
     setWindowFlags(windowFlags() & ~Qt::WindowMaximizeButtonHint &
                                    ~Qt::WindowMinimizeButtonHint);
-    
-    pGreetingWidget = new GreetingWidget(this);
-    addWidget(pGreetingWidget);
+
+    AddWidgets();
+    setCurrentWidget(pGreetingWidget);
     AttachConnections();
 }
 
@@ -25,6 +25,15 @@ void LaunchWidget::AttachConnections()
 
     connect(pGreetingWidget, &GreetingWidget::pressed,
             this,            &LaunchWidget::BtnNewProjectOrBtnLoadProject_Clicked);
+
+    connect(pLoadDialog,     &LoadDialog::btnBackClicked,
+            this,            &LaunchWidget::BtnBack_Clicked);
+
+    connect(pCreationDialog, &CreationDialog::btnBackClicked,
+            this,            &LaunchWidget::BtnBack_Clicked);
+    
+    connect(pCreationDialog, &CreationDialog::btnStartClicked,
+            this,            &LaunchWidget::CreationDialog_AcceptConfiguration);
 }
 
 void LaunchWidget::DetachConnections()
@@ -34,48 +43,67 @@ void LaunchWidget::DetachConnections()
 
     disconnect(pGreetingWidget, &GreetingWidget::pressed,
                this,            &LaunchWidget::BtnNewProjectOrBtnLoadProject_Clicked);
+    
+    disconnect(pLoadDialog,     &LoadDialog::btnBackClicked,
+               this,            &LaunchWidget::BtnBack_Clicked);
+
+    disconnect(pCreationDialog, &CreationDialog::btnBackClicked,
+               this,            &LaunchWidget::BtnBack_Clicked);
+
+    disconnect(pCreationDialog, &CreationDialog::btnStartClicked,
+               this,            &LaunchWidget::CreationDialog_AcceptConfiguration);
+}
+
+void LaunchWidget::AddWidgets()
+{
+    pGreetingWidget = new GreetingWidget(this);
+    pCreationDialog = new CreationDialog(pGreetingWidget);
+    pLoadDialog     = new LoadDialog(pGreetingWidget);
+
+    pGreetingWidget->setFixedSize(size());
+    pCreationDialog->setFixedSize(size());
+    pLoadDialog->setFixedSize(size());
+
+    addWidget(pGreetingWidget);
+    addWidget(pCreationDialog);
+    addWidget(pLoadDialog);
 }
 
 void LaunchWidget::GreetingWidget_LanguageChanged(int intLngIndex)
 {
-    // Find language type by its code.
     Languages lngType = static_cast<Languages>(intLngIndex);
 
-    // Change class' translator.
     WINDOW_MANAGER->SetTranslator(lngType);
 
-    // Recreate StartWidget and update connections.
     DetachConnections();
-    removeWidget(pGreetingWidget);
+    // removeWidget(pGreetingWidget);
+    // removeWidget(pCreationDialog);
+    // removeWidget(pLoadDialog);
     pGreetingWidget->deleteLater();
+    pCreationDialog->deleteLater();
+    pLoadDialog->deleteLater();
 
-    pGreetingWidget = new GreetingWidget(this);
-    addWidget(pGreetingWidget);
-    setCurrentWidget(pGreetingWidget);
+    AddWidgets();
     AttachConnections();
+    setCurrentWidget(pGreetingWidget);
 }
 
 void LaunchWidget::BtnNewProjectOrBtnLoadProject_Clicked(GreetingWidget::StandartButtons standartButton)
 {
-    BaseConfigurationDialog* pConfigurationWidget = nullptr;
-
     switch (standartButton)
     {
         case GreetingWidget::StandartButtons::NewProject:
-            pConfigurationWidget = new CreationDialog();
+            setCurrentWidget(pCreationDialog);
             break;
         case GreetingWidget::StandartButtons::LoadProject:
-            pConfigurationWidget = new LoadDialog();
+            setCurrentWidget(pLoadDialog);
             break;
         default:
-            pConfigurationWidget = new CreationDialog();
+            setCurrentWidget(pCreationDialog);
             break;
     }
-    addWidget(pConfigurationWidget);
-    setCurrentWidget(pConfigurationWidget); // next window (creator)
-
-    // if accepted -> send signal with configuration
-    connect(pConfigurationWidget, &CreationDialog::acceptConfiguration, this, &LaunchWidget::CreationDialog_AcceptConfiguration);
 }
 
-void LaunchWidget::CreationDialog_AcceptConfiguration(const QVariant& cfg) { WINDOW_MANAGER->LaunchWidget_AcceptConfiguration(cfg); }
+void LaunchWidget::BtnBack_Clicked() { setCurrentWidget(pGreetingWidget); }
+
+void LaunchWidget::CreationDialog_AcceptConfiguration() { QVariant cfg; WINDOW_MANAGER->LaunchWidget_AcceptConfiguration(cfg); }

src/GUI/GreetingWidget.cpp

@@ -1,12 +1,16 @@
 #pragma once
 #include <QStackedWidget>
 #include "GreetingWidget.hpp"
+#include "CreationDialog.hpp"
+#include "LoadDialog.hpp"
 
 class LaunchWidget final : public QStackedWidget
 {
     Q_OBJECT
 private: // Data
     GreetingWidget* pGreetingWidget = nullptr;
+    CreationDialog* pCreationDialog = nullptr;
+    LoadDialog*     pLoadDialog     = nullptr;
 
 private: // Methods
     /// @brief Connects slots and singals.
@@ -16,11 +20,17 @@ class LaunchWidget final : public QStackedWidget
 public:
     LaunchWidget(QWidget* parent = nullptr);
 
+private:
+    /// @brief Adds `GreetingWidget`, `CreationDialog`, `LoadDialog` to the class.
+    void AddWidgets();
+
 private slots:
+    /// @brief Show `GreetingWidget`, if button `Back` has been clicked.
+    void BtnBack_Clicked();
     /// @brief Change language by its index if language has been changed via select list.
     void GreetingWidget_LanguageChanged(int intLngIndex);
     /// @brief Open create/loader widget if start button has been clicked.
     void BtnNewProjectOrBtnLoadProject_Clicked(GreetingWidget::StandartButtons standartButton);
     /// @brief Returns checked configuration of user preferences.
-    void CreationDialog_AcceptConfiguration(const QVariant& configuration);
+    void CreationDialog_AcceptConfiguration();
 };

src/GUI/LaunchWidget.cpp

@@ -2,14 +2,22 @@
 #include <QRadioButton>
 #include <QVBoxLayout>
 #include <QPushButton>
+#include <QButtonGroup>
 #include <QFileDialog>
 #include <QLineEdit>
 #include <QFontMetrics>
 
 #include "LoadDialog.hpp"
 
-LoadDialog::LoadDialog(QWidget* parent) : BaseConfigurationDialog(parent)
+LoadDialog::LoadDialog(QWidget* parent) : QDialog(parent)
 {
+    QDialogButtonBox* btnbxOkAndCancel = new QDialogButtonBox();
+    btnbxOkAndCancel->setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+    btnbxOkAndCancel->button(QDialogButtonBox::Ok)->setText(tr("START"));
+    btnbxOkAndCancel->button(QDialogButtonBox::Cancel)->setText(tr("BACK"));
+    connect(btnbxOkAndCancel, &QDialogButtonBox::rejected, this, [=, this] { emit btnBackClicked(); });
+    connect(btnbxOkAndCancel, &QDialogButtonBox::accepted, this, [=, this] { emit btnStartClicked(); });
+
     // configure file path selection
     QLineEdit* pathToFileLineEdit = new QLineEdit();
     pathToFileLineEdit->setMaximumWidth(700);
@@ -31,41 +39,41 @@ LoadDialog::LoadDialog(QWidget* parent) : BaseConfigurationDialog(parent)
     connect(btnReview, &QPushButton::clicked, fileDialog, &QFileDialog::exec);
 
     // configure choise buttons
-    QRadioButton* loadFromFileButton = new QRadioButton(tr("Load project"));
-    connect(loadFromFileButton, &QPushButton::toggled, this, [=, this](bool checked)
+    QRadioButton* rdxLoadFromFile = new QRadioButton(tr("Load project"));
+    connect(rdxLoadFromFile, &QPushButton::toggled, this, [=, this](bool checked)
     {
         pathToFileLineEdit->setEnabled(checked);
         btnReview->setEnabled(checked);
     });
 
-    QRadioButton* loadFromGameButton = new QRadioButton(tr("Load installed game hotkey map"));
-    buttonsGroup.setExclusive(true);
-    loadFromFileButton->setChecked(true);
-    buttonsGroup.addButton(loadFromFileButton);
-    buttonsGroup.addButton(loadFromGameButton);
+    QButtonGroup* btngRadioboxes = new QButtonGroup();
+    QRadioButton* rbxLoadFromGame = new QRadioButton(tr("Load installed game hotkey map"));
+    btngRadioboxes->setExclusive(true);
+    rdxLoadFromFile->setChecked(true);
+    btngRadioboxes->addButton(rdxLoadFromFile);
+    btngRadioboxes->addButton(rbxLoadFromGame);
 
     QHBoxLayout* ltReview = new QHBoxLayout();
     ltReview->addWidget(pathToFileLineEdit);
     ltReview->addSpacing(5);
     ltReview->addWidget(btnReview);
-    ltReview->setContentsMargins(loadFromFileButton->sizeHint().width() -
-                                QFontMetrics(loadFromFileButton->font()).horizontalAdvance(loadFromFileButton->text()),
+    ltReview->setContentsMargins(rdxLoadFromFile->sizeHint().width() -
+                                QFontMetrics(rdxLoadFromFile->font()).horizontalAdvance(rdxLoadFromFile->text()),
                                 0,0,0);
 
     // configure dialog view
     QVBoxLayout* ltMainBlock = new QVBoxLayout();
     ltMainBlock->setContentsMargins(80,0,80,0);
     ltMainBlock->setAlignment(Qt::Alignment::enum_type::AlignCenter);
     ltMainBlock->addStretch(5);
-    ltMainBlock->addWidget(loadFromFileButton);
+    ltMainBlock->addWidget(rdxLoadFromFile);
     ltMainBlock->addSpacing(10);
     ltMainBlock->addLayout(ltReview);
     ltMainBlock->addStretch(2);
-    ltMainBlock->addWidget(loadFromGameButton);
+    ltMainBlock->addWidget(rbxLoadFromGame);
     ltMainBlock->addStretch(5);
-    ltMainBlock->addWidget(&dialogButtons, 0, Qt::AlignCenter);
+    ltMainBlock->addWidget(btnbxOkAndCancel, 0, Qt::AlignCenter);
     ltMainBlock->addStretch(1);
+
     setLayout(ltMainBlock);
 }
-
-QVariant LoadDialog::CreateConfigurationData() { return QVariant("Loader widget data."); }