Moved lots of files to the gui subdirectory

Author: oleg68

ide-projects/NetBeans12/nbproject/configurations.xml

@@ -69,65 +69,72 @@ control/GOElementCreator.cpp
 control/GOEventDistributor.cpp
 control/GOLabelControl.cpp
 control/GOPistonControl.cpp
-dialogs/common/GODialogCloser.cpp
-dialogs/common/GODialogSizeSet.cpp
-dialogs/common/GODialogTab.cpp
-dialogs/common/GOSimpleDialog.cpp
-dialogs/common/GOTabbedDialog.cpp
-dialogs/midi-event/GOMidiEventDialog.cpp
-dialogs/midi-event/GOMidiEventKeyTab.cpp
-dialogs/midi-event/GOMidiEventRecvTab.cpp
-dialogs/midi-event/GOMidiEventSendTab.cpp
-dialogs/settings/GOSettingsAudio.cpp
-dialogs/settings/GOSettingsDeviceMatchDialog.cpp
-dialogs/settings/GOSettingsDialog.cpp
-dialogs/settings/GOSettingsMidiDeviceList.cpp
-dialogs/settings/GOSettingsMidiDevices.cpp
-dialogs/settings/GOSettingsMidiMessage.cpp
-dialogs/settings/GOSettingsPaths.cpp
-dialogs/settings/GOSettingsPorts.cpp
-dialogs/settings/GOSettingsOptions.cpp
-dialogs/settings/GOSettingsOrgans.cpp
-dialogs/settings/GOSettingsReverb.cpp
-dialogs/settings/GOSettingsTemperaments.cpp
-dialogs/GOMidiListDialog.cpp
-dialogs/GONewReleaseDialog.cpp
-dialogs/GOOrganSettingsDialog.cpp
-dialogs/GOProgressDialog.cpp
-dialogs/GOPropertiesDialog.cpp
-dialogs/GOSelectOrganDialog.cpp
-dialogs/GOSplash.cpp
-dialogs/GOStopsDialog.cpp
 document-base/GODocumentBase.cpp
 document-base/GOView.cpp
-gui/primitives/GOBitmap.cpp
-gui/primitives/GODC.cpp
-gui/primitives/GOFont.cpp
-gui/primitives/go_gui_utils.cpp
-gui/GOGUIBankedGeneralsPanel.cpp
-gui/GOGUIButton.cpp
-gui/GOGUICrescendoPanel.cpp
-gui/GOGUIControl.cpp
-gui/GOGUICouplerPanel.cpp
-gui/GOGUIDisplayMetrics.cpp
-gui/GOGUIDivisionalsPanel.cpp
-gui/GOGUIEnclosure.cpp
-gui/GOGUIFloatingPanel.cpp
-gui/GOGUIHW1Background.cpp
-gui/GOGUIHW1DisplayMetrics.cpp
-gui/GOGUIImage.cpp
-gui/GOGUILayoutEngine.cpp
-gui/GOGUIPanelView.cpp
-gui/GOGUISetterDisplayMetrics.cpp
-gui/GOGUILabel.cpp
-gui/GOGUIManual.cpp
-gui/GOGUIManualBackground.cpp
-gui/GOGUIMasterPanel.cpp
-gui/GOGUIMetronomePanel.cpp
-gui/GOGUIPanel.cpp
-gui/GOGUIPanelWidget.cpp
-gui/GOGUIRecorderPanel.cpp
-gui/GOGUISequencerPanel.cpp
+gui/dialogs/common/GODialogCloser.cpp
+gui/dialogs/common/GODialogSizeSet.cpp
+gui/dialogs/common/GODialogTab.cpp
+gui/dialogs/common/GOSimpleDialog.cpp
+gui/dialogs/common/GOTabbedDialog.cpp
+gui/dialogs/midi-event/GOMidiEventDialog.cpp
+gui/dialogs/midi-event/GOMidiEventKeyTab.cpp
+gui/dialogs/midi-event/GOMidiEventRecvTab.cpp
+gui/dialogs/midi-event/GOMidiEventSendTab.cpp
+gui/dialogs/settings/GOSettingsAudio.cpp
+gui/dialogs/settings/GOSettingsDeviceMatchDialog.cpp
+gui/dialogs/settings/GOSettingsDialog.cpp
+gui/dialogs/settings/GOSettingsMidiDeviceList.cpp
+gui/dialogs/settings/GOSettingsMidiDevices.cpp
+gui/dialogs/settings/GOSettingsMidiMessage.cpp
+gui/dialogs/settings/GOSettingsPaths.cpp
+gui/dialogs/settings/GOSettingsPorts.cpp
+gui/dialogs/settings/GOSettingsOptions.cpp
+gui/dialogs/settings/GOSettingsOrgans.cpp
+gui/dialogs/settings/GOSettingsReverb.cpp
+gui/dialogs/settings/GOSettingsTemperaments.cpp
+gui/dialogs/GOMidiListDialog.cpp
+gui/dialogs/GONewReleaseDialog.cpp
+gui/dialogs/GOOrganSettingsDialog.cpp
+gui/dialogs/GOProgressDialog.cpp
+gui/dialogs/GOPropertiesDialog.cpp
+gui/dialogs/GOSelectOrganDialog.cpp
+gui/dialogs/GOSplash.cpp
+gui/dialogs/GOStopsDialog.cpp
+gui/frames/GOFrame.cpp
+gui/frames/GOLogWindow.cpp
+gui/frames/GOMainWindowData.cpp
+gui/panels/primitives/GOBitmap.cpp
+gui/panels/primitives/GODC.cpp
+gui/panels/primitives/GOFont.cpp
+gui/panels/GOGUIBankedGeneralsPanel.cpp
+gui/panels/GOGUIButton.cpp
+gui/panels/GOGUICrescendoPanel.cpp
+gui/panels/GOGUIControl.cpp
+gui/panels/GOGUICouplerPanel.cpp
+gui/panels/GOGUIDisplayMetrics.cpp
+gui/panels/GOGUIDivisionalsPanel.cpp
+gui/panels/GOGUIEnclosure.cpp
+gui/panels/GOGUIFloatingPanel.cpp
+gui/panels/GOGUIHW1Background.cpp
+gui/panels/GOGUIHW1DisplayMetrics.cpp
+gui/panels/GOGUIImage.cpp
+gui/panels/GOGUILayoutEngine.cpp
+gui/panels/GOGUIPanelView.cpp
+gui/panels/GOGUISetterDisplayMetrics.cpp
+gui/panels/GOGUILabel.cpp
+gui/panels/GOGUIManual.cpp
+gui/panels/GOGUIManualBackground.cpp
+gui/panels/GOGUIMasterPanel.cpp
+gui/panels/GOGUIMetronomePanel.cpp
+gui/panels/GOGUIPanel.cpp
+gui/panels/GOGUIPanelWidget.cpp
+gui/panels/GOGUIRecorderPanel.cpp
+gui/panels/GOGUISequencerPanel.cpp
+gui/size/GOSizeKeeper.cpp
+gui/wxcontrols/GOAudioGauge.cpp
+gui/wxcontrols/GOGrid.cpp
+gui/wxcontrols/GORightVisiblePicker.cpp
+gui/wxcontrols/go_gui_utils.cpp
 help/GOHelpController.cpp
 help/GOHelpRequestor.cpp
 loader/GOFileStore.cpp
@@ -178,7 +185,6 @@ model/GOSwitch.cpp
 model/GOTremulant.cpp
 model/GOWindchest.cpp
 modification/GOModificationProxy.cpp
-size/GOSizeKeeper.cpp
 sound/ports/GOSoundJackPort.cpp
 sound/ports/GOSoundPort.cpp
 sound/ports/GOSoundPortFactory.cpp
@@ -214,18 +220,12 @@ sound/GOSoundToneBalanceFilter.cpp
 updater/GOUpdateChecker.cpp
 yaml/GOSaveableToYaml.cpp
 yaml/go-wx-yaml.cpp
-wxcontrols/GOAudioGauge.cpp
-wxcontrols/GOGrid.cpp
-wxcontrols/GORightVisiblePicker.cpp
 GOAudioRecorder.cpp
 GOBitmapCache.cpp
 GOEvent.cpp
 GOLog.cpp
-GOLogWindow.cpp
 GOMetronome.cpp
-GOMainWindowData.cpp
 GOOrganController.cpp
-GOFrame.cpp
 GODocument.cpp
 GOVirtualCouplerController.cpp
 )

src/grandorgue/CMakeLists.txt

@@ -15,9 +15,9 @@
 #include <wx/stopwatch.h>
 
 #include "config/GOConfig.h"
+#include "gui/frames/GOFrame.h"
 #include "sound/GOSound.h"
 
-#include "GOFrame.h"
 #include "GOLog.h"
 #include "GOStdPath.h"
 #include "go_defs.h"

src/grandorgue/GOApp.cpp

@@ -12,7 +12,7 @@
 
 #include "ptrvector.h"
 
-#include "gui/primitives/GOBitmap.h"
+#include "gui/panels/primitives/GOBitmap.h"
 
 class GOOrganController;
 

src/grandorgue/GOBitmapCache.h

@@ -10,20 +10,20 @@
 #include <wx/app.h>
 
 #include "config/GOConfig.h"
-#include "dialogs/GOMidiListDialog.h"
-#include "dialogs/GOOrganSettingsDialog.h"
-#include "dialogs/GOStopsDialog.h"
-#include "dialogs/midi-event/GOMidiEventDialog.h"
 #include "document-base/GOView.h"
-#include "gui/GOGUIPanel.h"
-#include "gui/GOGUIPanelView.h"
+#include "gui/dialogs/GOMidiListDialog.h"
+#include "gui/dialogs/GOOrganSettingsDialog.h"
+#include "gui/dialogs/GOStopsDialog.h"
+#include "gui/dialogs/midi-event/GOMidiEventDialog.h"
+#include "gui/frames/GOFrame.h"
+#include "gui/panels/GOGUIPanel.h"
+#include "gui/panels/GOGUIPanelView.h"
+#include "gui/size/GOResizable.h"
 #include "midi/GOMidiEvent.h"
-#include "size/GOResizable.h"
 #include "sound/GOSound.h"
 #include "threading/GOMutexLocker.h"
 
 #include "GOEvent.h"
-#include "GOFrame.h"
 #include "GOOrgan.h"
 #include "GOOrganController.h"
 #include "go_ids.h"

src/grandorgue/GODocument.cpp

@@ -1,13 +1,13 @@
 /*
  * Copyright 2006 Milan Digital Audio LLC
- * Copyright 2009-2023 GrandOrgue contributors (see AUTHORS)
+ * Copyright 2009-2024 GrandOrgue contributors (see AUTHORS)
  * License GPL-2.0 or later
  * (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
  */
 
 #include "GOLog.h"
 
-#include "GOLogWindow.h"
+#include "gui/frames/GOLogWindow.h"
 
 GOLog::GOLog(wxWindow *parent) : m_LogWindow(NULL) {
   m_LogWindow = new GOLogWindow(parent, wxID_ANY, _("Log messages"));

src/grandorgue/GOLog.cpp

@@ -31,20 +31,20 @@
 #include "contrib/sha1.h"
 #include "control/GOElementCreator.h"
 #include "control/GOPushbuttonControl.h"
-#include "dialogs/GOProgressDialog.h"
 #include "files/GOOpenedFile.h"
 #include "files/GOStdFileName.h"
-#include "gui/GOGUIBankedGeneralsPanel.h"
-#include "gui/GOGUICouplerPanel.h"
-#include "gui/GOGUICrescendoPanel.h"
-#include "gui/GOGUIDivisionalsPanel.h"
-#include "gui/GOGUIFloatingPanel.h"
-#include "gui/GOGUIMasterPanel.h"
-#include "gui/GOGUIMetronomePanel.h"
-#include "gui/GOGUIPanel.h"
-#include "gui/GOGUIPanelCreator.h"
-#include "gui/GOGUIRecorderPanel.h"
-#include "gui/GOGUISequencerPanel.h"
+#include "gui/dialogs/GOProgressDialog.h"
+#include "gui/panels/GOGUIBankedGeneralsPanel.h"
+#include "gui/panels/GOGUICouplerPanel.h"
+#include "gui/panels/GOGUICrescendoPanel.h"
+#include "gui/panels/GOGUIDivisionalsPanel.h"
+#include "gui/panels/GOGUIFloatingPanel.h"
+#include "gui/panels/GOGUIMasterPanel.h"
+#include "gui/panels/GOGUIMetronomePanel.h"
+#include "gui/panels/GOGUIPanel.h"
+#include "gui/panels/GOGUIPanelCreator.h"
+#include "gui/panels/GOGUIRecorderPanel.h"
+#include "gui/panels/GOGUISequencerPanel.h"
 #include "loader/GOLoadThread.h"
 #include "loader/GOLoaderFilename.h"
 #include "loader/cache/GOCache.h"

src/grandorgue/GOOrganController.cpp

@@ -17,13 +17,13 @@
 #include "config/GOConfig.h"
 #include "control/GOEventDistributor.h"
 #include "control/GOLabelControl.h"
-#include "gui/GOGUIMouseState.h"
+#include "gui/frames/GOMainWindowData.h"
+#include "gui/panels/GOGUIMouseState.h"
 #include "loader/GOFileStore.h"
 #include "model/GOOrganModel.h"
 #include "modification/GOModificationProxy.h"
 
 #include "GOBitmapCache.h"
-#include "GOMainWindowData.h"
 #include "GOMemoryPool.h"
 #include "GOTimer.h"
 #include "GOVirtualCouplerController.h"

src/grandorgue/GOOrganController.h

@@ -14,7 +14,8 @@
 #include <map>
 #include <vector>
 
-#include "dialogs/common/GODialogSizeSet.h"
+#include "gui/dialogs/common/GODialogSizeSet.h"
+#include "gui/size/GOLogicalRect.h"
 #include "midi/GOMidiMap.h"
 #include "midi/GOMidiReceiverBase.h"
 #include "settings/GOSettingBool.h"
@@ -25,7 +26,6 @@
 #include "settings/GOSettingNumber.h"
 #include "settings/GOSettingStore.h"
 #include "settings/GOSettingString.h"
-#include "size/GOLogicalRect.h"
 #include "temperaments/GOTemperamentList.h"
 
 #include "GOAudioDeviceConfig.h"

src/grandorgue/config/GOConfig.h

@@ -1,13 +1,13 @@
 /*
  * Copyright 2006 Milan Digital Audio LLC
- * Copyright 2009-2023 GrandOrgue contributors (see AUTHORS)
+ * Copyright 2009-2024 GrandOrgue contributors (see AUTHORS)
  * License GPL-2.0 or later
  * (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
  */
 
 #include "GOView.h"
 
-#include "dialogs/common/GODialogCloser.h"
+#include "gui/dialogs/common/GODialogCloser.h"
 
 #include "GODocumentBase.h"
 

src/grandorgue/document-base/GOView.cpp

@@ -2,7 +2,7 @@
  * GrandOrgue - a free pipe organ simulator
  *
  * Copyright 2006 Milan Digital Audio LLC
- * Copyright 2009-2023 GrandOrgue contributors (see AUTHORS)
+ * Copyright 2009-2024 GrandOrgue contributors (see AUTHORS)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -20,7 +20,7 @@
  */
 
 #include "GOProgressDialog.h"
-#include "gui/primitives/go_gui_utils.h"
+#include "gui/wxcontrols/go_gui_utils.h"
 
 #include <wx/progdlg.h>
 #include <wx/stopwatch.h>

src/grandorgue/dialogs/GOMidiListDialog.cpp src/grandorgue/gui/dialogs/GOMidiListDialog.cpp

@@ -12,8 +12,8 @@
 
 #include "archive/GOArchiveFile.h"
 #include "config/GOConfig.h"
-#include "size/GOAdditionalSizeKeeperProxy.h"
-#include "wxcontrols/GOGrid.h"
+#include "gui/size/GOAdditionalSizeKeeperProxy.h"
+#include "gui/wxcontrols/GOGrid.h"
 
 #include "GOOrgan.h"
 #include "GOOrganList.h"

src/grandorgue/dialogs/GOMidiListDialog.h src/grandorgue/gui/dialogs/GOMidiListDialog.h

@@ -11,9 +11,9 @@
 #include "wx/dialog.h"
 #include <wx/sizer.h>
 
-#include "gui/primitives/go_gui_utils.h"
+#include "gui/size/GOSizeKeeper.h"
+#include "gui/wxcontrols/go_gui_utils.h"
 #include "help/GOHelpRequestor.h"
-#include "size/GOSizeKeeper.h"
 
 #include "GODialogCloser.h"
 #include "GODialogSizeSet.h"

src/grandorgue/dialogs/GONewReleaseDialog.cpp src/grandorgue/gui/dialogs/GONewReleaseDialog.cpp

@@ -14,7 +14,7 @@
 #include <wx/string.h>
 
 #include "config/GOConfigReader.h"
-#include "size/GOSizeKeeper.h"
+#include "gui/size/GOSizeKeeper.h"
 
 /**
  * This class keeps positions and sizes of all dialogs. Every dialog is

src/grandorgue/dialogs/GONewReleaseDialog.h src/grandorgue/gui/dialogs/GONewReleaseDialog.h

@@ -12,7 +12,7 @@
 #include <wx/bookctrl.h>
 #include <wx/panel.h>
 
-#include "size/GOAdditionalSizeKeeperProxy.h"
+#include "gui/size/GOAdditionalSizeKeeperProxy.h"
 
 #include "GODialogTab.h"
 

src/grandorgue/dialogs/GOOrganSettingsDialog.cpp src/grandorgue/gui/dialogs/GOOrganSettingsDialog.cpp

@@ -1,6 +1,6 @@
 /*
  * Copyright 2006 Milan Digital Audio LLC
- * Copyright 2009-2023 GrandOrgue contributors (see AUTHORS)
+ * Copyright 2009-2024 GrandOrgue contributors (see AUTHORS)
  * License GPL-2.0 or later
  * (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
  */
@@ -10,8 +10,8 @@
 
 #include <wx/propdlg.h>
 
-#include "dialogs/common/GOTabbedDialog.h"
 #include "document-base/GOView.h"
+#include "gui/dialogs/common/GOTabbedDialog.h"
 #include "modification/GOModificationProxy.h"
 
 class GOConfig;

src/grandorgue/dialogs/GOOrganSettingsDialog.h src/grandorgue/gui/dialogs/GOOrganSettingsDialog.h

@@ -16,7 +16,7 @@
 #include <wx/stattext.h>
 
 #include "config/GOConfig.h"
-#include "dialogs/common/GOTabbedDialog.h"
+#include "gui/dialogs/common/GOTabbedDialog.h"
 
 #include "GOMidiEventRecvTab.h"