Juergen Spitzmueller a écrit :
The attached patch finally eliminates the gui element.
I did not touch qt4, since Abdel is reorganizing the Prefs dialog currently.
I am done for now with the Prefs reorg. Feel free to modify it (or even
better process to phase 2 of my reorg ;-)).
I will working on the Citation/AddCitation dialog from now on. Please
retain any modification on this before I apply my cleanup probably this
week-end.
Abdel, while you are at it, could you please remove the wheel mouse spinbox?
Done, patch attached (not tested).
I will apply that once I get some spare time to compile and test (if you
don't beat me at this :-)).
Abdel.
* src/frontends/qt2/QPrefsDialog.C
(QPrefsDialog::QPrefsDialog):
(void QPrefsDialog::apply):
(void QPrefsDialog::update):
* src/frontends/qt2/ui/QPrefUI.ui: remove wheel mouse spin box
(bug 783).
Index: QPrefsDialog.C
===================================================================
--- QPrefsDialog.C (revision 13453)
+++ QPrefsDialog.C (working copy)
@@ -394,7 +394,6 @@
connect(uiModule->uiFileED, 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->wheelMouseSB, 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->lastfilesSB, SIGNAL(valueChanged(int)), this,
SLOT(change_adaptor()));
@@ -1121,7 +1120,6 @@
rc.ui_file = internal_path(uiModule->uiFileED->text());
rc.bind_file = internal_path(uiModule->bindFileED->text());
rc.cursor_follows_scrollbar = uiModule->cursorFollowsCB->isChecked();
- rc.wheel_jump = uiModule->wheelMouseSB->value();
rc.autosave = uiModule->autoSaveSB->value() * 60;
rc.make_backup = uiModule->autoSaveCB->isChecked();
rc.num_lastfiles = uiModule->lastfilesSB->value();
@@ -1416,7 +1414,6 @@
uiModule->uiFileED->setText(external_path(rc.ui_file));
uiModule->bindFileED->setText(external_path(rc.bind_file));
uiModule->cursorFollowsCB->setChecked(rc.cursor_follows_scrollbar);
- uiModule->wheelMouseSB->setValue(rc.wheel_jump);
// convert to minutes
int mins(rc.autosave / 60);
if (rc.autosave && !mins)
Index: ui/QPrefUi.ui
===================================================================
--- ui/QPrefUi.ui (revision 13453)
+++ ui/QPrefUi.ui (working copy)
@@ -1,300 +1,274 @@
-<ui version="4.0" stdsetdef="1" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
- <class>QPrefUi</class>
- <widget class="QWidget" name="QPrefUI" >
- <property name="geometry" >
- <rect>
- <x>0</x>
- <y>0</y>
- <width>416</width>
- <height>441</height>
- </rect>
- </property>
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>1</hsizetype>
- <vsizetype>1</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="windowTitle" >
- <string/>
- </property>
- <layout class="QVBoxLayout" >
- <property name="margin" >
- <number>11</number>
- </property>
- <property name="spacing" >
+<ui version="4.0" >
+ <author></author>
+ <comment></comment>
+ <exportmacro></exportmacro>
+ <class>QPrefUI</class>
+ <widget class="QWidget" name="QPrefUI" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>416</width>
+ <height>441</height>
+ </rect>
+ </property>
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>1</hsizetype>
+ <vsizetype>1</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="windowTitle" >
+ <string/>
+ </property>
+ <layout class="QVBoxLayout" >
+ <property name="margin" >
+ <number>11</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" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <layout class="QVBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
<number>6</number>
- </property>
- <item>
- <layout class="QGridLayout" >
+ </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>
+ <number>6</number>
</property>
- <item row="1" column="2" >
- <widget class="QPushButton" name="bindFilePB" >
- <property name="text" >
- <string>B&rowse...</string>
- </property>
- </widget>
+ <item>
+ <widget class="QCheckBox" name="autoSaveCB" >
+ <property name="text" >
+ <string>B&ackup documents </string>
+ </property>
+ </widget>
</item>
- <item row="0" column="0" >
- <widget class="QLabel" name="uiFileLA" >
- <property name="text" >
- <string>&User interface file:</string>
+ <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="buddy" >
- <cstring>uiFileED</cstring>
+ <property name="sizeType" >
+ <enum>QSizePolicy::Fixed</enum>
</property>
- </widget>
- </item>
- <item row="1" column="0" >
- <widget class="QLabel" name="bindFileLA" >
+ <property name="sizeHint" >
+ <size>
+ <width>21</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QLabel" name="autoSaveLA" >
<property name="text" >
- <string>&Bind file:</string>
+ <string> every</string>
</property>
<property name="buddy" >
- <cstring>bindFileED</cstring>
+ <cstring>autoSaveSB</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>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="autoSaveSB" >
+ <property name="maximum" >
+ <number>300</number>
</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>
- <layout class="QVBoxLayout" >
- <property name="margin" >
- <number>0</number>
+ <property name="minimum" >
+ <number>1</number>
</property>
- <property name="spacing" >
- <number>6</number>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="TextLabel1" >
+ <property name="text" >
+ <string>minutes</string>
</property>
- <item>
- <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" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <spacer name="Spacer6" >
- <property name="sizeHint" >
- <size>
- <width>21</width>
- <height>20</height>
- </size>
- </property>
- <property name="sizeType" >
- <enum>Fixed</enum>
- </property>
- <property name="orientation" >
- <enum>Horizontal</enum>
- </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>
- </widget>
- </item>
- <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>
- <layout class="QHBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <widget class="QLabel" name="wheelMouseLA" >
- <property name="text" >
- <string>W&heel mouse scroll:</string>
- </property>
- <property name="buddy" >
- <cstring>wheelMouseSB</cstring>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QSpinBox" name="wheelMouseSB" >
- <property name="maximum" >
- <number>250</number>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <widget class="QCheckBox" name="cursorFollowsCB" >
- <property name="text" >
- <string>Cursor follows &scrollbar</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
+ </widget>
+ </item>
+ </layout>
</item>
<item>
- <spacer name="Spacer8" >
- <property name="sizeHint" >
- <size>
- <width>20</width>
- <height>20</height>
- </size>
+ <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="sizeType" >
- <enum>Expanding</enum>
+ <property name="buddy" >
+ <cstring>lastfilesSB</cstring>
</property>
- <property name="orientation" >
- <enum>Horizontal</enum>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="lastfilesSB" >
+ <property name="maximum" >
+ <number>9</number>
</property>
- </spacer>
+ </widget>
+ </item>
+ </layout>
</item>
- </layout>
- </item>
- <item>
- <spacer name="Spacer7" >
- <property name="sizeHint" >
- <size>
- <width>20</width>
- <height>20</height>
- </size>
+ </layout>
+ </widget>
+ </item>
+ <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="sizeType" >
- <enum>Expanding</enum>
+ <property name="spacing" >
+ <number>6</number>
</property>
- <property name="orientation" >
- <enum>Vertical</enum>
- </property>
- </spacer>
- </item>
+ <item>
+ <widget class="QCheckBox" name="cursorFollowsCB" >
+ <property name="text" >
+ <string>Cursor follows &scrollbar</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType" >
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
</layout>
- </widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <tabstops>
- <tabstop>uiFileED</tabstop>
- <tabstop>uiFilePB</tabstop>
- <tabstop>bindFileED</tabstop>
- <tabstop>bindFilePB</tabstop>
- <tabstop>wheelMouseSB</tabstop>
- <tabstop>cursorFollowsCB</tabstop>
- <tabstop>autoSaveCB</tabstop>
- <tabstop>autoSaveSB</tabstop>
- <tabstop>lastfilesSB</tabstop>
- </tabstops>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType" >
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <tabstops>
+ <tabstop>uiFileED</tabstop>
+ <tabstop>uiFilePB</tabstop>
+ <tabstop>bindFileED</tabstop>
+ <tabstop>bindFilePB</tabstop>
+ <tabstop>cursorFollowsCB</tabstop>
+ <tabstop>autoSaveCB</tabstop>
+ <tabstop>autoSaveSB</tabstop>
+ <tabstop>lastfilesSB</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
</ui>
