The branch, master, has been updated. - Log -----------------------------------------------------------------
commit a4a610221ae62897b792ef2e5fb9bb6f65e7b1df Author: Juergen Spitzmueller <[email protected]> Date: Sat Mar 2 12:24:32 2013 +0100 Split the overcrowded and chaotic UI pref pane into two (#7524) diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp index e2ecb06..4ca856e 100644 --- a/src/frontends/qt4/GuiPrefs.cpp +++ b/src/frontends/qt4/GuiPrefs.cpp @@ -2507,6 +2507,66 @@ PrefUserInterface::PrefUserInterface(GuiPreferences * form) { setupUi(this); + connect(uiFilePB, SIGNAL(clicked()), + this, SLOT(selectUi())); + connect(uiFileED, SIGNAL(textChanged(QString)), + this, SIGNAL(changed())); + connect(iconSetCO, SIGNAL(activated(int)), + this, SIGNAL(changed())); + connect(lastfilesSB, SIGNAL(valueChanged(int)), + this, SIGNAL(changed())); + connect(tooltipCB, SIGNAL(toggled(bool)), + this, SIGNAL(changed())); + lastfilesSB->setMaximum(maxlastfiles); + + iconSetCO->addItem(qt_("Default"), QString()); + iconSetCO->addItem(qt_("Classic"), "classic"); + iconSetCO->addItem(qt_("Oxygen"), "oxygen"); +} + + +void PrefUserInterface::apply(LyXRC & rc) const +{ + rc.icon_set = fromqstr(iconSetCO->itemData( + iconSetCO->currentIndex()).toString()); + + rc.ui_file = internal_path(fromqstr(uiFileED->text())); + rc.num_lastfiles = lastfilesSB->value(); + rc.use_tooltip = tooltipCB->isChecked(); +} + + +void PrefUserInterface::update(LyXRC const & rc) +{ + int iconset = iconSetCO->findData(toqstr(rc.icon_set)); + if (iconset < 0) + iconset = 0; + iconSetCO->setCurrentIndex(iconset); + uiFileED->setText(toqstr(external_path(rc.ui_file))); + lastfilesSB->setValue(rc.num_lastfiles); + tooltipCB->setChecked(rc.use_tooltip); +} + + +void PrefUserInterface::selectUi() +{ + QString file = form_->browseUI(internalPath(uiFileED->text())); + if (!file.isEmpty()) + uiFileED->setText(file); +} + + +///////////////////////////////////////////////////////////////////// +// +// PrefDocumentHandling +// +///////////////////////////////////////////////////////////////////// + +PrefDocHandling::PrefDocHandling(GuiPreferences * form) + : PrefModule(qt_(catLookAndFeel), qt_("Document Handling"), form) +{ + setupUi(this); + connect(autoSaveCB, SIGNAL(toggled(bool)), autoSaveSB, SLOT(setEnabled(bool))); connect(autoSaveCB, SIGNAL(toggled(bool)), @@ -2517,12 +2577,6 @@ PrefUserInterface::PrefUserInterface(GuiPreferences * form) this, SIGNAL(changed())); connect(singleCloseTabButtonCB, SIGNAL(clicked()), this, SIGNAL(changed())); - connect(uiFilePB, SIGNAL(clicked()), - this, SLOT(selectUi())); - connect(uiFileED, SIGNAL(textChanged(QString)), - this, SIGNAL(changed())); - connect(iconSetCO, SIGNAL(activated(int)), - this, SIGNAL(changed())); connect(closeLastViewCO, SIGNAL(activated(int)), this, SIGNAL(changed())); connect(restoreCursorCB, SIGNAL(clicked()), @@ -2539,32 +2593,17 @@ PrefUserInterface::PrefUserInterface(GuiPreferences * form) this, SIGNAL(changed())); connect(saveCompressedCB, SIGNAL(clicked()), this, SIGNAL(changed())); - connect(lastfilesSB, SIGNAL(valueChanged(int)), - this, SIGNAL(changed())); - connect(tooltipCB, SIGNAL(toggled(bool)), - this, SIGNAL(changed())); - lastfilesSB->setMaximum(maxlastfiles); - - iconSetCO->addItem(qt_("Default"), QString()); - iconSetCO->addItem(qt_("Classic"), "classic"); - iconSetCO->addItem(qt_("Oxygen"), "oxygen"); } -void PrefUserInterface::apply(LyXRC & rc) const +void PrefDocHandling::apply(LyXRC & rc) const { - rc.icon_set = fromqstr(iconSetCO->itemData( - iconSetCO->currentIndex()).toString()); - - rc.ui_file = internal_path(fromqstr(uiFileED->text())); rc.use_lastfilepos = restoreCursorCB->isChecked(); rc.load_session = loadSessionCB->isChecked(); rc.allow_geometry_session = allowGeometrySessionCB->isChecked(); rc.autosave = autoSaveCB->isChecked() ? autoSaveSB->value() * 60 : 0; rc.make_backup = backupCB->isChecked(); rc.save_compressed = saveCompressedCB->isChecked(); - rc.num_lastfiles = lastfilesSB->value(); - rc.use_tooltip = tooltipCB->isChecked(); rc.open_buffers_in_tabs = openDocumentsInTabsCB->isChecked(); rc.single_instance = singleInstanceCB->isChecked(); rc.single_close_tab_button = singleCloseTabButtonCB->isChecked(); @@ -2585,13 +2624,8 @@ void PrefUserInterface::apply(LyXRC & rc) const } -void PrefUserInterface::update(LyXRC const & rc) +void PrefDocHandling::update(LyXRC const & rc) { - int iconset = iconSetCO->findData(toqstr(rc.icon_set)); - if (iconset < 0) - iconset = 0; - iconSetCO->setCurrentIndex(iconset); - uiFileED->setText(toqstr(external_path(rc.ui_file))); restoreCursorCB->setChecked(rc.use_lastfilepos); loadSessionCB->setChecked(rc.load_session); allowGeometrySessionCB->setChecked(rc.allow_geometry_session); @@ -2605,8 +2639,6 @@ void PrefUserInterface::update(LyXRC const & rc) autoSaveSB->setEnabled(autosave); backupCB->setChecked(rc.make_backup); saveCompressedCB->setChecked(rc.save_compressed); - lastfilesSB->setValue(rc.num_lastfiles); - tooltipCB->setChecked(rc.use_tooltip); openDocumentsInTabsCB->setChecked(rc.open_buffers_in_tabs); singleInstanceCB->setChecked(rc.single_instance && !rc.lyxpipes.empty()); singleInstanceCB->setEnabled(!rc.lyxpipes.empty()); @@ -2620,15 +2652,7 @@ void PrefUserInterface::update(LyXRC const & rc) } -void PrefUserInterface::selectUi() -{ - QString file = form_->browseUI(internalPath(uiFileED->text())); - if (!file.isEmpty()) - uiFileED->setText(file); -} - - -void PrefUserInterface::on_clearSessionPB_clicked() +void PrefDocHandling::on_clearSessionPB_clicked() { guiApp->clearSession(); } @@ -3241,6 +3265,7 @@ GuiPreferences::GuiPreferences(GuiView & lv) connect(restorePB, SIGNAL(clicked()), this, SLOT(slotRestore())); addModule(new PrefUserInterface(this)); + addModule(new PrefDocHandling(this)); addModule(new PrefEdit(this)); addModule(new PrefShortcuts(this)); PrefScreenFonts * screenfonts = new PrefScreenFonts(this); diff --git a/src/frontends/qt4/GuiPrefs.h b/src/frontends/qt4/GuiPrefs.h index 9cb96bc..02156ab 100644 --- a/src/frontends/qt4/GuiPrefs.h +++ b/src/frontends/qt4/GuiPrefs.h @@ -33,6 +33,7 @@ #include "ui_PrefCompletionUi.h" #include "ui_PrefColorsUi.h" #include "ui_PrefDisplayUi.h" +#include "ui_PrefDocHandlingUi.h" #include "ui_PrefEditUi.h" #include "ui_PrefPathsUi.h" #include "ui_PrefShortcutsUi.h" @@ -420,10 +421,24 @@ public: public Q_SLOTS: void selectUi(); +}; + + +class PrefDocHandling : public PrefModule, public Ui::PrefDocHandlingUi +{ + Q_OBJECT +public: + PrefDocHandling(GuiPreferences * form); + + void apply(LyXRC & rc) const; + void update(LyXRC const & rc); + +public Q_SLOTS: void on_clearSessionPB_clicked(); }; + class PrefEdit : public PrefModule, public Ui::PrefEditUi { Q_OBJECT diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am index bbb2c5f..fc42e9b 100644 --- a/src/frontends/qt4/Makefile.am +++ b/src/frontends/qt4/Makefile.am @@ -319,6 +319,7 @@ UIFILES = \ PrefColorsUi.ui \ PrefCompletionUi.ui \ PrefConvertersUi.ui \ + PrefDocHandlingUi.ui \ PrefOutputUi.ui \ PrefDisplayUi.ui \ PrefEditUi.ui \ diff --git a/src/frontends/qt4/ui/PrefDocHandlingUi.ui b/src/frontends/qt4/ui/PrefDocHandlingUi.ui new file mode 100644 index 0000000..aed6250 --- /dev/null +++ b/src/frontends/qt4/ui/PrefDocHandlingUi.ui @@ -0,0 +1,303 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>PrefDocHandlingUi</class> + <widget class="QWidget" name="PrefDocHandlingUi"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>524</width> + <height>440</height> + </rect> + </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="windowTitle"> + <string/> + </property> + <layout class="QGridLayout" name="gridLayout_4"> + <item row="0" column="0"> + <widget class="QGroupBox" name="GeometryGB"> + <property name="title"> + <string>Session handling</string> + </property> + <property name="flat"> + <bool>true</bool> + </property> + <layout class="QGridLayout" name="gridLayout_3"> + <item row="0" column="0"> + <widget class="QCheckBox" name="allowGeometrySessionCB"> + <property name="enabled"> + <bool>true</bool> + </property> + <property name="text"> + <string>Restore window layouts and &geometries</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QCheckBox" name="restoreCursorCB"> + <property name="toolTip"> + <string>Restore to the cursor position when the file was last closed</string> + </property> + <property name="text"> + <string>Restore cursor &positions</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QCheckBox" name="loadSessionCB"> + <property name="text"> + <string>&Load opened files from last session</string> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QPushButton" name="clearSessionPB"> + <property name="text"> + <string>&Clear all session information</string> + </property> + </widget> + </item> + <item row="3" column="1"> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>225</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + </item> + <item row="1" column="0"> + <widget class="QGroupBox" name="documentsGB"> + <property name="title"> + <string>Backup && saving</string> + </property> + <property name="flat"> + <bool>true</bool> + </property> + <layout class="QGridLayout" name="gridLayout_2"> + <item row="0" column="0"> + <widget class="QCheckBox" name="backupCB"> + <property name="text"> + <string>Backup &original documents when saving</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <widget class="QCheckBox" name="autoSaveCB"> + <property name="text"> + <string>&Backup documents, every</string> + </property> + </widget> + </item> + <item> + <widget class="QSpinBox" name="autoSaveSB"> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>300</number> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="TextLabel1"> + <property name="text"> + <string>&minutes</string> + </property> + <property name="buddy"> + <cstring>autoSaveSB</cstring> + </property> + </widget> + </item> + <item> + <spacer> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>61</width> + <height>21</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item row="2" column="0"> + <widget class="QCheckBox" name="saveCompressedCB"> + <property name="text"> + <string>&Save documents compressed by default</string> + </property> + </widget> + </item> + <item row="3" column="0"> + <layout class="QHBoxLayout" name="horizontalLayout_3"> + <item> + <widget class="QLabel" name="lastfilesLA"> + <property name="text"> + <string>Ma&ximum last files:</string> + </property> + <property name="buddy"> + <cstring>lastfilesSB</cstring> + </property> + </widget> + </item> + <item> + <widget class="QSpinBox" name="lastfilesSB"> + <property name="maximum"> + <number>9</number> + </property> + </widget> + </item> + <item> + <spacer> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>48</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + </layout> + </widget> + </item> + <item row="2" column="0"> + <widget class="QGroupBox" name="tabsGB"> + <property name="title"> + <string>Windows && work area</string> + </property> + <property name="flat"> + <bool>true</bool> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QCheckBox" name="openDocumentsInTabsCB"> + <property name="text"> + <string>Open documents in &tabs</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QCheckBox" name="singleInstanceCB"> + <property name="toolTip"> + <string>Whether to open documents in an already running instance of LyX. +(Set the LyXServer pipe path and restart LyX to enable this feature)</string> + </property> + <property name="text"> + <string>Use s&ingle instance</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QCheckBox" name="singleCloseTabButtonCB"> + <property name="toolTip"> + <string>Whether to place close button on each tab or only one in the top left.</string> + </property> + <property name="text"> + <string>Displa&y single close-tab button</string> + </property> + </widget> + </item> + <item row="3" column="0"> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Closing last &view:</string> + </property> + <property name="buddy"> + <cstring>closeLastViewCO</cstring> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="closeLastViewCO"> + <item> + <property name="text"> + <string>Closes document</string> + </property> + </item> + <item> + <property name="text"> + <string>Hides document</string> + </property> + </item> + <item> + <property name="text"> + <string>Ask the user</string> + </property> + </item> + </widget> + </item> + <item> + <spacer name="horizontalSpacer_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + </layout> + </widget> + </item> + <item row="3" column="0"> + <spacer> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>395</width> + <height>16</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + <layoutdefault spacing="4" margin="9"/> + <tabstops> + <tabstop>restoreCursorCB</tabstop> + <tabstop>loadSessionCB</tabstop> + <tabstop>clearSessionPB</tabstop> + <tabstop>backupCB</tabstop> + <tabstop>autoSaveCB</tabstop> + <tabstop>autoSaveSB</tabstop> + <tabstop>saveCompressedCB</tabstop> + <tabstop>lastfilesSB</tabstop> + </tabstops> + <includes> + <include location="local">qt_i18n.h</include> + </includes> + <resources/> + <connections/> +</ui> diff --git a/src/frontends/qt4/ui/PrefUi.ui b/src/frontends/qt4/ui/PrefUi.ui index a9a8dc5..e9cb131 100644 --- a/src/frontends/qt4/ui/PrefUi.ui +++ b/src/frontends/qt4/ui/PrefUi.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>604</width> - <height>559</height> + <width>450</width> + <height>271</height> </rect> </property> <property name="sizePolicy"> @@ -21,59 +21,93 @@ </property> <layout class="QGridLayout" name="gridLayout_3"> <item row="0" column="0"> - <widget class="QLabel" name="uiFileLA"> - <property name="text"> - <string>&User interface file:</string> - </property> - <property name="buddy"> - <cstring>uiFileED</cstring> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> + <string>General Look && Feel</string> </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QLineEdit" name="uiFileED"/> - </item> - <item row="0" column="2"> - <widget class="QPushButton" name="uiFilePB"> - <property name="text"> - <string>Bro&wse...</string> + <property name="flat"> + <bool>true</bool> </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QLabel" name="uiFileLA"> + <property name="text"> + <string>&User interface file:</string> + </property> + <property name="buddy"> + <cstring>uiFileED</cstring> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="uiFileED"/> + </item> + <item> + <widget class="QPushButton" name="uiFilePB"> + <property name="text"> + <string>Bro&wse...</string> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>77</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item row="1" column="0"> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <widget class="QLabel" name="iconSetLA"> + <property name="text"> + <string>&Icon Set:</string> + </property> + <property name="buddy"> + <cstring>iconSetCO</cstring> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="iconSetCO"> + <property name="toolTip"> + <string>The icon set to use. Warning: normal size of icons may be +wrong until you save the preferences and restart LyX.</string> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + </layout> </widget> </item> - <item row="0" column="3"> - <spacer name="horizontalSpacer_2"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>77</width> - <height>20</height> - </size> - </property> - </spacer> - </item> <item row="1" column="0"> - <widget class="QLabel" name="iconSetLA"> - <property name="text"> - <string>&Icon Set:</string> - </property> - <property name="buddy"> - <cstring>iconSetCO</cstring> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QComboBox" name="iconSetCO"> - <property name="toolTip"> - <string>The icon set to use. Warning: normal size of icons may be
wrong until you save the preferences and restart LyX.</string> - </property> - </widget> - </item> - <item row="2" column="0" colspan="4"> <widget class="QGroupBox" name="pixmapCacheGB_2"> <property name="title"> - <string>Automatic help</string> + <string>Context help</string> </property> <property name="alignment"> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> @@ -101,126 +135,16 @@ </layout> </widget> </item> - <item row="3" column="0" colspan="4"> - <widget class="QGroupBox" name="GeometryGB"> - <property name="title"> - <string>Session</string> - </property> - <property name="flat"> - <bool>true</bool> - </property> - <layout class="QGridLayout" name="gridLayout_4"> - <item row="0" column="0" colspan="2"> - <widget class="QCheckBox" name="allowGeometrySessionCB"> - <property name="enabled"> - <bool>true</bool> - </property> - <property name="text"> - <string>Restore window layouts and &geometries</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QCheckBox" name="restoreCursorCB"> - <property name="toolTip"> - <string>Restore to the cursor position when the file was last closed</string> - </property> - <property name="text"> - <string>Restore cursor &positions</string> - </property> - </widget> - </item> - <item row="2" column="0" colspan="2"> - <widget class="QCheckBox" name="loadSessionCB"> - <property name="text"> - <string>&Load opened files from last session</string> - </property> - </widget> - </item> - <item row="3" column="0"> - <widget class="QPushButton" name="clearSessionPB"> - <property name="text"> - <string>&Clear all session information</string> - </property> - </widget> - </item> - <item row="3" column="1"> - <spacer name="horizontalSpacer"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>225</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - </item> - <item row="4" column="0" colspan="4"> + <item row="2" column="0"> <widget class="QGroupBox" name="documentsGB"> <property name="title"> - <string>Documents</string> + <string>Menus</string> </property> <property name="flat"> <bool>true</bool> </property> <layout class="QGridLayout" name="gridLayout_2"> - <item row="0" column="0" colspan="5"> - <widget class="QCheckBox" name="backupCB"> - <property name="text"> - <string>Backup original documents when saving</string> - </property> - </widget> - </item> - <item row="1" column="0" colspan="3"> - <widget class="QCheckBox" name="autoSaveCB"> - <property name="text"> - <string>&Backup documents, every</string> - </property> - </widget> - </item> - <item row="1" column="3"> - <widget class="QSpinBox" name="autoSaveSB"> - <property name="minimum"> - <number>1</number> - </property> - <property name="maximum"> - <number>300</number> - </property> - </widget> - </item> - <item row="1" column="4"> - <widget class="QLabel" name="TextLabel1"> - <property name="text"> - <string>minutes</string> - </property> - </widget> - </item> - <item row="1" column="5"> - <spacer> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>61</width> - <height>21</height> - </size> - </property> - </spacer> - </item> - <item row="2" column="0"> - <widget class="QCheckBox" name="saveCompressedCB"> - <property name="text"> - <string>&Save documents compressed by default</string> - </property> - </widget> - </item> - <item row="3" column="0"> + <item row="0" column="0"> <widget class="QLabel" name="lastfilesLA"> <property name="text"> <string>&Maximum last files:</string> @@ -230,14 +154,7 @@ </property> </widget> </item> - <item row="3" column="1"> - <widget class="QSpinBox" name="lastfilesSB"> - <property name="maximum"> - <number>9</number> - </property> - </widget> - </item> - <item row="3" column="2" colspan="2"> + <item row="0" column="3" colspan="2"> <spacer> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -250,66 +167,17 @@ </property> </spacer> </item> - <item row="4" column="0" colspan="2"> - <widget class="QCheckBox" name="openDocumentsInTabsCB"> - <property name="text"> - <string>&Open documents in tabs</string> - </property> - </widget> - </item> - <item row="5" column="0" colspan="2"> - <widget class="QCheckBox" name="singleInstanceCB"> - <property name="toolTip"> - <string>Whether to open documents in an already running instance of LyX.
(Set the LyXServer pipe path and restart LyX to enable this feature)</string> - </property> - <property name="text"> - <string>S&ingle instance</string> - </property> - </widget> - </item> - <item row="6" column="0" colspan="2"> - <widget class="QCheckBox" name="singleCloseTabButtonCB"> - <property name="toolTip"> - <string>Whether to place close button on each tab or only one in the top left.</string> - </property> - <property name="text"> - <string>&Single close-tab button</string> - </property> - </widget> - </item> - <item row="7" column="0"> - <widget class="QLabel" name="label"> - <property name="text"> - <string>Closing last view:</string> - </property> - <property name="buddy"> - <cstring>closeLastViewCO</cstring> + <item row="0" column="2"> + <widget class="QSpinBox" name="lastfilesSB"> + <property name="maximum"> + <number>9</number> </property> </widget> </item> - <item row="7" column="1" colspan="4"> - <widget class="QComboBox" name="closeLastViewCO"> - <item> - <property name="text"> - <string>Closes document</string> - </property> - </item> - <item> - <property name="text"> - <string>Hides document</string> - </property> - </item> - <item> - <property name="text"> - <string>Ask the user</string> - </property> - </item> - </widget> - </item> </layout> </widget> </item> - <item row="5" column="0" colspan="4"> + <item row="3" column="0"> <spacer> <property name="orientation"> <enum>Qt::Vertical</enum> @@ -330,16 +198,6 @@ <tabstop>uiFilePB</tabstop> <tabstop>iconSetCO</tabstop> <tabstop>tooltipCB</tabstop> - <tabstop>allowGeometrySessionCB</tabstop> - <tabstop>restoreCursorCB</tabstop> - <tabstop>loadSessionCB</tabstop> - <tabstop>clearSessionPB</tabstop> - <tabstop>backupCB</tabstop> - <tabstop>autoSaveCB</tabstop> - <tabstop>autoSaveSB</tabstop> - <tabstop>saveCompressedCB</tabstop> - <tabstop>lastfilesSB</tabstop> - <tabstop>openDocumentsInTabsCB</tabstop> </tabstops> <includes> <include location="local">qt_i18n.h</include> ----------------------------------------------------------------------- Summary of changes: src/frontends/qt4/GuiPrefs.cpp | 103 ++++++---- src/frontends/qt4/GuiPrefs.h | 15 ++ src/frontends/qt4/Makefile.am | 1 + src/frontends/qt4/ui/PrefDocHandlingUi.ui | 303 +++++++++++++++++++++++++++ src/frontends/qt4/ui/PrefUi.ui | 324 ++++++++--------------------- 5 files changed, 474 insertions(+), 272 deletions(-) create mode 100644 src/frontends/qt4/ui/PrefDocHandlingUi.ui hooks/post-receive -- The LyX Source Repository
