Update canvas code from Carla

resources/resources.qrc

@@ -63,8 +63,12 @@
 
         <file>scalable/pb_generic.svg</file>
         <file>scalable/pb_hardware.svg</file>
+        <file>scalable/pb_plugin.svg</file>
+        <file>scalable/pb_file.svg</file>
+        <file>scalable/pb_configure.svg</file>
         <file>scalable/pb_audacious.svg</file>
         <file>scalable/pb_clementine.svg</file>
+        <file>scalable/pb_distrho.svg</file>
         <file>scalable/pb_jamin.svg</file>
         <file>scalable/pb_mplayer.svg</file>
         <file>scalable/pb_vlc.svg</file>

src/claudia.py

@@ -160,6 +160,7 @@ URI_CANVAS_Y       = "http://ladish.org/ns/canvas/y"
 URI_CANVAS_SPLIT   = "http://kxstudio.sf.net/ns/canvas/split"
 URI_CANVAS_X_SPLIT = "http://kxstudio.sf.net/ns/canvas/x_split"
 URI_CANVAS_Y_SPLIT = "http://kxstudio.sf.net/ns/canvas/y_split"
+URI_CANVAS_ICON    = "http://kxstudio.sf.net/ns/canvas/icon"
 
 DEFAULT_CANVAS_WIDTH  = 3100
 DEFAULT_CANVAS_HEIGHT = 2400

src/patchcanvas.py

@@ -56,9 +56,12 @@ ACTION_PORTS_CONNECT    = 6 # out_id, in_id, N
 ACTION_PORTS_DISCONNECT = 7 # conn_id, N, N
 
 # Icon
-ICON_HARDWARE    = 0
-ICON_APPLICATION = 1
-ICON_LADISH_ROOM = 2
+ICON_APPLICATION = 0
+ICON_HARDWARE    = 1
+ICON_DISTRHO     = 2
+ICON_FILE        = 3
+ICON_PLUGIN      = 4
+ICON_LADISH_ROOM = 5
 
 # Split Option
 SPLIT_UNDEF = 0
@@ -2518,6 +2521,9 @@ class CanvasIcon(QGraphicsSvgItem):
             elif "clementine" in name:
                 icon_path = ":/scalable/pb_clementine.svg"
                 self.p_size = QRectF(5, 4, 16, 16)
+            elif "distrho" in name:
+                icon_path = ":/scalable/pb_distrho.svg"
+                self.p_size = QRectF(5, 4, 14, 14)
             elif "jamin" in name:
                 icon_path = ":/scalable/pb_jamin.svg"
                 self.p_size = QRectF(5, 3, 16, 16)
@@ -2530,12 +2536,24 @@ class CanvasIcon(QGraphicsSvgItem):
 
             else:
                 icon_path = ":/scalable/pb_generic.svg"
-                self.p_size = QRectF(5, 3, 16, 16)
+                self.p_size = QRectF(4, 3, 16, 16)
 
         elif icon == ICON_HARDWARE:
             icon_path = ":/scalable/pb_hardware.svg"
             self.p_size = QRectF(5, 2, 16, 16)
 
+        elif icon == ICON_DISTRHO:
+            icon_path = ":/scalable/pb_distrho.svg"
+            self.p_size = QRectF(5, 4, 14, 14)
+
+        elif icon == ICON_FILE:
+            icon_path = ":/scalable/pb_file.svg"
+            self.p_size = QRectF(5, 4, 12, 14)
+
+        elif icon == ICON_PLUGIN:
+            icon_path = ":/scalable/pb_plugin.svg"
+            self.p_size = QRectF(5, 4, 14, 14)
+
         elif icon == ICON_LADISH_ROOM:
             # TODO - make a unique ladish-room icon
             icon_path = ":/scalable/pb_hardware.svg"