diff --git a/.gitignore b/.gitignore
index 20a52ba..19204c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,9 +5,9 @@
*~
*.a
*.o
-*.so
*.dll
*.exe
+*.so
*.carxp
*.carxs
@@ -29,12 +29,24 @@ carla-bridge-vst-x11
carla-discovery-qtcreator
carla-discovery-unix32
carla-discovery-unix64
-carla-discovery-win32.exe
-carla-discovery-win32.exe.so
-carla-discovery-win64.exe
-carla-discovery-win64.exe.so
+c++/carla-backend/doxygen/
c++/carla-includes/vst/
c++/jackmeter/cadence_jackmeter
src/resources_rc.py
+
+
+# incoming
+_/
+all-recheck
+c++/carla/
+c++/carla-backend/carla-dynamic.lv2/
+c++/carla-backend/carla_backend_lv2.cpp
+c++/carla-backend/carla_backend_vst.cpp
+c++/carla-bridge/qt-plugin/
+c++/flmixer/
+c++/xycontroller/
+c++/widgets/ledbutton.*
+c++/widgets/pixmapdial.*
+c++/widgets/pixmapkeyboard.*
diff --git a/c++/carla-includes/carla_osc_includes.h b/c++/carla-includes/carla_osc_includes.h
index 9d83293..dedbc59 100644
--- a/c++/carla-includes/carla_osc_includes.h
+++ b/c++/carla-includes/carla_osc_includes.h
@@ -150,7 +150,7 @@ void osc_send_midi(const CarlaOscData* const oscData, const uint8_t buf[4])
}
}
-#if 1//def BUILD_BRIDGE
+#ifdef BUILD_BRIDGE
static inline
void osc_send_update(const CarlaOscData* const oscData, const char* const url)
{
diff --git a/resources/resources.qrc b/resources/resources.qrc
index 3f69d95..1d35a25 100644
--- a/resources/resources.qrc
+++ b/resources/resources.qrc
@@ -7,6 +7,7 @@
16x16/claudia-launcher.png
16x16/carla.png
16x16/carla-control.png
+
16x16/application-exit.png
16x16/arrow-right.png
16x16/configure.png
@@ -49,6 +50,7 @@
48x48/claudia-launcher.png
48x48/carla.png
48x48/carla-control.png
+
48x48/canvas.png
48x48/exec.png
48x48/folder.png
@@ -64,6 +66,7 @@
scalable/carla.svg
scalable/carla-control.svg
scalable/jack.svg
+
scalable/pb_generic.svg
scalable/pb_hardware.svg
scalable/pb_audacious.svg
@@ -93,8 +96,10 @@
bitmaps/led-big_off.png
bitmaps/carla_about.png
bitmaps/carla_knobs1.png
+
bitmaps/canvas/frame_node_header.png
bitmaps/canvas/frame_port_bg.png
+
bitmaps/textures/metal_1-512px.jpg
bitmaps/textures/metal_2-512px.jpg
bitmaps/textures/metal_3-512px.jpg
@@ -105,11 +110,11 @@
bitmaps/textures/metal_8-512px.jpg
bitmaps/textures/metal_9-512px.jpg
+ screens/cadence-logs.png
+ screens/cadence-render.png
+ screens/cadence-xycontroller.png
screens/catia.png
screens/claudia.png
screens/carla.png
- screens/logs.png
- screens/render.png
- screens/xy-controller.png
diff --git a/resources/screens/cadence-logs.png b/resources/screens/cadence-logs.png
new file mode 100644
index 0000000..59e50c8
Binary files /dev/null and b/resources/screens/cadence-logs.png differ
diff --git a/resources/screens/cadence-render.png b/resources/screens/cadence-render.png
new file mode 100644
index 0000000..bf5b978
Binary files /dev/null and b/resources/screens/cadence-render.png differ
diff --git a/resources/screens/cadence-xycontroller.png b/resources/screens/cadence-xycontroller.png
new file mode 100644
index 0000000..9559e7b
Binary files /dev/null and b/resources/screens/cadence-xycontroller.png differ
diff --git a/resources/screens/logs.png b/resources/screens/logs.png
deleted file mode 100644
index 7ba390b..0000000
Binary files a/resources/screens/logs.png and /dev/null differ
diff --git a/resources/screens/render.png b/resources/screens/render.png
deleted file mode 100644
index 02ad452..0000000
Binary files a/resources/screens/render.png and /dev/null differ
diff --git a/resources/screens/xy-controller.png b/resources/screens/xy-controller.png
deleted file mode 100644
index 98637f0..0000000
Binary files a/resources/screens/xy-controller.png and /dev/null differ
diff --git a/src/ui/cadence.ui b/src/ui/cadence.ui
index 562308c..b2d50a8 100644
--- a/src/ui/cadence.ui
+++ b/src/ui/cadence.ui
@@ -681,7 +681,7 @@
- :/screens/logs.png
+ :/screens/cadence-logs.png
Qt::AlignCenter
@@ -716,7 +716,7 @@
- :/screens/render.png
+ :/screens/cadence-render.png
Qt::AlignCenter
@@ -751,7 +751,7 @@
- :/screens/xy-controller.png
+ :/screens/cadence-xycontroller.png
Qt::AlignCenter