From e99bd868f96725aa6c192b27a03b25a4403bffe6 Mon Sep 17 00:00:00 2001
From: Stephan Witt <switt@lyx.org>
Date: Sun, 18 Jul 2010 10:04:59 +0000
Subject: [PATCH] use "alt" instead of "option" for modifier keyword

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34967 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/LyXRC.cpp                       | 8 ++++----
 src/LyXRC.h                         | 2 +-
 src/frontends/qt4/GuiPrefs.cpp      | 4 ++--
 src/frontends/qt4/GuiWorkArea.cpp   | 2 +-
 src/frontends/qt4/ui/PrefInputUi.ui | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index 029f78b1d1..bd52e887bb 100644
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -1204,8 +1204,8 @@ int LyXRC::read(Lexer & lexrc)
 					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 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
 			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';
diff --git a/src/LyXRC.h b/src/LyXRC.h
index 7429105a4e..7e6ec91d7d 100644
--- a/src/LyXRC.h
+++ b/src/LyXRC.h
@@ -508,7 +508,7 @@ public:
 		SCROLL_WHEEL_ZOOM_OFF,
 		SCROLL_WHEEL_ZOOM_CTRL,
 		SCROLL_WHEEL_ZOOM_SHIFT,
-		SCROLL_WHEEL_ZOOM_OPTION
+		SCROLL_WHEEL_ZOOM_ALT
 	};
 	///
 	ScrollWheelZoom scroll_whell_zoom;
diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp
index 75eceee499..259fd42749 100644
--- a/src/frontends/qt4/GuiPrefs.cpp
+++ b/src/frontends/qt4/GuiPrefs.cpp
@@ -483,7 +483,7 @@ void PrefInput::apply(LyXRC & rc) const
 			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 @@ void PrefInput::update(LyXRC const & rc)
 		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;
diff --git a/src/frontends/qt4/GuiWorkArea.cpp b/src/frontends/qt4/GuiWorkArea.cpp
index 1f582cffaf..1e87434ad1 100644
--- a/src/frontends/qt4/GuiWorkArea.cpp
+++ b/src/frontends/qt4/GuiWorkArea.cpp
@@ -827,7 +827,7 @@ void GuiWorkArea::wheelEvent(QWheelEvent * ev)
 		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;
diff --git a/src/frontends/qt4/ui/PrefInputUi.ui b/src/frontends/qt4/ui/PrefInputUi.ui
index a0b8c8a856..75857b953f 100644
--- a/src/frontends/qt4/ui/PrefInputUi.ui
+++ b/src/frontends/qt4/ui/PrefInputUi.ui
@@ -243,7 +243,7 @@
          </item>
          <item>
           <property name="text">
-           <string>Option</string>
+           <string>Alt</string>
           </property>
          </item>
         </widget>