diff --git a/src/Gui/Action.cpp b/src/Gui/Action.cpp
index da43f8ffca..965f9ba7bb 100644
--- a/src/Gui/Action.cpp
+++ b/src/Gui/Action.cpp
@@ -57,6 +57,7 @@
#include "WhatsThis.h"
#include "Widgets.h"
#include "Workbench.h"
+#include "ShortcutManager.h"
using namespace Gui;
@@ -149,6 +150,11 @@ void Action::setEnabled(bool b)
_action->setEnabled(b);
}
+bool Action::isEnabled() const
+{
+ return _action->isEnabled();
+}
+
void Action::setVisible(bool b)
{
_action->setVisible(b);
@@ -157,6 +163,7 @@ void Action::setVisible(bool b)
void Action::setShortcut(const QString & key)
{
_action->setShortcut(key);
+ setToolTip(_tooltip, _title);
}
QKeySequence Action::shortcut() const
@@ -187,6 +194,8 @@ QString Action::statusTip() const
void Action::setText(const QString & s)
{
_action->setText(s);
+ if (_title.isEmpty())
+ setToolTip(_tooltip);
}
QString Action::text() const
@@ -194,14 +203,112 @@ QString Action::text() const
return _action->text();
}
-void Action::setToolTip(const QString & s)
+void Action::setToolTip(const QString & s, const QString & title)
{
- _action->setToolTip(s);
+ _tooltip = s;
+ _title = title;
+ _action->setToolTip(createToolTip(s,
+ title.isEmpty() ? _action->text() : title,
+ _action->font(),
+ _action->shortcut().toString(QKeySequence::NativeText),
+ this));
+}
+
+QString Action::createToolTip(QString _tooltip,
+ const QString & title,
+ const QFont &font,
+ const QString &sc,
+ Action *act)
+{
+ QString text = title;
+ text.remove(QLatin1Char('&'));;
+ while(text.size() && text[text.size()-1].isPunct())
+ text.resize(text.size()-1);
+
+ if (text.isEmpty())
+ return _tooltip;
+
+ // The following code tries to make a more useful tooltip by inserting at
+ // the beginning of the tooltip the action title in bold followed by the
+ // shortcut.
+ //
+ // The long winding code is to deal with the fact that Qt will auto wrap
+ // a rich text tooltip but the width is too short. We can escape the auto
+ // wrappin using .
+
+ QString shortcut = sc;
+ if (shortcut.size() && _tooltip.endsWith(shortcut))
+ _tooltip.resize(_tooltip.size() - shortcut.size());
+ if (shortcut.size())
+ shortcut = QString::fromLatin1(" (%1)").arg(shortcut);
+
+ QString tooltip = QString::fromLatin1(
+ "
%1%2
").arg(
+ text.toHtmlEscaped(), shortcut.toHtmlEscaped());
+
+ QString cmdName;
+ auto pcCmd = act ? act->_pcCmd : nullptr;
+ if (pcCmd && pcCmd->getName()) {
+ cmdName = QString::fromLatin1(pcCmd->getName());
+ if (auto groupcmd = dynamic_cast(pcCmd)) {
+ int idx = act->property("defaultAction").toInt();
+ auto cmd = groupcmd->getCommand(idx);
+ if (cmd && cmd->getName())
+ cmdName = QStringLiteral("%1 (%2:%3)")
+ .arg(QString::fromLatin1(cmd->getName()))
+ .arg(cmdName)
+ .arg(idx);
+ }
+ cmdName = QStringLiteral("%1
")
+ .arg(cmdName.toHtmlEscaped());
+ }
+
+ if (shortcut.size() && _tooltip.endsWith(shortcut))
+ _tooltip.resize(_tooltip.size() - shortcut.size());
+
+ if (_tooltip.isEmpty()
+ || _tooltip == text
+ || _tooltip == title)
+ {
+ return tooltip + cmdName;
+ }
+ if (Qt::mightBeRichText(_tooltip)) {
+ // already rich text, so let it be to avoid duplicated unwrapping
+ return tooltip + _tooltip + cmdName;
+ }
+
+ tooltip += QString::fromLatin1(
+ "");
+
+ // If the user supplied tooltip contains line break, we shall honour it.
+ if (_tooltip.indexOf(QLatin1Char('\n')) >= 0)
+ tooltip += _tooltip.toHtmlEscaped() + QString::fromLatin1("
") ;
+ else {
+ // If not, try to end the non wrapping paragraph at some pre defined
+ // width, so that the following text can wrap at that width.
+ float tipWidth = 400;
+ QFontMetrics fm(font);
+ int width = fm.width(_tooltip);
+ if (width <= tipWidth)
+ tooltip += _tooltip.toHtmlEscaped() + QString::fromLatin1("") ;
+ else {
+ int index = tipWidth / width * _tooltip.size();
+ // Try to only break at white space
+ for(int i=0; i<50 && index<_tooltip.size(); ++i, ++index) {
+ if (_tooltip[index] == QLatin1Char(' '))
+ break;
+ }
+ tooltip += _tooltip.left(index).toHtmlEscaped()
+ + QString::fromLatin1("")
+ + _tooltip.right(_tooltip.size()-index).trimmed().toHtmlEscaped();
+ }
+ }
+ return tooltip + cmdName;
}
QString Action::toolTip() const
{
- return _action->toolTip();
+ return _tooltip;
}
void Action::setWhatsThis(const QString & s)
@@ -533,7 +640,7 @@ void WorkbenchGroup::addTo(QWidget *w)
auto setupBox = [&](QComboBox* box) {
box->setIconSize(QSize(16, 16));
- box->setToolTip(_action->toolTip());
+ box->setToolTip(_tooltip);
box->setStatusTip(_action->statusTip());
box->setWhatsThis(_action->whatsThis());
box->addActions(_group->actions());
@@ -1244,4 +1351,206 @@ void WindowAction::addTo ( QWidget * w )
}
}
+// --------------------------------------------------------------------
+
+struct CmdInfo {
+ Command *cmd = nullptr;
+ QString text;
+ QString tooltip;
+ QIcon icon;
+ bool iconChecked = false;
+};
+static std::vector _Commands;
+static int _CommandRevision;
+
+class CommandModel : public QAbstractItemModel
+{
+public:
+
+public:
+ CommandModel(QObject* parent)
+ : QAbstractItemModel(parent)
+ {
+ update();
+ }
+
+ void update()
+ {
+ auto &manager = Application::Instance->commandManager();
+ if (_CommandRevision == manager.getRevision())
+ return;
+ beginResetModel();
+ _CommandRevision = manager.getRevision();
+ _Commands.clear();
+ for (auto &v : manager.getCommands()) {
+ _Commands.emplace_back();
+ auto &info = _Commands.back();
+ info.cmd = v.second;
+ }
+ endResetModel();
+ }
+
+ virtual QModelIndex parent(const QModelIndex &) const
+ {
+ return QModelIndex();
+ }
+
+ virtual QVariant data(const QModelIndex & index, int role) const
+ {
+ if (index.row() < 0 || index.row() >= (int)_Commands.size())
+ return QVariant();
+
+ auto &info = _Commands[index.row()];
+
+ switch(role) {
+ case Qt::DisplayRole:
+ case Qt::EditRole:
+ if (info.text.isEmpty()) {
+#if QT_VERSION>=QT_VERSION_CHECK(5,2,0)
+ info.text = QString::fromLatin1("%2 (%1)").arg(
+ QString::fromLatin1(info.cmd->getName()),
+ qApp->translate(info.cmd->className(), info.cmd->getMenuText()));
+#else
+ info.text = qApp->translate(info.cmd->className(), info.cmd->getMenuText());
+#endif
+ info.text.replace(QLatin1Char('&'), QString());
+ if (info.text.isEmpty())
+ info.text = QString::fromLatin1(info.cmd->getName());
+ }
+ return info.text;
+
+ case Qt::DecorationRole:
+ if (!info.iconChecked) {
+ info.iconChecked = true;
+ if(info.cmd->getPixmap())
+ info.icon = BitmapFactory().iconFromTheme(info.cmd->getPixmap());
+ }
+ return info.icon;
+
+ case Qt::ToolTipRole:
+ if (info.tooltip.isEmpty()) {
+ info.tooltip = QString::fromLatin1("%1: %2").arg(
+ QString::fromLatin1(info.cmd->getName()),
+ qApp->translate(info.cmd->className(), info.cmd->getMenuText()));
+ QString tooltip = qApp->translate(info.cmd->className(), info.cmd->getToolTipText());
+ if (tooltip.size())
+ info.tooltip += QString::fromLatin1("\n\n") + tooltip;
+ }
+ return info.tooltip;
+
+ case Qt::UserRole:
+ return QByteArray(info.cmd->getName());
+
+ default:
+ return QVariant();
+ }
+ }
+
+ virtual QModelIndex index(int row, int, const QModelIndex &) const
+ {
+ return this->createIndex(row, 0);
+ }
+
+ virtual int rowCount(const QModelIndex &) const
+ {
+ return (int)(_Commands.size());
+ }
+
+ virtual int columnCount(const QModelIndex &) const
+ {
+ return 1;
+ }
+};
+
+
+// --------------------------------------------------------------------
+
+CommandCompleter::CommandCompleter(QLineEdit *lineedit, QObject *parent)
+ : QCompleter(parent)
+{
+ this->setModel(new CommandModel(this));
+#if QT_VERSION>=QT_VERSION_CHECK(5,2,0)
+ this->setFilterMode(Qt::MatchContains);
+#endif
+ this->setCaseSensitivity(Qt::CaseInsensitive);
+ this->setCompletionMode(QCompleter::PopupCompletion);
+ this->setWidget(lineedit);
+ connect(lineedit, SIGNAL(textEdited(QString)), this, SLOT(onTextChanged(QString)));
+ connect(this, SIGNAL(activated(QModelIndex)), this, SLOT(onCommandActivated(QModelIndex)));
+ connect(this, SIGNAL(highlighted(QString)), lineedit, SLOT(setText(QString)));
+}
+
+bool CommandCompleter::eventFilter(QObject *o, QEvent *ev)
+{
+ if (ev->type() == QEvent::KeyPress
+ && (o == this->widget() || o == this->popup()))
+ {
+ QKeyEvent * ke = static_cast(ev);
+ switch(ke->key()) {
+ case Qt::Key_Escape: {
+ auto edit = qobject_cast(this->widget());
+ if (edit && edit->text().size()) {
+ edit->setText(QString());
+ popup()->hide();
+ return true;
+ } else if (popup()->isVisible()) {
+ popup()->hide();
+ return true;
+ }
+ break;
+ }
+ case Qt::Key_Tab: {
+ if (this->popup()->isVisible()) {
+ QKeyEvent kevent(ke->type(),Qt::Key_Down,0);
+ qApp->sendEvent(this->popup(), &kevent);
+ return true;
+ }
+ break;
+ }
+ case Qt::Key_Backtab: {
+ if (this->popup()->isVisible()) {
+ QKeyEvent kevent(ke->type(),Qt::Key_Up,0);
+ qApp->sendEvent(this->popup(), &kevent);
+ return true;
+ }
+ break;
+ }
+ case Qt::Key_Enter:
+ case Qt::Key_Return:
+ if (o == this->widget()) {
+ auto index = currentIndex();
+ if (index.isValid())
+ onCommandActivated(index);
+ else
+ complete();
+ ev->setAccepted(true);
+ return true;
+ }
+ default:
+ break;
+ }
+ }
+ return QCompleter::eventFilter(o, ev);
+}
+
+void CommandCompleter::onCommandActivated(const QModelIndex &index)
+{
+ QByteArray name = completionModel()->data(index, Qt::UserRole).toByteArray();
+ Q_EMIT commandActivated(name);
+}
+
+void CommandCompleter::onTextChanged(const QString &txt)
+{
+ if (txt.size() < 3 || !widget())
+ return;
+
+ static_cast(this->model())->update();
+
+ this->setCompletionPrefix(txt);
+ QRect rect = widget()->rect();
+ if (rect.width() < 300)
+ rect.setWidth(300);
+ this->complete(rect);
+}
+
#include "moc_Action.cpp"
diff --git a/src/Gui/Action.h b/src/Gui/Action.h
index 6a6be0c5a0..a9ec0b359d 100644
--- a/src/Gui/Action.h
+++ b/src/Gui/Action.h
@@ -28,6 +28,7 @@
#include
#include
#include
+#include
namespace Gui
{
@@ -57,6 +58,7 @@ public:
void setCheckable(bool);
void setChecked (bool, bool no_signal=false);
bool isChecked() const;
+ bool isEnabled() const;
void setShortcut (const QString &);
QKeySequence shortcut() const;
@@ -66,7 +68,7 @@ public:
QString statusTip() const;
void setText (const QString &);
QString text() const;
- void setToolTip (const QString &);
+ void setToolTip (const QString &, const QString &title = QString());
QString toolTip() const;
void setWhatsThis (const QString &);
QString whatsThis() const;
@@ -75,6 +77,16 @@ public:
return _action;
}
+ static QString createToolTip(QString tooltip,
+ const QString &title,
+ const QFont &font,
+ const QString &shortcut,
+ Action *action = nullptr);
+
+ Command *command() const {
+ return _pcCmd;
+ }
+
public Q_SLOTS:
virtual void onActivated ();
virtual void onToggled (bool);
@@ -82,6 +94,8 @@ public Q_SLOTS:
protected:
QAction* _action;
Command *_pcCmd;
+ QString _tooltip;
+ QString _title;
};
// --------------------------------------------------------------------
@@ -357,6 +371,26 @@ private:
QMenu* _menu;
};
+/**
+ * Command name completer.
+ */
+class GuiExport CommandCompleter : public QCompleter
+{
+ Q_OBJECT
+public:
+ CommandCompleter(QLineEdit *edit, QObject *parent = nullptr);
+
+Q_SIGNALS:
+ void commandActivated(const QByteArray &name);
+
+protected Q_SLOTS:
+ void onTextChanged(const QString &);
+ void onCommandActivated(const QModelIndex &);
+
+protected:
+ bool eventFilter(QObject *, QEvent *ev);
+};
+
} // namespace Gui
#endif // GUI_ACTION_H
diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt
index 2c23b7e7bb..68b07a0044 100644
--- a/src/Gui/CMakeLists.txt
+++ b/src/Gui/CMakeLists.txt
@@ -384,6 +384,7 @@ SET(Command_CPP_SRCS
CommandStructure.cpp
CommandLink.cpp
CommandPyImp.cpp
+ ShortcutManager.cpp
)
SET(Command_SRCS
${Command_CPP_SRCS}
@@ -391,6 +392,7 @@ SET(Command_SRCS
ActionFunction.h
Command.h
CommandT.h
+ ShortcutManager.h
)
SOURCE_GROUP("Command" FILES ${Command_SRCS})
diff --git a/src/Gui/Command.cpp b/src/Gui/Command.cpp
index dd7e9b780d..34c4d40c66 100644
--- a/src/Gui/Command.cpp
+++ b/src/Gui/Command.cpp
@@ -64,6 +64,7 @@
#include "WhatsThis.h"
#include "WorkbenchManager.h"
#include "Workbench.h"
+#include "ShortcutManager.h"
FC_LOG_LEVEL_INIT("Command", true, true)
@@ -161,6 +162,11 @@ CommandBase::~CommandBase()
//Note: The Action object becomes a children of MainWindow which gets destroyed _before_ the
//command manager hence before any command object. So the action pointer is a dangling pointer
//at this state.
+
+ // Command can be destroyed before the the MainWindow, for example, dynamic
+ // command created (and later deleted) by user for a pie menu.
+ if (getMainWindow())
+ delete _pcAction;
}
Action* CommandBase::getAction() const
@@ -226,6 +232,19 @@ Command::~Command()
{
}
+void Command::setShortcut(const QString &shortcut)
+{
+ if (_pcAction)
+ _pcAction->setShortcut(shortcut);
+}
+
+QString Command::getShortcut() const
+{
+ if (_pcAction)
+ return _pcAction->shortcut().toString();
+ return ShortcutManager::instance()->getShortcut(getName());
+}
+
bool Command::isViewOfType(Base::Type t) const
{
Gui::Document *d = getGuiApplication()->activeDocument();
@@ -244,6 +263,12 @@ void Command::addTo(QWidget *pcWidget)
{
if (!_pcAction) {
_pcAction = createAction();
+#ifdef FC_DEBUG
+ // Accelerator conflict can now be dynamically resolved in ShortcutManager
+ //
+ // printConflictingAccelerators();
+#endif
+ setShortcut(ShortcutManager::instance()->getShortcut(getName(), getAccel()));
testActive();
}
@@ -260,6 +285,12 @@ void Command::addToGroup(ActionGroup* group)
{
if (!_pcAction) {
_pcAction = createAction();
+#ifdef FC_DEBUG
+ // Accelerator conflict can now be dynamically resolved in ShortcutManager
+ //
+ // printConflictingAccelerators();
+#endif
+ setShortcut(ShortcutManager::instance()->getShortcut(getName(), getAccel()));
testActive();
}
group->addAction(_pcAction->findChild());
@@ -869,37 +900,14 @@ const char * Command::endCmdHelp()
return "