From 0bb92311bafb519af71584f275d16d51a384267a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marta=20Marczykowska-G=C3=B3recka?=
 <marta.maria.gorecka@gmail.com>
Date: Tue, 30 Apr 2019 16:24:30 +0200
Subject: [PATCH] Fixed bug with hiding last visible column

Removed old buggy code, replaced it with disabling hiding the 'name'
column (because manager is useless without VM name).
---
 qubesmanager/qube_manager.py | 31 ++++++++-----------------------
 ui/qubemanager.ui            |  1 -
 2 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/qubesmanager/qube_manager.py b/qubesmanager/qube_manager.py
index 9ca7802d..a824b67f 100644
--- a/qubesmanager/qube_manager.py
+++ b/qubesmanager/qube_manager.py
@@ -604,15 +604,16 @@ def on_domain_changed(self, vm, event, **_kwargs):
             return  # the VM was deleted before its status could be updated
 
     def load_manager_settings(self):
-        # visible columns
-        self.visible_columns_count = 0
         for col in self.columns_indices:
             col_no = self.columns_indices[col]
-            visible = self.manager_settings.value(
-                'columns/%s' % col,
-                defaultValue="true")
-            self.columns_actions[col_no].setChecked(visible == "true")
-            self.visible_columns_count += 1
+            if col == 'Name':
+                # 'Name' column should be always visible
+                self.columns_actions[col_no].setChecked(True)
+            else:
+                visible = self.manager_settings.value(
+                    'columns/%s' % col,
+                    defaultValue="true")
+                self.columns_actions[col_no].setChecked(visible == "true")
 
         self.sort_by_column = str(
             self.manager_settings.value("view/sort_column",
@@ -1161,22 +1162,6 @@ def showhide_toolbar(self, checked):
     def showhide_column(self, col_num, show):
         self.table.setColumnHidden(col_num, not show)
 
-        val = 1 if show else -1
-        self.visible_columns_count += val
-
-        if self.visible_columns_count == 1:
-            # disable hiding the last one
-            for col in self.columns_actions:
-                if self.columns_actions[col].isChecked():
-                    self.columns_actions[col].setEnabled(False)
-                    break
-        elif self.visible_columns_count == 2 and val == 1:
-            # enable hiding previously disabled column
-            for col in self.columns_actions:
-                if not self.columns_actions[col].isEnabled():
-                    self.columns_actions[col].setEnabled(True)
-                    break
-
         if self.settings_loaded:
             col_name = [name for name in self.columns_indices if
                         self.columns_indices[name] == col_num][0]
diff --git a/ui/qubemanager.ui b/ui/qubemanager.ui
index e234aac3..3fbcea18 100644
--- a/ui/qubemanager.ui
+++ b/ui/qubemanager.ui
@@ -281,7 +281,6 @@ DisposableVMs</string>
     </property>
     <addaction name="action_vm_type"/>
     <addaction name="action_label"/>
-    <addaction name="action_name"/>
     <addaction name="action_state"/>
     <addaction name="action_template"/>
     <addaction name="action_netvm"/>