Fixed shortcut window not closing when main is closed.

Author: gbrown5

global.cpp

@@ -1,11 +1,13 @@
 #include "global.h"
+#include <math.h>
 #include "gpmanager.h"
 
 QSettings settings("TuxSH", "InputRedirectionClient-Qt");
 
 Worker worker;
 Settings btnSettings;
 double tsRatio;
+
 std::vector<ShortCut> listShortcuts;
 
 QGamepadManager::GamepadButtons buttons = 0;

global.h

@@ -102,6 +102,7 @@ class Worker : public QObject {
     void setLeftAxis(double x, double y);
     void setRightAxis(double x, double y);
     void setPreviousLAxis(double x, double y);
+    void closeThread() { emit finished(); }
 
     explicit Worker(QObject *parent = 0) : QObject(parent)
     {

main.cpp

@@ -26,6 +26,7 @@ int main(int argc, char *argv[])
     QObject::connect(thread, SIGNAL (finished()), thread, SLOT (deleteLater()));
     QObject::connect(&timer, SIGNAL(timeout()), &worker, SLOT(sendFrame()));
     thread->start();
-
-    return a.exec();
+    a.exec();
+    worker.closeThread();
+    return 0;
 }

mainwidget.h

@@ -54,7 +54,8 @@ private slots:
         setContextMenuPolicy(Qt::CustomContextMenu);
 
         // Disable/hide the configurator button if running windows since it's not supported
-         if (QSysInfo::productType() == "windows")
+         if (QSysInfo::productType() == "windows" ||
+             QSysInfo::productType() == "osx")
          {
              configGamepadButton->setEnabled(false);
              configGamepadButton->setVisible(false);
@@ -177,15 +178,13 @@ private slots:
             touchScreen->update();
         });
 
-
         touchScreen = new TouchScreen(nullptr);
         settingsConfig = new ConfigWindow(nullptr, touchScreen);
         this->setWindowTitle(tr("InputRedirectionClient-Qt"));
 
         addrLineEdit->setText(settings.value("ipAddress", "").toString());
     }
 
-
     void show(void)
     {
         QWidget::show();
@@ -212,6 +211,9 @@ private slots:
          }
         touchScreen->close();
         settingsConfig->close();
+
+        touchScreen->setTouchScreenPressed(false);
+        delete touchScreen;
         ev->accept();
     }
 
@@ -224,7 +226,7 @@ private slots:
     //When main window is opened, load shortcut settings
     void showEvent(QShowEvent* event)
     {
-        int id = qRegisterMetaType<ShortCut>("ShortCut");
+        qRegisterMetaType<ShortCut>("ShortCut");
         qRegisterMetaTypeStreamOperators<ShortCut>("ShortCut");
 
     QString valName = "tsShortcut0";
@@ -244,7 +246,7 @@ private slots:
          }
          else
          {
-             settings.remove("tsShortcut"+i);
+             settings.remove(tr("tsShortcut%1").arg(i));
          }
 
      }
@@ -257,8 +259,7 @@ private slots:
 
         buttons = 0;
         interfaceButtons = 0;
-        touchScreen->setTouchScreenPressed(false);
-        delete touchScreen;
+
         delete settingsConfig;
     }
 };

touchscreen.cpp

@@ -220,3 +220,4 @@ void TouchScreen::clearImage(void)
     settings.setValue("tsBackgroundImage", "");
     updatePixmap();
 }
+

touchscreen.h

@@ -35,6 +35,12 @@ public slots:
     void updatePixmap(void);
     void clearImage(void);
     void paintEvent(QPaintEvent* e);
+
+   ~TouchScreen(void)
+    {
+        qDebug() << "DECON";
+        tsShortcutGui.close();
+    }
 };
 
 #endif // TOUCHSCREEN_H

tsshortcut.h

@@ -12,11 +12,9 @@ class TsShortcut : public QWidget
 {
 private:
     QString wTitle;
-    QPushButton  *acceptButton;
     QVBoxLayout  *layout;
     QFormLayout  *formLayout;
     QListWidget    *lstWidget;
-    QGamepadManager::GamepadButton btnToMap;
     QLabel       *lblDirections;
     QPushButton  *btnColorDialog, *btnCreateShort,
                  *btnDelShort, *btnHelp, *btnPressNow;