From 3784864e10029b6d2a211526098934b4ba89b818 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Sat, 13 Apr 2019 17:03:16 -0400
Subject: [PATCH] baseclass: Add is_visible

Remove the duplicated implementations everywhere
---
 virtManager/addhardware.py   | 5 +----
 virtManager/baseclass.py     | 3 +++
 virtManager/connect.py       | 2 +-
 virtManager/console.py       | 6 ------
 virtManager/create.py        | 3 ---
 virtManager/details.py       | 3 ---
 virtManager/host.py          | 3 ---
 virtManager/manager.py       | 4 +---
 virtManager/oslist.py        | 2 +-
 virtManager/storagebrowse.py | 2 +-
 10 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/virtManager/addhardware.py b/virtManager/addhardware.py
index 6d1f7cce..85dc34ee 100644
--- a/virtManager/addhardware.py
+++ b/virtManager/addhardware.py
@@ -131,7 +131,7 @@ class vmmAddHardware(vmmGObjectUI):
                                          pollnodedev=True)
 
     def close(self, ignore1=None, ignore2=None):
-        if self.topwin.is_visible():
+        if self.is_visible():
             logging.debug("Closing addhw")
             self.topwin.hide()
         if self._storagebrowser:
@@ -159,9 +159,6 @@ class vmmAddHardware(vmmGObjectUI):
         self._vsockdetails.cleanup()
         self._vsockdetails = None
 
-    def is_visible(self):
-        return self.topwin.get_visible()
-
 
     ##########################
     # Initialization methods #
diff --git a/virtManager/baseclass.py b/virtManager/baseclass.py
index c26264af..07bdeccc 100644
--- a/virtManager/baseclass.py
+++ b/virtManager/baseclass.py
@@ -321,6 +321,9 @@ class vmmGObjectUI(vmmGObject):
     def close(self, ignore1=None, ignore2=None):
         pass
 
+    def is_visible(self):
+        return bool(self.topwin and self.topwin.get_visible())
+
     def bind_escape_key_close(self):
         self.bind_escape_key_close_helper(self.topwin, self.close)
 
diff --git a/virtManager/connect.py b/virtManager/connect.py
index c4df00f5..a46a05e7 100644
--- a/virtManager/connect.py
+++ b/virtManager/connect.py
@@ -88,7 +88,7 @@ class vmmConnect(vmmGObjectUI):
 
     def show(self, parent):
         logging.debug("Showing open connection")
-        if self.topwin.is_visible():
+        if self.is_visible():
             self.topwin.present()
             return
 
diff --git a/virtManager/console.py b/virtManager/console.py
index 082cabcd..f0d74141 100644
--- a/virtManager/console.py
+++ b/virtManager/console.py
@@ -243,12 +243,6 @@ class vmmConsolePages(vmmGObjectUI):
             self.config.on_console_accels_changed(self._refresh_enable_accel))
 
 
-    def is_visible(self):
-        if self.topwin:
-            return self.topwin.get_visible()
-        else:
-            return False
-
     def _cleanup(self):
         self.vm = None
 
diff --git a/virtManager/create.py b/virtManager/create.py
index 1d6d7fef..782cdf27 100644
--- a/virtManager/create.py
+++ b/virtManager/create.py
@@ -193,9 +193,6 @@ class vmmCreate(vmmGObjectUI):
     # Standard window methods #
     ###########################
 
-    def is_visible(self):
-        return self.topwin.get_visible()
-
     def show(self, parent, uri):
         logging.debug("Showing new vm wizard")
 
diff --git a/virtManager/details.py b/virtManager/details.py
index 8abea6df..ab55db63 100644
--- a/virtManager/details.py
+++ b/virtManager/details.py
@@ -754,9 +754,6 @@ class vmmDetails(vmmGObjectUI):
         vmmEngine.get_instance().decrement_window_counter()
         return 1
 
-    def is_visible(self):
-        return bool(self.topwin.get_visible())
-
 
     ##########################
     # Initialization helpers #
diff --git a/virtManager/host.py b/virtManager/host.py
index 416f2579..4279f209 100644
--- a/virtManager/host.py
+++ b/virtManager/host.py
@@ -182,9 +182,6 @@ class vmmHost(vmmGObjectUI):
 
         vmmEngine.get_instance().increment_window_counter()
 
-    def is_visible(self):
-        return self.topwin.get_visible()
-
     def close(self, ignore1=None, ignore2=None):
         logging.debug("Closing host window for %s", self.conn)
         if not self.is_visible():
diff --git a/virtManager/manager.py b/virtManager/manager.py
index bf185ca8..dad9af8b 100644
--- a/virtManager/manager.py
+++ b/virtManager/manager.py
@@ -221,13 +221,11 @@ class vmmManager(vmmGObjectUI):
         if self._window_size:
             self.config.set_manager_window_size(*self._window_size)
 
-    def is_visible(self):
-        return bool(self.topwin.get_visible())
-
     def set_startup_error(self, msg):
         self.widget("vm-notebook").set_current_page(1)
         self.widget("startup-error-label").set_text(msg)
 
+
     ################
     # Init methods #
     ################
diff --git a/virtManager/oslist.py b/virtManager/oslist.py
index a77dc9d3..a83bc44f 100644
--- a/virtManager/oslist.py
+++ b/virtManager/oslist.py
@@ -78,7 +78,7 @@ class vmmOSList(vmmGObjectUI):
     def _set_default_selection(self):
         os_list = self.widget("os-list")
         sel = os_list.get_selection()
-        if not self.topwin.get_visible():
+        if not self.is_visible():
             return
         if not len(os_list.get_model()):
             return
diff --git a/virtManager/storagebrowse.py b/virtManager/storagebrowse.py
index d0d4834a..d1924d94 100644
--- a/virtManager/storagebrowse.py
+++ b/virtManager/storagebrowse.py
@@ -45,7 +45,7 @@ class vmmStorageBrowser(vmmGObjectUI):
         self.conn.schedule_priority_tick(pollpool=True)
 
     def close(self, ignore1=None, ignore2=None):
-        if self.topwin.is_visible():
+        if self.is_visible():
             logging.debug("Closing storage browser")
             self.topwin.hide()
         self.storagelist.close()