anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 10:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* src/lyxrc.C:

Browse Source 
* src/lyxrc.h:
	* lib/lyxrc.example: remove wheel jump option


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14406 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Michael Schmitt 2006-07-09 17:57:15 +00:00
parent b27f6ab561
commit f8bfe2bc99
3 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/lyxrc.example
View File

@ -178,11 +178,6 @@
# is 150%.
#\screen_zoom 100
# The wheel movement factor (for mice with wheels or five button mice)
# Default is 100, about a page down. A value of 10 give me about a line and
# a half
#\wheel_jump 10
# LyX normally doesn't update the cursor position if you move the scrollbar.
# If you scroll the cursor off the screen and then start typing LyX will
# move you back to where the cursor was. If you'd prefer to always have the

19
src/lyxrc.C
View File

@ -178,8 +178,7 @@ keyword_item lyxrcTags[] = {
{ "\\user_name", LyXRC::RC_USER_NAME },
{ "\\view_dvi_paper_option", LyXRC::RC_VIEWDVI_PAPEROPTION },
// compatibility with versions older than 1.4.0 only
{ "\\viewer" ,LyXRC::RC_VIEWER},
{ "\\wheel_jump", LyXRC::RC_WHEEL_JUMP }
{ "\\viewer" ,LyXRC::RC_VIEWER}
};
const int lyxrcCount = sizeof(lyxrcTags) / sizeof(keyword_item);
@ -227,7 +226,6 @@ void LyXRC::setDefaults() {
geometry_width = 0;
geometry_height = 0;
geometry_xysaved = true;
wheel_jump = 5;
// Default LaTeX font size:
font_sizes[LyXFont::SIZE_TINY] = "5.0";
font_sizes[LyXFont::SIZE_SCRIPT] = "7.0";
@ -657,12 +655,6 @@ int LyXRC::read(LyXLex & lexrc)
}
break;
case RC_WHEEL_JUMP:
if (lexrc.next()) {
wheel_jump = lexrc.getInteger();
}
break;
case RC_SCREEN_FONT_SIZES:
if (lexrc.next()) {
font_sizes[LyXFont::SIZE_TINY] =
@ -1516,11 +1508,6 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc) const
os << "\\screen_geometry_xysaved " << convert<string>(geometry_xysaved)
<< '\n';
}
case RC_WHEEL_JUMP:
if (ignore_system_lyxrc ||
wheel_jump != system_lyxrc.wheel_jump) {
os << "\\wheel_jump " << wheel_jump << '\n';
}
case RC_CURSOR_FOLLOWS_SCROLLBAR:
if (ignore_system_lyxrc ||
cursor_follows_scrollbar
@ -2517,10 +2504,6 @@ string const LyXRC::getDescription(LyXRCTags tag)
case RC_VIEWER:
break;
case RC_WHEEL_JUMP:
str = _("The number of lines that are scrolled by mice with wheels or five button mice.");
break;
case RC_LAST:
break;
}

3
src/lyxrc.h
View File

@ -249,9 +249,6 @@ public:
bool geometry_xysaved;
/// 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];
/// Allow the use of scalable fonts? Default is yes.