X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetInfo.cpp;h=2f26c971f864b8293b3d146e59fb038d21775f23;hb=83d2c7fa3704a221b143a54b0c78747fbd712504;hp=0ec533b457900df49ec10082a94b8652bc59553c;hpb=17b3e303351d5701b31cee377d1c9452b1d30c4d;p=lyx.git diff --git a/src/insets/InsetInfo.cpp b/src/insets/InsetInfo.cpp index 0ec533b457..2f26c971f8 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" @@ -22,14 +22,17 @@ #include "KeyMap.h" #include "LaTeXFeatures.h" #include "LayoutFile.h" +#include "Length.h" #include "LyXAction.h" #include "LyXRC.h" #include "LyXVC.h" #include "Lexer.h" #include "ParagraphParameters.h" +#include "version.h" #include "frontends/Application.h" +#include "support/convert.h" #include "support/debug.h" #include "support/docstream.h" #include "support/docstring_list.h" @@ -38,9 +41,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; @@ -87,7 +94,6 @@ NameTranslator const & nameTranslator() InsetInfo::InsetInfo(Buffer * buf, string const & name) : InsetCollapsable(buf), type_(UNKNOWN_INFO), name_() { - setAutoBreakRows(true); setInfo(name); status_ = Collapsed; } @@ -106,7 +112,7 @@ string InsetInfo::infoType() const } -docstring InsetInfo::name() const +docstring InsetInfo::layoutName() const { return from_ascii("Info:" + infoType()); } @@ -163,12 +169,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,19 +222,19 @@ bool InsetInfo::getStatus(Cursor & cur, FuncRequest const & cmd, switch (cmd.action()) { case LFUN_INSET_SETTINGS: return InsetCollapsable::getStatus(cur, cmd, flag); - + case LFUN_INSET_DIALOG_UPDATE: case LFUN_INSET_COPY_AS: flag.setEnabled(true); return true; - + case LFUN_INSET_MODIFY: if (validateModifyArgument(cmd.argument())) { flag.setEnabled(true); return true; } //fall through - + default: return false; } @@ -231,6 +245,7 @@ void InsetInfo::doDispatch(Cursor & cur, FuncRequest & cmd) { switch (cmd.action()) { case LFUN_INSET_MODIFY: + cur.recordUndo(); setInfo(to_utf8(cmd.argument())); break; @@ -357,6 +372,10 @@ void InsetInfo::updateInfo() break; } // iterate through the menubackend to find it + if (!theApp()) { + error("Can't determine menu entry for action %1$s in batch mode"); + break; + } if (!theApp()->searchMenu(func, names)) { error("No menu entry for action %1$s"); break; @@ -374,7 +393,7 @@ void InsetInfo::updateInfo() // 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 @@ -388,20 +407,46 @@ void InsetInfo::updateInfo() } case ICON_INFO: { FuncRequest func = lyxaction.lookupFunc(name_); - docstring icon_name = theApp()->iconName(func, true); - //FIXME: We should use the icon directly instead of + 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"; + 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; } @@ -411,7 +456,7 @@ void InsetInfo::updateInfo() break; } if (name_ == "path") { - setText(from_utf8(buffer().filePath())); + setText(from_utf8(os::latex_path(buffer().filePath()))); break; } if (name_ == "class") { @@ -437,24 +482,31 @@ void InsetInfo::updateInfo() else if (name_ == "vcs-date") itype = LyXVC::Date; string binfo = buffer().lyxvc().revisionInfo(itype); - if (binfo.empty()) { - docstring fmt = _("%1$s unknown[[InsetInfo]]"); - setText(bformat(fmt, from_utf8(name_))); - } else + if (binfo.empty()) + setText(from_ascii(name_) + " unknown"); + else setText(from_utf8(binfo)); break; } case LYX_INFO: if (name_ == "version") - setText(from_ascii(PACKAGE_VERSION)); + setText(from_ascii(lyx_version)); break; } } -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. + return contextMenuName(); +} + + +string InsetInfo::contextMenuName() const { - return from_ascii("context-info"); + return "context-info"; }