X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FToolbarDefaults.C;h=8930ae982a3b827be2f02ee4308fc2622483270c;hb=855181bd35f0440b08b65eabacce0720b93a0b53;hp=9e8cc03a780656abc5f622fa2d3e18f765a0a28e;hpb=4c6091b63f6ac4dae69ddcee26bf22e4f35a3cdf;p=lyx.git

diff --git a/src/ToolbarDefaults.C b/src/ToolbarDefaults.C
index 9e8cc03a78..8930ae982a 100644
--- a/src/ToolbarDefaults.C
+++ b/src/ToolbarDefaults.C
@@ -1,10 +1,10 @@
 /* This file is part of
- * ====================================================== 
- * 
+ * ======================================================
+ *
  *           LyX, The Document Processor
  *
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  *
  * ====================================================== */
@@ -20,12 +20,35 @@
 #include "lyxlex.h"
 #include "debug.h"
 #include "lyxlex.h"
+#include "support/lstrings.h"
 
 using std::endl;
 
 extern LyXAction lyxaction;
 ToolbarDefaults toolbardefaults;
 
+namespace {
+
+enum _tooltags {
+	TO_ADD = 1,
+	TO_ENDTOOLBAR,
+	TO_SEPARATOR,
+	TO_LAYOUTS,
+	TO_NEWLINE,
+	TO_LAST
+};
+
+
+struct keyword_item toolTags[TO_LAST - 1] = {
+	{ "end", TO_ENDTOOLBAR },
+	{ "icon", TO_ADD },
+	{ "layouts", TO_LAYOUTS },
+	{ "newline", TO_NEWLINE },
+	{ "separator", TO_SEPARATOR }
+};
+
+} // end of anon namespace
+
 
 ToolbarDefaults::ToolbarDefaults()
 {
@@ -39,7 +62,7 @@ void ToolbarDefaults::add(int action)
 }
 
 
-void ToolbarDefaults::init() 
+void ToolbarDefaults::init()
 {
 	add(LAYOUTS);
 	add(LFUN_FILE_OPEN);
@@ -52,94 +75,68 @@ void ToolbarDefaults::init()
 	add(LFUN_COPY);
 	add(LFUN_PASTE);
 	add(SEPARATOR);
-	
+
 	add(LFUN_EMPH);
 	add(LFUN_NOUN);
 	add(LFUN_FREE);
 	add(SEPARATOR);
-	
+
 	add(LFUN_INSET_FOOTNOTE);
 	add(LFUN_INSET_MARGINAL);
 
-	add(LFUN_DEPTH);
+	add(LFUN_DEPTH_PLUS);
 	add(SEPARATOR);
 
-	add(LFUN_TEX);
-        add(LFUN_MATH_MODE);
+	add(LFUN_MATH_MODE);
 	add(SEPARATOR);
 
-	add(LFUN_FIGURE);
+	add(LFUN_INSET_GRAPHICS);
 	add(LFUN_DIALOG_TABULAR_INSERT);
-#if 0
-	//add(LFUN_MELT);
-#endif
 }
 
 
-enum _tooltags {
-	TO_ADD = 1,
-	TO_ENDTOOLBAR,
-        TO_SEPARATOR,
-        TO_LAYOUTS,
-        TO_NEWLINE,
-	TO_LAST
-};
-
-
-struct keyword_item toolTags[TO_LAST - 1] = {
-	{ "end", TO_ENDTOOLBAR },
-	{ "icon", TO_ADD },
-        { "layouts", TO_LAYOUTS },
-        { "newline", TO_NEWLINE },
-        { "separator", TO_SEPARATOR }
-};
-
-
-void ToolbarDefaults::read(LyXLex & lex) 
+void ToolbarDefaults::read(LyXLex & lex)
 {
 	//consistency check
-	if (compare_no_case(lex.GetString(), "toolbar"))
+	if (compare_no_case(lex.getString(), "toolbar")) {
 		lyxerr << "Toolbar::read: ERROR wrong token:`"
-		       << lex.GetString() << '\'' << endl;
+		       << lex.getString() << '\'' << endl;
+	}
 
 	defaults.clear();
-	
-	string func;
+
 	bool quit = false;
-	
+
 	lex.pushTable(toolTags, TO_LAST - 1);
 
 	if (lyxerr.debugging(Debug::PARSER))
 		lex.printTable(lyxerr);
-	
-	while (lex.IsOK() && !quit) {
 
+	while (lex.isOK() && !quit) {
 		switch (lex.lex()) {
 		case TO_ADD:
-			if (lex.next()) {
-				func = lex.GetString();
-				lyxerr[Debug::GUI]
+			if (lex.next(true)) {
+				string const func = lex.getString();
+				lyxerr[Debug::PARSER]
 					<< "Toolbar::read TO_ADD func: `"
 					<< func << "'" << endl;
 				add(func);
 			}
 			break;
-		   
+
 		case TO_SEPARATOR:
 			add(SEPARATOR);
 			break;
-		   
+
 		case TO_LAYOUTS:
 			add(LAYOUTS);
 			break;
-		   
+
 		case TO_NEWLINE:
 			add(NEWLINE);
 			break;
-			
+
 		case TO_ENDTOOLBAR:
-			// should not set automatically
-			//set();
 			quit = true;
 			break;
 		default:
@@ -149,7 +146,6 @@ void ToolbarDefaults::read(LyXLex & lex)
 		}
 	}
 	lex.popTable();
-	lex.next();
 }
 
 
@@ -158,8 +154,8 @@ void ToolbarDefaults::add(string const & func)
 	int const tf = lyxaction.LookupFunc(func);
 
 	if (tf == -1) {
-		lyxerr << "Toolbar::add: no LyX command called`"
-		       << func << "'exists!" << endl; 
+		lyxerr << "Toolbar::add: no LyX command called `"
+		       << func << "' exists!" << endl;
 	} else {
 		add(tf);
 	}