anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-11 11:08:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Some polish.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25156 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Abdelrazak Younes 2008-06-06 09:33:24 +00:00
parent b4213b9fe5
commit af050ab1b0
2 changed files with 40 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/insets/InsetInfo.cpp
View File

@ -222,6 +222,19 @@ void InsetInfo::setInfo(string const & name)
} }
void InsetInfo::error(string const & err)
{
InsetText::setText(bformat(_(err), from_utf8(name_)), buffer().params().getFont(),
false);
}
void InsetInfo::setText(docstring const & str)
{
InsetText::setText(str, buffer().params().getFont(), false);
}
void InsetInfo::updateInfo() void InsetInfo::updateInfo()
{ {
InsetText::clear(); InsetText::clear();
@ -230,24 +243,24 @@ void InsetInfo::updateInfo()
switch (type_) { switch (type_) {
case UNKNOWN_INFO: case UNKNOWN_INFO:
setText(_("Unknown Info: ") + from_utf8(name_), error("Unknown Info: %1$s");
bp.getFont(), false);
break; break;
case SHORTCUT_INFO:
case SHORTCUTS_INFO: { case SHORTCUTS_INFO: {
FuncRequest func = lyxaction.lookupFunc(name_); FuncRequest func = lyxaction.lookupFunc(name_);
if (func.action != LFUN_UNKNOWN_ACTION) if (func.action == LFUN_UNKNOWN_ACTION) {
setText(theTopLevelKeymap().printBindings(func), error("Unknown action %1$s");
bp.getFont(), false); break;
break;
}
case SHORTCUT_INFO: {
FuncRequest func = lyxaction.lookupFunc(name_);
if (func.action != LFUN_UNKNOWN_ACTION) {
KeyMap::Bindings bindings = theTopLevelKeymap().findBindings(func);
if (!bindings.empty())
setText(bindings.rbegin()->print(KeySequence::ForGui),
bp.getFont(), false);
} }
KeyMap::Bindings bindings = theTopLevelKeymap().findBindings(func);
if (bindings.empty()) {
error("No binding for action %1$s");
break;
}
if (type_ == SHORTCUT_INFO)
setText(bindings.rbegin()->print(KeySequence::ForGui));
else
setText(theTopLevelKeymap().printBindings(func));
break; break;
} }
case LYXRC_INFO: { case LYXRC_INFO: {
@ -259,31 +272,28 @@ void InsetInfo::updateInfo()
// remove \n and "" // remove \n and ""
result = rtrim(result, "\n"); result = rtrim(result, "\n");
result = trim(result, "\""); result = trim(result, "\"");
setText(from_utf8(result), bp.getFont(), false); setText(from_utf8(result));
break; break;
} }
case PACKAGE_INFO: case PACKAGE_INFO:
// check in packages.lst // check in packages.lst
setText(LaTeXFeatures::isAvailable(name_) ? _("yes") : _("no"), setText(LaTeXFeatures::isAvailable(name_) ? _("yes") : _("no"));
bp.getFont(), false);
break; break;
case TEXTCLASS_INFO: { case TEXTCLASS_INFO: {
// name_ is the class name // name_ is the class name
setText(LayoutFileList::get().haveClass(name_) ? _("yes") : _("no"), setText(LayoutFileList::get().haveClass(name_) ? _("yes") : _("no"));
bp.getFont(), false);
break; break;
} }
case MENU_INFO: { case MENU_INFO: {
docstring_list names; docstring_list names;
FuncRequest func = lyxaction.lookupFunc(name_); FuncRequest func = lyxaction.lookupFunc(name_);
if (func.action == LFUN_UNKNOWN_ACTION) { if (func.action == LFUN_UNKNOWN_ACTION) {
setText(bformat(_("Unknown action %1$s"), from_utf8(name_)), bp.getFont(), false); error("Unknown action %1$s");
break; break;
} }
// iterate through the menubackend to find it // iterate through the menubackend to find it
if (!theApp()->searchMenu(func, names)) { if (!theApp()->searchMenu(func, names)) {
setText(bformat(_("No menu entry for action %1$s"), from_utf8(name_)), error("No menu entry for action %1$s");
bp.getFont(), false);
break; break;
} }
// if find, return its path. // if find, return its path.
@ -319,14 +329,13 @@ void InsetInfo::updateInfo()
} }
case BUFFER_INFO: { case BUFFER_INFO: {
if (name_ == "name") if (name_ == "name")
setText(from_utf8(buffer().fileName().onlyFileName()), setText(from_utf8(buffer().fileName().onlyFileName()));
bp.getFont(), false);
else if (name_ == "path") else if (name_ == "path")
setText(from_utf8(buffer().filePath()), bp.getFont(), false); setText(from_utf8(buffer().filePath()));
else if (name_ == "class") else if (name_ == "class")
setText(from_utf8(bp.documentClass().name()), bp.getFont(), false); setText(from_utf8(bp.documentClass().name()));
else else
setText(_("Unknown buffer info"), bp.getFont(), false); setText(_("Unknown buffer info"));
break; break;
} }
} }

4
src/insets/InsetInfo.h
View File

@ -135,6 +135,10 @@ private:
/// ///
virtual Inset * clone() const { return new InsetInfo(*this); } virtual Inset * clone() const { return new InsetInfo(*this); }
/// ///
void error(std::string const & err);
///
void setText(docstring const & str);
///
info_type type_; info_type type_;
/// ///
std::string name_; std::string name_;