anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-14 06:57:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

correct typo in RC_SCROLL_WHEEL_ZOOM text

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35004 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Stephan Witt 2010-07-22 14:51:35 +00:00
parent e2085186c2
commit 710bb42049
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/LyXRC.cpp
View File

@ -173,7 +173,7 @@ LexerKeyword lyxrcTags[] = {
{ "\\screen_font_typewriter_foundry", LyXRC::RC_SCREEN_FONT_TYPEWRITER_FOUNDRY }, { "\\screen_font_typewriter_foundry", LyXRC::RC_SCREEN_FONT_TYPEWRITER_FOUNDRY },
{ "\\screen_zoom", LyXRC::RC_SCREEN_ZOOM }, { "\\screen_zoom", LyXRC::RC_SCREEN_ZOOM },
{ "\\scroll_below_document", LyXRC::RC_SCROLL_BELOW_DOCUMENT }, { "\\scroll_below_document", LyXRC::RC_SCROLL_BELOW_DOCUMENT },
{ "\\scroll_whell_zoom", LyXRC::RC_SCROLL_WHEEL_ZOOM }, { "\\scroll_wheel_zoom", LyXRC::RC_SCROLL_WHEEL_ZOOM },
{ "\\serverpipe", LyXRC::RC_SERVERPIPE }, { "\\serverpipe", LyXRC::RC_SERVERPIPE },
{ "\\set_color", LyXRC::RC_SET_COLOR }, { "\\set_color", LyXRC::RC_SET_COLOR },
{ "\\show_banner", LyXRC::RC_SHOW_BANNER }, { "\\show_banner", LyXRC::RC_SHOW_BANNER },
@ -321,7 +321,7 @@ void LyXRC::setDefaults()
date_insert_format = "%x"; date_insert_format = "%x";
cursor_follows_scrollbar = false; cursor_follows_scrollbar = false;
scroll_below_document = false; scroll_below_document = false;
scroll_whell_zoom = SCROLL_WHEEL_ZOOM_CTRL; scroll_wheel_zoom = SCROLL_WHEEL_ZOOM_CTRL;
paragraph_markers = false; paragraph_markers = false;
mac_like_word_movement = false; mac_like_word_movement = false;
macro_edit_style = MACRO_EDIT_INLINE_BOX; macro_edit_style = MACRO_EDIT_INLINE_BOX;
@ -1201,15 +1201,15 @@ int LyXRC::read(Lexer & lexrc)
if (lexrc.next()) { if (lexrc.next()) {
string const tmp = lexrc.getString(); string const tmp = lexrc.getString();
if (tmp == "ctrl") if (tmp == "ctrl")
scroll_whell_zoom = SCROLL_WHEEL_ZOOM_CTRL; scroll_wheel_zoom = SCROLL_WHEEL_ZOOM_CTRL;
else if (tmp == "shift") else if (tmp == "shift")
scroll_whell_zoom = SCROLL_WHEEL_ZOOM_SHIFT; scroll_wheel_zoom = SCROLL_WHEEL_ZOOM_SHIFT;
else if (tmp == "alt") else if (tmp == "alt")
scroll_whell_zoom = SCROLL_WHEEL_ZOOM_ALT; scroll_wheel_zoom = SCROLL_WHEEL_ZOOM_ALT;
else { else {
scroll_whell_zoom = SCROLL_WHEEL_ZOOM_OFF; scroll_wheel_zoom = SCROLL_WHEEL_ZOOM_OFF;
if (tmp != "off" && tmp != "false") if (tmp != "off" && tmp != "false")
LYXERR0("Unrecognized scroll_whell_zoom status \"" LYXERR0("Unrecognized scroll_wheel_zoom status \""
<< tmp << '"'); << tmp << '"');
} }
} }
@ -2592,9 +2592,9 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
case RC_SCROLL_WHEEL_ZOOM: case RC_SCROLL_WHEEL_ZOOM:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
scroll_whell_zoom != system_lyxrc.scroll_whell_zoom) { scroll_wheel_zoom != system_lyxrc.scroll_wheel_zoom) {
string status; string status;
switch (scroll_whell_zoom) { switch (scroll_wheel_zoom) {
case SCROLL_WHEEL_ZOOM_OFF: case SCROLL_WHEEL_ZOOM_OFF:
status = "off"; status = "off";
break; break;
@ -2608,7 +2608,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
status = "alt"; status = "alt";
break; break;
} }
os << "\\scroll_whell_zoom " << status << '\n'; os << "\\scroll_wheel_zoom " << status << '\n';
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;

2
src/LyXRC.h
View File

@ -511,7 +511,7 @@ public:
SCROLL_WHEEL_ZOOM_ALT SCROLL_WHEEL_ZOOM_ALT
}; };
/// ///
ScrollWheelZoom scroll_whell_zoom; ScrollWheelZoom scroll_wheel_zoom;
}; };

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

@ -477,17 +477,17 @@ void PrefInput::apply(LyXRC & rc) const
if (scrollzoomEnableCB->isChecked()) { if (scrollzoomEnableCB->isChecked()) {
switch (scrollzoomValueCO->currentIndex()) { switch (scrollzoomValueCO->currentIndex()) {
case 0: case 0:
rc.scroll_whell_zoom = LyXRC::SCROLL_WHEEL_ZOOM_CTRL; rc.scroll_wheel_zoom = LyXRC::SCROLL_WHEEL_ZOOM_CTRL;
break; break;
case 1: case 1:
rc.scroll_whell_zoom = LyXRC::SCROLL_WHEEL_ZOOM_SHIFT; rc.scroll_wheel_zoom = LyXRC::SCROLL_WHEEL_ZOOM_SHIFT;
break; break;
case 2: case 2:
rc.scroll_whell_zoom = LyXRC::SCROLL_WHEEL_ZOOM_ALT; rc.scroll_wheel_zoom = LyXRC::SCROLL_WHEEL_ZOOM_ALT;
break; break;
} }
} else { } else {
rc.scroll_whell_zoom = LyXRC::SCROLL_WHEEL_ZOOM_OFF; rc.scroll_wheel_zoom = LyXRC::SCROLL_WHEEL_ZOOM_OFF;
} }
} }
@ -499,7 +499,7 @@ void PrefInput::update(LyXRC const & rc)
firstKeymapED->setText(toqstr(external_path(rc.primary_kbmap))); firstKeymapED->setText(toqstr(external_path(rc.primary_kbmap)));
secondKeymapED->setText(toqstr(external_path(rc.secondary_kbmap))); secondKeymapED->setText(toqstr(external_path(rc.secondary_kbmap)));
mouseWheelSpeedSB->setValue(rc.mouse_wheel_speed); mouseWheelSpeedSB->setValue(rc.mouse_wheel_speed);
switch (rc.scroll_whell_zoom) { switch (rc.scroll_wheel_zoom) {
case LyXRC::SCROLL_WHEEL_ZOOM_OFF: case LyXRC::SCROLL_WHEEL_ZOOM_OFF:
scrollzoomEnableCB->setChecked(false); scrollzoomEnableCB->setChecked(false);
break; break;

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

@ -818,7 +818,7 @@ void GuiWorkArea::wheelEvent(QWheelEvent * ev)
// documentation of QWheelEvent) // documentation of QWheelEvent)
double const delta = ev->delta() / 120.0; double const delta = ev->delta() / 120.0;
bool zoom = false; bool zoom = false;
switch (lyxrc.scroll_whell_zoom) { switch (lyxrc.scroll_wheel_zoom) {
case LyXRC::SCROLL_WHEEL_ZOOM_CTRL: case LyXRC::SCROLL_WHEEL_ZOOM_CTRL:
zoom = ev->modifiers() & Qt::ControlModifier; zoom = ev->modifiers() & Qt::ControlModifier;
zoom &= !(ev->modifiers() & (Qt::ShiftModifier | Qt::AltModifier)); zoom &= !(ev->modifiers() & (Qt::ShiftModifier | Qt::AltModifier));