mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-22 21:21:32 +00:00
Add rc.geometry_height, geometry_width, geometry_xysaved to the preference dialogs (qt3/qt4).
* src/frontends/qt3/QPrefs.C, QPrefsDialog.C, ui/QPrefUIModule.ui * src/frontends/qt4/QPrefsDialog.C, ui/QPrefUi.ui git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14518 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Bo Peng
parent
e6e554d68c
commit
7119a923d8
@ -180,6 +180,14 @@ void QPrefs::apply()
|
|||||||
rc.bind_file = internal_path(uimod->bindFileED->text());
|
rc.bind_file = internal_path(uimod->bindFileED->text());
|
||||||
rc.use_lastfilepos = uimod->restoreCursorCB->isChecked();
|
rc.use_lastfilepos = uimod->restoreCursorCB->isChecked();
|
||||||
rc.load_session = uimod->loadSessionCB->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.cursor_follows_scrollbar = uimod->cursorFollowsCB->isChecked();
|
||||||
rc.autosave = uimod->autoSaveSB->value() * 60;
|
rc.autosave = uimod->autoSaveSB->value() * 60;
|
||||||
rc.make_backup = uimod->autoSaveCB->isChecked();
|
rc.make_backup = uimod->autoSaveCB->isChecked();
|
||||||
@ -508,6 +516,17 @@ void QPrefs::update_contents()
|
|||||||
uimod->bindFileED->setText(external_path(rc.bind_file));
|
uimod->bindFileED->setText(external_path(rc.bind_file));
|
||||||
uimod->restoreCursorCB->setChecked(rc.use_lastfilepos);
|
uimod->restoreCursorCB->setChecked(rc.use_lastfilepos);
|
||||||
uimod->loadSessionCB->setChecked(rc.load_session);
|
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);
|
||||||
|
uimod->windowWidthLA->setEnabled(!loadWindowSize);
|
||||||
|
uimod->windowHeightLA->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);
|
uimod->cursorFollowsCB->setChecked(rc.cursor_follows_scrollbar);
|
||||||
// convert to minutes
|
// convert to minutes
|
||||||
int mins(rc.autosave / 60);
|
int mins(rc.autosave / 60);
|
||||||
|
|||||||
@ -233,6 +233,10 @@ QPrefsDialog::QPrefsDialog(QPrefs * form)
|
|||||||
connect(uiModule->bindFileED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
|
connect(uiModule->bindFileED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
|
||||||
connect(uiModule->restoreCursorCB, SIGNAL(toggled(bool)), 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->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->cursorFollowsCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
|
||||||
connect(uiModule->autoSaveSB, SIGNAL(valueChanged(int)), this, SLOT(change_adaptor()));
|
connect(uiModule->autoSaveSB, SIGNAL(valueChanged(int)), this, SLOT(change_adaptor()));
|
||||||
connect(uiModule->autoSaveCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
|
connect(uiModule->autoSaveCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
|
||||||
|
|||||||
@ -8,7 +8,7 @@
|
|||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>412</width>
|
<width>606</width>
|
||||||
<height>441</height>
|
<height>441</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
@ -23,17 +23,11 @@
|
|||||||
<property name="caption">
|
<property name="caption">
|
||||||
<string>QPrefUIModule</string>
|
<string>QPrefUIModule</string>
|
||||||
</property>
|
</property>
|
||||||
<grid>
|
<vbox>
|
||||||
<property name="name">
|
<property name="name">
|
||||||
<cstring>unnamed</cstring>
|
<cstring>unnamed</cstring>
|
||||||
</property>
|
</property>
|
||||||
<property name="margin">
|
<widget class="QLayoutWidget">
|
||||||
<number>11</number>
|
|
||||||
</property>
|
|
||||||
<property name="spacing">
|
|
||||||
<number>6</number>
|
|
||||||
</property>
|
|
||||||
<widget class="QLayoutWidget" row="0" column="0">
|
|
||||||
<property name="name">
|
<property name="name">
|
||||||
<cstring>Layout2</cstring>
|
<cstring>Layout2</cstring>
|
||||||
</property>
|
</property>
|
||||||
@ -97,37 +91,9 @@
|
|||||||
</widget>
|
</widget>
|
||||||
</grid>
|
</grid>
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QCheckBox" row="3" column="0">
|
<widget class="QLayoutWidget">
|
||||||
<property name="name">
|
<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>
|
</property>
|
||||||
<hbox>
|
<hbox>
|
||||||
<property name="name">
|
<property name="name">
|
||||||
@ -267,21 +233,11 @@
|
|||||||
</property>
|
</property>
|
||||||
<property name="sizeHint">
|
<property name="sizeHint">
|
||||||
<size>
|
<size>
|
||||||
<width>83</width>
|
<width>30</width>
|
||||||
<height>20</height>
|
<height>20</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
</spacer>
|
</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">
|
<widget class="QGroupBox">
|
||||||
<property name="name">
|
<property name="name">
|
||||||
<cstring>sessionGB</cstring>
|
<cstring>sessionGB</cstring>
|
||||||
@ -317,6 +273,173 @@
|
|||||||
</widget>
|
</widget>
|
||||||
</grid>
|
</grid>
|
||||||
</widget>
|
</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>
|
<spacer>
|
||||||
<property name="name">
|
<property name="name">
|
||||||
<cstring>spacer4</cstring>
|
<cstring>spacer4</cstring>
|
||||||
@ -329,14 +452,42 @@
|
|||||||
</property>
|
</property>
|
||||||
<property name="sizeHint">
|
<property name="sizeHint">
|
||||||
<size>
|
<size>
|
||||||
<width>138</width>
|
<width>257</width>
|
||||||
<height>31</height>
|
<height>31</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
</spacer>
|
</spacer>
|
||||||
</hbox>
|
</hbox>
|
||||||
</widget>
|
</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>
|
</widget>
|
||||||
<connections>
|
<connections>
|
||||||
<connection>
|
<connection>
|
||||||
@ -357,6 +508,30 @@
|
|||||||
<receiver>TextLabel1</receiver>
|
<receiver>TextLabel1</receiver>
|
||||||
<slot>setEnabled(bool)</slot>
|
<slot>setEnabled(bool)</slot>
|
||||||
</connection>
|
</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>
|
</connections>
|
||||||
<tabstops>
|
<tabstops>
|
||||||
<tabstop>uiFileED</tabstop>
|
<tabstop>uiFileED</tabstop>
|
||||||
|
|||||||
@ -1695,6 +1695,22 @@ PrefUserInterface::PrefUserInterface(QPrefs * form, QWidget * parent)
|
|||||||
this, SIGNAL(changed()));
|
this, SIGNAL(changed()));
|
||||||
connect(loadSessionCB, SIGNAL(toggled(bool)),
|
connect(loadSessionCB, SIGNAL(toggled(bool)),
|
||||||
this, SIGNAL(changed()));
|
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)),
|
connect(cursorFollowsCB, SIGNAL(toggled(bool)),
|
||||||
this, SIGNAL(changed()));
|
this, SIGNAL(changed()));
|
||||||
connect(autoSaveSB, SIGNAL(valueChanged(int)),
|
connect(autoSaveSB, SIGNAL(valueChanged(int)),
|
||||||
@ -1713,6 +1729,14 @@ void PrefUserInterface::apply(LyXRC & rc) const
|
|||||||
rc.bind_file = internal_path(bindFileED->text());
|
rc.bind_file = internal_path(bindFileED->text());
|
||||||
rc.use_lastfilepos = restoreCursorCB->isChecked();
|
rc.use_lastfilepos = restoreCursorCB->isChecked();
|
||||||
rc.load_session = loadSessionCB->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.cursor_follows_scrollbar = cursorFollowsCB->isChecked();
|
||||||
rc.autosave = autoSaveSB->value() * 60;
|
rc.autosave = autoSaveSB->value() * 60;
|
||||||
rc.make_backup = autoSaveCB->isChecked();
|
rc.make_backup = autoSaveCB->isChecked();
|
||||||
@ -1726,6 +1750,17 @@ void PrefUserInterface::update(LyXRC const & rc)
|
|||||||
bindFileED->setText(external_path(rc.bind_file));
|
bindFileED->setText(external_path(rc.bind_file));
|
||||||
restoreCursorCB->setChecked(rc.use_lastfilepos);
|
restoreCursorCB->setChecked(rc.use_lastfilepos);
|
||||||
loadSessionCB->setChecked(rc.load_session);
|
loadSessionCB->setChecked(rc.load_session);
|
||||||
|
bool loadWindowSize = rc.geometry_width == 0 && rc.geometry_height == 0;
|
||||||
|
loadWindowSizeCB->setChecked(loadWindowSize);
|
||||||
|
windowWidthSB->setEnabled(!loadWindowSize);
|
||||||
|
windowHeightSB->setEnabled(!loadWindowSize);
|
||||||
|
windowWidthLA->setEnabled(!loadWindowSize);
|
||||||
|
windowHeightLA->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);
|
cursorFollowsCB->setChecked(rc.cursor_follows_scrollbar);
|
||||||
// convert to minutes
|
// convert to minutes
|
||||||
int mins(rc.autosave / 60);
|
int mins(rc.autosave / 60);
|
||||||
|
|||||||
@ -8,8 +8,8 @@
|
|||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>416</width>
|
<width>728</width>
|
||||||
<height>513</height>
|
<height>657</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="sizePolicy" >
|
<property name="sizePolicy" >
|
||||||
@ -23,27 +23,65 @@
|
|||||||
<property name="windowTitle" >
|
<property name="windowTitle" >
|
||||||
<string/>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QGridLayout" >
|
|
||||||
<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>
|
|
||||||
</property>
|
|
||||||
<layout class="QGridLayout" >
|
|
||||||
<property name="margin" >
|
|
||||||
<number>9</number>
|
|
||||||
</property>
|
|
||||||
<property name="spacing" >
|
|
||||||
<number>6</number>
|
|
||||||
</property>
|
|
||||||
<item row="0" column="0" >
|
|
||||||
<layout class="QVBoxLayout" >
|
<layout class="QVBoxLayout" >
|
||||||
|
<property name="margin" >
|
||||||
|
<number>9</number>
|
||||||
|
</property>
|
||||||
|
<property name="spacing" >
|
||||||
|
<number>6</number>
|
||||||
|
</property>
|
||||||
|
<item>
|
||||||
|
<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>
|
||||||
|
<item>
|
||||||
|
<layout class="QHBoxLayout" >
|
||||||
<property name="margin" >
|
<property name="margin" >
|
||||||
<number>0</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
@ -51,47 +89,6 @@
|
|||||||
<number>6</number>
|
<number>6</number>
|
||||||
</property>
|
</property>
|
||||||
<item>
|
<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 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" >
|
<widget class="QGroupBox" name="documentsGB" >
|
||||||
<property name="title" >
|
<property name="title" >
|
||||||
<string>Documents</string>
|
<string>Documents</string>
|
||||||
@ -193,7 +190,141 @@
|
|||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item rowspan="2" row="1" column="1" >
|
<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>9</number>
|
||||||
|
</property>
|
||||||
|
<property name="spacing" >
|
||||||
|
<number>6</number>
|
||||||
|
</property>
|
||||||
|
<item>
|
||||||
|
<widget class="QCheckBox" name="loadWindowSizeCB" >
|
||||||
|
<property name="text" >
|
||||||
|
<string>Save/restore window size, or use fixed window</string>
|
||||||
|
</property>
|
||||||
|
<property name="checked" >
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<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::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="QCheckBox" name="loadWindowLocationCB" >
|
||||||
|
<property name="enabled" >
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
<property name="toolTip" >
|
||||||
|
<string>Restore to cursor position when the file was last closed</string>
|
||||||
|
</property>
|
||||||
|
<property name="text" >
|
||||||
|
<string>Save/restore window position</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
<spacer>
|
<spacer>
|
||||||
<property name="orientation" >
|
<property name="orientation" >
|
||||||
<enum>Qt::Horizontal</enum>
|
<enum>Qt::Horizontal</enum>
|
||||||
@ -204,12 +335,127 @@
|
|||||||
<property name="sizeHint" >
|
<property name="sizeHint" >
|
||||||
<size>
|
<size>
|
||||||
<width>51</width>
|
<width>51</width>
|
||||||
<height>258</height>
|
<height>174</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
</spacer>
|
</spacer>
|
||||||
</item>
|
</item>
|
||||||
<item row="4" column="0" colspan="2" >
|
</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>9</number>
|
||||||
|
</property>
|
||||||
|
<property name="spacing" >
|
||||||
|
<number>6</number>
|
||||||
|
</property>
|
||||||
|
<item row="0" column="0" >
|
||||||
|
<layout class="QVBoxLayout" >
|
||||||
|
<property name="margin" >
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<property name="spacing" >
|
||||||
|
<number>6</number>
|
||||||
|
</property>
|
||||||
|
<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="QCheckBox" name="cursorFollowsCB" >
|
||||||
|
<property name="text" >
|
||||||
|
<string>Cursor follows &scrollbar</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</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>20</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</spacer>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
<spacer>
|
<spacer>
|
||||||
<property name="orientation" >
|
<property name="orientation" >
|
||||||
<enum>Qt::Vertical</enum>
|
<enum>Qt::Vertical</enum>
|
||||||
@ -220,61 +466,11 @@
|
|||||||
<property name="sizeHint" >
|
<property name="sizeHint" >
|
||||||
<size>
|
<size>
|
||||||
<width>394</width>
|
<width>394</width>
|
||||||
<height>21</height>
|
<height>31</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
</spacer>
|
</spacer>
|
||||||
</item>
|
</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>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
<pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
|
<pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user