From 868530ab52908c695089c5be93171ac6f9f72132 Mon Sep 17 00:00:00 2001
From: NeoTheFox <soniczerops@gmail.com>
Date: Tue, 3 Mar 2015 18:02:59 +0300
Subject: [PATCH] Updated UI and added asymetric step selection

---
 aboutwindow.ui     |   9 +-
 graphics.qrc       |   3 +
 icons/g.png        | Bin 0 -> 604 bytes
 icons/sd.png       | Bin 0 -> 1301 bytes
 icons/settings.png | Bin 0 -> 699 bytes
 mainwindow.cpp     |  14 +
 mainwindow.h       |   4 +
 mainwindow.ui      | 639 +++++++++++++++++++++++++--------------------
 8 files changed, 374 insertions(+), 295 deletions(-)
 create mode 100644 icons/g.png
 create mode 100644 icons/sd.png
 create mode 100644 icons/settings.png

diff --git a/aboutwindow.ui b/aboutwindow.ui
index 9e1c1c8..064d63c 100644
--- a/aboutwindow.ui
+++ b/aboutwindow.ui
@@ -34,13 +34,12 @@
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;img src=&quot;:/icons/logo.png&quot; /&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;RepRaptor&lt;/span&gt; is a free and open source software for controlling RepRap and similar mashines. This software is distributed by terms of &lt;a href=&quot;https://www.gnu.org/licenses/gpl-2.0.html&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;GPL v2 licence.&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; text-decoration: underline; color:#0000ff;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;RepRaptor's main goal is to be as simple as possible and fast, yet functional. This software is being developed as a primary host software for &lt;span style=&quot; font-weight:600;&quot;&gt;MGTU MIREA&lt;/span&gt; university's 3D printing labratory by&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;mailto:repraptor-dev@repraptor.33mail.com&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Nickolay (aka &amp;quot;NeoTheFox&amp;quot;) Mardanov.&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;  RepRaptor&lt;/span&gt; is a free and open source software for controlling RepRap and similar mashines. This software is distributed by terms of &lt;a href=&quot;https://www.gnu.org/licenses/gpl-2.0.html&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;GPL v2 licence.&lt;/span&gt;&lt;/a&gt; Some graphical images (Fugue Icons) are distributed by terms of &lt;a href=&quot;https://creativecommons.org/licenses/by/3.0/deed.ru&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Creative Commons 3 licence&lt;/span&gt;&lt;/a&gt;.&lt;/p&gt;
+&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;  RepRaptor's main goal is to be as simple as possible and fast, yet functional. This software is being developed as a primary host software for &lt;span style=&quot; font-weight:600;&quot;&gt;MGTU MIREA&lt;/span&gt; university's 3D printing labratory by&lt;/p&gt;
+&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;mailto:repraptor-dev@repraptor.33mail.com&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Nickolay (aka &amp;quot;NeoTheFox&amp;quot;) Mardanov.&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;https://github.com/NeoTheFox/RepRaptor&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;GitHub&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://www.reprap.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;RepRap&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://www.reprap.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;RepRap wiki&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; text-decoration: underline; color:#0000ff;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; text-decoration: underline; color:#0000ff;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
diff --git a/graphics.qrc b/graphics.qrc
index 1cfb75b..d10ffa5 100644
--- a/graphics.qrc
+++ b/graphics.qrc
@@ -4,5 +4,8 @@
         <file>icons/logo.png</file>
         <file>icons/error_a.png</file>
         <file>icons/error_b.png</file>
+        <file>icons/g.png</file>
+        <file>icons/sd.png</file>
+        <file>icons/settings.png</file>
     </qresource>
 </RCC>
diff --git a/icons/g.png b/icons/g.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f943c5a9a6550e44960f2a5bbc40bb35ee3e4fb
GIT binary patch
literal 604
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7BuiW)N`mv#O3D+9QW+dm
z@{>{(JaZG%Q-e|yQz{EjrrIztF#hv&aSW-r)f2SQTRKtX|J`!&+Zjy(vo3I5TWR95
zwB+Rzk?DGKUxl!Xv;Sw>F2x~cRifn-E4pdtmTs>F0tE#x3MPwal>`U|>Sqb*&DgEK
z?|V`C&K0_~A3oLI`CYgF`|rKt$!VFKGHr=_mOj?}Cu_gu+V5N6FTO1Kke$vh7H{!F
zCQ@H4eErHB&#p+>T|Klb_jbhk5V0NNPxJpxn?0*3X`2G?*#%|MpLShsx}CG=V#b2F
z^{00RYOTGrJM)koziOmiW3$1GsEhfBOsW^z^2-TY_cc!~l5DN{_j-EKPv+2Rtq$Kg
zM4G2wc);hmFhIciWr@`7ZL!@V6@{#ZO}{-NI%7`eoo5owi|#m{E0pInqndM<*c7G}
zmk&M@?K68VSoW#d&2O{!f-12jmW52$KYo0E+cK_R=I8-s;aPiLC(KpT{PfRB!T3SW
z+^rWEney5BC1mIMcdZw5H~gc-Ia#F2kX!4Hb?TA?gUJF+(>w01dHVF6^n+Ou3$`n+
zyU(P(pnc^V=O_1U4}SkSKj?%XPqK!w0!!N&qqK*ge$42axleb){pp*NXVm=nu{zC@
zvB4@pFe+o-Jg2wes|)z}f97YiHg{O9Oi+7RcIf?|X@)(inkSp@-hGq0_M3v)S&jqF
zkGEv}nwEM}?1yf$#Oc_{IiFuWd7@-$_mA_x;H^@9iNlX~2qrM}%1Gpyy?TCvfq{X+
M)78&qol`;+05;(gegFUf

literal 0
HcmV?d00001

diff --git a/icons/sd.png b/icons/sd.png
new file mode 100644
index 0000000000000000000000000000000000000000..2615d959bf1509a8935abec337815500cfbbde4e
GIT binary patch
literal 1301
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7BuiW)N`mv#O3D+9QW+dm
z@{>{(JaZG%Q-e|yQz{EjrrIztFlT0lM3hAM`dB6B=jtVb)aX^@7BGN-jeSKyVsdtB
zi9%9pdS;%j()-=}l@u~lY?Z=IeGPmIoKrJ0J*tXQgRA^PlB=?lEmM^2?G$V(tSWK~
za#KqZ6)JLb@`|l0Y?Z*~TICg6frRyy6u?SKvTc<hj*9RNP;kyKN>wn`Gtf;oFf&jv
zGt@IQHZeCh*HJJsFf`CNFw!?P(ls=<GB&a@Fi?O3B|8P1qLehNAQv~NT}3Hrwn`Z#
zB?VUc`sL;2dgaD?`9<mahL)C=ATx}Nbc<5bbc-wVN)jt{^NN*WCb*;)Cl_TFlw{`T
zDS%8&Ov*1Uu~kxn8e5TD5R{poQBn*yJg*oUSjqXh`W1-<`i6Q2`bA(hApb!;o?GDS
zi(f}>E?jkSNl+@n@mS3-4yi0i)elN7&Mz%WP7O*;Q$}(iev3c~p?<LPO)SbzO|eyS
zOUx-w1xxt)TDjyWm*%GCm3X??Dplkb=%r+)SUH-RT9~=G8ksp7SQr|*xH*{`yEwWz
z8o3xc8XK6oIl}aM<`tJD<|U`X^kyRT8sgP!<y@4SSdw29lAoUgOAG-S`6c<q8TkbY
z&cVhC;hA|U`Q^o+c&Y#er<F@;QD#|cid#{Bt^zp7tTK^oFD(UG?QG~~<Z5ATY-Hl-
z;$~>*=;&nOY-((2;9_CwWa?zB1l5>=<Yll%XG<4j6H7BQ6Gvlb7Z*cACj$#dCnqOo
zH#b9bBSTX&C4D;u8+}mvKuRw#p&%DG5EGoVLCM@s0g-=F^HOY;ij?f_l&+urz`(%h
z<muuVQgLg^<c(fO90c0Ff19Lq)O1>sVtGX8GEap{uAP1&E&}gZ*93WaXntqd*YJbI
zu6-$c)znxm#RqAdKgv($?KZ!|$yc)><=@Zpyk})swypi)-y`s?hP|)+#r&$a4|6_y
z&U^lO*Sedh6gXU_r3$$}x>z^8&rNHoOK7N0YGl_Ujb|6;e$SDTNIqhAf+cpIWA#J6
zgGDo!y?p(<>aLW}wC18Eifh*v^LC`?`mElPwooSXj?~ZWu;kvY*L)8<?X>9YU$Fa8
z+6Bo6+aH;Uol^BQYJE2=`f<M_??v$=ITiCVE^xlIXr67rvwRz~-mw!e^_~~9b!&9-
ztzf=-chgOVqFVMfjsCmqqSqdIm~%`jpwDE9EYF<dCKH3Y+MgD^PX16EzaY)%PyYeA
z8|>d7eChB1z<Q^N--zQyS(@_hre!~W>K<UYk?`@@{Upcppn}TN)z4*}Q$iB}AMDXu

literal 0
HcmV?d00001

diff --git a/icons/settings.png b/icons/settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..89ab15f929bed603221d39049455a226270863df
GIT binary patch
literal 699
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7BuiW)N`mv#O3D+9QW+dm
z@{>{(JaZG%Q-e|yQz{EjrrIztFvWVhIEGZ*N=iAvWMXQ1P=am7j2SHwl9Fc|d^iQ_
zzrMP<yWz^_2M-e1#8P^dl$3a+q@)sl-QQoIV7S0dF)r@jg%>YY82I|?3Nte|8%@};
zbg62DTwcS54F)kE-rwJU;#m|6JA3QtlP4{iUhccTK0e>f)U;MjMMZ^o%5Q!%h7*Yf
z#>UA%K0oI-llMG*!eh4241>heox<wV8|Ub0XlU@3BtBRlzki>xriO+A!`!1EK0o(g
z^W*#b`*Zf!|9|M~<MYMP)U=aHDq+p4RY7*u-`;HVpKrHu<A%+fjcw}x&1sxDQ<8P_
zh7AoFZV3!V%)E&|K0P%)ye0E;*R!*;*H4>2|9$bFA0Lz7-`iWwJMGWM$L!1(EER4a
z_}9*=An=2MS77_5O+`;1K4g?SbtWMrL!<W9m6xAmV`FdI)%@7d*UHHL<NyEt`U2VI
zC0n+utEiamt@zl)tM!$)L!KdaJNJuU;W`#3zl)2Cq_%C}emy<?`IUl#f*8hKIm(-)
zCYT@0Wa)n9kT4~xw4~&!xTxsXn*aa)N(JO7>rLOZAd_#}#EDz;vtOUm)j9LF_V>59
ztYKl-zV0xo|NCodV`G0m|C|mL6&0sBb7Iow+SNYYzjf<b5lzjN0+p4OY@wl{Y=(x0
zY;zd09A<3ZeEX31^mqTZZ!Vs}?Q<$|(xgc|OiWBXEQ}W#3f$eVtD5K8{LasRzh%b!
z`Sx?VySp1R7((t8K0lYe;H=;2hJ|z4M1<Ir0t3D=BsnTPV^4}xc*d5*r;yg%CTnc5
zo{{+^`;5mqjf_7SW=!yF_#`Co-|_JNi!ba0O6wV!co<?{yl=lRTK$57fq}u()z4*}
HQ$iB}6kRs7

literal 0
HcmV?d00001

diff --git a/mainwindow.cpp b/mainwindow.cpp
index ba00fd7..288ce5f 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -689,3 +689,17 @@ void MainWindow::checkSDStatus()
 {
     if(sdWatcher.isFinished() && sdprinting) injectCommand("M27");
 }
+
+void MainWindow::on_stepspin_valueChanged(double arg1)
+{
+    if(arg1 < 1) ui->stepspin->setSingleStep(0.1);
+    else if(arg1 >=10) ui->stepspin->setSingleStep(10);
+    else if((int)arg1 >= 1) ui->stepspin->setSingleStep(1);
+}
+
+void MainWindow::on_estepspin_valueChanged(double arg1)
+{
+    if(arg1 < 1l) ui->estepspin->setSingleStep(0.1);
+    else if(arg1 >=10) ui->estepspin->setSingleStep(10);
+    else if((int)arg1 >= 1) ui->estepspin->setSingleStep(1);
+}
diff --git a/mainwindow.h b/mainwindow.h
index bd2a420..52c10cb 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -120,6 +120,10 @@ private slots:
     void checkSDStatus();
     void updateSDStatus();
 
+    void on_stepspin_valueChanged(double arg1);
+
+    void on_estepspin_valueChanged(double arg1);
+
 signals:
     void sdReady();
 };
diff --git a/mainwindow.ui b/mainwindow.ui
index e2427c7..438ce59 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -61,296 +61,6 @@
       </layout>
      </widget>
     </item>
-    <item row="0" column="1" rowspan="3">
-     <widget class="QGroupBox" name="controlBox">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="maximumSize">
-       <size>
-        <width>261</width>
-        <height>500</height>
-       </size>
-      </property>
-      <property name="title">
-       <string>Control</string>
-      </property>
-      <property name="checkable">
-       <bool>true</bool>
-      </property>
-      <layout class="QGridLayout" name="gridLayout_4">
-       <item row="0" column="8">
-        <widget class="QPushButton" name="homexbtn">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="text">
-          <string>H X</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="0">
-        <widget class="QPushButton" name="xminusbtn">
-         <property name="text">
-          <string>X-</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="8">
-        <widget class="QPushButton" name="homeybtn">
-         <property name="text">
-          <string>H Y</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="8">
-        <widget class="QPushButton" name="homezbtn">
-         <property name="text">
-          <string>H Z</string>
-         </property>
-        </widget>
-       </item>
-       <item row="5" column="0" colspan="4">
-        <widget class="QDoubleSpinBox" name="stepspin">
-         <property name="locale">
-          <locale language="English" country="UnitedStates"/>
-         </property>
-         <property name="minimum">
-          <double>0.100000000000000</double>
-         </property>
-         <property name="maximum">
-          <double>150.000000000000000</double>
-         </property>
-        </widget>
-       </item>
-       <item row="6" column="5" colspan="2">
-        <widget class="QPushButton" name="etmpset">
-         <property name="text">
-          <string>SET</string>
-         </property>
-        </widget>
-       </item>
-       <item row="6" column="0" colspan="2">
-        <widget class="QLabel" name="label_3">
-         <property name="text">
-          <string>E tmp</string>
-         </property>
-        </widget>
-       </item>
-       <item row="7" column="0" colspan="2">
-        <widget class="QLabel" name="label_4">
-         <property name="text">
-          <string>B tmp</string>
-         </property>
-        </widget>
-       </item>
-       <item row="7" column="5" colspan="2">
-        <widget class="QPushButton" name="btmpset">
-         <property name="text">
-          <string>SET</string>
-         </property>
-        </widget>
-       </item>
-       <item row="7" column="7" colspan="2">
-        <widget class="QPushButton" name="btmpoff">
-         <property name="text">
-          <string>OFF</string>
-         </property>
-        </widget>
-       </item>
-       <item row="8" column="2" colspan="3">
-        <widget class="QPushButton" name="fanonbtn">
-         <property name="text">
-          <string>FAN ON</string>
-         </property>
-        </widget>
-       </item>
-       <item row="8" column="6" colspan="3">
-        <widget class="QPushButton" name="fanoffbtn">
-         <property name="text">
-          <string>FAN OFF</string>
-         </property>
-        </widget>
-       </item>
-       <item row="9" column="2" colspan="3">
-        <widget class="QPushButton" name="atxonbtn">
-         <property name="text">
-          <string>ATX ON</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="6">
-        <widget class="QPushButton" name="eplusbtn">
-         <property name="text">
-          <string>E+</string>
-         </property>
-        </widget>
-       </item>
-       <item row="9" column="6" colspan="3">
-        <widget class="QPushButton" name="atxoffbtn">
-         <property name="text">
-          <string>ATX OFF</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="4">
-        <widget class="QPushButton" name="zplusbtn">
-         <property name="text">
-          <string>Z+</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="6">
-        <widget class="QPushButton" name="ezerobtn">
-         <property name="text">
-          <string>E0</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="1">
-        <widget class="QPushButton" name="centerbtn">
-         <property name="text">
-          <string>C</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="1">
-        <widget class="QPushButton" name="yplusbtn">
-         <property name="text">
-          <string>Y+</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="1">
-        <widget class="QPushButton" name="yminusbtn">
-         <property name="text">
-          <string>Y-</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="6">
-        <widget class="QPushButton" name="eminusbtn">
-         <property name="text">
-          <string>E-</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="4">
-        <widget class="QPushButton" name="zminusbtn">
-         <property name="text">
-          <string>Z-</string>
-         </property>
-        </widget>
-       </item>
-       <item row="6" column="2" colspan="3">
-        <widget class="QSpinBox" name="etmpspin">
-         <property name="maximum">
-          <number>500</number>
-         </property>
-        </widget>
-       </item>
-       <item row="7" column="2" colspan="3">
-        <widget class="QSpinBox" name="btmpspin">
-         <property name="maximum">
-          <number>500</number>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="0" colspan="4">
-        <widget class="QPushButton" name="homeallbtn">
-         <property name="text">
-          <string>Home All</string>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="4" colspan="5">
-        <widget class="QPushButton" name="releasebtn">
-         <property name="text">
-          <string>Release</string>
-         </property>
-        </widget>
-       </item>
-       <item row="5" column="4" colspan="5">
-        <widget class="QDoubleSpinBox" name="estepspin">
-         <property name="locale">
-          <locale language="English" country="UnitedStates"/>
-         </property>
-         <property name="minimum">
-          <double>0.100000000000000</double>
-         </property>
-         <property name="maximum">
-          <double>100.000000000000000</double>
-         </property>
-         <property name="value">
-          <double>1.000000000000000</double>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="2">
-        <widget class="QPushButton" name="xplusbtn">
-         <property name="text">
-          <string>X+</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</string>
-         </property>
-        </widget>
-       </item>
-       <item row="4" column="4" colspan="4">
-        <widget class="QLabel" name="label">
-         <property name="maximumSize">
-          <size>
-           <width>16777215</width>
-           <height>15</height>
-          </size>
-         </property>
-         <property name="text">
-          <string>E Step</string>
-         </property>
-        </widget>
-       </item>
-       <item row="10" column="2">
-        <spacer name="verticalSpacer">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::Expanding</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="6" column="7" colspan="2">
-        <widget class="QPushButton" name="etmpoff">
-         <property name="text">
-          <string>OFF</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-    </item>
     <item row="0" column="2" rowspan="3">
      <widget class="QGroupBox" name="consoleGroup">
       <property name="sizePolicy">
@@ -511,6 +221,299 @@
       </layout>
      </widget>
     </item>
+    <item row="0" column="1" rowspan="3">
+     <widget class="QGroupBox" name="controlBox">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="maximumSize">
+       <size>
+        <width>261</width>
+        <height>500</height>
+       </size>
+      </property>
+      <property name="title">
+       <string>Control</string>
+      </property>
+      <property name="checkable">
+       <bool>true</bool>
+      </property>
+      <layout class="QGridLayout" name="gridLayout_4">
+       <item row="0" column="8">
+        <widget class="QPushButton" name="homexbtn">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>H X</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0">
+        <widget class="QPushButton" name="xminusbtn">
+         <property name="text">
+          <string>X-</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="8">
+        <widget class="QPushButton" name="homeybtn">
+         <property name="text">
+          <string>H Y</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="8">
+        <widget class="QPushButton" name="homezbtn">
+         <property name="text">
+          <string>H Z</string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="0" colspan="4">
+        <widget class="QDoubleSpinBox" name="stepspin">
+         <property name="locale">
+          <locale language="English" country="UnitedStates"/>
+         </property>
+         <property name="minimum">
+          <double>0.100000000000000</double>
+         </property>
+         <property name="maximum">
+          <double>150.000000000000000</double>
+         </property>
+         <property name="value">
+          <double>1.000000000000000</double>
+         </property>
+        </widget>
+       </item>
+       <item row="7" column="0" colspan="2">
+        <widget class="QLabel" name="label_4">
+         <property name="text">
+          <string>B tmp</string>
+         </property>
+        </widget>
+       </item>
+       <item row="6" column="0" colspan="2">
+        <widget class="QLabel" name="label_3">
+         <property name="text">
+          <string>E tmp</string>
+         </property>
+        </widget>
+       </item>
+       <item row="6" column="5" colspan="2">
+        <widget class="QPushButton" name="etmpset">
+         <property name="text">
+          <string>SET</string>
+         </property>
+        </widget>
+       </item>
+       <item row="7" column="5" colspan="2">
+        <widget class="QPushButton" name="btmpset">
+         <property name="text">
+          <string>SET</string>
+         </property>
+        </widget>
+       </item>
+       <item row="7" column="7" colspan="2">
+        <widget class="QPushButton" name="btmpoff">
+         <property name="text">
+          <string>OFF</string>
+         </property>
+        </widget>
+       </item>
+       <item row="8" column="2" colspan="3">
+        <widget class="QPushButton" name="fanonbtn">
+         <property name="text">
+          <string>FAN ON</string>
+         </property>
+        </widget>
+       </item>
+       <item row="8" column="6" colspan="3">
+        <widget class="QPushButton" name="fanoffbtn">
+         <property name="text">
+          <string>FAN OFF</string>
+         </property>
+        </widget>
+       </item>
+       <item row="9" column="2" colspan="3">
+        <widget class="QPushButton" name="atxonbtn">
+         <property name="text">
+          <string>ATX ON</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="6">
+        <widget class="QPushButton" name="eplusbtn">
+         <property name="text">
+          <string>E+</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="4">
+        <widget class="QPushButton" name="zplusbtn">
+         <property name="text">
+          <string>Z+</string>
+         </property>
+        </widget>
+       </item>
+       <item row="9" column="6" colspan="3">
+        <widget class="QPushButton" name="atxoffbtn">
+         <property name="text">
+          <string>ATX OFF</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="6">
+        <widget class="QPushButton" name="ezerobtn">
+         <property name="text">
+          <string>E0</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="QPushButton" name="centerbtn">
+         <property name="text">
+          <string>C</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1">
+        <widget class="QPushButton" name="yplusbtn">
+         <property name="text">
+          <string>Y+</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="1">
+        <widget class="QPushButton" name="yminusbtn">
+         <property name="text">
+          <string>Y-</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="6">
+        <widget class="QPushButton" name="eminusbtn">
+         <property name="text">
+          <string>E-</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="4">
+        <widget class="QPushButton" name="zminusbtn">
+         <property name="text">
+          <string>Z-</string>
+         </property>
+        </widget>
+       </item>
+       <item row="6" column="2" colspan="3">
+        <widget class="QSpinBox" name="etmpspin">
+         <property name="maximum">
+          <number>500</number>
+         </property>
+        </widget>
+       </item>
+       <item row="7" column="2" colspan="3">
+        <widget class="QSpinBox" name="btmpspin">
+         <property name="maximum">
+          <number>500</number>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="0" colspan="4">
+        <widget class="QPushButton" name="homeallbtn">
+         <property name="text">
+          <string>Home All</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="4" colspan="5">
+        <widget class="QPushButton" name="releasebtn">
+         <property name="text">
+          <string>Release</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="2">
+        <widget class="QPushButton" name="xplusbtn">
+         <property name="text">
+          <string>X+</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</string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="4" colspan="5">
+        <widget class="QDoubleSpinBox" name="estepspin">
+         <property name="locale">
+          <locale language="English" country="UnitedStates"/>
+         </property>
+         <property name="minimum">
+          <double>0.100000000000000</double>
+         </property>
+         <property name="maximum">
+          <double>100.000000000000000</double>
+         </property>
+         <property name="value">
+          <double>1.000000000000000</double>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="4" colspan="4">
+        <widget class="QLabel" name="label">
+         <property name="maximumSize">
+          <size>
+           <width>16777215</width>
+           <height>15</height>
+          </size>
+         </property>
+         <property name="text">
+          <string>E Step</string>
+         </property>
+        </widget>
+       </item>
+       <item row="6" column="7" colspan="2">
+        <widget class="QPushButton" name="etmpoff">
+         <property name="text">
+          <string>OFF</string>
+         </property>
+        </widget>
+       </item>
+       <item row="10" column="2">
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::Expanding</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+    </item>
    </layout>
   </widget>
   <widget class="QMenuBar" name="menuBar">
@@ -553,7 +556,55 @@
    <addaction name="menuAbout"/>
   </widget>
   <widget class="QStatusBar" name="statusBar"/>
+  <widget class="QToolBar" name="toolBar">
+   <property name="minimumSize">
+    <size>
+     <width>0</width>
+     <height>0</height>
+    </size>
+   </property>
+   <property name="maximumSize">
+    <size>
+     <width>16777215</width>
+     <height>26</height>
+    </size>
+   </property>
+   <property name="windowTitle">
+    <string>Toolbar</string>
+   </property>
+   <property name="movable">
+    <bool>true</bool>
+   </property>
+   <property name="allowedAreas">
+    <set>Qt::AllToolBarAreas</set>
+   </property>
+   <property name="iconSize">
+    <size>
+     <width>16</width>
+     <height>16</height>
+    </size>
+   </property>
+   <property name="toolButtonStyle">
+    <enum>Qt::ToolButtonTextOnly</enum>
+   </property>
+   <property name="floatable">
+    <bool>true</bool>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+   <addaction name="actionOpen"/>
+   <addaction name="actionPrint_from_SD"/>
+   <addaction name="actionSettings"/>
+  </widget>
   <action name="actionOpen">
+   <property name="icon">
+    <iconset resource="graphics.qrc">
+     <normaloff>:/icons/g.png</normaloff>:/icons/g.png</iconset>
+   </property>
    <property name="text">
     <string>Open...</string>
    </property>
@@ -578,6 +629,10 @@
    </property>
   </action>
   <action name="actionSettings">
+   <property name="icon">
+    <iconset resource="graphics.qrc">
+     <normaloff>:/icons/settings.png</normaloff>:/icons/settings.png</iconset>
+   </property>
    <property name="text">
     <string>Settings</string>
    </property>
@@ -594,6 +649,10 @@
    <property name="enabled">
     <bool>true</bool>
    </property>
+   <property name="icon">
+    <iconset resource="graphics.qrc">
+     <normaloff>:/icons/sd.png</normaloff>:/icons/sd.png</iconset>
+   </property>
    <property name="text">
     <string>Print from SD...</string>
    </property>