diff options
| author | craig <craig@11d20701-8431-0410-a711-e3c959e3b870> | 2012-04-09 21:07:06 +0000 |
|---|---|---|
| committer | craig <craig@11d20701-8431-0410-a711-e3c959e3b870> | 2012-04-09 21:07:06 +0000 |
| commit | 50c2b87ba62af3be9475b3ad235c133818dbfb3d (patch) | |
| tree | 3b2ea7a26439b7e8e2765feaf88a805453986f6a /scribus/plugins | |
| parent | b252275b0c7d1a59082e7f1c64d984c2acbe5beb (diff) | |
| download | scribus-50c2b87ba62af3be9475b3ad235c133818dbfb3d.tar.gz scribus-50c2b87ba62af3be9475b3ad235c133818dbfb3d.tar.xz scribus-50c2b87ba62af3be9475b3ad235c133818dbfb3d.zip | |
Fix some GUI issues with the Path Operations dialog
git-svn-id: svn://scribus.net/branches/Version14x/Scribus@17426 11d20701-8431-0410-a711-e3c959e3b870
Diffstat (limited to 'scribus/plugins')
| -rw-r--r-- | scribus/plugins/tools/pathfinder/pathfinderbase.ui | 490 |
1 files changed, 270 insertions, 220 deletions
diff --git a/scribus/plugins/tools/pathfinder/pathfinderbase.ui b/scribus/plugins/tools/pathfinder/pathfinderbase.ui index 1884b9c..3db464a 100644 --- a/scribus/plugins/tools/pathfinder/pathfinderbase.ui +++ b/scribus/plugins/tools/pathfinder/pathfinderbase.ui @@ -1,82 +1,96 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>PathFinderBase</class> - <widget class="QDialog" name="PathFinderBase" > - <property name="geometry" > + <widget class="QDialog" name="PathFinderBase"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> - <width>410</width> - <height>368</height> + <width>442</width> + <height>386</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Boolean Path Operations</string> </property> - <layout class="QVBoxLayout" name="verticalLayout_2" > + <layout class="QVBoxLayout" name="verticalLayout_4"> <item> - <layout class="QHBoxLayout" > - <property name="spacing" > + <layout class="QHBoxLayout"> + <property name="spacing"> <number>5</number> </property> <item> - <layout class="QVBoxLayout" > - <property name="spacing" > + <layout class="QVBoxLayout"> + <property name="spacing"> <number>5</number> </property> <item> - <widget class="QLabel" name="sourceShape" > - <property name="minimumSize" > + <widget class="QLabel" name="sourceShape"> + <property name="minimumSize"> <size> <width>100</width> <height>100</height> </size> </property> - <property name="maximumSize" > + <property name="maximumSize"> <size> <width>100</width> <height>100</height> </size> </property> - <property name="toolTip" > + <property name="toolTip"> <string>First source shape.</string> </property> - <property name="autoFillBackground" > + <property name="autoFillBackground"> <bool>true</bool> </property> - <property name="frameShape" > + <property name="frameShape"> <enum>QFrame::Panel</enum> </property> - <property name="frameShadow" > + <property name="frameShadow"> <enum>QFrame::Sunken</enum> </property> - <property name="text" > + <property name="text"> <string/> </property> </widget> </item> <item> - <widget class="QCheckBox" name="keepSource1" > - <property name="toolTip" > + <widget class="QCheckBox" name="keepSource1"> + <property name="toolTip"> <string>Keep a copy of the original item after applying the operation</string> </property> - <property name="text" > + <property name="text"> <string>Keep</string> </property> </widget> </item> + <item> + <spacer name="verticalSpacer_4"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> </layout> </item> <item> - <layout class="QVBoxLayout" > - <property name="spacing" > + <layout class="QVBoxLayout"> + <property name="spacing"> <number>0</number> </property> <item> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>2</width> <height>2</height> @@ -85,28 +99,28 @@ </spacer> </item> <item> - <widget class="QLabel" name="label" > - <property name="font" > + <widget class="QLabel" name="label"> + <property name="font"> <font> <pointsize>30</pointsize> <weight>75</weight> <bold>true</bold> </font> </property> - <property name="text" > + <property name="text"> <string>+</string> </property> - <property name="alignment" > + <property name="alignment"> <set>Qt::AlignCenter</set> </property> </widget> </item> <item> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>2</width> <height>2</height> @@ -117,64 +131,77 @@ </layout> </item> <item> - <layout class="QVBoxLayout" > - <property name="spacing" > + <layout class="QVBoxLayout"> + <property name="spacing"> <number>5</number> </property> <item> - <widget class="QLabel" name="sourceShape2" > - <property name="minimumSize" > + <widget class="QLabel" name="sourceShape2"> + <property name="minimumSize"> <size> <width>100</width> <height>100</height> </size> </property> - <property name="maximumSize" > + <property name="maximumSize"> <size> <width>100</width> <height>100</height> </size> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Second source shape.</string> </property> - <property name="autoFillBackground" > + <property name="autoFillBackground"> <bool>true</bool> </property> - <property name="frameShape" > + <property name="frameShape"> <enum>QFrame::Panel</enum> </property> - <property name="frameShadow" > + <property name="frameShadow"> <enum>QFrame::Sunken</enum> </property> - <property name="text" > + <property name="text"> <string/> </property> </widget> </item> <item> - <widget class="QCheckBox" name="keepSource2" > - <property name="toolTip" > + <widget class="QCheckBox" name="keepSource2"> + <property name="toolTip"> <string>Keep a copy of the original item after applying the operation</string> </property> - <property name="text" > + <property name="text"> <string>Keep</string> </property> </widget> </item> + <item> + <spacer name="verticalSpacer_5"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> </layout> </item> <item> - <layout class="QVBoxLayout" > - <property name="spacing" > + <layout class="QVBoxLayout"> + <property name="spacing"> <number>0</number> </property> <item> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>2</width> <height>2</height> @@ -183,28 +210,28 @@ </spacer> </item> <item> - <widget class="QLabel" name="label_2" > - <property name="font" > + <widget class="QLabel" name="label_2"> + <property name="font"> <font> <pointsize>30</pointsize> <weight>75</weight> <bold>true</bold> </font> </property> - <property name="text" > + <property name="text"> <string>=</string> </property> - <property name="alignment" > + <property name="alignment"> <set>Qt::AlignCenter</set> </property> </widget> </item> <item> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>2</width> <height>2</height> @@ -215,47 +242,50 @@ </layout> </item> <item> - <layout class="QVBoxLayout" > + <layout class="QVBoxLayout"> <item> - <widget class="QLabel" name="resultShape" > - <property name="minimumSize" > + <widget class="QLabel" name="resultShape"> + <property name="minimumSize"> <size> <width>100</width> <height>100</height> </size> </property> - <property name="maximumSize" > + <property name="maximumSize"> <size> <width>100</width> <height>100</height> </size> </property> - <property name="toolTip" > + <property name="toolTip"> <string>The resulting shape.</string> </property> - <property name="autoFillBackground" > + <property name="autoFillBackground"> <bool>true</bool> </property> - <property name="frameShape" > + <property name="frameShape"> <enum>QFrame::Panel</enum> </property> - <property name="frameShadow" > + <property name="frameShadow"> <enum>QFrame::Sunken</enum> </property> - <property name="text" > + <property name="text"> <string/> </property> </widget> </item> <item> - <spacer> - <property name="orientation" > + <spacer name="verticalSpacer_3"> + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> + </property> + <property name="sizeHint" stdset="0"> <size> <width>20</width> - <height>40</height> + <height>20</height> </size> </property> </spacer> @@ -265,101 +295,101 @@ </layout> </item> <item> - <layout class="QHBoxLayout" name="horizontalLayout" > + <layout class="QHBoxLayout" name="horizontalLayout"> <item> - <layout class="QVBoxLayout" name="verticalLayout" > + <layout class="QVBoxLayout" name="verticalLayout"> <item> - <widget class="QGroupBox" name="groupBox" > - <property name="title" > + <widget class="QGroupBox" name="groupBox"> + <property name="title"> <string>Operation</string> </property> - <layout class="QHBoxLayout" > - <property name="spacing" > + <layout class="QHBoxLayout"> + <property name="spacing"> <number>5</number> </property> - <property name="margin" > + <property name="margin"> <number>10</number> </property> <item> - <widget class="QToolButton" name="opCombine" > - <property name="toolTip" > + <widget class="QToolButton" name="opCombine"> + <property name="toolTip"> <string>Unites the shapes</string> </property> - <property name="text" > + <property name="text"> <string>...</string> </property> - <property name="checkable" > + <property name="checkable"> <bool>true</bool> </property> - <property name="checked" > + <property name="checked"> <bool>true</bool> </property> - <property name="autoExclusive" > + <property name="autoExclusive"> <bool>true</bool> </property> </widget> </item> <item> - <widget class="QToolButton" name="opSubtraction" > - <property name="toolTip" > + <widget class="QToolButton" name="opSubtraction"> + <property name="toolTip"> <string>Subtracts the second shape from the first shape</string> </property> - <property name="text" > + <property name="text"> <string>...</string> </property> - <property name="checkable" > + <property name="checkable"> <bool>true</bool> </property> - <property name="autoExclusive" > + <property name="autoExclusive"> <bool>true</bool> </property> </widget> </item> <item> - <widget class="QToolButton" name="opIntersection" > - <property name="toolTip" > + <widget class="QToolButton" name="opIntersection"> + <property name="toolTip"> <string>Intersection of the shapes</string> </property> - <property name="text" > + <property name="text"> <string>...</string> </property> - <property name="checkable" > + <property name="checkable"> <bool>true</bool> </property> - <property name="autoExclusive" > + <property name="autoExclusive"> <bool>true</bool> </property> </widget> </item> <item> - <widget class="QToolButton" name="opExclusion" > - <property name="toolTip" > + <widget class="QToolButton" name="opExclusion"> + <property name="toolTip"> <string>Result is the area where the two shapes do not intersect</string> </property> - <property name="text" > + <property name="text"> <string>...</string> </property> - <property name="checkable" > + <property name="checkable"> <bool>true</bool> </property> - <property name="autoExclusive" > + <property name="autoExclusive"> <bool>true</bool> </property> </widget> </item> <item> - <widget class="QToolButton" name="opParts" > - <property name="toolTip" > + <widget class="QToolButton" name="opParts"> + <property name="toolTip"> <string>Break apart, -The result is a combination of "Intersection" and "Exclusion"</string> +The result is a combination of "Intersection" and "Exclusion"</string> </property> - <property name="text" > + <property name="text"> <string>...</string> </property> - <property name="checkable" > + <property name="checkable"> <bool>true</bool> </property> - <property name="autoExclusive" > + <property name="autoExclusive"> <bool>true</bool> </property> </widget> @@ -368,26 +398,26 @@ The result is a combination of "Intersection" and "Exclusion"</string> </widget> </item> <item> - <layout class="QHBoxLayout" > - <property name="spacing" > + <layout class="QHBoxLayout"> + <property name="spacing"> <number>0</number> </property> <item> - <widget class="QPushButton" name="swapShapes" > - <property name="toolTip" > + <widget class="QCheckBox" name="swapShapes"> + <property name="toolTip"> <string>Exchange the Source Shapes</string> </property> - <property name="text" > + <property name="text"> <string>Swap Shapes</string> </property> </widget> </item> <item> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>40</width> <height>20</height> @@ -398,11 +428,11 @@ The result is a combination of "Intersection" and "Exclusion"</string> </layout> </item> <item> - <spacer name="verticalSpacer" > - <property name="orientation" > + <spacer name="verticalSpacer"> + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>20</width> <height>40</height> @@ -413,112 +443,132 @@ The result is a combination of "Intersection" and "Exclusion"</string> </layout> </item> <item> - <widget class="QGroupBox" name="optionGroup" > - <property name="title" > - <string>Result Takes Color from:</string> - </property> - <layout class="QGridLayout" name="gridLayout_2" > - <item row="0" column="0" > - <widget class="QRadioButton" name="targetGetsSource1Color" > - <property name="toolTip" > - <string>The resulting shape uses the color of the first source shape</string> - </property> - <property name="text" > - <string>First Shape</string> - </property> - <property name="checked" > - <bool>true</bool> - </property> - </widget> - </item> - <item row="1" column="0" > - <widget class="QRadioButton" name="targetGetsSource2Color" > - <property name="toolTip" > - <string>The resulting shape uses the color of the second source shape</string> - </property> - <property name="text" > - <string>Second Shape</string> - </property> - </widget> - </item> - <item row="2" column="0" > - <widget class="QRadioButton" name="targetGetsOtherColor" > - <property name="toolTip" > - <string>The resulting shape uses the colors listed below</string> - </property> - <property name="text" > - <string>Custom Colors</string> - </property> - </widget> - </item> - <item row="3" column="0" > - <layout class="QGridLayout" name="gridLayout" > - <item row="0" column="0" > - <widget class="QLabel" name="label_3" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="text" > - <string>Stroke:</string> - </property> - </widget> - </item> - <item row="0" column="1" > - <widget class="ColorCombo" name="otherColorComboLine" > - <property name="enabled" > - <bool>false</bool> + <layout class="QVBoxLayout" name="verticalLayout_3"> + <item> + <widget class="QGroupBox" name="optionGroup"> + <property name="title"> + <string>Result Takes Color from:</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <widget class="QRadioButton" name="targetGetsSource1Color"> + <property name="toolTip"> + <string>The resulting shape uses the color of the first source shape</string> </property> - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Expanding" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <property name="text"> + <string>First Shape</string> </property> - <property name="toolTip" > - <string>Stroke Color</string> + <property name="checked"> + <bool>true</bool> </property> </widget> </item> - <item row="1" column="0" > - <widget class="QLabel" name="label_4" > - <property name="enabled" > - <bool>false</bool> + <item> + <widget class="QRadioButton" name="targetGetsSource2Color"> + <property name="toolTip"> + <string>The resulting shape uses the color of the second source shape</string> </property> - <property name="text" > - <string>Fill:</string> + <property name="text"> + <string>Second Shape</string> </property> </widget> </item> - <item row="1" column="1" > - <widget class="ColorCombo" name="otherColorComboFill" > - <property name="enabled" > - <bool>false</bool> + <item> + <widget class="QRadioButton" name="targetGetsOtherColor"> + <property name="toolTip"> + <string>The resulting shape uses the colors listed below</string> </property> - <property name="toolTip" > - <string>Fill Color</string> + <property name="text"> + <string>Custom Colors</string> </property> </widget> </item> + <item> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="label_3"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text"> + <string>Stroke:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="ColorCombo" name="otherColorComboLine"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Stroke Color</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_4"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text"> + <string>Fill:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="ColorCombo" name="otherColorComboFill"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Fill Color</string> + </property> + </widget> + </item> + </layout> + </item> </layout> - </item> - </layout> - </widget> + </widget> + </item> + <item> + <spacer name="verticalSpacer_2"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Minimum</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>17</width> + <height>0</height> + </size> + </property> + </spacer> + </item> + </layout> </item> </layout> </item> <item> - <widget class="QDialogButtonBox" name="buttonBox" > - <property name="orientation" > + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="standardButtons" > + <property name="standardButtons"> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> </property> </widget> </item> </layout> </widget> - <layoutdefault spacing="5" margin="10" /> + <layoutdefault spacing="5" margin="10"/> <customwidgets> <customwidget> <class>ColorCombo</class> @@ -534,11 +584,11 @@ The result is a combination of "Intersection" and "Exclusion"</string> <receiver>PathFinderBase</receiver> <slot>accept()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>307</x> <y>344</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>157</x> <y>274</y> </hint> @@ -550,11 +600,11 @@ The result is a combination of "Intersection" and "Exclusion"</string> <receiver>PathFinderBase</receiver> <slot>reject()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>375</x> <y>344</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>286</x> <y>274</y> </hint> @@ -566,11 +616,11 @@ The result is a combination of "Intersection" and "Exclusion"</string> <receiver>otherColorComboLine</receiver> <slot>setDisabled(bool)</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>388</x> <y>192</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>387</x> <y>266</y> </hint> @@ -582,11 +632,11 @@ The result is a combination of "Intersection" and "Exclusion"</string> <receiver>otherColorComboFill</receiver> <slot>setDisabled(bool)</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>388</x> <y>192</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>387</x> <y>294</y> </hint> @@ -598,11 +648,11 @@ The result is a combination of "Intersection" and "Exclusion"</string> <receiver>otherColorComboLine</receiver> <slot>setDisabled(bool)</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>388</x> <y>215</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>387</x> <y>266</y> </hint> @@ -614,11 +664,11 @@ The result is a combination of "Intersection" and "Exclusion"</string> <receiver>otherColorComboFill</receiver> <slot>setDisabled(bool)</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>388</x> <y>215</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>387</x> <y>294</y> </hint> @@ -630,11 +680,11 @@ The result is a combination of "Intersection" and "Exclusion"</string> <receiver>otherColorComboLine</receiver> <slot>setEnabled(bool)</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>388</x> <y>238</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>387</x> <y>266</y> </hint> @@ -646,11 +696,11 @@ The result is a combination of "Intersection" and "Exclusion"</string> <receiver>otherColorComboFill</receiver> <slot>setEnabled(bool)</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>388</x> <y>238</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>387</x> <y>294</y> </hint> @@ -662,11 +712,11 @@ The result is a combination of "Intersection" and "Exclusion"</string> <receiver>label_3</receiver> <slot>setDisabled(bool)</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>262</x> <y>182</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>245</x> <y>257</y> </hint> @@ -678,11 +728,11 @@ The result is a combination of "Intersection" and "Exclusion"</string> <receiver>label_3</receiver> <slot>setDisabled(bool)</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>282</x> <y>211</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>260</x> <y>253</y> </hint> @@ -694,11 +744,11 @@ The result is a combination of "Intersection" and "Exclusion"</string> <receiver>label_3</receiver> <slot>setEnabled(bool)</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>273</x> <y>225</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>264</x> <y>259</y> </hint> @@ -710,11 +760,11 @@ The result is a combination of "Intersection" and "Exclusion"</string> <receiver>label_4</receiver> <slot>setDisabled(bool)</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>319</x> <y>185</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>243</x> <y>282</y> </hint> @@ -726,11 +776,11 @@ The result is a combination of "Intersection" and "Exclusion"</string> <receiver>label_4</receiver> <slot>setDisabled(bool)</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>298</x> <y>207</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>259</x> <y>284</y> </hint> @@ -742,11 +792,11 @@ The result is a combination of "Intersection" and "Exclusion"</string> <receiver>label_4</receiver> <slot>setEnabled(bool)</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>257</x> <y>234</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>256</x> <y>286</y> </hint> |
