Qubes/manager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Show menu/tool bar options in context menu when menu/tool bar hidden. ( part of #455)

Browse Source
This commit is contained in:
Agnieszka Kostrzewa 2012-03-20 18:36:48 +01:00
parent de8028b268
commit 7f69338992
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
qubesmanager/main.py
View File

@ -549,6 +549,7 @@ class VmManagerWindow(Ui_VmManagerWindow, QMainWindow):
self.blk_menu = QMenu("Block devices") self.blk_menu = QMenu("Block devices")
self.context_menu.addMenu(self.blk_menu) self.context_menu.addMenu(self.blk_menu)
self.context_menu.addSeparator()
self.connect(self.table.horizontalHeader(), SIGNAL("sortIndicatorChanged(int, Qt::SortOrder)"), self.sortIndicatorChanged) 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.table, SIGNAL("customContextMenuRequested(const QPoint&)"), self.open_context_menu)
@ -558,10 +559,10 @@ class VmManagerWindow(Ui_VmManagerWindow, QMainWindow):
self.centralwidget.layout().setContentsMargins(0,0,0,0) self.centralwidget.layout().setContentsMargins(0,0,0,0)
self.layout().setContentsMargins(0,0,0,0) self.layout().setContentsMargins(0,0,0,0)
self.action_toolbar = QAction("tool bar", None) self.action_toolbar = QAction("Show tool bar", None)
self.action_toolbar.setCheckable(True) self.action_toolbar.setCheckable(True)
self.action_toolbar.setChecked(True) self.action_toolbar.setChecked(True)
self.action_menubar = QAction("menu bar", None) self.action_menubar = QAction("Show menu bar", None)
self.action_menubar.setCheckable(True) self.action_menubar.setCheckable(True)
self.action_menubar.setChecked(True) self.action_menubar.setChecked(True)
@ -605,11 +606,7 @@ class VmManagerWindow(Ui_VmManagerWindow, QMainWindow):
mainwindow_to_add += self.menubar.height() + self.menubar.contentsMargins().top() + self.menubar.contentsMargins().bottom() mainwindow_to_add += self.menubar.height() + self.menubar.contentsMargins().top() + self.menubar.contentsMargins().bottom()
if self.toolbar.isVisible(): if self.toolbar.isVisible():
mainwindow_to_add += self.toolbar.height() + self.toolbar.contentsMargins().top() + self.toolbar.contentsMargins().bottom() mainwindow_to_add += self.toolbar.height() + self.toolbar.contentsMargins().top() + self.toolbar.contentsMargins().bottom()
# in case both toolbar and menubar are hidden there must be an option to get them back
if mainwindow_to_add == 0:
mainwindow_to_add = 10
maxH += mainwindow_to_add maxH += mainwindow_to_add
minH += mainwindow_to_add minH += mainwindow_to_add
@ -1137,10 +1134,19 @@ class VmManagerWindow(Ui_VmManagerWindow, QMainWindow):
def showhide_menubar(self, checked): def showhide_menubar(self, checked):
self.menuWidget().setVisible(checked) self.menuWidget().setVisible(checked)
self.set_table_geom_height() self.set_table_geom_height()
if not checked:
self.context_menu.addAction(self.action_menubar)
else:
self.context_menu.removeAction(self.action_menubar)
def showhide_toolbar(self, checked): def showhide_toolbar(self, checked):
self.toolbar.setVisible(checked) self.toolbar.setVisible(checked)
self.set_table_geom_height() self.set_table_geom_height()
if not checked:
self.context_menu.addAction(self.action_toolbar)
else:
self.context_menu.removeAction(self.action_toolbar)
def showhide_collumn(self, col_num, show): def showhide_collumn(self, col_num, show):