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

Merge remote-tracking branch 'origin/pr/272'

Browse Source 
* origin/pr/272:
  Save 'compactview' state
  Added 'Compact View' Action
This commit is contained in:
Marek Marczykowski-Górecki 2020-12-10 05:17:52 +01:00
commit 3d1ff3e58d
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qubesmanager/qube_manager.py
View File

@ -706,6 +706,7 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QMainWindow):
lambda pos: self.open_tools_context_menu(self.toolbar, pos)) lambda pos: self.open_tools_context_menu(self.toolbar, pos))
self.action_menubar.toggled.connect(self.showhide_menubar) self.action_menubar.toggled.connect(self.showhide_menubar)
self.action_toolbar.toggled.connect(self.showhide_toolbar) self.action_toolbar.toggled.connect(self.showhide_toolbar)
self.action_compact_view.toggled.connect(self.set_compactview)
self.logs_menu.triggered.connect(self.show_log) self.logs_menu.triggered.connect(self.show_log)
self.table.resizeColumnsToContents() self.table.resizeColumnsToContents()
@ -752,6 +753,8 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QMainWindow):
self.menu_view.addSeparator() self.menu_view.addSeparator()
self.menu_view.addAction(self.action_toolbar) self.menu_view.addAction(self.action_toolbar)
self.menu_view.addAction(self.action_menubar) self.menu_view.addAction(self.action_menubar)
self.menu_view.addSeparator()
self.menu_view.addAction(self.action_compact_view)
try: try:
self.load_manager_settings() self.load_manager_settings()
@ -997,6 +1000,9 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QMainWindow):
if not self.manager_settings.value("view/toolbar_visible", if not self.manager_settings.value("view/toolbar_visible",
defaultValue=True): defaultValue=True):
self.action_toolbar.setChecked(False) self.action_toolbar.setChecked(False)
if self.manager_settings.value("view/compactview",
defaultValue="false") != "false":
self.action_compact_view.setChecked(True)
# Restore show checkboxes # Restore show checkboxes
self.show_running.setChecked(self.manager_settings.value( self.show_running.setChecked(self.manager_settings.value(
@ -1457,6 +1463,14 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QMainWindow):
def action_exit_triggered(self): def action_exit_triggered(self):
self.close() self.close()
def set_compactview(self, checked):
if checked:
self.toolbar.setToolButtonStyle(Qt.ToolButtonIconOnly)
else:
self.toolbar.setToolButtonStyle(Qt.ToolButtonTextUnderIcon)
if self.settings_loaded:
self.manager_settings.setValue('view/compactview', checked)
def showhide_menubar(self, checked): def showhide_menubar(self, checked):
self.menubar.setVisible(checked) self.menubar.setVisible(checked)
if not checked: if not checked:

8
ui/qubemanager.ui
View File

@ -949,6 +949,14 @@ Template</string>
<string>Open a secure Xen console in the qube. Useful chiefly for debugging purposes: for normal operation, use &quot;Run Terminal&quot; from the Domains widget. </string> <string>Open a secure Xen console in the qube. Useful chiefly for debugging purposes: for normal operation, use &quot;Run Terminal&quot; from the Domains widget. </string>
</property> </property>
</action> </action>
<action name="action_compact_view">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Compact View</string>
</property>
</action>
</widget> </widget>
<resources> <resources>
<include location="../resources.qrc"/> <include location="../resources.qrc"/>