From 09c4d71382fbad57d292657f82622c69c5af9425 Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Thu, 16 Jan 2014 18:02:43 +0100 Subject: [PATCH] Moved a bunch of dialogs to src/tomahawk/dialogs --- src/tomahawk/CMakeLists.txt | 24 ++++++++++--------- src/tomahawk/TomahawkApp.cpp | 2 +- src/tomahawk/TomahawkWindow.cpp | 6 ++--- .../{ => dialogs}/DiagnosticsDialog.cpp | 0 .../{ => dialogs}/DiagnosticsDialog.h | 0 .../{ => dialogs}/DiagnosticsDialog.ui | 0 src/tomahawk/{ => dialogs}/HostDialog.ui | 0 src/tomahawk/{ => dialogs}/LoadXSPFDialog.cpp | 0 src/tomahawk/{ => dialogs}/LoadXSPFDialog.h | 0 src/tomahawk/{ => dialogs}/LoadXSPFDialog.ui | 0 src/tomahawk/{ => dialogs}/ProxyDialog.ui | 0 src/tomahawk/{ => dialogs}/SettingsDialog.cpp | 0 src/tomahawk/{ => dialogs}/SettingsDialog.h | 0 .../{ => dialogs}/Settings_Accounts.ui | 0 .../{ => dialogs}/Settings_Advanced.ui | 0 .../{ => dialogs}/Settings_Collection.ui | 0 16 files changed, 17 insertions(+), 15 deletions(-) rename src/tomahawk/{ => dialogs}/DiagnosticsDialog.cpp (100%) rename src/tomahawk/{ => dialogs}/DiagnosticsDialog.h (100%) rename src/tomahawk/{ => dialogs}/DiagnosticsDialog.ui (100%) rename src/tomahawk/{ => dialogs}/HostDialog.ui (100%) rename src/tomahawk/{ => dialogs}/LoadXSPFDialog.cpp (100%) rename src/tomahawk/{ => dialogs}/LoadXSPFDialog.h (100%) rename src/tomahawk/{ => dialogs}/LoadXSPFDialog.ui (100%) rename src/tomahawk/{ => dialogs}/ProxyDialog.ui (100%) rename src/tomahawk/{ => dialogs}/SettingsDialog.cpp (100%) rename src/tomahawk/{ => dialogs}/SettingsDialog.h (100%) rename src/tomahawk/{ => dialogs}/Settings_Accounts.ui (100%) rename src/tomahawk/{ => dialogs}/Settings_Advanced.ui (100%) rename src/tomahawk/{ => dialogs}/Settings_Collection.ui (100%) diff --git a/src/tomahawk/CMakeLists.txt b/src/tomahawk/CMakeLists.txt index 48a34c2e4..04ecdf082 100644 --- a/src/tomahawk/CMakeLists.txt +++ b/src/tomahawk/CMakeLists.txt @@ -33,6 +33,10 @@ IF( LIBLASTFM_FOUND ) ENDIF( LIBLASTFM_FOUND ) SET( tomahawkSourcesGui ${tomahawkSourcesGui} + dialogs/DiagnosticsDialog.cpp + dialogs/LoadXSPFDialog.cpp + dialogs/SettingsDialog.cpp + sourcetree/SourcesModel.cpp sourcetree/SourcesProxyModel.cpp sourcetree/SourceTreeView.cpp @@ -52,11 +56,8 @@ SET( tomahawkSourcesGui ${tomahawkSourcesGui} TomahawkTrayIcon.cpp AudioControls.cpp - SettingsDialog.cpp - DiagnosticsDialog.cpp - TomahawkWindow.cpp - LoadXSPFDialog.cpp SocialWidget.cpp + TomahawkWindow.cpp widgets/ContainedMenuButton.cpp widgets/AccountListView.cpp @@ -75,16 +76,17 @@ IF( WITH_BREAKPAD ) ENDIF() SET( tomahawkUI ${tomahawkUI} + dialogs/DiagnosticsDialog.ui + dialogs/HostDialog.ui + dialogs/LoadXSPFDialog.ui + dialogs/ProxyDialog.ui + dialogs/Settings_Accounts.ui + dialogs/Settings_Advanced.ui + dialogs/Settings_Collection.ui + TomahawkWindow.ui - DiagnosticsDialog.ui - Settings_Accounts.ui - Settings_Advanced.ui - Settings_Collection.ui - HostDialog.ui - ProxyDialog.ui AudioControls.ui - LoadXSPFDialog.ui SocialWidget.ui ) diff --git a/src/tomahawk/TomahawkApp.cpp b/src/tomahawk/TomahawkApp.cpp index 404724e6e..01b88c235 100644 --- a/src/tomahawk/TomahawkApp.cpp +++ b/src/tomahawk/TomahawkApp.cpp @@ -77,7 +77,7 @@ #include "utils/SpotifyParser.h" #include "AtticaManager.h" #include "TomahawkWindow.h" - #include "SettingsDialog.h" + #include "dialogs/SettingsDialog.h" #include "ActionCollection.h" #include "widgets/HeaderLabel.h" #include "TomahawkSettingsGui.h" diff --git a/src/tomahawk/TomahawkWindow.cpp b/src/tomahawk/TomahawkWindow.cpp index 23bd73d14..5134adb66 100644 --- a/src/tomahawk/TomahawkWindow.cpp +++ b/src/tomahawk/TomahawkWindow.cpp @@ -70,13 +70,13 @@ #include "ViewManager.h" #include "ActionCollection.h" #include "AudioControls.h" -#include "SettingsDialog.h" -#include "DiagnosticsDialog.h" +#include "dialogs/SettingsDialog.h" +#include "dialogs/DiagnosticsDialog.h" #include "TomahawkSettings.h" #include "SourceList.h" #include "TomahawkTrayIcon.h" #include "TomahawkApp.h" -#include "LoadXSPFDialog.h" +#include "dialogs/LoadXSPFDialog.h" #include "utils/ImageRegistry.h" #include "utils/Logger.h" diff --git a/src/tomahawk/DiagnosticsDialog.cpp b/src/tomahawk/dialogs/DiagnosticsDialog.cpp similarity index 100% rename from src/tomahawk/DiagnosticsDialog.cpp rename to src/tomahawk/dialogs/DiagnosticsDialog.cpp diff --git a/src/tomahawk/DiagnosticsDialog.h b/src/tomahawk/dialogs/DiagnosticsDialog.h similarity index 100% rename from src/tomahawk/DiagnosticsDialog.h rename to src/tomahawk/dialogs/DiagnosticsDialog.h diff --git a/src/tomahawk/DiagnosticsDialog.ui b/src/tomahawk/dialogs/DiagnosticsDialog.ui similarity index 100% rename from src/tomahawk/DiagnosticsDialog.ui rename to src/tomahawk/dialogs/DiagnosticsDialog.ui diff --git a/src/tomahawk/HostDialog.ui b/src/tomahawk/dialogs/HostDialog.ui similarity index 100% rename from src/tomahawk/HostDialog.ui rename to src/tomahawk/dialogs/HostDialog.ui diff --git a/src/tomahawk/LoadXSPFDialog.cpp b/src/tomahawk/dialogs/LoadXSPFDialog.cpp similarity index 100% rename from src/tomahawk/LoadXSPFDialog.cpp rename to src/tomahawk/dialogs/LoadXSPFDialog.cpp diff --git a/src/tomahawk/LoadXSPFDialog.h b/src/tomahawk/dialogs/LoadXSPFDialog.h similarity index 100% rename from src/tomahawk/LoadXSPFDialog.h rename to src/tomahawk/dialogs/LoadXSPFDialog.h diff --git a/src/tomahawk/LoadXSPFDialog.ui b/src/tomahawk/dialogs/LoadXSPFDialog.ui similarity index 100% rename from src/tomahawk/LoadXSPFDialog.ui rename to src/tomahawk/dialogs/LoadXSPFDialog.ui diff --git a/src/tomahawk/ProxyDialog.ui b/src/tomahawk/dialogs/ProxyDialog.ui similarity index 100% rename from src/tomahawk/ProxyDialog.ui rename to src/tomahawk/dialogs/ProxyDialog.ui diff --git a/src/tomahawk/SettingsDialog.cpp b/src/tomahawk/dialogs/SettingsDialog.cpp similarity index 100% rename from src/tomahawk/SettingsDialog.cpp rename to src/tomahawk/dialogs/SettingsDialog.cpp diff --git a/src/tomahawk/SettingsDialog.h b/src/tomahawk/dialogs/SettingsDialog.h similarity index 100% rename from src/tomahawk/SettingsDialog.h rename to src/tomahawk/dialogs/SettingsDialog.h diff --git a/src/tomahawk/Settings_Accounts.ui b/src/tomahawk/dialogs/Settings_Accounts.ui similarity index 100% rename from src/tomahawk/Settings_Accounts.ui rename to src/tomahawk/dialogs/Settings_Accounts.ui diff --git a/src/tomahawk/Settings_Advanced.ui b/src/tomahawk/dialogs/Settings_Advanced.ui similarity index 100% rename from src/tomahawk/Settings_Advanced.ui rename to src/tomahawk/dialogs/Settings_Advanced.ui diff --git a/src/tomahawk/Settings_Collection.ui b/src/tomahawk/dialogs/Settings_Collection.ui similarity index 100% rename from src/tomahawk/Settings_Collection.ui rename to src/tomahawk/dialogs/Settings_Collection.ui