* src/frontends/qt2/QPrefs.C

	(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

diff --git a/src/frontends/qt2/QPrefs.C b/src/frontends/qt2/QPrefs.C
index 6f917a72bc6824fd79e320bb5e1c79652a6dad64..1a9038bc8484fc2529fa8badf3d8e7d006f7bca7 100644 (file)
--- a/src/frontends/qt2/QPrefs.C
+++ b/src/frontends/qt2/QPrefs.C
@@ -174,7 +174,6 @@ void QPrefs::apply()
        rc.ui_file = internal_path(uimod->uiFileED->text());
        rc.bind_file = internal_path(uimod->bindFileED->text());
        rc.cursor_follows_scrollbar = uimod->cursorFollowsCB->isChecked();
-       rc.wheel_jump = uimod->wheelMouseSB->value();
        rc.autosave = uimod->autoSaveSB->value() * 60;
        rc.make_backup = uimod->autoSaveCB->isChecked();
        rc.num_lastfiles = uimod->lastfilesSB->value();
@@ -496,7 +495,6 @@ void QPrefs::update_contents()
        uimod->uiFileED->setText(external_path(rc.ui_file));
        uimod->bindFileED->setText(external_path(rc.bind_file));
        uimod->cursorFollowsCB->setChecked(rc.cursor_follows_scrollbar);
-       uimod->wheelMouseSB->setValue(rc.wheel_jump);
        // convert to minutes
        int mins(rc.autosave / 60);
        if (rc.autosave && !mins)

diff --git a/src/frontends/qt2/QPrefsDialog.C b/src/frontends/qt2/QPrefsDialog.C
index b222137999a46ae02da31f376da6c0d43e4ac600..bb82481912345656bcaeac469f52f401fdc1934d 100644 (file)
--- a/src/frontends/qt2/QPrefsDialog.C
+++ b/src/frontends/qt2/QPrefsDialog.C
@@ -229,7 +229,6 @@ QPrefsDialog::QPrefsDialog(QPrefs * form)
        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()));

diff --git a/src/frontends/qt2/ui/QPrefUIModule.ui b/src/frontends/qt2/ui/QPrefUIModule.ui
index 8022e1e06af505e9c24b85d8e3ba5859d866d49a..1fd387ab01fb02241d1d761bcb8ecbe5b8f7123c 100644 (file)
--- a/src/frontends/qt2/ui/QPrefUIModule.ui
+++ b/src/frontends/qt2/ui/QPrefUIModule.ui
@@ -13,7 +13,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>416</width>
+            <width>412</width>
             <height>441</height>
         </rect>
     </property>
@@ -26,9 +26,9 @@
     </property>
     <property stdset="1">
         <name>caption</name>
-        <string></string>
+        <string>QPrefUIModule</string>
     </property>
-    <vbox>
+    <grid>
         <property stdset="1">
             <name>margin</name>
             <number>11</number>
@@ -37,90 +37,7 @@
             <name>spacing</name>
             <number>6</number>
         </property>
-        <widget>
-            <class>QLayoutWidget</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>Layout2</cstring>
-            </property>
-            <grid>
-                <property stdset="1">
-                    <name>margin</name>
-                    <number>0</number>
-                </property>
-                <property stdset="1">
-                    <name>spacing</name>
-                    <number>6</number>
-                </property>
-                <widget row="1"  column="2" >
-                    <class>QPushButton</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>bindFilePB</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>B&amp;rowse...</string>
-                    </property>
-                </widget>
-                <widget row="0"  column="0" >
-                    <class>QLabel</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>uiFileLA</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>&amp;User interface file:</string>
-                    </property>
-                    <property>
-                        <name>buddy</name>
-                        <cstring>uiFileED</cstring>
-                    </property>
-                </widget>
-                <widget row="1"  column="0" >
-                    <class>QLabel</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>bindFileLA</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>&amp;Bind file:</string>
-                    </property>
-                    <property>
-                        <name>buddy</name>
-                        <cstring>bindFileED</cstring>
-                    </property>
-                </widget>
-                <widget row="0"  column="1" >
-                    <class>QLineEdit</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>uiFileED</cstring>
-                    </property>
-                </widget>
-                <widget row="0"  column="2" >
-                    <class>QPushButton</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>uiFilePB</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Bro&amp;wse...</string>
-                    </property>
-                </widget>
-                <widget row="1"  column="1" >
-                    <class>QLineEdit</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>bindFileED</cstring>
-                    </property>
-                </widget>
-            </grid>
-        </widget>
-        <widget>
+        <widget row="1"  column="0" >
             <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
@@ -160,224 +77,166 @@
                                 <name>title</name>
                                 <string>Documents</string>
                             </property>
-                            <vbox>
+                            <widget>
+                                <class>QCheckBox</class>
                                 <property stdset="1">
-                                    <name>margin</name>
-                                    <number>11</number>
+                                    <name>name</name>
+                                    <cstring>autoSaveCB</cstring>
                                 </property>
                                 <property stdset="1">
-                                    <name>spacing</name>
-                                    <number>6</number>
+                                    <name>geometry</name>
+                                    <rect>
+                                        <x>11</x>
+                                        <y>17</y>
+                                        <width>275</width>
+                                        <height>17</height>
+                                    </rect>
                                 </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>
+                                <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>text</name>
-                                        <string>B&amp;ackup documents </string>
+                                        <name>margin</name>
+                                        <number>0</number>
                                     </property>
-                                </widget>
-                                <widget>
-                                    <class>QLayoutWidget</class>
                                     <property stdset="1">
-                                        <name>name</name>
-                                        <cstring>Layout11</cstring>
+                                        <name>spacing</name>
+                                        <number>6</number>
                                     </property>
-                                    <hbox>
+                                    <spacer>
+                                        <property>
+                                            <name>name</name>
+                                            <cstring>Spacer6</cstring>
+                                        </property>
                                         <property stdset="1">
-                                            <name>margin</name>
-                                            <number>0</number>
+                                            <name>orientation</name>
+                                            <enum>Horizontal</enum>
                                         </property>
                                         <property stdset="1">
-                                            <name>spacing</name>
-                                            <number>6</number>
+                                            <name>sizeType</name>
+                                            <enum>Fixed</enum>
                                         </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>
+                                            <name>sizeHint</name>
+                                            <size>
+                                                <width>21</width>
+                                                <height>20</height>
+                                            </size>
+                                        </property>
+                                    </spacer>
+                                    <widget>
+                                        <class>QLabel</class>
                                         <property stdset="1">
-                                            <name>margin</name>
-                                            <number>0</number>
+                                            <name>name</name>
+                                            <cstring>autoSaveLA</cstring>
                                         </property>
                                         <property stdset="1">
-                                            <name>spacing</name>
-                                            <number>6</number>
+                                            <name>text</name>
+                                            <string> every</string>
                                         </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>
+                                            <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>margin</name>
-                                    <number>11</number>
+                                    <name>name</name>
+                                    <cstring>Layout12</cstring>
                                 </property>
                                 <property stdset="1">
-                                    <name>spacing</name>
-                                    <number>6</number>
+                                    <name>geometry</name>
+                                    <rect>
+                                        <x>11</x>
+                                        <y>69</y>
+                                        <width>275</width>
+                                        <height>23</height>
+                                    </rect>
                                 </property>
-                                <widget>
-                                    <class>QLayoutWidget</class>
+                                <hbox>
                                     <property stdset="1">
-                                        <name>name</name>
-                                        <cstring>Layout9</cstring>
+                                        <name>margin</name>
+                                        <number>0</number>
                                     </property>
-                                    <hbox>
+                                    <property stdset="1">
+                                        <name>spacing</name>
+                                        <number>6</number>
+                                    </property>
+                                    <widget>
+                                        <class>QLabel</class>
                                         <property stdset="1">
-                                            <name>margin</name>
-                                            <number>0</number>
+                                            <name>name</name>
+                                            <cstring>lastfilesLA</cstring>
                                         </property>
                                         <property stdset="1">
-                                            <name>spacing</name>
-                                            <number>6</number>
+                                            <name>text</name>
+                                            <string>&amp;Maximum last files:</string>
                                         </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>
+                                        <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>
@@ -404,7 +263,101 @@
                 </spacer>
             </hbox>
         </widget>
-        <spacer>
+        <widget row="0"  column="0" >
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout2</cstring>
+            </property>
+            <grid>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>0</number>
+                </property>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>6</number>
+                </property>
+                <widget row="1"  column="2" >
+                    <class>QPushButton</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>bindFilePB</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>B&amp;rowse...</string>
+                    </property>
+                </widget>
+                <widget row="0"  column="0" >
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>uiFileLA</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>&amp;User interface file:</string>
+                    </property>
+                    <property>
+                        <name>buddy</name>
+                        <cstring>uiFileED</cstring>
+                    </property>
+                </widget>
+                <widget row="1"  column="0" >
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>bindFileLA</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>&amp;Bind file:</string>
+                    </property>
+                    <property>
+                        <name>buddy</name>
+                        <cstring>bindFileED</cstring>
+                    </property>
+                </widget>
+                <widget row="0"  column="1" >
+                    <class>QLineEdit</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>uiFileED</cstring>
+                    </property>
+                </widget>
+                <widget row="0"  column="2" >
+                    <class>QPushButton</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>uiFilePB</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Bro&amp;wse...</string>
+                    </property>
+                </widget>
+                <widget row="1"  column="1" >
+                    <class>QLineEdit</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>bindFileED</cstring>
+                    </property>
+                </widget>
+            </grid>
+        </widget>
+        <widget row="2"  column="0" >
+            <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>
+        <spacer row="3"  column="0" >
             <property>
                 <name>name</name>
                 <cstring>Spacer7</cstring>
@@ -425,7 +378,7 @@
                 </size>
             </property>
         </spacer>
-    </vbox>
+    </grid>
 </widget>
 <connections>
     <connection>
@@ -452,7 +405,6 @@
     <tabstop>uiFilePB</tabstop>
     <tabstop>bindFileED</tabstop>
     <tabstop>bindFilePB</tabstop>
-    <tabstop>wheelMouseSB</tabstop>
     <tabstop>cursorFollowsCB</tabstop>
     <tabstop>autoSaveCB</tabstop>
     <tabstop>autoSaveSB</tabstop>