Re: [patch] remove wheel mouse ui from qt2
Juergen Spitzmueller wrote: The attached patch finally eliminates the gui element. I did not touch qt4, since Abdel is reorganizing the Prefs dialog currently. Abdel, while you are at it, could you please remove the wheel mouse spinbox? OK to apply to branch and trunk? I would think so. Since the system wheel setting is obeyed now it is only logical to remove this setting in the same release (1.4.1). It would be nice if you could lookup whether gtk uses this setting at all, and make a comment in lyxrc.h stating which frontedns actually use wheel_jump. Georg
Re: [patch] remove wheel mouse ui from qt2
Juergen == Juergen Spitzmueller [EMAIL PROTECTED] writes: Juergen The attached patch finally eliminates the gui element. I did Juergen not touch qt4, since Abdel is reorganizing the Prefs dialog Juergen currently. Abdel, while you are at it, could you please Juergen remove the wheel mouse spinbox? Juergen OK to apply to branch and trunk? Definitely yes :) JMarc
Re: [patch] remove wheel mouse ui from qt2
Georg Baum wrote: I would think so. Since the system wheel setting is obeyed now it is only logical to remove this setting in the same release (1.4.1). It would be nice if you could lookup whether gtk uses this setting at all, and make a comment in lyxrc.h stating which frontedns actually use wheel_jump. I cannot compile gtk. I have committed the changes to qt2. Jürgen
Re: [patch] remove wheel mouse ui from qt2
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 - classQPrefUi/class - widget class=QWidget name=QPrefUI -property name=geometry - rect -x0/x -y0/y -width416/width -height441/height - /rect -/property -property name=sizePolicy - sizepolicy -hsizetype1/hsizetype -vsizetype1/vsizetype -horstretch0/horstretch -verstretch0/verstretch - /sizepolicy -/property -property name=windowTitle - string/ -/property -layout class=QVBoxLayout - property name=margin -number11/number - /property - property name=spacing +ui version=4.0 + author/author + comment/comment + exportmacro/exportmacro + classQPrefUI/class + widget class=QWidget name=QPrefUI + property name=geometry + rect +x0/x +y0/y +width416/width +height441/height + /rect + /property + property name=sizePolicy + sizepolicy +hsizetype1/hsizetype +vsizetype1/vsizetype +horstretch0/horstretch +verstretch0/verstretch + /sizepolicy + /property + property name=windowTitle + string/ + /property + layout class=QVBoxLayout + property name=margin +number11/number + /property + property name=spacing +number6/number + /property + item +layout class=QGridLayout + property name=margin + number0/number + /property + property name=spacing + number6/number + /property + item row=1 column=2 + widget class=QPushButton name=bindFilePB + property name=text +stringBamp;rowse.../string + /property + /widget + /item + item row=0 column=0 + widget class=QLabel name=uiFileLA + property name=text +stringamp;User interface file:/string + /property + property name=buddy +cstringuiFileED/cstring + /property + /widget + /item + item row=1 column=0 + widget class=QLabel name=bindFileLA + property name=text +stringamp;Bind file:/string + /property +
Re: [patch] remove wheel mouse ui from qt2
Juergen Spitzmueller wrote: I cannot compile gtk. You don't need to compile it in order to find out whether wheel_jump is used or not :-) Anyway, I looked now myself and will commit the attached patch. GeorgIndex: src/lyxrc.h === --- src/lyxrc.h (Revision 13460) +++ src/lyxrc.h (Arbeitskopie) @@ -238,6 +238,7 @@ public: /// Zoom factor for screen fonts unsigned int zoom; /// parameter for button_4 and button_5 (scrollwheel) + /// Only used by the xforms frontend unsigned int wheel_jump; /// Screen font sizes in points for each font size std::string font_sizes[10];
Re: [patch] remove wheel mouse ui from qt2
Abdelrazak Younes a écrit : 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 :-)). Committed. Abdel.
Re: [patch] remove wheel mouse ui from qt2
Juergen Spitzmueller wrote: > The attached patch finally eliminates the gui element. > I did not touch qt4, since Abdel is reorganizing the Prefs dialog > currently. Abdel, while you are at it, could you please remove the wheel > mouse spinbox? > > OK to apply to branch and trunk? I would think so. Since the system wheel setting is obeyed now it is only logical to remove this setting in the same release (1.4.1). It would be nice if you could lookup whether gtk uses this setting at all, and make a comment in lyxrc.h stating which frontedns actually use wheel_jump. Georg
Re: [patch] remove wheel mouse ui from qt2
> "Juergen" == Juergen Spitzmueller <[EMAIL PROTECTED]> writes: Juergen> The attached patch finally eliminates the gui element. I did Juergen> not touch qt4, since Abdel is reorganizing the Prefs dialog Juergen> currently. Abdel, while you are at it, could you please Juergen> remove the wheel mouse spinbox? Juergen> OK to apply to branch and trunk? Definitely yes :) JMarc
Re: [patch] remove wheel mouse ui from qt2
Georg Baum wrote: > I would think so. Since the system wheel setting is obeyed now it is only > logical to remove this setting in the same release (1.4.1). > It would be nice if you could lookup whether gtk uses this setting at all, > and make a comment in lyxrc.h stating which frontedns actually use > wheel_jump. I cannot compile gtk. I have committed the changes to qt2. Jürgen
Re: [patch] remove wheel mouse ui from qt2
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 @@ - - - - - QPrefUi - - - -0 -0 -416 -441 - - - - -1 -1 -0 -0 - - - - - - - -11 - - + + + + + QPrefUI + + + +0 +0 +416 +441 + + + + +1 +1 +0 +0 + + + + + + + +11 + + +6 + + + + + 0 + + + 6 + + + + +Browse... + + + + + + +User interface file: + + +uiFileED + + + + + + +Bind file: + + +bindFileED + + + + + + + + + +Browse... + + + + + + + + + + + + 0 + + + 6 + + + + +0 + + 6 - - - + + + + + Documents + + -0 + 11 -6 + 6 - - - -Browse... - - + + + + Backup documents + + - - - -User interface file: + + + + 0 + + + 6 + + + + + Qt::Horizontal - -uiFileED + + QSizePolicy::Fixed - - - - + + +21 +20 + + + + + + -Bind file: +every
Re: [patch] remove wheel mouse ui from qt2
Juergen Spitzmueller wrote: > I cannot compile gtk. You don't need to compile it in order to find out whether wheel_jump is used or not :-) Anyway, I looked now myself and will commit the attached patch. GeorgIndex: src/lyxrc.h === --- src/lyxrc.h (Revision 13460) +++ src/lyxrc.h (Arbeitskopie) @@ -238,6 +238,7 @@ public: /// Zoom factor for screen fonts unsigned int zoom; /// parameter for button_4 and button_5 (scrollwheel) + /// Only used by the xforms frontend unsigned int wheel_jump; /// Screen font sizes in points for each font size std::string font_sizes[10];
Re: [patch] remove wheel mouse ui from qt2
Abdelrazak Younes a écrit : 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 :-)). Committed. Abdel.
