In for a penny, in for a pound. Consistent use of // -*- C++ -*-

[lyx.git] / src / ToolbarDefaults.C

diff --git a/src/ToolbarDefaults.C b/src/ToolbarDefaults.C
index 60947b5872b6517780c4a289403436af1489a36d..b8d0c413a2d2c791a8bbc7b9c6657624f8ac18bd 100644 (file)
--- a/src/ToolbarDefaults.C
+++ b/src/ToolbarDefaults.C
@@ -1,14 +1,30 @@
+/* This file is part of
+ * ====================================================== 
+ * 
+ *           LyX, The Document Processor
+ *
+ *           Copyright 1995 Matthias Ettrich
+ *           Copyright 1995-2001 The LyX Team.
+ *
+ *
+ * ====================================================== */
+
+#ifdef __GNUG__
+#pragma implementation
+#endif
+
 #include <config.h>
 
 #include "ToolbarDefaults.h"
 #include "LyXAction.h"
-#include "toolbar.h"
+#include "lyxlex.h"
 #include "debug.h"
 #include "lyxlex.h"
 
 using std::endl;
 
 extern LyXAction lyxaction;
+ToolbarDefaults toolbardefaults;
 
 
 ToolbarDefaults::ToolbarDefaults()
@@ -25,35 +41,35 @@ void ToolbarDefaults::add(int action)
 
 void ToolbarDefaults::init() 
 {
-       add(Toolbar::TOOL_LAYOUTS);
-       add(LFUN_MENUOPEN);
+       add(LAYOUTS);
+       add(LFUN_FILE_OPEN);
        //add(LFUN_CLOSEBUFFER);
        add(LFUN_MENUWRITE);
        add(LFUN_MENUPRINT);
-       add(Toolbar::TOOL_SEPARATOR);
+       add(SEPARATOR);
 
        add(LFUN_CUT);
        add(LFUN_COPY);
        add(LFUN_PASTE);
-       add(Toolbar::TOOL_SEPARATOR);
+       add(SEPARATOR);
        
        add(LFUN_EMPH);
        add(LFUN_NOUN);
        add(LFUN_FREE);
-       add(Toolbar::TOOL_SEPARATOR);
+       add(SEPARATOR);
        
-       add(LFUN_FOOTMELT);
-       add(LFUN_MARGINMELT);
+       add(LFUN_INSET_FOOTNOTE);
+       add(LFUN_INSET_MARGINAL);
+
        add(LFUN_DEPTH);
-       add(Toolbar::TOOL_SEPARATOR);
+       add(SEPARATOR);
 
        add(LFUN_TEX);
         add(LFUN_MATH_MODE);
-       add(Toolbar::TOOL_SEPARATOR);
+       add(SEPARATOR);
 
        add(LFUN_FIGURE);
-       add(LFUN_TABLE);
-       //add(LFUN_MELT);
+       add(LFUN_DIALOG_TABULAR_INSERT);
 }
 
 
@@ -68,18 +84,18 @@ enum _tooltags {
 
 
 struct keyword_item toolTags[TO_LAST - 1] = {
-       { "\\add", TO_ADD },
-       { "\\end_toolbar", TO_ENDTOOLBAR },
-        { "\\layouts", TO_LAYOUTS },
-        { "\\newline", TO_NEWLINE },
-        { "\\separator", TO_SEPARATOR }
+       { "end", TO_ENDTOOLBAR },
+       { "icon", TO_ADD },
+        { "layouts", TO_LAYOUTS },
+        { "newline", TO_NEWLINE },
+        { "separator", TO_SEPARATOR }
 };
 
 
 void ToolbarDefaults::read(LyXLex & lex) 
 {
-               //consistency check
-       if (lex.GetString() != "\\begin_toolbar")
+       //consistency check
+       if (compare_no_case(lex.GetString(), "toolbar"))
                lyxerr << "Toolbar::read: ERROR wrong token:`"
                       << lex.GetString() << '\'' << endl;
 
@@ -92,17 +108,13 @@ void ToolbarDefaults::read(LyXLex & lex)
 
        if (lyxerr.debugging(Debug::PARSER))
                lex.printTable(lyxerr);
-       
-       while (lex.IsOK() && !quit) {
-               
-               lyxerr[Debug::TOOLBAR] << "Toolbar::read: current lex text: `"
-                                      << lex.GetString() << '\'' << endl;
 
-               switch(lex.lex()) {
+       while (lex.IsOK() && !quit) {
+               switch (lex.lex()) {
                case TO_ADD:
-                       if (lex.EatLine()) {
+                       if (lex.next()) {
                                func = lex.GetString();
-                               lyxerr[Debug::TOOLBAR]
+                               lyxerr[Debug::PARSER]
                                        << "Toolbar::read TO_ADD func: `"
                                        << func << "'" << endl;
                                add(func);
@@ -110,15 +122,15 @@ void ToolbarDefaults::read(LyXLex & lex)
                        break;
                   
                case TO_SEPARATOR:
-                       add(Toolbar::TOOL_SEPARATOR);
+                       add(SEPARATOR);
                        break;
                   
                case TO_LAYOUTS:
-                       add(Toolbar::TOOL_LAYOUTS);
+                       add(LAYOUTS);
                        break;
                   
                case TO_NEWLINE:
-                       add(Toolbar::TOOL_NEWLINE);
+                       add(NEWLINE);
                        break;
                        
                case TO_ENDTOOLBAR:
@@ -138,7 +150,7 @@ void ToolbarDefaults::read(LyXLex & lex)
 
 void ToolbarDefaults::add(string const & func)
 {
-       int tf = lyxaction.LookupFunc(func);
+       int const tf = lyxaction.LookupFunc(func);
 
        if (tf == -1) {
                lyxerr << "Toolbar::add: no LyX command called`"