fix cancelClicked, fix set level list focus after download

add keyborad shourtcuts

Author: noisecode3

MANUAL.md

@@ -53,8 +53,8 @@ From here you can:
 
 ![Info](doc/Info.png)
 
-- [ ] Focus Info content (ctrl+i)
-- [ ] Focus Cover List (ctrl+c)
+- [x] Focus Info content (ctrl+i)
+- [x] Focus Cover List (ctrl+c)
 - [x] Go to Walkthrough (ctrl+w)
 - [x] Go Back to Level List (ctrl+b)
 
@@ -69,9 +69,9 @@ From here you can:
 ![Setup](doc/Setup.png)
 
 - [x] Level Tab (alt+l)
-- [ ] Save Level Options (ctrl+s)
-- [ ] Reset Level Options (ctrl+r)
-- [ ] Environment Variables (ctrl+e)
+- [x] Save Level Options (ctrl+s)
+- [x] Reset Level Options (ctrl+r)
+- [x] Environment Variables (ctrl+e)
 
 ## Some open source modes that work well with Proton/Wine
 

src/view/Levels.cpp

@@ -43,10 +43,6 @@ UiLevels::UiLevels(QWidget *parent)
 
     stackedWidget->addWidget(select);
 
-    connect(dialog, &Dialog::cancelClicked, this, [this]() {
-        this->setStackedWidget("select");
-    });
-
     Filter* filter_p = select->filter;
     filter_p->setVisible(false);
 
@@ -96,16 +92,19 @@ UiLevels::UiLevels(QWidget *parent)
         } else {
             pushButtonFilter->setIcon(arrowDownIcon);
         }
-        pushButtonFilter->setIconSize(QSize(16, 16));
         this->select->levelViewList->setFocus();
     });
 
     pushButtonFilter->setIcon(arrowDownIcon);
-    pushButtonFilter->setIconSize(QSize(16, 16));
 
     connect(dialog, &Dialog::setLevelsState,
         this, &UiLevels::callbackDialog);
 
+    connect(dialog, &Dialog::cancelClicked,
+            this, [this](){
+        this->setStackedWidget("select");
+    });
+
     // Arrive with next batch of level icons
     connect(&Controller::getInstance(), &Controller::controllerReloadLevelList,
             this, &UiLevels::loadMoreCovers);
@@ -143,7 +142,7 @@ UiLevels::UiLevels(QWidget *parent)
     connect(this->select->stackedWidgetBar->navigateWidgetBar->pushButtonInfo,
             &QPushButton::clicked,
             this, &UiLevels::infoClicked);
-    
+
     connect(this->select->stackedWidgetBar->navigateWidgetBar->pushButtonRun,
             &QPushButton::clicked, this, &UiLevels::runClicked);
 }
@@ -558,7 +557,6 @@ void UiLevels::downloadClicked(qint64 id) {
     select->downloadingState(false);
     select->stackedWidgetBar->progressWidgetBar->progressBar->setValue(0);
     select->setCurrentWidgetBar(StackedWidgetBar::Progress);
-    this->select->levelViewList->setFocus();
 }
 
 void UiLevels::setpushButtonRunText(const QString &text) {
@@ -598,6 +596,7 @@ void UiLevels::workTick() {
         select->setCurrentWidgetBar(StackedWidgetBar::Navigate);
         select->downloadingState(true);
         levelDirSelected(id);
+        this->select->levelViewList->setFocus();
     }
 }
 

src/view/Levels/Dialog.cpp

@@ -71,6 +71,11 @@ Dialog::Dialog(QWidget *parent)
         qDebug() << "OK clicked, selected:" << selected;
         emit setLevelsState(selected);
     });
+
+    connect(m_cancelButton, &QPushButton::clicked, this, [this]() {
+        qDebug() << "Cancel clicked";
+        emit cancelClicked();
+    });
 }
 
 void Dialog::setMessage(const QString &text) {

src/view/Levels/Dialog.hpp

@@ -34,7 +34,6 @@ class Dialog : public QWidget {
     QString selectedOption() const;
 
  signals:
-    void okClicked();
     void setLevelsState(QString qwidget);
     void cancelClicked();
 

src/view/Ui.cpp

@@ -1,6 +1,7 @@
 #include "view/Ui.hpp"
 #include "view/Levels/Select/Filter.hpp"
 #include <qcombobox.h>
+#include <qnamespace.h>
 
 Ui::Ui(QWidget *parent)
     : QWidget(parent),
@@ -95,6 +96,11 @@ void Ui::setShortCuts() {
                 filterGroupBoxSearch->lineEditSearch->setFocus();
             }
         }
+        // Setup save
+        if (this->tabs->currentWidget() == this->setup) {
+            this->setup->settings->frameLevelSetup->
+                levelControl->commandLinkButtonLSSave->click();
+        }
     });
 
     // Search Type
@@ -172,15 +178,21 @@ void Ui::setShortCuts() {
     connectShortCut(QKeySequence(Qt::CTRL | Qt::Key_I),
         [this]() -> void {
         if (this->tabs->currentWidget() == this->levels) {
+            // Activate info
             if (this->levels->stackedWidget->currentWidget() ==
                         this->levels->select) {
                 this->levels->select->stackedWidgetBar->
                     navigateWidgetBar->pushButtonInfo->click();
             }
+            // Info text focus
+            if (this->levels->stackedWidget->currentWidget() ==
+                        this->levels->info) {
+                this->levels->info->infoContent->infoWebEngineView->setFocus();
+            }
         }
     });
 
-    // Go Back
+    // Info/Walkthrough Go Back
     connectShortCut(QKeySequence(Qt::CTRL | Qt::Key_B),
         [this]() -> void {
         if (this->tabs->currentWidget() == this->levels) {
@@ -191,7 +203,7 @@ void Ui::setShortCuts() {
         }
     });
 
-    // Walkthrough
+    // Info Go to Walkthrough
     connectShortCut(QKeySequence(Qt::CTRL | Qt::Key_W),
         [this]() -> void {
         if (this->tabs->currentWidget() == this->levels) {
@@ -202,6 +214,18 @@ void Ui::setShortCuts() {
         }
     });
 
+
+    // Info coverList focus
+    connectShortCut(QKeySequence(Qt::CTRL | Qt::Key_C),
+        [this]() -> void {
+        if (this->tabs->currentWidget() == this->levels) {
+            if (this->levels->stackedWidget->currentWidget() ==
+                        this->levels->info) {
+                this->levels->info->infoContent->coverListWidget->setFocus();
+            }
+        }
+    });
+
     // Select Filter
     connectShortCut(QKeySequence(Qt::CTRL | Qt::Key_Y),
         [this]() -> void {
@@ -232,6 +256,12 @@ void Ui::setShortCuts() {
                     filterGroupBoxSort->focusSelected();
             }
         }
+
+        // Setup reset
+        if (this->tabs->currentWidget() == this->setup) {
+            this->setup->settings->frameLevelSetup->
+                levelControl->commandLinkButtonLSReset->click();
+        }
     });
 
     // Download
@@ -251,6 +281,7 @@ void Ui::setShortCuts() {
         [this]() -> void {
         if (this->tabs->currentWidget() != this->levels) {
             this->tabs->setCurrentWidget(this->levels);
+            this->levels->select->levelViewList->setFocus();
         }
     });
 
@@ -259,6 +290,19 @@ void Ui::setShortCuts() {
         [this]() -> void {
         if (this->tabs->currentWidget() != this->setup) {
             this->tabs->setCurrentWidget(this->setup);
+            this->setup->settings->frameLevelSetup->
+                frameLevelSetupSettings->widgetEnvironmentVariables->
+                    lineEditEnvironmentVariables->setFocus();
+        }
+    });
+
+    // Setup environment
+    connectShortCut(QKeySequence(Qt::CTRL | Qt::Key_E),
+        [this]() -> void {
+        if (this->tabs->currentWidget() == this->setup) {
+            this->setup->settings->frameLevelSetup->
+                frameLevelSetupSettings->widgetEnvironmentVariables->
+                    lineEditEnvironmentVariables->setFocus();
         }
     });
 }