Skip to content

Commit b0fac54

Browse files
committed
SlicerChannelSelectorComponent: Behaviour and UI improvements.
* Updated images for collapse/show button; * Updated animations; * Some other small UI improvements; * Added possibility to collapse element by clicking "ESC" key either on the component itself or on the TextEditor.
1 parent 5610198 commit b0fac54

12 files changed

Lines changed: 554 additions & 102 deletions

File tree

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -918,6 +918,7 @@
918918
B2241E3C5C9F93389586F357 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DirectoryIterator.h"; path = "../../JuceLibraryCode/modules/juce_core/files/juce_DirectoryIterator.h"; sourceTree = "SOURCE_ROOT"; };
919919
B23E6EBB5F99CF7FC72FAC4E = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = VisualizerEditor.h; path = ../../Source/Processors/Editors/VisualizerEditor.h; sourceTree = "SOURCE_ROOT"; };
920920
B24098EC4FD79D5EDC9383EC = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Initialisation.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/application/juce_Initialisation.h"; sourceTree = "SOURCE_ROOT"; };
921+
B2526F15A2C024C7C33A4AD4 = {isa = PBXFileReference; lastKnownFileType = image.png; name = "dropdown_arrow_rotated.png"; path = "../../Resources/Images/Buttons/dropdown_arrow_rotated.png"; sourceTree = "SOURCE_ROOT"; };
921922
B2EF409A1F459E964756BA7C = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_FileInputStream.cpp"; path = "../../JuceLibraryCode/modules/juce_core/files/juce_FileInputStream.cpp"; sourceTree = "SOURCE_ROOT"; };
922923
B2FA9CC4754E136F22281176 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ImageEffectFilter.h"; path = "../../JuceLibraryCode/modules/juce_graphics/effects/juce_ImageEffectFilter.h"; sourceTree = "SOURCE_ROOT"; };
923924
B3BAC48D01C49D8727D08097 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ListBox.cpp"; path = "../../JuceLibraryCode/modules/juce_gui_basics/widgets/juce_ListBox.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -1167,7 +1168,6 @@
11671168
EA9518CDEA7049C21D5CE2D5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Process.h"; path = "../../JuceLibraryCode/modules/juce_core/threads/juce_Process.h"; sourceTree = "SOURCE_ROOT"; };
11681169
EAB6A66678B122C578B16445 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_HighResolutionTimer.h"; path = "../../JuceLibraryCode/modules/juce_core/threads/juce_HighResolutionTimer.h"; sourceTree = "SOURCE_ROOT"; };
11691170
EAC262A83CD2BEA14542AE89 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_StringPool.h"; path = "../../JuceLibraryCode/modules/juce_core/text/juce_StringPool.h"; sourceTree = "SOURCE_ROOT"; };
1170-
EF3F9AA8D70E1D4D55F13182 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AudioThumbnail.cpp"; path = "../../JuceLibraryCode/modules/juce_audio_utils/gui/juce_AudioThumbnail.cpp"; sourceTree = "SOURCE_ROOT"; };
11711171
F5A00ACFA3D76168F22F1205 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
11721172
99E1BC08B886CFDD2CCFD462 = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "open-ephys.app"; sourceTree = "BUILT_PRODUCTS_DIR"; };
11731173
E39CC410838072043E3C30DC = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = OriginalRecording.cpp; path = ../../Source/Processors/RecordNode/OriginalRecording.cpp; sourceTree = "SOURCE_ROOT"; };
@@ -1199,6 +1199,7 @@
11991199
EEA51B7EF1CF19028C6672E0 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_DocumentWindow.cpp"; path = "../../JuceLibraryCode/modules/juce_gui_basics/windows/juce_DocumentWindow.cpp"; sourceTree = "SOURCE_ROOT"; };
12001200
EEFC66D2DF5FD66B4D83B22F = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Component.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/components/juce_Component.h"; sourceTree = "SOURCE_ROOT"; };
12011201
EF059B26886B32000BCF8CFF = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MouseInputSource.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/mouse/juce_MouseInputSource.h"; sourceTree = "SOURCE_ROOT"; };
1202+
EF3F9AA8D70E1D4D55F13182 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AudioThumbnail.cpp"; path = "../../JuceLibraryCode/modules/juce_audio_utils/gui/juce_AudioThumbnail.cpp"; sourceTree = "SOURCE_ROOT"; };
12021203
EF4A6E0E1232071252ACCD7B = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_RelativeParallelogram.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/positioning/juce_RelativeParallelogram.h"; sourceTree = "SOURCE_ROOT"; };
12031204
EF610B2A17D9B1C0D24DCE67 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_android_JNIHelpers.h"; path = "../../JuceLibraryCode/modules/juce_core/native/juce_android_JNIHelpers.h"; sourceTree = "SOURCE_ROOT"; };
12041205
EF7B66764093D950724EFE70 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_OpenGLShaderProgram.h"; path = "../../JuceLibraryCode/modules/juce_opengl/opengl/juce_OpenGLShaderProgram.h"; sourceTree = "SOURCE_ROOT"; };
@@ -1325,6 +1326,7 @@
13251326
8AE2DDA47B2DFDEEEF69B12F,
13261327
DA0AE9F4A1DDC3555247216F, ); name = Icons; sourceTree = "<group>"; };
13271328
5B916D6239703986EFCDB624 = {isa = PBXGroup; children = (
1329+
B2526F15A2C024C7C33A4AD4,
13281330
489FFFB50604DA6AC9BE24AF,
13291331
C5D9C53AE4AE414244E1E19A,
13301332
A764EF4F46F472715B250E41,

Builds/VisualStudio2012/open-ephys.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2072,6 +2072,7 @@
20722072
<None Include="..\..\Resources\Images\Icons\DefaultDataSource.png"/>
20732073
<None Include="..\..\Resources\Images\Icons\FileReaderIcon.png"/>
20742074
<None Include="..\..\Resources\Images\Icons\IntanIcon.png"/>
2075+
<None Include="..\..\Resources\Images\Buttons\dropdown_arrow_rotated.png"/>
20752076
<None Include="..\..\Resources\Images\Buttons\dropdown_arrow.png"/>
20762077
<None Include="..\..\Resources\Images\Buttons\muteoff.png"/>
20772078
<None Include="..\..\Resources\Images\Buttons\muteon.png"/>

Builds/VisualStudio2012/open-ephys.vcxproj.filters

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3713,6 +3713,9 @@
37133713
<None Include="..\..\Resources\Images\Icons\IntanIcon.png">
37143714
<Filter>open-ephys\Resources\Images\Icons</Filter>
37153715
</None>
3716+
<None Include="..\..\Resources\Images\Buttons\dropdown_arrow_rotated.png">
3717+
<Filter>open-ephys\Resources\Images\Buttons</Filter>
3718+
</None>
37163719
<None Include="..\..\Resources\Images\Buttons\dropdown_arrow.png">
37173720
<Filter>open-ephys\Resources\Images\Buttons</Filter>
37183721
</None>

Builds/VisualStudio2013/open-ephys.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2076,6 +2076,7 @@
20762076
<None Include="..\..\Resources\Images\Icons\DefaultDataSource.png"/>
20772077
<None Include="..\..\Resources\Images\Icons\FileReaderIcon.png"/>
20782078
<None Include="..\..\Resources\Images\Icons\IntanIcon.png"/>
2079+
<None Include="..\..\Resources\Images\Buttons\dropdown_arrow_rotated.png"/>
20792080
<None Include="..\..\Resources\Images\Buttons\dropdown_arrow.png"/>
20802081
<None Include="..\..\Resources\Images\Buttons\muteoff.png"/>
20812082
<None Include="..\..\Resources\Images\Buttons\muteon.png"/>

Builds/VisualStudio2013/open-ephys.vcxproj.filters

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3713,6 +3713,9 @@
37133713
<None Include="..\..\Resources\Images\Icons\IntanIcon.png">
37143714
<Filter>open-ephys\Resources\Images\Icons</Filter>
37153715
</None>
3716+
<None Include="..\..\Resources\Images\Buttons\dropdown_arrow_rotated.png">
3717+
<Filter>open-ephys\Resources\Images\Buttons</Filter>
3718+
</None>
37163719
<None Include="..\..\Resources\Images\Buttons\dropdown_arrow.png">
37173720
<Filter>open-ephys\Resources\Images\Buttons</Filter>
37183721
</None>

0 commit comments

Comments
 (0)