projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Finalizing changes to the identities interface -> breaking protocol
[quassel.git]
/
src
/
uisupport
/
action.cpp
diff --git
a/src/uisupport/action.cpp
b/src/uisupport/action.cpp
index
700cce5
..
f160ac4
100644
(file)
--- a/
src/uisupport/action.cpp
+++ b/
src/uisupport/action.cpp
@@
-28,15
+28,23
@@
Action::Action(QObject *parent) : QWidgetAction(parent) {
init();
}
init();
}
-Action::Action(const QString &text, QObject *parent) : QWidgetAction(parent) {
+Action::Action(const QString &text, QObject *parent, const QObject *receiver, const char *slot, const QKeySequence &shortcut)
+: QWidgetAction(parent) {
init();
setText(text);
init();
setText(text);
+ setShortcut(shortcut);
+ if(receiver && slot)
+ connect(this, SIGNAL(triggered()), receiver, slot);
}
}
-Action::Action(const QIcon &icon, const QString &text, QObject *parent) : QWidgetAction(parent) {
+Action::Action(const QIcon &icon, const QString &text, QObject *parent, const QObject *receiver, const char *slot, const QKeySequence &shortcut)
+: QWidgetAction(parent) {
init();
setIcon(icon);
setText(text);
init();
setIcon(icon);
setText(text);
+ setShortcut(shortcut);
+ if(receiver && slot)
+ connect(this, SIGNAL(triggered()), receiver, slot);
}
void Action::init() {
}
void Action::init() {