2010-03-21 12:36:46 +00:00
|
|
|
<ui version="4.0">
|
2006-03-24 15:59:11 +00:00
|
|
|
<class>TextLayoutUi</class>
|
2010-03-21 12:36:46 +00:00
|
|
|
<widget class="QWidget" name="TextLayoutUi">
|
|
|
|
<property name="geometry">
|
2006-03-24 15:59:11 +00:00
|
|
|
<rect>
|
|
|
|
<x>0</x>
|
|
|
|
<y>0</y>
|
2009-07-20 07:20:29 +00:00
|
|
|
<width>421</width>
|
2010-03-21 12:36:46 +00:00
|
|
|
<height>280</height>
|
2006-03-24 15:59:11 +00:00
|
|
|
</rect>
|
|
|
|
</property>
|
2010-03-21 12:36:46 +00:00
|
|
|
<property name="windowTitle">
|
2006-03-24 15:59:11 +00:00
|
|
|
<string/>
|
|
|
|
</property>
|
2010-03-21 12:36:46 +00:00
|
|
|
<layout class="QGridLayout" name="gridLayout">
|
|
|
|
<item row="0" column="0">
|
|
|
|
<widget class="QGroupBox" name="separateGB">
|
|
|
|
<property name="title">
|
2009-07-20 07:20:29 +00:00
|
|
|
<string>Separate paragraphs with</string>
|
2007-05-11 17:59:32 +00:00
|
|
|
</property>
|
2010-03-21 12:36:46 +00:00
|
|
|
<property name="flat">
|
2007-09-19 09:08:07 +00:00
|
|
|
<bool>true</bool>
|
|
|
|
</property>
|
2010-03-21 12:36:46 +00:00
|
|
|
<layout class="QGridLayout" name="gridLayout_3">
|
|
|
|
<item row="0" column="0">
|
|
|
|
<widget class="QRadioButton" name="indentRB">
|
|
|
|
<property name="minimumSize">
|
2009-07-20 07:20:29 +00:00
|
|
|
<size>
|
|
|
|
<width>91</width>
|
|
|
|
<height>18</height>
|
|
|
|
</size>
|
2007-06-12 17:10:28 +00:00
|
|
|
</property>
|
2010-03-21 12:36:46 +00:00
|
|
|
<property name="toolTip">
|
2009-07-20 07:20:29 +00:00
|
|
|
<string>Indent consecutive paragraphs</string>
|
|
|
|
</property>
|
2010-03-21 12:36:46 +00:00
|
|
|
<property name="text">
|
2011-02-13 09:43:06 +00:00
|
|
|
<string>&Indentation:</string>
|
2009-07-20 07:20:29 +00:00
|
|
|
</property>
|
|
|
|
</widget>
|
|
|
|
</item>
|
2010-03-21 12:36:46 +00:00
|
|
|
<item row="0" column="1">
|
|
|
|
<widget class="QComboBox" name="indentCO">
|
|
|
|
<property name="enabled">
|
2009-07-20 07:20:29 +00:00
|
|
|
<bool>false</bool>
|
|
|
|
</property>
|
2010-03-21 12:36:46 +00:00
|
|
|
<property name="toolTip">
|
2009-07-20 07:20:29 +00:00
|
|
|
<string>Size of the indentation</string>
|
2007-06-12 17:10:28 +00:00
|
|
|
</property>
|
|
|
|
</widget>
|
|
|
|
</item>
|
2010-03-21 12:36:46 +00:00
|
|
|
<item row="0" column="2" colspan="2">
|
2009-07-20 07:20:29 +00:00
|
|
|
<spacer>
|
2010-03-21 12:36:46 +00:00
|
|
|
<property name="orientation">
|
2009-07-20 07:20:29 +00:00
|
|
|
<enum>Qt::Horizontal</enum>
|
|
|
|
</property>
|
2010-03-21 12:36:46 +00:00
|
|
|
<property name="sizeType">
|
2009-07-20 07:20:29 +00:00
|
|
|
<enum>QSizePolicy::Expanding</enum>
|
|
|
|
</property>
|
2010-03-21 12:36:46 +00:00
|
|
|
<property name="sizeHint" stdset="0">
|
2009-07-20 07:20:29 +00:00
|
|
|
<size>
|
|
|
|
<width>135</width>
|
|
|
|
<height>26</height>
|
|
|
|
</size>
|
|
|
|
</property>
|
|
|
|
</spacer>
|
|
|
|
</item>
|
2010-03-21 12:36:46 +00:00
|
|
|
<item row="1" column="1">
|
|
|
|
<widget class="QLineEdit" name="indentLE">
|
|
|
|
<property name="enabled">
|
2009-07-20 07:20:29 +00:00
|
|
|
<bool>false</bool>
|
|
|
|
</property>
|
2010-03-21 12:36:46 +00:00
|
|
|
<property name="toolTip">
|
2009-07-20 07:20:29 +00:00
|
|
|
<string/>
|
|
|
|
</property>
|
2010-03-21 12:36:46 +00:00
|
|
|
<property name="text">
|
2009-07-20 07:20:29 +00:00
|
|
|
<string/>
|
2007-09-19 09:08:07 +00:00
|
|
|
</property>
|
2009-07-20 07:20:29 +00:00
|
|
|
</widget>
|
|
|
|
</item>
|
2010-03-21 12:36:46 +00:00
|
|
|
<item row="1" column="2">
|
|
|
|
<widget class="LengthCombo" name="indentLengthCO">
|
|
|
|
<property name="enabled">
|
2007-09-19 09:08:07 +00:00
|
|
|
<bool>false</bool>
|
|
|
|
</property>
|
2010-03-21 12:36:46 +00:00
|
|
|
<property name="toolTip">
|
2009-07-20 07:20:29 +00:00
|
|
|
<string/>
|
2008-09-08 21:51:38 +00:00
|
|
|
</property>
|
2009-07-20 07:20:29 +00:00
|
|
|
</widget>
|
|
|
|
</item>
|
2010-03-21 12:36:46 +00:00
|
|
|
<item row="1" column="3">
|
|
|
|
<spacer>
|
|
|
|
<property name="orientation">
|
|
|
|
<enum>Qt::Horizontal</enum>
|
|
|
|
</property>
|
|
|
|
<property name="sizeHint" stdset="0">
|
|
|
|
<size>
|
|
|
|
<width>40</width>
|
|
|
|
<height>20</height>
|
|
|
|
</size>
|
|
|
|
</property>
|
|
|
|
</spacer>
|
|
|
|
</item>
|
|
|
|
<item row="2" column="0">
|
|
|
|
<widget class="QRadioButton" name="skipRB">
|
|
|
|
<property name="minimumSize">
|
2009-07-20 07:20:29 +00:00
|
|
|
<size>
|
|
|
|
<width>91</width>
|
|
|
|
<height>18</height>
|
|
|
|
</size>
|
2007-09-19 09:08:07 +00:00
|
|
|
</property>
|
2010-03-21 12:36:46 +00:00
|
|
|
<property name="toolTip">
|
2009-07-20 07:20:29 +00:00
|
|
|
<string/>
|
|
|
|
</property>
|
2010-03-21 12:36:46 +00:00
|
|
|
<property name="text">
|
2011-02-13 09:43:06 +00:00
|
|
|
<string>&Vertical space:</string>
|
2007-09-19 09:08:07 +00:00
|
|
|
</property>
|
2009-07-20 07:20:29 +00:00
|
|
|
</widget>
|
|
|
|
</item>
|
2010-03-21 12:36:46 +00:00
|
|
|
<item row="2" column="1">
|
|
|
|
<widget class="QComboBox" name="skipCO">
|
|
|
|
<property name="enabled">
|
2007-09-19 09:08:07 +00:00
|
|
|
<bool>false</bool>
|
|
|
|
</property>
|
2010-03-21 12:36:46 +00:00
|
|
|
<property name="toolTip">
|
2009-07-20 07:20:29 +00:00
|
|
|
<string>Size of the vertical space</string>
|
|
|
|
</property>
|
2007-09-19 09:08:07 +00:00
|
|
|
</widget>
|
|
|
|
</item>
|
2010-03-21 12:36:46 +00:00
|
|
|
<item row="2" column="2" colspan="2">
|
2009-07-20 07:20:29 +00:00
|
|
|
<spacer>
|
2010-03-21 12:36:46 +00:00
|
|
|
<property name="orientation">
|
2009-07-20 07:20:29 +00:00
|
|
|
<enum>Qt::Horizontal</enum>
|
|
|
|
</property>
|
2010-03-21 12:36:46 +00:00
|
|
|
<property name="sizeType">
|
2009-07-20 07:20:29 +00:00
|
|
|
<enum>QSizePolicy::Expanding</enum>
|
|
|
|
</property>
|
2010-03-21 12:36:46 +00:00
|
|
|
<property name="sizeHint" stdset="0">
|
2009-07-20 07:20:29 +00:00
|
|
|
<size>
|
|
|
|
<width>137</width>
|
|
|
|
<height>26</height>
|
|
|
|
</size>
|
|
|
|
</property>
|
|
|
|
</spacer>
|
|
|
|
</item>
|
2010-03-21 12:36:46 +00:00
|
|
|
<item row="3" column="1">
|
|
|
|
<widget class="QLineEdit" name="skipLE">
|
|
|
|
<property name="enabled">
|
2009-07-20 07:20:29 +00:00
|
|
|
<bool>false</bool>
|
|
|
|
</property>
|
2010-03-21 12:36:46 +00:00
|
|
|
<property name="toolTip">
|
2009-07-20 07:20:29 +00:00
|
|
|
<string/>
|
|
|
|
</property>
|
|
|
|
</widget>
|
|
|
|
</item>
|
2010-03-21 12:36:46 +00:00
|
|
|
<item row="3" column="2">
|
|
|
|
<widget class="LengthCombo" name="skipLengthCO">
|
|
|
|
<property name="enabled">
|
2009-07-20 07:20:29 +00:00
|
|
|
<bool>false</bool>
|
|
|
|
</property>
|
2010-03-21 12:36:46 +00:00
|
|
|
<property name="toolTip">
|
2009-07-20 07:20:29 +00:00
|
|
|
<string/>
|
2009-07-14 01:40:51 +00:00
|
|
|
</property>
|
2007-05-11 17:59:32 +00:00
|
|
|
</widget>
|
|
|
|
</item>
|
2010-03-21 12:36:46 +00:00
|
|
|
<item row="3" column="3">
|
2009-07-20 08:09:32 +00:00
|
|
|
<spacer>
|
2010-03-21 12:36:46 +00:00
|
|
|
<property name="orientation">
|
2009-07-20 08:09:32 +00:00
|
|
|
<enum>Qt::Horizontal</enum>
|
|
|
|
</property>
|
2010-03-21 12:36:46 +00:00
|
|
|
<property name="sizeHint" stdset="0">
|
2009-07-20 08:09:32 +00:00
|
|
|
<size>
|
|
|
|
<width>40</width>
|
|
|
|
<height>20</height>
|
|
|
|
</size>
|
|
|
|
</property>
|
|
|
|
</spacer>
|
|
|
|
</item>
|
|
|
|
</layout>
|
|
|
|
</widget>
|
|
|
|
</item>
|
2010-03-21 12:36:46 +00:00
|
|
|
<item row="1" column="0">
|
|
|
|
<widget class="QGroupBox" name="spacingGB">
|
|
|
|
<property name="minimumSize">
|
2009-07-20 08:09:32 +00:00
|
|
|
<size>
|
|
|
|
<width>0</width>
|
|
|
|
<height>0</height>
|
|
|
|
</size>
|
|
|
|
</property>
|
2010-03-21 12:36:46 +00:00
|
|
|
<property name="title">
|
2009-07-20 08:09:32 +00:00
|
|
|
<string>Spacing</string>
|
|
|
|
</property>
|
2010-03-21 12:36:46 +00:00
|
|
|
<property name="flat">
|
2009-07-20 08:09:32 +00:00
|
|
|
<bool>true</bool>
|
|
|
|
</property>
|
2010-03-21 12:36:46 +00:00
|
|
|
<property name="checkable">
|
2009-07-20 08:09:32 +00:00
|
|
|
<bool>false</bool>
|
|
|
|
</property>
|
2010-03-21 12:36:46 +00:00
|
|
|
<layout class="QGridLayout" name="gridLayout_2">
|
|
|
|
<item row="0" column="0">
|
|
|
|
<widget class="QLabel" name="lspacingL">
|
|
|
|
<property name="minimumSize">
|
2009-07-20 08:09:32 +00:00
|
|
|
<size>
|
|
|
|
<width>91</width>
|
|
|
|
<height>18</height>
|
|
|
|
</size>
|
|
|
|
</property>
|
2010-03-21 12:36:46 +00:00
|
|
|
<property name="text">
|
2009-07-20 08:09:32 +00:00
|
|
|
<string>&Line spacing:</string>
|
|
|
|
</property>
|
2010-03-21 12:36:46 +00:00
|
|
|
<property name="buddy">
|
2009-07-20 08:09:32 +00:00
|
|
|
<cstring>lspacingCO</cstring>
|
|
|
|
</property>
|
|
|
|
</widget>
|
|
|
|
</item>
|
2010-03-21 12:36:46 +00:00
|
|
|
<item row="0" column="1">
|
|
|
|
<widget class="QComboBox" name="lspacingCO">
|
|
|
|
<property name="toolTip">
|
2009-07-20 08:09:32 +00:00
|
|
|
<string>Spacing type</string>
|
|
|
|
</property>
|
2010-03-21 12:36:46 +00:00
|
|
|
<property name="duplicatesEnabled">
|
2009-07-20 08:09:32 +00:00
|
|
|
<bool>false</bool>
|
|
|
|
</property>
|
|
|
|
</widget>
|
|
|
|
</item>
|
2010-03-21 12:36:46 +00:00
|
|
|
<item row="0" column="2">
|
|
|
|
<widget class="QLineEdit" name="lspacingLE">
|
|
|
|
<property name="enabled">
|
2009-07-20 08:09:32 +00:00
|
|
|
<bool>false</bool>
|
|
|
|
</property>
|
2010-03-21 12:36:46 +00:00
|
|
|
<property name="toolTip">
|
2009-07-20 08:09:32 +00:00
|
|
|
<string>Number of lines</string>
|
|
|
|
</property>
|
|
|
|
</widget>
|
|
|
|
</item>
|
2010-03-21 12:36:46 +00:00
|
|
|
<item row="0" column="3">
|
|
|
|
<spacer name="horizontalSpacer">
|
|
|
|
<property name="orientation">
|
|
|
|
<enum>Qt::Horizontal</enum>
|
|
|
|
</property>
|
|
|
|
<property name="sizeHint" stdset="0">
|
|
|
|
<size>
|
|
|
|
<width>69</width>
|
|
|
|
<height>20</height>
|
|
|
|
</size>
|
|
|
|
</property>
|
|
|
|
</spacer>
|
|
|
|
</item>
|
|
|
|
<item row="1" column="0" colspan="2">
|
|
|
|
<widget class="QCheckBox" name="twoColumnCB">
|
|
|
|
<property name="toolTip">
|
2009-07-20 08:09:32 +00:00
|
|
|
<string>Format text into two columns</string>
|
|
|
|
</property>
|
2010-03-21 12:36:46 +00:00
|
|
|
<property name="text">
|
2009-07-20 08:09:32 +00:00
|
|
|
<string>Two-&column document</string>
|
|
|
|
</property>
|
|
|
|
</widget>
|
|
|
|
</item>
|
2007-05-11 17:59:32 +00:00
|
|
|
</layout>
|
|
|
|
</widget>
|
|
|
|
</item>
|
2010-03-21 12:36:46 +00:00
|
|
|
<item row="2" column="0">
|
|
|
|
<spacer>
|
|
|
|
<property name="orientation">
|
|
|
|
<enum>Qt::Vertical</enum>
|
|
|
|
</property>
|
|
|
|
<property name="sizeType">
|
|
|
|
<enum>QSizePolicy::Expanding</enum>
|
|
|
|
</property>
|
|
|
|
<property name="sizeHint" stdset="0">
|
|
|
|
<size>
|
|
|
|
<width>403</width>
|
|
|
|
<height>21</height>
|
|
|
|
</size>
|
|
|
|
</property>
|
|
|
|
</spacer>
|
|
|
|
</item>
|
2007-05-11 17:59:32 +00:00
|
|
|
</layout>
|
2006-03-24 15:59:11 +00:00
|
|
|
</widget>
|
|
|
|
<customwidgets>
|
|
|
|
<customwidget>
|
|
|
|
<class>LengthCombo</class>
|
2007-09-19 09:08:07 +00:00
|
|
|
<extends>QComboBox</extends>
|
2007-09-19 14:59:42 +00:00
|
|
|
<header>LengthCombo.h</header>
|
2006-03-24 15:59:11 +00:00
|
|
|
</customwidget>
|
|
|
|
</customwidgets>
|
|
|
|
<tabstops>
|
|
|
|
<tabstop>indentRB</tabstop>
|
2011-09-24 16:39:29 +00:00
|
|
|
<tabstop>indentCO</tabstop>
|
|
|
|
<tabstop>indentLE</tabstop>
|
|
|
|
<tabstop>indentLengthCO</tabstop>
|
2006-03-24 15:59:11 +00:00
|
|
|
<tabstop>skipRB</tabstop>
|
|
|
|
<tabstop>skipCO</tabstop>
|
|
|
|
<tabstop>skipLE</tabstop>
|
2011-09-24 16:39:29 +00:00
|
|
|
<tabstop>skipLengthCO</tabstop>
|
2006-03-24 15:59:11 +00:00
|
|
|
<tabstop>lspacingCO</tabstop>
|
|
|
|
<tabstop>lspacingLE</tabstop>
|
|
|
|
<tabstop>twoColumnCB</tabstop>
|
|
|
|
</tabstops>
|
Add support for listings package. Two listings command \lstinline, \lstinputlisting and an environment \lstlisting are supported, along with preamble \lstset. \lstinputlisting is implemented through Include dialog, and the other two are implemented with a new inset listings, along with its dialog.
* src/LyXAction.cpp: listing-insert action
* src/insets/Inset.h,cpp: LISTINGS_CODE
* src/insets/InsetInclude.cpp: handle \lstinputlisting
* src/insets/InsetListings.h,cpp: new listings inset
* src/insets/InsetListingsParams.h,cpp: parameters from listings package
* src/insets/InsetCommandParams.h,cpp: handle lstinputlisting option
* src/Bidi.cpp: handle LISTINGS_CODE
* src/frontends/qt4/ui/TextLayoutUi.ui: update UI
* src/frontends/qt4/ui/ListingsUi.ui: new dialog
* src/frontends/qt4/ui/IncludeUi.ui: update UI
* src/frontends/qt4/QInclude.h,cpp: add lstinputlisting
* src/frontends/qt4/QDocument.h,cpp: add textedit for preamble listings_params
* src/frontends/qt4/QListings.h,cpp: new listings inset
* src/frontends/qt4/Dialogs.cpp: new listings dialog
* src/frontends/controllers/ControlInclude.h,cpp: add lstinputlisting
* src/frontends/controllers/ControlListings.h,cpp: new listings inset
* src/LyXFunc.cpp: handle LISTING_CODE
* src/Paragraph.cpp: handle LISTING_CODE
* src/factory.cpp: new listings inset
* src/CutAndPaste.cpp: handle LISTINGS_CODE
* src/LaTeXFeatures.cpp: require listings
* src/Text3.cpp: Handle LISTINGS_CODE
* src/lfuns.h: add LFUN_LISTING_INSERT
* src/Buffer.cpp: change lyx file format to 269
* src/BufferParams.h,cpp: add listings_params to preamble
* lib/lyx2lyx/LyX.py: lyx2lyx
* lib/lyx2lyx/lyx_1_5.py: lyx2lyx
* lib/ui/stdmenus.inc: new menu item (no shortcut!)
* src/insets/Makefile.am: update autotools
* src/frontends/controllers/Makefile.am
* src/frontends/qt4/Makefile.dialogs
* src/frontends/qt4/Makefile.am
* po/POTFILES.in: a few more translatable files.
* development/scons/scons_manifest.py: scons build system
* development/FORMAT: document format changes
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18243 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-09 19:11:42 +00:00
|
|
|
<includes>
|
2010-03-21 12:36:46 +00:00
|
|
|
<include location="local">qt_i18n.h</include>
|
Add support for listings package. Two listings command \lstinline, \lstinputlisting and an environment \lstlisting are supported, along with preamble \lstset. \lstinputlisting is implemented through Include dialog, and the other two are implemented with a new inset listings, along with its dialog.
* src/LyXAction.cpp: listing-insert action
* src/insets/Inset.h,cpp: LISTINGS_CODE
* src/insets/InsetInclude.cpp: handle \lstinputlisting
* src/insets/InsetListings.h,cpp: new listings inset
* src/insets/InsetListingsParams.h,cpp: parameters from listings package
* src/insets/InsetCommandParams.h,cpp: handle lstinputlisting option
* src/Bidi.cpp: handle LISTINGS_CODE
* src/frontends/qt4/ui/TextLayoutUi.ui: update UI
* src/frontends/qt4/ui/ListingsUi.ui: new dialog
* src/frontends/qt4/ui/IncludeUi.ui: update UI
* src/frontends/qt4/QInclude.h,cpp: add lstinputlisting
* src/frontends/qt4/QDocument.h,cpp: add textedit for preamble listings_params
* src/frontends/qt4/QListings.h,cpp: new listings inset
* src/frontends/qt4/Dialogs.cpp: new listings dialog
* src/frontends/controllers/ControlInclude.h,cpp: add lstinputlisting
* src/frontends/controllers/ControlListings.h,cpp: new listings inset
* src/LyXFunc.cpp: handle LISTING_CODE
* src/Paragraph.cpp: handle LISTING_CODE
* src/factory.cpp: new listings inset
* src/CutAndPaste.cpp: handle LISTINGS_CODE
* src/LaTeXFeatures.cpp: require listings
* src/Text3.cpp: Handle LISTINGS_CODE
* src/lfuns.h: add LFUN_LISTING_INSERT
* src/Buffer.cpp: change lyx file format to 269
* src/BufferParams.h,cpp: add listings_params to preamble
* lib/lyx2lyx/LyX.py: lyx2lyx
* lib/lyx2lyx/lyx_1_5.py: lyx2lyx
* lib/ui/stdmenus.inc: new menu item (no shortcut!)
* src/insets/Makefile.am: update autotools
* src/frontends/controllers/Makefile.am
* src/frontends/qt4/Makefile.dialogs
* src/frontends/qt4/Makefile.am
* po/POTFILES.in: a few more translatable files.
* development/scons/scons_manifest.py: scons build system
* development/FORMAT: document format changes
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18243 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-09 19:11:42 +00:00
|
|
|
</includes>
|
2006-03-24 15:59:11 +00:00
|
|
|
<resources/>
|
|
|
|
<connections/>
|
2006-03-05 17:24:44 +00:00
|
|
|
</ui>
|