From b59866c5f37137d4356525941c2fc0e2f26f96cc Mon Sep 17 00:00:00 2001
From: DoITCreative <>
Date: Tue, 14 May 2019 18:16:26 +0300
Subject: [PATCH] UI fix

---
 aboutwindow.h     |   6 +--
 eepromwindow.cpp  |   2 +-
 eepromwindow.h    |   5 +-
 erroricon.h       |   3 +-
 errorwindow.h     |   5 +-
 main.cpp          |   2 +-
 mainwindow.cpp    |   2 -
 mainwindow.h      |   5 +-
 mainwindow.ui     | 116 +++++++++++++++++++++++++---------------------
 parser.h          |   3 +-
 repraptor.h       |   2 +-
 sdwindow.h        |   6 +--
 sender.h          |   5 +-
 settingswindow.h  |   5 +-
 settingswindow.ui |  27 ++++++++---
 15 files changed, 103 insertions(+), 91 deletions(-)

diff --git a/aboutwindow.h b/aboutwindow.h
index 3acfa76..0ce8337 100644
--- a/aboutwindow.h
+++ b/aboutwindow.h
@@ -1,12 +1,10 @@
 #ifndef ABOUTWINDOW_H
 #define ABOUTWINDOW_H
-
 #include <QDialog>
-
 #include "repraptor.h"
 
 namespace Ui {
-class AboutWindow;
+    class AboutWindow;
 }
 
 class AboutWindow : public QDialog
@@ -14,7 +12,7 @@ class AboutWindow : public QDialog
     Q_OBJECT
 
 public:
-    explicit AboutWindow(QWidget *parent = 0);
+    explicit AboutWindow(QWidget *parent = nullptr);
     ~AboutWindow();
 
 private:
diff --git a/eepromwindow.cpp b/eepromwindow.cpp
index 555641a..c15a74c 100644
--- a/eepromwindow.cpp
+++ b/eepromwindow.cpp
@@ -53,7 +53,7 @@ EEPROMWindow::EEPROMWindow(QStringList eepromLines, QWidget *parent) :
             {
             case 0:
                 edit->setValidator(new QIntValidator(-128, 255, this));
-            case 1:
+                break;
             case 2:
                 edit->setValidator(new QIntValidator(this));
                 break;
diff --git a/eepromwindow.h b/eepromwindow.h
index aa4b657..5602a17 100644
--- a/eepromwindow.h
+++ b/eepromwindow.h
@@ -1,6 +1,5 @@
 #ifndef EEPROMWINDOW_H
 #define EEPROMWINDOW_H
-
 #include <QDialog>
 #include <QtWidgets>
 
@@ -9,7 +8,7 @@
 using namespace RepRaptor;
 
 namespace Ui {
-class EEPROMWindow;
+    class EEPROMWindow;
 }
 
 class EEPROMWindow : public QDialog
@@ -17,7 +16,7 @@ class EEPROMWindow : public QDialog
     Q_OBJECT
 
 public:
-    explicit EEPROMWindow(QStringList eepromLines, QWidget *parent = 0);
+    explicit EEPROMWindow(QStringList eepromLines, QWidget *parent = nullptr);
     ~EEPROMWindow();
 
 private:
diff --git a/erroricon.h b/erroricon.h
index 6693ec6..8797034 100644
--- a/erroricon.h
+++ b/erroricon.h
@@ -1,6 +1,5 @@
 #ifndef ERRORICON_H
 #define ERRORICON_H
-
 #include <QWidget>
 #include <QTimer>
 #include <QPainter>
@@ -9,7 +8,7 @@ class ErrorIcon : public QWidget
 {
     Q_OBJECT
 public:
-    explicit ErrorIcon(QWidget *parent = 0);
+    explicit ErrorIcon(QWidget *parent = nullptr);
     ~ErrorIcon();
     QTimer *animation;
     QString frame;
diff --git a/errorwindow.h b/errorwindow.h
index 2a59b22..eb347fd 100644
--- a/errorwindow.h
+++ b/errorwindow.h
@@ -1,13 +1,12 @@
 #ifndef ERRORWINDOW_H
 #define ERRORWINDOW_H
-
 #include <QDialog>
 
 #include "erroricon.h"
 #include "repraptor.h"
 
 namespace Ui {
-class ErrorWindow;
+    class ErrorWindow;
 }
 
 class ErrorWindow : public QDialog
@@ -15,7 +14,7 @@ class ErrorWindow : public QDialog
     Q_OBJECT
 
 public:
-    explicit ErrorWindow(QWidget *parent = 0, QString errorText = "Unknown error", int errType = 0);
+    explicit ErrorWindow(QWidget *parent = nullptr, QString errorText = "Unknown error", int errType = 0);
     ~ErrorWindow();
 
 private:
diff --git a/main.cpp b/main.cpp
index 2ed518c..3292fcb 100644
--- a/main.cpp
+++ b/main.cpp
@@ -15,5 +15,5 @@ int main(int argc, char *argv[])
     MainWindow w;
     w.show();
 
-    return a.exec();
+    return QApplication::exec();
 }
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 12ae90a..76f330a 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -6,7 +6,6 @@ MainWindow::MainWindow(QWidget *parent) :
     ui(new Ui::MainWindow)
 {
     ui->setupUi(this);
-
     //Set parents
     settings.setParent(this);
     gfile.setParent(this);
@@ -207,7 +206,6 @@ MainWindow::~MainWindow()
     parserThread->wait();
     senderThread->quit();
     senderThread->wait();
-
     delete ui;
 }
 
diff --git a/mainwindow.h b/mainwindow.h
index ae95043..935e230 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -1,6 +1,5 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
-
 #include <QMainWindow>
 #include <QFileDialog>
 #include <QSystemTrayIcon>
@@ -26,7 +25,7 @@
 using namespace RepRaptor;
 
 namespace Ui {
-class MainWindow;
+    class MainWindow;
 }
 
 class MainWindow : public QMainWindow
@@ -34,7 +33,7 @@ class MainWindow : public QMainWindow
     Q_OBJECT
 
 public:
-    explicit MainWindow(QWidget *parent = 0);
+    explicit MainWindow(QWidget *parent = nullptr);
     ~MainWindow();
 
     Parser *parserWorker;
diff --git a/mainwindow.ui b/mainwindow.ui
index db2cc91..aace310 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>791</width>
-    <height>514</height>
+    <width>800</width>
+    <height>600</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -16,6 +16,12 @@
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
+  <property name="minimumSize">
+   <size>
+    <width>800</width>
+    <height>600</height>
+   </size>
+  </property>
   <property name="windowTitle">
    <string>RepRaptor</string>
   </property>
@@ -35,7 +41,7 @@
       </property>
       <property name="maximumSize">
        <size>
-        <width>200</width>
+        <width>250</width>
         <height>16777215</height>
        </size>
       </property>
@@ -83,15 +89,21 @@
     <item row="0" column="1" rowspan="3">
      <widget class="QGroupBox" name="controlBox">
       <property name="sizePolicy">
-       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
         <horstretch>0</horstretch>
         <verstretch>0</verstretch>
        </sizepolicy>
       </property>
+      <property name="minimumSize">
+       <size>
+        <width>0</width>
+        <height>0</height>
+       </size>
+      </property>
       <property name="maximumSize">
        <size>
-        <width>261</width>
-        <height>500</height>
+        <width>320</width>
+        <height>16777215</height>
        </size>
       </property>
       <property name="title">
@@ -314,7 +326,7 @@
         <widget class="QLineEdit" name="flowedit">
          <property name="font">
           <font>
-           <pointsize>9</pointsize>
+           <pointsize>12</pointsize>
           </font>
          </property>
          <property name="text">
@@ -354,34 +366,6 @@
          </property>
         </widget>
        </item>
-       <item row="10" column="2" colspan="2">
-        <widget class="QPushButton" name="fanonbtn">
-         <property name="text">
-          <string>Fan On</string>
-         </property>
-        </widget>
-       </item>
-       <item row="10" column="4" colspan="3">
-        <widget class="QPushButton" name="fanoffbtn">
-         <property name="text">
-          <string>Fan Off</string>
-         </property>
-        </widget>
-       </item>
-       <item row="11" column="2" colspan="2">
-        <widget class="QPushButton" name="atxonbtn">
-         <property name="text">
-          <string>ATX On</string>
-         </property>
-        </widget>
-       </item>
-       <item row="11" column="4" colspan="3">
-        <widget class="QPushButton" name="atxoffbtn">
-         <property name="text">
-          <string>ATX Off</string>
-         </property>
-        </widget>
-       </item>
        <item row="3" column="0" colspan="3">
         <widget class="QPushButton" name="homeallbtn">
          <property name="text">
@@ -462,6 +446,47 @@
          </property>
         </widget>
        </item>
+       <item row="4" column="0" colspan="3">
+        <widget class="QLabel" name="label_2">
+         <property name="maximumSize">
+          <size>
+           <width>16777215</width>
+           <height>15</height>
+          </size>
+         </property>
+         <property name="text">
+          <string>Step Increment</string>
+         </property>
+        </widget>
+       </item>
+       <item row="10" column="4" colspan="3">
+        <widget class="QPushButton" name="fanoffbtn">
+         <property name="text">
+          <string>Fan Off</string>
+         </property>
+        </widget>
+       </item>
+       <item row="11" column="4" colspan="3">
+        <widget class="QPushButton" name="atxoffbtn">
+         <property name="text">
+          <string>ATX Off</string>
+         </property>
+        </widget>
+       </item>
+       <item row="11" column="2" colspan="2">
+        <widget class="QPushButton" name="atxonbtn">
+         <property name="text">
+          <string>ATX On</string>
+         </property>
+        </widget>
+       </item>
+       <item row="10" column="2" colspan="2">
+        <widget class="QPushButton" name="fanonbtn">
+         <property name="text">
+          <string>Fan On</string>
+         </property>
+        </widget>
+       </item>
        <item row="10" column="0" rowspan="2" colspan="2">
         <widget class="QPushButton" name="haltbtn">
          <property name="minimumSize">
@@ -897,19 +922,6 @@ STOP</string>
          </property>
         </widget>
        </item>
-       <item row="4" column="0" colspan="3">
-        <widget class="QLabel" name="label_2">
-         <property name="maximumSize">
-          <size>
-           <width>16777215</width>
-           <height>15</height>
-          </size>
-         </property>
-         <property name="text">
-          <string>Step Increment</string>
-         </property>
-        </widget>
-       </item>
       </layout>
      </widget>
     </item>
@@ -971,7 +983,7 @@ STOP</string>
       </property>
       <property name="maximumSize">
        <size>
-        <width>200</width>
+        <width>250</width>
         <height>16777215</height>
        </size>
       </property>
@@ -1051,7 +1063,7 @@ STOP</string>
       </property>
       <property name="maximumSize">
        <size>
-        <width>200</width>
+        <width>250</width>
         <height>16777215</height>
        </size>
       </property>
@@ -1129,8 +1141,8 @@ STOP</string>
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>791</width>
-     <height>20</height>
+     <width>800</width>
+     <height>24</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
diff --git a/parser.h b/parser.h
index e366304..0186698 100644
--- a/parser.h
+++ b/parser.h
@@ -1,6 +1,5 @@
 #ifndef PARSETHREAD_H
 #define PARSETHREAD_H
-
 #include <QThread>
 #include <QSettings>
 
@@ -13,7 +12,7 @@ class Parser : public QObject
     Q_OBJECT
 
 public:
-    explicit Parser(QObject *parent = 0);
+    explicit Parser(QObject *parent = nullptr);
     ~Parser();
 
 protected:
diff --git a/repraptor.h b/repraptor.h
index 17b6e90..ce88b3f 100644
--- a/repraptor.h
+++ b/repraptor.h
@@ -4,10 +4,10 @@
 
 #ifndef REPRAPTOR_H
 #define REPRAPTOR_H
-
 #ifndef REPRAPTOR_VERSION
 #define REPRAPTOR_VERSION "0.3.9"
 #endif
+#include <QString>
 
 namespace RepRaptor
 {
diff --git a/sdwindow.h b/sdwindow.h
index 8bc92de..aeb0872 100644
--- a/sdwindow.h
+++ b/sdwindow.h
@@ -1,10 +1,9 @@
 #ifndef SDWINDOW_H
 #define SDWINDOW_H
-
 #include <QDialog>
 
 namespace Ui {
-class SDWindow;
+    class SDWindow;
 }
 
 class SDWindow : public QDialog
@@ -12,7 +11,7 @@ class SDWindow : public QDialog
     Q_OBJECT
 
 public:
-    explicit SDWindow(QStringList files, QWidget *parent = 0);
+    explicit SDWindow(QStringList files, QWidget *parent = nullptr);
     ~SDWindow();
 
 signals:
@@ -20,7 +19,6 @@ class SDWindow : public QDialog
 
 private slots:
     void on_buttonBox_accepted();
-
     void on_fileslist_doubleClicked(const QModelIndex &);
 
 private:
diff --git a/sender.h b/sender.h
index 30f2dbc..679daa1 100644
--- a/sender.h
+++ b/sender.h
@@ -1,6 +1,5 @@
 #ifndef SENDER_H
 #define SENDER_H
-
 #include <QObject>
 #include <QSerialPort>
 #include <QSerialPortInfo>
@@ -8,7 +7,6 @@
 #include <QTimer>
 #include <QSettings>
 #include <QVector>
-
 #include "repraptor.h"
 
 using namespace RepRaptor;
@@ -17,7 +15,7 @@ class Sender : public QObject
 {
     Q_OBJECT
 public:
-    explicit Sender(QObject *parent = 0);
+    explicit Sender(QObject *parent = nullptr);
     ~Sender();
 
 protected:
@@ -37,7 +35,6 @@ class Sender : public QObject
     QQueue <QString> userCommands;
     QStringList sentCommands;
     QVector <QString> gcode;
-
     bool sendLine(QString s);
 
 signals:
diff --git a/settingswindow.h b/settingswindow.h
index ad03d5e..b90d1a1 100644
--- a/settingswindow.h
+++ b/settingswindow.h
@@ -1,6 +1,5 @@
 #ifndef SETTINGSWINDOW_H
 #define SETTINGSWINDOW_H
-
 #include <QDialog>
 #include <QSettings>
 #include "repraptor.h"
@@ -8,7 +7,7 @@
 using namespace RepRaptor;
 
 namespace Ui {
-class SettingsWindow;
+    class SettingsWindow;
 }
 
 class SettingsWindow : public QDialog
@@ -16,7 +15,7 @@ class SettingsWindow : public QDialog
     Q_OBJECT
 
 public:
-    explicit SettingsWindow(QWidget *parent = 0);
+    explicit SettingsWindow(QWidget *parent = nullptr);
 
     QSettings settings;
 
diff --git a/settingswindow.ui b/settingswindow.ui
index a33dfe3..7aab89b 100644
--- a/settingswindow.ui
+++ b/settingswindow.ui
@@ -6,10 +6,16 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>603</width>
-    <height>491</height>
+    <width>330</width>
+    <height>550</height>
    </rect>
   </property>
+  <property name="minimumSize">
+   <size>
+    <width>330</width>
+    <height>550</height>
+   </size>
+  </property>
   <property name="windowTitle">
    <string>Settings</string>
   </property>
@@ -27,7 +33,7 @@
       </size>
      </property>
      <property name="currentIndex">
-      <number>0</number>
+      <number>2</number>
      </property>
      <widget class="QWidget" name="tab_general">
       <attribute name="title">
@@ -232,12 +238,12 @@
         <rect>
          <x>10</x>
          <y>20</y>
-         <width>249</width>
-         <height>171</height>
+         <width>291</width>
+         <height>191</height>
         </rect>
        </property>
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -261,6 +267,9 @@
           <property name="text">
            <string>X</string>
           </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
          </widget>
         </item>
         <item row="1" column="3">
@@ -309,6 +318,12 @@
         </item>
         <item row="3" column="0">
          <widget class="QLabel" name="label_10">
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>0</height>
+           </size>
+          </property>
           <property name="text">
            <string>Extruder
 feedrate</string>