Apply and tweak UI changes from gdreyband.

JuceOPLVSTi.jucer

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<JUCERPROJECT id="wUKQiT" name="JuceOPLVSTi" projectType="audioplug" version="0.13.2"
+<JUCERPROJECT id="wUKQiT" name="JuceOPLVSTi" projectType="audioplug" version="0.13.3"
               bundleIdentifier="com.plainweave.JuceOPLVSTi" buildVST="1" buildAU="1"
               pluginName="JuceOPLVSTi" pluginDesc="JuceOPLVSTi" pluginManufacturer="Plainweave Software"
               pluginManufacturerCode="Pwve" pluginCode="JOPL" pluginChannelConfigs="{0, 1}"
@@ -13,6 +13,10 @@
               buildAUv3="0">
   <MAINGROUP id="TOefyq" name="JuceOPLVSTi">
     <GROUP id="{DCA755EB-7953-0641-E719-95C7850E5B2B}" name="Source">
+      <FILE id="mSWBsr" name="OPLLookAndFeel.cpp" compile="1" resource="0"
+            file="Source/OPLLookAndFeel.cpp"/>
+      <FILE id="igacSV" name="OPLLookAndFeel.h" compile="0" resource="0"
+            file="Source/OPLLookAndFeel.h"/>
       <FILE id="o0sULY" name="DROMultiplexer.cpp" compile="1" resource="0"
             file="Source/DROMultiplexer.cpp"/>
       <FILE id="cULQN7" name="DROMultiplexer.h" compile="0" resource="0"

Source/OPLLookAndFeel.cpp

@@ -0,0 +1,34 @@
+/*
+  ==============================================================================
+
+    OPLLookAndFeel.cpp
+    Created: 10 Oct 2016 9:38:20pm
+    Author:  bruce
+
+  ==============================================================================
+*/
+
+#include "OPLLookAndFeel.h"
+#include "PluginGui.h"
+
+OPLLookAndFeel::OPLLookAndFeel()
+{
+	toggleOff = ImageCache::getFromMemory(PluginGui::toggle_off_sq_png, PluginGui::toggle_off_sq_pngSize), 1.000f, Colour(0x00000000);
+	toggleOn = ImageCache::getFromMemory(PluginGui::toggle_on_sq_png, PluginGui::toggle_on_sq_pngSize), 1.000f, Colour(0x00000000);
+	toggleRect = Rectangle<float>((float)toggleOff.getWidth(), (float)toggleOn.getHeight());
+}
+
+void OPLLookAndFeel::drawTickBox(Graphics &g,
+	Component &c,
+	float 	x,
+	float 	y,
+	float 	w,
+	float 	h,
+	bool 	ticked,
+	bool 	isEnabled,
+	bool 	isMouseOverButton,
+	bool 	isButtonDown
+) {
+	g.drawImage(ticked ? toggleOn : toggleOff, toggleRect.withY(y + 2));
+}
+

Source/OPLLookAndFeel.h

@@ -0,0 +1,43 @@
+/*
+  ==============================================================================
+
+    OPLLookAndFeel.h
+    Created: 10 Oct 2016 9:38:20pm
+    Author:  bruce
+
+  ==============================================================================
+*/
+
+#ifndef OPLLOOKANDFEEL_H_INCLUDED
+#define OPLLOOKANDFEEL_H_INCLUDED
+
+#include "JuceHeader.h"
+
+class OPLLookAndFeel : public LookAndFeel_V3
+{
+private:
+	Image toggleOff;
+	Image toggleOn;
+	Rectangle<float> toggleRect;
+
+public:
+	OPLLookAndFeel();
+
+	void drawTickBox(Graphics &g,
+		Component &c,
+		float 	x,
+		float 	y,
+		float 	w,
+		float 	h,
+		bool 	ticked,
+		bool 	isEnabled,
+		bool 	isMouseOverButton,
+		bool 	isButtonDown
+	);
+
+};
+
+
+
+
+#endif  // OPLLOOKANDFEEL_H_INCLUDED

Source/PluginGui.h

@@ -7,7 +7,7 @@
   the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
   and re-saved.
 
-  Created with Projucer version: 4.2.3
+  Created with Projucer version: 4.2.4
 
   ------------------------------------------------------------------------------
 
@@ -86,6 +86,26 @@ public:
     static const int channeloff_pngSize;
     static const char* channelon_png;
     static const int channelon_pngSize;
+    static const char* toggle_off_sq_png;
+    static const int toggle_off_sq_pngSize;
+    static const char* toggle_on_sq_png;
+    static const int toggle_on_sq_pngSize;
+    static const char* line_border_horiz_png;
+    static const int line_border_horiz_pngSize;
+    static const char* line_border_vert_png;
+    static const int line_border_vert_pngSize;
+    static const char* algo_switch_off_png;
+    static const int algo_switch_off_pngSize;
+    static const char* algo_switch_on_png;
+    static const int algo_switch_on_pngSize;
+    static const char* algo_switch_on2_png;
+    static const int algo_switch_on2_pngSize;
+    static const char* algo_switch_on3_png;
+    static const int algo_switch_on3_pngSize;
+    static const char* twoopAm_png;
+    static const int twoopAm_pngSize;
+    static const char* twoopFm_png;
+    static const int twoopFm_pngSize;
 
 
 private:
@@ -123,7 +143,6 @@ private:
     ScopedPointer<ToggleButton> vibratoButton;
     ScopedPointer<ToggleButton> sustainButton;
     ScopedPointer<ToggleButton> keyscaleEnvButton;
-    ScopedPointer<Label> frequencyLabel2;
     ScopedPointer<Label> dbLabel2;
     ScopedPointer<GroupComponent> groupComponent2;
     ScopedPointer<ComboBox> frequencyComboBox2;
@@ -159,7 +178,6 @@ private:
     ScopedPointer<Slider> feedbackSlider;
     ScopedPointer<Label> frequencyLabel7;
     ScopedPointer<ComboBox> velocityComboBox;
-    ScopedPointer<Label> attenuationLabel3;
     ScopedPointer<ComboBox> velocityComboBox2;
     ScopedPointer<Label> attenuationLabel4;
     ScopedPointer<ImageButton> alternatingsineImageButton;
@@ -186,6 +204,73 @@ private:
     ScopedPointer<TextButton> exportButton;
     ScopedPointer<TextButton> loadButton;
     ScopedPointer<Label> versionLabel;
+    ScopedPointer<ImageButton> ToggleButtonOffExample;
+    ScopedPointer<ImageButton> ToggleButtonOnExample;
+    ScopedPointer<Label> label;
+    ScopedPointer<Label> label2;
+    ScopedPointer<ImageButton> LineBorderButton1C;
+    ScopedPointer<ImageButton> LineBorderButton1A;
+    ScopedPointer<ImageButton> LineBorderButton1B;
+    ScopedPointer<Label> label3;
+    ScopedPointer<ImageButton> LineBorderButton3A;
+    ScopedPointer<ImageButton> LineBorderButton3B;
+    ScopedPointer<ImageButton> LineBorderButton3B2;
+    ScopedPointer<ImageButton> LineBorderButton1C2;
+    ScopedPointer<ImageButton> LineBorderButton1A2;
+    ScopedPointer<ImageButton> LineBorderButton1B2;
+    ScopedPointer<ImageButton> LineBorderButton1C3;
+    ScopedPointer<ImageButton> LineBorderButton1B3;
+    ScopedPointer<ImageButton> algoSwitchButtonOffEx1;
+    ScopedPointer<ImageButton> algoSwitchButtonOffEx2;
+    ScopedPointer<ImageButton> algoSwitchButtonOnEx1;
+    ScopedPointer<ImageButton> algoSwitchButtonOnEx2;
+    ScopedPointer<Label> label4;
+    ScopedPointer<Label> label5;
+    ScopedPointer<Label> label6;
+    ScopedPointer<Label> label7;
+    ScopedPointer<Label> label8;
+    ScopedPointer<ImageButton> algoSwitchButtonOn2Ex1;
+    ScopedPointer<ImageButton> algoSwitchButtonOn2Ex2;
+    ScopedPointer<Label> label9;
+    ScopedPointer<Label> label10;
+    ScopedPointer<ImageButton> algoSwitchButtonOn3Ex1;
+    ScopedPointer<ImageButton> algoSwitchButtonOn3Ex2;
+    ScopedPointer<Label> label11;
+    ScopedPointer<Label> label12;
+    ScopedPointer<ImageButton> TwoOpAMButton;
+    ScopedPointer<ImageButton> TwoOpFMButton;
+    ScopedPointer<Label> label13;
+    ScopedPointer<Label> label14;
+    ScopedPointer<Label> label15;
+    ScopedPointer<Label> label16;
+    ScopedPointer<Label> label17;
+    ScopedPointer<GroupComponent> groupComponent6;
+    ScopedPointer<ImageButton> algoSwitchButtonOnEx3;
+    ScopedPointer<Label> label18;
+    ScopedPointer<ImageButton> algoSwitchButtonOffEx3;
+    ScopedPointer<Label> label19;
+    ScopedPointer<ImageButton> TwoOpAMButton2;
+    ScopedPointer<Label> label20;
+    ScopedPointer<Label> label21;
+    ScopedPointer<Label> label22;
+    ScopedPointer<ImageButton> algoSwitchButtonOffEx4;
+    ScopedPointer<Label> label23;
+    ScopedPointer<ImageButton> algoSwitchButtonOn3Ex3;
+    ScopedPointer<Label> label24;
+    ScopedPointer<ImageButton> TwoOpFMButton2;
+    ScopedPointer<Label> label25;
+    ScopedPointer<Label> label26;
+    ScopedPointer<GroupComponent> groupComponent7;
+    ScopedPointer<ImageButton> algoSwitchButtonOffEx5;
+    ScopedPointer<Label> label27;
+    ScopedPointer<ImageButton> algoSwitchButtonOn3Ex4;
+    ScopedPointer<Label> label28;
+    ScopedPointer<GroupComponent> groupComponent8;
+    ScopedPointer<Label> frequencyLabel9;
+    ScopedPointer<Label> label29;
+    ScopedPointer<Label> label30;
+    ScopedPointer<Label> frequencyLabel10;
+    ScopedPointer<Label> attenuationLabel5;
 
 
     //==============================================================================