From 32caf80be159d1d3eda41a44cdc35fe5f2838180 Mon Sep 17 00:00:00 2001 From: Spekular Date: Sun, 10 Apr 2022 01:14:55 +0200 Subject: [PATCH] Rename 'dialogs' folder to 'modal', add missing modals (#6367) --- src/gui/CMakeLists.txt | 25 +++++++++---------- src/gui/{ => modals}/AboutDialog.cpp | 0 src/gui/{dialogs => modals}/ColorChooser.cpp | 0 .../ControllerConnectionDialog.cpp | 0 src/gui/{ => modals}/EffectSelectDialog.cpp | 0 .../{Forms => modals}/EffectSelectDialog.ui | 0 src/gui/{ => modals}/ExportProjectDialog.cpp | 0 src/gui/{dialogs => modals}/FileDialog.cpp | 0 src/gui/{widgets => modals}/RenameDialog.cpp | 0 src/gui/{ => modals}/SetupDialog.cpp | 0 .../VersionedSaveDialog.cpp | 0 src/gui/{dialogs => modals}/about_dialog.ui | 0 src/gui/{dialogs => modals}/export_project.ui | 0 13 files changed, 12 insertions(+), 13 deletions(-) rename src/gui/{ => modals}/AboutDialog.cpp (100%) rename src/gui/{dialogs => modals}/ColorChooser.cpp (100%) rename src/gui/{ => modals}/ControllerConnectionDialog.cpp (100%) rename src/gui/{ => modals}/EffectSelectDialog.cpp (100%) rename src/gui/{Forms => modals}/EffectSelectDialog.ui (100%) rename src/gui/{ => modals}/ExportProjectDialog.cpp (100%) rename src/gui/{dialogs => modals}/FileDialog.cpp (100%) rename src/gui/{widgets => modals}/RenameDialog.cpp (100%) rename src/gui/{ => modals}/SetupDialog.cpp (100%) rename src/gui/{dialogs => modals}/VersionedSaveDialog.cpp (100%) rename src/gui/{dialogs => modals}/about_dialog.ui (100%) rename src/gui/{dialogs => modals}/export_project.ui (100%) diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 192654594..bdff3347c 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -1,18 +1,14 @@ SET(LMMS_SRCS ${LMMS_SRCS} - gui/AboutDialog.cpp gui/ActionGroup.cpp gui/AudioAlsaSetupWidget.cpp gui/AudioDeviceSetupWidget.cpp gui/AutomatableModelView.cpp gui/AutomationClipView.cpp gui/AutomationTrackView.cpp - gui/ControllerConnectionDialog.cpp gui/ControllerDialog.cpp gui/EffectControlDialog.cpp - gui/EffectSelectDialog.cpp gui/embed.cpp - gui/ExportProjectDialog.cpp gui/FileBrowser.cpp gui/MixerView.cpp gui/GuiApplication.cpp @@ -38,7 +34,6 @@ SET(LMMS_SRCS gui/SampleClipView.cpp gui/SampleTrackView.cpp gui/SampleTrackWindow.cpp - gui/SetupDialog.cpp gui/StringPairDrag.cpp gui/SubWindow.cpp gui/TimeLineWidget.cpp @@ -47,9 +42,15 @@ SET(LMMS_SRCS gui/ClipView.cpp gui/TrackView.cpp - gui/dialogs/FileDialog.cpp - gui/dialogs/VersionedSaveDialog.cpp - gui/dialogs/ColorChooser.cpp + gui/modals/AboutDialog.cpp + gui/modals/ColorChooser.cpp + gui/modals/ControllerConnectionDialog.cpp + gui/modals/EffectSelectDialog.cpp + gui/modals/ExportProjectDialog.cpp + gui/modals/FileDialog.cpp + gui/modals/RenameDialog.cpp + gui/modals/SetupDialog.cpp + gui/modals/VersionedSaveDialog.cpp gui/editors/AutomationEditor.cpp gui/editors/Editor.cpp @@ -99,7 +100,6 @@ SET(LMMS_SRCS gui/widgets/PixmapButton.cpp gui/widgets/PositionLine.cpp gui/widgets/ProjectNotes.cpp - gui/widgets/RenameDialog.cpp gui/widgets/Rubberband.cpp gui/widgets/SendButtonIndicator.cpp gui/widgets/SideBar.cpp @@ -122,10 +122,9 @@ SET(LMMS_SRCS set(LMMS_UIS ${LMMS_UIS} - gui/dialogs/about_dialog.ui - gui/dialogs/export_project.ui - - gui/Forms/EffectSelectDialog.ui + gui/modals/about_dialog.ui + gui/modals/EffectSelectDialog.ui + gui/modals/export_project.ui PARENT_SCOPE ) diff --git a/src/gui/AboutDialog.cpp b/src/gui/modals/AboutDialog.cpp similarity index 100% rename from src/gui/AboutDialog.cpp rename to src/gui/modals/AboutDialog.cpp diff --git a/src/gui/dialogs/ColorChooser.cpp b/src/gui/modals/ColorChooser.cpp similarity index 100% rename from src/gui/dialogs/ColorChooser.cpp rename to src/gui/modals/ColorChooser.cpp diff --git a/src/gui/ControllerConnectionDialog.cpp b/src/gui/modals/ControllerConnectionDialog.cpp similarity index 100% rename from src/gui/ControllerConnectionDialog.cpp rename to src/gui/modals/ControllerConnectionDialog.cpp diff --git a/src/gui/EffectSelectDialog.cpp b/src/gui/modals/EffectSelectDialog.cpp similarity index 100% rename from src/gui/EffectSelectDialog.cpp rename to src/gui/modals/EffectSelectDialog.cpp diff --git a/src/gui/Forms/EffectSelectDialog.ui b/src/gui/modals/EffectSelectDialog.ui similarity index 100% rename from src/gui/Forms/EffectSelectDialog.ui rename to src/gui/modals/EffectSelectDialog.ui diff --git a/src/gui/ExportProjectDialog.cpp b/src/gui/modals/ExportProjectDialog.cpp similarity index 100% rename from src/gui/ExportProjectDialog.cpp rename to src/gui/modals/ExportProjectDialog.cpp diff --git a/src/gui/dialogs/FileDialog.cpp b/src/gui/modals/FileDialog.cpp similarity index 100% rename from src/gui/dialogs/FileDialog.cpp rename to src/gui/modals/FileDialog.cpp diff --git a/src/gui/widgets/RenameDialog.cpp b/src/gui/modals/RenameDialog.cpp similarity index 100% rename from src/gui/widgets/RenameDialog.cpp rename to src/gui/modals/RenameDialog.cpp diff --git a/src/gui/SetupDialog.cpp b/src/gui/modals/SetupDialog.cpp similarity index 100% rename from src/gui/SetupDialog.cpp rename to src/gui/modals/SetupDialog.cpp diff --git a/src/gui/dialogs/VersionedSaveDialog.cpp b/src/gui/modals/VersionedSaveDialog.cpp similarity index 100% rename from src/gui/dialogs/VersionedSaveDialog.cpp rename to src/gui/modals/VersionedSaveDialog.cpp diff --git a/src/gui/dialogs/about_dialog.ui b/src/gui/modals/about_dialog.ui similarity index 100% rename from src/gui/dialogs/about_dialog.ui rename to src/gui/modals/about_dialog.ui diff --git a/src/gui/dialogs/export_project.ui b/src/gui/modals/export_project.ui similarity index 100% rename from src/gui/dialogs/export_project.ui rename to src/gui/modals/export_project.ui