]> git.lyx.org Git - features.git/blobdiff - src/insets/InsetInfo.cpp
InsetInfo: Move validateArgument() to params
[features.git] / src / insets / InsetInfo.cpp
index da78a110755b1925910ab200c89f20b1f1caf275..54b8cf090e84ad031567c142f7d5c705a4e4a439 100644 (file)
@@ -75,6 +75,7 @@ NameTranslator const initTranslator()
        translator.addPair(InsetInfoParams::PACKAGE_INFO, "package");
        translator.addPair(InsetInfoParams::TEXTCLASS_INFO, "textclass");
        translator.addPair(InsetInfoParams::MENU_INFO, "menu");
+       translator.addPair(InsetInfoParams::L7N_INFO, "l7n");
        translator.addPair(InsetInfoParams::ICON_INFO, "icon");
        translator.addPair(InsetInfoParams::BUFFER_INFO, "buffer");
        translator.addPair(InsetInfoParams::LYX_INFO, "lyxinfo");
@@ -109,6 +110,7 @@ DefaultValueTranslator const initDVTranslator()
        translator.addPair(InsetInfoParams::PACKAGE_INFO, "graphics");
        translator.addPair(InsetInfoParams::TEXTCLASS_INFO, "article");
        translator.addPair(InsetInfoParams::MENU_INFO, "info-insert");
+       translator.addPair(InsetInfoParams::L7N_INFO, "");
        translator.addPair(InsetInfoParams::ICON_INFO, "info-insert");
        translator.addPair(InsetInfoParams::BUFFER_INFO, "name-noext");
        translator.addPair(InsetInfoParams::LYX_INFO, "version");
@@ -231,6 +233,10 @@ vector<pair<string,docstring>> InsetInfoParams::getArguments(Buffer const * buf,
                break;
        }
 
+       case L7N_INFO:
+               result.push_back(make_pair("custom", _("Custom")));
+               break;
+
        case LYXRC_INFO: {
                result.push_back(make_pair("custom", _("Custom")));
                set<string> rcs = lyxrc.getRCs();
@@ -324,6 +330,105 @@ vector<pair<string,docstring>> InsetInfoParams::getArguments(Buffer const * buf,
 }
 
 
+bool InsetInfoParams::validateArgument(Buffer const * buf, docstring const & arg,
+                                      bool const usedefaults) const
+{
+       string type;
+       string name = trim(split(to_utf8(arg), type, ' '));
+       if (name.empty() && usedefaults)
+               name = defaultValueTranslator().find(type);
+
+       switch (nameTranslator().find(type)) {
+       case UNKNOWN_INFO:
+               return false;
+
+       case SHORTCUT_INFO:
+       case SHORTCUTS_INFO:
+       case MENU_INFO: {
+               FuncRequest func = lyxaction.lookupFunc(name);
+               return func.action() != LFUN_UNKNOWN_ACTION;
+       }
+
+       case L7N_INFO:
+               return !name.empty();
+
+       case ICON_INFO: {
+               FuncCode const action = lyxaction.lookupFunc(name).action();
+               if (action == LFUN_UNKNOWN_ACTION) {
+                       string dir = "images";
+                       return !imageLibFileSearch(dir, name, "svgz,png").empty();
+               }
+               return true;
+       }
+
+       case LYXRC_INFO: {
+               set<string> rcs = lyxrc.getRCs();
+               return rcs.find(name) != rcs.end();
+       }
+
+       case PACKAGE_INFO:
+       case TEXTCLASS_INFO:
+               return true;
+
+       case BUFFER_INFO:
+               return (name == "name" || name == "name-noext"
+                       || name == "path" || name == "class");
+
+       case VCS_INFO:
+               if (name == "revision" || name == "tree-revision"
+                   || name == "author" || name == "date" || name == "time")
+                       return buf->lyxvc().inUse();
+               return false;
+
+       case LYX_INFO:
+               return name == "version";
+
+       case FIXDATE_INFO: {
+               string date;
+               string piece;
+               date = split(name, piece, '@');
+               if (!date.empty() && !QDate::fromString(toqstr(date), Qt::ISODate).isValid())
+                       return false;
+               if (!piece.empty())
+                       name = piece;
+       }
+       // fall through
+       case DATE_INFO:
+       case MODDATE_INFO: {
+               if (name == "long" || name == "short" || name == "ISO")
+                       return true;
+               else {
+                       QDate date = QDate::currentDate();
+                       return !date.toString(toqstr(name)).isEmpty();
+               }
+       }
+       case FIXTIME_INFO: {
+               string time;
+               string piece;
+               time = split(name, piece, '@');
+               if (!time.empty() && !QTime::fromString(toqstr(time), Qt::ISODate).isValid())
+                       return false;
+               if (!piece.empty())
+                       name = piece;
+       }
+       // fall through
+       case TIME_INFO:
+       case MODTIME_INFO: {
+               if (name == "long" || name == "short" || name == "ISO")
+                       return true;
+               else {
+                       QTime time = QTime::currentTime();
+                       return !time.toString(toqstr(name)).isEmpty();
+               }
+       }
+       }
+
+       return false;
+}
+
+
+
+
 string InsetInfoParams::infoType() const
 {
        return nameTranslator().find(type);
@@ -381,6 +486,10 @@ docstring InsetInfo::toolTip(BufferView const &, int, int) const
                result = bformat(_("The menu location for the function '%1$s'"),
                                from_utf8(params_.name));
                break;
+       case InsetInfoParams::L7N_INFO: 
+               result = bformat(_("The localization for the string '%1$s'"),
+                               from_utf8(params_.name));
+               break;
        case InsetInfoParams::ICON_INFO:
                result = bformat(_("The toolbar icon for the function '%1$s'"),
                                from_utf8(params_.name));
@@ -478,97 +587,6 @@ void InsetInfo::write(ostream & os) const
 }
 
 
-bool InsetInfo::validateModifyArgument(docstring const & arg) const
-{
-       string type;
-       string name = trim(split(to_utf8(arg), type, ' '));
-
-       switch (nameTranslator().find(type)) {
-       case InsetInfoParams::UNKNOWN_INFO:
-               return false;
-
-       case InsetInfoParams::SHORTCUT_INFO:
-       case InsetInfoParams::SHORTCUTS_INFO:
-       case InsetInfoParams::MENU_INFO: {
-               FuncRequest func = lyxaction.lookupFunc(name);
-               return func.action() != LFUN_UNKNOWN_ACTION;
-       }
-
-       case InsetInfoParams::ICON_INFO: {
-               FuncCode const action = lyxaction.lookupFunc(name).action();
-               if (action == LFUN_UNKNOWN_ACTION) {
-                       string dir = "images";
-                       return !imageLibFileSearch(dir, name, "svgz,png").empty();
-               }
-               return true;
-       }
-
-       case InsetInfoParams::LYXRC_INFO: {
-               set<string> rcs = lyxrc.getRCs();
-               return rcs.find(name) != rcs.end();
-       }
-
-       case InsetInfoParams::PACKAGE_INFO:
-       case InsetInfoParams::TEXTCLASS_INFO:
-               return true;
-
-       case InsetInfoParams::BUFFER_INFO:
-               return (name == "name" || name == "name-noext"
-                       || name == "path" || name == "class");
-
-       case InsetInfoParams::VCS_INFO:
-               if (name == "revision" || name == "tree-revision"
-                   || name == "author" || name == "date" || name == "time")
-                       return buffer().lyxvc().inUse();
-               return false;
-
-       case InsetInfoParams::LYX_INFO:
-               return name == "version";
-
-       case InsetInfoParams::FIXDATE_INFO: {
-               string date;
-               string piece;
-               date = split(name, piece, '@');
-               if (!date.empty() && !QDate::fromString(toqstr(date), Qt::ISODate).isValid())
-                       return false;
-               if (!piece.empty())
-                       name = piece;
-       }
-       // fall through
-       case InsetInfoParams::DATE_INFO:
-       case InsetInfoParams::MODDATE_INFO: {
-               if (name == "long" || name == "short" || name == "ISO")
-                       return true;
-               else {
-                       QDate date = QDate::currentDate();
-                       return !date.toString(toqstr(name)).isEmpty();
-               }
-       }
-       case InsetInfoParams::FIXTIME_INFO: {
-               string time;
-               string piece;
-               time = split(name, piece, '@');
-               if (!time.empty() && !QTime::fromString(toqstr(time), Qt::ISODate).isValid())
-                       return false;
-               if (!piece.empty())
-                       name = piece;
-       }
-       // fall through
-       case InsetInfoParams::TIME_INFO:
-       case InsetInfoParams::MODTIME_INFO: {
-               if (name == "long" || name == "short" || name == "ISO")
-                       return true;
-               else {
-                       QTime time = QTime::currentTime();
-                       return !time.toString(toqstr(name)).isEmpty();
-               }
-       }
-       }
-
-       return false;
-}
-
-
 bool InsetInfo::showInsetDialog(BufferView * bv) const
 {
        bv->showDialog("info");
@@ -590,7 +608,7 @@ bool InsetInfo::getStatus(Cursor & cur, FuncRequest const & cmd,
                return true;
 
        case LFUN_INSET_MODIFY:
-               if (validateModifyArgument(cmd.argument())) {
+               if (params_.validateArgument(&buffer(), cmd.argument())) {
                        flag.setEnabled(true);
                        string typestr;
                        string name = trim(split(to_utf8(cmd.argument()), typestr, ' '));
@@ -950,6 +968,24 @@ void InsetInfo::updateBuffer(ParIterator const & it, UpdateType utype) {
                }
                break;
        }
+       case InsetInfoParams::L7N_INFO: {
+               docstring locstring = _(params_.name);
+               // Remove trailing colons
+               locstring = rtrim(locstring, ":");
+               // Remove menu accelerators
+               if (contains(locstring, from_ascii("|"))) {
+                       docstring nlocstring;
+                       rsplit(locstring, nlocstring, '|');
+                       locstring = nlocstring;
+               }
+               // Remove Qt accelerators, but keep literal ampersands
+               locstring = subst(locstring, from_ascii(" & "), from_ascii("</amp;>"));
+               locstring = subst(locstring, from_ascii("&"), docstring());
+               locstring = subst(locstring, from_ascii("</amp;>"), from_ascii(" & "));
+               setText(locstring, guilang);
+               params_.force_ltr = !guilang->rightToLeft() && !params_.lang->rightToLeft();
+               break;
+       }
        case InsetInfoParams::ICON_INFO: {
                // only need to do this once.
                if (initialized_)