OK?
Jürgen
Index: src/frontends/qt4/ui/ListingsUi.ui =================================================================== --- src/frontends/qt4/ui/ListingsUi.ui (Revision 18810) +++ src/frontends/qt4/ui/ListingsUi.ui (Arbeitskopie) @@ -18,15 +18,23 @@ <property name="sizeGripEnabled" > <bool>true</bool> </property> - <layout class="QVBoxLayout" > + <layout class="QGridLayout" > <property name="margin" > <number>9</number> </property> <property name="spacing" > <number>6</number> </property> - <item> + <item row="0" column="0" > <widget class="QTabWidget" name="listingsTW" > + <property name="sizePolicy" > + <sizepolicy> + <hsizetype>3</hsizetype> + <vsizetype>3</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <property name="currentIndex" > <number>0</number> </property> @@ -185,10 +193,10 @@ </layout> </widget> </item> - <item row="1" column="1" > - <widget class="QGroupBox" name="rangeGB" > + <item row="0" column="0" > + <widget class="QGroupBox" name="placementGB" > <property name="title" > - <string>Range</string> + <string>Placement</string> </property> <layout class="QGridLayout" > <property name="margin" > @@ -197,110 +205,49 @@ <property name="spacing" > <number>6</number> </property> - <item row="1" column="0" > - <widget class="QLabel" name="numberfontsizeL_2" > - <property name="text" > - <string>&Last line:</string> + <item row="2" column="1" > + <widget class="QLineEdit" name="placementLE" > + <property name="toolTip" > + <string>Specify placement (htbp) for floating listings</string> </property> - <property name="wordWrap" > - <bool>false</bool> - </property> - <property name="buddy" > - <cstring>lastlineLE</cstring> - </property> </widget> </item> - <item row="1" column="1" > - <widget class="QLineEdit" name="lastlineLE" > + <item row="1" column="0" colspan="2" > + <widget class="QCheckBox" name="floatCB" > <property name="toolTip" > - <string>The last line to be printed</string> + <string>Check for floating listings</string> </property> <property name="text" > - <string/> + <string>&Float</string> </property> - <property name="alignment" > - <set>Qt::AlignLeading</set> - </property> </widget> </item> - <item row="0" column="1" > - <widget class="QLineEdit" name="firstlineLE" > + <item row="0" column="0" colspan="2" > + <widget class="QCheckBox" name="inlineCB" > <property name="toolTip" > - <string>The first line to be printed</string> + <string>Check for inline listings</string> </property> <property name="text" > - <string/> + <string>&Inline listing</string> </property> - <property name="alignment" > - <set>Qt::AlignLeading</set> - </property> </widget> </item> - <item row="0" column="0" > - <widget class="QLabel" name="numberfontsizeL_3" > + <item row="2" column="0" > + <widget class="QLabel" name="captionL_5" > <property name="text" > - <string>Fi&rst line:</string> + <string>&Placement:</string> </property> <property name="wordWrap" > <bool>false</bool> </property> <property name="buddy" > - <cstring>firstlineLE</cstring> + <cstring>placementLE</cstring> </property> </widget> </item> </layout> </widget> </item> - <item row="1" column="0" > - <widget class="QGroupBox" name="languageGB" > - <property name="title" > - <string>Language</string> - </property> - <layout class="QGridLayout" > - <property name="margin" > - <number>9</number> - </property> - <property name="spacing" > - <number>6</number> - </property> - <item row="1" column="1" > - <widget class="QComboBox" name="dialectCO" > - <property name="toolTip" > - <string>Select the dialect of the programming language, if available</string> - </property> - </widget> - </item> - <item row="1" column="0" > - <widget class="QLabel" name="dialectLBL" > - <property name="text" > - <string>&Dialect:</string> - </property> - <property name="buddy" > - <cstring>dialectCO</cstring> - </property> - </widget> - </item> - <item row="0" column="0" > - <widget class="QLabel" name="languageLBL" > - <property name="text" > - <string>Lan&guage:</string> - </property> - <property name="buddy" > - <cstring>languageCO</cstring> - </property> - </widget> - </item> - <item row="0" column="1" > - <widget class="QComboBox" name="languageCO" > - <property name="toolTip" > - <string>Select the programming language</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> <item row="0" column="1" > <widget class="QGroupBox" name="numberstyleGB" > <property name="title" > @@ -417,10 +364,10 @@ </layout> </widget> </item> - <item row="0" column="0" > - <widget class="QGroupBox" name="placementGB" > + <item row="1" column="0" > + <widget class="QGroupBox" name="languageGB" > <property name="title" > - <string>Placement</string> + <string>Language</string> </property> <layout class="QGridLayout" > <property name="margin" > @@ -429,43 +376,104 @@ <property name="spacing" > <number>6</number> </property> - <item row="2" column="1" > - <widget class="QLineEdit" name="placementLE" > + <item row="1" column="1" > + <widget class="QComboBox" name="dialectCO" > <property name="toolTip" > - <string>Specify placement (htbp) for floating listings</string> + <string>Select the dialect of the programming language, if available</string> </property> </widget> </item> - <item row="1" column="0" colspan="2" > - <widget class="QCheckBox" name="floatCB" > + <item row="1" column="0" > + <widget class="QLabel" name="dialectLBL" > + <property name="text" > + <string>&Dialect:</string> + </property> + <property name="buddy" > + <cstring>dialectCO</cstring> + </property> + </widget> + </item> + <item row="0" column="0" > + <widget class="QLabel" name="languageLBL" > + <property name="text" > + <string>Lan&guage:</string> + </property> + <property name="buddy" > + <cstring>languageCO</cstring> + </property> + </widget> + </item> + <item row="0" column="1" > + <widget class="QComboBox" name="languageCO" > <property name="toolTip" > - <string>Check for floating listings</string> + <string>Select the programming language</string> </property> + </widget> + </item> + </layout> + </widget> + </item> + <item row="1" column="1" > + <widget class="QGroupBox" name="rangeGB" > + <property name="title" > + <string>Range</string> + </property> + <layout class="QGridLayout" > + <property name="margin" > + <number>9</number> + </property> + <property name="spacing" > + <number>6</number> + </property> + <item row="1" column="0" > + <widget class="QLabel" name="numberfontsizeL_2" > <property name="text" > - <string>&Float</string> + <string>&Last line:</string> </property> + <property name="wordWrap" > + <bool>false</bool> + </property> + <property name="buddy" > + <cstring>lastlineLE</cstring> + </property> </widget> </item> - <item row="0" column="0" colspan="2" > - <widget class="QCheckBox" name="inlineCB" > + <item row="1" column="1" > + <widget class="QLineEdit" name="lastlineLE" > <property name="toolTip" > - <string>Check for inline listings</string> + <string>The last line to be printed</string> </property> <property name="text" > - <string>&Inline listing</string> + <string/> </property> + <property name="alignment" > + <set>Qt::AlignLeading</set> + </property> </widget> </item> - <item row="2" column="0" > - <widget class="QLabel" name="captionL_5" > + <item row="0" column="1" > + <widget class="QLineEdit" name="firstlineLE" > + <property name="toolTip" > + <string>The first line to be printed</string> + </property> <property name="text" > - <string>&Placement:</string> + <string/> </property> + <property name="alignment" > + <set>Qt::AlignLeading</set> + </property> + </widget> + </item> + <item row="0" column="0" > + <widget class="QLabel" name="numberfontsizeL_3" > + <property name="text" > + <string>Fi&rst line:</string> + </property> <property name="wordWrap" > <bool>false</bool> </property> <property name="buddy" > - <cstring>placementLE</cstring> + <cstring>firstlineLE</cstring> </property> </widget> </item> @@ -478,90 +486,100 @@ <attribute name="title" > <string>Ad&vanced</string> </attribute> - <widget class="QGroupBox" name="listingsGB" > - <property name="geometry" > - <rect> - <x>9</x> - <y>9</y> - <width>540</width> - <height>260</height> - </rect> + <layout class="QGridLayout" > + <property name="margin" > + <number>9</number> </property> - <property name="sizePolicy" > - <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>7</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <property name="spacing" > + <number>6</number> </property> - <property name="title" > - <string>More Parameters</string> - </property> - <layout class="QVBoxLayout" > - <property name="margin" > - <number>9</number> - </property> - <property name="spacing" > - <number>6</number> - </property> - <item> - <widget class="QSplitter" name="splitter" > - <property name="orientation" > - <enum>Qt::Horizontal</enum> + <item row="0" column="0" > + <widget class="QGroupBox" name="listingsGB" > + <property name="sizePolicy" > + <sizepolicy> + <hsizetype>3</hsizetype> + <vsizetype>3</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="title" > + <string>More Parameters</string> + </property> + <layout class="QGridLayout" > + <property name="margin" > + <number>9</number> </property> - <widget class="QTextBrowser" name="listingsTB" > - <property name="maximumSize" > - <size> - <width>16777215</width> - <height>16777215</height> - </size> - </property> - <property name="cursor" > - <cursor>0</cursor> - </property> - <property name="acceptDrops" > - <bool>false</bool> - </property> - <property name="toolTip" > - <string>Feedback window</string> - </property> - <property name="frameShape" > - <enum>QFrame::NoFrame</enum> - </property> - <property name="frameShadow" > - <enum>QFrame::Plain</enum> - </property> - <property name="lineWidth" > - <number>0</number> - </property> - <property name="acceptRichText" > - <bool>false</bool> - </property> - </widget> - <widget class="QTextEdit" name="listingsED" > - <property name="toolTip" > - <string>Input listing parameters here. Enter ? for a list of parameters.</string> - </property> - </widget> - </widget> - </item> - <item> - <widget class="QCheckBox" name="bypassCB" > - <property name="toolTip" > - <string>Check it to enter parameters that are not recognizable by LyX</string> + <property name="spacing" > + <number>6</number> </property> - <property name="text" > - <string>&Bypass validation</string> - </property> - </widget> - </item> - </layout> - </widget> + <item row="1" column="0" > + <widget class="QCheckBox" name="bypassCB" > + <property name="toolTip" > + <string>Check it to enter parameters that are not recognizable by LyX</string> + </property> + <property name="text" > + <string>&Bypass validation</string> + </property> + </widget> + </item> + <item row="0" column="0" > + <widget class="QSplitter" name="splitter" > + <property name="orientation" > + <enum>Qt::Horizontal</enum> + </property> + <widget class="QTextBrowser" name="listingsTB" > + <property name="maximumSize" > + <size> + <width>16777215</width> + <height>16777215</height> + </size> + </property> + <property name="cursor" > + <cursor>0</cursor> + </property> + <property name="acceptDrops" > + <bool>false</bool> + </property> + <property name="toolTip" > + <string>Feedback window</string> + </property> + <property name="frameShape" > + <enum>QFrame::NoFrame</enum> + </property> + <property name="frameShadow" > + <enum>QFrame::Plain</enum> + </property> + <property name="lineWidth" > + <number>0</number> + </property> + <property name="acceptRichText" > + <bool>false</bool> + </property> + </widget> + <widget class="QTextEdit" name="listingsED" > + <property name="sizePolicy" > + <sizepolicy> + <hsizetype>3</hsizetype> + <vsizetype>3</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip" > + <string>Input listing parameters here. Enter ? for a list of parameters.</string> + </property> + </widget> + </widget> + </item> + </layout> + </widget> + </item> + </layout> </widget> </widget> </item> - <item> + <item row="1" column="0" > <layout class="QHBoxLayout" > <property name="margin" > <number>0</number>