anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-23 10:18:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* src/frontends/qt2/QPrefs.C

Browse Source 
(void QPrefs::apply):
	(void QPrefs::update_contents):
* src/frontends/qt2/QPrefsDialog.C
	(QPrefsDialog::QPrefsDialog):
* src/frontends/qt2/ui/QPrefUIModule.ui:
	remove wheel mouse spin box (bug 783).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13457 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2006-03-23 09:37:05 +00:00
parent f68868707d
commit e951788e37
3 changed files with 239 additions and 290 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontends/qt2/QPrefs.C
View File

@ -174,7 +174,6 @@ void QPrefs::apply()
rc.ui_file = internal_path(uimod->uiFileED->text()); rc.ui_file = internal_path(uimod->uiFileED->text());
rc.bind_file = internal_path(uimod->bindFileED->text()); rc.bind_file = internal_path(uimod->bindFileED->text());
rc.cursor_follows_scrollbar = uimod->cursorFollowsCB->isChecked(); rc.cursor_follows_scrollbar = uimod->cursorFollowsCB->isChecked();
rc.wheel_jump = uimod->wheelMouseSB->value();
rc.autosave = uimod->autoSaveSB->value() * 60; rc.autosave = uimod->autoSaveSB->value() * 60;
rc.make_backup = uimod->autoSaveCB->isChecked(); rc.make_backup = uimod->autoSaveCB->isChecked();
rc.num_lastfiles = uimod->lastfilesSB->value(); rc.num_lastfiles = uimod->lastfilesSB->value();
@ -496,7 +495,6 @@ void QPrefs::update_contents()
uimod->uiFileED->setText(external_path(rc.ui_file)); uimod->uiFileED->setText(external_path(rc.ui_file));
uimod->bindFileED->setText(external_path(rc.bind_file)); uimod->bindFileED->setText(external_path(rc.bind_file));
uimod->cursorFollowsCB->setChecked(rc.cursor_follows_scrollbar); uimod->cursorFollowsCB->setChecked(rc.cursor_follows_scrollbar);
uimod->wheelMouseSB->setValue(rc.wheel_jump);
// convert to minutes // convert to minutes
int mins(rc.autosave / 60); int mins(rc.autosave / 60);
if (rc.autosave && !mins) if (rc.autosave && !mins)

1
src/frontends/qt2/QPrefsDialog.C
View File

@ -229,7 +229,6 @@ QPrefsDialog::QPrefsDialog(QPrefs * form)
connect(uiModule->uiFileED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor())); connect(uiModule->uiFileED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
connect(uiModule->bindFileED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor())); connect(uiModule->bindFileED, SIGNAL(textChanged(const QString&)), 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->wheelMouseSB, SIGNAL(valueChanged(int)), 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()));
connect(uiModule->lastfilesSB, SIGNAL(valueChanged(int)), this, SLOT(change_adaptor())); connect(uiModule->lastfilesSB, SIGNAL(valueChanged(int)), this, SLOT(change_adaptor()));

526
src/frontends/qt2/ui/QPrefUIModule.ui
View File

@ -13,7 +13,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>416</width> <width>412</width>
<height>441</height> <height>441</height>
</rect> </rect>
</property> </property>
@ -26,9 +26,9 @@
</property> </property>
<property stdset="1"> <property stdset="1">
<name>caption</name> <name>caption</name>
<string></string> <string>QPrefUIModule</string>
</property> </property>
<vbox> <grid>
<property stdset="1"> <property stdset="1">
<name>margin</name> <name>margin</name>
<number>11</number> <number>11</number>
@ -37,7 +37,233 @@
<name>spacing</name> <name>spacing</name>
<number>6</number> <number>6</number>
</property> </property>
<widget> <widget row="1" column="0" >
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
<cstring>Layout7</cstring>
</property>
<hbox>
<property stdset="1">
<name>margin</name>
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
<cstring>Layout6</cstring>
</property>
<vbox>
<property stdset="1">
<name>margin</name>
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget>
<class>QGroupBox</class>
<property stdset="1">
<name>name</name>
<cstring>documentsGB</cstring>
</property>
<property stdset="1">
<name>title</name>
<string>Documents</string>
</property>
<widget>
<class>QCheckBox</class>
<property stdset="1">
<name>name</name>
<cstring>autoSaveCB</cstring>
</property>
<property stdset="1">
<name>geometry</name>
<rect>
<x>11</x>
<y>17</y>
<width>275</width>
<height>17</height>
</rect>
</property>
<property stdset="1">
<name>text</name>
<string>B&amp;ackup documents </string>
</property>
</widget>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
<cstring>Layout11</cstring>
</property>
<property stdset="1">
<name>geometry</name>
<rect>
<x>60</x>
<y>40</y>
<width>177</width>
<height>23</height>
</rect>
</property>
<hbox>
<property stdset="1">
<name>margin</name>
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<spacer>
<property>
<name>name</name>
<cstring>Spacer6</cstring>
</property>
<property stdset="1">
<name>orientation</name>
<enum>Horizontal</enum>
</property>
<property stdset="1">
<name>sizeType</name>
<enum>Fixed</enum>
</property>
<property>
<name>sizeHint</name>
<size>
<width>21</width>
<height>20</height>
</size>
</property>
</spacer>
<widget>
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>autoSaveLA</cstring>
</property>
<property stdset="1">
<name>text</name>
<string> every</string>
</property>
<property>
<name>buddy</name>
<cstring>autoSaveSB</cstring>
</property>
</widget>
<widget>
<class>QSpinBox</class>
<property stdset="1">
<name>name</name>
<cstring>autoSaveSB</cstring>
</property>
<property stdset="1">
<name>maxValue</name>
<number>300</number>
</property>
<property stdset="1">
<name>minValue</name>
<number>1</number>
</property>
</widget>
<widget>
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>TextLabel1</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>minutes</string>
</property>
</widget>
</hbox>
</widget>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
<cstring>Layout12</cstring>
</property>
<property stdset="1">
<name>geometry</name>
<rect>
<x>11</x>
<y>69</y>
<width>275</width>
<height>23</height>
</rect>
</property>
<hbox>
<property stdset="1">
<name>margin</name>
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget>
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>lastfilesLA</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>&amp;Maximum last files:</string>
</property>
<property>
<name>buddy</name>
<cstring>lastfilesSB</cstring>
</property>
</widget>
<widget>
<class>QSpinBox</class>
<property stdset="1">
<name>name</name>
<cstring>lastfilesSB</cstring>
</property>
<property stdset="1">
<name>maxValue</name>
<number>9</number>
</property>
</widget>
</hbox>
</widget>
</widget>
</vbox>
</widget>
<spacer>
<property>
<name>name</name>
<cstring>Spacer8</cstring>
</property>
<property stdset="1">
<name>orientation</name>
<enum>Horizontal</enum>
</property>
<property stdset="1">
<name>sizeType</name>
<enum>Expanding</enum>
</property>
<property>
<name>sizeHint</name>
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</hbox>
</widget>
<widget row="0" column="0" >
<class>QLayoutWidget</class> <class>QLayoutWidget</class>
<property stdset="1"> <property stdset="1">
<name>name</name> <name>name</name>
@ -120,291 +346,18 @@
</widget> </widget>
</grid> </grid>
</widget> </widget>
<widget> <widget row="2" column="0" >
<class>QLayoutWidget</class> <class>QCheckBox</class>
<property stdset="1"> <property stdset="1">
<name>name</name> <name>name</name>
<cstring>Layout7</cstring> <cstring>cursorFollowsCB</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>Cursor follows &amp;scrollbar</string>
</property> </property>
<hbox>
<property stdset="1">
<name>margin</name>
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
<cstring>Layout6</cstring>
</property>
<vbox>
<property stdset="1">
<name>margin</name>
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget>
<class>QGroupBox</class>
<property stdset="1">
<name>name</name>
<cstring>documentsGB</cstring>
</property>
<property stdset="1">
<name>title</name>
<string>Documents</string>
</property>
<vbox>
<property stdset="1">
<name>margin</name>
<number>11</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget>
<class>QCheckBox</class>
<property stdset="1">
<name>name</name>
<cstring>autoSaveCB</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>B&amp;ackup documents </string>
</property>
</widget>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
<cstring>Layout11</cstring>
</property>
<hbox>
<property stdset="1">
<name>margin</name>
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<spacer>
<property>
<name>name</name>
<cstring>Spacer6</cstring>
</property>
<property stdset="1">
<name>orientation</name>
<enum>Horizontal</enum>
</property>
<property stdset="1">
<name>sizeType</name>
<enum>Fixed</enum>
</property>
<property>
<name>sizeHint</name>
<size>
<width>21</width>
<height>20</height>
</size>
</property>
</spacer>
<widget>
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>autoSaveLA</cstring>
</property>
<property stdset="1">
<name>text</name>
<string> every</string>
</property>
<property>
<name>buddy</name>
<cstring>autoSaveSB</cstring>
</property>
</widget>
<widget>
<class>QSpinBox</class>
<property stdset="1">
<name>name</name>
<cstring>autoSaveSB</cstring>
</property>
<property stdset="1">
<name>maxValue</name>
<number>300</number>
</property>
<property stdset="1">
<name>minValue</name>
<number>1</number>
</property>
</widget>
<widget>
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>TextLabel1</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>minutes</string>
</property>
</widget>
</hbox>
</widget>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
<cstring>Layout12</cstring>
</property>
<hbox>
<property stdset="1">
<name>margin</name>
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget>
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>lastfilesLA</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>&amp;Maximum last files:</string>
</property>
<property>
<name>buddy</name>
<cstring>lastfilesSB</cstring>
</property>
</widget>
<widget>
<class>QSpinBox</class>
<property stdset="1">
<name>name</name>
<cstring>lastfilesSB</cstring>
</property>
<property stdset="1">
<name>maxValue</name>
<number>9</number>
</property>
</widget>
</hbox>
</widget>
</vbox>
</widget>
<widget>
<class>QGroupBox</class>
<property stdset="1">
<name>name</name>
<cstring>scrollGB</cstring>
</property>
<property stdset="1">
<name>title</name>
<string>Scrolling</string>
</property>
<vbox>
<property stdset="1">
<name>margin</name>
<number>11</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
<cstring>Layout9</cstring>
</property>
<hbox>
<property stdset="1">
<name>margin</name>
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget>
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>wheelMouseLA</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>W&amp;heel mouse scroll:</string>
</property>
<property>
<name>buddy</name>
<cstring>wheelMouseSB</cstring>
</property>
</widget>
<widget>
<class>QSpinBox</class>
<property stdset="1">
<name>name</name>
<cstring>wheelMouseSB</cstring>
</property>
<property stdset="1">
<name>maxValue</name>
<number>250</number>
</property>
</widget>
</hbox>
</widget>
<widget>
<class>QCheckBox</class>
<property stdset="1">
<name>name</name>
<cstring>cursorFollowsCB</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>Cursor follows &amp;scrollbar</string>
</property>
</widget>
</vbox>
</widget>
</vbox>
</widget>
<spacer>
<property>
<name>name</name>
<cstring>Spacer8</cstring>
</property>
<property stdset="1">
<name>orientation</name>
<enum>Horizontal</enum>
</property>
<property stdset="1">
<name>sizeType</name>
<enum>Expanding</enum>
</property>
<property>
<name>sizeHint</name>
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</hbox>
</widget> </widget>
<spacer> <spacer row="3" column="0" >
<property> <property>
<name>name</name> <name>name</name>
<cstring>Spacer7</cstring> <cstring>Spacer7</cstring>
@ -425,7 +378,7 @@
</size> </size>
</property> </property>
</spacer> </spacer>
</vbox> </grid>
</widget> </widget>
<connections> <connections>
<connection> <connection>
@ -452,7 +405,6 @@
<tabstop>uiFilePB</tabstop> <tabstop>uiFilePB</tabstop>
<tabstop>bindFileED</tabstop> <tabstop>bindFileED</tabstop>
<tabstop>bindFilePB</tabstop> <tabstop>bindFilePB</tabstop>
<tabstop>wheelMouseSB</tabstop>
<tabstop>cursorFollowsCB</tabstop> <tabstop>cursorFollowsCB</tabstop>
<tabstop>autoSaveCB</tabstop> <tabstop>autoSaveCB</tabstop>
<tabstop>autoSaveSB</tabstop> <tabstop>autoSaveSB</tabstop>