From 43d479375a08ddb69d460a0369c85d6a5fdc065b Mon Sep 17 00:00:00 2001
From: Agnieszka Kostrzewa <a.kostrzewa@alx.pl>
Date: Wed, 8 Feb 2012 19:02:35 +0100
Subject: [PATCH] Conext menu and shifted View menu in the main window.

---
 mainwindow.ui        | 33 ++++++++++++++++++---------------
 qubesmanager/main.py |  9 +++++++++
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/mainwindow.ui b/mainwindow.ui
index bd5bfb7..66a1b36 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -90,6 +90,9 @@
       <property name="lineWidth">
        <number>0</number>
       </property>
+      <property name="verticalScrollBarPolicy">
+       <enum>Qt::ScrollBarAlwaysOn</enum>
+      </property>
       <property name="alternatingRowColors">
        <bool>true</bool>
       </property>
@@ -230,21 +233,15 @@
     <property name="title">
      <string>View</string>
     </property>
-    <widget class="QMenu" name="menuColumns_visibility">
-     <property name="title">
-      <string>Columns visibility</string>
-     </property>
-     <addaction name="actionUpd"/>
-     <addaction name="actionTemplate"/>
-     <addaction name="actionNetVM"/>
-     <addaction name="actionCPU"/>
-     <addaction name="actionCPU_Graph"/>
-     <addaction name="actionMEM"/>
-     <addaction name="actionMEM_Graph"/>
-     <addaction name="actionUpdate_Info"/>
-     <addaction name="actionBlock_Devices"/>
-    </widget>
-    <addaction name="menuColumns_visibility"/>
+    <addaction name="actionUpd"/>
+    <addaction name="actionTemplate"/>
+    <addaction name="actionNetVM"/>
+    <addaction name="actionCPU"/>
+    <addaction name="actionCPU_Graph"/>
+    <addaction name="actionMEM"/>
+    <addaction name="actionMEM_Graph"/>
+    <addaction name="actionUpdate_Info"/>
+    <addaction name="actionBlock_Devices"/>
    </widget>
    <addaction name="menuOptions"/>
    <addaction name="menuView"/>
@@ -253,6 +250,9 @@
    <property name="windowTitle">
     <string>toolBar</string>
    </property>
+   <property name="allowedAreas">
+    <set>Qt::BottomToolBarArea|Qt::TopToolBarArea</set>
+   </property>
    <property name="floatable">
     <bool>false</bool>
    </property>
@@ -552,6 +552,9 @@
    <property name="checkable">
     <bool>true</bool>
    </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
    <property name="text">
     <string>Upd</string>
    </property>
diff --git a/qubesmanager/main.py b/qubesmanager/main.py
index 8a2f79e..e503c71 100755
--- a/qubesmanager/main.py
+++ b/qubesmanager/main.py
@@ -683,6 +683,15 @@ class VmManagerWindow(Ui_VmManagerWindow, QMainWindow):
 
         self.table.sortItems(self.columns_indices["MEM"], Qt.DescendingOrder)
 
+        self.table.addAction(self.action_settings)
+        self.table.addAction(self.action_removevm)
+        self.table.addAction(self.action_resumevm)
+        self.table.addAction(self.action_pausevm)
+        self.table.addAction(self.action_shutdownvm)
+        self.table.addAction(self.action_appmenus)
+        self.table.addAction(self.action_editfwrules)
+        self.table.addAction(self.action_updatevm)
+
         self.table.setContentsMargins(0,0,0,0)
         self.centralwidget.layout().setContentsMargins(0,0,0,0)
         self.layout().setContentsMargins(0,0,0,0)