projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9309338
)
add MenuBar toggle to ChatScene context menu
author
Daniel Albers
<daniel@lbers.com>
Sun, 17 Jan 2010 22:53:27 +0000
(23:53 +0100)
committer
Manuel Nickschas
<sputnick@quassel-irc.org>
Mon, 18 Jan 2010 19:47:23 +0000
(20:47 +0100)
src/qtui/chatscene.cpp
patch
|
blob
|
history
diff --git
a/src/qtui/chatscene.cpp
b/src/qtui/chatscene.cpp
index
5072e38
..
b748e1a
100644
(file)
--- a/
src/qtui/chatscene.cpp
+++ b/
src/qtui/chatscene.cpp
@@
-23,8
+23,15
@@
#include <QDrag>
#include <QGraphicsSceneMouseEvent>
#include <QMenu>
#include <QDrag>
#include <QGraphicsSceneMouseEvent>
#include <QMenu>
+#include <QMenuBar>
#include <QPersistentModelIndex>
#include <QPersistentModelIndex>
+#ifdef HAVE_KDE
+# include <KMenuBar>
+#else
+# include <QMenuBar>
+#endif
+
#ifdef HAVE_WEBKIT
# include <QWebView>
#endif
#ifdef HAVE_WEBKIT
# include <QWebView>
#endif
@@
-598,6
+605,9
@@
void ChatScene::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) {
// no item -> default scene actions
GraphicalUi::contextMenuActionProvider()->addActions(&menu, filter(), BufferId());
// no item -> default scene actions
GraphicalUi::contextMenuActionProvider()->addActions(&menu, filter(), BufferId());
+ if (QtUi::mainWindow()->menuBar()->isHidden())
+ menu.addAction(QtUi::actionCollection("General")->action("ToggleMenuBar"));
+
menu.exec(event->screenPos());
}
menu.exec(event->screenPos());
}