anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-27 22:41:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

use "alt" instead of "option" for modifier keyword

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34967 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Stephan Witt 2010-07-18 10:04:59 +00:00
parent 99160cd715
commit e99bd868f9
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/LyXRC.cpp
View File

@ -1204,8 +1204,8 @@ int LyXRC::read(Lexer & lexrc)
scroll_whell_zoom = SCROLL_WHEEL_ZOOM_CTRL; scroll_whell_zoom = SCROLL_WHEEL_ZOOM_CTRL;
else if (tmp == "shift") else if (tmp == "shift")
scroll_whell_zoom = SCROLL_WHEEL_ZOOM_SHIFT; scroll_whell_zoom = SCROLL_WHEEL_ZOOM_SHIFT;
else if (tmp == "option") else if (tmp == "alt")
scroll_whell_zoom = SCROLL_WHEEL_ZOOM_OPTION; scroll_whell_zoom = SCROLL_WHEEL_ZOOM_ALT;
else { else {
scroll_whell_zoom = SCROLL_WHEEL_ZOOM_OFF; scroll_whell_zoom = SCROLL_WHEEL_ZOOM_OFF;
if (tmp != "off" && tmp != "false") 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: case SCROLL_WHEEL_ZOOM_SHIFT:
status = "shift"; status = "shift";
break; break;
case SCROLL_WHEEL_ZOOM_OPTION: case SCROLL_WHEEL_ZOOM_ALT:
status = "option"; status = "alt";
break; break;
} }
os << "\\scroll_whell_zoom " << status << '\n'; os << "\\scroll_whell_zoom " << status << '\n';

2
src/LyXRC.h
View File

@ -508,7 +508,7 @@ public:
SCROLL_WHEEL_ZOOM_OFF, SCROLL_WHEEL_ZOOM_OFF,
SCROLL_WHEEL_ZOOM_CTRL, SCROLL_WHEEL_ZOOM_CTRL,
SCROLL_WHEEL_ZOOM_SHIFT, SCROLL_WHEEL_ZOOM_SHIFT,
SCROLL_WHEEL_ZOOM_OPTION SCROLL_WHEEL_ZOOM_ALT
}; };
/// ///
ScrollWheelZoom scroll_whell_zoom; ScrollWheelZoom scroll_whell_zoom;

4
src/frontends/qt4/GuiPrefs.cpp
View File

@ -483,7 +483,7 @@ void PrefInput::apply(LyXRC & rc) const
rc.scroll_whell_zoom = LyXRC::SCROLL_WHEEL_ZOOM_SHIFT; rc.scroll_whell_zoom = LyXRC::SCROLL_WHEEL_ZOOM_SHIFT;
break; break;
case 2: case 2:
rc.scroll_whell_zoom = LyXRC::SCROLL_WHEEL_ZOOM_OPTION; rc.scroll_whell_zoom = LyXRC::SCROLL_WHEEL_ZOOM_ALT;
break; break;
} }
} else { } else {
@ -511,7 +511,7 @@ void PrefInput::update(LyXRC const & rc)
scrollzoomEnableCB->setChecked(true); scrollzoomEnableCB->setChecked(true);
scrollzoomValueCO->setCurrentIndex(1); scrollzoomValueCO->setCurrentIndex(1);
break; break;
case LyXRC::SCROLL_WHEEL_ZOOM_OPTION: case LyXRC::SCROLL_WHEEL_ZOOM_ALT:
scrollzoomEnableCB->setChecked(true); scrollzoomEnableCB->setChecked(true);
scrollzoomValueCO->setCurrentIndex(2); scrollzoomValueCO->setCurrentIndex(2);
break; break;

2
src/frontends/qt4/GuiWorkArea.cpp
View File

@ -827,7 +827,7 @@ void GuiWorkArea::wheelEvent(QWheelEvent * ev)
zoom = ev->modifiers() & Qt::ShiftModifier; zoom = ev->modifiers() & Qt::ShiftModifier;
zoom &= !(ev->modifiers() & (Qt::ControlModifier || Qt::AltModifier)); zoom &= !(ev->modifiers() & (Qt::ControlModifier || Qt::AltModifier));
break; break;
case LyXRC::SCROLL_WHEEL_ZOOM_OPTION: case LyXRC::SCROLL_WHEEL_ZOOM_ALT:
zoom = ev->modifiers() & Qt::AltModifier; zoom = ev->modifiers() & Qt::AltModifier;
zoom &= !(ev->modifiers() & (Qt::ShiftModifier || Qt::ControlModifier)); zoom &= !(ev->modifiers() & (Qt::ShiftModifier || Qt::ControlModifier));
break; break;

2
src/frontends/qt4/ui/PrefInputUi.ui
View File

@ -243,7 +243,7 @@
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>Option</string> <string>Alt</string>
</property> </property>
</item> </item>
</widget> </widget>