From 00359f1c9d94cffc65ec283a8dabd11813d87312 Mon Sep 17 00:00:00 2001
From: Jim Evins <evins@snaught.com>
Date: Tue, 18 Aug 2015 01:31:19 -0400
Subject: [PATCH] Fleshed out object editor UI.

---
 glabels/icons.qrc                             |  12 +-
 .../actions/glabels-align-text-center.png     | Bin 0 -> 384 bytes
 .../24x24/actions/glabels-align-text-left.png | Bin 0 -> 398 bytes
 .../actions/glabels-align-text-right.png      | Bin 0 -> 375 bytes
 .../actions/glabels-format-text-bold.png      | Bin 0 -> 415 bytes
 .../actions/glabels-format-text-italic.png    | Bin 0 -> 393 bytes
 .../actions/glabels-format-text-underline.png | Bin 0 -> 379 bytes
 ...tom.png => glabels-valign-text-bottom.png} | Bin
 ...dle.png => glabels-valign-text-middle.png} | Bin
 ...xt-top.png => glabels-valign-text-top.png} | Bin
 glabels/ui/ObjectEditor.ui                    | 625 +++++++++++-------
 11 files changed, 386 insertions(+), 251 deletions(-)
 create mode 100644 glabels/icons/24x24/actions/glabels-align-text-center.png
 create mode 100644 glabels/icons/24x24/actions/glabels-align-text-left.png
 create mode 100644 glabels/icons/24x24/actions/glabels-align-text-right.png
 create mode 100644 glabels/icons/24x24/actions/glabels-format-text-bold.png
 create mode 100644 glabels/icons/24x24/actions/glabels-format-text-italic.png
 create mode 100644 glabels/icons/24x24/actions/glabels-format-text-underline.png
 rename glabels/icons/24x24/actions/{glabels-align-text-bottom.png => glabels-valign-text-bottom.png} (100%)
 rename glabels/icons/24x24/actions/{glabels-align-text-middle.png => glabels-valign-text-middle.png} (100%)
 rename glabels/icons/24x24/actions/{glabels-align-text-top.png => glabels-valign-text-top.png} (100%)

diff --git a/glabels/icons.qrc b/glabels/icons.qrc
index bf9b5ed..8e4b4be 100644
--- a/glabels/icons.qrc
+++ b/glabels/icons.qrc
@@ -28,20 +28,26 @@
 	<file>icons/16x16/actions/glabels-rotate-right.png</file>
 	<file>icons/16x16/actions/glabels-text.png</file>
 	<file>icons/16x16/apps/glabels.png</file>
-	<file>icons/24x24/actions/glabels-align-text-bottom.png</file>
-	<file>icons/24x24/actions/glabels-align-text-middle.png</file>
-	<file>icons/24x24/actions/glabels-align-text-top.png</file>
+	<file>icons/24x24/actions/glabels-align-text-center.png</file>
+	<file>icons/24x24/actions/glabels-align-text-left.png</file>
+	<file>icons/24x24/actions/glabels-align-text-right.png</file>
 	<file>icons/24x24/actions/glabels-arrow.png</file>
 	<file>icons/24x24/actions/glabels-barcode.png</file>
 	<file>icons/24x24/actions/glabels-box.png</file>
 	<file>icons/24x24/actions/glabels-bucket-fill.png</file>
 	<file>icons/24x24/actions/glabels-ellipse.png</file>
+	<file>icons/24x24/actions/glabels-format-text-bold.png</file>
+	<file>icons/24x24/actions/glabels-format-text-italic.png</file>
+	<file>icons/24x24/actions/glabels-format-text-underline.png</file>
 	<file>icons/24x24/actions/glabels-image.png</file>
 	<file>icons/24x24/actions/glabels-line.png</file>
 	<file>icons/24x24/actions/glabels-merge.png</file>
 	<file>icons/24x24/actions/glabels-object-properties.png</file>
 	<file>icons/24x24/actions/glabels-pencil.png</file>
 	<file>icons/24x24/actions/glabels-text.png</file>
+	<file>icons/24x24/actions/glabels-valign-text-bottom.png</file>
+	<file>icons/24x24/actions/glabels-valign-text-middle.png</file>
+	<file>icons/24x24/actions/glabels-valign-text-top.png</file>
 	<file>icons/24x24/actions/fallback-edit-copy.png</file>
 	<file>icons/24x24/actions/fallback-edit-cut.png</file>
 	<file>icons/24x24/actions/fallback-edit-paste.png</file>
diff --git a/glabels/icons/24x24/actions/glabels-align-text-center.png b/glabels/icons/24x24/actions/glabels-align-text-center.png
new file mode 100644
index 0000000000000000000000000000000000000000..21258160bdfef3eac3f5b43d7cadb2b27e2ba273
GIT binary patch
literal 384
zcmV-`0e}99P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0003;Nkl<ZcmeH|
z+e!ja7=?R^gcxb?RjStrA}Xwgu`T12hdh{v98)wkEmN7CM6LcZFzDr0wQr;tXr>{?
z3oq8?=7VqXue}7|Uo)qG1t4^y&{0r^ov@%xmI3P<YoN&(kIy3v#(n5U7wv8fjn*Y9
zwGy;a9+`X^iBt^Xm<px@@b$(rz~>Xm<5`BCc)bF-+riAc^8}bgKLOnP^!*iYpP5Vv
zPcI`39}M&dJ#_RNwAu~St|};1G@NT$q_YW}CL%bFD7*tn-p8JQ2V2{l-}*53?l6L|
zLhju`NDb1T-J9Hk=?&Zu?|5{hgWKLUn(aFGU#=EWDCTgMOCg?$A{<qrs0=cb;6K>q
z?tcY{ybI^<-5)z8#K`^*SqAVf`1aJBRlYwL<pT0r2I*`P@#M_E6gcGWZ39Gcm8`oL
eXz`=XFW>{1!39GB+F(Qg0000<MNUMnLSTYXGpmsR

literal 0
HcmV?d00001

diff --git a/glabels/icons/24x24/actions/glabels-align-text-left.png b/glabels/icons/24x24/actions/glabels-align-text-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..e38b02f5285ffcd97d4c5f3564dfab8165f9242d
GIT binary patch
literal 398
zcmV;90df9`P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00041Nkl<Zc-rli
z?@Gc@7{<GbgqTd`rBt^OL_`$Hma<kUY5vcdqN!=FX=`dT?O4(Zi^3~=((|D&1}YjF
z_~H3@_`&--@AEDJ_|q%^a|Do%MRMTcF>aiqKt=+rt*_#%`;O0U2X7xQXqyDhRvonm
z9a^OXrBpz!aEVkV0XY#xC>p@2&yD`OkpOl(M=X|Qj2kO!CG+9n@W;XA5u6V4s{^ys
z#%nLnCc)!V9Y&)9y;g>*6;V)f$Xun6NXa;t!w7_Z)WMNk?2Cqj-^0%CHa535sFwi%
z$JwZZX@p@`$P64vu8AB7E}jhCg9f=rvt^*(tfFe%L93{^DPJS6Wa<2q={REX2!atm
zynYW(JQ76735T#hun$vrz%UG%?H-8K!DRh2)WNN;(%va)O22#P-_PdLw0|y=F+}AM
s&VpV#@38?k8#}TCw%0$4i}rs2-|V~vIGA+kg8%>k07*qoM6N<$g8UD(-~a#s

literal 0
HcmV?d00001

diff --git a/glabels/icons/24x24/actions/glabels-align-text-right.png b/glabels/icons/24x24/actions/glabels-align-text-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..a740a6a53747db96333d44155880bad578ce1956
GIT binary patch
literal 375
zcmV--0f_#IP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0003#Nkl<ZcmeIx
z?MlK>90u^NA|VWiw^H3hgoydl(p>6nu6#+|YHE|k%B<DWwHi@GhYAe3xhL)8B05S%
z13x?;4-Y)Q|Cs^stC<%3^MZnyC%JqE<0i{<gsNb1X#qF4SFoKv%)WuHaSXkqLDibr
zZ_21i6%;EXwnQGAxipd+ETZuUM(?N!f<cD(e6tuge*YZ#dxOG`Fwx%B2BX~uZ!dTq
z=6OKy_;ioE2WMztp=V#fFuUlS>d<r*EmeW6)UaDCVY?)N7qZ|oDX_@|R%2n80ma@P
zFrdHx$qn51f9+VXogOZ&bDWtcANwC3wQ<mHV6P#eDwR<zix5N}8J<Hb%_6=QMK}`r
z{vR+5Lp)|ck-U&4KV|Txi_(%ID|J-suKl@nB-j`t(J)p*%byKs5(vx_ZyHPs-T?t|
V`R~5|F|+^x002ovPDHLkV1iXpqCNls

literal 0
HcmV?d00001

diff --git a/glabels/icons/24x24/actions/glabels-format-text-bold.png b/glabels/icons/24x24/actions/glabels-format-text-bold.png
new file mode 100644
index 0000000000000000000000000000000000000000..fef94440af2deda09f9616da38cc8bcc5a616bd6
GIT binary patch
literal 415
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaAtq$-BaRt)<!2rl$WMpJwVq#%o
zVP$1yV`Jmu;^OA!=HcPt<>lq)=NA?hmXMH;m6er~lT%VsQd3jY(9qD-)YQ__($Uc|
zGBUEWv$MCicXf3Q4GoQmh=_@aiI0y@N=iykPcJMiEGsLkuCA`HukYySm@r|&j2Sal
ztXQ#e<Ho&v_wL`n|G<F*Cr+F=dGh3$GiR<}zkcJ!ja#>FJ$m%$^XJb$e*F0T`!~>y
zE*@Wtfv#jO3GxeOICv=bZ=)}eyTH@MF{I+w-t+E4O#uR~fln6A5ODQb(J`a=+P(j$
zrd)ay{9uOh8|#XzQF$evS}PR1Pj`r%-6efT$W=_^T4YGX)-xUxJ^Z;|_Fk9B+2NH|
z!!9SIvM=83b>xHJ{{(Jrn127SrJ^G%=TGS`?lYxKmM2Q|Es$onJj}4|(?)jxR_h%G
z=UHNZB{T>&1||Io@$EmJ&my}!sm@g9`3gCoi(6y%Fy5Rey-qIu|3RQz89ZJ6T-G@y
GGywoJy{Do8

literal 0
HcmV?d00001

diff --git a/glabels/icons/24x24/actions/glabels-format-text-italic.png b/glabels/icons/24x24/actions/glabels-format-text-italic.png
new file mode 100644
index 0000000000000000000000000000000000000000..027220f459a3ed68421cffb3b736ce428015033b
GIT binary patch
literal 393
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaAEeh}naRt)<!2rl$WMpJwV&dlJ
z=HcPt=jRs`6ciE?5)~DdkdTm-l~q(!R8mq>Q&ZE_)YQ__GB7Z(wzjsjv-9@$4hjm2
zi;GK6PEJcp%gV~i$;l}xDXFZitgEZ5udi=zZk{x0(u^51X3m_sV8MdLix;n2wQ9$X
z9lLk$K62#9@#DuYU%q_v=FNNe?md0_^x3m#@87@w_U+rBKY#xH`v-KIqSzj7pyQZJ
zg8YIR4jzjA+vp4APWE(h45_%a_xyFfCI^Am#5>Kbfg2USvEA4`?|Z%J;@PRwTC(?@
z{%Jh3Cs@uka3iy`f42Mdn1>8*kG-sWn9i~v)7ka$<3)WQesRUMA74*Ut2a(?ow;1M
zBUnu0@TD5<%^%h*wz~Va{+fddH|K^0+ZdBLy&w4Ga@<kLX`Hou=ZhfAo4tHT?o{=E
k_tZD&JF{PRO7JZGzB!T$^@8QffzD&_boFyt=akR{05~zElK=n!

literal 0
HcmV?d00001

diff --git a/glabels/icons/24x24/actions/glabels-format-text-underline.png b/glabels/icons/24x24/actions/glabels-format-text-underline.png
new file mode 100644
index 0000000000000000000000000000000000000000..836acf21c434a3098a8c2336b8b8e451e2e10f20
GIT binary patch
literal 379
zcmV->0fhdEP)<h;3K|Lk000e1NJLTq000;O000;W0{{R3*Qw3Q0001!P)t-s00030
z|NsC0{{R300s;a90|N#I1_%fU3JMAi4h|9$5*HU2ARr(rDk>~2EG;c9Gcz+cH#bB?
zL`g|WS65eASy^9SUu9)wd3kw%e}996gNTTTlarH|mzSEFnx3AXr>Cd8ySu-?zrw=8
z!^6YJ$H&gj&ezx1+uPgS-QC~c-{$7#?Ck9K_xJnz`~Cg>|Ns9W|7?c<000AYQchC<
z!NOhrflUAa0F+5YK~#9!ozUkF!XOxh;mUDa>z;KL2d?V5|En{Rd|C*NiO)~okVA<6
zr1(*B0xy}RjhncD=pCha0j)C&;gDL(1eh^2es7}7;Im@H#T(DvWYB-B+aTv7d=&yW
zC<#MU_m98^6ST=t7z6Xn>Nw$43vVc{8lj*_-nOY&%P*?@>d9@PhDY;9FjJ4AZ2MGH
Z?gf_7AiT3%4zK_K002ovPDHLkV1mPtsgwW!

literal 0
HcmV?d00001

diff --git a/glabels/icons/24x24/actions/glabels-align-text-bottom.png b/glabels/icons/24x24/actions/glabels-valign-text-bottom.png
similarity index 100%
rename from glabels/icons/24x24/actions/glabels-align-text-bottom.png
rename to glabels/icons/24x24/actions/glabels-valign-text-bottom.png
diff --git a/glabels/icons/24x24/actions/glabels-align-text-middle.png b/glabels/icons/24x24/actions/glabels-valign-text-middle.png
similarity index 100%
rename from glabels/icons/24x24/actions/glabels-align-text-middle.png
rename to glabels/icons/24x24/actions/glabels-valign-text-middle.png
diff --git a/glabels/icons/24x24/actions/glabels-align-text-top.png b/glabels/icons/24x24/actions/glabels-valign-text-top.png
similarity index 100%
rename from glabels/icons/24x24/actions/glabels-align-text-top.png
rename to glabels/icons/24x24/actions/glabels-valign-text-top.png
diff --git a/glabels/ui/ObjectEditor.ui b/glabels/ui/ObjectEditor.ui
index f78a8cd..2f68777 100644
--- a/glabels/ui/ObjectEditor.ui
+++ b/glabels/ui/ObjectEditor.ui
@@ -70,13 +70,178 @@
    <item row="1" column="0">
     <widget class="QTabWidget" name="notebook">
      <property name="currentIndex">
-      <number>0</number>
+      <number>5</number>
      </property>
      <widget class="QWidget" name="textPage">
       <attribute name="title">
        <string>Text</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_15">
+       <item row="1" column="0">
+        <widget class="QGroupBox" name="groupBox_2">
+         <property name="title">
+          <string>Layout</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_2">
+          <item row="0" column="0">
+           <layout class="QFormLayout" name="formLayout_2">
+            <item row="0" column="0">
+             <widget class="QLabel" name="label_7">
+              <property name="text">
+               <string>Alignment:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="1">
+             <layout class="QHBoxLayout" name="horizontalLayout_2">
+              <item>
+               <widget class="QPushButton" name="textHAlignLeftToggle">
+                <property name="text">
+                 <string/>
+                </property>
+                <property name="icon">
+                 <iconset resource="../icons.qrc">
+                  <normaloff>:/icons/24x24/actions/glabels-align-text-left.png</normaloff>:/icons/24x24/actions/glabels-align-text-left.png</iconset>
+                </property>
+                <property name="checkable">
+                 <bool>true</bool>
+                </property>
+                <property name="flat">
+                 <bool>false</bool>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QPushButton" name="textHAlignCenterToggle">
+                <property name="text">
+                 <string/>
+                </property>
+                <property name="icon">
+                 <iconset resource="../icons.qrc">
+                  <normaloff>:/icons/24x24/actions/glabels-align-text-center.png</normaloff>:/icons/24x24/actions/glabels-align-text-center.png</iconset>
+                </property>
+                <property name="checkable">
+                 <bool>true</bool>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QPushButton" name="textHAlignRightToggle">
+                <property name="text">
+                 <string/>
+                </property>
+                <property name="icon">
+                 <iconset resource="../icons.qrc">
+                  <normaloff>:/icons/24x24/actions/glabels-align-text-right.png</normaloff>:/icons/24x24/actions/glabels-align-text-right.png</iconset>
+                </property>
+                <property name="checkable">
+                 <bool>true</bool>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+            <item row="1" column="0">
+             <widget class="QLabel" name="label_8">
+              <property name="text">
+               <string/>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="1">
+             <layout class="QHBoxLayout" name="horizontalLayout_3">
+              <item>
+               <widget class="QPushButton" name="textVAlignTopToggle">
+                <property name="text">
+                 <string/>
+                </property>
+                <property name="icon">
+                 <iconset resource="../icons.qrc">
+                  <normaloff>:/icons/24x24/actions/glabels-valign-text-top.png</normaloff>:/icons/24x24/actions/glabels-valign-text-top.png</iconset>
+                </property>
+                <property name="checkable">
+                 <bool>true</bool>
+                </property>
+                <property name="flat">
+                 <bool>false</bool>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QPushButton" name="textVAlignMiddleToggle">
+                <property name="text">
+                 <string/>
+                </property>
+                <property name="icon">
+                 <iconset resource="../icons.qrc">
+                  <normaloff>:/icons/24x24/actions/glabels-valign-text-middle.png</normaloff>:/icons/24x24/actions/glabels-valign-text-middle.png</iconset>
+                </property>
+                <property name="checkable">
+                 <bool>true</bool>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QPushButton" name="textVAlignBottomToggle">
+                <property name="text">
+                 <string/>
+                </property>
+                <property name="icon">
+                 <iconset resource="../icons.qrc">
+                  <normaloff>:/icons/24x24/actions/glabels-valign-text-bottom.png</normaloff>:/icons/24x24/actions/glabels-valign-text-bottom.png</iconset>
+                </property>
+                <property name="checkable">
+                 <bool>true</bool>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+            <item row="2" column="0">
+             <widget class="QLabel" name="label_9">
+              <property name="text">
+               <string>Line spacing:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="1">
+             <layout class="QHBoxLayout" name="horizontalLayout_19">
+              <item>
+               <widget class="QDoubleSpinBox" name="textLineSpacingSpin"/>
+              </item>
+              <item>
+               <spacer name="horizontalSpacer_16">
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>40</width>
+                  <height>20</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
+             </layout>
+            </item>
+           </layout>
+          </item>
+          <item row="0" column="1">
+           <spacer name="horizontalSpacer_5">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </widget>
+       </item>
        <item row="0" column="0">
         <widget class="QGroupBox" name="groupBox">
          <property name="title">
@@ -88,6 +253,9 @@
          <layout class="QGridLayout" name="gridLayout">
           <item row="0" column="0">
            <layout class="QFormLayout" name="formLayout">
+            <property name="fieldGrowthPolicy">
+             <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+            </property>
             <item row="0" column="0">
              <widget class="QLabel" name="label_3">
               <property name="text">
@@ -95,6 +263,9 @@
               </property>
              </widget>
             </item>
+            <item row="0" column="1">
+             <widget class="QFontComboBox" name="textFontFamilyCombo"/>
+            </item>
             <item row="1" column="0">
              <widget class="QLabel" name="label_4">
               <property name="text">
@@ -102,9 +273,6 @@
               </property>
              </widget>
             </item>
-            <item row="1" column="1">
-             <widget class="QDoubleSpinBox" name="doubleSpinBox"/>
-            </item>
             <item row="2" column="0">
              <widget class="QLabel" name="label_5">
               <property name="text">
@@ -115,13 +283,13 @@
             <item row="2" column="1">
              <layout class="QHBoxLayout" name="horizontalLayout">
               <item>
-               <widget class="QPushButton" name="pushButton">
+               <widget class="QPushButton" name="textFontBoldToggle">
                 <property name="text">
                  <string/>
                 </property>
                 <property name="icon">
                  <iconset resource="../icons.qrc">
-                  <normaloff>:/icons/24x24/actions/glabels-text.png</normaloff>:/icons/24x24/actions/glabels-text.png</iconset>
+                  <normaloff>:/icons/24x24/actions/glabels-format-text-bold.png</normaloff>:/icons/24x24/actions/glabels-format-text-bold.png</iconset>
                 </property>
                 <property name="checkable">
                  <bool>true</bool>
@@ -132,13 +300,13 @@
                </widget>
               </item>
               <item>
-               <widget class="QPushButton" name="pushButton_2">
+               <widget class="QPushButton" name="textFontItalicToggle">
                 <property name="text">
                  <string/>
                 </property>
                 <property name="icon">
                  <iconset resource="../icons.qrc">
-                  <normaloff>:/icons/24x24/actions/glabels-text.png</normaloff>:/icons/24x24/actions/glabels-text.png</iconset>
+                  <normaloff>:/icons/24x24/actions/glabels-format-text-italic.png</normaloff>:/icons/24x24/actions/glabels-format-text-italic.png</iconset>
                 </property>
                 <property name="checkable">
                  <bool>true</bool>
@@ -146,19 +314,32 @@
                </widget>
               </item>
               <item>
-               <widget class="QPushButton" name="pushButton_3">
+               <widget class="QPushButton" name="textFontUnderlineToggle">
                 <property name="text">
                  <string/>
                 </property>
                 <property name="icon">
                  <iconset resource="../icons.qrc">
-                  <normaloff>:/icons/24x24/actions/glabels-text.png</normaloff>:/icons/24x24/actions/glabels-text.png</iconset>
+                  <normaloff>:/icons/24x24/actions/glabels-format-text-underline.png</normaloff>:/icons/24x24/actions/glabels-format-text-underline.png</iconset>
                 </property>
                 <property name="checkable">
                  <bool>true</bool>
                 </property>
                </widget>
               </item>
+              <item>
+               <spacer name="horizontalSpacer_20">
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>40</width>
+                  <height>20</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
              </layout>
             </item>
             <item row="3" column="0">
@@ -168,15 +349,49 @@
               </property>
              </widget>
             </item>
-            <item row="3" column="1">
-             <widget class="glabels::ColorButton" name="pushButton_4">
-              <property name="text">
-               <string/>
-              </property>
-             </widget>
+            <item row="1" column="1">
+             <layout class="QHBoxLayout" name="horizontalLayout_18">
+              <item>
+               <widget class="QDoubleSpinBox" name="textFontSizeSpin"/>
+              </item>
+              <item>
+               <spacer name="horizontalSpacer_15">
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>40</width>
+                  <height>20</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
+             </layout>
             </item>
-            <item row="0" column="1">
-             <widget class="QFontComboBox" name="fontComboBox"/>
+            <item row="3" column="1">
+             <layout class="QHBoxLayout" name="horizontalLayout_23">
+              <item>
+               <widget class="glabels::ColorButton" name="textColorButton">
+                <property name="text">
+                 <string/>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <spacer name="horizontalSpacer_19">
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>40</width>
+                  <height>20</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
+             </layout>
             </item>
            </layout>
           </item>
@@ -196,153 +411,18 @@
          </layout>
         </widget>
        </item>
-       <item row="1" column="0">
-        <widget class="QGroupBox" name="groupBox_2">
-         <property name="title">
-          <string>Layout</string>
+       <item row="3" column="0">
+        <spacer name="verticalSpacer_5">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
          </property>
-         <layout class="QGridLayout" name="gridLayout_2">
-          <item row="0" column="0">
-           <layout class="QFormLayout" name="formLayout_2">
-            <item row="0" column="0">
-             <widget class="QLabel" name="label_7">
-              <property name="text">
-               <string>Alignment:</string>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="1">
-             <layout class="QHBoxLayout" name="horizontalLayout_2">
-              <item>
-               <widget class="QPushButton" name="pushButton_6">
-                <property name="text">
-                 <string/>
-                </property>
-                <property name="icon">
-                 <iconset resource="../icons.qrc">
-                  <normaloff>:/icons/24x24/actions/glabels-text.png</normaloff>:/icons/24x24/actions/glabels-text.png</iconset>
-                </property>
-                <property name="checkable">
-                 <bool>true</bool>
-                </property>
-                <property name="flat">
-                 <bool>false</bool>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QPushButton" name="pushButton_7">
-                <property name="text">
-                 <string/>
-                </property>
-                <property name="icon">
-                 <iconset resource="../icons.qrc">
-                  <normaloff>:/icons/24x24/actions/glabels-text.png</normaloff>:/icons/24x24/actions/glabels-text.png</iconset>
-                </property>
-                <property name="checkable">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QPushButton" name="pushButton_8">
-                <property name="text">
-                 <string/>
-                </property>
-                <property name="icon">
-                 <iconset resource="../icons.qrc">
-                  <normaloff>:/icons/24x24/actions/glabels-text.png</normaloff>:/icons/24x24/actions/glabels-text.png</iconset>
-                </property>
-                <property name="checkable">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </item>
-            <item row="1" column="0">
-             <widget class="QLabel" name="label_8">
-              <property name="text">
-               <string/>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="1">
-             <layout class="QHBoxLayout" name="horizontalLayout_3">
-              <item>
-               <widget class="QPushButton" name="pushButton_9">
-                <property name="text">
-                 <string/>
-                </property>
-                <property name="icon">
-                 <iconset resource="../icons.qrc">
-                  <normaloff>:/icons/24x24/actions/glabels-align-text-bottom.png</normaloff>:/icons/24x24/actions/glabels-align-text-bottom.png</iconset>
-                </property>
-                <property name="checkable">
-                 <bool>true</bool>
-                </property>
-                <property name="flat">
-                 <bool>false</bool>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QPushButton" name="pushButton_10">
-                <property name="text">
-                 <string/>
-                </property>
-                <property name="icon">
-                 <iconset resource="../icons.qrc">
-                  <normaloff>:/icons/24x24/actions/glabels-align-text-middle.png</normaloff>:/icons/24x24/actions/glabels-align-text-middle.png</iconset>
-                </property>
-                <property name="checkable">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QPushButton" name="pushButton_11">
-                <property name="text">
-                 <string/>
-                </property>
-                <property name="icon">
-                 <iconset resource="../icons.qrc">
-                  <normaloff>:/icons/24x24/actions/glabels-align-text-top.png</normaloff>:/icons/24x24/actions/glabels-align-text-top.png</iconset>
-                </property>
-                <property name="checkable">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </item>
-            <item row="2" column="0">
-             <widget class="QLabel" name="label_9">
-              <property name="text">
-               <string>Line spacing:</string>
-              </property>
-             </widget>
-            </item>
-            <item row="2" column="1">
-             <widget class="QDoubleSpinBox" name="doubleSpinBox_2"/>
-            </item>
-           </layout>
-          </item>
-          <item row="0" column="1">
-           <spacer name="horizontalSpacer_5">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>40</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-         </layout>
-        </widget>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>150</height>
+          </size>
+         </property>
+        </spacer>
        </item>
        <item row="2" column="0">
         <widget class="QGroupBox" name="groupBox_3">
@@ -371,7 +451,7 @@
                </spacer>
               </item>
               <item>
-               <widget class="glabels::FieldButton" name="pushButton_12">
+               <widget class="glabels::FieldButton" name="textInsertFieldButton">
                 <property name="text">
                  <string/>
                 </property>
@@ -397,19 +477,6 @@
          </layout>
         </widget>
        </item>
-       <item row="3" column="0">
-        <spacer name="verticalSpacer_5">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>156</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="barcodePage">
@@ -417,6 +484,19 @@
        <string>Barcode</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_14">
+       <item row="2" column="0">
+        <spacer name="verticalSpacer_4">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>356</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
        <item row="0" column="0">
         <widget class="QGroupBox" name="groupBox_7">
          <property name="title">
@@ -433,17 +513,17 @@
              </widget>
             </item>
             <item row="0" column="1">
-             <widget class="QComboBox" name="comboBox"/>
+             <widget class="QComboBox" name="barcodeTypeCombo"/>
             </item>
             <item row="1" column="1">
-             <widget class="QCheckBox" name="checkBox">
+             <widget class="QCheckBox" name="barcodeShowTextCheck">
               <property name="text">
                <string>Show text</string>
               </property>
              </widget>
             </item>
             <item row="2" column="1">
-             <widget class="QCheckBox" name="checkBox_2">
+             <widget class="QCheckBox" name="barcodeChecksumCheck">
               <property name="text">
                <string>Checksum</string>
               </property>
@@ -457,11 +537,28 @@
              </widget>
             </item>
             <item row="3" column="1">
-             <widget class="glabels::ColorButton" name="pushButton_5">
-              <property name="text">
-               <string/>
-              </property>
-             </widget>
+             <layout class="QHBoxLayout" name="horizontalLayout_22">
+              <item>
+               <widget class="glabels::ColorButton" name="barcodeColorButton">
+                <property name="text">
+                 <string/>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <spacer name="horizontalSpacer_18">
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>40</width>
+                  <height>20</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
+             </layout>
             </item>
            </layout>
           </item>
@@ -492,7 +589,7 @@
             <item row="0" column="0">
              <layout class="QVBoxLayout" name="verticalLayout_2">
               <item>
-               <widget class="QRadioButton" name="radioButton">
+               <widget class="QRadioButton" name="barcodeLiteralRadio">
                 <property name="sizePolicy">
                  <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
                   <horstretch>0</horstretch>
@@ -526,7 +623,7 @@
              </layout>
             </item>
             <item row="0" column="1">
-             <widget class="QPlainTextEdit" name="plainTextEdit">
+             <widget class="QPlainTextEdit" name="barcodeTextEdit">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
                 <horstretch>0</horstretch>
@@ -544,7 +641,7 @@
             <item row="1" column="0">
              <layout class="QVBoxLayout" name="verticalLayout_4">
               <item>
-               <widget class="QRadioButton" name="radioButton_2">
+               <widget class="QRadioButton" name="barcodeKeyRadio">
                 <property name="sizePolicy">
                  <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
                   <horstretch>0</horstretch>
@@ -582,7 +679,7 @@
               <item>
                <layout class="QHBoxLayout" name="horizontalLayout_16">
                 <item>
-                 <widget class="glabels::FieldButton" name="pushButton_16">
+                 <widget class="glabels::FieldButton" name="barcodeFieldButton">
                   <property name="text">
                    <string/>
                   </property>
@@ -613,9 +710,9 @@
                  </widget>
                 </item>
                 <item row="0" column="1">
-                 <widget class="QLabel" name="label_22">
+                 <widget class="QLabel" name="barcodeFormatLabel">
                   <property name="text">
-                   <string>TextLabel</string>
+                   <string>0000000000</string>
                   </property>
                  </widget>
                 </item>
@@ -629,7 +726,7 @@
                 <item row="1" column="1">
                  <layout class="QHBoxLayout" name="horizontalLayout_15">
                   <item>
-                   <widget class="QSpinBox" name="spinBox_2"/>
+                   <widget class="QSpinBox" name="barcodeDigitsSpin"/>
                   </item>
                   <item>
                    <spacer name="horizontalSpacer_12">
@@ -655,19 +752,6 @@
          </layout>
         </widget>
        </item>
-       <item row="2" column="0">
-        <spacer name="verticalSpacer_4">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>356</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="imagePage">
@@ -697,7 +781,7 @@
           <item row="0" column="0">
            <layout class="QFormLayout" name="formLayout_8">
             <item row="0" column="0">
-             <widget class="QRadioButton" name="radioButton_3">
+             <widget class="QRadioButton" name="imageFileRadio">
               <property name="text">
                <string>File:</string>
               </property>
@@ -711,14 +795,14 @@
              </widget>
             </item>
             <item row="1" column="0">
-             <widget class="QRadioButton" name="radioButton_4">
+             <widget class="QRadioButton" name="imageKeyRadio">
               <property name="text">
                <string>Key:</string>
               </property>
              </widget>
             </item>
             <item row="1" column="1">
-             <widget class="glabels::FieldButton" name="pushButton_18">
+             <widget class="glabels::FieldButton" name="imageFieldButton">
               <property name="text">
                <string/>
               </property>
@@ -769,9 +853,6 @@
                 </property>
                </widget>
               </item>
-              <item row="0" column="1">
-               <widget class="QDoubleSpinBox" name="doubleSpinBox_3"/>
-              </item>
               <item row="1" column="0">
                <widget class="QLabel" name="label_11">
                 <property name="text">
@@ -779,12 +860,43 @@
                 </property>
                </widget>
               </item>
+              <item row="0" column="1">
+               <layout class="QHBoxLayout" name="horizontalLayout_20">
+                <item>
+                 <widget class="QDoubleSpinBox" name="lineWidthSpin"/>
+                </item>
+                <item>
+                 <widget class="QLabel" name="label_22">
+                  <property name="text">
+                   <string>points</string>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </item>
               <item row="1" column="1">
-               <widget class="glabels::ColorButton" name="pushButton_13">
-                <property name="text">
-                 <string/>
-                </property>
-               </widget>
+               <layout class="QHBoxLayout" name="horizontalLayout_21">
+                <item>
+                 <widget class="glabels::ColorButton" name="lineColorButton">
+                  <property name="text">
+                   <string/>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <spacer name="horizontalSpacer_17">
+                  <property name="orientation">
+                   <enum>Qt::Horizontal</enum>
+                  </property>
+                  <property name="sizeHint" stdset="0">
+                   <size>
+                    <width>40</width>
+                    <height>20</height>
+                   </size>
+                  </property>
+                 </spacer>
+                </item>
+               </layout>
               </item>
              </layout>
             </item>
@@ -820,7 +932,7 @@
                </widget>
               </item>
               <item row="0" column="1">
-               <widget class="glabels::ColorButton" name="pushButton_14">
+               <widget class="glabels::ColorButton" name="fillColorButton">
                 <property name="text">
                  <string/>
                 </property>
@@ -854,7 +966,7 @@
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
-           <height>582</height>
+           <height>578</height>
           </size>
          </property>
         </spacer>
@@ -884,10 +996,10 @@
             <item row="0" column="1">
              <layout class="QHBoxLayout" name="horizontalLayout_9">
               <item>
-               <widget class="QDoubleSpinBox" name="doubleSpinBox_6"/>
+               <widget class="QDoubleSpinBox" name="posXSpin"/>
               </item>
               <item>
-               <widget class="QLabel" name="label_27">
+               <widget class="QLabel" name="posXUnitsLabel">
                 <property name="text">
                  <string>inches</string>
                 </property>
@@ -905,10 +1017,10 @@
             <item row="1" column="1">
              <layout class="QHBoxLayout" name="horizontalLayout_10">
               <item>
-               <widget class="QDoubleSpinBox" name="doubleSpinBox_7"/>
+               <widget class="QDoubleSpinBox" name="posYSpin"/>
               </item>
               <item>
-               <widget class="QLabel" name="label_28">
+               <widget class="QLabel" name="posYUnitsLabel">
                 <property name="text">
                  <string>inches</string>
                 </property>
@@ -935,7 +1047,7 @@
         </widget>
        </item>
        <item row="1" column="0">
-        <widget class="QGroupBox" name="groupBox_11">
+        <widget class="QGroupBox" name="sizeRectFrame">
          <property name="title">
           <string>Size</string>
          </property>
@@ -952,10 +1064,10 @@
             <item row="0" column="1">
              <layout class="QHBoxLayout" name="horizontalLayout_11">
               <item>
-               <widget class="QDoubleSpinBox" name="doubleSpinBox_8"/>
+               <widget class="QDoubleSpinBox" name="sizeWSpin"/>
               </item>
               <item>
-               <widget class="QLabel" name="label_31">
+               <widget class="QLabel" name="sizeWUnitsLabel">
                 <property name="text">
                  <string>inches</string>
                 </property>
@@ -973,10 +1085,10 @@
             <item row="1" column="1">
              <layout class="QHBoxLayout" name="horizontalLayout_12">
               <item>
-               <widget class="QDoubleSpinBox" name="doubleSpinBox_9"/>
+               <widget class="QDoubleSpinBox" name="sizeHSpin"/>
               </item>
               <item>
-               <widget class="QLabel" name="label_32">
+               <widget class="QLabel" name="sizeHUnitsLabel">
                 <property name="text">
                  <string>inches</string>
                 </property>
@@ -987,14 +1099,14 @@
             <item row="2" column="1">
              <layout class="QVBoxLayout" name="verticalLayout_6">
               <item>
-               <widget class="QCheckBox" name="checkBox_3">
+               <widget class="QCheckBox" name="sizeAspectCheck">
                 <property name="text">
                  <string>Lock aspect ratio</string>
                 </property>
                </widget>
               </item>
               <item>
-               <widget class="QPushButton" name="pushButton_19">
+               <widget class="QPushButton" name="sizeResetImageButton">
                 <property name="text">
                  <string>Reset image size</string>
                 </property>
@@ -1021,7 +1133,7 @@
         </widget>
        </item>
        <item row="2" column="0">
-        <widget class="QGroupBox" name="groupBox_12">
+        <widget class="QGroupBox" name="sizeLineFrame">
          <property name="title">
           <string>Size</string>
          </property>
@@ -1038,10 +1150,10 @@
             <item row="0" column="1">
              <layout class="QHBoxLayout" name="horizontalLayout_13">
               <item>
-               <widget class="QDoubleSpinBox" name="doubleSpinBox_10"/>
+               <widget class="QDoubleSpinBox" name="sizeLineLengthSpin"/>
               </item>
               <item>
-               <widget class="QLabel" name="label_34">
+               <widget class="QLabel" name="sizeLineLengthUnitsLabel">
                 <property name="text">
                  <string>inches</string>
                 </property>
@@ -1059,7 +1171,7 @@
             <item row="1" column="1">
              <layout class="QHBoxLayout" name="horizontalLayout_14">
               <item>
-               <widget class="QDoubleSpinBox" name="doubleSpinBox_11"/>
+               <widget class="QDoubleSpinBox" name="sizeLineAngleSpin"/>
               </item>
               <item>
                <widget class="QLabel" name="label_36">
@@ -1109,7 +1221,7 @@
       </attribute>
       <layout class="QGridLayout" name="gridLayout_17">
        <item row="0" column="0">
-        <widget class="QGroupBox" name="groupBox_6">
+        <widget class="QGroupBox" name="shadowEnableCheck">
          <property name="title">
           <string>Shadow</string>
          </property>
@@ -1132,10 +1244,10 @@
             <item row="0" column="1">
              <layout class="QHBoxLayout" name="horizontalLayout_6">
               <item>
-               <widget class="QDoubleSpinBox" name="doubleSpinBox_4"/>
+               <widget class="QDoubleSpinBox" name="shadowXSpin"/>
               </item>
               <item>
-               <widget class="QLabel" name="label_17">
+               <widget class="QLabel" name="shadowXUnitsLabel">
                 <property name="text">
                  <string>inches</string>
                 </property>
@@ -1153,10 +1265,10 @@
             <item row="1" column="1">
              <layout class="QHBoxLayout" name="horizontalLayout_7">
               <item>
-               <widget class="QDoubleSpinBox" name="doubleSpinBox_5"/>
+               <widget class="QDoubleSpinBox" name="shadowYSpin"/>
               </item>
               <item>
-               <widget class="QLabel" name="label_18">
+               <widget class="QLabel" name="shadowYUnitsLabel">
                 <property name="text">
                  <string>inches</string>
                 </property>
@@ -1171,13 +1283,6 @@
               </property>
              </widget>
             </item>
-            <item row="2" column="1">
-             <widget class="glabels::ColorButton" name="pushButton_15">
-              <property name="text">
-               <string/>
-              </property>
-             </widget>
-            </item>
             <item row="3" column="0">
              <widget class="QLabel" name="label_16">
               <property name="text">
@@ -1188,7 +1293,7 @@
             <item row="3" column="1">
              <layout class="QHBoxLayout" name="horizontalLayout_8">
               <item>
-               <widget class="QSpinBox" name="spinBox"/>
+               <widget class="QSpinBox" name="shadowOpacitySpin"/>
               </item>
               <item>
                <widget class="QLabel" name="label_19">
@@ -1199,6 +1304,30 @@
               </item>
              </layout>
             </item>
+            <item row="2" column="1">
+             <layout class="QHBoxLayout" name="horizontalLayout_24">
+              <item>
+               <widget class="glabels::ColorButton" name="shadowColorButton">
+                <property name="text">
+                 <string/>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <spacer name="horizontalSpacer_21">
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>40</width>
+                  <height>20</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
+             </layout>
+            </item>
            </layout>
           </item>
           <item row="0" column="1">
@@ -1225,7 +1354,7 @@
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
-           <height>585</height>
+           <height>583</height>
           </size>
          </property>
         </spacer>