#include "InsetSpecialChar.h"
#include "KeyMap.h"
#include "LaTeXFeatures.h"
+#include "Language.h"
#include "LayoutFile.h"
#include "Length.h"
#include "LyXAction.h"
typedef Translator<InsetInfo::info_type, string> NameTranslator;
NameTranslator const initTranslator()
-{
+{
NameTranslator translator(InsetInfo::UNKNOWN_INFO, "unknown");
translator.addPair(InsetInfo::SHORTCUTS_INFO, "shortcuts");
return translator;
}
-} // namespace anon
+} // namespace
/////////////////////////////////////////////////////////////////////////
//
/////////////////////////////////////////////////////////////////////////
-
-InsetInfo::InsetInfo(Buffer * buf, string const & name)
- : InsetCollapsable(buf), type_(UNKNOWN_INFO), name_()
+
+InsetInfo::InsetInfo(Buffer * buf, string const & name)
+ : InsetCollapsible(buf), type_(UNKNOWN_INFO), name_(),
+ force_ltr_(false)
{
- setAutoBreakRows(true);
setInfo(name);
status_ = Collapsed;
}
name_ = lex.getString();
} else if (token == "\\end_inset")
break;
- }
+ }
if (token != "\\end_inset") {
lex.printError("Missing \\end_inset at this point");
throw ExceptionMessage(WarningException,
void InsetInfo::write(ostream & os) const
{
- os << "Info\ntype \"" << infoType()
+ os << "Info\ntype \"" << infoType()
<< "\"\narg " << Lexer::quoteString(name_);
}
case SHORTCUT_INFO:
case SHORTCUTS_INFO:
- case MENU_INFO:
- case ICON_INFO: {
+ case MENU_INFO: {
FuncRequest func = lyxaction.lookupFunc(name);
return func.action() != LFUN_UNKNOWN_ACTION;
}
+ 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: {
ostringstream oss;
lyxrc.write(oss, true, name);
{
switch (cmd.action()) {
case LFUN_INSET_SETTINGS:
- return InsetCollapsable::getStatus(cur, cmd, flag);
+ return InsetCollapsible::getStatus(cur, cmd, flag);
case LFUN_INSET_DIALOG_UPDATE:
case LFUN_INSET_COPY_AS:
}
default:
- InsetCollapsable::doDispatch(cur, cmd);
+ InsetCollapsible::doDispatch(cur, cmd);
break;
}
}
void InsetInfo::error(string const & err)
{
- setText(bformat(_(err), from_utf8(name_)),
+ setText(bformat(_(err), from_utf8(name_)),
Font(inherit_font, buffer().params().language), false);
}
}
+bool InsetInfo::forceLTR() const
+{
+ return !buffer().params().language->rightToLeft() || force_ltr_;
+}
+
+
void InsetInfo::updateInfo()
{
- BufferParams const & bp = buffer().params();
+ BufferParams const & bp = buffer().params();
+ force_ltr_ = false;
switch (type_) {
case UNKNOWN_INFO:
error("Unknown Info: %1$s");
setText(_("undefined"));
break;
}
+ docstring sequence;
if (type_ == SHORTCUT_INFO)
- setText(bindings.begin()->print(KeySequence::Portable));
+ sequence = bindings.begin()->print(KeySequence::ForGui);
else
- setText(theTopLevelKeymap().printBindings(func, KeySequence::Portable));
+ 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;
+ docstring gui;
+ string const lcode = bp.language->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 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());
+ force_ltr_ = !bp.language->rightToLeft();
break;
}
case LYXRC_INFO: {
}
// remove leading comments and \\name and space
result = result.substr(loc + name_.size() + 2);
-
+
// remove \n and ""
result = rtrim(result, "\n");
result = trim(result, "\"");
//fu.fontInfo().setUnderbar(FONT_ON);
docstring_list::const_iterator beg = names.begin();
docstring_list::const_iterator end = names.end();
- for (docstring_list::const_iterator it = beg ;
+ for (docstring_list::const_iterator it = beg ;
it != end ; ++it) {
// do not insert > for the top level menu item
if (it != beg)
// that, we might as well use below
// Paragraph::insert on each string (JMarc)
for (size_type i = 0; i != it->length(); ++i)
- par.insertChar(par.size(), (*it)[i],
+ par.insertChar(par.size(), (*it)[i],
f, Change(Change::UNCHANGED));
}
break;
setText(from_utf8(bp.documentClass().name()));
break;
}
-
+
// everything that follows is for version control.
// nothing that isn't version control should go below this line.
if (!buffer().lyxvc().inUse()) {
string InsetInfo::contextMenu(BufferView const &, int, int) const
{
- //FIXME: We override the implementation of InsetCollapsable,
- //because this inset is not a collapsable inset.
+ //FIXME: We override the implementation of InsetCollapsible,
+ //because this inset is not a collapsible inset.
return contextMenuName();
}
projects / lyx.git / blobdiff