Misc fixing

source/carla

@@ -38,6 +38,7 @@ class CarlaMultiW(QTabWidget):
         self.fRack     = CarlaRackW(parent, False)
         self.fPatchbay = CarlaPatchbayW(parent, False)
         self.fParent   = parent
+        self.fUseCustomPaint = False
 
         self.addTab(self.fRack, "Plugins")
         self.addTab(self.fPatchbay, "Patchbay")
@@ -148,13 +149,21 @@ class CarlaMultiW(QTabWidget):
         self.fPatchbay.resize(self.fRack.size())
         self.fPatchbay.slot_miniCanvasCheckSize()
 
-    #def paintEvent(self, event):
-        #QTabWidget.paintEvent(self, event)
+    def setUseCustomPaint(self, useCustomPaint):
+        if self.fUseCustomPaint != useCustomPaint:
+            self.fUseCustomPaint = useCustomPaint
+            self.update()
 
-        #painter = QPainter(self)
-        #painter.setBrush(QColor(36, 36, 36))
-        #painter.setPen(QColor(62, 62, 62))
-        #painter.drawRect(1, self.height()/2, self.width()-3, self.height()-self.height()/2-1)
+    def paintEvent(self, event):
+        QTabWidget.paintEvent(self, event)
+
+        if not self.fUseCustomPaint:
+            return
+
+        painter = QPainter(self)
+        painter.setBrush(QColor(36, 36, 36))
+        painter.setPen(QColor(62, 62, 62))
+        painter.drawRect(1, self.height()/2, self.width()-3, self.height()-self.height()/2-1)
 
     def resizeEvent(self, event):
         QTabWidget.resizeEvent(self, event)
@@ -175,6 +184,8 @@ class CarlaHostW(HostWindow):
         self.fContainer = CarlaMultiW(self)
         self.setupContainer(True, self.fContainer.fPatchbay.themeData)
 
+        self.fContainer.setUseCustomPaint(self.fSavedSettings[CARLA_KEY_CUSTOM_PAINTING])
+
         # -------------------------------------------------------------
         # Set-up GUI stuff
 

source/carla-patchbay

@@ -39,7 +39,7 @@ if __name__ == '__main__':
     # -------------------------------------------------------------
     # App initialization
 
-    app = CarlaApplication()
+    app = CarlaApplication("Carla2-Patchbay")
 
     # -------------------------------------------------------------
     # Set-up custom signal handling

source/carla-plugin

@@ -716,7 +716,7 @@ if __name__ == '__main__':
     # -------------------------------------------------------------
     # App initialization
 
-    app = CarlaApplication()
+    app = CarlaApplication("Carla2-Plugin")
 
     # -------------------------------------------------------------
     # Set-up custom signal handling

source/carla-rack

@@ -39,7 +39,7 @@ if __name__ == '__main__':
     # -------------------------------------------------------------
     # App initialization
 
-    app = CarlaApplication()
+    app = CarlaApplication("Carla2-Rack")
 
     # -------------------------------------------------------------
     # Set-up custom signal handling

source/carla_host.py

@@ -308,7 +308,7 @@ class HostWindow(QMainWindow):
         if showMiniCanvas:
             canvasWidth, canvasHeight, canvasBg, canvasBrush, canvasPen = canvasThemeData
             self.ui.miniCanvasPreview.setViewTheme(canvasBg, canvasBrush, canvasPen)
-            self.ui.miniCanvasPreview.init(self.fContainer.scene, canvasWidth, canvasHeight, self.fSavedSettings["UseCustomMiniCanvasPaint"])
+            self.ui.miniCanvasPreview.init(self.fContainer.scene, canvasWidth, canvasHeight, self.fSavedSettings[CARLA_KEY_CUSTOM_PAINTING])
         else:
             self.ui.miniCanvasPreview.hide()
 
@@ -317,7 +317,7 @@ class HostWindow(QMainWindow):
     def updateContainer(self, canvasThemeData):
         canvasWidth, canvasHeight, canvasBg, canvasBrush, canvasPen = canvasThemeData
         self.ui.miniCanvasPreview.setViewTheme(canvasBg, canvasBrush, canvasPen)
-        self.ui.miniCanvasPreview.init(self.fContainer.scene, canvasWidth, canvasHeight, self.fSavedSettings["UseCustomMiniCanvasPaint"])
+        self.ui.miniCanvasPreview.init(self.fContainer.scene, canvasWidth, canvasHeight, self.fSavedSettings[CARLA_KEY_CUSTOM_PAINTING])
 
     # -----------------------------------------------------------------
     # Internal stuff (files)
@@ -597,10 +597,10 @@ class HostWindow(QMainWindow):
             self.ui.act_settings_show_toolbar.setChecked(showToolbar)
             self.ui.toolBar.setVisible(showToolbar)
 
-            #if settings.contains("SplitterState"):
-                #self.ui.splitter.restoreState(settings.value("SplitterState", ""))
-            #else:
-            self.ui.splitter.setSizes([99999, 210])
+            if settings.contains("SplitterState"):
+                self.ui.splitter.restoreState(settings.value("SplitterState", ""))
+            else:
+                self.ui.splitter.setSizes([210, 99999])
 
             diskFolders = toList(settings.value("DiskFolders", [HOME]))
 
@@ -665,7 +665,7 @@ class HostWindow(QMainWindow):
             CARLA_KEY_CANVAS_USE_OPENGL:       settings.value(CARLA_KEY_CANVAS_USE_OPENGL,       CARLA_DEFAULT_CANVAS_USE_OPENGL,       type=bool),
             CARLA_KEY_CANVAS_ANTIALIASING:     settings.value(CARLA_KEY_CANVAS_ANTIALIASING,     CARLA_DEFAULT_CANVAS_ANTIALIASING,     type=int),
             CARLA_KEY_CANVAS_HQ_ANTIALIASING:  settings.value(CARLA_KEY_CANVAS_HQ_ANTIALIASING,  CARLA_DEFAULT_CANVAS_HQ_ANTIALIASING,  type=bool),
-            "UseCustomMiniCanvasPaint":       (settings.value(CARLA_KEY_MAIN_USE_PRO_THEME, True, type=bool) and
+            CARLA_KEY_CUSTOM_PAINTING:        (settings.value(CARLA_KEY_MAIN_USE_PRO_THEME, True, type=bool) and
                                                settings.value(CARLA_KEY_MAIN_PRO_THEME_COLOR, "Black", type=str).lower() == "black")
         }
 

source/carla_shared.py

@@ -311,6 +311,7 @@ CARLA_KEY_CANVAS_EYE_CANDY        = "Canvas/EyeCandy"        # enum
 CARLA_KEY_CANVAS_USE_OPENGL       = "Canvas/UseOpenGL"       # bool
 CARLA_KEY_CANVAS_ANTIALIASING     = "Canvas/Antialiasing"    # enum
 CARLA_KEY_CANVAS_HQ_ANTIALIASING  = "Canvas/HQAntialiasing"  # bool
+CARLA_KEY_CUSTOM_PAINTING         = "UseCustomPainting"      # bool
 
 CARLA_KEY_ENGINE_DRIVER_PREFIX         = "Engine/Driver-"
 CARLA_KEY_ENGINE_AUDIO_DRIVER          = "Engine/AudioDriver"         # str

source/widgets/canvaspreviewframe.py

@@ -158,10 +158,8 @@ class CanvasPreviewFrame(QFrame):
             painter.setPen(QColor(62, 62, 62))
             painter.drawRect(2, 2, self.width()-4, self.height()-3)
 
-            #painter.setBrush(self.fViewBg)
-            #painter.setPen(self.fViewBg)
-            painter.setBrush(QColor(62, 62, 255))
-            painter.setPen(QColor(62, 62, 255))
+            painter.setBrush(self.fViewBg)
+            painter.setPen(self.fViewBg)
             painter.drawRect(3, 3, self.width()-6, self.height()-6)
         else:
             painter.setBrush(self.fViewBg)