patch for listingsui.ui and textlayout.ui attached
(will be offline until sunday...)
Bo Peng wrote:
Index: src/frontends/qt4/ui/ListingsUi.ui
===================================================================
The patch can not be cleanly applied here... I guess you will have to
open designer and repeat what you have done again.
Sorry about the inconvenience.
Bo
Index: src/frontends/qt4/ui/ListingsUi.ui
===================================================================
--- src/frontends/qt4/ui/ListingsUi.ui (revision 18249)
+++ src/frontends/qt4/ui/ListingsUi.ui (working copy)
@@ -8,8 +8,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>451</width>
- <height>392</height>
+ <width>398</width>
+ <height>387</height>
</rect>
</property>
<property name="windowTitle" >
@@ -18,135 +18,111 @@
<property name="sizeGripEnabled" >
<bool>true</bool>
</property>
- <widget class="QWidget" name="layoutWidget" >
- <property name="geometry" >
- <rect>
- <x>10</x>
- <y>10</y>
- <width>431</width>
- <height>371</height>
- </rect>
+ <layout class="QGridLayout" >
+ <property name="margin" >
+ <number>9</number>
</property>
- <layout class="QVBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <widget class="QCheckBox" name="inlineCB" >
- <property name="text" >
- <string>Inlined listing (\lstinline)</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QGroupBox" name="listingsGB" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>7</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="title" >
- <string>Parameters</string>
- </property>
- <widget class="QTextEdit" name="listingsED" >
- <property name="geometry" >
- <rect>
- <x>10</x>
- <y>100</y>
- <width>411</width>
- <height>171</height>
- </rect>
- </property>
- </widget>
- <widget class="QTextBrowser" name="listingsTB" >
- <property name="geometry" >
- <rect>
- <x>10</x>
- <y>20</y>
- <width>411</width>
- <height>71</height>
- </rect>
- </property>
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>4</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="cursor" >
- <cursor>14</cursor>
- </property>
- <property name="acceptDrops" >
- <bool>false</bool>
- </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>
- </item>
- <item>
- <layout class="QHBoxLayout" >
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item row="1" column="0" >
+ <widget class="QGroupBox" name="listingsGB" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>7</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="title" >
+ <string>Parameters</string>
+ </property>
+ <layout class="QVBoxLayout" >
<property name="margin" >
- <number>0</number>
+ <number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
+ <widget class="QTextBrowser" name="listingsTB" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
- <property name="sizeType" >
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" >
+ <property name="maximumSize" >
<size>
- <width>101</width>
- <height>27</height>
+ <width>16777215</width>
+ <height>120</height>
</size>
</property>
- </spacer>
- </item>
- <item>
- <widget class="QPushButton" name="okPB" >
- <property name="text" >
- <string>OK</string>
+ <property name="frameShape" >
+ <enum>QFrame::Box</enum>
</property>
- <property name="default" >
- <bool>true</bool>
- </property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="closePB" >
- <property name="text" >
- <string>Cancel</string>
- </property>
- </widget>
+ <widget class="QTextEdit" name="listingsED" />
</item>
</layout>
- </item>
- </layout>
- </widget>
+ </widget>
+ </item>
+ <item row="0" column="0" >
+ <widget class="QCheckBox" name="inlineCB" >
+ <property name="text" >
+ <string>Inlined listing (\lstinline)</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0" >
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType" >
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>101</width>
+ <height>27</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="okPB" >
+ <property name="text" >
+ <string>OK</string>
+ </property>
+ <property name="default" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="closePB" >
+ <property name="text" >
+ <string>Cancel</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
</widget>
<tabstops>
<tabstop>okPB</tabstop>
Index: src/frontends/qt4/ui/TextLayoutUi.ui
===================================================================
--- src/frontends/qt4/ui/TextLayoutUi.ui (revision 18249)
+++ src/frontends/qt4/ui/TextLayoutUi.ui (working copy)
@@ -5,312 +5,226 @@
<rect>
<x>0</x>
<y>0</y>
- <width>449</width>
- <height>517</height>
+ <width>318</width>
+ <height>369</height>
</rect>
</property>
<property name="windowTitle" >
<string/>
</property>
- <widget class="QWidget" name="" >
- <property name="geometry" >
- <rect>
- <x>9</x>
- <y>10</y>
- <width>399</width>
- <height>511</height>
- </rect>
+ <layout class="QGridLayout" >
+ <property name="margin" >
+ <number>9</number>
</property>
- <layout class="QVBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <widget class="QGroupBox" name="ButtonGroup6" >
- <property name="title" >
- <string>Separate Paragraphs With</string>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item row="3" column="0" >
+ <widget class="QGroupBox" name="listingsGB" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize" >
+ <size>
+ <width>0</width>
+ <height>150</height>
+ </size>
+ </property>
+ <property name="layoutDirection" >
+ <enum>Qt::LeftToRight</enum>
+ </property>
+ <property name="title" >
+ <string>Listings settings</string>
+ </property>
+ <property name="flat" >
+ <bool>true</bool>
+ </property>
+ <layout class="QGridLayout" >
+ <property name="margin" >
+ <number>9</number>
</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="QComboBox" name="skipCO" >
- <property name="enabled" >
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item row="2" column="2" colspan="2" >
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>178</width>
- <height>22</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="3" column="3" >
- <widget class="LengthCombo" native="1" name="skipLengthCO" >
- <property name="enabled" >
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item row="3" column="1" colspan="2" >
- <widget class="QLineEdit" name="skipLE" >
- <property name="enabled" >
- <bool>false</bool>
- </property>
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>1</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- <item rowspan="2" row="2" column="0" >
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>31</width>
- <height>58</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="1" column="0" colspan="4" >
- <widget class="QRadioButton" name="skipRB" >
- <property name="toolTip" >
- <string/>
- </property>
- <property name="text" >
- <string>&Vertical space</string>
- </property>
- </widget>
- </item>
- <item row="0" column="0" colspan="4" >
- <widget class="QRadioButton" name="indentRB" >
- <property name="toolTip" >
- <string>Indent consecutive paragraphs</string>
- </property>
- <property name="text" >
- <string>&Indentation</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QGroupBox" name="groupBox" >
- <property name="title" >
- <string>Spacing</string>
+ <property name="spacing" >
+ <number>6</number>
</property>
- <layout class="QVBoxLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <layout class="QVBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <layout class="QHBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <widget class="QLabel" name="lspacingL" >
- <property name="text" >
- <string>&Line spacing:</string>
- </property>
- <property name="buddy" >
- <cstring>lspacingCO</cstring>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="lspacingCO" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="duplicatesEnabled" >
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLineEdit" name="lspacingLE" >
- <property name="enabled" >
- <bool>false</bool>
- </property>
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>1</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <widget class="QCheckBox" name="twoColumnCB" >
- <property name="toolTip" >
- <string>Format text into two columns</string>
- </property>
- <property name="text" >
- <string>Two-&column document</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QGroupBox" name="listingsGB" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <item row="1" column="0" >
+ <widget class="QTextEdit" name="listingsED" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>7</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0" >
+ <widget class="QTextBrowser" name="listingsTB" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize" >
+ <size>
+ <width>16777215</width>
+ <height>75</height>
+ </size>
+ </property>
+ <property name="frameShape" >
+ <enum>QFrame::Box</enum>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="0" column="0" >
+ <widget class="QCheckBox" name="twoColumnCB" >
+ <property name="toolTip" >
+ <string>Format text into two columns</string>
+ </property>
+ <property name="text" >
+ <string>Two-&column document</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" >
+ <widget class="QGroupBox" name="ButtonGroup6" >
+ <property name="title" >
+ <string>Separate Paragraphs With</string>
+ </property>
+ <property name="flat" >
+ <bool>true</bool>
+ </property>
+ <layout class="QGridLayout" >
+ <property name="margin" >
+ <number>9</number>
</property>
- <property name="minimumSize" >
- <size>
- <width>0</width>
- <height>150</height>
- </size>
+ <property name="spacing" >
+ <number>6</number>
</property>
- <property name="layoutDirection" >
- <enum>Qt::LeftToRight</enum>
+ <item row="2" column="2" >
+ <widget class="LengthCombo" name="skipLengthCO" />
+ </item>
+ <item row="2" column="1" >
+ <widget class="QLineEdit" name="skipLE" >
+ <property name="enabled" >
+ <bool>false</bool>
+ </property>
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>1</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1" >
+ <widget class="QComboBox" name="skipCO" >
+ <property name="enabled" >
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" >
+ <widget class="QRadioButton" name="skipRB" >
+ <property name="toolTip" >
+ <string/>
+ </property>
+ <property name="text" >
+ <string>&Vertical space</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0" >
+ <widget class="QRadioButton" name="indentRB" >
+ <property name="toolTip" >
+ <string>Indent consecutive paragraphs</string>
+ </property>
+ <property name="text" >
+ <string>&Indentation</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="2" column="0" >
+ <widget class="QGroupBox" name="groupBox" >
+ <property name="title" >
+ <string>Spacing</string>
+ </property>
+ <property name="flat" >
+ <bool>true</bool>
+ </property>
+ <layout class="QGridLayout" >
+ <property name="margin" >
+ <number>9</number>
</property>
- <property name="title" >
- <string>Listings settings</string>
+ <property name="spacing" >
+ <number>6</number>
</property>
- <widget class="QTextBrowser" name="listingsTB" >
- <property name="geometry" >
- <rect>
- <x>10</x>
- <y>70</y>
- <width>371</width>
- <height>71</height>
- </rect>
- </property>
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>4</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="cursor" >
- <cursor>14</cursor>
- </property>
- <property name="acceptDrops" >
- <bool>false</bool>
- </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="geometry" >
- <rect>
- <x>10</x>
- <y>20</y>
- <width>371</width>
- <height>75</height>
- </rect>
- </property>
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </widget>
- </item>
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>397</width>
- <height>27</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
+ <item row="0" column="0" >
+ <widget class="QLabel" name="lspacingL" >
+ <property name="text" >
+ <string>&Line spacing:</string>
+ </property>
+ <property name="buddy" >
+ <cstring>lspacingCO</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1" >
+ <widget class="QComboBox" name="lspacingCO" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>5</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="duplicatesEnabled" >
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2" >
+ <widget class="QLineEdit" name="lspacingLE" >
+ <property name="enabled" >
+ <bool>false</bool>
+ </property>
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>1</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
</widget>
<customwidgets>
<customwidget>
<class>LengthCombo</class>
- <extends>QWidget</extends>
- <header>LengthCombo.h</header>
+ <extends>QComboBox</extends>
+ <header>lengthcombo.h</header>
</customwidget>
</customwidgets>
<tabstops>
