X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetInfo.cpp;h=0740fb4c91560231d88dd7c037afecb546df676b;hb=6936c1b4fa7f4a9e0ec98046431217b6916fed58;hp=98fe7d7c9b21caabb0ddfde97a848375aca91a4d;hpb=a3d5f27038826bb85fe6f1bed432d41bda69ff1e;p=lyx.git diff --git a/src/insets/InsetInfo.cpp b/src/insets/InsetInfo.cpp index 98fe7d7c9b..0740fb4c91 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" @@ -58,7 +58,7 @@ namespace { typedef Translator NameTranslator; NameTranslator const initTranslator() -{ +{ NameTranslator translator(InsetInfo::UNKNOWN_INFO, "unknown"); translator.addPair(InsetInfo::SHORTCUTS_INFO, "shortcuts"); @@ -81,7 +81,7 @@ NameTranslator const & nameTranslator() return translator; } -} // namespace anon +} // namespace ///////////////////////////////////////////////////////////////////////// // @@ -90,11 +90,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), initialized_(false), + type_(UNKNOWN_INFO), name_() { - setAutoBreakRows(true); setInfo(name); status_ = Collapsed; } @@ -141,20 +141,19 @@ 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, _("Missing \\end_inset at this point."), from_utf8(token)); } - updateInfo(); } void InsetInfo::write(ostream & os) const { - os << "Info\ntype \"" << infoType() + os << "Info\ntype \"" << infoType() << "\"\narg " << Lexer::quoteString(name_); } @@ -170,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); @@ -214,7 +221,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: @@ -240,6 +247,7 @@ void InsetInfo::doDispatch(Cursor & cur, FuncRequest & cmd) case LFUN_INSET_MODIFY: cur.recordUndo(); setInfo(to_utf8(cmd.argument())); + initialized_ = false; break; case LFUN_INSET_COPY_AS: { @@ -257,7 +265,7 @@ void InsetInfo::doDispatch(Cursor & cur, FuncRequest & cmd) } default: - InsetCollapsable::doDispatch(cur, cmd); + InsetCollapsible::doDispatch(cur, cmd); break; } } @@ -271,13 +279,12 @@ void InsetInfo::setInfo(string const & name) string type; name_ = trim(split(name, type, ' ')); type_ = nameTranslator().find(type); - updateInfo(); } 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); } @@ -288,16 +295,21 @@ void InsetInfo::setText(docstring const & str) } -void InsetInfo::updateInfo() -{ - BufferParams const & bp = buffer().params(); +void InsetInfo::updateBuffer(ParIterator const & it, UpdateType utype) { + BufferParams const & bp = buffer().params(); switch (type_) { case UNKNOWN_INFO: error("Unknown Info: %1$s"); + initialized_ = false; break; case SHORTCUT_INFO: case SHORTCUTS_INFO: { + // only need to do this once. + if (initialized_) + break; + // and we will not keep trying if we fail + initialized_ = true; FuncRequest const func = lyxaction.lookupFunc(name_); if (func.action() == LFUN_UNKNOWN_ACTION) { error("Unknown action %1$s"); @@ -316,11 +328,15 @@ void InsetInfo::updateInfo() break; } case LYXRC_INFO: { + // this information could actually change, if the preferences are changed, + // so we will recalculate each time through. ostringstream oss; if (name_.empty()) { setText(_("undefined")); 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_); string result = oss.str(); if (result.size() < 2) { @@ -336,7 +352,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, "\""); @@ -344,20 +360,33 @@ void InsetInfo::updateInfo() break; } case PACKAGE_INFO: + // only need to do this once. + if (initialized_) + break; // check in packages.lst setText(LaTeXFeatures::isAvailable(name_) ? _("yes") : _("no")); + initialized_ = true; break; case TEXTCLASS_INFO: { + // only need to do this once. + if (initialized_) + break; // name_ is the class name LayoutFileList const & list = LayoutFileList::get(); bool available = false; if (list.haveClass(name_)) available = list[name_].isTeXClassAvailable(); setText(available ? _("yes") : _("no")); + initialized_ = true; break; } case 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_); if (func.action() == LFUN_UNKNOWN_ACTION) { @@ -379,12 +408,9 @@ void InsetInfo::updateInfo() Font const f(inherit_font, buffer().params().language); //Font fu = f; //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 ; - it != end ; ++it) { + for (docstring const & name : names) { // do not insert > for the top level menu item - if (it != beg) + if (&name != &names.front()) par.insertInset(par.size(), new InsetSpecialChar(InsetSpecialChar::MENU_SEPARATOR), f, Change(Change::UNCHANGED)); //FIXME: add proper underlines here. This @@ -392,13 +418,17 @@ void InsetInfo::updateInfo() // 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], - f, Change(Change::UNCHANGED)); + for (char_type c : name) + par.insertChar(par.size(), c, f, Change(Change::UNCHANGED)); } break; } case 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_); docstring icon_name = frontend::Application::iconName(func, true); // FIXME: We should use the icon directly instead of @@ -410,13 +440,25 @@ 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; - 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; + 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; @@ -432,6 +474,7 @@ void InsetInfo::updateInfo() break; } case BUFFER_INFO: { + // this could all change, so we will recalculate each time if (name_ == "name") { setText(from_utf8(buffer().fileName().onlyFileName())); break; @@ -444,9 +487,13 @@ void InsetInfo::updateInfo() 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. + + // this information could change, in principle, so we will + // recalculate each time through if (!buffer().lyxvc().inUse()) { setText(_("No version control")); break; @@ -470,17 +517,22 @@ void InsetInfo::updateInfo() break; } case LYX_INFO: + // only need to do this once. + if (initialized_) + break; if (name_ == "version") setText(from_ascii(lyx_version)); + initialized_ = true; break; } + InsetCollapsible::updateBuffer(it, utype); } 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(); }