GuiCompare: Show the contents of the Options groupbox, add some accelerators and make it compatible with Qt4.2.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33185 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2010-01-24 01:49:22 +00:00
parent e3c9fa3d0d
commit e0c3837dcf

View File

@ -15,16 +15,19 @@
<property name="sizeGripEnabled"> <property name="sizeGripEnabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_1"> <layout class="QGridLayout">
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QGridLayout">
<property name="margin"> <property name="margin">
<number>9</number> <number>9</number>
</property> </property>
<item> <property name="spacing">
<number>6</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="newFileLA"> <widget class="QLabel" name="newFileLA">
<property name="text"> <property name="text">
<string>&amp;New Document:</string> <string>&amp;New Document:</string>
@ -34,12 +37,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="1" column="0">
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout">
<item> <item>
<widget class="QComboBox" name="newFileCB"> <widget class="QComboBox" name="newFileCB">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" > <sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -51,6 +56,14 @@
</item> </item>
<item> <item>
<widget class="QPushButton" name="newFilePB"> <widget class="QPushButton" name="newFilePB">
<property name="sizePolicy">
<sizepolicy>
<hsizetype>5</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text"> <property name="text">
<string>&amp;Browse...</string> <string>&amp;Browse...</string>
</property> </property>
@ -61,7 +74,7 @@
</item> </item>
</layout> </layout>
</item> </item>
<item> <item row="2" column="0">
<widget class="QLabel" name="oldFileLA"> <widget class="QLabel" name="oldFileLA">
<property name="text"> <property name="text">
<string>&amp;Old Document:</string> <string>&amp;Old Document:</string>
@ -71,12 +84,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="3" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout">
<item> <item>
<widget class="QComboBox" name="oldFileCB"> <widget class="QComboBox" name="oldFileCB">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" > <sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -88,6 +103,14 @@
</item> </item>
<item> <item>
<widget class="QPushButton" name="oldFilePB"> <widget class="QPushButton" name="oldFilePB">
<property name="sizePolicy">
<sizepolicy>
<hsizetype>5</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text"> <property name="text">
<string>Bro&amp;wse...</string> <string>Bro&amp;wse...</string>
</property> </property>
@ -98,10 +121,12 @@
</item> </item>
</layout> </layout>
</item> </item>
<item> <item row="4" column="0">
<widget class="QGroupBox" name="groupBox"> <widget class="QGroupBox" name="groupBox">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" > <sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -109,64 +134,59 @@
<property name="title"> <property name="title">
<string>Options</string> <string>Options</string>
</property> </property>
<widget class="QRadioButton" name="newSettingsRB"> <layout class="QGridLayout">
<property name="geometry"> <property name="margin">
<rect> <number>9</number>
<x>20</x>
<y>40</y>
<width>151</width>
<height>18</height>
</rect>
</property> </property>
<property name="text"> <property name="spacing">
<string>New Document</string> <number>6</number>
</property> </property>
</widget> <item row="0" column="0">
<widget class="QRadioButton" name="oldSettingsRB"> <widget class="QLabel" name="label">
<property name="geometry"> <property name="sizePolicy">
<rect> <sizepolicy>
<x>20</x> <hsizetype>0</hsizetype>
<y>60</y> <vsizetype>0</vsizetype>
<width>151</width> <horstretch>0</horstretch>
<height>18</height> <verstretch>0</verstretch>
</rect> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>Old Document</string> <string>Copy Document Settings from:</string>
</property> </property>
</widget> <property name="scaledContents">
<widget class="QLabel" name="label"> <bool>true</bool>
<property name="geometry"> </property>
<rect> </widget>
<x>20</x> </item>
<y>20</y> <item row="1" column="0">
<width>237</width> <widget class="QRadioButton" name="newSettingsRB">
<height>16</height> <property name="text">
</rect> <string>N&amp;ew Document</string>
</property> </property>
<property name="sizePolicy"> </widget>
<sizepolicy vsizetype="Preferred" hsizetype="Preferred" > </item>
<horstretch>0</horstretch> <item row="2" column="0">
<verstretch>0</verstretch> <widget class="QRadioButton" name="oldSettingsRB">
</sizepolicy> <property name="text">
</property> <string>Ol&amp;d Document</string>
<property name="text"> </property>
<string>Copy Document Settings from:</string> </widget>
</property> </item>
<property name="scaledContents"> </layout>
<bool>true</bool>
</property>
</widget>
</widget> </widget>
</item> </item>
<item> <item row="5" column="0">
<widget class="QProgressBar" name="progressBar"> <widget class="QProgressBar" name="progressBar">
<property name="value"> <property name="value">
<number>24</number> <number>24</number>
</property> </property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget> </widget>
</item> </item>
<item> <item row="6" column="0" >
<layout class="QHBoxLayout"> <layout class="QHBoxLayout">
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
@ -182,7 +202,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>QSizePolicy::Expanding</enum> <enum>QSizePolicy::Expanding</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -220,7 +240,7 @@
</item> </item>
</layout> </layout>
</item> </item>
<item> <item row="1" column="0" >
<widget class="QStatusBar" name="statusBar"/> <widget class="QStatusBar" name="statusBar"/>
</item> </item>
</layout> </layout>
@ -231,3 +251,4 @@
<resources/> <resources/>
<connections/> <connections/>
</ui> </ui>