From db2c96f511636af15a6a967ac923d744875b146a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20P=C3=B6nitz?= Date: Fri, 28 Sep 2007 23:14:33 +0000 Subject: [PATCH] cosmetics git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20573 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/Action.cpp | 49 +++++++++--------------------- src/frontends/qt4/Action.h | 22 +++++--------- src/frontends/qt4/GuiPopupMenu.cpp | 14 +++------ src/frontends/qt4/GuiToolbar.cpp | 5 +-- 4 files changed, 31 insertions(+), 59 deletions(-) diff --git a/src/frontends/qt4/Action.cpp b/src/frontends/qt4/Action.cpp index 26d9bd6ec3..683f073165 100644 --- a/src/frontends/qt4/Action.cpp +++ b/src/frontends/qt4/Action.cpp @@ -12,58 +12,39 @@ #include "Action.h" -#include "GuiView.h" -#include "qt_helpers.h" +#include "frontends/LyXView.h" #include "callback.h" -#include "LyXFunc.h" -#include "FuncStatus.h" #include "debug.h" +#include "FuncRequest.h" +#include "FuncStatus.h" +#include "GuiView.h" +#include "LyXFunc.h" +#include "qt_helpers.h" #include "support/lstrings.h" -#include - -using std::string; -using std::endl; - namespace lyx { namespace frontend { -Action::Action(GuiViewBase & lyxView, docstring const & text, - FuncRequest const & func, docstring const & tooltip) +Action::Action(GuiViewBase & lyxView, QString const & icon, + QString const & text, FuncRequest const & func, + QString const & tooltip) : QAction(&lyxView), func_(func), lyxView_(lyxView) { #if QT_VERSION >= 0x040200 // only Qt/Mac handles that setMenuRole(NoRole); #endif - setText(toqstr(text)); - setToolTip(toqstr(tooltip)); - setStatusTip(toqstr(tooltip)); + setIcon(QPixmap(icon)); + setText(text); + setToolTip(tooltip); + setStatusTip(tooltip); connect(this, SIGNAL(triggered()), this, SLOT(action())); update(); } -Action::Action(GuiViewBase & lyxView, string const & icon, docstring const & text, - FuncRequest const & func, docstring const & tooltip) - : QAction(&lyxView), func_(func), lyxView_(lyxView) -{ - setIcon(QPixmap(icon.c_str())); - setText(toqstr(text)); - setToolTip(toqstr(tooltip)); - setStatusTip(toqstr(tooltip)); - connect(this, SIGNAL(triggered()), this, SLOT(action())); - update(); -} - -/* -void Action::setAction(FuncRequest const & func) -{ - func_=func; -} -*/ void Action::update() { @@ -85,8 +66,8 @@ void Action::update() void Action::action() { -// LYXERR(Debug::ACTION) << "calling LyXFunc::dispatch: func_: " << func_ << endl; - + // LYXERR(Debug::ACTION) << "calling LyXFunc::dispatch: func_: " + // "\n"; lyxView_.dispatch(func_); triggered(this); } diff --git a/src/frontends/qt4/Action.h b/src/frontends/qt4/Action.h index 79bf2b5ff0..ecefbfe958 100644 --- a/src/frontends/qt4/Action.h +++ b/src/frontends/qt4/Action.h @@ -12,14 +12,12 @@ #ifndef ACTION_H #define ACTION_H -#include "frontends/LyXView.h" -#include "FuncRequest.h" - -#include "support/docstring.h" - #include namespace lyx { + +class FuncRequest; + namespace frontend { class GuiViewBase; @@ -29,20 +27,16 @@ class GuiViewBase; * * Action can be used in LyX menubar and/or toolbars. */ -class Action : public QAction { +class Action : public QAction +{ Q_OBJECT -public: - - Action(GuiViewBase & lyxView, docstring const & text, - FuncRequest const & func, docstring const & tooltip = docstring()); - Action(GuiViewBase & lyxView, std::string const & icon, docstring const & text, - FuncRequest const & func, docstring const & tooltip = docstring()); +public: + Action(GuiViewBase & lyxView, QString const & icon, QString const & text, + FuncRequest const & func, QString const & tooltip); void update(); -// void setAction(FuncRequest const & func); - Q_SIGNALS: /// the current action is triggered void triggered(QAction *); diff --git a/src/frontends/qt4/GuiPopupMenu.cpp b/src/frontends/qt4/GuiPopupMenu.cpp index b03110eeca..1c2c104fc3 100644 --- a/src/frontends/qt4/GuiPopupMenu.cpp +++ b/src/frontends/qt4/GuiPopupMenu.cpp @@ -11,8 +11,6 @@ #include -// Qt defines a macro 'signals' that clashes with a boost namespace. -// All is well if the namespace is visible first. #include "GuiView.h" #include "Action.h" @@ -35,8 +33,8 @@ using std::endl; namespace lyx { namespace frontend { -GuiPopupMenu::GuiPopupMenu(GuiMenubar * owner, - MenuItem const & mi, bool topLevelMenu) +GuiPopupMenu::GuiPopupMenu(GuiMenubar * owner, MenuItem const & mi, + bool topLevelMenu) : owner_(owner) { name_ = mi.submenuname(); @@ -74,15 +72,13 @@ void GuiPopupMenu::updateView() void GuiPopupMenu::populate(QMenu * qMenu, Menu * menu) { - LYXERR(Debug::GUI) << "populating menu " << to_utf8(menu->name()) ; + LYXERR(Debug::GUI) << "populating menu " << to_utf8(menu->name()); if (menu->size() == 0) { LYXERR(Debug::GUI) << "\tERROR: empty menu " << to_utf8(menu->name()) << endl; return; } - else { - LYXERR(Debug::GUI) << " ***** menu entries " << menu->size() << endl; - } + LYXERR(Debug::GUI) << " ***** menu entries " << menu->size() << endl; Menu::const_iterator m = menu->begin(); Menu::const_iterator end = menu->end(); @@ -110,7 +106,7 @@ void GuiPopupMenu::populate(QMenu * qMenu, Menu * menu) addBinding(label, *m); Action * action = new Action(*(owner_->view()), - label, m->func()); + QString(), toqstr(label), m->func(), QString()); qMenu->addAction(action); } } diff --git a/src/frontends/qt4/GuiToolbar.cpp b/src/frontends/qt4/GuiToolbar.cpp index cd5c584229..44bddb9070 100644 --- a/src/frontends/qt4/GuiToolbar.cpp +++ b/src/frontends/qt4/GuiToolbar.cpp @@ -191,8 +191,9 @@ void GuiToolbar::focusCommandBuffer() Action * GuiToolbar::addItem(ToolbarItem const & item) { - Action * act = new Action(owner_, getIcon(item.func_, false), - item.label_, item.func_, item.label_); + Action * act = new Action(owner_, + getIcon(item.func_, false).c_str(), + toqstr(item.label_), item.func_, toqstr(item.label_)); actions_.append(act); return act; } -- 2.39.2