reorganize files, start colour dropdown implementation in key editor …

…controls
vsicurella · Aug 11, 2024 · a11aeab · a11aeab
1 parent 4f576af
commit a11aeab
Show file tree

Hide file tree

Showing 92 changed files with 3,173 additions and 3,167 deletions.
diff --git a/Source/LumatoneEditorFonts.h b/Source/LumatoneEditorFonts.h
diff --git a/Source/LumatoneMenu.cpp b/Source/LumatoneMenu.cpp
@@ -9,7 +9,6 @@
 */
 
 #include "LumatoneMenu.h"
-#include "./LumatoneEditorState.h"
 
 namespace Lumatone {
 	namespace Menu {

diff --git a/Source/LumatoneMenu.h b/Source/LumatoneMenu.h
@@ -12,7 +12,7 @@
 
 #include <JuceHeader.h>
 
-#include "LumatoneEditorState.h"
+#include "./data/LumatoneEditorState.h"
 
 namespace Lumatone {
 	namespace Menu {

diff --git a/Source/Main.cpp b/Source/Main.cpp
@@ -12,11 +12,11 @@
 #include "Main.h"
 
 #include "MainWindow.h"
-#include "MainComponent.h"
+#include "./components/MainComponent.h"
 
-#include "FirmwareTransfer.h"
+#include "./firmware/FirmwareTransfer.h"
 
-#include "LumatoneEditorLookAndFeel.h"
+#include "./style/LumatoneEditorLookAndFeel.h"
 
 #include "./actions/KeySelectionControlActions.h"
 
@@ -25,8 +25,8 @@
 #include "./lumatone_editor_library/graphics/view_constants.h"
 #include "./lumatone_editor_library/palettes/colour_palette_file.h"
 
-#include "VelocityCurveDlgBase.h"
-#include "NoteOnOffVelocityCurveDialog.h"
+// #include "VelocityCurveDlgBase.h"
+// #include "NoteOnOffVelocityCurveDialog.h"
 #include "LumatoneMenu.h"
 
 //==============================================================================

diff --git a/Source/Main.h b/Source/Main.h
@@ -14,9 +14,9 @@
 
 #include "./lumatone_editor_library/lumatone_midi_driver/lumatone_midi_driver.h"
 
-#include "./LumatoneEditorState.h"
+#include "./data/LumatoneEditorState.h"
 
-#include "LocalisationMap.h"
+#include "./style/LocalisationMap.h"
 
 #define CHOOSE_FILE_NOOP [](bool) -> void {}
 

diff --git a/Source/MainWindow.cpp b/Source/MainWindow.cpp
@@ -8,13 +8,12 @@
 */
 
 #include "MainWindow.h"
-#include "MainComponent.h"
-
 #include "LumatoneMenu.h"
 
-#include "LumatoneEditorLookAndFeel.h"
-#include "./lumatone_editor_library/palettes/colour_palette_file.h"
+#include "./components/MainComponent.h"
+#include "./style/LumatoneEditorLookAndFeel.h"
 
+#include "./lumatone_editor_library/palettes/colour_palette_file.h"
 #include "./lumatone_editor_library/graphics/view_constants.h"
 
 MainWindow::MainWindow(const LumatoneEditorState& stateIn, juce::ApplicationCommandManager* cmdManager)

diff --git a/Source/MainWindow.h b/Source/MainWindow.h
@@ -10,7 +10,7 @@
 #pragma once
 #include <JuceHeader.h>
 
-#include "LumatoneEditorState.h"
+#include "./data/LumatoneEditorState.h"
 
 #include "./lumatone_editor_library/listeners/editor_listener.h"
 

diff --git a/Source/Settings/CalibrationDlg.cpp b/Source/Settings/CalibrationDlg.cpp
@@ -20,7 +20,7 @@
 //[Headers] You can add your own extra header files here...
 #include "WheelsCalibrationComponent.h"
 
-#include "../LumatoneEditorLookAndFeel.h"
+#include "../style/LumatoneEditorLookAndFeel.h"
 
 #include "../lumatone_editor_library/graphics/view_constants.h"
 #include "../lumatone_editor_library/device/lumatone_controller.h"

diff --git a/Source/Settings/CalibrationDlg.h b/Source/Settings/CalibrationDlg.h
@@ -21,7 +21,7 @@
 
 //[Headers]     -- You can add your own extra header files here --
 
-#include "../LumatoneEditorState.h"
+#include "../data/LumatoneEditorState.h"
 #include "../lumatone_editor_library/lumatone_midi_driver/firmware_types.h"
 #include "../lumatone_editor_library/listeners/firmware_listener.h"
 

diff --git a/Source/Settings/FirmwareDlg.cpp b/Source/Settings/FirmwareDlg.cpp
@@ -10,8 +10,8 @@
 
 #include "FirmwareDlg.h"
 
-#include "../LumatoneEditorLookAndFeel.h"
-#include "../LumatoneEditorFontLibrary.h"
+#include "../style/LumatoneEditorLookAndFeel.h"
+#include "../style/LumatoneEditorFontLibrary.h"
 
 #include "../lumatone_editor_library/device/lumatone_controller.h"
 

diff --git a/Source/Settings/FirmwareDlg.h b/Source/Settings/FirmwareDlg.h
@@ -10,9 +10,9 @@
 
 #pragma once
 
-#include "../LumatoneEditorState.h"
-#include "../FileBrowserComponent.h"
-#include "../FirmwareTransfer.h"
+#include "../data/LumatoneEditorState.h"
+#include "../controls/FileBrowserComponent.h"
+#include "../firmware/FirmwareTransfer.h"
 
 #include "../lumatone_editor_library/listeners/firmware_listener.h"
 

diff --git a/Source/Settings/MidiSettingsDlg.cpp b/Source/Settings/MidiSettingsDlg.cpp
@@ -10,7 +10,7 @@
 
 #include "MidiSettingsDlg.h"
 
-#include "../LumatoneEditorFontLibrary.h"
+#include "../style/LumatoneEditorFontLibrary.h"
 
 #include "../lumatone_editor_library/device/lumatone_controller.h"
 

diff --git a/Source/Settings/MidiSettingsDlg.h b/Source/Settings/MidiSettingsDlg.h
@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include "../LumatoneEditorState.h"
+#include "../data/LumatoneEditorState.h"
 
 #include "../lumatone_editor_library/listeners/firmware_listener.h"
 #include "../lumatone_editor_library/lumatone_midi_driver/firmware_types.h"

diff --git a/Source/Settings/PresetSettingsDlg.h b/Source/Settings/PresetSettingsDlg.h
@@ -11,7 +11,7 @@
 #pragma once
 #include <JuceHeader.h>
 
-#include "../LumatoneEditorState.h"
+#include "../data/LumatoneEditorState.h"
 
 #include "../lumatone_editor_library/listeners/firmware_listener.h"
 #include "../lumatone_editor_library/lumatone_midi_driver/firmware_types.h"

diff --git a/Source/Settings/SettingsContainer.cpp b/Source/Settings/SettingsContainer.cpp
@@ -10,7 +10,7 @@
 
 #include "SettingsContainer.h"
 
-#include "../LumatoneEditorLookAndFeel.h"
+#include "../style/LumatoneEditorLookAndFeel.h"
 
 #include "CalibrationDlg.h"
 #include "FirmwareDlg.h"

diff --git a/Source/Settings/SettingsContainer.h b/Source/Settings/SettingsContainer.h
@@ -11,7 +11,7 @@
 #pragma once
 #include <JuceHeader.h>
 
-#include "../LumatoneEditorState.h"
+#include "../data/LumatoneEditorState.h"
 
 typedef enum {
     Calibration = 0,

diff --git a/Source/actions/BatchColourActions.h b/Source/actions/BatchColourActions.h
@@ -11,7 +11,7 @@
 #ifndef LUMATONE_EDITOR_BATCH_COLOUR_ACTIONS_H
 #define LUMATONE_EDITOR_BATCH_COLOUR_ACTIONS_H
 
-#include "../LumatoneEditorState.h"
+#include "../data/LumatoneEditorState.h"
 #include "../lumatone_editor_library/actions/lumatone_action.h"
 #include "../data/LumatoneEditorBatchColourState.h"
 

diff --git a/Source/actions/EditorControlActions.h b/Source/actions/EditorControlActions.h
@@ -11,7 +11,7 @@
 #ifndef LUMATONE_EDITOR_CONTROL_ACTIONS_H
 #define LUMATONE_EDITOR_CONTROL_ACTIONS_H
 
-#include "../LumatoneEditorState.h"
+#include "../data/LumatoneEditorState.h"
 #include "../lumatone_editor_library/actions/lumatone_action.h"
 #include "../data/LumatoneEditSelectionState.h"
 

diff --git a/Source/actions/KeySelectionControlActions.h b/Source/actions/KeySelectionControlActions.h
@@ -11,7 +11,7 @@
 #ifndef LUMATONE_SELECTION_CONTROL_ACTIONS_H
 #define LUMATONE_SELECTION_CONTROL_ACTIONS_H
 
-#include "../LumatoneEditorState.h"
+#include "../data/LumatoneEditorState.h"
 #include "../lumatone_editor_library/actions/lumatone_action.h"
 #include "../data/LumatoneEditSelectionState.h"
 

diff --git a/...mapping_editors/KeyboardClickListener.cpp → Source/actions/KeyboardClickListener.cpp b/...mapping_editors/KeyboardClickListener.cpp → Source/actions/KeyboardClickListener.cpp
@@ -1,6 +1,6 @@
 #include "KeyboardClickListener.h"
 
-#include "../actions/KeySelectionControlActions.h"
+#include "./KeySelectionControlActions.h"
 
 KeyboardClickListener::KeyboardClickListener(const LumatoneEditorState &stateIn, LumatoneKeyboardComponent *keyboardComponentIn)
     : LumatoneEditorState("LumatoneKeyboardClickListener", stateIn)

diff --git a/...e/mapping_editors/KeyboardClickListener.h → Source/actions/KeyboardClickListener.h b/...e/mapping_editors/KeyboardClickListener.h → Source/actions/KeyboardClickListener.h
@@ -11,7 +11,7 @@
 #ifndef LUMATONE_KEY_SELECTION_CONTROLLER_H
 #define LUMATONE_KEY_SELECTION_CONTROLLER_H
 
-#include "../LumatoneEditorState.h"
+#include "../data/LumatoneEditorState.h"
 #include "../lumatone_editor_library/ui/keyboard_component.h"
 #include "../lumatone_editor_library/palettes/colour_selection_broadcaster.h"
 // Maybe KeyboardComponentSelectionController

diff --git a/Source/ColourPaletteWindow.cpp → Source/components/ColourPaletteWindow.cpp b/Source/ColourPaletteWindow.cpp → Source/components/ColourPaletteWindow.cpp
@@ -10,13 +10,13 @@
 
 #include "ColourPaletteWindow.h"
 
-#include "./lumatone_editor_library/palettes/colour_selection_group.h"
-#include "./lumatone_editor_library/palettes/colour_picker_panel.h"
+#include "../lumatone_editor_library/palettes/colour_picker_panel.h"
+#include "../lumatone_editor_library/palettes/colour_selection_group.h"
 
-#include "./colour_palette_component.h"
+#include "../controls/colour_palette_component.h"
 #include "./palette_edit_panel.h"
 
-#include "./LumatoneEditorLookAndFeel.h"
+#include "../style/LumatoneEditorLookAndFeel.h"
 
 
 //==============================================================================

diff --git a/Source/ColourPaletteWindow.h → Source/components/ColourPaletteWindow.h b/Source/ColourPaletteWindow.h → Source/components/ColourPaletteWindow.h
@@ -10,12 +10,12 @@
 
 #pragma once
 
-#include "./lumatone_editor_library/palettes/colour_selection_group.h"
-#include "./lumatone_editor_library/palettes/colour_palette_file.h"
+#include "./../lumatone_editor_library/palettes/colour_selection_group.h"
+#include "./../lumatone_editor_library/palettes/colour_palette_file.h"
 
 #include "./palette_selection_panel.h"
 
-#include "./LumatoneEditorState.h"
+#include "../data/LumatoneEditorState.h"
 
 class ColourSelectionGroup;
 class ColourPaletteComponent;