Default resolution now 1440x900

Desktop_Interface/Labrador.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.1.0, 2017-06-02T14:52:32. -->
+<!-- Written by QtCreator 4.1.0, 2017-06-02T18:39:02. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

Desktop_Interface/ui_files_desktop/mainwindow.ui

@@ -9,8 +9,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1152</width>
+    <width>1440</width>
-    <height>1032</height>
+    <height>900</height>
    </rect>
   </property>
   <property name="minimumSize">
@@ -48,6 +48,29 @@
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QLabel" name="cursorStatsLabel">
+        <property name="maximumSize">
+         <size>
+          <width>16777215</width>
+          <height>48</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>cursorStatsLabel</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="functionGenControl" name="controller_fg">
+        <property name="text">
+         <string>SALUTON MI ESTAS FUNCTION GENERATOR CONTROLLER</string>
+        </property>
+       </widget>
+      </item>
       <item>
        <widget class="QTextEdit" name="debugConsole"/>
       </item>
@@ -530,22 +553,6 @@
         </property>
        </spacer>
       </item>
-      <item>
-       <widget class="QLabel" name="cursorStatsLabel">
-        <property name="maximumSize">
-         <size>
-          <width>16777215</width>
-          <height>48</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>cursorStatsLabel</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignCenter</set>
-        </property>
-       </widget>
-      </item>
       <item>
        <widget class="QGroupBox" name="multimeterGroup">
         <property name="enabled">
@@ -737,13 +744,6 @@
         </property>
        </spacer>
       </item>
-      <item>
-       <widget class="functionGenControl" name="controller_fg">
-        <property name="text">
-         <string>SALUTON MI ESTAS FUNCTION GENERATOR CONTROLLER</string>
-        </property>
-       </widget>
-      </item>
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout_5">
         <item>
@@ -1310,8 +1310,8 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>1152</width>
+     <width>1440</width>
-     <height>22</height>
+     <height>19</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">

Desktop_Interface/ui_mainwindow.h

@@ -120,6 +120,8 @@ public:
     QHBoxLayout *horizontalLayout;
     QVBoxLayout *verticalLayout;
     QCustomPlot *scopeAxes;
+    QLabel *cursorStatsLabel;
+    functionGenControl *controller_fg;
     QTextEdit *debugConsole;
     QSlider *timeBaseSlider;
     QPlainTextEdit *console1;
@@ -170,7 +172,6 @@ public:
     QDoubleSpinBox *triggerLevelValue;
     QCheckBox *singleShotCheckBox;
     QSpacerItem *verticalSpacer_3;
-    QLabel *cursorStatsLabel;
     QGroupBox *multimeterGroup;
     QGridLayout *gridLayout;
     QComboBox *multimeterModeSelect;
@@ -188,7 +189,6 @@ public:
     QLabel *multimeterModeLabel;
     espoSpinBox *multimeterResistanceSelect;
     QSpacerItem *verticalSpacer_2;
-    functionGenControl *controller_fg;
     QHBoxLayout *horizontalLayout_5;
     QGroupBox *signalGenGroup_CH1;
     QVBoxLayout *verticalLayout_19;
@@ -268,7 +268,7 @@ public:
         if (MainWindow->objectName().isEmpty())
             MainWindow->setObjectName(QStringLiteral("MainWindow"));
         MainWindow->setEnabled(true);
-        MainWindow->resize(1152, 1032);
+        MainWindow->resize(1440, 900);
         MainWindow->setMinimumSize(QSize(1024, 768));
         actionGainAuto = new QAction(MainWindow);
         actionGainAuto->setObjectName(QStringLiteral("actionGainAuto"));
@@ -496,6 +496,18 @@ public:
 
         verticalLayout->addWidget(scopeAxes);
 
+        cursorStatsLabel = new QLabel(centralWidget);
+        cursorStatsLabel->setObjectName(QStringLiteral("cursorStatsLabel"));
+        cursorStatsLabel->setMaximumSize(QSize(16777215, 48));
+        cursorStatsLabel->setAlignment(Qt::AlignCenter);
+
+        verticalLayout->addWidget(cursorStatsLabel);
+
+        controller_fg = new functionGenControl(centralWidget);
+        controller_fg->setObjectName(QStringLiteral("controller_fg"));
+
+        verticalLayout->addWidget(controller_fg);
+
         debugConsole = new QTextEdit(centralWidget);
         debugConsole->setObjectName(QStringLiteral("debugConsole"));
 
@@ -799,13 +811,6 @@ public:
 
         verticalLayout_5->addItem(verticalSpacer_3);
 
-        cursorStatsLabel = new QLabel(centralWidget);
-        cursorStatsLabel->setObjectName(QStringLiteral("cursorStatsLabel"));
-        cursorStatsLabel->setMaximumSize(QSize(16777215, 48));
-        cursorStatsLabel->setAlignment(Qt::AlignCenter);
-
-        verticalLayout_5->addWidget(cursorStatsLabel);
-
         multimeterGroup = new QGroupBox(centralWidget);
         multimeterGroup->setObjectName(QStringLiteral("multimeterGroup"));
         multimeterGroup->setEnabled(false);
@@ -909,11 +914,6 @@ public:
 
         verticalLayout_5->addItem(verticalSpacer_2);
 
-        controller_fg = new functionGenControl(centralWidget);
-        controller_fg->setObjectName(QStringLiteral("controller_fg"));
-
-        verticalLayout_5->addWidget(controller_fg);
-
         horizontalLayout_5 = new QHBoxLayout();
         horizontalLayout_5->setSpacing(6);
         horizontalLayout_5->setObjectName(QStringLiteral("horizontalLayout_5"));
@@ -1244,7 +1244,7 @@ public:
         MainWindow->setCentralWidget(centralWidget);
         menuBar = new QMenuBar(MainWindow);
         menuBar->setObjectName(QStringLiteral("menuBar"));
-        menuBar->setGeometry(QRect(0, 0, 1152, 22));
+        menuBar->setGeometry(QRect(0, 0, 1440, 19));
         menuFile = new QMenu(menuBar);
         menuFile->setObjectName(QStringLiteral("menuFile"));
         menuOscilloscope_2 = new QMenu(menuBar);
@@ -1550,6 +1550,8 @@ public:
         actionSnap_to_Cursors->setText(QApplication::translate("MainWindow", "Snap to Cursors", 0));
         actionEnter_Manually->setText(QApplication::translate("MainWindow", "Enter Manually", 0));
         actionTake_Snapshot->setText(QApplication::translate("MainWindow", "Take Snapshot", 0));
+        cursorStatsLabel->setText(QApplication::translate("MainWindow", "cursorStatsLabel", 0));
+        controller_fg->setText(QApplication::translate("MainWindow", "SALUTON MI ESTAS FUNCTION GENERATOR CONTROLLER", 0));
         deviceConnected->setText(QApplication::translate("MainWindow", "Device Not Connected!", 0));
         scopeGroup_CH1->setTitle(QApplication::translate("MainWindow", "Oscilloscope CH1", 0));
         pausedLabeL_CH1->setText(QApplication::translate("MainWindow", "Paused", 0));
@@ -1582,7 +1584,6 @@ public:
          << QApplication::translate("MainWindow", "CH2 (Falling)", 0)
         );
         singleShotCheckBox->setText(QApplication::translate("MainWindow", "Single Shot", 0));
-        cursorStatsLabel->setText(QApplication::translate("MainWindow", "cursorStatsLabel", 0));
         multimeterGroup->setTitle(QApplication::translate("MainWindow", "Multimeter++", 0));
         multimeterModeSelect->clear();
         multimeterModeSelect->insertItems(0, QStringList()
@@ -1599,7 +1600,6 @@ public:
         multimeterResistanceLabel->setText(QApplication::translate("MainWindow", "Series Resistance", 0));
         multimeterModeLabel->setText(QApplication::translate("MainWindow", "Mode", 0));
         multimeterResistanceSelect->setSuffix(QApplication::translate("MainWindow", "\316\251", 0));
-        controller_fg->setText(QApplication::translate("MainWindow", "SALUTON MI ESTAS FUNCTION GENERATOR CONTROLLER", 0));
         signalGenGroup_CH1->setTitle(QApplication::translate("MainWindow", "Signal Gen CH1", 0));
         waveformLabel_CH1->setText(QApplication::translate("MainWindow", "Waveform", 0));
         frequencyLabel_CH1->setText(QApplication::translate("MainWindow", "Frequency", 0));