diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f740b44d514..e16881e1d12 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -33,6 +33,7 @@ INCLUDE_DIRECTORIES( "${CMAKE_SOURCE_DIR}/include" "${CMAKE_SOURCE_DIR}/src/core/include" "${CMAKE_SOURCE_DIR}/src/gui/include" + "${CMAKE_SOURCE_DIR}/src" ) IF(WIN32 AND MSVC) diff --git a/src/gui/include/ActionGroup.h b/src/gui/ActionGroup.h similarity index 100% rename from src/gui/include/ActionGroup.h rename to src/gui/ActionGroup.h diff --git a/src/gui/include/AudioAlsaSetupWidget.h b/src/gui/AudioAlsaSetupWidget.h similarity index 100% rename from src/gui/include/AudioAlsaSetupWidget.h rename to src/gui/AudioAlsaSetupWidget.h diff --git a/src/gui/AutomatableModelView.cpp b/src/gui/AutomatableModelView.cpp index 0e364993f06..44080b88ecb 100644 --- a/src/gui/AutomatableModelView.cpp +++ b/src/gui/AutomatableModelView.cpp @@ -27,7 +27,7 @@ #include "AutomatableModelView.h" #include "AutomationClip.h" -#include "ControllerConnectionDialog.h" +#include "modals/ControllerConnectionDialog.h" #include "ControllerConnection.h" #include "embed.h" #include "GuiApplication.h" diff --git a/src/gui/include/ColorHelper.h b/src/gui/ColorHelper.h similarity index 100% rename from src/gui/include/ColorHelper.h rename to src/gui/ColorHelper.h diff --git a/src/gui/include/ControlLayout.h b/src/gui/ControlLayout.h similarity index 100% rename from src/gui/include/ControlLayout.h rename to src/gui/ControlLayout.h diff --git a/src/gui/include/ControllerView.h b/src/gui/ControllerView.h similarity index 100% rename from src/gui/include/ControllerView.h rename to src/gui/ControllerView.h diff --git a/src/gui/include/Controls.h b/src/gui/Controls.h similarity index 100% rename from src/gui/include/Controls.h rename to src/gui/Controls.h diff --git a/src/gui/include/DeprecationHelper.h b/src/gui/DeprecationHelper.h similarity index 100% rename from src/gui/include/DeprecationHelper.h rename to src/gui/DeprecationHelper.h diff --git a/src/gui/EffectRackView.cpp b/src/gui/EffectRackView.cpp index 478e117fe80..5ca8acb3370 100644 --- a/src/gui/EffectRackView.cpp +++ b/src/gui/EffectRackView.cpp @@ -30,9 +30,9 @@ #include #include "EffectRackView.h" -#include "EffectSelectDialog.h" +#include "modals/EffectSelectDialog.h" #include "EffectView.h" -#include "GroupBox.h" +#include "widgets/GroupBox.h" namespace lmms::gui diff --git a/src/gui/FileBrowser.cpp b/src/gui/FileBrowser.cpp index e5168fac8bb..83f22db1154 100644 --- a/src/gui/FileBrowser.cpp +++ b/src/gui/FileBrowser.cpp @@ -51,7 +51,7 @@ #include "ImportFilter.h" #include "Instrument.h" #include "InstrumentTrack.h" -#include "InstrumentTrackWindow.h" +#include "instrument/InstrumentTrackWindow.h" #include "MainWindow.h" #include "PatternStore.h" #include "PluginFactory.h" diff --git a/src/gui/include/FileBrowser.h b/src/gui/FileBrowser.h similarity index 100% rename from src/gui/include/FileBrowser.h rename to src/gui/FileBrowser.h diff --git a/src/gui/include/LmmsPalette.h b/src/gui/LmmsPalette.h similarity index 100% rename from src/gui/include/LmmsPalette.h rename to src/gui/LmmsPalette.h diff --git a/src/gui/include/LmmsStyle.h b/src/gui/LmmsStyle.h similarity index 100% rename from src/gui/include/LmmsStyle.h rename to src/gui/LmmsStyle.h diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index d534be96f3f..c0bd9db813f 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -35,7 +35,7 @@ #include #include -#include "AboutDialog.h" +#include "modals/AboutDialog.h" #include "AutomationEditor.h" #include "ControllerRackView.h" #include "embed.h" @@ -47,7 +47,7 @@ #include "GuiApplication.h" #include "ImportFilter.h" #include "InstrumentTrackView.h" -#include "InstrumentTrackWindow.h" +#include "instrument/InstrumentTrackWindow.h" #include "MicrotunerConfig.h" #include "PatternEditor.h" #include "PianoRoll.h" @@ -58,18 +58,18 @@ #include "ProjectJournal.h" #include "ProjectNotes.h" #include "ProjectRenderer.h" -#include "RecentProjectsMenu.h" +#include "menus/RecentProjectsMenu.h" #include "RemotePlugin.h" -#include "SetupDialog.h" +#include "modals/SetupDialog.h" #include "SideBar.h" #include "SongEditor.h" #include "SubWindow.h" -#include "TemplatesMenu.h" +#include "menus/TemplatesMenu.h" #include "TextFloat.h" #include "TimeLineWidget.h" -#include "ToolButton.h" +#include "widgets/ToolButton.h" #include "ToolPlugin.h" -#include "VersionedSaveDialog.h" +#include "modals/VersionedSaveDialog.h" #include "lmmsversion.h" diff --git a/src/gui/include/MicrotunerConfig.h b/src/gui/MicrotunerConfig.h similarity index 100% rename from src/gui/include/MicrotunerConfig.h rename to src/gui/MicrotunerConfig.h diff --git a/src/gui/MidiCCRackView.cpp b/src/gui/MidiCCRackView.cpp index a0b1496fb54..044f698a037 100644 --- a/src/gui/MidiCCRackView.cpp +++ b/src/gui/MidiCCRackView.cpp @@ -31,7 +31,7 @@ #include #include "embed.h" -#include "GroupBox.h" +#include "widgets/GroupBox.h" #include "GuiApplication.h" #include "InstrumentTrack.h" #include "Knob.h" diff --git a/src/gui/include/MidiCCRackView.h b/src/gui/MidiCCRackView.h similarity index 100% rename from src/gui/include/MidiCCRackView.h rename to src/gui/MidiCCRackView.h diff --git a/src/gui/include/MidiSetupWidget.h b/src/gui/MidiSetupWidget.h similarity index 100% rename from src/gui/include/MidiSetupWidget.h rename to src/gui/MidiSetupWidget.h diff --git a/src/gui/MixerChannelView.cpp b/src/gui/MixerChannelView.cpp index 2a1fe09289e..b68c7bc5df8 100644 --- a/src/gui/MixerChannelView.cpp +++ b/src/gui/MixerChannelView.cpp @@ -28,7 +28,7 @@ #include "Mixer.h" #include "MixerChannelView.h" #include "MixerView.h" -#include "PeakIndicator.h" +#include "widgets/PeakIndicator.h" #include "Song.h" #include "ConfigManager.h" diff --git a/src/gui/include/PluginBrowser.h b/src/gui/PluginBrowser.h similarity index 100% rename from src/gui/include/PluginBrowser.h rename to src/gui/PluginBrowser.h diff --git a/src/gui/include/RowTableView.h b/src/gui/RowTableView.h similarity index 100% rename from src/gui/include/RowTableView.h rename to src/gui/RowTableView.h diff --git a/src/gui/SampleTrackWindow.cpp b/src/gui/SampleTrackWindow.cpp index 81a2ca89b60..bd56a99bd9f 100644 --- a/src/gui/SampleTrackWindow.cpp +++ b/src/gui/SampleTrackWindow.cpp @@ -40,7 +40,7 @@ #include "SampleTrackView.h" #include "Song.h" #include "SubWindow.h" -#include "TrackLabelButton.h" +#include "tracks/TrackLabelButton.h" namespace lmms::gui { diff --git a/src/gui/include/SampleTrackWindow.h b/src/gui/SampleTrackWindow.h similarity index 100% rename from src/gui/include/SampleTrackWindow.h rename to src/gui/SampleTrackWindow.h diff --git a/src/gui/include/SideBar.h b/src/gui/SideBar.h similarity index 100% rename from src/gui/include/SideBar.h rename to src/gui/SideBar.h diff --git a/src/gui/include/SideBarWidget.h b/src/gui/SideBarWidget.h similarity index 100% rename from src/gui/include/SideBarWidget.h rename to src/gui/SideBarWidget.h diff --git a/src/gui/clips/AutomationClipView.cpp b/src/gui/clips/AutomationClipView.cpp index 9b71bb74c74..77810a1156f 100644 --- a/src/gui/clips/AutomationClipView.cpp +++ b/src/gui/clips/AutomationClipView.cpp @@ -33,7 +33,7 @@ #include "embed.h" #include "GuiApplication.h" #include "ProjectJournal.h" -#include "RenameDialog.h" +#include "gui/modals/RenameDialog.h" #include "StringPairDrag.h" #include "TextFloat.h" #include "Track.h" diff --git a/src/gui/clips/MidiClipView.cpp b/src/gui/clips/MidiClipView.cpp index b735913e4d0..f2c9aa47ee5 100644 --- a/src/gui/clips/MidiClipView.cpp +++ b/src/gui/clips/MidiClipView.cpp @@ -36,11 +36,11 @@ #include "AutomationEditor.h" #include "ConfigManager.h" -#include "DeprecationHelper.h" +#include "gui/DeprecationHelper.h" #include "GuiApplication.h" #include "MidiClip.h" #include "PianoRoll.h" -#include "RenameDialog.h" +#include "gui/modals/RenameDialog.h" #include "TrackView.h" namespace lmms::gui diff --git a/src/gui/clips/PatternClipView.cpp b/src/gui/clips/PatternClipView.cpp index bf12440c722..906eb50c342 100644 --- a/src/gui/clips/PatternClipView.cpp +++ b/src/gui/clips/PatternClipView.cpp @@ -33,7 +33,7 @@ #include "MainWindow.h" #include "PatternClip.h" #include "PatternStore.h" -#include "RenameDialog.h" +#include "gui/modals/RenameDialog.h" namespace lmms::gui { diff --git a/src/gui/editors/AutomationEditor.cpp b/src/gui/editors/AutomationEditor.cpp index a7ca0727972..2b5d815b226 100644 --- a/src/gui/editors/AutomationEditor.cpp +++ b/src/gui/editors/AutomationEditor.cpp @@ -45,10 +45,10 @@ #define __USE_XOPEN #endif -#include "ActionGroup.h" +#include "gui/ActionGroup.h" #include "AutomationNode.h" #include "ComboBox.h" -#include "DeprecationHelper.h" +#include "gui/DeprecationHelper.h" #include "DetuningHelper.h" #include "Engine.h" #include "GuiApplication.h" diff --git a/src/gui/editors/PianoRoll.cpp b/src/gui/editors/PianoRoll.cpp index 5811f956cc1..02bee3a2f4c 100644 --- a/src/gui/editors/PianoRoll.cpp +++ b/src/gui/editors/PianoRoll.cpp @@ -49,13 +49,13 @@ #include #include "AutomationEditor.h" -#include "ActionGroup.h" +#include "gui/ActionGroup.h" #include "Clipboard.h" #include "ComboBox.h" #include "ConfigManager.h" #include "DataFile.h" #include "debug.h" -#include "DeprecationHelper.h" +#include "gui/DeprecationHelper.h" #include "DetuningHelper.h" #include "embed.h" #include "GuiApplication.h" @@ -65,7 +65,7 @@ #include "PatternStore.h" #include "PianoView.h" #include "PositionLine.h" -#include "SimpleTextFloat.h" +#include "gui/widgets/SimpleTextFloat.h" #include "SongEditor.h" #include "StepRecorderWidget.h" #include "TextFloat.h" diff --git a/src/gui/include/PositionLine.h b/src/gui/editors/PositionLine.h similarity index 100% rename from src/gui/include/PositionLine.h rename to src/gui/editors/PositionLine.h diff --git a/src/gui/editors/SongEditor.cpp b/src/gui/editors/SongEditor.cpp index 9ba9ac083d4..2b1e1dbe591 100644 --- a/src/gui/editors/SongEditor.cpp +++ b/src/gui/editors/SongEditor.cpp @@ -34,26 +34,26 @@ #include #include -#include "ActionGroup.h" +#include "gui/ActionGroup.h" #include "AudioDevice.h" #include "AudioEngine.h" -#include "AutomatableSlider.h" +#include "gui/widgets/AutomatableSlider.h" #include "ClipView.h" #include "ComboBox.h" #include "ConfigManager.h" -#include "CPULoadWidget.h" -#include "DeprecationHelper.h" +#include "gui/widgets/CPULoadWidget.h" +#include "gui/DeprecationHelper.h" #include "embed.h" #include "GuiApplication.h" #include "LcdSpinBox.h" #include "MainWindow.h" -#include "MeterDialog.h" -#include "Oscilloscope.h" +#include "gui/widgets/MeterDialog.h" +#include "gui/widgets/Oscilloscope.h" #include "PianoRoll.h" #include "PositionLine.h" #include "SubWindow.h" #include "TextFloat.h" -#include "TimeDisplayWidget.h" +#include "gui/widgets/TimeDisplayWidget.h" #include "TimeLineWidget.h" #include "TrackView.h" diff --git a/src/gui/editors/TimeLineWidget.cpp b/src/gui/editors/TimeLineWidget.cpp index 7657e2916cd..ffa5ba249d7 100644 --- a/src/gui/editors/TimeLineWidget.cpp +++ b/src/gui/editors/TimeLineWidget.cpp @@ -37,7 +37,7 @@ #include "ConfigManager.h" #include "embed.h" #include "GuiApplication.h" -#include "NStateButton.h" +#include "gui/widgets/NStateButton.h" #include "TextFloat.h" namespace lmms::gui diff --git a/src/gui/editors/TrackContainerView.cpp b/src/gui/editors/TrackContainerView.cpp index 60a46838041..52ab78771b0 100644 --- a/src/gui/editors/TrackContainerView.cpp +++ b/src/gui/editors/TrackContainerView.cpp @@ -33,7 +33,7 @@ #include "AudioEngine.h" #include "DataFile.h" #include "MainWindow.h" -#include "FileBrowser.h" +#include "gui/FileBrowser.h" #include "ImportFilter.h" #include "Instrument.h" #include "InstrumentTrack.h" diff --git a/src/gui/include/EnvelopeAndLfoView.h b/src/gui/instrument/EnvelopeAndLfoView.h similarity index 100% rename from src/gui/include/EnvelopeAndLfoView.h rename to src/gui/instrument/EnvelopeAndLfoView.h diff --git a/src/gui/instrument/EnvelopeGraph.cpp b/src/gui/instrument/EnvelopeGraph.cpp index 4cf5da74bfa..0b97622f3b0 100644 --- a/src/gui/instrument/EnvelopeGraph.cpp +++ b/src/gui/instrument/EnvelopeGraph.cpp @@ -31,7 +31,7 @@ #include "EnvelopeAndLfoParameters.h" #include "lmms_math.h" -#include "ColorHelper.h" +#include "gui/ColorHelper.h" #include diff --git a/src/gui/include/EnvelopeGraph.h b/src/gui/instrument/EnvelopeGraph.h similarity index 100% rename from src/gui/include/EnvelopeGraph.h rename to src/gui/instrument/EnvelopeGraph.h diff --git a/src/gui/instrument/InstrumentFunctionViews.cpp b/src/gui/instrument/InstrumentFunctionViews.cpp index ad8abe73524..5af6a82e304 100644 --- a/src/gui/instrument/InstrumentFunctionViews.cpp +++ b/src/gui/instrument/InstrumentFunctionViews.cpp @@ -29,7 +29,7 @@ #include "InstrumentFunctions.h" #include "InstrumentFunctionViews.h" #include "ComboBox.h" -#include "GroupBox.h" +#include "gui/widgets/GroupBox.h" #include "gui_templates.h" #include "Knob.h" #include "TempoSyncKnob.h" diff --git a/src/gui/include/InstrumentFunctionViews.h b/src/gui/instrument/InstrumentFunctionViews.h similarity index 100% rename from src/gui/include/InstrumentFunctionViews.h rename to src/gui/instrument/InstrumentFunctionViews.h diff --git a/src/gui/instrument/InstrumentMidiIOView.cpp b/src/gui/instrument/InstrumentMidiIOView.cpp index e3f10bd1a32..4bfc22ee96b 100644 --- a/src/gui/instrument/InstrumentMidiIOView.cpp +++ b/src/gui/instrument/InstrumentMidiIOView.cpp @@ -28,11 +28,11 @@ #include #include "InstrumentMidiIOView.h" -#include "MidiPortMenu.h" +#include "gui/menus/MidiPortMenu.h" #include "AudioEngine.h" #include "Engine.h" #include "embed.h" -#include "GroupBox.h" +#include "gui/widgets/GroupBox.h" #include "gui_templates.h" #include "LcdSpinBox.h" #include "MidiClient.h" diff --git a/src/gui/include/InstrumentMidiIOView.h b/src/gui/instrument/InstrumentMidiIOView.h similarity index 100% rename from src/gui/include/InstrumentMidiIOView.h rename to src/gui/instrument/InstrumentMidiIOView.h diff --git a/src/gui/instrument/InstrumentSoundShapingView.cpp b/src/gui/instrument/InstrumentSoundShapingView.cpp index a3a78e25670..553ec242444 100644 --- a/src/gui/instrument/InstrumentSoundShapingView.cpp +++ b/src/gui/instrument/InstrumentSoundShapingView.cpp @@ -30,10 +30,10 @@ #include "EnvelopeAndLfoParameters.h" #include "EnvelopeAndLfoView.h" #include "ComboBox.h" -#include "GroupBox.h" +#include "gui/widgets/GroupBox.h" #include "gui_templates.h" #include "Knob.h" -#include "TabWidget.h" +#include "gui/widgets/TabWidget.h" namespace lmms::gui diff --git a/src/gui/include/InstrumentSoundShapingView.h b/src/gui/instrument/InstrumentSoundShapingView.h similarity index 100% rename from src/gui/include/InstrumentSoundShapingView.h rename to src/gui/instrument/InstrumentSoundShapingView.h diff --git a/src/gui/instrument/InstrumentTrackWindow.cpp b/src/gui/instrument/InstrumentTrackWindow.cpp index 8b868bb50dd..11584fff2c8 100644 --- a/src/gui/instrument/InstrumentTrackWindow.cpp +++ b/src/gui/instrument/InstrumentTrackWindow.cpp @@ -39,9 +39,9 @@ #include "EffectRackView.h" #include "embed.h" #include "Engine.h" -#include "FileBrowser.h" +#include "gui/FileBrowser.h" #include "FileDialog.h" -#include "GroupBox.h" +#include "gui/widgets/GroupBox.h" #include "MixerChannelLcdSpinBox.h" #include "GuiApplication.h" #include "Instrument.h" @@ -55,7 +55,7 @@ #include "Knob.h" #include "LcdSpinBox.h" #include "LedCheckBox.h" -#include "LeftRightNav.h" +#include "gui/widgets/LeftRightNav.h" #include "MainWindow.h" #include "PianoView.h" #include "PluginFactory.h" @@ -63,9 +63,9 @@ #include "Song.h" #include "StringPairDrag.h" #include "SubWindow.h" -#include "TabWidget.h" +#include "gui/widgets/TabWidget.h" #include "TrackContainerView.h" -#include "TrackLabelButton.h" +#include "gui/tracks/TrackLabelButton.h" namespace lmms::gui diff --git a/src/gui/include/InstrumentTrackWindow.h b/src/gui/instrument/InstrumentTrackWindow.h similarity index 100% rename from src/gui/include/InstrumentTrackWindow.h rename to src/gui/instrument/InstrumentTrackWindow.h diff --git a/src/gui/instrument/InstrumentTuningView.cpp b/src/gui/instrument/InstrumentTuningView.cpp index daa361aad6b..d29396caab4 100644 --- a/src/gui/instrument/InstrumentTuningView.cpp +++ b/src/gui/instrument/InstrumentTuningView.cpp @@ -31,7 +31,7 @@ #include #include "ComboBox.h" -#include "GroupBox.h" +#include "gui/widgets/GroupBox.h" #include "GuiApplication.h" #include "gui_templates.h" #include "InstrumentTrack.h" diff --git a/src/gui/include/InstrumentTuningView.h b/src/gui/instrument/InstrumentTuningView.h similarity index 100% rename from src/gui/include/InstrumentTuningView.h rename to src/gui/instrument/InstrumentTuningView.h diff --git a/src/gui/instrument/LfoGraph.cpp b/src/gui/instrument/LfoGraph.cpp index 7edbacb09ea..50fe160d561 100644 --- a/src/gui/instrument/LfoGraph.cpp +++ b/src/gui/instrument/LfoGraph.cpp @@ -30,7 +30,7 @@ #include "EnvelopeAndLfoParameters.h" #include "Oscillator.h" -#include "ColorHelper.h" +#include "gui/ColorHelper.h" #include "gui_templates.h" diff --git a/src/gui/include/LfoGraph.h b/src/gui/instrument/LfoGraph.h similarity index 100% rename from src/gui/include/LfoGraph.h rename to src/gui/instrument/LfoGraph.h diff --git a/src/gui/include/MidiPortMenu.h b/src/gui/menus/MidiPortMenu.h similarity index 100% rename from src/gui/include/MidiPortMenu.h rename to src/gui/menus/MidiPortMenu.h diff --git a/src/gui/include/RecentProjectsMenu.h b/src/gui/menus/RecentProjectsMenu.h similarity index 100% rename from src/gui/include/RecentProjectsMenu.h rename to src/gui/menus/RecentProjectsMenu.h diff --git a/src/gui/include/TemplatesMenu.h b/src/gui/menus/TemplatesMenu.h similarity index 100% rename from src/gui/include/TemplatesMenu.h rename to src/gui/menus/TemplatesMenu.h diff --git a/src/gui/include/AboutDialog.h b/src/gui/modals/AboutDialog.h similarity index 100% rename from src/gui/include/AboutDialog.h rename to src/gui/modals/AboutDialog.h diff --git a/src/gui/modals/ControllerConnectionDialog.cpp b/src/gui/modals/ControllerConnectionDialog.cpp index c7bdd28b4c7..b65e8852304 100644 --- a/src/gui/modals/ControllerConnectionDialog.cpp +++ b/src/gui/modals/ControllerConnectionDialog.cpp @@ -33,14 +33,14 @@ #include "ControllerConnection.h" #include "MidiController.h" #include "MidiClient.h" -#include "MidiPortMenu.h" +#include "gui/menus/MidiPortMenu.h" #include "LcdSpinBox.h" #include "LedCheckBox.h" #include "ComboBox.h" -#include "GroupBox.h" +#include "gui/widgets/GroupBox.h" #include "Song.h" -#include "TabWidget.h" -#include "ToolButton.h" +#include "gui/widgets/TabWidget.h" +#include "gui/widgets/ToolButton.h" #include "embed.h" diff --git a/src/gui/include/ControllerConnectionDialog.h b/src/gui/modals/ControllerConnectionDialog.h similarity index 100% rename from src/gui/include/ControllerConnectionDialog.h rename to src/gui/modals/ControllerConnectionDialog.h diff --git a/src/gui/include/EffectSelectDialog.h b/src/gui/modals/EffectSelectDialog.h similarity index 100% rename from src/gui/include/EffectSelectDialog.h rename to src/gui/modals/EffectSelectDialog.h diff --git a/src/gui/include/RenameDialog.h b/src/gui/modals/RenameDialog.h similarity index 100% rename from src/gui/include/RenameDialog.h rename to src/gui/modals/RenameDialog.h diff --git a/src/gui/modals/SetupDialog.cpp b/src/gui/modals/SetupDialog.cpp index 6f05433b782..1341dcff1c0 100644 --- a/src/gui/modals/SetupDialog.cpp +++ b/src/gui/modals/SetupDialog.cpp @@ -38,7 +38,7 @@ #include "Engine.h" #include "FileDialog.h" #include "MainWindow.h" -#include "MidiSetupWidget.h" +#include "gui/MidiSetupWidget.h" #include "ProjectJournal.h" #include "SetupDialog.h" #include "TabBar.h" @@ -47,7 +47,7 @@ // Platform-specific audio-interface classes. #include "AudioAlsa.h" -#include "AudioAlsaSetupWidget.h" +#include "gui/AudioAlsaSetupWidget.h" #include "AudioDummy.h" #include "AudioJack.h" #include "AudioOss.h" diff --git a/src/gui/include/SetupDialog.h b/src/gui/modals/SetupDialog.h similarity index 99% rename from src/gui/include/SetupDialog.h rename to src/gui/modals/SetupDialog.h index 871a80bcd4b..a15904f66cf 100644 --- a/src/gui/include/SetupDialog.h +++ b/src/gui/modals/SetupDialog.h @@ -32,7 +32,7 @@ #include "AudioDeviceSetupWidget.h" #include "lmmsconfig.h" #include "MidiClient.h" -#include "MidiSetupWidget.h" +#include "gui/MidiSetupWidget.h" class QCheckBox; diff --git a/src/gui/modals/VersionedSaveDialog.cpp b/src/gui/modals/VersionedSaveDialog.cpp index c8e1c682120..a7d5674a7af 100644 --- a/src/gui/modals/VersionedSaveDialog.cpp +++ b/src/gui/modals/VersionedSaveDialog.cpp @@ -29,7 +29,7 @@ #include #include -#include "DeprecationHelper.h" +#include "gui/DeprecationHelper.h" #include "VersionedSaveDialog.h" #include "LedCheckBox.h" diff --git a/src/gui/include/VersionedSaveDialog.h b/src/gui/modals/VersionedSaveDialog.h similarity index 100% rename from src/gui/include/VersionedSaveDialog.h rename to src/gui/modals/VersionedSaveDialog.h diff --git a/src/gui/include/FadeButton.h b/src/gui/tracks/FadeButton.h similarity index 100% rename from src/gui/include/FadeButton.h rename to src/gui/tracks/FadeButton.h diff --git a/src/gui/tracks/InstrumentTrackView.cpp b/src/gui/tracks/InstrumentTrackView.cpp index 1d9991c3107..09e342cf193 100644 --- a/src/gui/tracks/InstrumentTrackView.cpp +++ b/src/gui/tracks/InstrumentTrackView.cpp @@ -36,15 +36,15 @@ #include "Engine.h" #include "FadeButton.h" #include "Knob.h" -#include "MidiCCRackView.h" +#include "gui/MidiCCRackView.h" #include "Mixer.h" #include "MixerView.h" #include "GuiApplication.h" #include "Instrument.h" -#include "InstrumentTrackWindow.h" +#include "gui/instrument/InstrumentTrackWindow.h" #include "MainWindow.h" #include "MidiClient.h" -#include "MidiPortMenu.h" +#include "gui/menus/MidiPortMenu.h" #include "TrackLabelButton.h" diff --git a/src/gui/tracks/SampleTrackView.cpp b/src/gui/tracks/SampleTrackView.cpp index 8475f7fa9e1..5f238e11e54 100644 --- a/src/gui/tracks/SampleTrackView.cpp +++ b/src/gui/tracks/SampleTrackView.cpp @@ -36,7 +36,7 @@ #include "GuiApplication.h" #include "Knob.h" #include "SampleClip.h" -#include "SampleTrackWindow.h" +#include "gui/SampleTrackWindow.h" #include "StringPairDrag.h" #include "TrackContainerView.h" #include "TrackLabelButton.h" diff --git a/src/gui/tracks/TrackLabelButton.cpp b/src/gui/tracks/TrackLabelButton.cpp index 871d42316e5..23df1a88fcc 100644 --- a/src/gui/tracks/TrackLabelButton.cpp +++ b/src/gui/tracks/TrackLabelButton.cpp @@ -33,7 +33,7 @@ #include "InstrumentTrackView.h" #include "Instrument.h" #include "InstrumentTrack.h" -#include "RenameDialog.h" +#include "gui/modals/RenameDialog.h" #include "TrackRenameLineEdit.h" #include "TrackView.h" #include "Track.h" diff --git a/src/gui/include/TrackLabelButton.h b/src/gui/tracks/TrackLabelButton.h similarity index 100% rename from src/gui/include/TrackLabelButton.h rename to src/gui/tracks/TrackLabelButton.h diff --git a/src/gui/include/TrackRenameLineEdit.h b/src/gui/tracks/TrackRenameLineEdit.h similarity index 100% rename from src/gui/include/TrackRenameLineEdit.h rename to src/gui/tracks/TrackRenameLineEdit.h diff --git a/src/gui/include/AutomatableSlider.h b/src/gui/widgets/AutomatableSlider.h similarity index 100% rename from src/gui/include/AutomatableSlider.h rename to src/gui/widgets/AutomatableSlider.h diff --git a/src/gui/include/CPULoadWidget.h b/src/gui/widgets/CPULoadWidget.h similarity index 100% rename from src/gui/include/CPULoadWidget.h rename to src/gui/widgets/CPULoadWidget.h diff --git a/src/gui/include/GroupBox.h b/src/gui/widgets/GroupBox.h similarity index 100% rename from src/gui/include/GroupBox.h rename to src/gui/widgets/GroupBox.h diff --git a/src/gui/widgets/Knob.cpp b/src/gui/widgets/Knob.cpp index d282f72c20f..67874b0564b 100644 --- a/src/gui/widgets/Knob.cpp +++ b/src/gui/widgets/Knob.cpp @@ -31,7 +31,7 @@ #endif #include "lmms_math.h" -#include "DeprecationHelper.h" +#include "gui/DeprecationHelper.h" #include "embed.h" #include "gui_templates.h" diff --git a/src/gui/widgets/LcdFloatSpinBox.cpp b/src/gui/widgets/LcdFloatSpinBox.cpp index c71d665689e..a3aa84656b5 100644 --- a/src/gui/widgets/LcdFloatSpinBox.cpp +++ b/src/gui/widgets/LcdFloatSpinBox.cpp @@ -38,7 +38,7 @@ #include #include "CaptionMenu.h" -#include "DeprecationHelper.h" +#include "gui/DeprecationHelper.h" #include "embed.h" #include "GuiApplication.h" #include "gui_templates.h" diff --git a/src/gui/widgets/LcdWidget.cpp b/src/gui/widgets/LcdWidget.cpp index 7370a939fe3..be9538bd4cf 100644 --- a/src/gui/widgets/LcdWidget.cpp +++ b/src/gui/widgets/LcdWidget.cpp @@ -29,7 +29,7 @@ #include #include "LcdWidget.h" -#include "DeprecationHelper.h" +#include "gui/DeprecationHelper.h" #include "embed.h" #include "gui_templates.h" diff --git a/src/gui/widgets/LedCheckBox.cpp b/src/gui/widgets/LedCheckBox.cpp index 42e49a8ae2b..fd653d4b3d3 100644 --- a/src/gui/widgets/LedCheckBox.cpp +++ b/src/gui/widgets/LedCheckBox.cpp @@ -27,7 +27,7 @@ #include #include "LedCheckBox.h" -#include "DeprecationHelper.h" +#include "gui/DeprecationHelper.h" #include "embed.h" #include "gui_templates.h" diff --git a/src/gui/include/LeftRightNav.h b/src/gui/widgets/LeftRightNav.h similarity index 100% rename from src/gui/include/LeftRightNav.h rename to src/gui/widgets/LeftRightNav.h diff --git a/src/gui/include/MeterDialog.h b/src/gui/widgets/MeterDialog.h similarity index 100% rename from src/gui/include/MeterDialog.h rename to src/gui/widgets/MeterDialog.h diff --git a/src/gui/include/NStateButton.h b/src/gui/widgets/NStateButton.h similarity index 100% rename from src/gui/include/NStateButton.h rename to src/gui/widgets/NStateButton.h diff --git a/src/gui/include/Oscilloscope.h b/src/gui/widgets/Oscilloscope.h similarity index 100% rename from src/gui/include/Oscilloscope.h rename to src/gui/widgets/Oscilloscope.h diff --git a/src/gui/include/PeakIndicator.h b/src/gui/widgets/PeakIndicator.h similarity index 100% rename from src/gui/include/PeakIndicator.h rename to src/gui/widgets/PeakIndicator.h diff --git a/src/gui/include/SimpleTextFloat.h b/src/gui/widgets/SimpleTextFloat.h similarity index 100% rename from src/gui/include/SimpleTextFloat.h rename to src/gui/widgets/SimpleTextFloat.h diff --git a/src/gui/widgets/TabWidget.cpp b/src/gui/widgets/TabWidget.cpp index a370c1ea9fb..ac98cc40437 100644 --- a/src/gui/widgets/TabWidget.cpp +++ b/src/gui/widgets/TabWidget.cpp @@ -31,7 +31,7 @@ #include #include -#include "DeprecationHelper.h" +#include "gui/DeprecationHelper.h" #include "embed.h" #include "gui_templates.h" diff --git a/src/gui/include/TabWidget.h b/src/gui/widgets/TabWidget.h similarity index 100% rename from src/gui/include/TabWidget.h rename to src/gui/widgets/TabWidget.h diff --git a/src/gui/include/TimeDisplayWidget.h b/src/gui/widgets/TimeDisplayWidget.h similarity index 100% rename from src/gui/include/TimeDisplayWidget.h rename to src/gui/widgets/TimeDisplayWidget.h diff --git a/src/gui/include/ToolButton.h b/src/gui/widgets/ToolButton.h similarity index 100% rename from src/gui/include/ToolButton.h rename to src/gui/widgets/ToolButton.h