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 + + + +
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.
[patch] remove wheel mouse ui from qt2
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? * 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). Jürgen Index: src/frontends/qt2/QPrefs.C === --- src/frontends/qt2/QPrefs.C (Revision 13455) +++ src/frontends/qt2/QPrefs.C (Arbeitskopie) @@ -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) Index: src/frontends/qt2/QPrefsDialog.C === --- src/frontends/qt2/QPrefsDialog.C (Revision 13455) +++ src/frontends/qt2/QPrefsDialog.C (Arbeitskopie) @@ -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())); Index: src/frontends/qt2/ui/QPrefUIModule.ui === --- src/frontends/qt2/ui/QPrefUIModule.ui (Revision 13455) +++ src/frontends/qt2/ui/QPrefUIModule.ui (Arbeitskopie) @@ -13,7 +13,7 @@ rect x0/x y0/y -width416/width +width412/width height441/height /rect /property @@ -26,9 +26,9 @@ /property property stdset=1 namecaption/name -string/string +stringQPrefUIModule/string /property -vbox +grid property stdset=1 namemargin/name number11/number @@ -37,90 +37,7 @@ namespacing/name number6/number /property -widget -classQLayoutWidget/class -property stdset=1 -namename/name -cstringLayout2/cstring -/property -grid -property stdset=1 -namemargin/name -number0/number -/property -property stdset=1 -namespacing/name -number6/number -/property -widget row=1 column=2 -classQPushButton/class -property stdset=1 -namename/name -cstringbindFilePB/cstring -/property -property stdset=1 -nametext/name -stringBamp;rowse.../string -/property -/widget -widget row=0 column=0 -classQLabel/class -property stdset=1 -namename/name -cstringuiFileLA/cstring -/property -property stdset=1 -nametext/name -stringamp;User interface file:/string -/property -property -namebuddy/name -cstringuiFileED/cstring -/property -/widget -widget row=1 column=0 -classQLabel/class -property stdset=1 -namename/name -cstringbindFileLA/cstring -/property -property stdset=1
[patch] remove wheel mouse ui from qt2
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? * 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). Jürgen Index: src/frontends/qt2/QPrefs.C === --- src/frontends/qt2/QPrefs.C (Revision 13455) +++ src/frontends/qt2/QPrefs.C (Arbeitskopie) @@ -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) Index: src/frontends/qt2/QPrefsDialog.C === --- src/frontends/qt2/QPrefsDialog.C (Revision 13455) +++ src/frontends/qt2/QPrefsDialog.C (Arbeitskopie) @@ -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())); Index: src/frontends/qt2/ui/QPrefUIModule.ui === --- src/frontends/qt2/ui/QPrefUIModule.ui (Revision 13455) +++ src/frontends/qt2/ui/QPrefUIModule.ui (Arbeitskopie) @@ -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 -Browse... - - - -QLabel - -name -uiFileLA - - -text -User interface file: - - -buddy -uiFileED - - - -QLabel - -name -bindFileLA - - -text -Bind file: - - -buddy -bindFileED - - - -QLineEdit - -name -uiFileED - - - -QPushButton - -name -uiFilePB - - -text -Browse... - -
Re: [Patch] Qt4 wheel mouse + Q_WS_* macro
Georg Baum a écrit : Abdel, the line end conversion in the clipboard used Q_OS_MACX on purpose. You changed that to Q_WS_MACX, meaning that it will not happen on X11/Mac. Are you sure that it is not needed there? If yes, we should also change the qt2 frontend, otherwise please change it back. Hum, I don't know, did someone tested your changes on qt2/X11/Mac? I would tend to think that the X11 clipboard wouldn't need this change but I don't know really. The Qt4 documentation is misleading, only Q_OS_* are documented, not Q_WS_*. I have verified that Q_OS_X11 does not exist in qglobal.h, only Q_WS_X11; I thought it to be the same for MAC, hence the change. But Q_OS_MAC and Q_OS_MACX are defined: #if defined(Q_OS_DARWIN) # define Q_OS_MAC /* Q_OS_MAC is mostly for compatiblity, but also more clear */ # define Q_OS_MACX /* Q_OS_MACX is only for compatiblity.*/ #endif So, in short, if you're sure about that, I'll happily revert the changes. Abdel. Georg
Re: [Patch] Qt4 wheel mouse + Q_WS_* macro
Abdelrazak == Abdelrazak Younes [EMAIL PROTECTED] writes: Abdelrazak Hum, I don't know, did someone tested your changes on Abdelrazak qt2/X11/Mac? I would tend to think that the X11 clipboard Abdelrazak wouldn't need this change but I don't know really. I would assume that the X11 clipboard always uses LF, but I have no way to check. Abdelrazak The Qt4 documentation is misleading, only Q_OS_* are Abdelrazak documented, not Q_WS_*. I have verified that Q_OS_X11 does Abdelrazak not exist in qglobal.h, only Q_WS_X11; X11 is a window system, not an operating system. Abdelrazak I thought it to be the same for MAC, hence the change. But Abdelrazak Q_OS_MAC and Q_OS_MACX are defined: Abdelrazak #if defined(Q_OS_DARWIN) # define Q_OS_MAC /* Q_OS_MAC is Abdelrazak mostly for compatiblity, but also more clear */ # define Abdelrazak Q_OS_MACX /* Q_OS_MACX is only for compatiblity.*/ #endif I guess Q_OS_MAC should be replaced with Q_OS_DARWIN, if we want to keep it. JMarc
Re: [Patch] Qt4 wheel mouse + Q_WS_* macro
Jean-Marc Lasgouttes a écrit : Abdelrazak == Abdelrazak Younes [EMAIL PROTECTED] writes: Abdelrazak Hum, I don't know, did someone tested your changes on Abdelrazak qt2/X11/Mac? I would tend to think that the X11 clipboard Abdelrazak wouldn't need this change but I don't know really. I would assume that the X11 clipboard always uses LF, but I have no way to check. I guess our only hope is Bennett... How you guys did managed to complete the MAC port without any developer on board? Abdelrazak The Qt4 documentation is misleading, only Q_OS_* are Abdelrazak documented, not Q_WS_*. I have verified that Q_OS_X11 does Abdelrazak not exist in qglobal.h, only Q_WS_X11; X11 is a window system, not an operating system. Tell that to Trolltech ;-) Abdelrazak I thought it to be the same for MAC, hence the change. But Abdelrazak Q_OS_MAC and Q_OS_MACX are defined: Abdelrazak #if defined(Q_OS_DARWIN) # define Q_OS_MAC /* Q_OS_MAC is Abdelrazak mostly for compatiblity, but also more clear */ # define Abdelrazak Q_OS_MACX /* Q_OS_MACX is only for compatiblity.*/ #endif I guess Q_OS_MAC should be replaced with Q_OS_DARWIN, if we want to keep it. Yes. Abdel.
Re: [Patch] Qt4 wheel mouse + Q_WS_* macro
Jean-Marc Lasgouttes wrote: Abdelrazak == Abdelrazak Younes [EMAIL PROTECTED] writes: Abdelrazak Hum, I don't know, did someone tested your changes on Abdelrazak qt2/X11/Mac? I would tend to think that the X11 clipboard Abdelrazak wouldn't need this change but I don't know really. I would assume that the X11 clipboard always uses LF, but I have no way to check. Me neither. Therefore I went to the safe side and did the translation also for X11. This would only fail if X11 used CRLF, but that would be very awkward. Georg
Re: [Patch] Qt4 wheel mouse + Q_WS_* macro
Abdelrazak == Abdelrazak Younes [EMAIL PROTECTED] writes: Abdelrazak I guess our only hope is Bennett... How you guys did Abdelrazak managed to complete the MAC port without any developer on Abdelrazak board? Because of GUI-I, and because Qt/Mac does not work too badly. And also because Ronald Florence (the initiator of the port) was enough of a programmer to do it. But getting right the code in the qt2 frontend has been an amusing task (Bennett has been very patient to try out the various bogus ideas I came up with). JMarc
Re: [Patch] Qt4 wheel mouse + Q_WS_* macro
On Mar 15, 2006, at 5:22 AM, Abdelrazak Younes wrote: Jean-Marc Lasgouttes a écrit : Abdelrazak == Abdelrazak Younes [EMAIL PROTECTED] writes: Abdelrazak Hum, I don't know, did someone tested your changes on Abdelrazak qt2/X11/Mac? I would tend to think that the X11 clipboard Abdelrazak wouldn't need this change but I don't know really. I would assume that the X11 clipboard always uses LF, but I have no way to check. I guess our only hope is Bennett... How you guys did managed to complete the MAC port without any developer on board? So what am I, chopped liver? ... Actually, I might as well be for the next week: I'm getting too busy with other things right now. Hopefully by Tuesday I'll be able to try this again. Bennett
Re: [Patch] Qt4 wheel mouse + Q_WS_* macro
Bennett Helm a écrit : On Mar 15, 2006, at 5:22 AM, Abdelrazak Younes wrote: Jean-Marc Lasgouttes a écrit : Abdelrazak == Abdelrazak Younes [EMAIL PROTECTED] writes: Abdelrazak Hum, I don't know, did someone tested your changes on Abdelrazak qt2/X11/Mac? I would tend to think that the X11 clipboard Abdelrazak wouldn't need this change but I don't know really. I would assume that the X11 clipboard always uses LF, but I have no way to check. I guess our only hope is Bennett... How you guys did managed to complete the MAC port without any developer on board? So what am I, chopped liver? ... Sorry Bennet, I didn't meant to hurt you, I meant C++ developer. I got the (maybe wrong) impression that you were not. I appreciate very much your help in testing in any case. Abdel. Actually, I might as well be for the next week: I'm getting too busy with other things right now. Hopefully by Tuesday I'll be able to try this again. Bennett
Re: [Patch] Qt4 wheel mouse + Q_WS_* macro
On Mar 15, 2006, at 12:31 PM, Abdelrazak Younes wrote: Bennett Helm a écrit : On Mar 15, 2006, at 5:22 AM, Abdelrazak Younes wrote: Jean-Marc Lasgouttes a écrit : Abdelrazak == Abdelrazak Younes [EMAIL PROTECTED] writes: Abdelrazak Hum, I don't know, did someone tested your changes on Abdelrazak qt2/X11/Mac? I would tend to think that the X11 clipboard Abdelrazak wouldn't need this change but I don't know really. I would assume that the X11 clipboard always uses LF, but I have no way to check. I guess our only hope is Bennett... How you guys did managed to complete the MAC port without any developer on board? So what am I, chopped liver? ... Sorry Bennet, I didn't meant to hurt you, I meant C++ developer. I got the (maybe wrong) impression that you were not. No offense taken (and no apology necessary): as you correctly surmised, I'm not a developer -- just able (and willing) to test ... and kibitz. (Though I did manage to write a GUI installer for Mac: that ought to count for something!) I suppose, since it's not Friday, I should have included a smiley. In any case, I'm impressed by and appreciative of the efforts you real developers have made, in spite of my bumbling, to get things to work on Mac. I just hope I'm not your only hope! :P Bennett
Re: [Patch] Qt4 wheel mouse + Q_WS_* macro
Georg Baum a écrit : Abdel, the line end conversion in the clipboard used Q_OS_MACX on purpose. You changed that to Q_WS_MACX, meaning that it will not happen on X11/Mac. Are you sure that it is not needed there? If yes, we should also change the qt2 frontend, otherwise please change it back. Hum, I don't know, did someone tested your changes on qt2/X11/Mac? I would tend to think that the X11 clipboard wouldn't need this change but I don't know really. The Qt4 documentation is misleading, only Q_OS_* are documented, not Q_WS_*. I have verified that Q_OS_X11 does not exist in qglobal.h, only Q_WS_X11; I thought it to be the same for MAC, hence the change. But Q_OS_MAC and Q_OS_MACX are defined: #if defined(Q_OS_DARWIN) # define Q_OS_MAC /* Q_OS_MAC is mostly for compatiblity, but also more clear */ # define Q_OS_MACX /* Q_OS_MACX is only for compatiblity.*/ #endif So, in short, if you're sure about that, I'll happily revert the changes. Abdel. Georg
Re: [Patch] Qt4 wheel mouse + Q_WS_* macro
> "Abdelrazak" == Abdelrazak Younes <[EMAIL PROTECTED]> writes: Abdelrazak> Hum, I don't know, did someone tested your changes on Abdelrazak> qt2/X11/Mac? I would tend to think that the X11 clipboard Abdelrazak> wouldn't need this change but I don't know really. I would assume that the X11 clipboard always uses LF, but I have no way to check. Abdelrazak> The Qt4 documentation is misleading, only Q_OS_* are Abdelrazak> documented, not Q_WS_*. I have verified that Q_OS_X11 does Abdelrazak> not exist in qglobal.h, only Q_WS_X11; X11 is a window system, not an operating system. Abdelrazak> I thought it to be the same for MAC, hence the change. But Abdelrazak> Q_OS_MAC and Q_OS_MACX are defined: Abdelrazak> #if defined(Q_OS_DARWIN) # define Q_OS_MAC /* Q_OS_MAC is Abdelrazak> mostly for compatiblity, but also more clear */ # define Abdelrazak> Q_OS_MACX /* Q_OS_MACX is only for compatiblity.*/ #endif I guess Q_OS_MAC should be replaced with Q_OS_DARWIN, if we want to keep it. JMarc
Re: [Patch] Qt4 wheel mouse + Q_WS_* macro
Jean-Marc Lasgouttes a écrit : "Abdelrazak" == Abdelrazak Younes <[EMAIL PROTECTED]> writes: Abdelrazak> Hum, I don't know, did someone tested your changes on Abdelrazak> qt2/X11/Mac? I would tend to think that the X11 clipboard Abdelrazak> wouldn't need this change but I don't know really. I would assume that the X11 clipboard always uses LF, but I have no way to check. I guess our only hope is Bennett... How you guys did managed to complete the MAC port without any developer on board? Abdelrazak> The Qt4 documentation is misleading, only Q_OS_* are Abdelrazak> documented, not Q_WS_*. I have verified that Q_OS_X11 does Abdelrazak> not exist in qglobal.h, only Q_WS_X11; X11 is a window system, not an operating system. Tell that to Trolltech ;-) Abdelrazak> I thought it to be the same for MAC, hence the change. But Abdelrazak> Q_OS_MAC and Q_OS_MACX are defined: Abdelrazak> #if defined(Q_OS_DARWIN) # define Q_OS_MAC /* Q_OS_MAC is Abdelrazak> mostly for compatiblity, but also more clear */ # define Abdelrazak> Q_OS_MACX /* Q_OS_MACX is only for compatiblity.*/ #endif I guess Q_OS_MAC should be replaced with Q_OS_DARWIN, if we want to keep it. Yes. Abdel.
Re: [Patch] Qt4 wheel mouse + Q_WS_* macro
Jean-Marc Lasgouttes wrote: >> "Abdelrazak" == Abdelrazak Younes >> <[EMAIL PROTECTED]> writes: > > Abdelrazak> Hum, I don't know, did someone tested your changes on > Abdelrazak> qt2/X11/Mac? I would tend to think that the X11 clipboard > Abdelrazak> wouldn't need this change but I don't know really. > > I would assume that the X11 clipboard always uses LF, but I have no > way to check. Me neither. Therefore I went to the safe side and did the translation also for X11. This would only fail if X11 used CRLF, but that would be very awkward. Georg
Re: [Patch] Qt4 wheel mouse + Q_WS_* macro
> "Abdelrazak" == Abdelrazak Younes <[EMAIL PROTECTED]> writes: Abdelrazak> I guess our only hope is Bennett... How you guys did Abdelrazak> managed to complete the MAC port without any developer on Abdelrazak> board? Because of GUI-I, and because Qt/Mac does not work too badly. And also because Ronald Florence (the initiator of the port) was enough of a programmer to do it. But getting right the code in the qt2 frontend has been an amusing task (Bennett has been very patient to try out the various bogus ideas I came up with). JMarc
Re: [Patch] Qt4 wheel mouse + Q_WS_* macro
On Mar 15, 2006, at 5:22 AM, Abdelrazak Younes wrote: Jean-Marc Lasgouttes a écrit : "Abdelrazak" == Abdelrazak Younes <[EMAIL PROTECTED]> writes: Abdelrazak> Hum, I don't know, did someone tested your changes on Abdelrazak> qt2/X11/Mac? I would tend to think that the X11 clipboard Abdelrazak> wouldn't need this change but I don't know really. I would assume that the X11 clipboard always uses LF, but I have no way to check. I guess our only hope is Bennett... How you guys did managed to complete the MAC port without any developer on board? So what am I, chopped liver? ... Actually, I might as well be for the next week: I'm getting too busy with other things right now. Hopefully by Tuesday I'll be able to try this again. Bennett
Re: [Patch] Qt4 wheel mouse + Q_WS_* macro
Bennett Helm a écrit : On Mar 15, 2006, at 5:22 AM, Abdelrazak Younes wrote: Jean-Marc Lasgouttes a écrit : "Abdelrazak" == Abdelrazak Younes <[EMAIL PROTECTED]> writes: Abdelrazak> Hum, I don't know, did someone tested your changes on Abdelrazak> qt2/X11/Mac? I would tend to think that the X11 clipboard Abdelrazak> wouldn't need this change but I don't know really. I would assume that the X11 clipboard always uses LF, but I have no way to check. I guess our only hope is Bennett... How you guys did managed to complete the MAC port without any developer on board? So what am I, chopped liver? ... Sorry Bennet, I didn't meant to hurt you, I meant "C++ developer". I got the (maybe wrong) impression that you were not. I appreciate very much your help in testing in any case. Abdel. Actually, I might as well be for the next week: I'm getting too busy with other things right now. Hopefully by Tuesday I'll be able to try this again. Bennett
Re: [Patch] Qt4 wheel mouse + Q_WS_* macro
On Mar 15, 2006, at 12:31 PM, Abdelrazak Younes wrote: Bennett Helm a écrit : On Mar 15, 2006, at 5:22 AM, Abdelrazak Younes wrote: Jean-Marc Lasgouttes a écrit : "Abdelrazak" == Abdelrazak Younes <[EMAIL PROTECTED]> writes: Abdelrazak> Hum, I don't know, did someone tested your changes on Abdelrazak> qt2/X11/Mac? I would tend to think that the X11 clipboard Abdelrazak> wouldn't need this change but I don't know really. I would assume that the X11 clipboard always uses LF, but I have no way to check. I guess our only hope is Bennett... How you guys did managed to complete the MAC port without any developer on board? So what am I, chopped liver? ... Sorry Bennet, I didn't meant to hurt you, I meant "C++ developer". I got the (maybe wrong) impression that you were not. No offense taken (and no apology necessary): as you correctly surmised, I'm not a developer -- just able (and willing) to test ... and kibitz. (Though I did manage to write a GUI installer for Mac: that ought to count for something!) I suppose, since it's not Friday, I should have included a smiley. In any case, I'm impressed by and appreciative of the efforts you real developers have made, in spite of my bumbling, to get things to work on Mac. I just hope I'm not your only hope! :P Bennett
[Patch] Qt4 wheel mouse + Q_WS_* macro
Index: D:/msys/home/yns/lyx/trunk/src/frontends/qt4/ChangeLog
===
--- D:/msys/home/yns/lyx/trunk/src/frontends/qt4/ChangeLog (revision 13369)
+++ D:/msys/home/yns/lyx/trunk/src/frontends/qt4/ChangeLog (working copy)
@@ -1,8 +1,23 @@
-2006-03-01 Jürgen Spitzmüller [EMAIL PROTECTED]
+2006-03-14 Abdelrazak Younes [EMAIL PROTECTED]
+
+ * QWorkArea.[Ch]: Wheel one-liner mouse fix
+ * QWorkArea.C: Reverted to Q_WS_X11 and Q_WS_MACX instead of Q_OS_*
+ * QWorkArea.h: Added comments
+
+2006-03-12 Lars Gullik Bjønnes [EMAIL PROTECTED]
+
+ * ui/pch.h: new file
+
+2006-03-11 Abdelrazak Younes [EMAIL PROTECTED]
+
+ * Various Compilation fixes for MacOSX. There is still a problem
+ with Dialog.C:275 which does not recognize
+
+2006-03-10 Jürgen Spitzmüller [EMAIL PROTECTED]
* QLMenubar.h: compile fix for gcc-4.1.
-2006-03-01 Abdelrazak Younes [EMAIL PROTECTED]
+2006-03-10 Abdelrazak Younes [EMAIL PROTECTED]
* QWorkArea.[Ch] cleanup:
- Added private members workWidth_ and workHeight_ in order to
@@ -14,10 +29,6 @@
separate place at the end of QWorkArea.C.
- initial support for Wheel mouse (still does not work).
-2006-03-12 Lars Gullik Bjønnes [EMAIL PROTECTED]
-
- * ui/pch.h: new file
-
2006-03-10 Georg Baum [EMAIL PROTECTED]
* QWorkArea.C (getClipboard): convert MAC to UNIX line endings on OSX
Index: D:/msys/home/yns/lyx/trunk/src/frontends/qt4/QLMenubar.C
===
--- D:/msys/home/yns/lyx/trunk/src/frontends/qt4/QLMenubar.C(revision 13369)
+++ D:/msys/home/yns/lyx/trunk/src/frontends/qt4/QLMenubar.C(working copy)
@@ -149,7 +149,7 @@
*/
QMenuBar * QLMenubar::menuBar() const
{
-#ifdef Q_OS_MACX
+#ifdef Q_WS_MACX
return mac_menubar_.get();
#else
return owner_-menuBar();
@@ -158,7 +158,7 @@
void QLMenubar::macxMenuBarInit()
{
-#ifdef Q_OS_MACX
+#ifdef Q_WS_MACX
mac_menubar_.reset(new QMenuBar);
// this is the name of the menu that contains our special entries
Index: D:/msys/home/yns/lyx/trunk/src/frontends/qt4/QLPopupMenu.C
===
--- D:/msys/home/yns/lyx/trunk/src/frontends/qt4/QLPopupMenu.C (revision 13369)
+++ D:/msys/home/yns/lyx/trunk/src/frontends/qt4/QLPopupMenu.C (working copy)
@@ -28,7 +28,7 @@
#include debug.h
-#ifdef Q_OS_MACX
+#ifdef Q_WS_MACX
#include kbmap.h
#include QLyXKeySym.h
extern boost::scoped_ptrkb_keymap toplevel_keymap;
@@ -147,7 +147,7 @@
/// \todo Mac specific binding handling.
void QLPopupMenu::addBinding(string label, MenuItem const mi)
{
-#ifndef Q_OS_MACX
+#ifndef Q_WS_MACX
string const binding(mi.binding());
if (!binding.empty()) {
@@ -177,7 +177,7 @@
/// \todo Fix Mac specific menu hack
void QLPopupMenu::specialMacXmenuHack()
{
-#ifdef Q_OS_MACX
+#ifdef Q_WS_MACX
/* The qt/mac menu code has a very silly hack that
moves some menu entries that it recognizes by name
(e.g. Preferences...) to the LyX menu. This
Index: D:/msys/home/yns/lyx/trunk/src/frontends/qt4/QWorkArea.C
===
--- D:/msys/home/yns/lyx/trunk/src/frontends/qt4/QWorkArea.C(revision 13369)
+++ D:/msys/home/yns/lyx/trunk/src/frontends/qt4/QWorkArea.C(working copy)
@@ -43,7 +43,7 @@
#include X11/Xlib.h
#endif
-#ifdef Q_OS_MACX
+#ifdef Q_WS_MACX
#include Carbon/Carbon.h
#include support/lstrings.h
using lyx::support::subst;
@@ -185,7 +185,7 @@
setInputMethodEnabled(true);
#endif
-#ifdef Q_OS_X11
+#ifdef Q_WS_X11
// doubleClickInterval() is 400 ms on X11 witch is just too long.
// On Windows and Mac OS X, the operating system's value is used.
// On Microsoft Windows, calling this function sets the double
@@ -193,7 +193,7 @@
QApplication::setDoubleClickInterval(300);
#endif
-#ifdef Q_OS_MACX
+#ifdef Q_WS_MACX
wa_ptr = this;
#endif
}
@@ -249,7 +249,7 @@
lyxerr[Debug::ACTION] getClipboard: (const char*) str endl;
if (str.isNull())
return string();
-#ifdef Q_OS_MACX
+#ifdef Q_WS_MACX
// The MAC clipboard uses \r for lineendings, and we use \n
return subst(fromqstr(str), '\r', '\n');
#else
@@ -260,7 +260,7 @@
void QWorkArea::putClipboard(string const str) const
{
-#ifdef Q_OS_MACX
+#ifdef Q_WS_MACX
// The MAC clipboard uses \r for lineendings, and we use \n
QApplication::clipboard()-setText(toqstr(subst(str, '\n', '\r')),
QClipboard::Selection);
@@ -390,6 +390,7 @@
void QWorkArea::wheelEvent(QWheelEvent * e)
{
verticalScrollBar()-setValue(verticalScrollBar()-value() -
e-delta());
+ adjustViewWithScrollBar();
}
void QWorkArea
Re: [Patch] Qt4 wheel mouse + Q_WS_* macro
Abdel, the line end conversion in the clipboard used Q_OS_MACX on purpose. You changed that to Q_WS_MACX, meaning that it will not happen on X11/Mac. Are you sure that it is not needed there? If yes, we should also change the qt2 frontend, otherwise please change it back. Georg
[Patch] Qt4 wheel mouse + Q_WS_* macro
Index: D:/msys/home/yns/lyx/trunk/src/frontends/qt4/ChangeLog
===
--- D:/msys/home/yns/lyx/trunk/src/frontends/qt4/ChangeLog (revision 13369)
+++ D:/msys/home/yns/lyx/trunk/src/frontends/qt4/ChangeLog (working copy)
@@ -1,8 +1,23 @@
-2006-03-01 Jürgen Spitzmüller <[EMAIL PROTECTED]>
+2006-03-14 Abdelrazak Younes <[EMAIL PROTECTED]>
+
+ * QWorkArea.[Ch]: Wheel one-liner mouse fix
+ * QWorkArea.C: Reverted to Q_WS_X11 and Q_WS_MACX instead of Q_OS_*
+ * QWorkArea.h: Added comments
+
+2006-03-12 Lars Gullik Bjønnes <[EMAIL PROTECTED]>
+
+ * ui/pch.h: new file
+
+2006-03-11 Abdelrazak Younes <[EMAIL PROTECTED]>
+
+ * Various Compilation fixes for MacOSX. There is still a problem
+ with Dialog.C:275 which does not recognize
+
+2006-03-10 Jürgen Spitzmüller <[EMAIL PROTECTED]>
* QLMenubar.h: compile fix for gcc-4.1.
-2006-03-01 Abdelrazak Younes <[EMAIL PROTECTED]>
+2006-03-10 Abdelrazak Younes <[EMAIL PROTECTED]>
* QWorkArea.[Ch] cleanup:
- Added private members workWidth_ and workHeight_ in order to
@@ -14,10 +29,6 @@
separate place at the end of QWorkArea.C.
- initial support for Wheel mouse (still does not work).
-2006-03-12 Lars Gullik Bjønnes <[EMAIL PROTECTED]>
-
- * ui/pch.h: new file
-
2006-03-10 Georg Baum <[EMAIL PROTECTED]>
* QWorkArea.C (getClipboard): convert MAC to UNIX line endings on OSX
Index: D:/msys/home/yns/lyx/trunk/src/frontends/qt4/QLMenubar.C
===
--- D:/msys/home/yns/lyx/trunk/src/frontends/qt4/QLMenubar.C(revision 13369)
+++ D:/msys/home/yns/lyx/trunk/src/frontends/qt4/QLMenubar.C(working copy)
@@ -149,7 +149,7 @@
*/
QMenuBar * QLMenubar::menuBar() const
{
-#ifdef Q_OS_MACX
+#ifdef Q_WS_MACX
return mac_menubar_.get();
#else
return owner_->menuBar();
@@ -158,7 +158,7 @@
void QLMenubar::macxMenuBarInit()
{
-#ifdef Q_OS_MACX
+#ifdef Q_WS_MACX
mac_menubar_.reset(new QMenuBar);
// this is the name of the menu that contains our special entries
Index: D:/msys/home/yns/lyx/trunk/src/frontends/qt4/QLPopupMenu.C
===
--- D:/msys/home/yns/lyx/trunk/src/frontends/qt4/QLPopupMenu.C (revision 13369)
+++ D:/msys/home/yns/lyx/trunk/src/frontends/qt4/QLPopupMenu.C (working copy)
@@ -28,7 +28,7 @@
#include "debug.h"
-#ifdef Q_OS_MACX
+#ifdef Q_WS_MACX
#include "kbmap.h"
#include "QLyXKeySym.h"
extern boost::scoped_ptr toplevel_keymap;
@@ -147,7 +147,7 @@
/// \todo Mac specific binding handling.
void QLPopupMenu::addBinding(string & label, MenuItem const & mi)
{
-#ifndef Q_OS_MACX
+#ifndef Q_WS_MACX
string const binding(mi.binding());
if (!binding.empty()) {
@@ -177,7 +177,7 @@
/// \todo Fix Mac specific menu hack
void QLPopupMenu::specialMacXmenuHack()
{
-#ifdef Q_OS_MACX
+#ifdef Q_WS_MACX
/* The qt/mac menu code has a very silly hack that
moves some menu entries that it recognizes by name
(e.g. "Preferences...") to the "LyX" menu. This
Index: D:/msys/home/yns/lyx/trunk/src/frontends/qt4/QWorkArea.C
===
--- D:/msys/home/yns/lyx/trunk/src/frontends/qt4/QWorkArea.C(revision 13369)
+++ D:/msys/home/yns/lyx/trunk/src/frontends/qt4/QWorkArea.C(working copy)
@@ -43,7 +43,7 @@
#include
#endif
-#ifdef Q_OS_MACX
+#ifdef Q_WS_MACX
#include
#include
using lyx::support::subst;
@@ -185,7 +185,7 @@
setInputMethodEnabled(true);
#endif
-#ifdef Q_OS_X11
+#ifdef Q_WS_X11
// doubleClickInterval() is 400 ms on X11 witch is just too long.
// On Windows and Mac OS X, the operating system's value is used.
// On Microsoft Windows, calling this function sets the double
@@ -193,7 +193,7 @@
QApplication::setDoubleClickInterval(300);
#endif
-#ifdef Q_OS_MACX
+#ifdef Q_WS_MACX
wa_ptr = this;
#endif
}
@@ -249,7 +249,7 @@
lyxerr[Debug::ACTION] << "getClipboard: " << (const char*) str << endl;
if (str.isNull())
return string();
-#ifdef Q_OS_MACX
+#ifdef Q_WS_MACX
// The MAC clipboard uses \r for lineendings, and we use \n
return subst(fromqstr(str), '\r', '\n');
#else
@@ -260,7 +260,7 @@
void QWorkArea::putClipboard(string const & str) const
{
-#ifdef Q_OS_MACX
+#ifdef Q_WS_MACX
// The MAC clipboard uses \r for lineendings, and we use \n
QApplication::clipboard()->setText(toqstr(subst(str, '\n', '\r')),
QClipboard::Selection);
@@ -390,6 +390,7 @@
void QWorkArea::wheelEvent(QWheelEv
Re: [Patch] Qt4 wheel mouse + Q_WS_* macro
Abdel, the line end conversion in the clipboard used Q_OS_MACX on purpose. You changed that to Q_WS_MACX, meaning that it will not happen on X11/Mac. Are you sure that it is not needed there? If yes, we should also change the qt2 frontend, otherwise please change it back. Georg
Re: [prerelease] LyX 1.4.0pre3 - Wheel mouse too slow
Please report all issues with these packages to lyx-devel@lists.lyx.org On my system the wheel mouse moves the screen too slowly to be useful in LyX-1.4.0pre3 (QT). Also, the setting Wheel mouse scroll in LyX: Preferences/Look and feel/User Interface/Scrolling/ does not seem to have any effect on the speed at which the wheel mouse moves the screen. The wheel mouse moved the screen much faster with LyX 1.3.6 (also using the QT ui). My System: kubuntu 5.10 (upgraded from preview) quatro FX 1100 (128MB) AGP 4x KDE 3.5 QT 3.3.4 gcc 4.02 Intel(R) Pentium(R) 4 CPU 1500MHz -- John C. McCabe-Dansted Masters Student
Re: [prerelease] LyX 1.4.0pre3 - Wheel mouse too slow
John C. McCabe-Dansted wrote: Also, the setting Wheel mouse scroll in LyX: Preferences/Look and feel/User Interface/Scrolling/ does not seem to have any effect on the speed at which the wheel mouse moves the screen. This setting is actually ignored in the qt frontend (we should consider hiding it). Jürgen
Re: [prerelease] LyX 1.4.0pre3 - Wheel mouse too slow
On Tuesday 27 December 2005 10:46, Juergen Spitzmueller wrote: John C. McCabe-Dansted wrote: Also, the setting Wheel mouse scroll in LyX: Preferences/Look and feel/User Interface/Scrolling/ does not seem to have any effect on the speed at which the wheel mouse moves the screen. This setting is actually ignored in the qt frontend (we should consider hiding it). Yes. See also http://bugzilla.lyx.org/show_bug.cgi?id=783 Georg
Re: [prerelease] LyX 1.4.0pre3 - Wheel mouse too slow
Yes, I can set the global Mouse wheel scrolls by (n) lines in system settings/mouse/advanced. However LyX seems to use a third or less of the global value. When I set 3 lines per wheel mouse click, LyX-1.4.0pre3 moves ~1/2 lines per wheel mouse click. When I set 12 lines per wheel mouse click, LyX-1.4.0pre3 moves ~4 lines per wheel mouse click. Would it be possible to resolve this discrepancy? Also, should I be posting these bugs at bugzilla.lyx.org as well as/instead of here? On Tuesday 27 December 2005 23:12, Georg Baum wrote: On Tuesday 27 December 2005 10:46, Juergen Spitzmueller wrote: John C. McCabe-Dansted wrote: Also, the setting Wheel mouse scroll in LyX: Preferences/Look and feel/User Interface/Scrolling/ does not seem to have any effect on the speed at which the wheel mouse moves the screen. This setting is actually ignored in the qt frontend (we should consider hiding it). Yes. See also http://bugzilla.lyx.org/show_bug.cgi?id=783 Georg -- John C. McCabe-Dansted Masters Student
Re: [prerelease] LyX 1.4.0pre3 - Wheel mouse too slow
On Tuesday 27 December 2005 11:42, John C. McCabe-Dansted wrote: Yes, I can set the global Mouse wheel scrolls by (n) lines in system settings/mouse/advanced. However LyX seems to use a third or less of the global value. When I set 3 lines per wheel mouse click, LyX-1.4.0pre3 moves ~1/2 lines per wheel mouse click. When I set 12 lines per wheel mouse click, LyX-1.4.0pre3 moves ~4 lines per wheel mouse click. Would it be possible to resolve this discrepancy? Of course. Unfortunately I don't know why it is like that, it might have some reason. Also, should I be posting these bugs at bugzilla.lyx.org as well as/instead of here? Please add them on bugzilla to the relevant entries (or create new ones) and post them here. Bugzilla makes sure that they are not forgotten, posting to the list brings the issues to the attention of developers. Georg
Re: [prerelease] LyX 1.4.0pre3 - Wheel mouse too slow
Georg Baum [EMAIL PROTECTED] writes: | On Tuesday 27 December 2005 11:42, John C. McCabe-Dansted wrote: | Yes, I can set the global Mouse wheel scrolls by (n) lines in system | settings/mouse/advanced. However LyX seems to use a third or less of the | global value. When I set 3 lines per wheel mouse click, LyX-1.4.0pre3 moves | ~1/2 lines per wheel mouse click. When I set 12 lines per wheel mouse | click, LyX-1.4.0pre3 moves ~4 lines per wheel mouse click. Would it be | possible to resolve this discrepancy? | | Of course. Unfortunately I don't know why it is like that, it might have some | reason. I bet it is use not being able to handle that many events at the same time, so we and up discarding some. I am not sure if we should change this, but rather continue to work at making the drawing faster. -- Lgb
Re: [prerelease] LyX 1.4.0pre3 - Wheel mouse too slow
> Please report all issues with these packages to > lyx-devel@lists.lyx.org On my system the wheel mouse moves the screen too slowly to be useful in LyX-1.4.0pre3 (QT). Also, the setting "Wheel mouse scroll" in does not seem to have any effect on the speed at which the wheel mouse moves the screen. The wheel mouse moved the screen much faster with LyX 1.3.6 (also using the QT ui). My System: kubuntu 5.10 (upgraded from preview) quatro FX 1100 (128MB) AGP 4x KDE 3.5 QT 3.3.4 gcc 4.02 Intel(R) Pentium(R) 4 CPU 1500MHz -- John C. McCabe-Dansted Masters Student
Re: [prerelease] LyX 1.4.0pre3 - Wheel mouse too slow
John C. McCabe-Dansted wrote: > Also, the setting "Wheel mouse scroll" in Preferences/Look and feel/User Interface/Scrolling/> does not seem to have > any effect on the speed at which the wheel mouse moves the screen. This setting is actually ignored in the qt frontend (we should consider hiding it). Jürgen
Re: [prerelease] LyX 1.4.0pre3 - Wheel mouse too slow
On Tuesday 27 December 2005 10:46, Juergen Spitzmueller wrote: > John C. McCabe-Dansted wrote: > > Also, the setting "Wheel mouse scroll" in > Preferences/Look and feel/User Interface/Scrolling/> does not seem to > > have any effect on the speed at which the wheel mouse moves the screen. > > This setting is actually ignored in the qt frontend (we should consider > hiding it). Yes. See also http://bugzilla.lyx.org/show_bug.cgi?id=783 Georg
Re: [prerelease] LyX 1.4.0pre3 - Wheel mouse too slow
Yes, I can set the global "Mouse wheel scrolls by (n) lines" in "system settings/mouse/advanced". However LyX seems to use a third or less of the global value. When I set 3 lines per wheel mouse click, LyX-1.4.0pre3 moves ~1/2 lines per wheel mouse click. When I set 12 lines per wheel mouse click, LyX-1.4.0pre3 moves ~4 lines per wheel mouse click. Would it be possible to resolve this discrepancy? Also, should I be posting these bugs at bugzilla.lyx.org as well as/instead of here? On Tuesday 27 December 2005 23:12, Georg Baum wrote: > On Tuesday 27 December 2005 10:46, Juergen Spitzmueller wrote: > > John C. McCabe-Dansted wrote: > > > Also, the setting "Wheel mouse scroll" in > > Preferences/Look and feel/User Interface/Scrolling/> does not seem to > > > have any effect on the speed at which the wheel mouse moves the screen. > > > > This setting is actually ignored in the qt frontend (we should consider > > hiding it). > > Yes. See also http://bugzilla.lyx.org/show_bug.cgi?id=783 > > > Georg -- John C. McCabe-Dansted Masters Student
Re: [prerelease] LyX 1.4.0pre3 - Wheel mouse too slow
On Tuesday 27 December 2005 11:42, John C. McCabe-Dansted wrote: > Yes, I can set the global "Mouse wheel scrolls by (n) lines" in "system > settings/mouse/advanced". However LyX seems to use a third or less of the > global value. When I set 3 lines per wheel mouse click, LyX-1.4.0pre3 moves > ~1/2 lines per wheel mouse click. When I set 12 lines per wheel mouse > click, LyX-1.4.0pre3 moves ~4 lines per wheel mouse click. Would it be > possible to resolve this discrepancy? Of course. Unfortunately I don't know why it is like that, it might have some reason. > Also, should I be posting these bugs at bugzilla.lyx.org as well as/instead > of here? Please add them on bugzilla to the relevant entries (or create new ones) and post them here. Bugzilla makes sure that they are not forgotten, posting to the list brings the issues to the attention of developers. Georg
Re: [prerelease] LyX 1.4.0pre3 - Wheel mouse too slow
Georg Baum <[EMAIL PROTECTED]> writes: | On Tuesday 27 December 2005 11:42, John C. McCabe-Dansted wrote: | > Yes, I can set the global "Mouse wheel scrolls by (n) lines" in "system | > settings/mouse/advanced". However LyX seems to use a third or less of the | > global value. When I set 3 lines per wheel mouse click, LyX-1.4.0pre3 moves | > ~1/2 lines per wheel mouse click. When I set 12 lines per wheel mouse | > click, LyX-1.4.0pre3 moves ~4 lines per wheel mouse click. Would it be | > possible to resolve this discrepancy? | | Of course. Unfortunately I don't know why it is like that, it might have some | reason. I bet it is use not being able to handle that many events at the same time, so we and up discarding some. I am not sure if we should change this, but rather continue to work at making the drawing faster. -- Lgb
Re: Wheel mouse
Amir Karger wrote: In case it's relevant and not reported yet, I believe I found that in LyX1.1.6fix2, if the mouse is over a fig, then the mouse wheel doesn't work. (This might only be when the fig takes up the whole window, but I don't think so.) I suspect It is when the figure is lager than the amount specified by the wheel_jump variable. And the bug is still there in fix3. Pit -- Peter Pit Suetterlin http://www.uni-sw.gwdg.de/~pit Universitaets-Sternwarte Goettingen Tel.: +49 551 39-5048 [EMAIL PROTECTED]
Re: Wheel mouse
Amir Karger wrote: > In case it's relevant and not reported yet, I believe I found that in > LyX1.1.6fix2, if the mouse is over a fig, then the mouse wheel doesn't > work. (This might only be when the fig takes up the whole window, but > I don't think so.) I suspect It is when the figure is lager than the amount specified by the wheel_jump variable. And the bug is still there in fix3. Pit -- Peter "Pit" Suetterlin http://www.uni-sw.gwdg.de/~pit Universitaets-Sternwarte Goettingen Tel.: +49 551 39-5048 [EMAIL PROTECTED]
Wheel mouse
Hi Andre et al.,
just in case you have a wheel mouse, could you please check why the cursor
hangs in the math formula? Load the attached file, move the cursor to
the beginning of the document and scroll down with the wheel of your
mouse.
Another interesting fact: You cannot exit LyX if you are in mathed.
Michael
--
==
Michael Schmittphone: +49 451 500 3725
Institute for Telematics secretary: +49 451 500 3721
Medical University of Luebeck fax: +49 451 500 3722
Ratzeburger Allee 160 eMail: [EMAIL PROTECTED]
D-23538 Luebeck, Germany WWW: http://www.itm.mu-luebeck.de
==
#LyX 1.2 created this file. For more info see http://www.lyx.org/
\lyxformat 220
\textclass article
\begin_preamble
\usepackage{amsfonts}
\end_preamble
\language english
\inputencoding latin1
\fontscheme default
\graphics default
\paperfontsize default
\spacing single
\papersize Default
\paperpackage a4
\use_geometry 0
\use_amsmath 1
\use_natbib 0
\use_numerical_citations 0
\paperorientation portrait
\secnumdepth 3
\tocdepth 3
\paragraph_separation indent
\defskip medskip
\quotes_language english
\quotes_times 2
\papercolumns 1
\papersides 1
\paperpagestyle default
\layout Title
An Efficient Method for Fully Relativistic Simulations of Coalescing Binary
Neutron Stars
\layout Author
Walter Landry
\newline
Physics Dept., University of Utah, SLC, UT 84112
\layout Date
\SpecialChar ~
\layout Standard
These are all the equations from Walter's PhD thesis which he prepared using
LyX.
\layout Standard
\begin_inset Formula \begin{equation}
ds^{2} =g_{\mu \nu } dx^{\mu } dx^{\nu } =-\alpha ^{2} dt^{2} +\gamma _{ij} (dx^{i}
+\beta ^{i} dt)(dx^{j} +\beta ^{j} dt).\label{first}\end{equation}
\end_inset
\begin_inset Formula \begin{equation}
\frac{\partial \gamma _{ij} }{\partial t}=-2\alpha K_{ij} +\nabla _{i} \beta _{j}
+\nabla _{j} \beta _{i} ,\label{g dot}\end{equation}
\end_inset
\layout Standard
\begin_inset Formula \begin{eqnarray}
\frac{\partial K_{ij} }{\partial t}=-\nabla _{i} \nabla _{j} \alpha +K_{lj} \nabla
_{i} \beta ^{l} +K_{il} \nabla _{j} \beta ^{l} +\beta ^{l} \nabla _{l} K_{ij}
\nonumber \\
+\alpha \left[ R_{ij} -2K_{il} K^{l}_{j} +KK_{ij} -S_{ij} -\frac{1}{2}\gamma _{ij}
+(\rho -S)\right] .\label{K dot}\end{eqnarray}
\end_inset
\begin_inset Formula \begin{eqnarray}
R_{ij} =\frac{1}{2}\gamma ^{kl} \left[ \gamma _{kj,il} +\gamma _{il,kj} -\gamma
_{kl,ij} -\gamma _{ij,kl} \right. \nonumber \\
\left. +2\left( \Gamma ^{m}_{il} \Gamma _{mkj} -\Gamma ^{m}_{ij} \Gamma _{mkl}
\right) \right] . \label{Ricci}\end{eqnarray}
\end_inset
\begin_inset Formula \[
n_{\mu } =(-\alpha ,0,0,0).\]
\end_inset
\begin_inset Formula \begin{eqnarray*}
\rho = 8\pi n_{\mu } n_{\nu } T^{\mu \nu } =8\pi \alpha ^{2} T^{tt} , \\
J^{i} = -8\pi n_{\mu } \gamma ^{i}_{j} T^{\mu j} , \\
S_{ij} = 8\pi \gamma _{ik} \gamma _{jl} T^{kl} ,\end{eqnarray*}
\end_inset
\begin_inset Formula \[
S=\gamma ^{ij} S_{ij} .\]
\end_inset
\layout Standard
\begin_inset Formula \begin{equation}
R+K^{2} -K_{ij} K^{ij} =2\rho ,\label{Energy}\end{equation}
\end_inset
\begin_inset Formula \begin{equation}
\nabla _{j} \left( K^{ij} -\gamma ^{ij} K\right) =J^{i}
.\label{Momentum}\end{equation}
\end_inset
\layout Standard
\begin_inset Formula \[
K^{ij} =\psi ^{-10} \left( \widetilde{A}^{ij} +\left( lX\right) ^{ij} \right)
+\frac{1}{3}\psi ^{-4} \widetilde{\gamma }^{ik} \mathrm{T}\mathrm{r}K,\]
\end_inset
\begin_inset Formula \[
\left( lX\right) ^{ij} =\widetilde{\nabla }^{i} X^{j} +\widetilde{\nabla }^{j} X^{i}
-\frac{2}{3}\widetilde{\gamma }^{ij} \widetilde{\nabla }_{k} X^{k} ,\]
\end_inset
\begin_inset Formula \begin{eqnarray}
-8\widetilde{\nabla }^{2} \psi = -\widetilde{R}\psi -\frac{2}{3}\left( trK\right)
^{2} \psi ^{5} \nonumber \\
+\left( \widetilde{A}^{ij} +\left( lX\right) ^{ij} \right) ^{2} \psi ^{-7}
+2\rho \psi ^{5} ,\label{phi constraint} \\
\widetilde{\nabla }^{2} X^{i} + \frac{1}{3}\widetilde{\nabla }^{i}
\widetilde{\nabla }_{j} X^{j} +\widetilde{R}^{i}_{j} X^{j} \nonumber \\
= J^{i} \psi ^{10} -\widetilde{\nabla }_{j} \widetilde{A}^{ij} +\frac{2}{3}\psi
^{6} \widetilde{\nabla }^{i} trK,\label{X constraint}\end{eqnarray}
\end_inset
\begin_inset Formula \begin{eqnarray}
-8\widetilde{\nabla }^{2} (\psi _{0} +\delta \psi )=-\widetilde{R}(\psi _{0} +\delta
\psi )-\frac{2}{3}\left( trK\right) ^{2} \psi ^{4}_{0} (\psi _{0} +5\delta \psi )
\nonumber \\
+\left( \widetilde{A}^{ij} +\left( lX_{0} \right) ^{ij} \right) ^{2} \psi ^{-8}_{0}
+(\psi _{0} -7\delta \psi )+2\rho \psi ^{4}_{0} (\psi _{0
Re: Wheel mouse
On Thu, Aug 16, 2001 at 05:10:42PM +0200, Michael Schmitt wrote: Another interesting fact: You cannot exit LyX if you are in mathed. both ctrl-Q and menu work fine for me inside mathed. john
Re: Wheel mouse
just in case you have a wheel mouse, could you please check why the cursor hangs in the math formula? I don't have one. Load the attached file, move the cursor to the beginning of the document and scroll down with the wheel of your mouse. Another interesting fact: You cannot exit LyX if you are in mathed. *shrug* the global/local dispatcher interaction is wierd anyway... Andre' -- André Pönitz . [EMAIL PROTECTED]
Re: Wheel mouse
On Thu, Aug 16, 2001 at 05:12:43PM +0200, Andre Poenitz wrote: just in case you have a wheel mouse, could you please check why the cursor hangs in the math formula? I don't have one. In case it's relevant and not reported yet, I believe I found that in LyX1.1.6fix2, if the mouse is over a fig, then the mouse wheel doesn't work. (This might only be when the fig takes up the whole window, but I don't think so.) -Amir
Wheel mouse
Hi Andre et al.,
just in case you have a wheel mouse, could you please check why the cursor
"hangs" in the math formula? Load the attached file, move the cursor to
the beginning of the document and scroll down with the wheel of your
mouse.
Another interesting fact: You cannot exit LyX if you are in mathed.
Michael
--
==
Michael Schmittphone: +49 451 500 3725
Institute for Telematics secretary: +49 451 500 3721
Medical University of Luebeck fax: +49 451 500 3722
Ratzeburger Allee 160 eMail: [EMAIL PROTECTED]
D-23538 Luebeck, Germany WWW: http://www.itm.mu-luebeck.de
==
#LyX 1.2 created this file. For more info see http://www.lyx.org/
\lyxformat 220
\textclass article
\begin_preamble
\usepackage{amsfonts}
\end_preamble
\language english
\inputencoding latin1
\fontscheme default
\graphics default
\paperfontsize default
\spacing single
\papersize Default
\paperpackage a4
\use_geometry 0
\use_amsmath 1
\use_natbib 0
\use_numerical_citations 0
\paperorientation portrait
\secnumdepth 3
\tocdepth 3
\paragraph_separation indent
\defskip medskip
\quotes_language english
\quotes_times 2
\papercolumns 1
\papersides 1
\paperpagestyle default
\layout Title
An Efficient Method for Fully Relativistic Simulations of Coalescing Binary
Neutron Stars
\layout Author
Walter Landry
\newline
Physics Dept., University of Utah, SLC, UT 84112
\layout Date
\SpecialChar ~
\layout Standard
These are all the equations from Walter's PhD thesis which he prepared using
LyX.
\layout Standard
\begin_inset Formula \begin{equation}
ds^{2} =g_{\mu \nu } dx^{\mu } dx^{\nu } =-\alpha ^{2} dt^{2} +\gamma _{ij} (dx^{i}
+\beta ^{i} dt)(dx^{j} +\beta ^{j} dt).\label{first}\end{equation}
\end_inset
\begin_inset Formula \begin{equation}
\frac{\partial \gamma _{ij} }{\partial t}=-2\alpha K_{ij} +\nabla _{i} \beta _{j}
+\nabla _{j} \beta _{i} ,\label{g dot}\end{equation}
\end_inset
\layout Standard
\begin_inset Formula \begin{eqnarray}
\frac{\partial K_{ij} }{\partial t}=-\nabla _{i} \nabla _{j} \alpha +K_{lj} \nabla
_{i} \beta ^{l} +K_{il} \nabla _{j} \beta ^{l} +\beta ^{l} \nabla _{l} K_{ij} & &
\nonumber \\
+\alpha \left[ R_{ij} -2K_{il} K^{l}_{j} +KK_{ij} -S_{ij} -\frac{1}{2}\gamma _{ij}
+(\rho -S)\right] . & & \label{K dot}\end{eqnarray}
\end_inset
\begin_inset Formula \begin{eqnarray}
R_{ij} =\frac{1}{2}\gamma ^{kl} & \left[ \gamma _{kj,il} +\gamma _{il,kj} -\gamma
_{kl,ij} -\gamma _{ij,kl} \right. & \nonumber \\
& \left. +2\left( \Gamma ^{m}_{il} \Gamma _{mkj} -\Gamma ^{m}_{ij} \Gamma _{mkl}
\right) \right] . & \label{Ricci}\end{eqnarray}
\end_inset
\begin_inset Formula \[
n_{\mu } =(-\alpha ,0,0,0).\]
\end_inset
\begin_inset Formula \begin{eqnarray*}
\rho & = & 8\pi n_{\mu } n_{\nu } T^{\mu \nu } =8\pi \alpha ^{2} T^{tt} , \\
J^{i} & = & -8\pi n_{\mu } \gamma ^{i}_{j} T^{\mu j} , \\
S_{ij} & = & 8\pi \gamma _{ik} \gamma _{jl} T^{kl} ,\end{eqnarray*}
\end_inset
\begin_inset Formula \[
S=\gamma ^{ij} S_{ij} .\]
\end_inset
\layout Standard
\begin_inset Formula \begin{equation}
R+K^{2} -K_{ij} K^{ij} =2\rho ,\label{Energy}\end{equation}
\end_inset
\begin_inset Formula \begin{equation}
\nabla _{j} \left( K^{ij} -\gamma ^{ij} K\right) =J^{i}
.\label{Momentum}\end{equation}
\end_inset
\layout Standard
\begin_inset Formula \[
K^{ij} =\psi ^{-10} \left( \widetilde{A}^{ij} +\left( lX\right) ^{ij} \right)
+\frac{1}{3}\psi ^{-4} \widetilde{\gamma }^{ik} \mathrm{T}\mathrm{r}K,\]
\end_inset
\begin_inset Formula \[
\left( lX\right) ^{ij} =\widetilde{\nabla }^{i} X^{j} +\widetilde{\nabla }^{j} X^{i}
-\frac{2}{3}\widetilde{\gamma }^{ij} \widetilde{\nabla }_{k} X^{k} ,\]
\end_inset
\begin_inset Formula \begin{eqnarray}
-8\widetilde{\nabla }^{2} \psi & = & -\widetilde{R}\psi -\frac{2}{3}\left( trK\right)
^{2} \psi ^{5} \nonumber \\
& & +\left( \widetilde{A}^{ij} +\left( lX\right) ^{ij} \right) ^{2} \psi ^{-7}
+2\rho \psi ^{5} ,\label{phi constraint} \\
\widetilde{\nabla }^{2} X^{i} & + & \frac{1}{3}\widetilde{\nabla }^{i}
\widetilde{\nabla }_{j} X^{j} +\widetilde{R}^{i}_{j} X^{j} \nonumber \\
& = & J^{i} \psi ^{10} -\widetilde{\nabla }_{j} \widetilde{A}^{ij} +\frac{2}{3}\psi
^{6} \widetilde{\nabla }^{i} trK,\label{X constraint}\end{eqnarray}
\end_inset
\begin_inset Formula \begin{eqnarray}
-8\widetilde{\nabla }^{2} (\psi _{0} +\delta \psi )=-\widetilde{R}(\psi _{0} +\delta
\psi )-\frac{2}{3}\left( trK\right) ^{2} \psi ^{4}_{0} (\psi _{0} +5\delta \psi ) & &
\nonumber \\
+\left(
Re: Wheel mouse
On Thu, Aug 16, 2001 at 05:10:42PM +0200, Michael Schmitt wrote: > Another interesting fact: You cannot exit LyX if you are in mathed. both ctrl-Q and menu work fine for me inside mathed. john
Re: Wheel mouse
> just in case you have a wheel mouse, could you please check why the cursor > "hangs" in the math formula? I don't have one. > Load the attached file, move the cursor to > the beginning of the document and scroll down with the wheel of your > mouse. > > Another interesting fact: You cannot exit LyX if you are in mathed. *shrug* the global/local dispatcher interaction is wierd anyway... Andre' -- André Pönitz . [EMAIL PROTECTED]
Re: Wheel mouse
On Thu, Aug 16, 2001 at 05:12:43PM +0200, Andre Poenitz wrote: > > just in case you have a wheel mouse, could you please check why the cursor > > "hangs" in the math formula? > > I don't have one. In case it's relevant and not reported yet, I believe I found that in LyX1.1.6fix2, if the mouse is over a fig, then the mouse wheel doesn't work. (This might only be when the fig takes up the whole window, but I don't think so.) -Amir
