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");
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");
// Normalise paths like /foo//bar ==> /foo/bar
for (auto doc : doclist) {
- subst(doc, from_ascii("\r"), docstring());
+ doc = subst(doc, from_ascii("\r"), docstring());
while (contains(doc, from_ascii("//")))
- subst(doc, from_ascii("//"), from_ascii("/"));
+ doc = subst(doc, from_ascii("//"), from_ascii("/"));
if (!doc.empty())
list.insert(removeExtension(onlyFileName(to_utf8(doc))));
}
// remove duplicates
return list;
}
+
+bool translateString(docstring const & in, docstring & out, string const & lcode)
+{
+ out = translateIfPossible(in, lcode);
+ return in != out;
+}
} // namespace anon
-docstring InsetInfoParams::getDate(string const iname, QDate const date) const
+docstring InsetInfoParams::getDate(string const & iname, QDate const date) const
{
QLocale loc;
if (lang)
else if (iname == "ISO")
return qstring_to_ucs4(date.toString(Qt::ISODate));
else if (iname == "loclong")
- return qstring_to_ucs4(loc.toString(date, toqstr(lang->dateFormat(0))));
+ return lang ? qstring_to_ucs4(loc.toString(date, toqstr(lang->dateFormat(0))))
+ : _("No long date format (language unknown)!");
else if (iname == "locmedium")
- return qstring_to_ucs4(loc.toString(date, toqstr(lang->dateFormat(1))));
+ return lang ? qstring_to_ucs4(loc.toString(date, toqstr(lang->dateFormat(1))))
+ : _("No medium date format (language unknown)!");
else if (iname == "locshort")
- return qstring_to_ucs4(loc.toString(date, toqstr(lang->dateFormat(2))));
+ return lang ? qstring_to_ucs4(loc.toString(date, toqstr(lang->dateFormat(2))))
+ : _("No short date format (language unknown)!");
else
return qstring_to_ucs4(loc.toString(date, toqstr(iname)));
}
-docstring InsetInfoParams::getTime(string const iname, QTime const time) const
+docstring InsetInfoParams::getTime(string const & iname, QTime const time) const
{
QLocale loc;
if (lang)
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();
break;
}
result.push_back(make_pair("revision", _("Revision[[Version Control]]")));
+ result.push_back(make_pair("revision-abbrev", _("Abbreviated revision[[Version Control]]")));
result.push_back(make_pair("tree-revision", _("Tree revision")));
result.push_back(make_pair("author", _("Author")));
result.push_back(make_pair("date", _("Date")));
- result.push_back(make_pair("time", _("Time")));
+ result.push_back(make_pair("time", _("Time[[of day]]")));
break;
}
case LYX_INFO:
result.push_back(make_pair("version", _("LyX version")));
+ result.push_back(make_pair("layoutformat", _("LyX layout format")));
break;
case FIXDATE_INFO:
}
+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 == "revision-abbrev" || name == "tree-revision"
+ || name == "author" || name == "date" || name == "time")
+ return buf->lyxvc().inUse();
+ return false;
+
+ case LYX_INFO:
+ return name == "version" || name == "layoutformat";
+
+ 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);
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));
case InsetInfoParams::VCS_INFO:
if (params_.name == "revision")
result = _("Version control revision");
+ else if (params_.name == "revision-abbrev")
+ result = _("Version control abbreviated revision");
else if (params_.name == "tree-revision")
result = _("Version control tree revision");
else if (params_.name == "author")
result = _("Version control time");
break;
case InsetInfoParams::LYX_INFO:
- result = _("The current LyX version");
+ if (params_.name == "version")
+ result = _("The current LyX version");
+ else if (params_.name == "layoutformat")
+ result = _("The current LyX layout format");
break;
case InsetInfoParams::DATE_INFO:
result = _("The current date");
}
-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");
case LFUN_INSET_DIALOG_UPDATE:
case LFUN_INSET_COPY_AS:
+ case LFUN_INSET_DISSOLVE:
flag.setEnabled(true);
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, ' '));
void InsetInfo::error(docstring const & err, Language const * lang)
{
- setText(bformat(translateIfPossible(err, lang->code()), from_utf8(params_.name)),
- Font(inherit_font, lang), false);
+ docstring const res = translateIfPossible(err, lang->code());
+ bool const translated = res != err;
+ // If the string is not translated, we use default lang (English)
+ Font const f = translated ? Font(inherit_font, lang) : Font(inherit_font);
+ setText(bformat(res, from_utf8(params_.name)), f, false);
}
void InsetInfo::info(docstring const & err, Language const * lang)
{
- setText(translateIfPossible(err, lang->code()),
- Font(inherit_font, lang), false);
+ docstring const res = translateIfPossible(err, lang->code());
+ bool const translated = res != err;
+ // If the string is not translated, we use default lang (English)
+ Font const f = translated ? Font(inherit_font, lang) : Font(inherit_font);
+ setText(translateIfPossible(err, lang->code()), f, false);
}
}
-bool InsetInfo::forceLTR() const
+bool InsetInfo::forceLTR(OutputParams const &) const
{
return params_.force_ltr;
}
-void InsetInfo::updateBuffer(ParIterator const & it, UpdateType utype) {
+void InsetInfo::updateBuffer(ParIterator const & it, UpdateType utype, bool const deleted) {
// If the Buffer is a clone, then we neither need nor want to do any
// of what follows. We want, rather, just to inherit how things were
// in the original Buffer. This is especially important for VCS.
info(from_ascii("undefined"), params_.lang);
break;
}
- if (params_.type == InsetInfoParams::SHORTCUT_INFO)
- setText(bindings.begin()->print(KeySequence::ForGui), guilang);
- else
- setText(theTopLevelKeymap().printBindings(func, KeySequence::ForGui), guilang);
- params_.force_ltr = !guilang->rightToLeft() && !params_.lang->rightToLeft();
+ docstring sequence;
+ docstring seq_untranslated;
+ if (params_.type == InsetInfoParams::SHORTCUT_INFO) {
+ sequence = bindings.begin()->print(KeySequence::ForGui);
+ seq_untranslated = bindings.begin()->print(KeySequence::ForGui, true);
+ } else {
+ sequence = theTopLevelKeymap().printBindings(func, KeySequence::ForGui);
+ seq_untranslated = theTopLevelKeymap().printBindings(func, KeySequence::ForGui, true);
+ }
+ // QKeySequence returns special characters for keys on the mac
+ // Since these are not included in many fonts, we
+ // re-translate them to textual names (see #10641)
+ odocstringstream ods;
+ string const lcode = params_.lang->code();
+ docstring trans;
+ bool is_translated = sequence != seq_untranslated;
+ for (size_t n = 0; n < sequence.size(); ++n) {
+ char_type const c = sequence[n];
+ switch(c) {
+ case 0x21b5://Return
+ gui = _("Return[[Key]]");
+ is_translated = translateString(from_ascii("Return[[Key]]"), trans, lcode);
+ ods << trans;
+ break;
+ case 0x21b9://Tab both directions (Win)
+ gui = _("Tab[[Key]]");
+ is_translated = translateString(from_ascii("Tab[[Key]]"), trans, lcode);
+ ods << trans;
+ break;
+ case 0x21de://Qt::Key_PageUp
+ gui = _("PgUp");
+ is_translated = translateString(from_ascii("PgUp"), trans, lcode);
+ ods << trans;
+ break;
+ case 0x21df://Qt::Key_PageDown
+ gui = _("PgDown");
+ is_translated = translateString(from_ascii("PgDown"), trans, lcode);
+ ods << trans;
+ break;
+ case 0x21e4://Qt::Key_Backtab
+ gui = _("Backtab");
+ is_translated = translateString(from_ascii("Backtab"), trans, lcode);
+ ods << trans;
+ break;
+ case 0x21e5://Qt::Key_Tab
+ gui = _("Tab");
+ is_translated = translateString(from_ascii("Tab"), trans, lcode);
+ ods << trans;
+ break;
+ case 0x21e7://Shift
+ gui = _("Shift");
+ is_translated = translateString(from_ascii("Shift"), trans, lcode);
+ ods << trans;
+ break;
+ case 0x21ea://Qt::Key_CapsLock
+ gui = _("CapsLock");
+ is_translated = translateString(from_ascii("CapsLock"), trans, lcode);
+ ods << trans;
+ break;
+ case 0x2303://Control
+ gui = _("Control[[Key]]");
+ is_translated = translateString(from_ascii("Control[[Key]]"), trans, lcode);
+ ods << trans;
+ break;
+ case 0x2318://CMD
+ gui = _("Command[[Key]]");
+ is_translated = translateString(from_ascii("Command[[Key]]"), trans, lcode);
+ ods << trans;
+ break;
+ case 0x2324://Qt::Key_Enter
+ gui = _("Return[[Key]]");
+ is_translated = translateString(from_ascii("Return[[Key]]"), trans, lcode);
+ ods << trans;
+ break;
+ case 0x2325://Option key
+ gui = _("Option[[Key]]");
+ is_translated = translateString(from_ascii("Option[[Key]]"), trans, lcode);
+ ods << trans;
+ break;
+ case 0x2326://Qt::Key_Delete
+ gui = _("Delete[[Key]]");
+ is_translated = translateString(from_ascii("Delete[[Key]]"), trans, lcode);
+ ods << trans;
+ break;
+ case 0x232b://Qt::Key_Backspace
+ gui = _("Fn+Del");
+ is_translated = translateString(from_ascii("Fn+Del"), trans, lcode);
+ ods << trans;
+ break;
+ case 0x238b://Qt::Key_Escape
+ gui = _("Esc");
+ is_translated = translateString(from_ascii("Esc"), trans, lcode);
+ ods << trans;
+ break;
+ default:
+ ods.put(c);
+ }
+ }
+ setText(ods.str(), is_translated ? guilang : nullptr);
+ params_.force_ltr = !is_translated || (!guilang->rightToLeft() && !params_.lang->rightToLeft());
break;
}
case InsetInfoParams::LYXRC_INFO: {
// only need to do this once.
if (initialized_)
break;
- // and we will not keep trying if we fail
- initialized_ = true;
docstring_list names;
- FuncRequest const func = lyxaction.lookupFunc(params_.name);
+ FuncRequest func = lyxaction.lookupFunc(params_.name);
if (func.action() == LFUN_UNKNOWN_ACTION) {
gui = _("Unknown action %1$s");
error(from_ascii("Unknown action %1$s"), params_.lang);
break;
}
+ if (func.action() == LFUN_BUFFER_VIEW || func.action() == LFUN_BUFFER_UPDATE)
+ // The default output format is in the menu without argument,
+ // so strip it here.
+ if (func.argument() == from_ascii(buffer().params().getDefaultOutputFormat()))
+ func = FuncRequest(func.action());
// iterate through the menubackend to find it
if (!theApp()) {
gui = _("Can't determine menu entry for action %1$s in batch mode");
error(from_ascii("Can't determine menu entry for action %1$s in batch mode"), params_.lang);
+ initialized_ = true;
break;
}
+ // and we will not keep trying if we fail
+ initialized_ = theApp()->hasBufferView();
if (!theApp()->searchMenu(func, names)) {
gui = _("No menu entry for action %1$s");
error(from_ascii("No menu entry for action %1$s"), params_.lang);
}
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_)
initialized_ = true;
FuncRequest func = lyxaction.lookupFunc(params_.name);
docstring icon_name = frontend::Application::iconName(func, true);
- // FIXME: We should use the icon directly instead of
- // going through FileName. The code below won't work
- // if the icon is embedded in the executable through
- // the Qt resource system.
- // This is only a negligible performance problem:
- // If the installed icon differs from the resource icon the
- // installed one is preferred anyway, and all icons that are
- // embedded in the resources are installed as well.
FileName file(to_utf8(icon_name));
if (file.onlyFileNameWithoutExt() == "unknown") {
string dir = "images";
LyXVC::RevisionInfo itype = LyXVC::Unknown;
if (params_.name == "revision")
itype = LyXVC::File;
+ else if (params_.name == "revision-abbrev")
+ itype = LyXVC::FileAbbrev;
else if (params_.name == "tree-revision")
itype = LyXVC::Tree;
else if (params_.name == "author")
break;
if (params_.name == "version")
setText(from_ascii(lyx_version), params_.lang);
+ else if (params_.name == "layoutformat")
+ setText(convert<docstring>(LAYOUT_FORMAT), params_.lang);
initialized_ = true;
break;
case InsetInfoParams::DATE_INFO:
// Just to do something with that string
LYXERR(Debug::INFO, "info inset text: " << gui);
- InsetCollapsible::updateBuffer(it, utype);
+ InsetCollapsible::updateBuffer(it, utype, deleted);
}
projects / lyx.git / blobdiff