#include <config.h>
#include "Toolbars.h"
+#include "Converter.h"
+#include "Format.h"
#include "FuncRequest.h"
#include "Lexer.h"
#include "LyXAction.h"
-#include "support/lstrings.h"
+#include "qt_helpers.h"
#include "support/debug.h"
#include "support/gettext.h"
-
-#include <boost/bind.hpp>
+#include "support/lstrings.h"
#include <algorithm>
namespace lyx {
namespace frontend {
-namespace {
-
-} // namespace anon
-
/////////////////////////////////////////////////////////////////////////
//
//
/////////////////////////////////////////////////////////////////////////
-ToolbarItem::ToolbarItem(Type type, FuncRequest const & func, docstring const & label)
- : type_(type), func_(func), label_(label)
+ToolbarItem::ToolbarItem(Type type, FuncRequest const & func,
+ docstring const & label)
+ : type_(type), func_(make_shared<FuncRequest>(func)), label_(label)
{
}
-ToolbarItem::ToolbarItem(Type type, string const & name, docstring const & label)
- : type_(type), label_(label), name_(name)
+ToolbarItem::ToolbarItem(Type type, string const & name,
+ docstring const & label)
+ : type_(type), func_(make_shared<FuncRequest>()), label_(label), name_(name)
{
}
void ToolbarInfo::add(ToolbarItem const & item)
{
items.push_back(item);
- items.back().func_.origin = FuncRequest::TOOLBAR;
+ items.back().func_->setOrigin(FuncRequest::TOOLBAR);
}
TO_MINIBUFFER,
TO_TABLEINSERT,
TO_POPUPMENU,
+ TO_STICKYPOPUPMENU,
TO_ICONPALETTE,
+ TO_EXPORTFORMATS,
+ TO_IMPORTFORMATS,
+ TO_UPDATEFORMATS,
+ TO_VIEWFORMATS
};
struct LexerKeyword toolTags[] = {
{ "end", TO_ENDTOOLBAR },
+ { "exportformats", TO_EXPORTFORMATS },
{ "iconpalette", TO_ICONPALETTE },
+ { "importformats", TO_IMPORTFORMATS },
{ "item", TO_COMMAND },
{ "layouts", TO_LAYOUTS },
{ "minibuffer", TO_MINIBUFFER },
{ "popupmenu", TO_POPUPMENU },
{ "separator", TO_SEPARATOR },
- { "tableinsert", TO_TABLEINSERT }
+ { "stickypopupmenu", TO_STICKYPOPUPMENU },
+ { "tableinsert", TO_TABLEINSERT },
+ { "updateformats", TO_UPDATEFORMATS },
+ { "viewformats", TO_VIEWFORMATS },
};
//consistency check
name = lex.getString();
lex.next(true);
- gui_name = lex.getString();
+ gui_name = _(lex.getString());
// FIXME what to do here?
if (!lex) {
lex.printTable(lyxerr);
while (lex.isOK() && !quit) {
- switch (lex.lex()) {
+ int const code = lex.lex();
+ switch (code) {
case TO_COMMAND:
if (lex.next(true)) {
docstring const tooltip = translateIfPossible(lex.getDocString());
}
break;
+ case TO_STICKYPOPUPMENU:
+ if (lex.next(true)) {
+ string const name = lex.getString();
+ lex.next(true);
+ docstring const label = lex.getDocString();
+ add(ToolbarItem(ToolbarItem::STICKYPOPUPMENU, name, label));
+ }
+ break;
+
case TO_ICONPALETTE:
if (lex.next(true)) {
string const name = lex.getString();
quit = true;
break;
+ case TO_EXPORTFORMATS:
+ case TO_IMPORTFORMATS:
+ case TO_UPDATEFORMATS:
+ case TO_VIEWFORMATS: {
+ FormatList formats = (code == TO_IMPORTFORMATS) ?
+ theConverters().importableFormats() :
+ theConverters().exportableFormats(true);
+ sort(formats.begin(), formats.end());
+ for (Format const * f : formats) {
+ if (f->dummy())
+ continue;
+ if (code != TO_IMPORTFORMATS &&
+ !f->documentFormat())
+ continue;
+
+ docstring const prettyname = f->prettyname();
+ docstring tooltip;
+ FuncCode lfun = LFUN_NOACTION;
+ switch (code) {
+ case TO_EXPORTFORMATS:
+ lfun = LFUN_BUFFER_EXPORT;
+ tooltip = _("Export %1$s");
+ break;
+ case TO_IMPORTFORMATS:
+ lfun = LFUN_BUFFER_IMPORT;
+ tooltip = _("Import %1$s");
+ break;
+ case TO_UPDATEFORMATS:
+ lfun = LFUN_BUFFER_UPDATE;
+ tooltip = _("Update %1$s");
+ break;
+ case TO_VIEWFORMATS:
+ lfun = LFUN_BUFFER_VIEW;
+ tooltip = _("View %1$s");
+ break;
+ }
+ FuncRequest func(lfun, f->name(),
+ FuncRequest::TOOLBAR);
+ add(ToolbarItem(ToolbarItem::COMMAND, func,
+ bformat(tooltip, prettyname)));
+ }
+ break;
+ }
+
default:
lex.printError("ToolbarInfo::read: "
"Unknown toolbar tag: `$$Token'");
{
enum {
TO_TOOLBAR = 1,
- TO_ENDTOOLBARSET,
+ TO_ENDTOOLBARSET
};
struct LexerKeyword toolTags[] = {
flag = MATHMACROTEMPLATE;
else if (!compare_ascii_no_case(*cit, "review"))
flag = REVIEW;
+ else if (!compare_ascii_no_case(*cit, "minibuffer"))
+ flag = MINIBUFFER;
else if (!compare_ascii_no_case(*cit, "top"))
flag = TOP;
else if (!compare_ascii_no_case(*cit, "bottom"))
flag = RIGHT;
else if (!compare_ascii_no_case(*cit, "auto"))
flag = AUTO;
+ else if (!compare_ascii_no_case(*cit, "samerow"))
+ flag = SAMEROW;
+ else if (!compare_ascii_no_case(*cit, "ipa"))
+ flag = IPA;
else {
LYXERR(Debug::ANY,
"Toolbars::readToolbarSettings: unrecognised token:`"
}
toolbar_visibility_[name] = visibility;
- if (visibility >= MATH) {
+ if (visibility & ALLOWAUTO) {
if (ToolbarInfo const * ti = info(name))
- const_cast<ToolbarInfo *>(ti)->gui_name += " (auto)";
+ const_cast<ToolbarInfo *>(ti)->gui_name +=
+ " (" + _("auto") + ")";
}
}
}