Improved layouts.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8203 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2003-12-05 13:26:46 +00:00
parent 45813b3a3f
commit dc136ca719
4 changed files with 1068 additions and 1099 deletions

View File

@ -1,3 +1,7 @@
2003-12-05 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
* ui/QExternalDialogBase.ui: improved layout.
2003-12-04 Angus Leeming <leeming@lyx.org> 2003-12-04 Angus Leeming <leeming@lyx.org>
* lengthvalidator.[Ch]: a new class LengthValidator, derived from * lengthvalidator.[Ch]: a new class LengthValidator, derived from

View File

@ -13,8 +13,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>394</width> <width>331</width>
<height>418</height> <height>320</height>
</rect> </rect>
</property> </property>
<property stdset="1"> <property stdset="1">
@ -25,21 +25,21 @@
<name>sizeGripEnabled</name> <name>sizeGripEnabled</name>
<bool>true</bool> <bool>true</bool>
</property> </property>
<widget> <grid>
<property stdset="1">
<name>margin</name>
<number>11</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget row="1" column="0" >
<class>QLayoutWidget</class> <class>QLayoutWidget</class>
<property stdset="1"> <property stdset="1">
<name>name</name> <name>name</name>
<cstring>Layout2</cstring> <cstring>Layout2</cstring>
</property> </property>
<property stdset="1">
<name>geometry</name>
<rect>
<x>11</x>
<y>369</y>
<width>372</width>
<height>38</height>
</rect>
</property>
<hbox> <hbox>
<property stdset="1"> <property stdset="1">
<name>margin</name> <name>margin</name>
@ -121,21 +121,12 @@
</widget> </widget>
</hbox> </hbox>
</widget> </widget>
<widget> <widget row="0" column="0" >
<class>QTabWidget</class> <class>QTabWidget</class>
<property stdset="1"> <property stdset="1">
<name>name</name> <name>name</name>
<cstring>tab</cstring> <cstring>tab</cstring>
</property> </property>
<property stdset="1">
<name>geometry</name>
<rect>
<x>11</x>
<y>11</y>
<width>387</width>
<height>325</height>
</rect>
</property>
<property> <property>
<name>layoutSpacing</name> <name>layoutSpacing</name>
</property> </property>
@ -603,20 +594,20 @@
<name>title</name> <name>title</name>
<string></string> <string></string>
</property> </property>
<widget> <grid>
<property stdset="1">
<name>margin</name>
<number>11</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget row="0" column="0" >
<class>QLayoutWidget</class> <class>QLayoutWidget</class>
<property stdset="1"> <property stdset="1">
<name>name</name> <name>name</name>
<cstring>Layout49</cstring> <cstring>Layout14</cstring>
</property>
<property stdset="1">
<name>geometry</name>
<rect>
<x>11</x>
<y>11</y>
<width>322</width>
<height>36</height>
</rect>
</property> </property>
<grid> <grid>
<property stdset="1"> <property stdset="1">
@ -627,25 +618,6 @@
<name>spacing</name> <name>spacing</name>
<number>6</number> <number>6</number>
</property> </property>
<widget row="0" column="2" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>originLA</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>&amp;Origin:</string>
</property>
<property>
<name>buddy</name>
<cstring>originCO</cstring>
</property>
<property>
<name>toolTip</name>
<string>The origin of the rotation</string>
</property>
</widget>
<widget row="0" column="1" > <widget row="0" column="1" >
<class>QLineEdit</class> <class>QLineEdit</class>
<property stdset="1"> <property stdset="1">
@ -668,6 +640,36 @@
<string>Angle to rotate image by</string> <string>Angle to rotate image by</string>
</property> </property>
</widget> </widget>
<widget row="1" column="0" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>originLA</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>&amp;Origin:</string>
</property>
<property>
<name>buddy</name>
<cstring>originCO</cstring>
</property>
<property>
<name>toolTip</name>
<string>The origin of the rotation</string>
</property>
</widget>
<widget row="1" column="1" >
<class>QComboBox</class>
<property stdset="1">
<name>name</name>
<cstring>originCO</cstring>
</property>
<property>
<name>toolTip</name>
<string>The origin of the rotation</string>
</property>
</widget>
<widget row="0" column="0" > <widget row="0" column="0" >
<class>QLabel</class> <class>QLabel</class>
<property stdset="1"> <property stdset="1">
@ -687,19 +689,30 @@
<string>Angle to rotate image by</string> <string>Angle to rotate image by</string>
</property> </property>
</widget> </widget>
<widget row="0" column="3" >
<class>QComboBox</class>
<property stdset="1">
<name>name</name>
<cstring>originCO</cstring>
</property>
<property>
<name>toolTip</name>
<string>The origin of the rotation</string>
</property>
</widget>
</grid> </grid>
</widget> </widget>
<spacer row="0" column="1" >
<property>
<name>name</name>
<cstring>Spacer4</cstring>
</property>
<property stdset="1">
<name>orientation</name>
<enum>Horizontal</enum>
</property>
<property stdset="1">
<name>sizeType</name>
<enum>Expanding</enum>
</property>
<property>
<name>sizeHint</name>
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</grid>
</widget> </widget>
</grid> </grid>
</widget> </widget>
@ -732,91 +745,16 @@
<name>title</name> <name>title</name>
<string></string> <string></string>
</property> </property>
<widget> <grid>
<class>QComboBox</class>
<property stdset="1"> <property stdset="1">
<name>name</name> <name>margin</name>
<cstring>widthUnitCO</cstring> <number>11</number>
</property> </property>
<property stdset="1"> <property stdset="1">
<name>geometry</name> <name>spacing</name>
<rect> <number>6</number>
<x>232</x>
<y>11</y>
<width>95</width>
<height>34</height>
</rect>
</property> </property>
</widget> <widget row="0" column="1" >
<widget>
<class>LengthCombo</class>
<property stdset="1">
<name>name</name>
<cstring>heightUnitCO</cstring>
</property>
<property stdset="1">
<name>geometry</name>
<rect>
<x>236</x>
<y>56</y>
<width>91</width>
<height>31</height>
</rect>
</property>
</widget>
<widget>
<class>QLineEdit</class>
<property stdset="1">
<name>name</name>
<cstring>heightED</cstring>
</property>
<property stdset="1">
<name>enabled</name>
<bool>true</bool>
</property>
<property stdset="1">
<name>geometry</name>
<rect>
<x>61</x>
<y>53</y>
<width>165</width>
<height>30</height>
</rect>
</property>
<property>
<name>toolTip</name>
<string>Height of image in output</string>
</property>
</widget>
<widget>
<class>QCheckBox</class>
<property stdset="1">
<name>name</name>
<cstring>aspectratioCB</cstring>
</property>
<property stdset="1">
<name>enabled</name>
<bool>true</bool>
</property>
<property stdset="1">
<name>geometry</name>
<rect>
<x>61</x>
<y>91</y>
<width>165</width>
<height>26</height>
</rect>
</property>
<property stdset="1">
<name>text</name>
<string>&amp;Maintain aspect ratio</string>
</property>
<property>
<name>toolTip</name>
<string>Maintain aspect ratio with largest dimension</string>
</property>
</widget>
<widget>
<class>QLineEdit</class> <class>QLineEdit</class>
<property stdset="1"> <property stdset="1">
<name>name</name> <name>name</name>
@ -826,49 +764,19 @@
<name>enabled</name> <name>enabled</name>
<bool>true</bool> <bool>true</bool>
</property> </property>
<property stdset="1">
<name>geometry</name>
<rect>
<x>61</x>
<y>13</y>
<width>165</width>
<height>30</height>
</rect>
</property>
<property> <property>
<name>toolTip</name> <name>toolTip</name>
<string>Width of image in output</string> <string>Width of image in output</string>
</property> </property>
</widget> </widget>
<widget> <widget row="0" column="2" >
<class>QLabel</class> <class>QComboBox</class>
<property stdset="1"> <property stdset="1">
<name>name</name> <name>name</name>
<cstring>widthLA</cstring> <cstring>widthUnitCO</cstring>
</property>
<property stdset="1">
<name>enabled</name>
<bool>true</bool>
</property>
<property stdset="1">
<name>geometry</name>
<rect>
<x>11</x>
<y>11</y>
<width>44</width>
<height>34</height>
</rect>
</property>
<property stdset="1">
<name>text</name>
<string>&amp;Width:</string>
</property>
<property>
<name>buddy</name>
<cstring>widthED</cstring>
</property> </property>
</widget> </widget>
<widget> <widget row="1" column="0" >
<class>QLabel</class> <class>QLabel</class>
<property stdset="1"> <property stdset="1">
<name>name</name> <name>name</name>
@ -878,15 +786,6 @@
<name>enabled</name> <name>enabled</name>
<bool>true</bool> <bool>true</bool>
</property> </property>
<property stdset="1">
<name>geometry</name>
<rect>
<x>11</x>
<y>51</y>
<width>44</width>
<height>34</height>
</rect>
</property>
<property stdset="1"> <property stdset="1">
<name>text</name> <name>text</name>
<string>&amp;Height:</string> <string>&amp;Height:</string>
@ -896,6 +795,67 @@
<cstring>heightED</cstring> <cstring>heightED</cstring>
</property> </property>
</widget> </widget>
<widget row="0" column="0" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>widthLA</cstring>
</property>
<property stdset="1">
<name>enabled</name>
<bool>true</bool>
</property>
<property stdset="1">
<name>text</name>
<string>&amp;Width:</string>
</property>
<property>
<name>buddy</name>
<cstring>widthED</cstring>
</property>
</widget>
<widget row="1" column="1" >
<class>QLineEdit</class>
<property stdset="1">
<name>name</name>
<cstring>heightED</cstring>
</property>
<property stdset="1">
<name>enabled</name>
<bool>true</bool>
</property>
<property>
<name>toolTip</name>
<string>Height of image in output</string>
</property>
</widget>
<widget row="1" column="2" >
<class>LengthCombo</class>
<property stdset="1">
<name>name</name>
<cstring>heightUnitCO</cstring>
</property>
</widget>
<widget row="2" column="1" >
<class>QCheckBox</class>
<property stdset="1">
<name>name</name>
<cstring>aspectratioCB</cstring>
</property>
<property stdset="1">
<name>enabled</name>
<bool>true</bool>
</property>
<property stdset="1">
<name>text</name>
<string>&amp;Maintain aspect ratio</string>
</property>
<property>
<name>toolTip</name>
<string>Maintain aspect ratio with largest dimension</string>
</property>
</widget>
</grid>
</widget> </widget>
</grid> </grid>
</widget> </widget>
@ -928,28 +888,54 @@
<name>title</name> <name>title</name>
<string></string> <string></string>
</property> </property>
<widget> <grid>
<class>QCheckBox</class>
<property stdset="1"> <property stdset="1">
<name>name</name> <name>margin</name>
<cstring>clipCB</cstring> <number>11</number>
</property> </property>
<property stdset="1"> <property stdset="1">
<name>geometry</name> <name>spacing</name>
<rect> <number>6</number>
<x>11</x> </property>
<y>16</y> <widget row="1" column="0" rowspan="1" colspan="2" >
<width>150</width> <class>QLayoutWidget</class>
<height>26</height> <property stdset="1">
</rect> <name>name</name>
<cstring>Layout13</cstring>
</property>
<hbox>
<property stdset="1">
<name>margin</name>
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
<cstring>Layout12</cstring>
</property>
<vbox>
<property stdset="1">
<name>margin</name>
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget>
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>xLA_2</cstring>
</property> </property>
<property stdset="1"> <property stdset="1">
<name>text</name> <name>text</name>
<string>Clip to &amp;bounding box</string> <string></string>
</property>
<property>
<name>toolTip</name>
<string>Clip to bounding box values</string>
</property> </property>
</widget> </widget>
<widget> <widget>
@ -958,15 +944,6 @@
<name>name</name> <name>name</name>
<cstring>rtLA</cstring> <cstring>rtLA</cstring>
</property> </property>
<property stdset="1">
<name>geometry</name>
<rect>
<x>11</x>
<y>81</y>
<width>73</width>
<height>30</height>
</rect>
</property>
<property stdset="1"> <property stdset="1">
<name>text</name> <name>text</name>
<string>Right &amp;top:</string> <string>Right &amp;top:</string>
@ -976,61 +953,12 @@
<cstring>xrED</cstring> <cstring>xrED</cstring>
</property> </property>
</widget> </widget>
<widget>
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>yLA</cstring>
</property>
<property stdset="1">
<name>geometry</name>
<rect>
<x>223</x>
<y>53</y>
<width>127</width>
<height>22</height>
</rect>
</property>
<property stdset="1">
<name>text</name>
<string>y</string>
</property>
</widget>
<widget>
<class>QLineEdit</class>
<property stdset="1">
<name>name</name>
<cstring>xlED</cstring>
</property>
<property stdset="1">
<name>geometry</name>
<rect>
<x>90</x>
<y>117</y>
<width>127</width>
<height>30</height>
</rect>
</property>
<property>
<name>toolTip</name>
<string></string>
</property>
</widget>
<widget> <widget>
<class>QLabel</class> <class>QLabel</class>
<property stdset="1"> <property stdset="1">
<name>name</name> <name>name</name>
<cstring>lbLA</cstring> <cstring>lbLA</cstring>
</property> </property>
<property stdset="1">
<name>geometry</name>
<rect>
<x>11</x>
<y>117</y>
<width>73</width>
<height>30</height>
</rect>
</property>
<property stdset="1"> <property stdset="1">
<name>text</name> <name>text</name>
<string>&amp;Left bottom:</string> <string>&amp;Left bottom:</string>
@ -1040,53 +968,29 @@
<cstring>xlED</cstring> <cstring>xlED</cstring>
</property> </property>
</widget> </widget>
<widget> </vbox>
<class>QLineEdit</class>
<property stdset="1">
<name>name</name>
<cstring>ytED</cstring>
</property>
<property stdset="1">
<name>geometry</name>
<rect>
<x>223</x>
<y>81</y>
<width>127</width>
<height>30</height>
</rect>
</property>
</widget> </widget>
<widget> <widget>
<class>QLineEdit</class> <class>QLayoutWidget</class>
<property stdset="1"> <property stdset="1">
<name>name</name> <name>name</name>
<cstring>ybED</cstring> <cstring>Layout10</cstring>
</property>
<vbox>
<property stdset="1">
<name>margin</name>
<number>0</number>
</property> </property>
<property stdset="1"> <property stdset="1">
<name>geometry</name> <name>spacing</name>
<rect> <number>6</number>
<x>223</x>
<y>117</y>
<width>127</width>
<height>30</height>
</rect>
</property> </property>
</widget>
<widget> <widget>
<class>QLabel</class> <class>QLabel</class>
<property stdset="1"> <property stdset="1">
<name>name</name> <name>name</name>
<cstring>xLA</cstring> <cstring>xLA</cstring>
</property> </property>
<property stdset="1">
<name>geometry</name>
<rect>
<x>90</x>
<y>53</y>
<width>71</width>
<height>22</height>
</rect>
</property>
<property stdset="1"> <property stdset="1">
<name>text</name> <name>text</name>
<string>x</string> <string>x</string>
@ -1098,31 +1002,85 @@
<name>name</name> <name>name</name>
<cstring>xrED</cstring> <cstring>xrED</cstring>
</property> </property>
</widget>
<widget>
<class>QLineEdit</class>
<property stdset="1"> <property stdset="1">
<name>geometry</name> <name>name</name>
<rect> <cstring>xlED</cstring>
<x>90</x> </property>
<y>81</y> <property>
<width>127</width> <name>toolTip</name>
<height>30</height> <string></string>
</rect> </property>
</widget>
</vbox>
</widget>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
<cstring>Layout11</cstring>
</property>
<vbox>
<property stdset="1">
<name>margin</name>
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget>
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>yLA</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>y</string>
</property> </property>
</widget> </widget>
<widget> <widget>
<class>QLineEdit</class>
<property stdset="1">
<name>name</name>
<cstring>ytED</cstring>
</property>
</widget>
<widget>
<class>QLineEdit</class>
<property stdset="1">
<name>name</name>
<cstring>ybED</cstring>
</property>
</widget>
</vbox>
</widget>
</hbox>
</widget>
<widget row="0" column="0" >
<class>QCheckBox</class>
<property stdset="1">
<name>name</name>
<cstring>clipCB</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>Clip to &amp;bounding box</string>
</property>
<property>
<name>toolTip</name>
<string>Clip to bounding box values</string>
</property>
</widget>
<widget row="0" column="1" >
<class>QPushButton</class> <class>QPushButton</class>
<property stdset="1"> <property stdset="1">
<name>name</name> <name>name</name>
<cstring>getbbPB</cstring> <cstring>getbbPB</cstring>
</property> </property>
<property stdset="1">
<name>geometry</name>
<rect>
<x>167</x>
<y>11</y>
<width>183</width>
<height>36</height>
</rect>
</property>
<property stdset="1"> <property stdset="1">
<name>text</name> <name>text</name>
<string>&amp;Get from File</string> <string>&amp;Get from File</string>
@ -1132,6 +1090,7 @@
<string>Get bounding box from the (EPS) file</string> <string>Get bounding box from the (EPS) file</string>
</property> </property>
</widget> </widget>
</grid>
</widget> </widget>
</grid> </grid>
</widget> </widget>
@ -1260,6 +1219,7 @@
</grid> </grid>
</widget> </widget>
</widget> </widget>
</grid>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget> <customwidget>

View File

@ -1,3 +1,8 @@
2003-12-05 Angus Leeming <leeming@lyx.org>
* forms/form_external.fd: try and mimic Jürgen's changes to
ui/QExternalDialogBase.ui.
2003-12-05 Angus Leeming <leeming@lyx.org> 2003-12-05 Angus Leeming <leeming@lyx.org>
* FormExternal.[Ch]: * FormExternal.[Ch]:

View File

@ -287,7 +287,7 @@ alignment: FL_ALIGN_TOP_LEFT
style: FL_NORMAL_STYLE style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE size: FL_NORMAL_SIZE
lcol: FL_BLACK lcol: FL_BLACK
label: Scale|#l label: Scale:|#l
shortcut: shortcut:
resize: FL_RESIZE_ALL resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity gravity: FL_NoGravity FL_NoGravity
@ -347,7 +347,7 @@ alignment: FL_ALIGN_LEFT
style: FL_NORMAL_STYLE style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE size: FL_NORMAL_SIZE
lcol: FL_BLACK lcol: FL_BLACK
label: Angle|#n label: Angle:|#n
shortcut: shortcut:
resize: FL_RESIZE_ALL resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity gravity: FL_NoGravity FL_NoGravity
@ -358,14 +358,14 @@ argument: 0
-------------------- --------------------
class: FL_CHOICE class: FL_CHOICE
type: NORMAL_CHOICE type: NORMAL_CHOICE
box: 250 40 90 25 box: 75 70 120 25
boxtype: FL_FRAME_BOX boxtype: FL_FRAME_BOX
colors: FL_COL1 FL_BLACK colors: FL_COL1 FL_BLACK
alignment: FL_ALIGN_LEFT alignment: FL_ALIGN_LEFT
style: FL_NORMAL_STYLE style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE size: FL_NORMAL_SIZE
lcol: FL_BLACK lcol: FL_BLACK
label: Origin|#O label: Origin:|#O
shortcut: shortcut:
resize: FL_RESIZE_ALL resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity gravity: FL_NoGravity FL_NoGravity
@ -407,7 +407,7 @@ alignment: FL_ALIGN_LEFT
style: FL_NORMAL_STYLE style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE size: FL_NORMAL_SIZE
lcol: FL_BLACK lcol: FL_BLACK
label: Width|#W label: Width:|#W
shortcut: shortcut:
resize: FL_RESIZE_ALL resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity gravity: FL_NoGravity FL_NoGravity
@ -443,7 +443,7 @@ alignment: FL_ALIGN_LEFT
style: FL_NORMAL_STYLE style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE size: FL_NORMAL_SIZE
lcol: FL_BLACK lcol: FL_BLACK
label: Height|#H label: Height:|#H
shortcut: shortcut:
resize: FL_RESIZE_ALL resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity gravity: FL_NoGravity FL_NoGravity
@ -593,7 +593,7 @@ alignment: FL_ALIGN_LEFT
style: FL_NORMAL_STYLE style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE size: FL_NORMAL_SIZE
lcol: FL_BLACK lcol: FL_BLACK
label: Right top|#t label: Right top:|#t
shortcut: shortcut:
resize: FL_RESIZE_ALL resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity gravity: FL_NoGravity FL_NoGravity
@ -629,7 +629,7 @@ alignment: FL_ALIGN_LEFT
style: FL_NORMAL_STYLE style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE size: FL_NORMAL_SIZE
lcol: FL_BLACK lcol: FL_BLACK
label: Left bottom|#L label: Left bottom:|#L
shortcut: shortcut:
resize: FL_RESIZE_ALL resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity gravity: FL_NoGravity FL_NoGravity
@ -689,7 +689,7 @@ alignment: FL_ALIGN_TOP_LEFT
style: FL_NORMAL_STYLE style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE size: FL_NORMAL_SIZE
lcol: FL_BLACK lcol: FL_BLACK
label: Format|#t label: Format:|#t
shortcut: shortcut:
resize: FL_RESIZE_ALL resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity gravity: FL_NoGravity FL_NoGravity
@ -707,7 +707,7 @@ alignment: FL_ALIGN_TOP_LEFT
style: FL_NORMAL_STYLE style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE size: FL_NORMAL_SIZE
lcol: FL_BLACK lcol: FL_BLACK
label: Option|#p label: Option:|#p
shortcut: shortcut:
resize: FL_RESIZE_ALL resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity gravity: FL_NoGravity FL_NoGravity