Skip to content

Commit 37d28e2

Browse files
sept-ensept-en
committed
ButtonGroupManager: Refactoring.
* LinearButtonGroupManager class now have the same functionality as ButtonGroupManager class had before. * ButtonGroupManager now is the base class for all other button group managers. * Appropriate fixes in the CAR plugin.
1 parent 10a567f commit 37d28e2

14 files changed

Lines changed: 341 additions & 183 deletions

File tree

‎Builds/Linux/Makefile‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ OBJECTS := \
118118
$(OBJDIR)/DataWindow_83ce6754.o \
119119
$(OBJDIR)/SpikeObject_24e8c655.o \
120120
$(OBJDIR)/MatlabLikePlot_fb09c37f.o \
121+
$(OBJDIR)/LinearButtonGroupManager_ea5cb5bf.o \
121122
$(OBJDIR)/ButtonGroupManager_75d0fbfa.o \
122123
$(OBJDIR)/MaterialButtonLookAndFeel_d7d19ba2.o \
123124
$(OBJDIR)/MaterialSliderLookAndFeel_c97dd613.o \
@@ -502,6 +503,11 @@ $(OBJDIR)/MatlabLikePlot_fb09c37f.o: ../../Source/Processors/Visualization/Matla
502503
@echo "Compiling MatlabLikePlot.cpp"
503504
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
504505

506+
$(OBJDIR)/LinearButtonGroupManager_ea5cb5bf.o: ../../Source/UI/Utils/LinearButtonGroupManager.cpp
507+
-@mkdir -p $(OBJDIR)
508+
@echo "Compiling LinearButtonGroupManager.cpp"
509+
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
510+
505511
$(OBJDIR)/ButtonGroupManager_75d0fbfa.o: ../../Source/UI/Utils/ButtonGroupManager.cpp
506512
-@mkdir -p $(OBJDIR)
507513
@echo "Compiling ButtonGroupManager.cpp"

‎Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@
8787
1B620FC17AAECA4C5DE741E2 = {isa = PBXBuildFile; fileRef = 66463AB11EA4D6341C32F27E; };
8888
19BB86C918F89D1377F8A0E1 = {isa = PBXBuildFile; fileRef = 5894D40A0E8FA6E9B3EBF9D9; };
8989
89223664B6CB2A912E36B091 = {isa = PBXBuildFile; fileRef = F115ED75E977A54AAF036B2C; };
90+
EE60D8FC7DCEC9C9AE545F4D = {isa = PBXBuildFile; fileRef = 6F201AA651C426427E515AF2; };
9091
43BDE8C7A1D17FC0CD2EF00D = {isa = PBXBuildFile; fileRef = 0BD711FD3C982C60B294F311; };
9192
5A43E4E1547CBD9C2A635AEE = {isa = PBXBuildFile; fileRef = 3A3EFEB7D30A6E75D5A1D1B1; };
9293
8C78E9A851776185755D708E = {isa = PBXBuildFile; fileRef = BDD36C3C308596F8CCCBF163; };
@@ -596,6 +597,7 @@
596597
6E2F243D8F70CC92391204A4 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MultiDocumentPanel.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/layout/juce_MultiDocumentPanel.h"; sourceTree = "SOURCE_ROOT"; };
597598
6EA1CC7DACDDBA863179521A = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_TemporaryFile.cpp"; path = "../../JuceLibraryCode/modules/juce_core/files/juce_TemporaryFile.cpp"; sourceTree = "SOURCE_ROOT"; };
598599
6EF4EFD6D74D2573AC6B6A6F = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_module_info"; path = "../../JuceLibraryCode/modules/juce_audio_devices/juce_module_info"; sourceTree = "SOURCE_ROOT"; };
600+
6F201AA651C426427E515AF2 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LinearButtonGroupManager.cpp; path = ../../Source/UI/Utils/LinearButtonGroupManager.cpp; sourceTree = "SOURCE_ROOT"; };
599601
6F9B89F7AD0E13887871D4FE = {isa = PBXFileReference; lastKnownFileType = image.png; name = SourceDrop.png; path = ../../Resources/Images/Icons/SourceDrop.png; sourceTree = "SOURCE_ROOT"; };
600602
6FE8B0DD6116E6A3456ECF09 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_ios_UIViewComponent.mm"; path = "../../JuceLibraryCode/modules/juce_gui_extra/native/juce_ios_UIViewComponent.mm"; sourceTree = "SOURCE_ROOT"; };
601603
700597338DEC9AB65C4C8A5E = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DrawableText.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/drawables/juce_DrawableText.h"; sourceTree = "SOURCE_ROOT"; };
@@ -995,6 +997,7 @@
995997
C679AE9BBB9B1EE3BAB09E11 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_FileBasedDocument.h"; path = "../../JuceLibraryCode/modules/juce_gui_extra/documents/juce_FileBasedDocument.h"; sourceTree = "SOURCE_ROOT"; };
996998
C67AA7952D9EF7E248118B85 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_StringPool.cpp"; path = "../../JuceLibraryCode/modules/juce_core/text/juce_StringPool.cpp"; sourceTree = "SOURCE_ROOT"; };
997999
C67C5EC0EE8DBC501C8AA395 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_NamedPipe.h"; path = "../../JuceLibraryCode/modules/juce_core/network/juce_NamedPipe.h"; sourceTree = "SOURCE_ROOT"; };
1000+
C6B404239BFB396294D92170 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = LinearButtonGroupManager.h; path = ../../Source/UI/Utils/LinearButtonGroupManager.h; sourceTree = "SOURCE_ROOT"; };
9981001
C6BDC4DAD5B40321DA67462A = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ApplicationCommandTarget.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/commands/juce_ApplicationCommandTarget.h"; sourceTree = "SOURCE_ROOT"; };
9991002
C6E19D3864B40A52BCC49315 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ModifierKeys.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/keyboard/juce_ModifierKeys.h"; sourceTree = "SOURCE_ROOT"; };
10001003
C7359F50186E4017FE1724DA = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = PlaceholderProcessorEditor.h; path = ../../Source/Processors/PlaceholderProcessor/PlaceholderProcessorEditor.h; sourceTree = "SOURCE_ROOT"; };
@@ -1141,21 +1144,21 @@
11411144
E7ACE8C1456403A574236451 = {isa = PBXFileReference; lastKnownFileType = file; name = "cpmono-bold-serialized"; path = "../../Resources/Fonts/cpmono-bold-serialized"; sourceTree = "SOURCE_ROOT"; };
11421145
E7EE416EF527C7506B499070 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_BigInteger.h"; path = "../../JuceLibraryCode/modules/juce_core/maths/juce_BigInteger.h"; sourceTree = "SOURCE_ROOT"; };
11431146
E835BEB3C42E4B241804BE13 = {isa = PBXFileReference; lastKnownFileType = file; name = "cpmono-light-serialized"; path = "../../Resources/Fonts/cpmono-light-serialized"; sourceTree = "SOURCE_ROOT"; };
1144-
E8964C0BE264A55753BC6B7B = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_Midi.cpp"; path = "../../JuceLibraryCode/modules/juce_audio_devices/native/juce_linux_Midi.cpp"; sourceTree = "SOURCE_ROOT"; };
11451147
E8D51D470C9955D7D03D5469 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ChebyshevII.h; path = ../../Source/Processors/Dsp/ChebyshevII.h; sourceTree = "SOURCE_ROOT"; };
11461148
E91923510CB2280C3A3B9E9C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_LocalisedStrings.h"; path = "../../JuceLibraryCode/modules/juce_core/text/juce_LocalisedStrings.h"; sourceTree = "SOURCE_ROOT"; };
1147-
E91A272EF06892937CB4B9CE = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ComponentDragger.cpp"; path = "../../JuceLibraryCode/modules/juce_gui_basics/mouse/juce_ComponentDragger.cpp"; sourceTree = "SOURCE_ROOT"; };
11481149
E93BE115650B1CB80EACB841 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = EditorViewportButtons.h; path = ../../Source/UI/EditorViewportButtons.h; sourceTree = "SOURCE_ROOT"; };
11491150
E946426F95E0240683CB3337 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DrawablePath.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/drawables/juce_DrawablePath.h"; sourceTree = "SOURCE_ROOT"; };
11501151
E97684DCE824DEDA6683C6CD = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Synthesiser.cpp"; path = "../../JuceLibraryCode/modules/juce_audio_basics/synthesisers/juce_Synthesiser.cpp"; sourceTree = "SOURCE_ROOT"; };
1151-
F5A00ACFA3D76168F22F1205 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
1152-
99E1BC08B886CFDD2CCFD462 = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "open-ephys.app"; sourceTree = "BUILT_PRODUCTS_DIR"; };
1153-
E39CC410838072043E3C30DC = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = OriginalRecording.cpp; path = ../../Source/Processors/RecordNode/OriginalRecording.cpp; sourceTree = "SOURCE_ROOT"; };
11541152
EA2FC92CECD1EDA1F07DC59C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_TooltipWindow.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/windows/juce_TooltipWindow.h"; sourceTree = "SOURCE_ROOT"; };
11551153
EA354D7D8E48D461415D52D8 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_JPEGLoader.cpp"; path = "../../JuceLibraryCode/modules/juce_graphics/image_formats/juce_JPEGLoader.cpp"; sourceTree = "SOURCE_ROOT"; };
1156-
EA73332E3D5AEC04ADDFBB2A = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioDataConverters.h"; path = "../../JuceLibraryCode/modules/juce_audio_basics/buffers/juce_AudioDataConverters.h"; sourceTree = "SOURCE_ROOT"; };
11571154
EA9518CDEA7049C21D5CE2D5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Process.h"; path = "../../JuceLibraryCode/modules/juce_core/threads/juce_Process.h"; sourceTree = "SOURCE_ROOT"; };
11581155
EAB2319C7AA57E06A2247CDF = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_BorderSize.h"; path = "../../JuceLibraryCode/modules/juce_graphics/geometry/juce_BorderSize.h"; sourceTree = "SOURCE_ROOT"; };
1156+
F5A00ACFA3D76168F22F1205 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
1157+
99E1BC08B886CFDD2CCFD462 = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "open-ephys.app"; sourceTree = "BUILT_PRODUCTS_DIR"; };
1158+
E39CC410838072043E3C30DC = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = OriginalRecording.cpp; path = ../../Source/Processors/RecordNode/OriginalRecording.cpp; sourceTree = "SOURCE_ROOT"; };
1159+
E8964C0BE264A55753BC6B7B = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_Midi.cpp"; path = "../../JuceLibraryCode/modules/juce_audio_devices/native/juce_linux_Midi.cpp"; sourceTree = "SOURCE_ROOT"; };
1160+
E91A272EF06892937CB4B9CE = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ComponentDragger.cpp"; path = "../../JuceLibraryCode/modules/juce_gui_basics/mouse/juce_ComponentDragger.cpp"; sourceTree = "SOURCE_ROOT"; };
1161+
EA73332E3D5AEC04ADDFBB2A = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioDataConverters.h"; path = "../../JuceLibraryCode/modules/juce_audio_basics/buffers/juce_AudioDataConverters.h"; sourceTree = "SOURCE_ROOT"; };
11591162
EAB637B566FEBBDADA654262 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_VSTMidiEventList.h"; path = "../../JuceLibraryCode/modules/juce_audio_processors/format_types/juce_VSTMidiEventList.h"; sourceTree = "SOURCE_ROOT"; };
11601163
EAB6A66678B122C578B16445 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_HighResolutionTimer.h"; path = "../../JuceLibraryCode/modules/juce_core/threads/juce_HighResolutionTimer.h"; sourceTree = "SOURCE_ROOT"; };
11611164
EAC262A83CD2BEA14542AE89 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_StringPool.h"; path = "../../JuceLibraryCode/modules/juce_core/text/juce_StringPool.h"; sourceTree = "SOURCE_ROOT"; };
@@ -1501,6 +1504,8 @@
15011504
E2624A71F15AE5C96B34505B,
15021505
C4B85C0286AC2510730355E3, ); name = Processors; sourceTree = "<group>"; };
15031506
9FD23BB71495B921F7AC315C = {isa = PBXGroup; children = (
1507+
6F201AA651C426427E515AF2,
1508+
C6B404239BFB396294D92170,
15041509
0BD711FD3C982C60B294F311,
15051510
8FB4ED771FADEC613566CE7D, ); name = Utils; sourceTree = "<group>"; };
15061511
25D496F2BBBF4F8E2BC09479 = {isa = PBXGroup; children = (
@@ -2799,6 +2804,7 @@
27992804
1B620FC17AAECA4C5DE741E2,
28002805
19BB86C918F89D1377F8A0E1,
28012806
89223664B6CB2A912E36B091,
2807+
EE60D8FC7DCEC9C9AE545F4D,
28022808
43BDE8C7A1D17FC0CD2EF00D,
28032809
5A43E4E1547CBD9C2A635AEE,
28042810
8C78E9A851776185755D708E,

‎Builds/VisualStudio2012/open-ephys.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,7 @@
322322
<ClCompile Include="..\..\Source\Processors\Visualization\DataWindow.cpp"/>
323323
<ClCompile Include="..\..\Source\Processors\Visualization\SpikeObject.cpp"/>
324324
<ClCompile Include="..\..\Source\Processors\Visualization\MatlabLikePlot.cpp"/>
325+
<ClCompile Include="..\..\Source\UI\Utils\LinearButtonGroupManager.cpp"/>
325326
<ClCompile Include="..\..\Source\UI\Utils\ButtonGroupManager.cpp"/>
326327
<ClCompile Include="..\..\Source\UI\LookAndFeel\MaterialButtonLookAndFeel.cpp"/>
327328
<ClCompile Include="..\..\Source\UI\LookAndFeel\MaterialSliderLookAndFeel.cpp"/>
@@ -1537,6 +1538,7 @@
15371538
<ClInclude Include="..\..\Source\Processors\Visualization\SpikeObject.h"/>
15381539
<ClInclude Include="..\..\Source\Processors\Visualization\Visualizer.h"/>
15391540
<ClInclude Include="..\..\Source\Processors\Visualization\MatlabLikePlot.h"/>
1541+
<ClInclude Include="..\..\Source\UI\Utils\LinearButtonGroupManager.h"/>
15401542
<ClInclude Include="..\..\Source\UI\Utils\ButtonGroupManager.h"/>
15411543
<ClInclude Include="..\..\Source\UI\LookAndFeel\MaterialButtonLookAndFeel.h"/>
15421544
<ClInclude Include="..\..\Source\UI\LookAndFeel\MaterialSliderLookAndFeel.h"/>

‎Builds/VisualStudio2012/open-ephys.vcxproj.filters‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -604,6 +604,9 @@
604604
<ClCompile Include="..\..\Source\Processors\Visualization\MatlabLikePlot.cpp">
605605
<Filter>open-ephys\Source\Processors\Visualization</Filter>
606606
</ClCompile>
607+
<ClCompile Include="..\..\Source\UI\Utils\LinearButtonGroupManager.cpp">
608+
<Filter>open-ephys\Source\UI\Utils</Filter>
609+
</ClCompile>
607610
<ClCompile Include="..\..\Source\UI\Utils\ButtonGroupManager.cpp">
608611
<Filter>open-ephys\Source\UI\Utils</Filter>
609612
</ClCompile>
@@ -2106,6 +2109,9 @@
21062109
<ClInclude Include="..\..\Source\Processors\Visualization\MatlabLikePlot.h">
21072110
<Filter>open-ephys\Source\Processors\Visualization</Filter>
21082111
</ClInclude>
2112+
<ClInclude Include="..\..\Source\UI\Utils\LinearButtonGroupManager.h">
2113+
<Filter>open-ephys\Source\UI\Utils</Filter>
2114+
</ClInclude>
21092115
<ClInclude Include="..\..\Source\UI\Utils\ButtonGroupManager.h">
21102116
<Filter>open-ephys\Source\UI\Utils</Filter>
21112117
</ClInclude>

‎Builds/VisualStudio2013/open-ephys.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,7 @@
326326
<ClCompile Include="..\..\Source\Processors\Visualization\DataWindow.cpp"/>
327327
<ClCompile Include="..\..\Source\Processors\Visualization\SpikeObject.cpp"/>
328328
<ClCompile Include="..\..\Source\Processors\Visualization\MatlabLikePlot.cpp"/>
329+
<ClCompile Include="..\..\Source\UI\Utils\LinearButtonGroupManager.cpp"/>
329330
<ClCompile Include="..\..\Source\UI\Utils\ButtonGroupManager.cpp"/>
330331
<ClCompile Include="..\..\Source\UI\LookAndFeel\MaterialButtonLookAndFeel.cpp"/>
331332
<ClCompile Include="..\..\Source\UI\LookAndFeel\MaterialSliderLookAndFeel.cpp"/>
@@ -1541,6 +1542,7 @@
15411542
<ClInclude Include="..\..\Source\Processors\Visualization\SpikeObject.h"/>
15421543
<ClInclude Include="..\..\Source\Processors\Visualization\Visualizer.h"/>
15431544
<ClInclude Include="..\..\Source\Processors\Visualization\MatlabLikePlot.h"/>
1545+
<ClInclude Include="..\..\Source\UI\Utils\LinearButtonGroupManager.h"/>
15441546
<ClInclude Include="..\..\Source\UI\Utils\ButtonGroupManager.h"/>
15451547
<ClInclude Include="..\..\Source\UI\LookAndFeel\MaterialButtonLookAndFeel.h"/>
15461548
<ClInclude Include="..\..\Source\UI\LookAndFeel\MaterialSliderLookAndFeel.h"/>

‎Builds/VisualStudio2013/open-ephys.vcxproj.filters‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -604,6 +604,9 @@
604604
<ClCompile Include="..\..\Source\Processors\Visualization\MatlabLikePlot.cpp">
605605
<Filter>open-ephys\Source\Processors\Visualization</Filter>
606606
</ClCompile>
607+
<ClCompile Include="..\..\Source\UI\Utils\LinearButtonGroupManager.cpp">
608+
<Filter>open-ephys\Source\UI\Utils</Filter>
609+
</ClCompile>
607610
<ClCompile Include="..\..\Source\UI\Utils\ButtonGroupManager.cpp">
608611
<Filter>open-ephys\Source\UI\Utils</Filter>
609612
</ClCompile>
@@ -2106,6 +2109,9 @@
21062109
<ClInclude Include="..\..\Source\Processors\Visualization\MatlabLikePlot.h">
21072110
<Filter>open-ephys\Source\Processors\Visualization</Filter>
21082111
</ClInclude>
2112+
<ClInclude Include="..\..\Source\UI\Utils\LinearButtonGroupManager.h">
2113+
<Filter>open-ephys\Source\UI\Utils</Filter>
2114+
</ClInclude>
21092115
<ClInclude Include="..\..\Source\UI\Utils\ButtonGroupManager.h">
21102116
<Filter>open-ephys\Source\UI\Utils</Filter>
21112117
</ClInclude>

‎Source/Plugins/CAR/CAREditor.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ static const Font FONT_LABELS ("Default", 13.f, Font::plain);
3636
CAREditor::CAREditor (GenericProcessor* parentProcessor, bool useDefaultParameterEditors)
3737
: GenericEditor (parentProcessor, useDefaultParameterEditors)
3838
, m_currentChannelsView (REFERENCE_CHANNELS)
39-
, m_channelSelectorButtonManager (new ButtonGroupManager)
39+
, m_channelSelectorButtonManager (new LinearButtonGroupManager)
4040
, m_gainSlider (new ParameterSlider (0.0, 100.0, 100.0, FONT_LABELS))
4141
{
4242
TextButton* referenceChannelsButton = new TextButton ("Reference", "Switch to reference channels");
@@ -57,9 +57,9 @@ CAREditor::CAREditor (GenericProcessor* parentProcessor, bool useDefaultParamete
5757
m_channelSelectorButtonManager->setRadioButtonMode (true);
5858
m_channelSelectorButtonManager->setButtonListener (this);
5959
m_channelSelectorButtonManager->setButtonsLookAndFeel (m_materialButtonLookAndFeel);
60-
m_channelSelectorButtonManager->setBackgroundColour (Colours::white);
61-
m_channelSelectorButtonManager->setOutlineColour (Colour (0x0));
62-
m_channelSelectorButtonManager->setAccentColour (COLOUR_ACCENT);
60+
m_channelSelectorButtonManager->setColour (ButtonGroupManager::backgroundColourId, Colours::white);
61+
m_channelSelectorButtonManager->setColour (ButtonGroupManager::outlineColourId, Colour (0x0));
62+
m_channelSelectorButtonManager->setColour (LinearButtonGroupManager::accentColourId, COLOUR_ACCENT);
6363
addAndMakeVisible (m_channelSelectorButtonManager);
6464

6565
m_gainSlider->setColour (Slider::rotarySliderFillColourId, Colour::fromRGB (255, 193, 7));

‎Source/Plugins/CAR/CAREditor.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ class CAREditor : public GenericEditor
6464

6565
ChannelsType m_currentChannelsView;
6666

67-
ScopedPointer<ButtonGroupManager> m_channelSelectorButtonManager;
68-
ScopedPointer<ParameterSlider> m_gainSlider;
67+
ScopedPointer<LinearButtonGroupManager> m_channelSelectorButtonManager;
68+
ScopedPointer<ParameterSlider> m_gainSlider;
6969

7070
// LookAndFeel
7171
SharedResourcePointer<MaterialButtonLookAndFeel> m_materialButtonLookAndFeel;

‎Source/Plugins/Headers/UIUtilitiesHeaders.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
2525
This header contains all needed UI utuility components for plugins.
2626
*/
2727

28-
#include "../../UI/Utils/ButtonGroupManager.h"
28+
#include "../../UI/Utils/LinearButtonGroupManager.h"

0 commit comments

Comments
 (0)