X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetInfo.cpp;h=65ce972af305a88ec083e5a5b79332aa66456195;hb=b9116e8b81f55ee795ea444ee02ff921bf82606a;hp=acea3acb25acdbcd1d3a9496e846a5b723ec8eea;hpb=1b3c9e54c574c02e079623701eac0c6a0d7da453;p=lyx.git diff --git a/src/insets/InsetInfo.cpp b/src/insets/InsetInfo.cpp index acea3acb25..65ce972af3 100644 --- a/src/insets/InsetInfo.cpp +++ b/src/insets/InsetInfo.cpp @@ -10,7 +10,7 @@ #include #include "InsetInfo.h" - +#include "LyX.h" #include "Buffer.h" #include "BufferParams.h" #include "BufferView.h" @@ -21,7 +21,9 @@ #include "InsetSpecialChar.h" #include "KeyMap.h" #include "LaTeXFeatures.h" +#include "Language.h" #include "LayoutFile.h" +#include "Length.h" #include "LyXAction.h" #include "LyXRC.h" #include "LyXVC.h" @@ -31,6 +33,7 @@ #include "frontends/Application.h" +#include "support/convert.h" #include "support/debug.h" #include "support/docstream.h" #include "support/docstring_list.h" @@ -39,9 +42,13 @@ #include "support/filetools.h" #include "support/gettext.h" #include "support/lstrings.h" +#include "support/qstring_helpers.h" +#include "support/Translator.h" #include +#include + using namespace std; using namespace lyx::support; @@ -52,7 +59,7 @@ namespace { typedef Translator NameTranslator; NameTranslator const initTranslator() -{ +{ NameTranslator translator(InsetInfo::UNKNOWN_INFO, "unknown"); translator.addPair(InsetInfo::SHORTCUTS_INFO, "shortcuts"); @@ -75,7 +82,7 @@ NameTranslator const & nameTranslator() return translator; } -} // namespace anon +} // namespace ///////////////////////////////////////////////////////////////////////// // @@ -84,11 +91,11 @@ NameTranslator const & nameTranslator() ///////////////////////////////////////////////////////////////////////// - -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; } @@ -107,7 +114,7 @@ string InsetInfo::infoType() const } -docstring InsetInfo::name() const +docstring InsetInfo::layoutName() const { return from_ascii("Info:" + infoType()); } @@ -135,7 +142,7 @@ void InsetInfo::read(Lexer & lex) name_ = lex.getString(); } else if (token == "\\end_inset") break; - } + } if (token != "\\end_inset") { lex.printError("Missing \\end_inset at this point"); throw ExceptionMessage(WarningException, @@ -148,7 +155,7 @@ void InsetInfo::read(Lexer & lex) void InsetInfo::write(ostream & os) const { - os << "Info\ntype \"" << infoType() + os << "Info\ntype \"" << infoType() << "\"\narg " << Lexer::quoteString(name_); } @@ -164,12 +171,20 @@ bool InsetInfo::validateModifyArgument(docstring const & arg) const 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); @@ -208,7 +223,7 @@ bool InsetInfo::getStatus(Cursor & cur, FuncRequest const & cmd, { 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: @@ -251,7 +266,7 @@ void InsetInfo::doDispatch(Cursor & cur, FuncRequest & cmd) } default: - InsetCollapsable::doDispatch(cur, cmd); + InsetCollapsible::doDispatch(cur, cmd); break; } } @@ -271,7 +286,7 @@ void InsetInfo::setInfo(string const & name) 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); } @@ -282,10 +297,17 @@ void InsetInfo::setText(docstring const & str) } +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"); @@ -303,10 +325,82 @@ void InsetInfo::updateInfo() 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: { @@ -330,7 +424,7 @@ void InsetInfo::updateInfo() } // remove leading comments and \\name and space result = result.substr(loc + name_.size() + 2); - + // remove \n and "" result = rtrim(result, "\n"); result = trim(result, "\""); @@ -375,19 +469,19 @@ void InsetInfo::updateInfo() //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) par.insertInset(par.size(), new InsetSpecialChar(InsetSpecialChar::MENU_SEPARATOR), - Change(Change::UNCHANGED)); + f, Change(Change::UNCHANGED)); //FIXME: add proper underlines here. This // involves rewriting searchMenu used above to // return a vector of menus. If we do not do // 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; @@ -395,7 +489,7 @@ void InsetInfo::updateInfo() case ICON_INFO: { FuncRequest func = lyxaction.lookupFunc(name_); docstring icon_name = frontend::Application::iconName(func, true); - //FIXME: We should use the icon directly instead of + // 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. @@ -404,14 +498,36 @@ void InsetInfo::updateInfo() // 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"; + FileName file2(imageLibFileSearch(dir, name_, "svgz,png")); + if (!file2.empty()) + file = file2; + } if (!file.exists()) break; + int percent_scale = 100; + if (use_gui) { + // Compute the scale factor for the icon such that its + // width on screen is equal to 1em in pixels. + // The scale factor is rounded to the integer nearest + // to the float value of the ratio 100*iconsize/imgsize. + int imgsize = QImage(toqstr(file.absFileName())).width(); + if (imgsize > 0) { + int iconsize = Length(1, Length::EM).inPixels(1); + percent_scale = (100 * iconsize + imgsize / 2)/imgsize; + } + } InsetGraphics * inset = new InsetGraphics(buffer_); InsetGraphicsParams igp; igp.filename = file; + igp.lyxscale = percent_scale; + igp.scale = string(); + igp.width = Length(1, Length::EM); inset->setParams(igp); clear(); - paragraphs().front().insertInset(0, inset, + Font const f(inherit_font, buffer().params().language); + paragraphs().front().insertInset(0, inset, f, Change(Change::UNCHANGED)); break; } @@ -421,14 +537,14 @@ void InsetInfo::updateInfo() break; } if (name_ == "path") { - setText(from_utf8(buffer().filePath())); + setText(from_utf8(os::latex_path(buffer().filePath()))); break; } if (name_ == "class") { 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()) { @@ -448,7 +564,7 @@ void InsetInfo::updateInfo() itype = LyXVC::Date; string binfo = buffer().lyxvc().revisionInfo(itype); if (binfo.empty()) - setText(bformat(_("%1$s unknown"), from_ascii(name_))); + setText(from_ascii(name_) + " unknown"); else setText(from_utf8(binfo)); break; @@ -461,17 +577,17 @@ void InsetInfo::updateInfo() } -docstring InsetInfo::contextMenu(BufferView const &, int, int) const +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(); } -docstring InsetInfo::contextMenuName() const +string InsetInfo::contextMenuName() const { - return from_ascii("context-info"); + return "context-info"; }