Proper abstract ui setup; Save/restore Logs window pos

src/catarina.py

@@ -598,9 +598,7 @@ class CatarinaDisconnectPortsW(QDialog, ui_catarina_disconnectports.Ui_CatarinaD
 
 class CatarinaMainW(AbstractCanvasJackClass):
     def __init__(self, parent=None):
-        AbstractCanvasJackClass.__init__(self, parent, "Catarina")
-        self.ui = ui_catarina.Ui_CatarinaMainW()
-        self.ui.setupUi(self)
+        AbstractCanvasJackClass.__init__(self, "Catarina", ui_catarina.Ui_CatarinaMainW, parent)
 
         self.loadSettings(True)
 

src/catia.py

@@ -102,9 +102,7 @@ URI_CANVAS_ICON = "http://kxstudio.sf.net/ns/canvas/icon"
 
 class CatiaMainW(AbstractCanvasJackClass):
     def __init__(self, parent=None):
-        AbstractCanvasJackClass.__init__(self, parent, "Catia")
-        self.ui = ui_catia.Ui_CatiaMainW()
-        self.ui.setupUi(self)
+        AbstractCanvasJackClass.__init__(self, "Catia", ui_catia.Ui_CatiaMainW, parent)
 
         self.fGroupList      = []
         self.fGroupSplitList = []

src/claudia.py

@@ -598,9 +598,7 @@ class ClaudiaLauncherW(QDialog):
 
 class ClaudiaMainW(AbstractCanvasJackClass):
     def __init__(self, parent=None):
-        AbstractCanvasJackClass.__init__(self, parent, "Claudia")
-        self.ui = ui_claudia.Ui_ClaudiaMainW()
-        self.ui.setupUi(self)
+        AbstractCanvasJackClass.__init__(self, "Claudia", ui_claudia.Ui_ClaudiaMainW, parent)
 
         self.m_lastItemType = None
         self.m_lastRoomPath = None

src/logs.py

@@ -19,7 +19,7 @@
 # ------------------------------------------------------------------------------------------------------------
 # Imports (Global)
 
-from PyQt4.QtCore import pyqtSlot, Qt, QFile, QIODevice, QMutex, QMutexLocker, QTextStream, QThread
+from PyQt4.QtCore import pyqtSlot, Qt, QFile, QIODevice, QMutex, QMutexLocker, QTextStream, QThread, QSettings
 from PyQt4.QtGui import QDialog, QPalette, QSyntaxHighlighter
 
 # ------------------------------------------------------------------------------------------------------------
@@ -121,8 +121,9 @@ class LogsReadThread(QThread):
     def __init__(self, parent):
         QThread.__init__(self, parent)
 
-        self.fCloseNow  = False
-        self.fPurgeLogs = False
+        self.fCloseNow   = False
+        self.fPurgeLogs  = False
+        self.fRealParent = parent
 
         # -------------------------------------------------------------
         # Take some values from Logs Window
@@ -234,7 +235,7 @@ class LogsReadThread(QThread):
                 else:
                     textLADISH = ""
 
-                self.parent().setLogsText(textJACK, textA2J, textLASH, textLADISH)
+                self.fRealParent.setLogsText(textJACK, textA2J, textLASH, textLADISH)
                 self.emit(SIGNAL("updateLogs()"))
 
             if not self.fCloseNow:
@@ -283,6 +284,8 @@ class LogsW(QDialog):
         self.ui = ui_logs.Ui_LogsW()
         self.ui.setupUi(self)
 
+        self.loadSettings()
+
         self.fFirstRun = True
         self.fTextLock = QMutex()
 
@@ -400,7 +403,17 @@ class LogsW(QDialog):
         self.ui.pte_lash.clear()
         self.ui.pte_ladish.clear()
 
+    def loadSettings(self):
+        settings = QSettings("Cadence", "Cadence-Logs")
+        self.restoreGeometry(settings.value("Geometry", ""))
+
+    def saveSettings(self):
+        settings = QSettings("Cadence", "Cadence-Logs")
+        settings.setValue("Geometry", self.saveGeometry())
+
     def closeEvent(self, event):
+        self.saveSettings()
+
         if self.fReadThread.isRunning():
             self.fReadThread.closeNow()
 

src/shared.py

@@ -242,6 +242,8 @@ def closeWindowHandler():
     gGui.close()
     QApplication.instance().quit()
 
+    gGui = None
+
 def showWindowHandler():
     global gGui
 

src/shared_canvasjack.py

@@ -95,9 +95,12 @@ gJack.client = None
 # Abstract Canvas and JACK Class
 
 class AbstractCanvasJackClass(QMainWindow):
-    def __init__(self, parent, appName):
+    def __init__(self, appName, UiClass, parent):
         QMainWindow.__init__(self, parent)
 
+        self.ui = UiClass()
+        self.ui.setupUi(self)
+
         self.fAppName          = appName
         self.fCurTransportView = TRANSPORT_VIEW_HMS