Hi, all,
It is not bad to learn some signal-slot basics. Attached is a complete
qt3/qt4 patch that add these rc entries. Please test. If there is no
objection, I will apply the patch tomorrow.
Now, the only missing part of the session patch series is the save and
restoration of cursor stacks, which does not seem necessary if UUID
will be used. Lars, what is the status of uuid?
Bo
Index: src/frontends/qt3/QPrefs.C
===================================================================
--- src/frontends/qt3/QPrefs.C (revision 14512)
+++ src/frontends/qt3/QPrefs.C (working copy)
@@ -180,6 +180,14 @@
rc.bind_file = internal_path(uimod->bindFileED->text());
rc.use_lastfilepos = uimod->restoreCursorCB->isChecked();
rc.load_session = uimod->loadSessionCB->isChecked();
+ if (uimod->loadWindowSizeCB->isChecked()) {
+ rc.geometry_width = 0;
+ rc.geometry_height = 0;
+ } else {
+ rc.geometry_width = uimod->windowWidthSB->value();
+ rc.geometry_height = uimod->windowHeightSB->value();
+ }
+ rc.geometry_xysaved = uimod->loadWindowLocationCB->isChecked();
rc.cursor_follows_scrollbar = uimod->cursorFollowsCB->isChecked();
rc.autosave = uimod->autoSaveSB->value() * 60;
rc.make_backup = uimod->autoSaveCB->isChecked();
@@ -508,6 +516,15 @@
uimod->bindFileED->setText(external_path(rc.bind_file));
uimod->restoreCursorCB->setChecked(rc.use_lastfilepos);
uimod->loadSessionCB->setChecked(rc.load_session);
+ bool loadWindowSize = rc.geometry_width == 0 && rc.geometry_height == 0;
+ uimod->loadWindowSizeCB->setChecked(loadWindowSize);
+ uimod->windowWidthSB->setEnabled(!loadWindowSize);
+ uimod->windowHeightSB->setEnabled(!loadWindowSize);
+ if (!loadWindowSize) {
+ uimod->windowWidthSB->setValue(rc.geometry_width);
+ uimod->windowHeightSB->setValue(rc.geometry_height);
+ }
+ uimod->loadWindowLocationCB->setChecked(rc.geometry_xysaved);
uimod->cursorFollowsCB->setChecked(rc.cursor_follows_scrollbar);
// convert to minutes
int mins(rc.autosave / 60);
Index: src/frontends/qt3/QPrefsDialog.C
===================================================================
--- src/frontends/qt3/QPrefsDialog.C (revision 14512)
+++ src/frontends/qt3/QPrefsDialog.C (working copy)
@@ -233,6 +233,10 @@
connect(uiModule->bindFileED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
connect(uiModule->restoreCursorCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
connect(uiModule->loadSessionCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
+ connect(uiModule->loadWindowSizeCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
+ connect(uiModule->loadWindowLocationCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
+ connect(uiModule->windowWidthSB, SIGNAL(valueChanged(int)), this, SLOT(change_adaptor()));
+ connect(uiModule->windowHeightSB, SIGNAL(valueChanged(int)), this, SLOT(change_adaptor()));
connect(uiModule->cursorFollowsCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
connect(uiModule->autoSaveSB, SIGNAL(valueChanged(int)), this, SLOT(change_adaptor()));
connect(uiModule->autoSaveCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
Index: src/frontends/qt3/ui/QPrefUIModule.ui
===================================================================
--- src/frontends/qt3/ui/QPrefUIModule.ui (revision 14512)
+++ src/frontends/qt3/ui/QPrefUIModule.ui (working copy)
@@ -8,7 +8,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>412</width>
+ <width>606</width>
<height>441</height>
</rect>
</property>
@@ -23,17 +23,11 @@
<property name="caption">
<string>QPrefUIModule</string>
</property>
- <grid>
+ <vbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <property name="margin">
- <number>11</number>
- </property>
- <property name="spacing">
- <number>6</number>
- </property>
- <widget class="QLayoutWidget" row="0" column="0">
+ <widget class="QLayoutWidget">
<property name="name">
<cstring>Layout2</cstring>
</property>
@@ -97,38 +91,10 @@
</widget>
</grid>
</widget>
- <widget class="QCheckBox" row="3" column="0">
+ <widget class="QLayoutWidget">
<property name="name">
- <cstring>cursorFollowsCB</cstring>
+ <cstring>layout7</cstring>
</property>
- <property name="text">
- <string>Cursor follows &scrollbar</string>
- </property>
- <property name="accel">
- <string>Alt+S</string>
- </property>
- </widget>
- <spacer row="4" column="0">
- <property name="name">
- <cstring>Spacer7</cstring>
- </property>
- <property name="orientation">
- <enum>Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
- <property name="sizeHint">
- <size>
- <width>20</width>
- <height>90</height>
- </size>
- </property>
- </spacer>
- <widget class="QLayoutWidget" row="1" column="0">
- <property name="name">
- <cstring>layout8</cstring>
- </property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
@@ -267,21 +233,11 @@
</property>
<property name="sizeHint">
<size>
- <width>83</width>
+ <width>30</width>
<height>20</height>
</size>
</property>
</spacer>
- </hbox>
- </widget>
- <widget class="QLayoutWidget" row="2" column="0">
- <property name="name">
- <cstring>layout9</cstring>
- </property>
- <hbox>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
<widget class="QGroupBox">
<property name="name">
<cstring>sessionGB</cstring>
@@ -319,6 +275,173 @@
</widget>
<spacer>
<property name="name">
+ <cstring>spacer4_2</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Expanding</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>40</width>
+ <height>31</height>
+ </size>
+ </property>
+ </spacer>
+ </hbox>
+ </widget>
+ <widget class="QLayoutWidget">
+ <property name="name">
+ <cstring>layout15</cstring>
+ </property>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QGroupBox">
+ <property name="name">
+ <cstring>GeometryGB</cstring>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>5</hsizetype>
+ <vsizetype>5</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="title">
+ <string>Geometry</string>
+ </property>
+ <vbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QCheckBox">
+ <property name="name">
+ <cstring>loadWindowSizeCB</cstring>
+ </property>
+ <property name="text">
+ <string>Save/restore window size, or use fixed window</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ <widget class="QLayoutWidget">
+ <property name="name">
+ <cstring>layoutWidthHeight</cstring>
+ </property>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <spacer>
+ <property name="name">
+ <cstring>Spacer6_2</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Fixed</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>30</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>windowWidthLA</cstring>
+ </property>
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Width</string>
+ </property>
+ </widget>
+ <widget class="QSpinBox">
+ <property name="name">
+ <cstring>windowWidthSB</cstring>
+ </property>
+ <property name="maxValue">
+ <number>9999</number>
+ </property>
+ <property name="minValue">
+ <number>200</number>
+ </property>
+ <property name="lineStep">
+ <number>10</number>
+ </property>
+ </widget>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>windowHeightLA</cstring>
+ </property>
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Height</string>
+ </property>
+ </widget>
+ <widget class="QSpinBox">
+ <property name="name">
+ <cstring>windowHeightSB</cstring>
+ </property>
+ <property name="maxValue">
+ <number>9999</number>
+ </property>
+ <property name="minValue">
+ <number>200</number>
+ </property>
+ <property name="lineStep">
+ <number>10</number>
+ </property>
+ </widget>
+ <spacer>
+ <property name="name">
+ <cstring>Spacer6_2_2</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Fixed</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>30</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </hbox>
+ </widget>
+ <widget class="QCheckBox">
+ <property name="name">
+ <cstring>loadWindowLocationCB</cstring>
+ </property>
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="text">
+ <string>Save/restore window position</string>
+ </property>
+ <property name="toolTip" stdset="0">
+ <string>Restore to cursor position when the file was last closed</string>
+ </property>
+ </widget>
+ </vbox>
+ </widget>
+ <spacer>
+ <property name="name">
<cstring>spacer4</cstring>
</property>
<property name="orientation">
@@ -329,14 +452,42 @@
</property>
<property name="sizeHint">
<size>
- <width>138</width>
+ <width>257</width>
<height>31</height>
</size>
</property>
</spacer>
</hbox>
</widget>
- </grid>
+ <widget class="QCheckBox">
+ <property name="name">
+ <cstring>cursorFollowsCB</cstring>
+ </property>
+ <property name="text">
+ <string>Cursor follows &scrollbar</string>
+ </property>
+ <property name="accel">
+ <string>Alt+S</string>
+ </property>
+ </widget>
+ <spacer>
+ <property name="name">
+ <cstring>Spacer7</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Expanding</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>20</width>
+ <height>73</height>
+ </size>
+ </property>
+ </spacer>
+ </vbox>
</widget>
<connections>
<connection>
@@ -357,6 +508,30 @@
<receiver>TextLabel1</receiver>
<slot>setEnabled(bool)</slot>
</connection>
+ <connection>
+ <sender>loadWindowSizeCB</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>windowWidthSB</receiver>
+ <slot>setDisabled(bool)</slot>
+ </connection>
+ <connection>
+ <sender>loadWindowSizeCB</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>windowHeightSB</receiver>
+ <slot>setDisabled(bool)</slot>
+ </connection>
+ <connection>
+ <sender>loadWindowSizeCB</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>windowWidthLA</receiver>
+ <slot>setDisabled(bool)</slot>
+ </connection>
+ <connection>
+ <sender>loadWindowSizeCB</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>windowHeightLA</receiver>
+ <slot>setDisabled(bool)</slot>
+ </connection>
</connections>
<tabstops>
<tabstop>uiFileED</tabstop>
Index: src/frontends/qt4/QPrefsDialog.C
===================================================================
--- src/frontends/qt4/QPrefsDialog.C (revision 14512)
+++ src/frontends/qt4/QPrefsDialog.C (working copy)
@@ -1695,6 +1695,22 @@
this, SIGNAL(changed()));
connect(loadSessionCB, SIGNAL(toggled(bool)),
this, SIGNAL(changed()));
+ connect(loadWindowSizeCB, SIGNAL(toggled(bool)),
+ this, SIGNAL(changed()));
+ connect(loadWindowSizeCB, SIGNAL(toggled(bool)),
+ windowWidthLA, SLOT(setDisabled(bool)));
+ connect(loadWindowSizeCB, SIGNAL(toggled(bool)),
+ windowHeightLA, SLOT(setDisabled(bool)));
+ connect(loadWindowSizeCB, SIGNAL(toggled(bool)),
+ windowWidthSB, SLOT(setDisabled(bool)));
+ connect(loadWindowSizeCB, SIGNAL(toggled(bool)),
+ windowHeightSB, SLOT(setDisabled(bool)));
+ connect(loadWindowLocationCB, SIGNAL(toggled(bool)),
+ this, SIGNAL(changed()));
+ connect(windowWidthSB, SIGNAL(valueChanged(int)),
+ this, SIGNAL(changed()));
+ connect(windowHeightSB, SIGNAL(valueChanged(int)),
+ this, SIGNAL(changed()));
connect(cursorFollowsCB, SIGNAL(toggled(bool)),
this, SIGNAL(changed()));
connect(autoSaveSB, SIGNAL(valueChanged(int)),
@@ -1713,6 +1729,14 @@
rc.bind_file = internal_path(bindFileED->text());
rc.use_lastfilepos = restoreCursorCB->isChecked();
rc.load_session = loadSessionCB->isChecked();
+ if (loadWindowSizeCB->isChecked()) {
+ rc.geometry_width = 0;
+ rc.geometry_height = 0;
+ } else {
+ rc.geometry_width = windowWidthSB->value();
+ rc.geometry_height = windowHeightSB->value();
+ }
+ rc.geometry_xysaved = loadWindowLocationCB->isChecked();
rc.cursor_follows_scrollbar = cursorFollowsCB->isChecked();
rc.autosave = autoSaveSB->value() * 60;
rc.make_backup = autoSaveCB->isChecked();
@@ -1726,6 +1750,15 @@
bindFileED->setText(external_path(rc.bind_file));
restoreCursorCB->setChecked(rc.use_lastfilepos);
loadSessionCB->setChecked(rc.load_session);
+ bool loadWindowSize = rc.geometry_width == 0 && rc.geometry_height == 0;
+ loadWindowSizeCB->setChecked(loadWindowSize);
+ windowWidthSB->setEnabled(!loadWindowSize);
+ windowHeightSB->setEnabled(!loadWindowSize);
+ if (!loadWindowSize) {
+ windowWidthSB->setValue(rc.geometry_width);
+ windowHeightSB->setValue(rc.geometry_height);
+ }
+ loadWindowLocationCB->setChecked(rc.geometry_xysaved);
cursorFollowsCB->setChecked(rc.cursor_follows_scrollbar);
// convert to minutes
int mins(rc.autosave / 60);
Index: src/frontends/qt4/ui/QPrefUi.ui
===================================================================
--- src/frontends/qt4/ui/QPrefUi.ui (revision 14512)
+++ src/frontends/qt4/ui/QPrefUi.ui (working copy)
@@ -8,8 +8,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>416</width>
- <height>513</height>
+ <width>728</width>
+ <height>657</height>
</rect>
</property>
<property name="sizePolicy" >
@@ -23,195 +23,441 @@
<property name="windowTitle" >
<string/>
</property>
- <layout class="QGridLayout" >
+ <layout class="QVBoxLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
- <item row="2" column="0" >
- <widget class="QGroupBox" name="sessionGB" >
- <property name="title" >
- <string>Session</string>
+ <item>
+ <layout class="QGridLayout" >
+ <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="0" column="0" >
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item row="1" column="2" >
+ <widget class="QPushButton" name="bindFilePB" >
+ <property name="text" >
+ <string>B&rowse...</string>
+ </property>
+ </widget>
+ </item>
+ <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>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" >
+ <widget class="QLabel" name="bindFileLA" >
+ <property name="text" >
+ <string>&Bind file:</string>
+ </property>
+ <property name="buddy" >
+ <cstring>bindFileED</cstring>
+ </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>
+ </widget>
+ </item>
+ <item row="1" column="1" >
+ <widget class="QLineEdit" name="bindFileED" />
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QGroupBox" name="documentsGB" >
+ <property name="title" >
+ <string>Documents</string>
+ </property>
<layout class="QVBoxLayout" >
<property name="margin" >
- <number>0</number>
+ <number>11</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
- <widget class="QCheckBox" name="restoreCursorCB" >
+ <widget class="QCheckBox" name="autoSaveCB" >
<property name="text" >
- <string>Restore cursor positions</string>
+ <string>B&ackup documents </string>
</property>
</widget>
</item>
<item>
- <widget class="QCheckBox" name="loadSessionCB" >
- <property name="text" >
- <string>Load opened files from last session</string>
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
</property>
- </widget>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType" >
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>21</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QLabel" name="autoSaveLA" >
+ <property name="text" >
+ <string> every</string>
+ </property>
+ <property name="buddy" >
+ <cstring>autoSaveSB</cstring>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="autoSaveSB" >
+ <property name="maximum" >
+ <number>300</number>
+ </property>
+ <property name="minimum" >
+ <number>1</number>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="TextLabel1" >
+ <property name="text" >
+ <string>minutes</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
+ <item>
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="lastfilesLA" >
+ <property name="text" >
+ <string>&Maximum 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>
+ </layout>
+ </item>
</layout>
- </item>
- </layout>
- </widget>
- </item>
- <item row="3" column="0" >
- <widget class="QGroupBox" name="scrollGB" >
- <property name="title" >
- <string>Scrolling</string>
- </property>
- <layout class="QVBoxLayout" >
- <property name="margin" >
- <number>11</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <widget class="QCheckBox" name="cursorFollowsCB" >
- <property name="text" >
- <string>Cursor follows &scrollbar</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item row="1" column="0" >
- <widget class="QGroupBox" name="documentsGB" >
- <property name="title" >
- <string>Documents</string>
- </property>
- <layout class="QVBoxLayout" >
- <property name="margin" >
- <number>11</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <widget class="QCheckBox" name="autoSaveCB" >
- <property name="text" >
- <string>B&ackup documents </string>
- </property>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" >
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="GeometryGB" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>5</hsizetype>
+ <vsizetype>5</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="title" >
+ <string>Geometry</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="QCheckBox" name="loadWindowSizeCB" >
+ <property name="text" >
+ <string>Save/restore window size, or use fixed window</string>
</property>
- <property name="sizeType" >
- <enum>QSizePolicy::Fixed</enum>
+ <property name="checked" >
+ <bool>true</bool>
</property>
- <property name="sizeHint" >
- <size>
- <width>21</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
+ </widget>
</item>
<item>
- <widget class="QLabel" name="autoSaveLA" >
- <property name="text" >
- <string> every</string>
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
</property>
- <property name="buddy" >
- <cstring>autoSaveSB</cstring>
+ <property name="spacing" >
+ <number>6</number>
</property>
- </widget>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType" >
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>30</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QLabel" name="windowWidthLA" >
+ <property name="enabled" >
+ <bool>false</bool>
+ </property>
+ <property name="text" >
+ <string>Width</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="windowWidthSB" >
+ <property name="maximum" >
+ <number>9999</number>
+ </property>
+ <property name="minimum" >
+ <number>200</number>
+ </property>
+ <property name="singleStep" >
+ <number>10</number>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="windowHeightLA" >
+ <property name="enabled" >
+ <bool>false</bool>
+ </property>
+ <property name="text" >
+ <string>Height</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="windowHeightSB" >
+ <property name="maximum" >
+ <number>9999</number>
+ </property>
+ <property name="minimum" >
+ <number>200</number>
+ </property>
+ <property name="singleStep" >
+ <number>10</number>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType" >
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>30</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
</item>
<item>
- <widget class="QSpinBox" name="autoSaveSB" >
- <property name="maximum" >
- <number>300</number>
+ <widget class="QCheckBox" name="loadWindowLocationCB" >
+ <property name="enabled" >
+ <bool>true</bool>
</property>
- <property name="minimum" >
- <number>1</number>
+ <property name="toolTip" >
+ <string>Restore to cursor position when the file was last closed</string>
</property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="TextLabel1" >
<property name="text" >
- <string>minutes</string>
+ <string>Save/restore window position</string>
</property>
</widget>
</item>
</layout>
- </item>
- <item>
- <layout class="QHBoxLayout" >
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType" >
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>51</width>
+ <height>174</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QGroupBox" name="sessionGB" >
+ <property name="title" >
+ <string>Session</string>
+ </property>
+ <layout class="QGridLayout" >
<property name="margin" >
- <number>0</number>
+ <number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
- <item>
- <widget class="QLabel" name="lastfilesLA" >
- <property name="text" >
- <string>&Maximum last files:</string>
+ <item row="0" column="0" >
+ <layout class="QVBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
</property>
- <property name="buddy" >
- <cstring>lastfilesSB</cstring>
+ <property name="spacing" >
+ <number>6</number>
</property>
- </widget>
+ <item>
+ <widget class="QCheckBox" name="restoreCursorCB" >
+ <property name="text" >
+ <string>Restore cursor positions</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="loadSessionCB" >
+ <property name="text" >
+ <string>Load opened files from last session</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType" >
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>351</width>
+ <height>124</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QGroupBox" name="scrollGB" >
+ <property name="title" >
+ <string>Scrolling</string>
+ </property>
+ <layout class="QVBoxLayout" >
+ <property name="margin" >
+ <number>11</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
<item>
- <widget class="QSpinBox" name="lastfilesSB" >
- <property name="maximum" >
- <number>9</number>
+ <widget class="QCheckBox" name="cursorFollowsCB" >
+ <property name="text" >
+ <string>Cursor follows &scrollbar</string>
</property>
</widget>
</item>
</layout>
- </item>
- </layout>
- </widget>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType" >
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>351</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
</item>
- <item rowspan="2" row="1" column="1" >
+ <item>
<spacer>
<property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>51</width>
- <height>258</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="4" column="0" colspan="2" >
- <spacer>
- <property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
@@ -220,61 +466,11 @@
<property name="sizeHint" >
<size>
<width>394</width>
- <height>21</height>
+ <height>31</height>
</size>
</property>
</spacer>
</item>
- <item row="0" column="0" colspan="2" >
- <layout class="QGridLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item row="1" column="2" >
- <widget class="QPushButton" name="bindFilePB" >
- <property name="text" >
- <string>B&rowse...</string>
- </property>
- </widget>
- </item>
- <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>
- </property>
- </widget>
- </item>
- <item row="1" column="0" >
- <widget class="QLabel" name="bindFileLA" >
- <property name="text" >
- <string>&Bind file:</string>
- </property>
- <property name="buddy" >
- <cstring>bindFileED</cstring>
- </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>
- </widget>
- </item>
- <item row="1" column="1" >
- <widget class="QLineEdit" name="bindFileED" />
- </item>
- </layout>
- </item>
</layout>
</widget>
<pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
