Remove unused command line options and lyxrc tags.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@783 a592a061-630c-0410-9148-cb99ea01b6c8

ChangeLog

@@ -1,3 +1,17 @@
+2000-05-31  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+	* lib/lyxrc.example: remove mention of non-existing commands
+
+	* lyx.man: remove mention of color-related switches.
+
+	* src/lyxrc.C: remove RC_SELECTIONCOLOR and RC_BACKGROUNDCOLOR. 
+
+	* src/lyx_gui.C: remove all the color-related ressources, which
+	are not used anymore.
+
+	* src/lyx_gui_misc.C (WarnReadonly): use MakeDisplayPath on file
+	name. 
+
 2000-05-31 Dekel Tsur  <dekel@math.tau.ac.il>
 
 	* src/lyxrc.C (read): Add a missing break in the switch

lib/lyxrc.example

@@ -207,24 +207,6 @@
 # is 150%.
 #\screen_zoom 100
 
-# LyX offers a faster method for drawing selected text if you uncomment the 
-# following line. The trick is to invert the color-information. This will 
-# switch between white and black and give almost random results for
-# other colors, so a white background is necessary. Any other settings of 
-# the background color will be ignored for this reason. This setting
-# is useful on monochrome screens and on slow systems. Fast selection
-# can cause cosmetic problems with a few broken X servers.
-#\fast_selection true
-
-# If you don't like the default background or selection color, you can
-# set your own here:
-#\background_color white
-#\background_color lightyellow
-#
-# For reference, the defaults are:
-#\background_color linen
-#\selection_color lightblue
-
 # 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 

lyx.man

@@ -32,11 +32,10 @@ about this concept in the online documentation under the Help menu.
 
 Currently, \fBLyX\fR uses the XForms library as a toolkit. \fBLyX\fR
 should run everywhere, where XForms runs. This is on all major Unix
-platforms as well as some PC platforms, including Sun, SGI, HP, DEC
+platforms as well as some PC platforms, including Sun, SGI, HP, Compaq
-Alpha/OSF, IBM RS6000, Convex, Cray, i386/Linux, Alpha/Linux,
+Tru64, IBM RS6000, Convex, Cray, i386/Linux, Alpha/Linux,
 i386/FreeBSD, i386/NetBSD, DecSystem(mips)/Ultrix, OS/2 with XFree or 
 PMX and others. 
-
 .SH OPTIONS
 \fBLyX\fR supports the following command-line switches, which can also
 be specified as X resources (e. g. in .Xdefaults) with class
@@ -74,43 +73,6 @@ is given, the main window is centered.
 .BI \-dbg " feature[,feature...]"
 where feature is a name or number.
 Use "\fBlyx -dbg\fR" to see the list of available debug features.
-.TP
-.BI \-Reverse
-swaps foreground and background colors.
-.TP
-.BI \-Mono
-runs \fBLyX\fR in black and white mode.
-.TP
-.BI \-FastSelection
-uses a fast black and white drawing routine for selections. If you use
-this, the switches BackgroundColor and SelectionColor are ignored.
-.PP
-The following options can be used to define the colors to use for
-different things:
-.TP
-.BI \-MathColor " color"
-.TP
-.BI \-MathFrameColor " color"
-.TP
-.BI \-FootColor " color"
-.TP
-.BI \-LabelColor " color"
-.TP
-.BI \-FillColor " color"
-.TP
-.BI \-NewLineColor " color"
-.TP
-.BI \-OnOffLineColor " color"
-.TP
-.BI \-LatexColor " color"
-.TP
-.BI \-NoteColor " color"
-.TP
-.BI \-LightedColor " color"
-.TP
-.BI \-BackgroundColor " color"
-.TP
-.BI \-SelectionColor " color"
 .PP
 Furthermore, \fBLyX\fR understands the following generic command line options 
 from the \fBForms Library\fR:
@@ -176,7 +138,6 @@ The system directory is determined by searching for the file
 4) <path of binary>/../share/<name of binary>/ 
 .br
 5) hardcoded lyx_dir (usually /usr/local/share/lyx on UNIX and %X11ROOT%\\XFree86\\lib\\X11\\lyx on OS/2 with XFree)
-
 .TP
 .B LYX_USERDIR_11x
 can be used to specify which user directory to use.
@@ -193,7 +154,6 @@ The user directory is, in order of precedence:
 .B LYX_LOCALEDIR
 can be used to tell LyX where to look for the translations of its GUI
 strings in other languages.
-
 .SH FILES
 .nf
 .ta \w'\fILIBDIR\fR/lyxrc.in  'u
@@ -215,36 +175,39 @@ strings in other languages.
 
 .I LIBDIR
 is the system directory. This is usually /usr/local/share/lyx on UNIX and %X11ROOT%\\XFree86\\lib\\X11\\lyx on OS/2 with XFree.
-
 .SH SEE ALSO
 reLyX(1), latex(1), xforms(5).
 
 Full documentation in either native \fBLyX\fR or postscript format.
 .SH BUGS/LIMITATIONS
 There are probably still some bugs in \fBLyX\fR. Please report them to
-lyx-devel@lists.lyx.org with detailed info, including which version of \fBLyX\fR
+lyx-devel@lists.lyx.org with detailed info, including which version of
-you use.  Consult the "Known Bugs" item under the Help menu first if possible.
+\fBLyX\fR you use. Consult the "Known Bugs" item under the Help menu
+first if possible.
 
-\fBLaTeX\fR import is still not perfect and may produce buggy *.lyx files. Consult the \fBreLyX\fR documentation.
+\fBLaTeX\fR import is still not perfect and may produce buggy *.lyx
+files. Consult the \fBreLyX\fR documentation.
 
-XFree on OS/2 currently does not support PC codepages. If you use \fBemTeX\fR to preview/print with cp850, etc., this might lead to strange \fBemTeX\fR error messages.
+XFree on OS/2 currently does not support PC codepages. If you use
+\fBemTeX\fR to preview/print with cp850, etc., this might lead to
+strange \fBemTeX\fR error messages.
 .B Remedy:
   1) In filenames use only A-Z, a-z, 1-9.
   2) Install a recent \fBLaTeX\fR package inputenc.sty. Select Layout->Document->encoding:latin1, so that \fBreLyX\fR adds the \fBLaTeX\fR command '\\usepackage[latin1]{inputenc}'.
 
-\fBLyX\fR server has some limitations under OS/2: See Help->Customization for details. 
+\fBLyX\fR server has some limitations under OS/2: See
+Help->Customization for details.
 
-Preview of inline images in rare cases does not show the image. If you want to preview the image, just click on it and choose fullscreen preview. 
+Preview of inline images in rare cases does not show the image. If you
+want to preview the image, just click on it and choose fullscreen
+preview.
 
 If you have performance problems, please go through the \fBlyxrc\fR
-configuration file.  It contains settings that can be used to improve 
+configuration file. It contains settings that can be used to improve
 performance on slow systems.
- 
+.SH AUTHORS
-
-
-.SH AUTHOR
 Copyright
 .Cr
-1995, 1996, 1997, 1998, 1999 by Matthias Ettrich (ettrich@informatik.uni-tuebingen.de)
+1995, 1996, 1997, 1998, 1999 by Matthias Ettrich
-and the rest of the \fBLyX Team\fR (See Credits under the Help menu
+(ettrich@informatik.uni-tuebingen.de) and the rest of the \fBLyX
-item).
+Team\fR (See Credits under the Help menu item).

src/lyx_gui.C

@@ -78,20 +78,7 @@ FL_CMD_OPT cmdopt[] =
 	{"-width", "*.width", XrmoptionSepArg, "690"},
 	{"-height", "*.height", XrmoptionSepArg, "510"},
 	{"-xpos", "*.xpos", XrmoptionSepArg, "-1"},
-	{"-ypos", "*.ypos", XrmoptionSepArg, "-1"},
+	{"-ypos", "*.ypos", XrmoptionSepArg, "-1"}
-	{"-MathColor", "*.MathColor", XrmoptionSepArg, "blue"},
-	{"-MathFrameColor", "*.MathFrameColor", XrmoptionSepArg, "magenta"},
-	{"-FootColor", "*.FootColor", XrmoptionSepArg, "red"}, 
-	{"-NewLineColor", "*.NewLineColor", XrmoptionSepArg, "red"},
-	{"-LabelColor", "*.LabelColor", XrmoptionSepArg, "palegreen"},
-	{"-FillColor", "*.FillColor", XrmoptionSepArg, "magenta"},
-	{"-OnOffLineColor", "*.OnOffLineColor", XrmoptionSepArg, "magenta"},
-	{"-LatexColor", "*.LatexColor", XrmoptionSepArg, "red"},
-	{"-NoteColor", "*.NoteColor", XrmoptionSepArg, "yellow"},
-	{"-NoteFrameColor", "*.NoteFrameColor", XrmoptionSepArg, "black"},
-	{"-LightedColor", "*.LightedColor", XrmoptionSepArg, "gray80"},
-	{"-BackgroundColor", "*.BackgroundColor", XrmoptionSepArg, "linen"},
-	{"-SelectionColor", "*.SelectionColor", XrmoptionSepArg, "lightblue"}
 };
 
 static int width;
@@ -99,20 +86,6 @@ static int height;
 static int xpos;
 static int ypos;
 bool	   cursor_follows_scrollbar;
-char	   math_color[32];
-char	   math_frame_color[32];
-char	   foot_color[32];
-char       new_line_color[32];
-char	   label_color[32];
-char	   fill_color[32];
-char	   on_off_line_color[32];
-char	   latex_color[32];
-char	   note_color[32];
-char       note_frame_color[32];
-char	   lighted_color[32];
-string    background_color;
-char	   b_c[32];
-char	   selection_color[32];
 
 
 FL_resource res[] =
@@ -120,20 +93,7 @@ FL_resource res[] =
 	{"width", "widthClass", FL_INT, &width, "690", 0},
 	{"height", "heightClass", FL_INT, &height, "510", 0},
 	{"xpos", "xposClass", FL_INT, &xpos, "-1", 0},
-	{"ypos", "yposClass", FL_INT, &ypos, "-1", 0},
+	{"ypos", "yposClass", FL_INT, &ypos, "-1", 0}
-	{"MathColor", "colorClass", FL_STRING, math_color, "blue", 31},
-	{"MathFrameColor", "colorClass", FL_STRING, math_frame_color, "magenta", 31},
-	{"FootColor", "colorClass", FL_STRING, foot_color, "red", 31},
-	{"NewLineColor", "colorClass", FL_STRING, new_line_color, "red", 31},
-	{"LabelColor", "colorClass", FL_STRING, label_color, "palegreen", 31},
-	{"FillColor", "colorClass", FL_STRING, fill_color, "magenta", 31},
-	{"OnOffLineColor", "colorClass", FL_STRING, on_off_line_color, "magenta", 31},
-	{"LatexColor", "colorClass", FL_STRING, latex_color, "red", 31},
-	{"NoteColor", "colorClass", FL_STRING, note_color, "yellow", 31},
-	{"NoteFrameColor", "colorClass", FL_STRING, note_frame_color, "black", 31},
-	{"LightedColor", "colorClass", FL_STRING, lighted_color, "gray80", 31},
-	{"BackgroundColor", "colorClass", FL_STRING, b_c, "linen", 31},
-	{"SelectionColor", "colorClass", FL_STRING, selection_color, "lightblue", 31}
 };
 
 
@@ -176,8 +136,6 @@ LyXGUI::LyXGUI(LyX * owner, int * argc, char * argv[], bool GUI)
 	// X Error handler install goes here
 	XSetErrorHandler(LyX_XErrHandler);
 	
-	background_color = b_c;
-	
 	// Make sure default screen is not larger than monitor
 	if (width == 690 && height == 510) {
 		Screen * scr = DefaultScreenOfDisplay(fl_get_display());

src/lyx_gui_misc.C

@@ -32,6 +32,7 @@
 #include "insets/insetindex.h"
 #include "LyXView.h"
 #include "bufferview_funcs.h"
+#include "support/filetools.h"
 
 using std::pair;
 using std::make_pair;
@@ -407,7 +408,7 @@ void WarnReadonly(string const & file)
 {
 	WriteAlert(_("Any changes will be ignored"),
 		   _("The document is read-only:"),
-		   file);
+		   MakeDisplayPath(file));
 }
 
 /// Get the dpi setting of the current screen

src/lyxrc.C

@@ -41,8 +41,6 @@ using std::endl;
 // not in lyxrc?? (Matthias) 
 // Because nobody put them there. (Asger)
 
-extern string background_color;
-extern char selection_color[];
 extern bool cursor_follows_scrollbar;
 extern LyXAction lyxaction;
 extern kb_keymap * toplevel_keymap;
@@ -102,8 +100,6 @@ enum LyXRCTags {
 	RC_KBMAP,
 	RC_KBMAP_PRIMARY,
 	RC_KBMAP_SECONDARY,
-	RC_SELECTION_COLOR,
-	RC_BACKGROUND_COLOR,
 	RC_FAX_COMMAND,
 	RC_PHONEBOOK,
 	RC_FAXPROGRAM,
@@ -170,7 +166,6 @@ keyword_item lyxrcTags[] = {
 	{ "\\auto_number", RC_AUTO_NUMBER },
 	{ "\\auto_region_delete", RC_AUTOREGIONDELETE },
 	{ "\\autosave", RC_AUTOSAVE },
-	{ "\\background_color", RC_BACKGROUND_COLOR },
 	{ "\\backupdir_path", RC_BACKUPDIR_PATH },
 	{ "\\begin_toolbar", RC_BEGINTOOLBAR },
 	{ "\\bind", RC_BIND },
@@ -254,7 +249,6 @@ keyword_item lyxrcTags[] = {
 	{ "\\screen_font_sizes", RC_SCREEN_FONT_SIZES },
 	{ "\\screen_font_typewriter", RC_SCREEN_FONT_TYPEWRITER },
 	{ "\\screen_zoom", RC_SCREEN_ZOOM },
-	{ "\\selection_color", RC_SELECTION_COLOR },
 	{ "\\serverpipe", RC_SERVERPIPE },
 	{ "\\show_banner", RC_SHOW_BANNER },
 	{ "\\spell_command", RC_SPELL_COMMAND },
@@ -903,15 +897,6 @@ int LyXRC::read(string const & filename)
 				cursor_follows_scrollbar = lexrc.GetBool();
 			break;
 
-		case RC_BACKGROUND_COLOR:
-			if (lexrc.next())
-				background_color = lexrc.GetString();
-			break;
-		case RC_SELECTION_COLOR:
-			if (lexrc.next())
-				strncpy(selection_color,
-					lexrc.GetString().c_str(), 31);
-			break;
 		case RC_FAX_COMMAND:
  			if (lexrc.next())
  				fax_command = lexrc.GetString();
@@ -1303,10 +1288,6 @@ void LyXRC::output(ostream & os) const
 	case RC_CURSOR_FOLLOWS_SCROLLBAR:
 		os << "\\cursor_follows_scrollbar "
 		   << tostr(cursor_follows_scrollbar) << "\n";
-	case RC_BACKGROUND_COLOR:
-		os << "\\background_color \"" << background_color << "\"\n";
-	case RC_SELECTION_COLOR:
-		os << "\\selection_color \"" << selection_color << "\"\n";
 	case RC_FAX_COMMAND:
 		os << "\\fax_command \"" << fax_command << "\"\n";
 	case RC_FAXPROGRAM: