Seth/sethLabels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Minor UI cleanup (#313)

Browse Source 
* Adjust tab-order of widgets to follow a logical spatial order.  (#309)
* Remove default attribute from Print button in PrintView.  (#308)
This commit is contained in:
Jaye Evins
2026-02-18 11:38:38 -05:00
committed by GitHub
parent 6ad97b76dc
commit 226841fe38
13 changed files with 162 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glabels/ui/EditVariableDialog.ui
+9 -1
View File
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>469</width>
<height>297</height>
<height>310</height>
</rect>
</property>
<property name="windowTitle">
@@ -132,6 +132,14 @@
</slots>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>typeCombo</tabstop>
<tabstop>nameEdit</tabstop>
<tabstop>valueEdit</tabstop>
<tabstop>colorValueButton</tabstop>
<tabstop>incrementCombo</tabstop>
<tabstop>stepSizeEdit</tabstop>
</tabstops>
<resources/>
<connections>
<connection>
glabels/ui/ObjectEditor.ui
+64 -11
View File
@@ -56,7 +56,6 @@
<font>
<family>Sans Serif</family>
<pointsize>10</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@@ -70,7 +69,7 @@
<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">
@@ -106,7 +105,8 @@
<string/>
</property>
<property name="icon">
<iconset theme="glabels-align-text-left"/>
<iconset theme="glabels-align-text-left">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="iconSize">
<size>
@@ -131,7 +131,8 @@
<string/>
</property>
<property name="icon">
<iconset theme="glabels-align-text-center"/>
<iconset theme="glabels-align-text-center">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="iconSize">
<size>
@@ -153,7 +154,8 @@
<string/>
</property>
<property name="icon">
<iconset theme="glabels-align-text-right"/>
<iconset theme="glabels-align-text-right">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="iconSize">
<size>
@@ -182,7 +184,8 @@
<string/>
</property>
<property name="icon">
<iconset theme="glabels-valign-text-top"/>
<iconset theme="glabels-valign-text-top">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="iconSize">
<size>
@@ -207,7 +210,8 @@
<string/>
</property>
<property name="icon">
<iconset theme="glabels-valign-text-middle"/>
<iconset theme="glabels-valign-text-middle">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="iconSize">
<size>
@@ -229,7 +233,8 @@
<string/>
</property>
<property name="icon">
<iconset theme="glabels-valign-text-bottom"/>
<iconset theme="glabels-valign-text-bottom">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="iconSize">
<size>
@@ -382,7 +387,8 @@
<string/>
</property>
<property name="icon">
<iconset theme="glabels-format-text-bold"/>
<iconset theme="glabels-format-text-bold">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="iconSize">
<size>
@@ -404,7 +410,8 @@
<string/>
</property>
<property name="icon">
<iconset theme="glabels-format-text-italic"/>
<iconset theme="glabels-format-text-italic">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="iconSize">
<size>
@@ -423,7 +430,8 @@
<string/>
</property>
<property name="icon">
<iconset theme="glabels-format-text-underline"/>
<iconset theme="glabels-format-text-underline">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="iconSize">
<size>
@@ -1537,6 +1545,51 @@
</slots>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>notebook</tabstop>
<tabstop>textFontFamilyCombo</tabstop>
<tabstop>textFontSizeSpin</tabstop>
<tabstop>textFontBoldToggle</tabstop>
<tabstop>textFontItalicToggle</tabstop>
<tabstop>textFontUnderlineToggle</tabstop>
<tabstop>textColorButton</tabstop>
<tabstop>textHAlignLeftToggle</tabstop>
<tabstop>textHAlignCenterToggle</tabstop>
<tabstop>textHAlignRightToggle</tabstop>
<tabstop>textVAlignTopToggle</tabstop>
<tabstop>textVAlignMiddleToggle</tabstop>
<tabstop>textVAlignBottomToggle</tabstop>
<tabstop>textWrapModeCombo</tabstop>
<tabstop>textLineSpacingSpin</tabstop>
<tabstop>textAutoShrinkCheck</tabstop>
<tabstop>textEdit</tabstop>
<tabstop>textInsertFieldButton</tabstop>
<tabstop>barcodeStyleButton</tabstop>
<tabstop>barcodeShowTextCheck</tabstop>
<tabstop>barcodeChecksumCheck</tabstop>
<tabstop>barcodeColorButton</tabstop>
<tabstop>barcodeDataEdit</tabstop>
<tabstop>barcodeInsertFieldButton</tabstop>
<tabstop>imageFilenameLineEdit</tabstop>
<tabstop>imageBrowseButton</tabstop>
<tabstop>imageFieldButton</tabstop>
<tabstop>lineWidthSpin</tabstop>
<tabstop>lineColorButton</tabstop>
<tabstop>fillColorButton</tabstop>
<tabstop>posXSpin</tabstop>
<tabstop>posYSpin</tabstop>
<tabstop>sizeWSpin</tabstop>
<tabstop>sizeHSpin</tabstop>
<tabstop>sizeAspectCheck</tabstop>
<tabstop>sizeResetImageButton</tabstop>
<tabstop>sizeLineLengthSpin</tabstop>
<tabstop>sizeLineAngleSpin</tabstop>
<tabstop>shadowEnableCheck</tabstop>
<tabstop>shadowXSpin</tabstop>
<tabstop>shadowYSpin</tabstop>
<tabstop>shadowColorButton</tabstop>
<tabstop>shadowOpacitySpin</tabstop>
</tabstops>
<resources>
<include location="../icons.qrc"/>
</resources>
glabels/ui/PreferencesDialog.ui
+12 -1
View File
@@ -17,7 +17,7 @@
<item row="0" column="0">
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>0</number>
<number>1</number>
</property>
<widget class="QWidget" name="tab">
<attribute name="title">
@@ -195,6 +195,17 @@
</item>
</layout>
</widget>
<tabstops>
<tabstop>tabWidget</tabstop>
<tabstop>unitsInchesRadio</tabstop>
<tabstop>unitsMillimetersRadio</tabstop>
<tabstop>unitsCentimetersRadio</tabstop>
<tabstop>unitsPointsRadio</tabstop>
<tabstop>unitsPicasRadio</tabstop>
<tabstop>gridOriginTlRadio</tabstop>
<tabstop>gridOriginCenterRadio</tabstop>
<tabstop>gridSpacingSpin</tabstop>
</tabstops>
<resources/>
<connections>
<connection>
glabels/ui/PrintView.ui
+1 -1
View File
@@ -490,7 +490,7 @@
</size>
</property>
<property name="default">
<bool>true</bool>
<bool>false</bool>
</property>
</widget>
</item>
glabels/ui/PropertiesView.ui
+7
View File
@@ -434,6 +434,13 @@
<header>SimplePreview.hpp</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>changeProductButton</tabstop>
<tabstop>lengthSpin</tabstop>
<tabstop>orientationCombo</tabstop>
<tabstop>similarBrowser</tabstop>
<tabstop>preview</tabstop>
</tabstops>
<resources>
<include location="../icons.qrc"/>
</resources>
glabels/ui/ReportBugDialog.ui
+5
View File
@@ -218,6 +218,11 @@
</item>
</layout>
</widget>
<tabstops>
<tabstop>websiteButton</tabstop>
<tabstop>infoText</tabstop>
<tabstop>copyButton</tabstop>
</tabstops>
<resources>
<include location="../icons.qrc"/>
</resources>
glabels/ui/TemplateDesignerCdPage.ui
+8
View File
@@ -183,6 +183,14 @@
</item>
</layout>
</widget>
<tabstops>
<tabstop>r1Spin</tabstop>
<tabstop>r2Spin</tabstop>
<tabstop>xClipSpin</tabstop>
<tabstop>yClipSpin</tabstop>
<tabstop>wasteSpin</tabstop>
<tabstop>marginSpin</tabstop>
</tabstops>
<resources>
<include location="../images.qrc"/>
</resources>
glabels/ui/TemplateDesignerEllipsePage.ui
+6
View File
@@ -149,6 +149,12 @@
</item>
</layout>
</widget>
<tabstops>
<tabstop>wSpin</tabstop>
<tabstop>hSpin</tabstop>
<tabstop>wasteSpin</tabstop>
<tabstop>marginSpin</tabstop>
</tabstops>
<resources>
<include location="../images.qrc"/>
</resources>
glabels/ui/TemplateDesignerOneLayoutPage.ui
+7 -2
View File
@@ -132,7 +132,11 @@
<item row="0" column="1" rowspan="2">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="glabels::SimplePreview" name="preview"/>
<widget class="glabels::SimplePreview" name="preview">
<property name="interactive">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
@@ -161,7 +165,8 @@
<string>Print test sheet</string>
</property>
<property name="icon">
<iconset theme="glabels-print"/>
<iconset theme="glabels-print">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="iconSize">
<size>
glabels/ui/TemplateDesignerPageSizePage.ui
+6
View File
@@ -129,6 +129,12 @@
</item>
</layout>
</widget>
<tabstops>
<tabstop>pageSizeCombo</tabstop>
<tabstop>wSpin</tabstop>
<tabstop>hSpin</tabstop>
<tabstop>rollWSpin</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>
glabels/ui/TemplateDesignerRectPage.ui
+9
View File
@@ -187,6 +187,15 @@
</item>
</layout>
</widget>
<tabstops>
<tabstop>wSpin</tabstop>
<tabstop>hSpin</tabstop>
<tabstop>rSpin</tabstop>
<tabstop>xWasteSpin</tabstop>
<tabstop>yWasteSpin</tabstop>
<tabstop>xMarginSpin</tabstop>
<tabstop>yMarginSpin</tabstop>
</tabstops>
<resources>
<include location="../images.qrc"/>
</resources>
glabels/ui/TemplateDesignerRoundPage.ui
+5
View File
@@ -132,6 +132,11 @@
</item>
</layout>
</widget>
<tabstops>
<tabstop>rSpin</tabstop>
<tabstop>wasteSpin</tabstop>
<tabstop>marginSpin</tabstop>
</tabstops>
<resources>
<include location="../images.qrc"/>
</resources>
glabels/ui/TemplateDesignerTwoLayoutPage.ui
+23 -2
View File
@@ -170,7 +170,11 @@
<item row="0" column="1" rowspan="2">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="glabels::SimplePreview" name="preview"/>
<widget class="glabels::SimplePreview" name="preview">
<property name="interactive">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
@@ -199,7 +203,8 @@
<string>Print test sheet</string>
</property>
<property name="icon">
<iconset theme="glabels-print"/>
<iconset theme="glabels-print">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="iconSize">
<size>
@@ -248,6 +253,22 @@
<header>SimplePreview.hpp</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>nxSpin1</tabstop>
<tabstop>nySpin1</tabstop>
<tabstop>x0Spin1</tabstop>
<tabstop>y0Spin1</tabstop>
<tabstop>dxSpin1</tabstop>
<tabstop>dySpin1</tabstop>
<tabstop>nxSpin2</tabstop>
<tabstop>nySpin2</tabstop>
<tabstop>x0Spin2</tabstop>
<tabstop>y0Spin2</tabstop>
<tabstop>dxSpin2</tabstop>
<tabstop>dySpin2</tabstop>
<tabstop>preview</tabstop>
<tabstop>printButton</tabstop>
</tabstops>
<resources>
<include location="../icons.qrc"/>
</resources>