X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiToolbar.cpp;h=0469db25151c5542926b60ce49d4b9565da55f57;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=a6cb4d49722b84d238763106a8251e9919036556;hpb=4559120e8a0c65fa70eae951e5202d2e14ba5c02;p=lyx.git diff --git a/src/frontends/qt4/GuiToolbar.cpp b/src/frontends/qt4/GuiToolbar.cpp index a6cb4d4972..0469db2515 100644 --- a/src/frontends/qt4/GuiToolbar.cpp +++ b/src/frontends/qt4/GuiToolbar.cpp @@ -3,10 +3,11 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Lars Gullik Bjønnes + * \author Lars Gullik Bjønnes * \author John Levon * \author Jean-Marc Lasgouttes * \author Angus Leeming + * \author Stefan Schimanski * \author Abdelrazak Younes * * Full author contact details are available in file CREDITS. @@ -14,377 +15,97 @@ #include -#include "Buffer.h" -#include "BufferParams.h" -#include "BufferView.h" -#include "Cursor.h" -#include "support/debug.h" -#include "FuncRequest.h" -#include "FuncStatus.h" -#include "support/gettext.h" -#include "IconPalette.h" -#include "Layout.h" -#include "LyXFunc.h" -#include "Paragraph.h" -#include "TextClass.h" -#include "ToolbarBackend.h" - -#include "GuiView.h" -#include "GuiCommandBuffer.h" #include "GuiToolbar.h" -#include "LyXAction.h" + #include "Action.h" -#include "qt_helpers.h" +#include "GuiApplication.h" +#include "GuiCommandBuffer.h" +#include "GuiView.h" +#include "IconPalette.h" #include "InsertTableWidget.h" +#include "LayoutBox.h" +#include "qt_helpers.h" +#include "Toolbars.h" + +#include "FuncRequest.h" +#include "FuncStatus.h" +#include "KeyMap.h" +#include "LyXFunc.h" #include "LyXRC.h" -#include "support/filetools.h" +#include "support/debug.h" +#include "support/gettext.h" #include "support/lstrings.h" -#include "support/lyxalgo.h" // sorted -#include +#include +#include +#include #include #include -#include -#include -#include +#include "support/lassert.h" using namespace std; using namespace lyx::support; -static void initializeResources() -{ - static bool initialized = false; - if (!initialized) { - Q_INIT_RESOURCE(Resources); - initialized = true; - } -} - - namespace lyx { namespace frontend { -namespace { - -struct PngMap { - char const * key; - char const * value; -}; - - -bool operator<(PngMap const & lhs, PngMap const & rhs) -{ - return strcmp(lhs.key, rhs.key) < 0; -} - - -class CompareKey { -public: - CompareKey(string const & name) : name_(name) {} - bool operator()(PngMap const & other) const { return other.key == name_; } -private: - string const name_; -}; - - -PngMap sorted_png_map[] = { - { "Bumpeq", "bumpeq2" }, - { "Cap", "cap2" }, - { "Cup", "cup2" }, - { "Delta", "delta2" }, - { "Downarrow", "downarrow2" }, - { "Gamma", "gamma2" }, - { "Lambda", "lambda2" }, - { "Leftarrow", "leftarrow2" }, - { "Leftrightarrow", "leftrightarrow2" }, - { "Longleftarrow", "longleftarrow2" }, - { "Longleftrightarrow", "longleftrightarrow2" }, - { "Longrightarrow", "longrightarrow2" }, - { "Omega", "omega2" }, - { "Phi", "phi2" }, - { "Pi", "pi2" }, - { "Psi", "psi2" }, - { "Rightarrow", "rightarrow2" }, - { "Sigma", "sigma2" }, - { "Subset", "subset2" }, - { "Supset", "supset2" }, - { "Theta", "theta2" }, - { "Uparrow", "uparrow2" }, - { "Updownarrow", "updownarrow2" }, - { "Upsilon", "upsilon2" }, - { "Vdash", "vdash3" }, - { "Xi", "xi2" }, - { "nLeftarrow", "nleftarrow2" }, - { "nLeftrightarrow", "nleftrightarrow2" }, - { "nRightarrow", "nrightarrow2" }, - { "nVDash", "nvdash3" }, - { "nvDash", "nvdash2" }, - { "textrm \\AA", "textrm_AA"}, - { "textrm \\O", "textrm_O"}, - { "vDash", "vdash2" } -}; - -size_t const nr_sorted_png_map = sizeof(sorted_png_map) / sizeof(PngMap); - - -string const find_png(string const & name) -{ - PngMap const * const begin = sorted_png_map; - PngMap const * const end = begin + nr_sorted_png_map; - BOOST_ASSERT(sorted(begin, end)); - - PngMap const * const it = find_if(begin, end, CompareKey(name)); - - string png_name; - if (it != end) - png_name = it->value; - else { - png_name = subst(name, "_", "underscore"); - png_name = subst(png_name, ' ', '_'); - - // This way we can have "math-delim { }" on the toolbar. - png_name = subst(png_name, "(", "lparen"); - png_name = subst(png_name, ")", "rparen"); - png_name = subst(png_name, "[", "lbracket"); - png_name = subst(png_name, "]", "rbracket"); - png_name = subst(png_name, "{", "lbrace"); - png_name = subst(png_name, "}", "rbrace"); - png_name = subst(png_name, "|", "bars"); - png_name = subst(png_name, ",", "thinspace"); - png_name = subst(png_name, ":", "mediumspace"); - png_name = subst(png_name, ";", "thickspace"); - png_name = subst(png_name, "!", "negthinspace"); - } - - LYXERR(Debug::GUI, "find_png(" << name << ")\n" - << "Looking for math PNG called \"" << png_name << '"'); - return png_name; -} - -} // namespace anon - - -/// return a icon for the given action -static QIcon getIcon(FuncRequest const & f, bool unknown) -{ - initializeResources(); - QPixmap pm; - string name1; - string name2; - string path; - string fullname; - - switch (f.action) { - case LFUN_MATH_INSERT: - if (!f.argument().empty()) { - path = "math/"; - name1 = find_png(to_utf8(f.argument()).substr(1)); - } - break; - case LFUN_MATH_DELIM: - case LFUN_MATH_BIGDELIM: - path = "math/"; - name1 = find_png(to_utf8(f.argument())); - break; - case LFUN_CALL: - path = "commands/"; - name1 = to_utf8(f.argument()); - break; - default: - name2 = lyxaction.getActionName(f.action); - name1 = name2; - - if (!f.argument().empty()) - name1 = subst(name2 + ' ' + to_utf8(f.argument()), ' ', '_'); - } - - fullname = libFileSearch("images/" + path, name1, "png").absFilename(); - if (pm.load(toqstr(fullname))) - return pm; - - fullname = libFileSearch("images/" + path, name2, "png").absFilename(); - if (pm.load(toqstr(fullname))) - return pm; - - if (pm.load(":/images/" + toqstr(path + name1) + ".png")) - return pm; - - if (pm.load(":/images/" + toqstr(path + name2) + ".png")) - return pm; - - LYXERR(Debug::GUI, "Cannot find icon for command \"" - << lyxaction.getActionName(f.action) - << '(' << to_utf8(f.argument()) << ")\""); - if (unknown) - pm.load(":/images/unknown.png"); - - return pm; -} - - -///////////////////////////////////////////////////////////////////// -// -// GuiLayoutBox -// -///////////////////////////////////////////////////////////////////// - -GuiLayoutBox::GuiLayoutBox(GuiView & owner) - : owner_(owner) -{ - setSizeAdjustPolicy(QComboBox::AdjustToContents); - setFocusPolicy(Qt::ClickFocus); - setMinimumWidth(sizeHint().width()); - setMaxVisibleItems(100); - - QObject::connect(this, SIGNAL(activated(QString)), - this, SLOT(selected(QString))); - owner_.setLayoutDialog(this); - updateContents(true); -} - - -void GuiLayoutBox::set(docstring const & layout) -{ - if (!text_class_) - return; - - QString const & name = toqstr(translateIfPossible( - (*text_class_)[layout]->name())); - - if (name == currentText()) - return; - - int i = findText(name); - if (i == -1) { - lyxerr << "Trying to select non existent layout type " - << fromqstr(name) << endl; - return; - } - - setCurrentIndex(i); -} - - -void GuiLayoutBox::addItemSort(QString const & item, bool sorted) +GuiToolbar::GuiToolbar(ToolbarInfo const & tbinfo, GuiView & owner) + : QToolBar(toqstr(tbinfo.gui_name), &owner), visibility_(0), + allowauto_(false), owner_(owner), command_buffer_(0), + tbinfo_(tbinfo), filled_(false) { - int const end = count(); - if (!sorted || end < 2 || item[0].category() != QChar::Letter_Uppercase) { - addItem(item); - return; - } - - // Let the default one be at the beginning - int i = 1; - for (setCurrentIndex(i); currentText() < item;) { - // e.g. --Separator-- - if (currentText()[0].category() != QChar::Letter_Uppercase) - break; - if (++i == end) - break; - setCurrentIndex(i); - } + setIconSize(owner.iconSize()); + connect(&owner, SIGNAL(iconSizeChanged(QSize)), this, + SLOT(setIconSize(QSize))); - insertItem(i, item); + // Toolbar dragging is allowed. + setMovable(true); + // This is used by QMainWindow::restoreState for proper main window state + // restauration. + setObjectName(toqstr(tbinfo.name)); + restoreSession(); } -void GuiLayoutBox::updateContents(bool reset) +void GuiToolbar::fill() { - Buffer const * buffer = owner_.buffer(); - if (!buffer) { - clear(); - setEnabled(false); - text_class_ = 0; + if (filled_) return; - } - - setEnabled(true); - TextClass const * text_class = &buffer->params().getTextClass(); - if (!reset && text_class_ == text_class) { - set(owner_.view()->cursor().innerParagraph().layout()->name()); - return; - } - - text_class_ = text_class; - - setUpdatesEnabled(false); - clear(); - - TextClass::const_iterator it = text_class_->begin(); - TextClass::const_iterator const end = text_class_->end(); - for (; it != end; ++it) { - // ignore obsolete entries - addItemSort(toqstr(translateIfPossible((*it)->name())), lyxrc.sort_layouts); - } - - setCurrentIndex(0); - - // needed to recalculate size hint - hide(); - setMinimumWidth(sizeHint().width()); - set(owner_.view()->cursor().innerParagraph().layout()->name()); - show(); - - setUpdatesEnabled(true); + ToolbarInfo::item_iterator it = tbinfo_.items.begin(); + ToolbarInfo::item_iterator end = tbinfo_.items.end(); + for (; it != end; ++it) + add(*it); + filled_ = true; } -void GuiLayoutBox::selected(const QString & str) +void GuiToolbar::showEvent(QShowEvent * ev) { - owner_.setFocus(); - updateContents(false); - if (!text_class_) - return; - - docstring const name = qstring_to_ucs4(str); - TextClass::const_iterator it = text_class_->begin(); - TextClass::const_iterator const end = text_class_->end(); - for (; it != end; ++it) { - docstring const & itname = (*it)->name(); - if (translateIfPossible(itname) == name) { - FuncRequest const func(LFUN_LAYOUT, itname, - FuncRequest::TOOLBAR); - theLyXFunc().setLyXView(&owner_); - lyx::dispatch(func); - return; - } - } - lyxerr << "ERROR (layoutSelected): layout not found!" << endl; + fill(); + ev->accept(); } - -///////////////////////////////////////////////////////////////////// -// -// GuiToolbar -// -///////////////////////////////////////////////////////////////////// - - -GuiToolbar::GuiToolbar(ToolbarInfo const & tbinfo, GuiView & owner) - : QToolBar(qt_(tbinfo.gui_name), &owner), owner_(owner), - layout_(0), command_buffer_(0) +void GuiToolbar::setVisibility(int visibility) { - // give visual separation between adjacent toolbars - addSeparator(); - - // TODO: save toolbar position - setMovable(true); - - ToolbarInfo::item_iterator it = tbinfo.items.begin(); - ToolbarInfo::item_iterator end = tbinfo.items.end(); - for (; it != end; ++it) - add(*it); + visibility_ = visibility; + allowauto_ = visibility_ >= Toolbars::MATH; } Action * GuiToolbar::addItem(ToolbarItem const & item) { - Action * act = new Action(owner_, - getIcon(item.func_, false), - toqstr(item.label_), item.func_, toqstr(item.label_)); + QString text = toqstr(item.label_); + // Get the keys bound to this action, but keep only the + // first one later + KeyMap::Bindings bindings = theTopLevelKeymap().findBindings(item.func_); + if (bindings.size()) + text += " [" + toqstr(bindings.begin()->print(KeySequence::ForGui)) + "]"; + + Action * act = new Action(&owner_, getIcon(item.func_, false), + text, item.func_, text, this); actions_.append(act); return act; } @@ -396,24 +117,19 @@ class PaletteButton : public QToolButton private: GuiToolbar * bar_; ToolbarItem const & tbitem_; - IconPalette * panel_; bool initialized_; public: PaletteButton(GuiToolbar * bar, ToolbarItem const & item) : QToolButton(bar), bar_(bar), tbitem_(item), initialized_(false) { - setToolTip(qt_(to_ascii(tbitem_.label_))); - setStatusTip(qt_(to_ascii(tbitem_.label_))); - setText(qt_(to_ascii(tbitem_.label_))); + QString const label = qt_(to_ascii(tbitem_.label_)); + setToolTip(label); + setStatusTip(label); + setText(label); connect(bar_, SIGNAL(iconSizeChanged(QSize)), this, SLOT(setIconSize(QSize))); - panel_ = new IconPalette(this); - panel_->setWindowTitle(qt_(to_ascii(tbitem_.label_))); setCheckable(true); - connect(this, SIGNAL(clicked(bool)), panel_, SLOT(setVisible(bool))); - connect(panel_, SIGNAL(visible(bool)), this, SLOT(setChecked(bool))); - ToolbarInfo const * tbinfo = - toolbarbackend.getDefinedToolbarInfo(tbitem_.name_); + ToolbarInfo const * tbinfo = guiApp->toolbars().info(tbitem_.name_); if (tbinfo) // use the icon of first action for the toolbar button setIcon(getIcon(tbinfo->items.begin()->func_, true)); @@ -428,17 +144,21 @@ public: initialized_ = true; - ToolbarInfo const * tbinfo = - toolbarbackend.getDefinedToolbarInfo(tbitem_.name_); + ToolbarInfo const * tbinfo = guiApp->toolbars().info(tbitem_.name_); if (!tbinfo) { - lyxerr << "Unknown toolbar " << tbitem_.name_ << endl; + LYXERR0("Unknown toolbar " << tbitem_.name_); return; } + IconPalette * panel = new IconPalette(this); + QString const label = qt_(to_ascii(tbitem_.label_)); + panel->setWindowTitle(label); + connect(this, SIGNAL(clicked(bool)), panel, SLOT(setVisible(bool))); + connect(panel, SIGNAL(visible(bool)), this, SLOT(setChecked(bool))); ToolbarInfo::item_iterator it = tbinfo->items.begin(); ToolbarInfo::item_iterator const end = tbinfo->items.end(); for (; it != end; ++it) if (!getStatus(it->func_).unknown()) - panel_->addButton(bar_->addItem(*it)); + panel->addButton(bar_->addItem(*it)); QToolButton::mousePressEvent(e); } @@ -446,16 +166,79 @@ public: } + +MenuButton::MenuButton(GuiToolbar * bar, ToolbarItem const & item, bool const sticky) + : QToolButton(bar), bar_(bar), tbitem_(item), initialized_(false) +{ + setPopupMode(QToolButton::InstantPopup); + QString const label = qt_(to_ascii(tbitem_.label_)); + setToolTip(label); + setStatusTip(label); + setText(label); + QString const name = toqstr(tbitem_.name_); + FileName const fname = libFileSearch("images/math/", name, "png"); + if (fname.exists()) + setIcon(QIcon(getPixmap("images/math/", name, "png"))); + else + setIcon(QIcon(getPixmap("images/", name, "png"))); + if (sticky) + connect(this, SIGNAL(triggered(QAction *)), + this, SLOT(actionTriggered(QAction *))); + connect(bar, SIGNAL(iconSizeChanged(QSize)), + this, SLOT(setIconSize(QSize))); +} + +void MenuButton::mousePressEvent(QMouseEvent * e) +{ + if (initialized_) { + QToolButton::mousePressEvent(e); + return; + } + + initialized_ = true; + + QString const label = qt_(to_ascii(tbitem_.label_)); + ButtonMenu * m = new ButtonMenu(label, this); + m->setWindowTitle(label); + m->setTearOffEnabled(true); + connect(bar_, SIGNAL(updated()), m, SLOT(updateParent())); + ToolbarInfo const * tbinfo = guiApp->toolbars().info(tbitem_.name_); + if (!tbinfo) { + LYXERR0("Unknown toolbar " << tbitem_.name_); + return; + } + ToolbarInfo::item_iterator it = tbinfo->items.begin(); + ToolbarInfo::item_iterator const end = tbinfo->items.end(); + for (; it != end; ++it) + if (!getStatus(it->func_).unknown()) + m->add(bar_->addItem(*it)); + setMenu(m); + + QToolButton::mousePressEvent(e); +} + + +void MenuButton::actionTriggered(QAction * action) +{ + QToolButton::setDefaultAction(action); + setPopupMode(QToolButton::DelayedPopup); +} + + void GuiToolbar::add(ToolbarItem const & item) { switch (item.type_) { case ToolbarItem::SEPARATOR: addSeparator(); break; - case ToolbarItem::LAYOUTS: - layout_ = new GuiLayoutBox(owner_); - addWidget(layout_); + case ToolbarItem::LAYOUTS: { + LayoutBox * layout = owner_.getLayoutDialog(); + QObject::connect(this, SIGNAL(iconSizeChanged(QSize)), + layout, SLOT(setIconSize(QSize))); + QAction * action = addWidget(layout); + action->setVisible(true); break; + } case ToolbarItem::MINIBUFFER: command_buffer_ = new GuiCommandBuffer(&owner_); addWidget(command_buffer_); @@ -466,9 +249,10 @@ void GuiToolbar::add(ToolbarItem const & item) QToolButton * tb = new QToolButton; tb->setCheckable(true); tb->setIcon(getIcon(FuncRequest(LFUN_TABULAR_INSERT), true)); - tb->setToolTip(qt_(to_ascii(item.label_))); - tb->setStatusTip(qt_(to_ascii(item.label_))); - tb->setText(qt_(to_ascii(item.label_))); + QString const label = qt_(to_ascii(item.label_)); + tb->setToolTip(label); + tb->setStatusTip(label); + tb->setText(label); InsertTableWidget * iv = new InsertTableWidget(owner_, tb); connect(tb, SIGNAL(clicked(bool)), iv, SLOT(show(bool))); connect(iv, SIGNAL(visible(bool)), tb, SLOT(setChecked(bool))); @@ -481,31 +265,11 @@ void GuiToolbar::add(ToolbarItem const & item) break; case ToolbarItem::POPUPMENU: { - QToolButton * tb = new QToolButton; - tb->setPopupMode(QToolButton::InstantPopup); - tb->setToolTip(qt_(to_ascii(item.label_))); - tb->setStatusTip(qt_(to_ascii(item.label_))); - tb->setText(qt_(to_ascii(item.label_))); - tb->setIcon(QPixmap(":images/math/" + toqstr(item.name_) + ".png")); - connect(this, SIGNAL(iconSizeChanged(QSize)), - tb, SLOT(setIconSize(QSize))); - - ButtonMenu * m = new ButtonMenu(qt_(to_ascii(item.label_)), tb); - m->setWindowTitle(qt_(to_ascii(item.label_))); - m->setTearOffEnabled(true); - connect(this, SIGNAL(updated()), m, SLOT(updateParent())); - ToolbarInfo const * tbinfo = toolbarbackend.getDefinedToolbarInfo(item.name_); - if (!tbinfo) { - lyxerr << "Unknown toolbar " << item.name_ << endl; - break; + addWidget(new MenuButton(this, item, false)); + break; } - ToolbarInfo::item_iterator it = tbinfo->items.begin(); - ToolbarInfo::item_iterator const end = tbinfo->items.end(); - for (; it != end; ++it) - if (!getStatus(it->func_).unknown()) - m->add(addItem(*it)); - tb->setMenu(m); - addWidget(tb); + case ToolbarItem::STICKYPOPUPMENU: { + addWidget(new MenuButton(this, item, true)); break; } case ToolbarItem::COMMAND: { @@ -519,56 +283,88 @@ void GuiToolbar::add(ToolbarItem const & item) } -void GuiToolbar::saveInfo(ToolbarSection::ToolbarInfo & tbinfo) +void GuiToolbar::update(bool in_math, bool in_table, bool in_review, + bool in_mathmacrotemplate) { - // if tbinfo.state == auto *do not* set on/off - if (tbinfo.state != ToolbarSection::ToolbarInfo::AUTO) { - if (GuiToolbar::isVisible()) - tbinfo.state = ToolbarSection::ToolbarInfo::ON; - else - tbinfo.state = ToolbarSection::ToolbarInfo::OFF; + if (visibility_ & Toolbars::AUTO) { + bool show_it = (in_math && (visibility_ & Toolbars::MATH)) + || (in_table && (visibility_ & Toolbars::TABLE)) + || (in_review && (visibility_ & Toolbars::REVIEW)) + || (in_mathmacrotemplate && (visibility_ & Toolbars::MATHMACROTEMPLATE)); + setVisible(show_it); } - // - // no need to save it here. - Qt::ToolBarArea loc = owner_.toolBarArea(this); - - if (loc == Qt::TopToolBarArea) - tbinfo.location = ToolbarSection::ToolbarInfo::TOP; - else if (loc == Qt::BottomToolBarArea) - tbinfo.location = ToolbarSection::ToolbarInfo::BOTTOM; - else if (loc == Qt::RightToolBarArea) - tbinfo.location = ToolbarSection::ToolbarInfo::RIGHT; - else if (loc == Qt::LeftToolBarArea) - tbinfo.location = ToolbarSection::ToolbarInfo::LEFT; - else - tbinfo.location = ToolbarSection::ToolbarInfo::NOTSET; - - // save toolbar position. They are not used to restore toolbar position - // now because move(x,y) does not work for toolbar. - tbinfo.posx = pos().x(); - tbinfo.posy = pos().y(); -} - -void GuiToolbar::updateContents() -{ // update visible toolbars only if (!isVisible()) return; + // This is a speed bottleneck because this is called on every keypress // and update calls getStatus, which copies the cursor at least two times for (int i = 0; i < actions_.size(); ++i) actions_[i]->update(); - if (layout_) - layout_->setEnabled(lyx::getStatus(FuncRequest(LFUN_LAYOUT)).enabled()); + LayoutBox * layout = owner_.getLayoutDialog(); + if (layout) + layout->setEnabled(lyx::getStatus(FuncRequest(LFUN_LAYOUT)).enabled()); // emit signal updated(); } +QString GuiToolbar::sessionKey() const +{ + return "views/" + QString::number(owner_.id()) + "/" + objectName(); +} + + +void GuiToolbar::saveSession() const +{ + QSettings settings; + settings.setValue(sessionKey() + "/visibility", visibility_); +} + + +void GuiToolbar::restoreSession() +{ + QSettings settings; + setVisibility(settings.value(sessionKey() + "/visibility").toInt()); +} + + +void GuiToolbar::toggle() +{ + docstring state; + if (allowauto_) { + if (!(visibility_ & Toolbars::AUTO)) { + visibility_ |= Toolbars::AUTO; + hide(); + state = _("auto"); + } else { + visibility_ &= ~Toolbars::AUTO; + if (isVisible()) { + hide(); + state = _("off"); + } else { + show(); + state = _("on"); + } + } + } else { + if (isVisible()) { + hide(); + state = _("off"); + } else { + show(); + state = _("on"); + } + } + + owner_.message(bformat(_("Toolbar \"%1$s\" state set to %2$s"), + qstring_to_ucs4(windowTitle()), state)); +} + } // namespace frontend } // namespace lyx -#include "GuiToolbar_moc.cpp" +#include "moc_GuiToolbar.cpp"