Reorder toolbar, fix Bridge directories in `make dist`, update osdialog

Makefile

@@ -12,6 +12,7 @@ STRIP ?= strip
 # Sources and build flags
 
 SOURCES += dep/nanovg/src/nanovg.c
+SOURCES += dep/osdialog/osdialog.c
 SOURCES += $(wildcard src/*.cpp src/*/*.cpp)
 
 ifdef ARCH_MAC
@@ -105,8 +106,8 @@ ifdef ARCH_MAC
 	otool -L $(BUNDLE)/Contents/MacOS/$(TARGET)
 
 	cp plugins/Fundamental/dist/Fundamental-*.zip $(BUNDLE)/Contents/Resources/Fundamental.zip
-	cp -R Bridge/au/dist/VCV-Bridge.component dist/
-	cp -R Bridge/vst/dist/VCV-Bridge.vst dist/
+	cp -R Bridge/AU/dist/VCV-Bridge.component dist/
+	cp -R Bridge/VST/dist/VCV-Bridge.vst dist/
 	# Make DMG image
 	cd dist && ln -s /Applications Applications
 	cd dist && ln -s /Library/Audio/Plug-Ins/Components Components
@@ -116,8 +117,8 @@ endif
 ifdef ARCH_WIN
 	mkdir -p dist/Rack
 	mkdir -p dist/Rack/Bridge
-	cp Bridge/vst/dist/VCV-Bridge-64.dll dist/Rack/Bridge/
-	cp Bridge/vst/dist/VCV-Bridge-32.dll dist/Rack/Bridge/
+	cp Bridge/VST/dist/VCV-Bridge-64.dll dist/Rack/Bridge/
+	cp Bridge/VST/dist/VCV-Bridge-32.dll dist/Rack/Bridge/
 	cp -R LICENSE* res dist/Rack/
 	cp $(TARGET) dist/Rack/
 	$(STRIP) -s dist/Rack/$(TARGET)
@@ -133,6 +134,8 @@ ifdef ARCH_WIN
 endif
 ifdef ARCH_LIN
 	mkdir -p dist/Rack
+	mkdir -p dist/Rack/Bridge
+	cp Bridge/VST/dist/VCV-Bridge.so dist/Rack/Bridge/
 	cp -R LICENSE* res dist/Rack/
 	cp $(TARGET) dist/Rack/
 	$(STRIP) -s dist/Rack/$(TARGET)

dep/osdialog

@@ -1 +1 @@
-Subproject commit 015d020615e8169d2f227ad385c5f2aa1e091fd1
+Subproject commit ad9b5b8209079939d3862374a835389ffe7c6827

src/app/Toolbar.cpp

@@ -150,6 +150,13 @@ struct RackLockButton : TooltipIconButton {
 	}
 };
 
+struct ZoomSlider : Slider {
+	void onAction(EventAction &e) override {
+		Slider::onAction(e);
+		gRackScene->zoomWidget->setZoom(roundf(value) / 100.0);
+	}
+};
+
 
 Toolbar::Toolbar() {
 	box.size.y = BND_WIDGET_HEIGHT + 2*5;
@@ -166,6 +173,10 @@ Toolbar::Toolbar() {
 	layout->addChild(new RevertButton());
 	layout->addChild(new DisconnectCablesButton());
 
+	layout->addChild(new SampleRateButton());
+	layout->addChild(new PowerMeterButton());
+	layout->addChild(new RackLockButton());
+
 	wireOpacitySlider = new Slider();
 	wireOpacitySlider->box.size.x = 150;
 	wireOpacitySlider->label = "Cable opacity";
@@ -183,16 +194,6 @@ Toolbar::Toolbar() {
 	wireTensionSlider->setDefaultValue(0.5);
 	layout->addChild(wireTensionSlider);
 
-	layout->addChild(new SampleRateButton());
-	layout->addChild(new PowerMeterButton());
-	layout->addChild(new RackLockButton());
-
-	struct ZoomSlider : Slider {
-		void onAction(EventAction &e) override {
-			Slider::onAction(e);
-			gRackScene->zoomWidget->setZoom(roundf(value) / 100.0);
-		}
-	};
 	zoomSlider = new ZoomSlider();
 	zoomSlider->box.size.x = 150;
 	zoomSlider->precision = 0;
@@ -202,13 +203,6 @@ Toolbar::Toolbar() {
 	zoomSlider->setDefaultValue(100.0);
 	layout->addChild(zoomSlider);
 
-/*
-	cpuUsageButton = new RadioButton();
-	cpuUsageButton->box.size.x = 100;
-	cpuUsageButton->label = "CPU usage";
-	layout->addChild(cpuUsageButton);
-*/
-
 	// Kind of hacky, but display the PluginManagerWidget only if the local directory is not the development directory
 	if (assetLocal("") != "./") {
 		Widget *pluginManager = new PluginManagerWidget();