From fd330c283d8dbfed7fe377ddebb5f9fd8f2df705 Mon Sep 17 00:00:00 2001
From: Marek Marczykowski <marmarek@invisiblethingslab.com>
Date: Fri, 15 Feb 2013 16:06:54 +0100
Subject: [PATCH] Add menubar/toolbar context menu explicitly

Previously it was somehow automatically generated. Unfortunately it
caused SEGV in libQtCore (4.8).
---
 mainwindow.ui        |  6 ++++++
 qubesmanager/main.py | 11 +++++++++++
 2 files changed, 17 insertions(+)

diff --git a/mainwindow.ui b/mainwindow.ui
index 7fb3d26..31c16b0 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -232,6 +232,9 @@
      <height>22</height>
     </rect>
    </property>
+   <property name="contextMenuPolicy">
+    <enum>Qt::CustomContextMenu</enum>
+   </property>
    <widget class="QMenu" name="menu_system">
     <property name="title">
      <string>System</string>
@@ -324,6 +327,9 @@
    <property name="floatable">
     <bool>false</bool>
    </property>
+   <property name="contextMenuPolicy">
+    <enum>Qt::CustomContextMenu</enum>
+   </property>
    <attribute name="toolBarArea">
     <enum>TopToolBarArea</enum>
    </attribute>
diff --git a/qubesmanager/main.py b/qubesmanager/main.py
index f55b966..49ee907 100755
--- a/qubesmanager/main.py
+++ b/qubesmanager/main.py
@@ -785,10 +785,18 @@ class VmManagerWindow(Ui_VmManagerWindow, QMainWindow):
         self.context_menu.addMenu(self.logs_menu)
         self.context_menu.addSeparator()
 
+        self.tools_context_menu = QMenu(self)
+        self.tools_context_menu.addAction(self.action_toolbar)
+        self.tools_context_menu.addAction(self.action_menubar)
+
         self.table_selection_changed()
 
         self.connect(self.table.horizontalHeader(), SIGNAL("sortIndicatorChanged(int, Qt::SortOrder)"), self.sortIndicatorChanged)
         self.connect(self.table, SIGNAL("customContextMenuRequested(const QPoint&)"), self.open_context_menu)
+        self.connect(self.menubar, SIGNAL("customContextMenuRequested(const QPoint&)"),
+            lambda pos: self.open_tools_context_menu(self.menubar, pos))
+        self.connect(self.toolBar, SIGNAL("customContextMenuRequested(const QPoint&)"),
+            lambda pos: self.open_tools_context_menu(self.toolBar, pos))
         self.connect(self.blk_menu, SIGNAL("triggered(QAction *)"), self.attach_dettach_device_triggered)
         self.connect(self.logs_menu, SIGNAL("triggered(QAction *)"), self.show_log)
 
@@ -1649,6 +1657,9 @@ class VmManagerWindow(Ui_VmManagerWindow, QMainWindow):
         menu.addAction(self.action_menubar)
         return menu
 
+    def open_tools_context_menu(self, widget, point):
+        self.tools_context_menu.exec_(widget.mapToGlobal(point))
+
 
     @pyqtSlot('const QPoint&')
     def open_context_menu(self, point):