X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetInfo.cpp;h=2c3943effdb643f1a62aad49c19257553070885b;hb=f5123ccfa82215030c70561af881175d92244492;hp=750b57f82c5a4dacc48d57a8e3069385aa8c57dd;hpb=7356fcd2cf5daabb311b710385b6ad2ae57acda3;p=lyx.git diff --git a/src/insets/InsetInfo.cpp b/src/insets/InsetInfo.cpp index 750b57f82c..2c3943effd 100644 --- a/src/insets/InsetInfo.cpp +++ b/src/insets/InsetInfo.cpp @@ -14,6 +14,7 @@ #include "Buffer.h" #include "BufferParams.h" #include "BufferView.h" +#include "CutAndPaste.h" #include "FuncRequest.h" #include "FuncStatus.h" #include "InsetGraphics.h" @@ -23,8 +24,8 @@ #include "LayoutFile.h" #include "LyXAction.h" #include "LyXRC.h" +#include "LyXVC.h" #include "Lexer.h" -#include "MetricsInfo.h" #include "ParagraphParameters.h" #include "frontends/Application.h" @@ -61,6 +62,7 @@ NameTranslator const initTranslator() translator.addPair(InsetInfo::MENU_INFO, "menu"); translator.addPair(InsetInfo::ICON_INFO, "icon"); translator.addPair(InsetInfo::BUFFER_INFO, "buffer"); + translator.addPair(InsetInfo::LYX_INFO, "lyxinfo"); return translator; } @@ -82,7 +84,7 @@ NameTranslator const & nameTranslator() -InsetInfo::InsetInfo(Buffer const & buf, string const & name) +InsetInfo::InsetInfo(Buffer * buf, string const & name) : InsetCollapsable(buf), type_(UNKNOWN_INFO), name_() { setAutoBreakRows(true); @@ -93,8 +95,8 @@ InsetInfo::InsetInfo(Buffer const & buf, string const & name) Inset * InsetInfo::editXY(Cursor & cur, int x, int y) { - cur.push(*this); - return InsetCollapsable::editXY(cur, x, y); + // do not allow the cursor to be set in this Inset + return Inset::editXY(cur, x, y); } @@ -112,10 +114,8 @@ docstring InsetInfo::name() const docstring InsetInfo::toolTip(BufferView const &, int, int) const { - odocstringstream os; - os << _("Information regarding ") - << _(infoType()) << " " << from_utf8(name_); - return os.str(); + return bformat(_("Information regarding %1$s '%2$s'"), + _(infoType()), from_utf8(name_)); } @@ -141,7 +141,6 @@ void InsetInfo::read(Lexer & lex) _("Missing \\end_inset at this point."), from_utf8(token)); } - setLayout(buffer().params()); updateInfo(); } @@ -153,31 +152,45 @@ void InsetInfo::write(ostream & os) const } -bool InsetInfo::validate(docstring const & arg) const +bool InsetInfo::validateModifyArgument(docstring const & arg) const { string type; string const name = trim(split(to_utf8(arg), type, ' ')); + switch (nameTranslator().find(type)) { case UNKNOWN_INFO: return false; + case SHORTCUT_INFO: case SHORTCUTS_INFO: case MENU_INFO: case ICON_INFO: { FuncRequest func = lyxaction.lookupFunc(name); - return func.action != LFUN_UNKNOWN_ACTION; + return func.action() != LFUN_UNKNOWN_ACTION; } + case LYXRC_INFO: { ostringstream oss; lyxrc.write(oss, true, name); return !oss.str().empty(); } + case PACKAGE_INFO: case TEXTCLASS_INFO: return true; + case BUFFER_INFO: - return name == "name" || name == "path" || name == "class"; + if (name == "name" || name == "path" || name == "class") + return true; + if (name == "vcs-revision" || name == "vcs-tree-revision" || + name == "vcs-author" || name == "vcs-date" || name == "vcs-time") + return buffer().lyxvc().inUse(); + return false; + + case LYX_INFO: + return name == "version"; } + return false; } @@ -192,47 +205,51 @@ bool InsetInfo::showInsetDialog(BufferView * bv) const bool InsetInfo::getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus & flag) const { - switch (cmd.action) { - case LFUN_MOUSE_PRESS: - case LFUN_MOUSE_RELEASE: - case LFUN_MOUSE_MOTION: - case LFUN_MOUSE_DOUBLE: - case LFUN_MOUSE_TRIPLE: - case LFUN_COPY: + switch (cmd.action()) { case LFUN_INSET_SETTINGS: return InsetCollapsable::getStatus(cur, cmd, flag); - - case LFUN_INSET_MODIFY: + + case LFUN_INSET_DIALOG_UPDATE: + case LFUN_INSET_COPY_AS: flag.setEnabled(true); - break; - + return true; + + case LFUN_INSET_MODIFY: + if (validateModifyArgument(cmd.argument())) { + flag.setEnabled(true); + return true; + } + //fall through + default: return false; } - return true; } void InsetInfo::doDispatch(Cursor & cur, FuncRequest & cmd) { - // allow selection, copy but not cut, delete etc - switch (cmd.action) { - case LFUN_MOUSE_PRESS: - case LFUN_MOUSE_RELEASE: - case LFUN_MOUSE_MOTION: - case LFUN_MOUSE_DOUBLE: - case LFUN_MOUSE_TRIPLE: - case LFUN_COPY: - case LFUN_INSET_SETTINGS: - InsetCollapsable::doDispatch(cur, cmd); - break; - + switch (cmd.action()) { case LFUN_INSET_MODIFY: setInfo(to_utf8(cmd.argument())); - cur.pos() = 0; break; + case LFUN_INSET_COPY_AS: { + cap::clearSelection(); + Cursor copy(cur); + copy.pushBackward(*this); + copy.pit() = 0; + copy.pos() = 0; + copy.resetAnchor(); + copy.pit() = copy.lastpit(); + copy.pos() = copy.lastpos(); + copy.setSelection(); + cap::copySelection(copy); + break; + } + default: + InsetCollapsable::doDispatch(cur, cmd); break; } } @@ -246,20 +263,20 @@ void InsetInfo::setInfo(string const & name) string type; name_ = trim(split(name, type, ' ')); type_ = nameTranslator().find(type); - setLayout(buffer().params()); updateInfo(); } void InsetInfo::error(string const & err) { - setText(bformat(_(err), from_utf8(name_)), Font(inherit_font), false); + setText(bformat(_(err), from_utf8(name_)), + Font(inherit_font, buffer().params().language), false); } void InsetInfo::setText(docstring const & str) { - setText(str, Font(inherit_font), false); + setText(str, Font(inherit_font, buffer().params().language), false); } @@ -273,8 +290,8 @@ void InsetInfo::updateInfo() break; case SHORTCUT_INFO: case SHORTCUTS_INFO: { - FuncRequest func = lyxaction.lookupFunc(name_); - if (func.action == LFUN_UNKNOWN_ACTION) { + FuncRequest const func = lyxaction.lookupFunc(name_); + if (func.action() == LFUN_UNKNOWN_ACTION) { error("Unknown action %1$s"); break; } @@ -285,19 +302,33 @@ void InsetInfo::updateInfo() break; } if (type_ == SHORTCUT_INFO) - setText(bindings.begin()->print(KeySequence::Portable), - Font(inherit_font), false); + setText(bindings.begin()->print(KeySequence::Portable)); else - setText(theTopLevelKeymap().printBindings(func, KeySequence::Portable), - Font(inherit_font), false); + setText(theTopLevelKeymap().printBindings(func, KeySequence::Portable)); break; } case LYXRC_INFO: { ostringstream oss; + if (name_.empty()) { + setText(_("undefined")); + break; + } lyxrc.write(oss, true, name_); string result = oss.str(); - // remove leading \\name - result = result.substr(name_.size() + 2); + if (result.size() < 2) { + setText(_("undefined")); + 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_) { + setText(_("undefined")); + break; + } + // remove leading comments and \\name and space + result = result.substr(loc + name_.size() + 2); + // remove \n and "" result = rtrim(result, "\n"); result = trim(result, "\""); @@ -308,15 +339,20 @@ void InsetInfo::updateInfo() // check in packages.lst setText(LaTeXFeatures::isAvailable(name_) ? _("yes") : _("no")); break; + case TEXTCLASS_INFO: { // name_ is the class name - setText(LayoutFileList::get().haveClass(name_) ? _("yes") : _("no")); + LayoutFileList const & list = LayoutFileList::get(); + bool available = false; + if (list.haveClass(name_)) + available = list[name_].isTeXClassAvailable(); + setText(available ? _("yes") : _("no")); break; } case MENU_INFO: { docstring_list names; - FuncRequest func = lyxaction.lookupFunc(name_); - if (func.action == LFUN_UNKNOWN_ACTION) { + FuncRequest const func = lyxaction.lookupFunc(name_); + if (func.action() == LFUN_UNKNOWN_ACTION) { error("Unknown action %1$s"); break; } @@ -328,7 +364,7 @@ void InsetInfo::updateInfo() // if found, return its path. clear(); Paragraph & par = paragraphs().front(); - Font const f = Font(getLayout().font()); + Font const f(inherit_font, buffer().params().language); //Font fu = f; //fu.fontInfo().setUnderbar(FONT_ON); docstring_list::const_iterator beg = names.begin(); @@ -360,7 +396,7 @@ void InsetInfo::updateInfo() FileName file(to_utf8(icon_name)); if (!file.exists()) break; - InsetGraphics * inset = new InsetGraphics(buffer()); + InsetGraphics * inset = new InsetGraphics(buffer_); InsetGraphicsParams igp; igp.filename = file; inset->setParams(igp); @@ -370,16 +406,47 @@ void InsetInfo::updateInfo() break; } case BUFFER_INFO: { - if (name_ == "name") + if (name_ == "name") { setText(from_utf8(buffer().fileName().onlyFileName())); - else if (name_ == "path") + break; + } + if (name_ == "path") { setText(from_utf8(buffer().filePath())); - else if (name_ == "class") + 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()) { + setText(_("No version control")); + break; + } + LyXVC::RevisionInfo itype = LyXVC::Unknown; + if (name_ == "vcs-revision") + itype = LyXVC::File; + else if (name_ == "vcs-tree-revision") + itype = LyXVC::Tree; + else if (name_ == "vcs-author") + itype = LyXVC::Author; + else if (name_ == "vcs-time") + itype = LyXVC::Time; + else if (name_ == "vcs-date") + itype = LyXVC::Date; + string binfo = buffer().lyxvc().revisionInfo(itype); + if (binfo.empty()) + setText(bformat(_("%1$s unknown"), from_ascii(name_))); else - setText(_("Unknown buffer info")); + setText(from_utf8(binfo)); break; } + case LYX_INFO: + if (name_ == "version") + setText(from_ascii(PACKAGE_VERSION)); + break; } }