More fixes to insettabular/text (and some missing features added).

[lyx.git] / src / LyXAction.C

diff --git a/src/LyXAction.C b/src/LyXAction.C
index d46ffab334c9c573390c8af8e0b4e35367c5f0bb..31e60716b4e6b89d34d877f152d545fa6a62a662 100644 (file)
--- a/src/LyXAction.C
+++ b/src/LyXAction.C
@@ -379,14 +379,13 @@ void LyXAction::init()
                { LFUN_GOTOFILEROW, "server-goto-file-row", "", Noop },
                { LFUN_NOTIFY, "server-notify", "", ReadOnly },
                { LFUN_SETXY, "server-set-xy", "", ReadOnly },
-               { LFUN_SET_COLOR, "set-color", "", Noop },
+               { LFUN_SET_COLOR, "set-color", "", ReadOnly|NoBuffer },
                { LFUN_SPELLCHECK, "spellchecker", "", Noop },
-               { LFUN_INSERT_MATH, "symbol-insert", "", Noop },
                { LFUN_SHIFT_TAB, "tab-backward", "", Noop },
                { LFUN_TAB, "tab-forward", "", Noop },
                { LFUN_TABINSERT, "tab-insert", "", Noop },
                { LFUN_DIALOG_TABULAR_INSERT, "dialog-tabular-insert",
-                 N_("Open Insert Tabular Dialog"), Noop },
+                 N_("Insert Table"), Noop },
                { LFUN_TABULAR_FEATURE, "tabular-feature",
                  N_("Tabular Features"), Noop },
                { LFUN_INSET_TABULAR, "tabular-insert",
@@ -463,7 +462,7 @@ int LyXAction::searchActionArg(kb_action action, string const & arg) const
                                      << endl;
                return LFUN_UNKNOWN_ACTION;
        }
-       
+
        arg_item::const_iterator aci = (*pit).second.find(arg);
 
        if (aci == (*pit).second.end()) {
@@ -487,7 +486,7 @@ int LyXAction::searchActionArg(kb_action action, string const & arg) const
 // Returns a pseudo-action given an action and its argument.
 int LyXAction::getPseudoAction(kb_action action, string const & arg) const
 {
-       int psdaction = searchActionArg(action, arg);
+       int const psdaction = searchActionArg(action, arg);
 
        if (isPseudoAction(psdaction)) return psdaction;
 
@@ -519,7 +518,7 @@ int LyXAction::getPseudoAction(kb_action action, string const & arg) const
 kb_action LyXAction::retrieveActionArg(int pseudo, string & arg) const
 {
        arg.erase(); // clear it to be sure.
-       
+
        pseudo_map::const_iterator pit = lyx_pseudo_map.find(pseudo);
 
        if (pit != lyx_pseudo_map.end()) {
@@ -542,7 +541,7 @@ int LyXAction::LookupFunc(string const & func) const
 
        // split action and arg
        string actstr;
-       string argstr = split(func, actstr, ' ');
+       string const argstr = split(func, actstr, ' ');
        lyxerr[Debug::ACTION] << "Action: " << actstr << '\n';
        lyxerr[Debug::ACTION] << "Arg   : " << argstr << '\n';
 
@@ -595,7 +594,7 @@ int LyXAction::getApproxFunc(string const & func) const
 
 string const LyXAction::getApproxFuncName(string const & func) const
 {
-       int f = getApproxFunc(func);
+       int const f = getApproxFunc(func);
        // This will return empty string if f isn't an action.
        return getActionName(f);
 }