From e951788e37418fdd73c9f93f16a9e1f9aee90c28 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=BCrgen=20Spitzm=C3=BCller?= Date: Thu, 23 Mar 2006 09:37:05 +0000 Subject: [PATCH] * 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 --- src/frontends/qt2/QPrefs.C | 2 - src/frontends/qt2/QPrefsDialog.C | 1 - src/frontends/qt2/ui/QPrefUIModule.ui | 516 ++++++++++++-------------- 3 files changed, 234 insertions(+), 285 deletions(-) diff --git a/src/frontends/qt2/QPrefs.C b/src/frontends/qt2/QPrefs.C index 6f917a72bc..1a9038bc84 100644 --- 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 b222137999..bb82481912 100644 --- 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 8022e1e06a..1fd387ab01 100644 --- a/src/frontends/qt2/ui/QPrefUIModule.ui +++ b/src/frontends/qt2/ui/QPrefUIModule.ui @@ -13,7 +13,7 @@ 0 0 - 416 + 412 441 @@ -26,9 +26,9 @@ caption - + QPrefUIModule - + margin 11 @@ -37,90 +37,7 @@ spacing 6 - - QLayoutWidget - - name - Layout2 - - - - margin - 0 - - - spacing - 6 - - - QPushButton - - name - bindFilePB - - - text - B&rowse... - - - - QLabel - - name - uiFileLA - - - text - &User interface file: - - - buddy - uiFileED - - - - QLabel - - name - bindFileLA - - - text - &Bind file: - - - buddy - bindFileED - - - - QLineEdit - - name - uiFileED - - - - QPushButton - - name - uiFilePB - - - text - Bro&wse... - - - - QLineEdit - - name - bindFileED - - - - - + QLayoutWidget name @@ -160,224 +77,166 @@ title Documents - + + QCheckBox - margin - 11 + name + autoSaveCB - spacing - 6 + geometry + + 11 + 17 + 275 + 17 + - - QCheckBox - - name - autoSaveCB - + + text + B&ackup documents + + + + QLayoutWidget + + name + Layout11 + + + geometry + + 60 + 40 + 177 + 23 + + + - text - B&ackup documents + margin + 0 - - - QLayoutWidget - name - Layout11 + spacing + 6 - + + + name + Spacer6 + - margin - 0 + orientation + Horizontal - spacing - 6 + sizeType + Fixed - - - name - Spacer6 - - - orientation - Horizontal - - - sizeType - Fixed - - - sizeHint - - 21 - 20 - - - - - QLabel - - name - autoSaveLA - - - text - every - - - buddy - autoSaveSB - - - - QSpinBox - - name - autoSaveSB - - - maxValue - 300 - - - minValue - 1 - - - - QLabel - - name - TextLabel1 - - - text - minutes - - - - - - QLayoutWidget - - name - Layout12 - - + + sizeHint + + 21 + 20 + + + + + QLabel - margin - 0 + name + autoSaveLA - spacing - 6 + text + every - - QLabel - - name - lastfilesLA - - - text - &Maximum last files: - - - buddy - lastfilesSB - - - - QSpinBox - - name - lastfilesSB - - - maxValue - 9 - - - - - - - - QGroupBox - - name - scrollGB - - - title - Scrolling - - + + buddy + autoSaveSB + + + + QSpinBox + + name + autoSaveSB + + + maxValue + 300 + + + minValue + 1 + + + + QLabel + + name + TextLabel1 + + + text + minutes + + + + + + QLayoutWidget - margin - 11 + name + Layout12 - spacing - 6 + geometry + + 11 + 69 + 275 + 23 + - - QLayoutWidget + - name - Layout9 + margin + 0 - + + spacing + 6 + + + QLabel - margin - 0 + name + lastfilesLA - spacing - 6 + text + &Maximum last files: - - QLabel - - name - wheelMouseLA - - - text - W&heel mouse scroll: - - - buddy - wheelMouseSB - - - - QSpinBox - - name - wheelMouseSB - - - maxValue - 250 - - - - - - QCheckBox - - name - cursorFollowsCB - - - text - Cursor follows &scrollbar - - - + + buddy + lastfilesSB + + + + QSpinBox + + name + lastfilesSB + + + maxValue + 9 + + + + @@ -404,7 +263,101 @@ - + + QLayoutWidget + + name + Layout2 + + + + margin + 0 + + + spacing + 6 + + + QPushButton + + name + bindFilePB + + + text + B&rowse... + + + + QLabel + + name + uiFileLA + + + text + &User interface file: + + + buddy + uiFileED + + + + QLabel + + name + bindFileLA + + + text + &Bind file: + + + buddy + bindFileED + + + + QLineEdit + + name + uiFileED + + + + QPushButton + + name + uiFilePB + + + text + Bro&wse... + + + + QLineEdit + + name + bindFileED + + + + + + QCheckBox + + name + cursorFollowsCB + + + text + Cursor follows &scrollbar + + + name Spacer7 @@ -425,7 +378,7 @@ - + @@ -452,7 +405,6 @@ uiFilePB bindFileED bindFilePB - wheelMouseSB cursorFollowsCB autoSaveCB autoSaveSB -- 2.39.2