SHS/qad
4
1
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

graphic refactoring

Browse Source 
graphic buttons
menu for save and export
enable grid in config and save it in session
remove traceX traceY
This commit is contained in:
Бычков Андрей
2023-01-22 15:27:49 +03:00
parent c166c040b0
commit 56246e657a
8 changed files with 798 additions and 546 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
libs/graphic/graphic_conf.ui
View File

@@ -10,7 +10,7 @@
<x>0</x>
<y>0</y>
<width>387</width>
<height>505</height>
<height>507</height>
</rect>
</property>
<property name="windowTitle">
@@ -21,7 +21,7 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QGroupBox" name="groupBox">
<widget class="QGroupBox" name="groupAppearence">
<property name="title">
<string>Appearance</string>
</property>
@@ -71,7 +71,7 @@
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_3">
<widget class="QLabel" name="labelBackgroundColor">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
@@ -91,7 +91,7 @@
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_7">
<widget class="QLabel" name="labelTextColor">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
@@ -116,7 +116,7 @@
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_2">
<widget class="QGroupBox" name="groupMargins">
<property name="title">
<string>Margins</string>
</property>
@@ -145,7 +145,7 @@
</widget>
</item>
<item row="1" column="2">
<widget class="QLabel" name="labelAll">
<widget class="QLabel" name="labelMarginAll">
<property name="text">
<string>All:</string>
</property>
@@ -165,7 +165,7 @@
</widget>
</item>
<item row="1" column="4">
<widget class="QLabel" name="label_12">
<widget class="QLabel" name="labelMarginRight">
<property name="text">
<string>Right:</string>
</property>
@@ -175,7 +175,7 @@
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_10">
<widget class="QLabel" name="labelMarginLeft">
<property name="text">
<string>Left:</string>
</property>
@@ -185,7 +185,7 @@
</widget>
</item>
<item row="2" column="2">
<widget class="QLabel" name="label_13">
<widget class="QLabel" name="labelMarginBottom">
<property name="text">
<string>Bottom:</string>
</property>
@@ -205,7 +205,7 @@
</widget>
</item>
<item row="0" column="2">
<widget class="QLabel" name="label_11">
<widget class="QLabel" name="labelMarginTop">
<property name="text">
<string>Top:</string>
</property>
@@ -215,7 +215,7 @@
</widget>
</item>
<item row="1" column="3">
<widget class="QSpinBox" name="spinMarginT_2">
<widget class="QSpinBox" name="spinMarginAll">
<property name="suffix">
<string> px</string>
</property>
@@ -230,16 +230,19 @@
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QGroupBox" name="groupBox_3">
<widget class="QGroupBox" name="groupGrid">
<property name="title">
<string>Grid</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<layout class="QFormLayout" name="formLayout_2">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_4">
<widget class="QLabel" name="labelGridColor">
<property name="text">
<string>Color:</string>
</property>
@@ -253,7 +256,7 @@
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_5">
<widget class="QLabel" name="labelGridStyle">
<property name="text">
<string>Style:</string>
</property>
@@ -263,7 +266,7 @@
<widget class="QComboBox" name="comboStyleGrid"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_6">
<widget class="QLabel" name="labelGridWidth">
<property name="text">
<string>Width:</string>
</property>
@@ -277,14 +280,14 @@
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_8">
<widget class="QLabel" name="labelGridStepX">
<property name="text">
<string>Step X:</string>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="label_9">
<widget class="QLabel" name="labelGridStepY">
<property name="text">
<string>Step Y:</string>
</property>
@@ -340,7 +343,7 @@
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_1">
<widget class="QGroupBox" name="groupGraphics">
<property name="title">
<string>Graphics</string>
</property>
@@ -359,7 +362,7 @@
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label">
<widget class="QLabel" name="labelGraphicColor">
<property name="text">
<string>Color:</string>
</property>
@@ -373,7 +376,7 @@
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_2">
<widget class="QLabel" name="labelGraphicStyle">
<property name="text">
<string>Style:</string>
</property>
@@ -518,7 +521,6 @@
</tabstops>
<resources>
<include location="../../../cd/utils/pult/cdpult.qrc"/>
<include location="../../../cd/utils/pult/cdpult.qrc"/>
</resources>
<connections>
<connection>
@@ -528,8 +530,8 @@
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>255</x>
<y>641</y>
<x>376</x>
<y>495</y>
</hint>
<hint type="destinationlabel">
<x>245</x>
@@ -544,12 +546,12 @@
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>322</x>
<y>410</y>
<x>286</x>
<y>373</y>
</hint>
<hint type="destinationlabel">
<x>415</x>
<y>411</y>
<x>366</x>
<y>376</y>
</hint>
</hints>
</connection>
@@ -560,12 +562,12 @@
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>322</x>
<y>434</y>
<x>291</x>
<y>399</y>
</hint>
<hint type="destinationlabel">
<x>415</x>
<y>435</y>
<x>366</x>
<y>402</y>
</hint>
</hints>
</connection>
@@ -576,8 +578,8 @@
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>294</x>
<y>641</y>
<x>376</x>
<y>495</y>
</hint>
<hint type="destinationlabel">
<x>288</x>
@@ -592,76 +594,76 @@
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>322</x>
<y>458</y>
<x>245</x>
<y>425</y>
</hint>
<hint type="destinationlabel">
<x>415</x>
<y>460</y>
<x>366</x>
<y>431</y>
</hint>
</hints>
</connection>
<connection>
<sender>spinMarginT_2</sender>
<sender>spinMarginAll</sender>
<signal>valueChanged(int)</signal>
<receiver>spinMarginT</receiver>
<slot>setValue(int)</slot>
<hints>
<hint type="sourcelabel">
<x>259</x>
<y>221</y>
<x>237</x>
<y>209</y>
</hint>
<hint type="destinationlabel">
<x>249</x>
<y>191</y>
<x>237</x>
<y>183</y>
</hint>
</hints>
</connection>
<connection>
<sender>spinMarginT_2</sender>
<sender>spinMarginAll</sender>
<signal>valueChanged(int)</signal>
<receiver>spinMarginR</receiver>
<slot>setValue(int)</slot>
<hints>
<hint type="sourcelabel">
<x>268</x>
<y>220</y>
<x>237</x>
<y>209</y>
</hint>
<hint type="destinationlabel">
<x>371</x>
<y>220</y>
<x>367</x>
<y>209</y>
</hint>
</hints>
</connection>
<connection>
<sender>spinMarginT_2</sender>
<sender>spinMarginAll</sender>
<signal>valueChanged(int)</signal>
<receiver>spinMarginB</receiver>
<slot>setValue(int)</slot>
<hints>
<hint type="sourcelabel">
<x>233</x>
<y>230</y>
<x>237</x>
<y>209</y>
</hint>
<hint type="destinationlabel">
<x>234</x>
<y>252</y>
<x>237</x>
<y>235</y>
</hint>
</hints>
</connection>
<connection>
<sender>spinMarginT_2</sender>
<sender>spinMarginAll</sender>
<signal>valueChanged(int)</signal>
<receiver>spinMarginL</receiver>
<slot>setValue(int)</slot>
<hints>
<hint type="sourcelabel">
<x>213</x>
<y>230</y>
<x>237</x>
<y>209</y>
</hint>
<hint type="destinationlabel">
<x>133</x>
<y>229</y>
<x>106</x>
<y>209</y>
</hint>
</hints>
</connection>