Am 18.07.2010 um 08:34 schrieb Enrico Forestieri:
> On Sun, Jul 18, 2010 at 12:29:43AM +0200, [email protected] wrote:
>
>> Author: switt
>> Date: Sun Jul 18 00:29:42 2010
>> New Revision: 34955
>> URL: http://www.lyx.org/trac/changeset/34955
>>
>> Log:
>> make mouse scroll wheel zoom configurable
> [...]
>> + case RC_SCROLL_WHEEL_ZOOM:
>> + if (ignore_system_lyxrc ||
>> + scroll_whell_zoom != system_lyxrc.scroll_whell_zoom) {
>> + string status;
>> + switch (scroll_whell_zoom) {
>> + case SCROLL_WHEEL_ZOOM_OFF:
>> + status = "off";
>> + break;
>> + case SCROLL_WHEEL_ZOOM_CTRL:
>> + status = "ctrl";
>> + break;
>> + case SCROLL_WHEEL_ZOOM_SHIFT:
>> + status = "shift";
>> + break;
>> + case SCROLL_WHEEL_ZOOM_OPTION:
>> + status = "option";
>> + break;
>
> What is "option"? I think this is Mac specific and should not be an
> option (sorry for the pun) on other platforms.
Attached is the patch to change Option to Alt. OK?
Stephan
Index: src/LyXRC.h
===================================================================
--- src/LyXRC.h (Revision 34955)
+++ src/LyXRC.h (Arbeitskopie)
@@ -508,7 +508,7 @@
SCROLL_WHEEL_ZOOM_OFF,
SCROLL_WHEEL_ZOOM_CTRL,
SCROLL_WHEEL_ZOOM_SHIFT,
- SCROLL_WHEEL_ZOOM_OPTION
+ SCROLL_WHEEL_ZOOM_ALT
};
///
ScrollWheelZoom scroll_whell_zoom;
Index: src/LyXRC.cpp
===================================================================
--- src/LyXRC.cpp (Revision 34955)
+++ src/LyXRC.cpp (Arbeitskopie)
@@ -1204,8 +1204,8 @@
scroll_whell_zoom =
SCROLL_WHEEL_ZOOM_CTRL;
else if (tmp == "shift")
scroll_whell_zoom =
SCROLL_WHEEL_ZOOM_SHIFT;
- else if (tmp == "option")
- scroll_whell_zoom =
SCROLL_WHEEL_ZOOM_OPTION;
+ else if (tmp == "alt")
+ scroll_whell_zoom =
SCROLL_WHEEL_ZOOM_ALT;
else {
scroll_whell_zoom =
SCROLL_WHEEL_ZOOM_OFF;
if (tmp != "off" && tmp != "false")
@@ -2604,8 +2604,8 @@
case SCROLL_WHEEL_ZOOM_SHIFT:
status = "shift";
break;
- case SCROLL_WHEEL_ZOOM_OPTION:
- status = "option";
+ case SCROLL_WHEEL_ZOOM_ALT:
+ status = "alt";
break;
}
os << "\\scroll_whell_zoom " << status << '\n';
Index: src/frontends/qt4/GuiWorkArea.cpp
===================================================================
--- src/frontends/qt4/GuiWorkArea.cpp (Revision 34955)
+++ src/frontends/qt4/GuiWorkArea.cpp (Arbeitskopie)
@@ -827,7 +827,7 @@
zoom = ev->modifiers() & Qt::ShiftModifier;
zoom &= !(ev->modifiers() & (Qt::ControlModifier ||
Qt::AltModifier));
break;
- case LyXRC::SCROLL_WHEEL_ZOOM_OPTION:
+ case LyXRC::SCROLL_WHEEL_ZOOM_ALT:
zoom = ev->modifiers() & Qt::AltModifier;
zoom &= !(ev->modifiers() & (Qt::ShiftModifier ||
Qt::ControlModifier));
break;
Index: src/frontends/qt4/GuiPrefs.cpp
===================================================================
--- src/frontends/qt4/GuiPrefs.cpp (Revision 34955)
+++ src/frontends/qt4/GuiPrefs.cpp (Arbeitskopie)
@@ -483,7 +483,7 @@
rc.scroll_whell_zoom = LyXRC::SCROLL_WHEEL_ZOOM_SHIFT;
break;
case 2:
- rc.scroll_whell_zoom = LyXRC::SCROLL_WHEEL_ZOOM_OPTION;
+ rc.scroll_whell_zoom = LyXRC::SCROLL_WHEEL_ZOOM_ALT;
break;
}
} else {
@@ -511,7 +511,7 @@
scrollzoomEnableCB->setChecked(true);
scrollzoomValueCO->setCurrentIndex(1);
break;
- case LyXRC::SCROLL_WHEEL_ZOOM_OPTION:
+ case LyXRC::SCROLL_WHEEL_ZOOM_ALT:
scrollzoomEnableCB->setChecked(true);
scrollzoomValueCO->setCurrentIndex(2);
break;
Index: src/frontends/qt4/ui/PrefInputUi.ui
===================================================================
--- src/frontends/qt4/ui/PrefInputUi.ui (Revision 34955)
+++ src/frontends/qt4/ui/PrefInputUi.ui (Arbeitskopie)
@@ -243,7 +243,7 @@
</item>
<item>
<property name="text">
- <string>Option</string>
+ <string>Alt</string>
</property>
</item>
</widget>
