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

Reconcile style accross all source files.

Browse Source 
- All glabels code is in "glabels" top-level namespace.
- Other assorted cleanup.
This commit is contained in:
Jim Evins
2017-01-15 22:58:53 -05:00
parent 44aa31d074
commit b797d13e40
153 changed files with 17673 additions and 16841 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glabels/ui/ObjectEditor.ui
+20 -17
View File
@@ -35,7 +35,7 @@
<item row="1" column="0">
<widget class="QTabWidget" name="notebook">
<property name="currentIndex">
<number>4</number>
<number>5</number>
</property>
<widget class="QWidget" name="textPage">
<attribute name="title">
@@ -372,7 +372,7 @@
<item row="3" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_23">
<item>
<widget class="ColorButton" name="textColorButton">
<widget class="glabels::ColorButton" name="textColorButton">
<property name="text">
<string/>
</property>
@@ -451,7 +451,7 @@
</spacer>
</item>
<item>
<widget class="FieldButton" name="textInsertFieldCombo"/>
<widget class="glabels::FieldButton" name="textInsertFieldCombo"/>
</item>
<item>
<spacer name="horizontalSpacer_2">
@@ -535,7 +535,7 @@
<item row="3" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_22">
<item>
<widget class="ColorButton" name="barcodeColorButton">
<widget class="glabels::ColorButton" name="barcodeColorButton">
<property name="text">
<string/>
</property>
@@ -814,7 +814,7 @@
</widget>
</item>
<item>
<widget class="FieldButton" name="imageFieldCombo">
<widget class="glabels::FieldButton" name="imageFieldCombo">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
@@ -933,7 +933,7 @@
<item row="1" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_21">
<item>
<widget class="ColorButton" name="lineColorButton">
<widget class="glabels::ColorButton" name="lineColorButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -987,7 +987,7 @@
</widget>
</item>
<item row="0" column="1">
<widget class="ColorButton" name="fillColorButton">
<widget class="glabels::ColorButton" name="fillColorButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -1199,7 +1199,16 @@
<property name="spacing">
<number>15</number>
</property>
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
@@ -1457,7 +1466,7 @@
<item row="2" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_24">
<item>
<widget class="ColorButton" name="shadowColorButton">
<widget class="glabels::ColorButton" name="shadowColorButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -1545,20 +1554,14 @@
</widget>
<customwidgets>
<customwidget>
<class>ColorButton</class>
<class>glabels::ColorButton</class>
<extends>QPushButton</extends>
<header>ColorButton.h</header>
<slots>
<signal>colorChanged()</signal>
</slots>
</customwidget>
<customwidget>
<class>FieldButton</class>
<class>glabels::FieldButton</class>
<extends>QComboBox</extends>
<header>FieldButton.h</header>
<slots>
<signal>keySelected(QString)</signal>
</slots>
</customwidget>
</customwidgets>
<resources>
glabels/ui/PrintView.ui
+12 -3
View File
@@ -26,7 +26,7 @@
<enum>QLayout::SetDefaultConstraint</enum>
</property>
<item>
<widget class="Preview" name="preview" native="true">
<widget class="glabels::Preview" name="preview" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
@@ -109,7 +109,16 @@
<property name="sizeConstraint">
<enum>QLayout::SetDefaultConstraint</enum>
</property>
<property name="margin">
<property name="leftMargin">
<number>12</number>
</property>
<property name="topMargin">
<number>12</number>
</property>
<property name="rightMargin">
<number>12</number>
</property>
<property name="bottomMargin">
<number>12</number>
</property>
<item>
@@ -340,7 +349,7 @@
</widget>
<customwidgets>
<customwidget>
<class>Preview</class>
<class>glabels::Preview</class>
<extends>QWidget</extends>
<header>Preview.h</header>
<container>1</container>
glabels/ui/PropertiesView.ui
+12 -4
View File
@@ -29,7 +29,7 @@
<item row="0" column="4">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="SimplePreview" name="preview">
<widget class="glabels::SimplePreview" name="preview">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
@@ -42,7 +42,16 @@
</item>
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout">
<property name="margin">
<property name="leftMargin">
<number>12</number>
</property>
<property name="topMargin">
<number>12</number>
</property>
<property name="rightMargin">
<number>12</number>
</property>
<property name="bottomMargin">
<number>12</number>
</property>
<item>
@@ -362,10 +371,9 @@
</widget>
<customwidgets>
<customwidget>
<class>SimplePreview</class>
<class>glabels::SimplePreview</class>
<extends>QGraphicsView</extends>
<header>SimplePreview.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources>
glabels/ui/SelectProductDialog.ui
+12 -3
View File
@@ -170,7 +170,16 @@
<item>
<widget class="QWidget" name="categoriesCheckContainer" native="true">
<layout class="QGridLayout" name="gridLayout">
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<property name="spacing">
@@ -252,7 +261,7 @@
</widget>
</item>
<item>
<widget class="TemplatePicker" name="templatePicker">
<widget class="glabels::TemplatePicker" name="templatePicker">
<property name="showDropIndicator" stdset="0">
<bool>false</bool>
</property>
@@ -290,7 +299,7 @@
</widget>
<customwidgets>
<customwidget>
<class>TemplatePicker</class>
<class>glabels::TemplatePicker</class>
<extends>QListWidget</extends>
<header>TemplatePicker.h</header>
</customwidget>