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

UserVariables branch merge

Browse Source
This commit is contained in:
gitlost
2019-08-21 03:37:56 +01:00
parent 6ab3a12b92 6a789c9632
commit 2444cacb74
92 changed files with 3624 additions and 1283 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glabels/ui/ObjectEditor.ui
+171 -170
View File
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>400</width>
<height>640</height>
<height>648</height>
</rect>
</property>
<property name="sizePolicy">
@@ -29,9 +29,9 @@
</size>
</property>
<property name="windowTitle">
<string>Form</string>
<string notr="true">Form</string>
</property>
<layout class="QGridLayout" name="gridLayout_5">
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
@@ -579,7 +579,11 @@
</spacer>
</item>
<item>
<widget class="glabels::FieldButton" name="textInsertFieldCombo"/>
<widget class="glabels::FieldButton" name="textInsertFieldButton">
<property name="text">
<string notr="true">Insert field</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
@@ -729,7 +733,11 @@
</spacer>
</item>
<item>
<widget class="glabels::FieldButton" name="barcodeInsertFieldCombo"/>
<widget class="glabels::FieldButton" name="barcodeInsertFieldButton">
<property name="text">
<string notr="true">Insert field</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_12">
@@ -758,14 +766,27 @@
<string>Image</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_13">
<item row="0" column="0">
<item row="2" column="0">
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>646</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0">
<widget class="QGroupBox" name="groupBox_9">
<property name="title">
<string>File</string>
</property>
<layout class="QGridLayout" name="gridLayout_12">
<layout class="QGridLayout" name="gridLayout_5">
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout_5">
<layout class="QHBoxLayout" name="horizontalLayout_17">
<item>
<widget class="QLineEdit" name="imageFilenameLineEdit">
<property name="sizePolicy">
@@ -789,68 +810,47 @@
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_17" stretch="1,0,1">
<item>
<widget class="QPushButton" name="imageFileButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Select File...</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>or</string>
</property>
</widget>
</item>
<item>
<widget class="glabels::FieldButton" name="imageFieldCombo">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<item>
<property name="text">
<string>Select Merge Field...</string>
</property>
</item>
</widget>
</item>
</layout>
<widget class="QPushButton" name="imageBrowseButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Browse...</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_27">
<item>
<spacer name="horizontalSpacer_13">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="glabels::FieldButton" name="imageFieldButton">
<property name="text">
<string notr="true">Use field</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item row="2" column="0">
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>646</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<widget class="QWidget" name="lineFillPage">
@@ -1520,14 +1520,6 @@
<signal>colorChanged()</signal>
</slots>
</customwidget>
<customwidget>
<class>glabels::FieldButton</class>
<extends>QComboBox</extends>
<header>FieldButton.h</header>
<slots>
<signal>keySelected(QString)</signal>
</slots>
</customwidget>
<customwidget>
<class>glabels::BarcodeMenuButton</class>
<extends>QPushButton</extends>
@@ -1536,6 +1528,14 @@
<signal>selectionChanged()</signal>
</slots>
</customwidget>
<customwidget>
<class>glabels::FieldButton</class>
<extends>QPushButton</extends>
<header>FieldButton.h</header>
<slots>
<signal>keySelected(QString)</signal>
</slots>
</customwidget>
</customwidgets>
<resources>
<include location="../icons.qrc"/>
@@ -1644,8 +1644,8 @@
<slot>onTextControlsChanged()</slot>
<hints>
<hint type="sourcelabel">
<x>157</x>
<y>333</y>
<x>160</x>
<y>332</y>
</hint>
<hint type="destinationlabel">
<x>396</x>
@@ -1660,8 +1660,8 @@
<slot>onTextControlsChanged()</slot>
<hints>
<hint type="sourcelabel">
<x>198</x>
<y>333</y>
<x>200</x>
<y>332</y>
</hint>
<hint type="destinationlabel">
<x>398</x>
@@ -1676,8 +1676,8 @@
<slot>onTextControlsChanged()</slot>
<hints>
<hint type="sourcelabel">
<x>238</x>
<y>333</y>
<x>240</x>
<y>332</y>
</hint>
<hint type="destinationlabel">
<x>395</x>
@@ -1692,8 +1692,8 @@
<slot>onTextControlsChanged()</slot>
<hints>
<hint type="sourcelabel">
<x>284</x>
<y>333</y>
<x>286</x>
<y>332</y>
</hint>
<hint type="destinationlabel">
<x>393</x>
@@ -1708,8 +1708,8 @@
<slot>onTextControlsChanged()</slot>
<hints>
<hint type="sourcelabel">
<x>325</x>
<y>333</y>
<x>326</x>
<y>332</y>
</hint>
<hint type="destinationlabel">
<x>396</x>
@@ -1725,7 +1725,7 @@
<hints>
<hint type="sourcelabel">
<x>365</x>
<y>333</y>
<y>332</y>
</hint>
<hint type="destinationlabel">
<x>397</x>
@@ -1740,8 +1740,8 @@
<slot>onTextControlsChanged()</slot>
<hints>
<hint type="sourcelabel">
<x>184</x>
<y>407</y>
<x>189</x>
<y>404</y>
</hint>
<hint type="destinationlabel">
<x>394</x>
@@ -1757,7 +1757,7 @@
<hints>
<hint type="sourcelabel">
<x>178</x>
<y>143</y>
<y>139</y>
</hint>
<hint type="destinationlabel">
<x>392</x>
@@ -1772,8 +1772,8 @@
<slot>onLineControlsChanged()</slot>
<hints>
<hint type="sourcelabel">
<x>137</x>
<y>179</y>
<x>136</x>
<y>174</y>
</hint>
<hint type="destinationlabel">
<x>1</x>
@@ -1788,8 +1788,8 @@
<slot>onFillControlsChanged()</slot>
<hints>
<hint type="sourcelabel">
<x>136</x>
<y>263</y>
<x>135</x>
<y>256</y>
</hint>
<hint type="destinationlabel">
<x>6</x>
@@ -1804,8 +1804,8 @@
<slot>onPositionControlsChanged()</slot>
<hints>
<hint type="sourcelabel">
<x>159</x>
<y>142</y>
<x>160</x>
<y>138</y>
</hint>
<hint type="destinationlabel">
<x>399</x>
@@ -1820,8 +1820,8 @@
<slot>onPositionControlsChanged()</slot>
<hints>
<hint type="sourcelabel">
<x>159</x>
<y>179</y>
<x>160</x>
<y>174</y>
</hint>
<hint type="destinationlabel">
<x>325</x>
@@ -1836,8 +1836,8 @@
<slot>onRectSizeControlsChanged()</slot>
<hints>
<hint type="sourcelabel">
<x>159</x>
<y>265</y>
<x>160</x>
<y>258</y>
</hint>
<hint type="destinationlabel">
<x>3</x>
@@ -1852,8 +1852,8 @@
<slot>onRectSizeControlsChanged()</slot>
<hints>
<hint type="sourcelabel">
<x>159</x>
<y>302</y>
<x>160</x>
<y>294</y>
</hint>
<hint type="destinationlabel">
<x>0</x>
@@ -1868,8 +1868,8 @@
<slot>onResetImageSize()</slot>
<hints>
<hint type="sourcelabel">
<x>210</x>
<y>372</y>
<x>213</x>
<y>362</y>
</hint>
<hint type="destinationlabel">
<x>4</x>
@@ -1900,8 +1900,8 @@
<slot>onShadowControlsChanged()</slot>
<hints>
<hint type="sourcelabel">
<x>165</x>
<y>142</y>
<x>166</x>
<y>138</y>
</hint>
<hint type="destinationlabel">
<x>398</x>
@@ -1916,8 +1916,8 @@
<slot>onShadowControlsChanged()</slot>
<hints>
<hint type="sourcelabel">
<x>165</x>
<y>179</y>
<x>166</x>
<y>174</y>
</hint>
<hint type="destinationlabel">
<x>294</x>
@@ -1932,8 +1932,8 @@
<slot>onShadowControlsChanged()</slot>
<hints>
<hint type="sourcelabel">
<x>142</x>
<y>215</y>
<x>141</x>
<y>209</y>
</hint>
<hint type="destinationlabel">
<x>399</x>
@@ -1948,8 +1948,8 @@
<slot>onShadowControlsChanged()</slot>
<hints>
<hint type="sourcelabel">
<x>159</x>
<y>252</y>
<x>162</x>
<y>245</y>
</hint>
<hint type="destinationlabel">
<x>399</x>
@@ -1964,8 +1964,8 @@
<slot>onLineSizeControlsChanged()</slot>
<hints>
<hint type="sourcelabel">
<x>174</x>
<y>456</y>
<x>177</x>
<y>444</y>
</hint>
<hint type="destinationlabel">
<x>5</x>
@@ -1980,8 +1980,8 @@
<slot>onLineSizeControlsChanged()</slot>
<hints>
<hint type="sourcelabel">
<x>174</x>
<y>493</y>
<x>177</x>
<y>480</y>
</hint>
<hint type="destinationlabel">
<x>1</x>
@@ -1990,14 +1990,14 @@
</hints>
</connection>
<connection>
<sender>imageFileButton</sender>
<sender>imageBrowseButton</sender>
<signal>clicked()</signal>
<receiver>ObjectEditor</receiver>
<slot>onImageFileButtonClicked()</slot>
<hints>
<hint type="sourcelabel">
<x>133</x>
<y>175</y>
<x>367</x>
<y>135</y>
</hint>
<hint type="destinationlabel">
<x>394</x>
@@ -2005,22 +2005,6 @@
</hint>
</hints>
</connection>
<connection>
<sender>imageFieldCombo</sender>
<signal>keySelected(QString)</signal>
<receiver>ObjectEditor</receiver>
<slot>onImageKeySelected(QString)</slot>
<hints>
<hint type="sourcelabel">
<x>302</x>
<y>175</y>
</hint>
<hint type="destinationlabel">
<x>397</x>
<y>32</y>
</hint>
</hints>
</connection>
<connection>
<sender>textEdit</sender>
<signal>textChanged()</signal>
@@ -2037,22 +2021,6 @@
</hint>
</hints>
</connection>
<connection>
<sender>textInsertFieldCombo</sender>
<signal>keySelected(QString)</signal>
<receiver>ObjectEditor</receiver>
<slot>onTextInsertFieldKeySelected(QString)</slot>
<hints>
<hint type="sourcelabel">
<x>239</x>
<y>599</y>
</hint>
<hint type="destinationlabel">
<x>395</x>
<y>645</y>
</hint>
</hints>
</connection>
<connection>
<sender>barcodeShowTextCheck</sender>
<signal>toggled(bool)</signal>
@@ -2060,8 +2028,8 @@
<slot>onBarcodeControlsChanged()</slot>
<hints>
<hint type="sourcelabel">
<x>178</x>
<y>172</y>
<x>195</x>
<y>167</y>
</hint>
<hint type="destinationlabel">
<x>4</x>
@@ -2076,8 +2044,8 @@
<slot>onBarcodeControlsChanged()</slot>
<hints>
<hint type="sourcelabel">
<x>164</x>
<y>204</y>
<x>195</x>
<y>198</y>
</hint>
<hint type="destinationlabel">
<x>1</x>
@@ -2093,7 +2061,7 @@
<hints>
<hint type="sourcelabel">
<x>126</x>
<y>239</y>
<y>232</y>
</hint>
<hint type="destinationlabel">
<x>1</x>
@@ -2117,22 +2085,6 @@
</hint>
</hints>
</connection>
<connection>
<sender>barcodeInsertFieldCombo</sender>
<signal>keySelected(QString)</signal>
<receiver>ObjectEditor</receiver>
<slot>onBarcodeInsertFieldKeySelected(QString)</slot>
<hints>
<hint type="sourcelabel">
<x>239</x>
<y>400</y>
</hint>
<hint type="destinationlabel">
<x>403</x>
<y>625</y>
</hint>
</hints>
</connection>
<connection>
<sender>barcodeStyleButton</sender>
<signal>selectionChanged()</signal>
@@ -2140,8 +2092,8 @@
<slot>onBarcodeControlsChanged()</slot>
<hints>
<hint type="sourcelabel">
<x>178</x>
<y>140</y>
<x>195</x>
<y>136</y>
</hint>
<hint type="destinationlabel">
<x>5</x>
@@ -2197,6 +2149,54 @@
</hint>
</hints>
</connection>
<connection>
<sender>textInsertFieldButton</sender>
<signal>keySelected(QString)</signal>
<receiver>ObjectEditor</receiver>
<slot>onTextInsertFieldKeySelected(QString)</slot>
<hints>
<hint type="sourcelabel">
<x>191</x>
<y>589</y>
</hint>
<hint type="destinationlabel">
<x>227</x>
<y>642</y>
</hint>
</hints>
</connection>
<connection>
<sender>barcodeInsertFieldButton</sender>
<signal>keySelected(QString)</signal>
<receiver>ObjectEditor</receiver>
<slot>onBarcodeInsertFieldKeySelected(QString)</slot>
<hints>
<hint type="sourcelabel">
<x>208</x>
<y>379</y>
</hint>
<hint type="destinationlabel">
<x>205</x>
<y>649</y>
</hint>
</hints>
</connection>
<connection>
<sender>imageFieldButton</sender>
<signal>keySelected(QString)</signal>
<receiver>ObjectEditor</receiver>
<slot>onImageKeySelected(QString)</slot>
<hints>
<hint type="sourcelabel">
<x>317</x>
<y>160</y>
</hint>
<hint type="destinationlabel">
<x>331</x>
<y>-12</y>
</hint>
</hints>
</connection>
</connections>
<slots>
<slot>onChanged()</slot>
@@ -2213,5 +2213,6 @@
<slot>onTextInsertFieldKeySelected(QString)</slot>
<slot>onBarcodeControlsChanged()</slot>
<slot>onBarcodeInsertFieldKeySelected(QString)</slot>
<slot>onImageComboChanged()</slot>
</slots>
</ui>