Patch attached. Will be applied later.
Cheers, Bo
Index: src/frontends/qt4/ui/ListingsUi.ui =================================================================== --- src/frontends/qt4/ui/ListingsUi.ui (revision 18382) +++ src/frontends/qt4/ui/ListingsUi.ui (working copy) @@ -8,8 +8,8 @@ <rect> <x>0</x> <y>0</y> - <width>511</width> - <height>325</height> + <width>548</width> + <height>353</height> </rect> </property> <property name="windowTitle" > @@ -18,14 +18,14 @@ <property name="sizeGripEnabled" > <bool>true</bool> </property> - <layout class="QGridLayout" > + <layout class="QVBoxLayout" > <property name="margin" > <number>9</number> </property> <property name="spacing" > <number>6</number> </property> - <item row="0" column="0" > + <item> <widget class="QTabWidget" name="listingsTW" > <property name="currentIndex" > <number>0</number> @@ -34,347 +34,392 @@ <attribute name="title" > <string>Main Settings</string> </attribute> - <layout class="QGridLayout" > + <layout class="QVBoxLayout" > <property name="margin" > <number>9</number> </property> <property name="spacing" > <number>6</number> </property> - <item rowspan="2" row="0" column="2" > - <widget class="QGroupBox" name="basicstyleGB" > - <property name="title" > - <string>Style</string> + <item> + <layout class="QHBoxLayout" > + <property name="margin" > + <number>0</number> </property> - <layout class="QGridLayout" > - <property name="margin" > - <number>9</number> - </property> - <property name="spacing" > - <number>6</number> - </property> - <item row="2" column="0" colspan="2" > - <widget class="QCheckBox" name="breaklinesCB" > - <property name="toolTip" > - <string>Breaking lines longer than the linewidth</string> - </property> - <property name="text" > - <string>&Break long lines</string> - </property> - <property name="shortcut" > - <number>276824130</number> - </property> - </widget> - </item> - <item row="3" column="0" colspan="2" > - <widget class="QCheckBox" name="spaceCB" > - <property name="toolTip" > - <string>Insert a special symbol for a space</string> - </property> - <property name="text" > - <string>&Space as Symbol</string> - </property> - <property name="shortcut" > - <number>276824147</number> - </property> - </widget> - </item> - <item row="4" column="0" colspan="2" > - <widget class="QCheckBox" name="extendedcharsCB" > - <property name="enabled" > - <bool>true</bool> - </property> - <property name="toolTip" > - <string>Use extended character table</string> - </property> - <property name="text" > - <string>&Extended Chars</string> - </property> - <property name="shortcut" > - <number>276824133</number> - </property> - </widget> - </item> - <item row="1" column="0" > - <widget class="QLabel" name="fontstyle_label_3" > - <property name="text" > - <string>Font style:</string> - </property> - <property name="wordWrap" > - <bool>false</bool> - </property> - <property name="buddy" > - <cstring>fontstyleCO</cstring> - </property> - </widget> - </item> - <item row="1" column="1" > - <widget class="QComboBox" name="fontstyleCO" > - <property name="sizePolicy" > - <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="toolTip" > - <string>Choose the Font Style</string> - </property> - <property name="editable" > - <bool>true</bool> - </property> - <property name="autoCompletion" > - <bool>true</bool> - </property> - <property name="duplicatesEnabled" > - <bool>false</bool> - </property> - </widget> - </item> - <item row="0" column="0" > - <widget class="QLabel" name="fontsize_label_3" > - <property name="text" > - <string>Font size:</string> - </property> - <property name="wordWrap" > - <bool>false</bool> - </property> - <property name="buddy" > - <cstring>fontsizeCO</cstring> - </property> - </widget> - </item> - <item row="0" column="1" > - <widget class="QComboBox" name="fontsizeCO" > - <property name="sizePolicy" > - <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="toolTip" > - <string>Choose the Font Size</string> - </property> - <property name="editable" > - <bool>true</bool> - </property> - <property name="autoCompletion" > - <bool>true</bool> - </property> - <property name="duplicatesEnabled" > - <bool>false</bool> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item row="1" column="0" > - <widget class="QGroupBox" name="groupBox" > - <property name="title" > - <string>Language</string> + <property name="spacing" > + <number>6</number> </property> - <layout class="QGridLayout" > - <property name="margin" > - <number>9</number> - </property> - <property name="spacing" > - <number>6</number> - </property> - <item row="0" column="0" > - <widget class="QComboBox" name="languageCO" /> - </item> - </layout> - </widget> - </item> - <item row="0" column="0" > - <widget class="QGroupBox" name="groupBox_2" > - <property name="title" > - <string>Placement</string> - </property> - <layout class="QGridLayout" > - <property name="margin" > - <number>9</number> - </property> - <property name="spacing" > - <number>6</number> - </property> - <item row="2" column="1" > - <widget class="QLineEdit" name="placementLE" /> - </item> - <item row="2" column="0" > - <widget class="QLabel" name="captionL_5" > - <property name="text" > - <string>Placement:</string> + <item> + <layout class="QVBoxLayout" > + <property name="margin" > + <number>0</number> + </property> + <property name="spacing" > + <number>6</number> + </property> + <item> + <widget class="QGroupBox" name="placementGB" > + <property name="title" > + <string>Placement</string> + </property> + <layout class="QGridLayout" > + <property name="margin" > + <number>9</number> + </property> + <property name="spacing" > + <number>6</number> + </property> + <item row="2" column="1" > + <widget class="QLineEdit" name="placementLE" /> + </item> + <item row="2" column="0" > + <widget class="QLabel" name="captionL_5" > + <property name="text" > + <string>Placement:</string> + </property> + <property name="wordWrap" > + <bool>false</bool> + </property> + </widget> + </item> + <item row="1" column="0" colspan="2" > + <widget class="QCheckBox" name="floatCB" > + <property name="text" > + <string>Float</string> + </property> + </widget> + </item> + <item row="0" column="0" colspan="2" > + <widget class="QCheckBox" name="inlineCB" > + <property name="text" > + <string>Inline listing</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <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="0" column="0" > + <widget class="QComboBox" name="languageCO" /> + </item> + </layout> + </widget> + </item> + </layout> + </item> + <item> + <layout class="QVBoxLayout" > + <property name="margin" > + <number>0</number> + </property> + <property name="spacing" > + <number>6</number> + </property> + <item> + <widget class="QGroupBox" name="numberstyleGB" > + <property name="title" > + <string>Line numbering</string> + </property> + <layout class="QGridLayout" > + <property name="margin" > + <number>9</number> + </property> + <property name="spacing" > + <number>6</number> + </property> + <item row="0" column="0" > + <widget class="QLabel" name="label" > + <property name="text" > + <string>Side: </string> + </property> + </widget> + </item> + <item row="1" column="1" > + <widget class="QLineEdit" name="numberStepLE" > + <property name="toolTip" > + <string>Differenz between two numbered lines</string> + </property> + <property name="text" > + <string/> + </property> + <property name="alignment" > + <set>Qt::AlignLeading</set> + </property> + </widget> + </item> + <item row="1" column="0" > + <widget class="QLabel" name="stepnumberL" > + <property name="toolTip" > + <string>File name of image</string> + </property> + <property name="text" > + <string>Step:</string> + </property> + <property name="wordWrap" > + <bool>false</bool> + </property> + <property name="buddy" > + <cstring>numberStepLE</cstring> + </property> + </widget> + </item> + <item row="2" column="0" > + <widget class="QLabel" name="numberfontsizeL" > + <property name="text" > + <string>Font size:</string> + </property> + <property name="wordWrap" > + <bool>false</bool> + </property> + <property name="buddy" > + <cstring>numberFontSizeCO</cstring> + </property> + </widget> + </item> + <item row="2" column="1" > + <widget class="QComboBox" name="numberFontSizeCO" > + <property name="sizePolicy" > + <sizepolicy> + <hsizetype>7</hsizetype> + <vsizetype>0</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip" > + <string>Choose the Font Size</string> + </property> + <property name="editable" > + <bool>true</bool> + </property> + <property name="autoCompletion" > + <bool>true</bool> + </property> + <property name="duplicatesEnabled" > + <bool>false</bool> + </property> + </widget> + </item> + <item row="0" column="1" > + <widget class="QComboBox" name="numberSideCO" /> + </item> + </layout> + </widget> + </item> + <item> + <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="0" column="0" > + <widget class="QLabel" name="numberfontsizeL_3" > + <property name="text" > + <string>First line:</string> + </property> + <property name="wordWrap" > + <bool>false</bool> + </property> + <property name="buddy" > + <cstring>numberFontSizeCO</cstring> + </property> + </widget> + </item> + <item row="0" column="1" > + <widget class="QLineEdit" name="firstlineLE" > + <property name="toolTip" > + <string>Differenz between two numbered lines</string> + </property> + <property name="text" > + <string/> + </property> + <property name="alignment" > + <set>Qt::AlignLeading</set> + </property> + </widget> + </item> + <item row="1" column="1" > + <widget class="QLineEdit" name="lastlineLE" > + <property name="toolTip" > + <string>Differenz between two numbered lines</string> + </property> + <property name="text" > + <string/> + </property> + <property name="alignment" > + <set>Qt::AlignLeading</set> + </property> + </widget> + </item> + <item row="1" column="0" > + <widget class="QLabel" name="numberfontsizeL_2" > + <property name="text" > + <string>Last line:</string> + </property> + <property name="wordWrap" > + <bool>false</bool> + </property> + <property name="buddy" > + <cstring>numberFontSizeCO</cstring> + </property> + </widget> + </item> + </layout> + </widget> + </item> + </layout> + </item> + <item> + <widget class="QGroupBox" name="basicstyleGB" > + <property name="title" > + <string>Style</string> + </property> + <layout class="QGridLayout" > + <property name="margin" > + <number>9</number> </property> - <property name="wordWrap" > - <bool>false</bool> + <property name="spacing" > + <number>6</number> </property> - </widget> - </item> - <item row="1" column="0" colspan="2" > - <widget class="QCheckBox" name="floatCB" > - <property name="text" > - <string>Float</string> - </property> - </widget> - </item> - <item row="0" column="0" colspan="2" > - <widget class="QCheckBox" name="inlineCB" > - <property name="text" > - <string>Inline listing</string> - </property> - </widget> - </item> - </layout> - </widget> + <item row="2" column="0" colspan="2" > + <widget class="QCheckBox" name="breaklinesCB" > + <property name="toolTip" > + <string>Breaking lines longer than the linewidth</string> + </property> + <property name="text" > + <string>&Break long lines</string> + </property> + <property name="shortcut" > + <number>276824130</number> + </property> + </widget> + </item> + <item row="3" column="0" colspan="2" > + <widget class="QCheckBox" name="spaceCB" > + <property name="toolTip" > + <string>Insert a special symbol for a space</string> + </property> + <property name="text" > + <string>&Space as Symbol</string> + </property> + <property name="shortcut" > + <number>276824147</number> + </property> + </widget> + </item> + <item row="4" column="0" colspan="2" > + <widget class="QCheckBox" name="extendedcharsCB" > + <property name="enabled" > + <bool>true</bool> + </property> + <property name="toolTip" > + <string>Use extended character table</string> + </property> + <property name="text" > + <string>&Extended Chars</string> + </property> + <property name="shortcut" > + <number>276824133</number> + </property> + </widget> + </item> + <item row="1" column="0" > + <widget class="QLabel" name="fontstyle_label_3" > + <property name="text" > + <string>Font style:</string> + </property> + <property name="wordWrap" > + <bool>false</bool> + </property> + <property name="buddy" > + <cstring>fontstyleCO</cstring> + </property> + </widget> + </item> + <item row="1" column="1" > + <widget class="QComboBox" name="fontstyleCO" > + <property name="sizePolicy" > + <sizepolicy> + <hsizetype>7</hsizetype> + <vsizetype>0</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip" > + <string>Choose the Font Style</string> + </property> + <property name="editable" > + <bool>true</bool> + </property> + <property name="autoCompletion" > + <bool>true</bool> + </property> + <property name="duplicatesEnabled" > + <bool>false</bool> + </property> + </widget> + </item> + <item row="0" column="0" > + <widget class="QLabel" name="fontsize_label_3" > + <property name="text" > + <string>Font size:</string> + </property> + <property name="wordWrap" > + <bool>false</bool> + </property> + <property name="buddy" > + <cstring>fontsizeCO</cstring> + </property> + </widget> + </item> + <item row="0" column="1" > + <widget class="QComboBox" name="fontsizeCO" > + <property name="sizePolicy" > + <sizepolicy> + <hsizetype>7</hsizetype> + <vsizetype>0</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip" > + <string>Choose the Font Size</string> + </property> + <property name="editable" > + <bool>true</bool> + </property> + <property name="autoCompletion" > + <bool>true</bool> + </property> + <property name="duplicatesEnabled" > + <bool>false</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + </layout> </item> - <item rowspan="2" row="0" column="1" > - <widget class="QGroupBox" name="numberstyleGB" > - <property name="title" > - <string>Line numbering</string> - </property> - <layout class="QGridLayout" > - <property name="margin" > - <number>9</number> - </property> - <property name="spacing" > - <number>6</number> - </property> - <item row="4" column="0" > - <widget class="QLabel" name="numberfontsizeL_2" > - <property name="text" > - <string>Last line:</string> - </property> - <property name="wordWrap" > - <bool>false</bool> - </property> - <property name="buddy" > - <cstring>numberFontSizeCO</cstring> - </property> - </widget> - </item> - <item row="3" column="0" > - <widget class="QLabel" name="numberfontsizeL_3" > - <property name="text" > - <string>First line:</string> - </property> - <property name="wordWrap" > - <bool>false</bool> - </property> - <property name="buddy" > - <cstring>numberFontSizeCO</cstring> - </property> - </widget> - </item> - <item row="0" column="0" > - <widget class="QLabel" name="label" > - <property name="text" > - <string>Side: </string> - </property> - </widget> - </item> - <item row="0" column="1" > - <widget class="QComboBox" name="numberSideCO" /> - </item> - <item row="2" column="1" > - <widget class="QComboBox" name="numberFontSizeCO" > - <property name="sizePolicy" > - <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="toolTip" > - <string>Choose the Font Size</string> - </property> - <property name="editable" > - <bool>true</bool> - </property> - <property name="autoCompletion" > - <bool>true</bool> - </property> - <property name="duplicatesEnabled" > - <bool>false</bool> - </property> - </widget> - </item> - <item row="2" column="0" > - <widget class="QLabel" name="numberfontsizeL" > - <property name="text" > - <string>Font size:</string> - </property> - <property name="wordWrap" > - <bool>false</bool> - </property> - <property name="buddy" > - <cstring>numberFontSizeCO</cstring> - </property> - </widget> - </item> - <item row="1" column="0" > - <widget class="QLabel" name="stepnumberL" > - <property name="toolTip" > - <string>File name of image</string> - </property> - <property name="text" > - <string>Step:</string> - </property> - <property name="wordWrap" > - <bool>false</bool> - </property> - <property name="buddy" > - <cstring>numberStepLE</cstring> - </property> - </widget> - </item> - <item row="1" column="1" > - <widget class="QLineEdit" name="numberStepLE" > - <property name="toolTip" > - <string>Differenz between two numbered lines</string> - </property> - <property name="text" > - <string/> - </property> - <property name="alignment" > - <set>Qt::AlignLeading</set> - </property> - </widget> - </item> - <item row="3" column="1" > - <widget class="QLineEdit" name="firstlineLE" > - <property name="toolTip" > - <string>Differenz between two numbered lines</string> - </property> - <property name="text" > - <string/> - </property> - <property name="alignment" > - <set>Qt::AlignLeading</set> - </property> - </widget> - </item> - <item row="4" column="1" > - <widget class="QLineEdit" name="lastlineLE" > - <property name="toolTip" > - <string>Differenz between two numbered lines</string> - </property> - <property name="text" > - <string/> - </property> - <property name="alignment" > - <set>Qt::AlignLeading</set> - </property> - </widget> - </item> - </layout> - </widget> - </item> </layout> </widget> <widget class="QWidget" name="tab_2" > @@ -449,7 +494,7 @@ </widget> </widget> </item> - <item row="1" column="0" > + <item> <layout class="QHBoxLayout" > <property name="margin" > <number>0</number>