* Licence details can be found in the file COPYING.
*
* \author Bo Peng
+ * \author Jürgen Spitzmüller
*
* Full author contact details are available in file CREDITS.
*/
#include <sstream>
#include <QtGui/QImage>
+#include <QDate>
+#include <QLocale>
using namespace std;
using namespace lyx::support;
namespace {
-typedef Translator<InsetInfo::info_type, string> NameTranslator;
+typedef Translator<InsetInfoParams::info_type, string> NameTranslator;
NameTranslator const initTranslator()
{
- NameTranslator translator(InsetInfo::UNKNOWN_INFO, "unknown");
-
- translator.addPair(InsetInfo::SHORTCUTS_INFO, "shortcuts");
- translator.addPair(InsetInfo::SHORTCUT_INFO, "shortcut");
- translator.addPair(InsetInfo::LYXRC_INFO, "lyxrc");
- translator.addPair(InsetInfo::PACKAGE_INFO, "package");
- translator.addPair(InsetInfo::TEXTCLASS_INFO, "textclass");
- translator.addPair(InsetInfo::MENU_INFO, "menu");
- translator.addPair(InsetInfo::ICON_INFO, "icon");
- translator.addPair(InsetInfo::BUFFER_INFO, "buffer");
- translator.addPair(InsetInfo::LYX_INFO, "lyxinfo");
- translator.addPair(InsetInfo::VCS_INFO, "vcs");
+ NameTranslator translator(InsetInfoParams::UNKNOWN_INFO, "unknown");
+
+ translator.addPair(InsetInfoParams::SHORTCUTS_INFO, "shortcuts");
+ translator.addPair(InsetInfoParams::SHORTCUT_INFO, "shortcut");
+ translator.addPair(InsetInfoParams::LYXRC_INFO, "lyxrc");
+ translator.addPair(InsetInfoParams::PACKAGE_INFO, "package");
+ translator.addPair(InsetInfoParams::TEXTCLASS_INFO, "textclass");
+ translator.addPair(InsetInfoParams::MENU_INFO, "menu");
+ translator.addPair(InsetInfoParams::ICON_INFO, "icon");
+ translator.addPair(InsetInfoParams::BUFFER_INFO, "buffer");
+ translator.addPair(InsetInfoParams::LYX_INFO, "lyxinfo");
+ translator.addPair(InsetInfoParams::VCS_INFO, "vcs");
+ translator.addPair(InsetInfoParams::DATE_INFO, "date");
+ translator.addPair(InsetInfoParams::MODDATE_INFO, "moddate");
+ translator.addPair(InsetInfoParams::FIXDATE_INFO, "fixdate");
+ translator.addPair(InsetInfoParams::TIME_INFO, "time");
+ translator.addPair(InsetInfoParams::MODTIME_INFO, "modtime");
+ translator.addPair(InsetInfoParams::FIXTIME_INFO, "fixtime");
return translator;
}
return translator;
}
+
+typedef Translator<InsetInfoParams::info_type, string> DefaultValueTranslator;
+
+DefaultValueTranslator const initDVTranslator()
+{
+ DefaultValueTranslator translator(InsetInfoParams::UNKNOWN_INFO, "");
+
+ translator.addPair(InsetInfoParams::SHORTCUTS_INFO, "info-insert");
+ translator.addPair(InsetInfoParams::SHORTCUT_INFO, "info-insert");
+ translator.addPair(InsetInfoParams::LYXRC_INFO, "user_name");
+ translator.addPair(InsetInfoParams::PACKAGE_INFO, "graphics");
+ translator.addPair(InsetInfoParams::TEXTCLASS_INFO, "article");
+ translator.addPair(InsetInfoParams::MENU_INFO, "info-insert");
+ translator.addPair(InsetInfoParams::ICON_INFO, "info-insert");
+ translator.addPair(InsetInfoParams::BUFFER_INFO, "name-noext");
+ translator.addPair(InsetInfoParams::LYX_INFO, "version");
+ translator.addPair(InsetInfoParams::VCS_INFO, "revision");
+ translator.addPair(InsetInfoParams::DATE_INFO, "loclong");
+ translator.addPair(InsetInfoParams::MODDATE_INFO, "loclong");
+ translator.addPair(InsetInfoParams::FIXDATE_INFO, "loclong");
+ translator.addPair(InsetInfoParams::TIME_INFO, "long");
+ translator.addPair(InsetInfoParams::MODTIME_INFO, "long");
+ translator.addPair(InsetInfoParams::FIXTIME_INFO, "long");
+
+ return translator;
+}
+
+/// The translator between the information type enum and some sensible default value.
+DefaultValueTranslator const & defaultValueTranslator()
+{
+ static DefaultValueTranslator const translator = initDVTranslator();
+ return translator;
+}
+
} // namespace
+
+/////////////////////////////////////////////////////////////////////
+//
+// InsetInfoParams
+//
+///////////////////////////////////////////////////////////////////////
+
+InsetInfoParams infoparams;
+
+namespace{
+set<string> getTexFileList(string const & filename)
+{
+ set<string> list;
+ FileName const file = libFileSearch(string(), filename);
+ if (file.empty())
+ return list;
+
+ // FIXME Unicode.
+ vector<docstring> doclist =
+ getVectorFromString(file.fileContents("UTF-8"), from_ascii("\n"));
+
+ // Normalise paths like /foo//bar ==> /foo/bar
+ for (auto doc : doclist) {
+ subst(doc, from_ascii("\r"), docstring());
+ while (contains(doc, from_ascii("//")))
+ subst(doc, from_ascii("//"), from_ascii("/"));
+ if (!doc.empty())
+ list.insert(removeExtension(onlyFileName(to_utf8(doc))));
+ }
+
+ // remove duplicates
+ return list;
+}
+} // namespace anon
+
+
+docstring InsetInfoParams::getDate(string const iname, QDate const date) const
+{
+ QLocale loc;
+ if (lang)
+ loc = QLocale(toqstr(lang->code()));
+ if (iname == "long")
+ return qstring_to_ucs4(loc.toString(date, QLocale::LongFormat));
+ else if (iname == "short")
+ return qstring_to_ucs4(loc.toString(date, QLocale::ShortFormat));
+ 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))));
+ else if (iname == "locmedium")
+ return qstring_to_ucs4(loc.toString(date, toqstr(lang->dateFormat(1))));
+ else if (iname == "locshort")
+ return qstring_to_ucs4(loc.toString(date, toqstr(lang->dateFormat(2))));
+ else
+ return qstring_to_ucs4(loc.toString(date, toqstr(iname)));
+}
+
+
+docstring InsetInfoParams::getTime(string const iname, QTime const time) const
+{
+ QLocale loc;
+ if (lang)
+ loc = QLocale(toqstr(lang->code()));
+ if (iname == "long")
+ return qstring_to_ucs4(loc.toString(time, QLocale::LongFormat));
+ else if (iname == "short")
+ return qstring_to_ucs4(loc.toString(time, QLocale::ShortFormat));
+ else if (iname == "ISO")
+ return qstring_to_ucs4(time.toString(Qt::ISODate));
+ else
+ return qstring_to_ucs4(loc.toString(time, toqstr(iname)));
+}
+
+
+vector<pair<string,docstring>> InsetInfoParams::getArguments(Buffer const * buf,
+ string const & itype) const
+{
+ vector<pair<string,docstring>> result;
+
+ switch (nameTranslator().find(itype)) {
+ case UNKNOWN_INFO:
+ result.push_back(make_pair("invalid", _("Please select a valid type!")));
+ break;
+
+ case SHORTCUT_INFO:
+ case SHORTCUTS_INFO:
+ case MENU_INFO:
+ case ICON_INFO: {
+ result.push_back(make_pair("custom", _("Custom")));
+ LyXAction::const_iterator fit = lyxaction.func_begin();
+ LyXAction::const_iterator const fen = lyxaction.func_end();
+ for (; fit != fen; ++fit) {
+ string const lfun = fit->first;
+ if (!lfun.empty())
+ result.push_back(make_pair(lfun, from_ascii(lfun)));
+ }
+ break;
+ }
+
+ case LYXRC_INFO: {
+ result.push_back(make_pair("custom", _("Custom")));
+ set<string> rcs = lyxrc.getRCs();
+ for (auto const & rc : rcs)
+ result.push_back(make_pair(rc, from_ascii(rc)));
+ break;
+ }
+
+ case PACKAGE_INFO:
+ case TEXTCLASS_INFO: {
+ result.push_back(make_pair("custom", _("Custom")));
+ string const filename = (itype == "package") ? "styFiles.lst"
+ : "clsFiles.lst";
+ set<string> flist = getTexFileList(filename);
+ for (auto const & f : flist)
+ result.push_back(make_pair(f, from_utf8(f)));
+ break;
+ }
+
+ case BUFFER_INFO:
+ result.push_back(make_pair("name", _("File name (with extension)")));
+ result.push_back(make_pair("name-noext", _("File name (without extension)")));
+ result.push_back(make_pair("path", _("File path")));
+ result.push_back(make_pair("class", _("Used text class")));
+ break;
+
+ case VCS_INFO: {
+ if (!buf->lyxvc().inUse()) {
+ result.push_back(make_pair("invalid", _("No version control!")));
+ break;
+ }
+ result.push_back(make_pair("revision", _("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[[of day]]")));
+ break;
+ }
+
+ case LYX_INFO:
+ result.push_back(make_pair("version", _("LyX version")));
+ break;
+
+ case FIXDATE_INFO:
+ case DATE_INFO:
+ case MODDATE_INFO: {
+ string const dt = split(name, '@');
+ QDate date;
+ if (itype == "moddate")
+ date = QDateTime::fromTime_t(buf->fileName().lastModified()).date();
+ else if (itype == "fixdate" && !dt.empty()) {
+ QDate const gdate = QDate::fromString(toqstr(dt), Qt::ISODate);
+ date = (gdate.isValid()) ? gdate : QDate::currentDate();
+ } else
+ date = QDate::currentDate();
+ result.push_back(make_pair("long",getDate("long", date)));
+ result.push_back(make_pair("short", getDate("short", date)));
+ result.push_back(make_pair("loclong", getDate("loclong", date)));
+ result.push_back(make_pair("locmedium", getDate("locmedium", date)));
+ result.push_back(make_pair("locshort", getDate("locshort", date)));
+ result.push_back(make_pair("ISO", getDate("ISO", date)));
+ result.push_back(make_pair("yyyy", getDate("yyyy", date)));
+ result.push_back(make_pair("MMMM", getDate("MMMM", date)));
+ result.push_back(make_pair("MMM", getDate("MMM", date)));
+ result.push_back(make_pair("dddd", getDate("dddd", date)));
+ result.push_back(make_pair("ddd", getDate("ddd", date)));
+ result.push_back(make_pair("custom", _("Custom")));
+ break;
+ }
+ case FIXTIME_INFO:
+ case TIME_INFO:
+ case MODTIME_INFO: {
+ string const tt = split(name, '@');
+ QTime time;
+ if (itype == "modtime")
+ time = QDateTime::fromTime_t(buf->fileName().lastModified()).time();
+ else if (itype == "fixtime" && !tt.empty()) {
+ QTime const gtime = QTime::fromString(toqstr(tt), Qt::ISODate);
+ time = (gtime.isValid()) ? gtime : QTime::currentTime();
+ } else
+ time = QTime::currentTime();
+ result.push_back(make_pair("long",getTime("long", time)));
+ result.push_back(make_pair("short", getTime("short", time)));
+ result.push_back(make_pair("ISO", getTime("ISO", time)));
+ result.push_back(make_pair("custom", _("Custom")));
+ break;
+ }
+ }
+
+ return result;
+}
+
+
+string InsetInfoParams::infoType() const
+{
+ return nameTranslator().find(type);
+}
+
+
+
/////////////////////////////////////////////////////////////////////////
//
// InsetInfo
InsetInfo::InsetInfo(Buffer * buf, string const & name)
- : InsetCollapsible(buf), initialized_(false),
- type_(UNKNOWN_INFO), name_(), force_ltr_(false)
+ : InsetCollapsible(buf), initialized_(false)
{
+ params_.type = InsetInfoParams::UNKNOWN_INFO;
+ params_.force_ltr = false;
setInfo(name);
status_ = Collapsed;
}
}
-string InsetInfo::infoType() const
-{
- return nameTranslator().find(type_);
-}
-
-
docstring InsetInfo::layoutName() const
{
- return from_ascii("Info:" + infoType());
+ return from_ascii("Info:" + params_.infoType());
}
docstring InsetInfo::toolTip(BufferView const &, int, int) const
{
docstring result;
- switch (nameTranslator().find(infoType())) {
- case UNKNOWN_INFO:
+ switch (nameTranslator().find(params_.infoType())) {
+ case InsetInfoParams::UNKNOWN_INFO:
result = _("Invalid information inset");
break;
- case SHORTCUT_INFO:
+ case InsetInfoParams::SHORTCUT_INFO:
result = bformat(_("The keybard shortcut for the function '%1$s'"),
- from_utf8(name_));
+ from_utf8(params_.name));
break;
- case SHORTCUTS_INFO:
+ case InsetInfoParams::SHORTCUTS_INFO:
result = bformat(_("The keybard shortcuts for the function '%1$s'"),
- from_utf8(name_));
+ from_utf8(params_.name));
break;
- case MENU_INFO:
+ case InsetInfoParams::MENU_INFO:
result = bformat(_("The menu location for the function '%1$s'"),
- from_utf8(name_));
+ from_utf8(params_.name));
break;
- case ICON_INFO:
+ case InsetInfoParams::ICON_INFO:
result = bformat(_("The toolbar icon for the function '%1$s'"),
- from_utf8(name_));
+ from_utf8(params_.name));
break;
- case LYXRC_INFO:
+ case InsetInfoParams::LYXRC_INFO:
result = bformat(_("The preference setting for the preference key '%1$s'"),
- from_utf8(name_));
+ from_utf8(params_.name));
break;
- case PACKAGE_INFO:
+ case InsetInfoParams::PACKAGE_INFO:
result = bformat(_("Availability of the LaTeX package '%1$s'"),
- from_utf8(name_));
+ from_utf8(params_.name));
break;
- case TEXTCLASS_INFO:
+ case InsetInfoParams::TEXTCLASS_INFO:
result = bformat(_("Availability of the LaTeX class '%1$s'"),
- from_utf8(name_));
+ from_utf8(params_.name));
break;
- case BUFFER_INFO:
- if (name_ == "name")
- result = _("The name of this file");
- else if (name_ == "path")
+ case InsetInfoParams::BUFFER_INFO:
+ if (params_.name == "name")
+ result = _("The name of this file (incl. extension)");
+ else if (params_.name == "name-noext")
+ result = _("The name of this file (without extension)");
+ else if (params_.name == "path")
result = _("The path where this file is saved");
- else if (name_ == "class")
+ else if (params_.name == "class")
result = _("The class this document uses");
break;
- case VCS_INFO:
- if (name_ == "revision")
+ case InsetInfoParams::VCS_INFO:
+ if (params_.name == "revision")
result = _("Version control revision");
- else if (name_ == "tree-revision")
+ else if (params_.name == "tree-revision")
result = _("Version control tree revision");
- else if (name_ == "author")
+ else if (params_.name == "author")
result = _("Version control author");
- else if (name_ == "date")
+ else if (params_.name == "date")
result = _("Version control date");
- else if (name_ == "time")
+ else if (params_.name == "time")
result = _("Version control time");
break;
- case LYX_INFO:
+ case InsetInfoParams::LYX_INFO:
result = _("The current LyX version");
break;
+ case InsetInfoParams::DATE_INFO:
+ result = _("The current date");
+ break;
+ case InsetInfoParams::MODDATE_INFO:
+ result = _("The date of last save");
+ break;
+ case InsetInfoParams::FIXDATE_INFO:
+ result = _("A static date");
+ break;
+ case InsetInfoParams::TIME_INFO:
+ result = _("The current time");
+ break;
+ case InsetInfoParams::MODTIME_INFO:
+ result = _("The time of last save");
+ break;
+ case InsetInfoParams::FIXTIME_INFO:
+ result = _("A static time");
+ break;
}
return result;
if (token == "type") {
lex.next();
token = lex.getString();
- type_ = nameTranslator().find(token);
+ params_.type = nameTranslator().find(token);
} else if (token == "arg") {
lex.next(true);
- name_ = lex.getString();
+ params_.name = lex.getString();
} else if (token == "\\end_inset")
break;
}
void InsetInfo::write(ostream & os) const
{
- os << "Info\ntype \"" << infoType()
- << "\"\narg " << Lexer::quoteString(name_);
+ os << "Info\ntype \"" << params_.infoType()
+ << "\"\narg " << Lexer::quoteString(params_.name);
}
bool InsetInfo::validateModifyArgument(docstring const & arg) const
{
string type;
- string const name = trim(split(to_utf8(arg), type, ' '));
+ string name = trim(split(to_utf8(arg), type, ' '));
switch (nameTranslator().find(type)) {
- case UNKNOWN_INFO:
+ case InsetInfoParams::UNKNOWN_INFO:
return false;
- case SHORTCUT_INFO:
- case SHORTCUTS_INFO:
- case MENU_INFO: {
+ case InsetInfoParams::SHORTCUT_INFO:
+ case InsetInfoParams::SHORTCUTS_INFO:
+ case InsetInfoParams::MENU_INFO: {
FuncRequest func = lyxaction.lookupFunc(name);
return func.action() != LFUN_UNKNOWN_ACTION;
}
- case ICON_INFO: {
+ case InsetInfoParams::ICON_INFO: {
FuncCode const action = lyxaction.lookupFunc(name).action();
if (action == LFUN_UNKNOWN_ACTION) {
string dir = "images";
return true;
}
- case LYXRC_INFO: {
+ case InsetInfoParams::LYXRC_INFO: {
set<string> rcs = lyxrc.getRCs();
return rcs.find(name) != rcs.end();
}
- case PACKAGE_INFO:
- case TEXTCLASS_INFO:
+ case InsetInfoParams::PACKAGE_INFO:
+ case InsetInfoParams::TEXTCLASS_INFO:
return true;
- case BUFFER_INFO:
- return (name == "name" || name == "path" || name == "class");
+ case InsetInfoParams::BUFFER_INFO:
+ return (name == "name" || name == "name-noext"
+ || name == "path" || name == "class");
- case VCS_INFO:
+ case InsetInfoParams::VCS_INFO:
if (name == "revision" || name == "tree-revision"
|| name == "author" || name == "date" || name == "time")
return buffer().lyxvc().inUse();
return false;
- case LYX_INFO:
+ case InsetInfoParams::LYX_INFO:
return name == "version";
- }
-
- return false;
-}
-
-
-namespace{
-set<string> getTexFileList(string const & filename)
-{
- set<string> list;
- FileName const file = libFileSearch(string(), filename);
- if (file.empty())
- return list;
-
- // FIXME Unicode.
- vector<docstring> doclist =
- getVectorFromString(file.fileContents("UTF-8"), from_ascii("\n"));
- // Normalise paths like /foo//bar ==> /foo/bar
- for (auto doc : doclist) {
- subst(doc, from_ascii("\r"), docstring());
- while (contains(doc, from_ascii("//")))
- subst(doc, from_ascii("//"), from_ascii("/"));
- if (!doc.empty())
- list.insert(removeExtension(onlyFileName(to_utf8(doc))));
+ 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;
}
-
- // remove duplicates
- return list;
-}
-} // namespace anon
-
-
-vector<pair<string,docstring>> InsetInfo::getArguments(string const & type) const
-{
- vector<pair<string,docstring>> result;
-
- switch (nameTranslator().find(type)) {
- case UNKNOWN_INFO:
- result.push_back(make_pair("invalid", _("Please select a valid type!")));
- break;
-
- case SHORTCUT_INFO:
- case SHORTCUTS_INFO:
- case MENU_INFO:
- case ICON_INFO: {
- result.push_back(make_pair("custom", _("Custom")));
- LyXAction::const_iterator fit = lyxaction.func_begin();
- LyXAction::const_iterator const fen = lyxaction.func_end();
- for (; fit != fen; ++fit) {
- string const lfun = fit->first;
- if (!lfun.empty())
- result.push_back(make_pair(lfun, from_ascii(lfun)));
+ // 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();
}
- break;
}
-
- case LYXRC_INFO: {
- result.push_back(make_pair("custom", _("Custom")));
- set<string> rcs = lyxrc.getRCs();
- for (auto const & rc : rcs)
- result.push_back(make_pair(rc, from_ascii(rc)));
- break;
- }
-
- case PACKAGE_INFO:
- case TEXTCLASS_INFO: {
- result.push_back(make_pair("custom", _("Custom")));
- string const filename = (type == "package") ? "styFiles.lst"
- : "clsFiles.lst";
- set<string> flist = getTexFileList(filename);
- for (auto const & f : flist)
- result.push_back(make_pair(f, from_utf8(f)));
- break;
+ 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;
}
-
- case BUFFER_INFO:
- result.push_back(make_pair("name", _("File name")));
- result.push_back(make_pair("path", _("File path")));
- result.push_back(make_pair("class", _("Used text class")));
- break;
-
- case VCS_INFO: {
- if (!buffer().lyxvc().inUse()) {
- result.push_back(make_pair("invalid", _("No version control!")));
- break;
+ // 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();
}
- result.push_back(make_pair("revision", _("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")));
- break;
}
-
- case LYX_INFO:
- result.push_back(make_pair("version", _("LyX version")));
- break;
}
- return result;
+ return false;
}
case LFUN_INSET_MODIFY:
if (validateModifyArgument(cmd.argument())) {
flag.setEnabled(true);
+ string typestr;
+ string name = trim(split(to_utf8(cmd.argument()), typestr, ' '));
+ InsetInfoParams::info_type type = nameTranslator().find(typestr);
+ string origname = params_.name;
+ if (type == InsetInfoParams::FIXDATE_INFO
+ || type == InsetInfoParams::FIXTIME_INFO)
+ split(params_.name, origname, '@');
+ flag.setOnOff(type == params_.type && name == origname);
return true;
}
//fall through
{
if (name.empty())
return;
+
+ string saved_date_specifier;
+ // Store old date specifier for potential re-use
+ if (!params_.name.empty())
+ saved_date_specifier = split(params_.name, '@');
// info_type name
string type;
- name_ = trim(split(name, type, ' '));
- type_ = nameTranslator().find(type);
+ params_.name = trim(split(name, type, ' '));
+ params_.type = nameTranslator().find(type);
+ if (params_.name.empty())
+ params_.name = defaultValueTranslator().find(params_.type);
+ if (params_.type == InsetInfoParams::FIXDATE_INFO) {
+ string const date_specifier = split(params_.name, '@');
+ // If an explicit new fix date is specified, use that
+ // Otherwise, use the old one or, if there is none,
+ // the current date
+ if (date_specifier.empty()) {
+ if (saved_date_specifier.empty())
+ params_.name += "@" + fromqstr(QDate::currentDate().toString(Qt::ISODate));
+ else
+ params_.name += "@" + saved_date_specifier;
+ }
+ }
+ else if (params_.type == InsetInfoParams::FIXTIME_INFO) {
+ string const time_specifier = split(params_.name, '@');
+ // If an explicit new fix time is specified, use that
+ // Otherwise, use the old one or, if there is none,
+ // the current time
+ if (time_specifier.empty()) {
+ if (saved_date_specifier.empty())
+ params_.name += "@" + fromqstr(QTime::currentTime().toString(Qt::ISODate));
+ else
+ params_.name += "@" + saved_date_specifier;
+ }
+ }
}
void InsetInfo::error(docstring const & err, Language const * lang)
{
- setText(bformat(translateIfPossible(err, lang->code()), from_utf8(name_)),
+ setText(bformat(translateIfPossible(err, lang->code()), from_utf8(params_.name)),
Font(inherit_font, lang), false);
}
bool InsetInfo::forceLTR() const
{
- return force_ltr_;
+ return params_.force_ltr;
}
return;
BufferParams const & bp = buffer().params();
- Language const * lang = it.paragraph().getFontSettings(bp, it.pos()).language();
+ params_.lang = it.paragraph().getFontSettings(bp, it.pos()).language();
Language const * tryguilang = languages.getFromCode(Messages::guiLanguage());
// Some info insets use the language of the GUI (if available)
- Language const * guilang = tryguilang ? tryguilang : lang;
+ Language const * guilang = tryguilang ? tryguilang : params_.lang;
- force_ltr_ = !lang->rightToLeft();
+ params_.force_ltr = !params_.lang->rightToLeft();
// This is just to get the string into the po files
docstring gui;
- switch (type_) {
- case UNKNOWN_INFO:
+ switch (params_.type) {
+ case InsetInfoParams::UNKNOWN_INFO:
gui = _("Unknown Info!");
- info(from_ascii("Unknown Info!"), lang);
+ info(from_ascii("Unknown Info!"), params_.lang);
initialized_ = false;
break;
- case SHORTCUT_INFO:
- case SHORTCUTS_INFO: {
+ case InsetInfoParams::SHORTCUT_INFO:
+ case InsetInfoParams::SHORTCUTS_INFO: {
// shortcuts can change, so we need to re-do this each time
- FuncRequest const func = lyxaction.lookupFunc(name_);
+ FuncRequest const func = lyxaction.lookupFunc(params_.name);
if (func.action() == LFUN_UNKNOWN_ACTION) {
gui = _("Unknown action %1$s");
- error(from_ascii("Unknown action %1$s"), lang);
+ error(from_ascii("Unknown action %1$s"), params_.lang);
break;
}
KeyMap::Bindings bindings = theTopLevelKeymap().findBindings(func);
if (bindings.empty()) {
gui = _("undefined");
- info(from_ascii("undefined"), lang);
+ info(from_ascii("undefined"), params_.lang);
break;
}
- if (type_ == SHORTCUT_INFO)
- setText(bindings.begin()->print(KeySequence::ForGui), guilang);
+ docstring sequence;
+ if (params_.type == InsetInfoParams::SHORTCUT_INFO)
+ sequence = bindings.begin()->print(KeySequence::ForGui);
else
- setText(theTopLevelKeymap().printBindings(func, KeySequence::ForGui), guilang);
- force_ltr_ = !guilang->rightToLeft() && !lang->rightToLeft();
+ sequence = theTopLevelKeymap().printBindings(func, KeySequence::ForGui);
+ // 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();
+ for (size_t n = 0; n < sequence.size(); ++n) {
+ char_type const c = sequence[n];
+ switch(c) {
+ case 0x21b5://Return
+ gui = _("Return[[Key]]");
+ ods << translateIfPossible(from_ascii("Return[[Key]]"), lcode);
+ break;
+ case 0x21b9://Tab both directions (Win)
+ gui = _("Tab[[Key]]");
+ ods << translateIfPossible(from_ascii("Tab[[Key]]"), lcode);
+ break;
+ case 0x21de://Qt::Key_PageUp
+ gui = _("PgUp");
+ ods << translateIfPossible(from_ascii("PgUp"), lcode);
+ break;
+ case 0x21df://Qt::Key_PageDown
+ gui = _("PgDown");
+ ods << translateIfPossible(from_ascii("PgDown"), lcode);
+ break;
+ case 0x21e4://Qt::Key_Backtab
+ gui = _("Backtab");
+ ods << translateIfPossible(from_ascii("Backtab"), lcode);
+ break;
+ case 0x21e5://Qt::Key_Tab
+ gui = _("Tab");
+ ods << translateIfPossible(from_ascii("Tab"), lcode);
+ break;
+ case 0x21e7://Shift
+ gui = _("Shift");
+ ods << translateIfPossible(from_ascii("Shift"), lcode);
+ break;
+ case 0x21ea://Qt::Key_CapsLock
+ gui = _("CapsLock");
+ ods << translateIfPossible(from_ascii("CapsLock"), lcode);
+ break;
+ case 0x2303://Control
+ gui = _("Control[[Key]]");
+ ods << translateIfPossible(from_ascii("Control[[Key]]"), lcode);
+ break;
+ case 0x2318://CMD
+ gui = _("Command[[Key]]");
+ ods << translateIfPossible(from_ascii("Command[[Key]]"), lcode);
+ break;
+ case 0x2324://Qt::Key_Enter
+ gui = _("Return[[Key]]");
+ ods << translateIfPossible(from_ascii("Return[[Key]]"), lcode);
+ break;
+ case 0x2325://Option key
+ gui = _("Option[[Key]]");
+ ods << translateIfPossible(from_ascii("Option[[Key]]"), lcode);
+ break;
+ case 0x2326://Qt::Key_Delete
+ gui = _("Delete[[Key]]");
+ ods << translateIfPossible(from_ascii("Delete[[Key]]"), lcode);
+ break;
+ case 0x232b://Qt::Key_Backspace
+ gui = _("Fn+Del");
+ ods << translateIfPossible(from_ascii("Fn+Delete"), lcode);
+ break;
+ case 0x238b://Qt::Key_Escape
+ gui = _("Esc");
+ ods << translateIfPossible(from_ascii("Esc"), lcode);
+ break;
+ default:
+ ods.put(c);
+ }
+ }
+ setText(ods.str(), guilang);
+ params_.force_ltr = !guilang->rightToLeft() && !params_.lang->rightToLeft();
break;
}
- case LYXRC_INFO: {
+ case InsetInfoParams::LYXRC_INFO: {
// this information could change, if the preferences are changed,
// so we will recalculate each time through.
ostringstream oss;
- if (name_.empty()) {
+ if (params_.name.empty()) {
gui = _("undefined");
- info(from_ascii("undefined"), lang);
+ info(from_ascii("undefined"), params_.lang);
break;
}
// FIXME this uses the serialization mechanism to get the info
// we want, which i guess works but is a bit strange.
- lyxrc.write(oss, true, name_);
+ lyxrc.write(oss, true, params_.name);
string result = oss.str();
if (result.size() < 2) {
gui = _("undefined");
- info(from_ascii("undefined"), lang);
+ info(from_ascii("undefined"), params_.lang);
break;
}
string::size_type loc = result.rfind("\n", result.size() - 2);
loc = loc == string::npos ? 0 : loc + 1;
- if (result.size() < loc + name_.size() + 1
- || result.substr(loc + 1, name_.size()) != name_) {
+ if (result.size() < loc + params_.name.size() + 1
+ || result.substr(loc + 1, params_.name.size()) != params_.name) {
gui = _("undefined");
- info(from_ascii("undefined"), lang);
+ info(from_ascii("undefined"), params_.lang);
break;
}
// remove leading comments and \\name and space
- result = result.substr(loc + name_.size() + 2);
+ result = result.substr(loc + params_.name.size() + 2);
// remove \n and ""
result = rtrim(result, "\n");
result = trim(result, "\"");
- setText(from_utf8(result), lang);
+ gui = _("not set");
+ if (result.empty())
+ result = "not set";
+ setText(from_utf8(result), params_.lang);
break;
}
- case PACKAGE_INFO:
+ case InsetInfoParams::PACKAGE_INFO:
// only need to do this once.
if (initialized_)
break;
// check in packages.lst
- if (LaTeXFeatures::isAvailable(name_)) {
+ if (LaTeXFeatures::isAvailable(params_.name)) {
gui = _("yes");
- info(from_ascii("yes"), lang);
+ info(from_ascii("yes"), params_.lang);
} else {
gui = _("no");
- info(from_ascii("no"), lang);
+ info(from_ascii("no"), params_.lang);
}
initialized_ = true;
break;
- case TEXTCLASS_INFO: {
+ case InsetInfoParams::TEXTCLASS_INFO: {
// the TextClass can change
LayoutFileList const & list = LayoutFileList::get();
bool available = false;
- // name_ is the class name
- if (list.haveClass(name_))
- available = list[name_].isTeXClassAvailable();
+ // params_.name is the class name
+ if (list.haveClass(params_.name))
+ available = list[params_.name].isTeXClassAvailable();
if (available) {
gui = _("yes");
- info(from_ascii("yes"), lang);
+ info(from_ascii("yes"), params_.lang);
} else {
gui = _("no");
- info(from_ascii("no"), lang);
+ info(from_ascii("no"), params_.lang);
}
break;
}
- case MENU_INFO: {
+ case InsetInfoParams::MENU_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(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"), lang);
+ 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"), lang);
+ 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"), lang);
+ error(from_ascii("No menu entry for action %1$s"), params_.lang);
break;
}
// if found, return its path.
clear();
Paragraph & par = paragraphs().front();
Font const f(inherit_font, guilang);
- force_ltr_ = !guilang->rightToLeft();
+ params_.force_ltr = !guilang->rightToLeft();
//Font fu = f;
//fu.fontInfo().setUnderbar(FONT_ON);
for (docstring const & name : names) {
}
break;
}
- case ICON_INFO: {
+ case InsetInfoParams::ICON_INFO: {
// only need to do this once.
if (initialized_)
break;
// and we will not keep trying if we fail
initialized_ = true;
- FuncRequest func = lyxaction.lookupFunc(name_);
+ 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
FileName file(to_utf8(icon_name));
if (file.onlyFileNameWithoutExt() == "unknown") {
string dir = "images";
- FileName file2(imageLibFileSearch(dir, name_, "svgz,png"));
+ FileName file2(imageLibFileSearch(dir, params_.name, "svgz,png"));
if (!file2.empty())
file = file2;
}
igp.width = Length(1, Length::EM);
inset->setParams(igp);
clear();
- Font const f(inherit_font, lang);
+ Font const f(inherit_font, params_.lang);
paragraphs().front().insertInset(0, inset, f,
Change(Change::UNCHANGED));
break;
}
- case BUFFER_INFO: {
+ case InsetInfoParams::BUFFER_INFO: {
// this could all change, so we will recalculate each time
- if (name_ == "name")
- setText(from_utf8(buffer().fileName().onlyFileName()), lang);
- else if (name_ == "path")
- setText(from_utf8(os::latex_path(buffer().filePath())), lang);
- else if (name_ == "class")
- setText(from_utf8(bp.documentClass().name()), lang);
+ if (params_.name == "name")
+ setText(from_utf8(buffer().fileName().onlyFileName()), params_.lang);
+ else if (params_.name == "name-noext")
+ setText(from_utf8(buffer().fileName().onlyFileNameWithoutExt()), params_.lang);
+ else if (params_.name == "path")
+ setText(from_utf8(os::latex_path(buffer().filePath())), params_.lang);
+ else if (params_.name == "class")
+ setText(from_utf8(bp.documentClass().name()), params_.lang);
break;
}
- case VCS_INFO: {
+ case InsetInfoParams::VCS_INFO: {
// this information could change, in principle, so we will
// recalculate each time through
if (!buffer().lyxvc().inUse()) {
gui = _("No version control!");
- info(from_ascii("No version control!"), lang);
+ info(from_ascii("No version control!"), params_.lang);
break;
}
LyXVC::RevisionInfo itype = LyXVC::Unknown;
- if (name_ == "revision")
+ if (params_.name == "revision")
itype = LyXVC::File;
- else if (name_ == "tree-revision")
+ else if (params_.name == "tree-revision")
itype = LyXVC::Tree;
- else if (name_ == "author")
+ else if (params_.name == "author")
itype = LyXVC::Author;
- else if (name_ == "time")
+ else if (params_.name == "time")
itype = LyXVC::Time;
- else if (name_ == "date")
+ else if (params_.name == "date")
itype = LyXVC::Date;
string binfo = buffer().lyxvc().revisionInfo(itype);
if (binfo.empty()) {
gui = _("%1$s[[vcs data]] unknown");
- error(from_ascii("%1$s[[vcs data]] unknown"), lang);
+ error(from_ascii("%1$s[[vcs data]] unknown"), params_.lang);
} else
- setText(from_utf8(binfo), lang);
+ setText(from_utf8(binfo), params_.lang);
break;
}
- case LYX_INFO:
+ case InsetInfoParams::LYX_INFO:
// only need to do this once.
if (initialized_)
break;
- if (name_ == "version")
- setText(from_ascii(lyx_version), lang);
+ if (params_.name == "version")
+ setText(from_ascii(lyx_version), params_.lang);
initialized_ = true;
break;
+ case InsetInfoParams::DATE_INFO:
+ case InsetInfoParams::MODDATE_INFO:
+ case InsetInfoParams::FIXDATE_INFO: {
+ string date_format = params_.name;
+ string const date_specifier = (params_.type == InsetInfoParams::FIXDATE_INFO
+ && contains(params_.name, '@'))
+ ? split(params_.name, date_format, '@') : string();
+ QDate date;
+ if (params_.type == InsetInfoParams::MODDATE_INFO)
+ date = QDateTime::fromTime_t(buffer().fileName().lastModified()).date();
+ else if (params_.type == InsetInfoParams::FIXDATE_INFO && !date_specifier.empty())
+ date = QDate::fromString(toqstr(date_specifier), Qt::ISODate);
+ else
+ date = QDate::currentDate();
+ setText(params_.getDate(date_format, date), params_.lang);
+ break;
+ }
+ case InsetInfoParams::TIME_INFO:
+ case InsetInfoParams::MODTIME_INFO:
+ case InsetInfoParams::FIXTIME_INFO: {
+ string time_format = params_.name;
+ string const time_specifier = (params_.type == InsetInfoParams::FIXTIME_INFO
+ && contains(params_.name, '@'))
+ ? split(params_.name, time_format, '@') : string();
+ QTime time;
+ if (params_.type == InsetInfoParams::MODTIME_INFO)
+ time = QDateTime::fromTime_t(buffer().fileName().lastModified()).time();
+ else if (params_.type == InsetInfoParams::FIXTIME_INFO && !time_specifier.empty())
+ time = QTime::fromString(toqstr(time_specifier), Qt::ISODate);
+ else
+ time = QTime::currentTime();
+ setText(params_.getTime(time_format, time), params_.lang);
+ break;
}
+ }
+
// Just to do something with that string
LYXERR(Debug::INFO, "info inset text: " << gui);
InsetCollapsible::updateBuffer(it, utype);
projects / lyx.git / blobdiff