Group classes into folders, Dolphin is too big in the meantime for having a flat...

svn path=/trunk/KDE/kdebase/apps/; revision=911065

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9cd091045a0d1a50d91d50dce53672b158c1b05a..708271d004f013d663af9cdd8883d0e1e1336928 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -18,8 +18,8 @@ endif (Nepomuk_FOUND)
 ########### next target ###############
 
 set(dolphinprivate_LIB_SRCS
-    additionalinfodialog.cpp
-    applyviewpropsjob.cpp
+    settings/additionalinfodialog.cpp
+    settings/applyviewpropsjob.cpp
     dolphincontroller.cpp
     dolphindetailsview.cpp
     dolphiniconsview.cpp
@@ -28,33 +28,33 @@ set(dolphinprivate_LIB_SRCS
     dolphindirlister.cpp
     dolphinfileitemdelegate.cpp
     dolphinmodel.cpp
-    dolphinsettings.cpp
+    settings/dolphinsettings.cpp
     dolphinsortfilterproxymodel.cpp
-    dolphintooltip.cpp
+    tooltips/dolphintooltip.cpp
     dolphincategorydrawer.cpp
     dolphinview.cpp
     dolphinviewactionhandler.cpp
     dolphinviewautoscroller.cpp
     draganddrophelper.cpp
     folderexpander.cpp
-    ktooltip.cpp
-    kformattedballoontipdelegate.cpp
+    tooltips/ktooltip.cpp
+    tooltips/kformattedballoontipdelegate.cpp
     renamedialog.cpp
     selectiontoggle.cpp
     selectionmanager.cpp
-    tooltipmanager.cpp
+    tooltips/tooltipmanager.cpp
     viewproperties.cpp
-    viewpropertiesdialog.cpp
-    viewpropsprogressinfo.cpp
+    settings/viewpropertiesdialog.cpp
+    settings/viewpropsprogressinfo.cpp
     zoomlevelinfo.cpp
     )
 
 kde4_add_kcfg_files(dolphinprivate_LIB_SRCS
-    dolphin_columnmodesettings.kcfgc
-    dolphin_directoryviewpropertysettings.kcfgc
-    dolphin_detailsmodesettings.kcfgc
-    dolphin_iconsmodesettings.kcfgc
-    dolphin_generalsettings.kcfgc)
+    settings/dolphin_columnmodesettings.kcfgc
+    settings/dolphin_directoryviewpropertysettings.kcfgc
+    settings/dolphin_detailsmodesettings.kcfgc
+    settings/dolphin_iconsmodesettings.kcfgc
+    settings/dolphin_generalsettings.kcfgc)
 
 kde4_add_library(dolphinprivate SHARED ${dolphinprivate_LIB_SRCS})
 
@@ -90,62 +90,62 @@ install(FILES dolphinpart.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 ##########################################
 
 set(dolphin_SRCS
-    columnviewsettingspage.cpp
-    commentwidget.cpp
-    commenteditwidget.cpp
-    detailsviewsettingspage.cpp
+    settings/columnviewsettingspage.cpp
+    panels/information/commentwidget.cpp
+    panels/information/commenteditwidget.cpp
+    settings/detailsviewsettingspage.cpp
     dolphinapplication.cpp
-    dolphinfontrequester.cpp
+    settings/dolphinfontrequester.cpp
     dolphinmainwindow.cpp
     dolphinnewmenu.cpp
     dolphinviewcontainer.cpp
     dolphinstatusbar.cpp
     dolphindirlister.cpp
     dolphincontextmenu.cpp
-    dolphinfileplacesview.cpp
-    dolphinsettingsdialog.cpp
+    panels/places/dolphinfileplacesview.cpp
+    settings/dolphinsettingsdialog.cpp
     filterbar.cpp
-    generalsettingspage.cpp
-    generalviewsettingspage.cpp
-    iconsizegroupbox.cpp
-    iconsviewsettingspage.cpp
-    infosidebarpage.cpp
-    ktreeview.cpp
+    settings/generalsettingspage.cpp
+    settings/generalviewsettingspage.cpp
+    settings/iconsizegroupbox.cpp
+    settings/iconsviewsettingspage.cpp
+    panels/information/infosidebarpage.cpp
+    panels/folders/ktreeview.cpp
     main.cpp
-    metadatawidget.cpp
-    metatextlabel.cpp
+    panels/information/metadatawidget.cpp
+    panels/information/metatextlabel.cpp
     pixmapviewer.cpp
-    settingspagebase.cpp
-    sidebarpage.cpp
-    startupsettingspage.cpp
+    settings/settingspagebase.cpp
+    panels/sidebarpage.cpp
+    settings/startupsettingspage.cpp
     statusbarspaceinfo.cpp
     statusbarmessagelabel.cpp
-    treeviewcontextmenu.cpp
-    treeviewsidebarpage.cpp
-    sidebartreeview.cpp
-    viewsettingspage.cpp
-    viewsettingspagebase.cpp
+    panels/folders/treeviewcontextmenu.cpp
+    panels/folders/treeviewsidebarpage.cpp
+    panels/folders/sidebartreeview.cpp
+    settings/viewsettingspage.cpp
+    settings/viewsettingspagebase.cpp
     zoomlevelinfo.cpp
     )
 
 kde4_add_kcfg_files(dolphin_SRCS
-    dolphin_folderspanelsettings.kcfgc)
+    panels/folders/dolphin_folderspanelsettings.kcfgc)
 
 if(Nepomuk_FOUND)
 set(dolphin_SRCS
   ${dolphin_SRCS}
-  nepomukmassupdatejob.cpp
-  tagcloud/tagcloud.cpp
-  tagcloud/resourcetaggingwidget.cpp
-  tagcloud/taggingpopup.cpp
-  tagcloud/newtagdialog.cpp
+  panels/information/nepomukmassupdatejob.cpp
+  panels/information/tagcloud.cpp
+  panels/information/resourcetaggingwidget.cpp
+  panels/information/taggingpopup.cpp
+  panels/information/newtagdialog.cpp
 )
-kde4_add_ui_files(dolphin_SRCS tagcloud/newtagdialog.ui)
+kde4_add_ui_files(dolphin_SRCS panels/information/newtagdialog.ui)
 
 endif(Nepomuk_FOUND)
 
 if(NOT WIN32)
-   set(dolphin_SRCS ${dolphin_SRCS} terminalsidebarpage.cpp)
+   set(dolphin_SRCS ${dolphin_SRCS} panels/terminal/terminalsidebarpage.cpp)
 endif(NOT WIN32)
 
 qt4_add_dbus_adaptor(dolphin_SRCS
@@ -171,25 +171,23 @@ install(TARGETS dolphin ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 set(kcm_dolphin_PART_SRCS
     kcmdolphin.cpp
-    columnviewsettingspage.cpp
-    detailsviewsettingspage.cpp
-    dolphinfontrequester.cpp
-#    dolphinsettings.cpp
-    generalviewsettingspage.cpp
-    iconsizegroupbox.cpp
-    iconsviewsettingspage.cpp
+    settings/columnviewsettingspage.cpp
+    settings/detailsviewsettingspage.cpp
+    settings/dolphinfontrequester.cpp
+    settings/generalviewsettingspage.cpp
+    settings/iconsizegroupbox.cpp
+    settings/iconsviewsettingspage.cpp
     pixmapviewer.cpp
-    viewsettingspagebase.cpp
-#    viewproperties.cpp
+    settings/viewsettingspagebase.cpp
     zoomlevelinfo.cpp
 )
 
 kde4_add_kcfg_files(kcm_dolphin_PART_SRCS
-    dolphin_columnmodesettings.kcfgc
-    dolphin_directoryviewpropertysettings.kcfgc
-    dolphin_detailsmodesettings.kcfgc
-    dolphin_iconsmodesettings.kcfgc
-    dolphin_generalsettings.kcfgc)
+    settings/dolphin_columnmodesettings.kcfgc
+    settings/dolphin_directoryviewpropertysettings.kcfgc
+    settings/dolphin_detailsmodesettings.kcfgc
+    settings/dolphin_iconsmodesettings.kcfgc
+    settings/dolphin_generalsettings.kcfgc)
 
 kde4_add_plugin(kcm_dolphin ${kcm_dolphin_PART_SRCS})
 
@@ -203,6 +201,6 @@ install(TARGETS kcm_dolphin DESTINATION ${PLUGIN_INSTALL_DIR} )
 ########### install files ###############
 
 install( FILES  dolphin.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
-install( FILES  dolphin_directoryviewpropertysettings.kcfg dolphin_generalsettings.kcfg dolphin_columnmodesettings.kcfg dolphin_iconsmodesettings.kcfg dolphin_detailsmodesettings.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
+install( FILES  settings/dolphin_directoryviewpropertysettings.kcfg settings/dolphin_generalsettings.kcfg settings/dolphin_columnmodesettings.kcfg settings/dolphin_iconsmodesettings.kcfg settings/dolphin_detailsmodesettings.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
 install( FILES  dolphinui.rc DESTINATION ${DATA_INSTALL_DIR}/dolphin )
 install( FILES kcmdolphin.desktop DESTINATION ${SERVICES_INSTALL_DIR} )

diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp
index 05c33d7dd1339b3c8d02ed83b02491901a20a84f..bc488b8ae5626efb0799ecd59fd8d4988a9c3cf7 100644 (file)
--- a/src/dolphincolumnview.cpp
+++ b/src/dolphincolumnview.cpp
@@ -21,7 +21,7 @@
 
 #include "dolphincolumnwidget.h"
 #include "dolphincontroller.h"
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "zoomlevelinfo.h"
 
 #include "dolphin_columnmodesettings.h"

diff --git a/src/dolphincolumnwidget.cpp b/src/dolphincolumnwidget.cpp
index d7d8bb500a0f7959950c0936aa70c864734c5a93..b86cd72696c45a450fdb54b62333410bc6a1fb9d 100644 (file)
--- a/src/dolphincolumnwidget.cpp
+++ b/src/dolphincolumnwidget.cpp
@@ -24,14 +24,14 @@
 #include "dolphincontroller.h"
 #include "dolphindirlister.h"
 #include "dolphinsortfilterproxymodel.h"
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "dolphinviewautoscroller.h"
 #include "dolphin_columnmodesettings.h"
 #include "dolphin_generalsettings.h"
 #include "draganddrophelper.h"
 #include "folderexpander.h"
 #include "selectionmanager.h"
-#include "tooltipmanager.h"
+#include "tooltips/tooltipmanager.h"
 
 #include <kcolorscheme.h>
 #include <kdirlister.h>

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 99735ea9ee9a08956e672bd9c4499aca7e890e8b..a7f7df36c53a4c9d3b43074531fdf68a2caae7c1 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -22,7 +22,7 @@
 
 #include "dolphinmainwindow.h"
 #include "dolphinnewmenu.h"
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "dolphinview.h"
 #include "dolphinviewcontainer.h"
 #include "dolphin_generalsettings.h"

diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index 2d18c8e18c71f350d34f849292e92aafca87a42a..acfff6a65c2f49ed4f91e73607c82614a37415a2 100644 (file)
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -23,7 +23,7 @@
 #include "dolphinmodel.h"
 #include "dolphincontroller.h"
 #include "dolphinfileitemdelegate.h"
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "dolphinsortfilterproxymodel.h"
 #include "dolphinviewautoscroller.h"
 #include "draganddrophelper.h"

diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index f32ecbd3df57e6b39d251999803283cd948e6aba..885a49101e04b1f0d154874c349f34c6a52ec7f7 100644 (file)
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -21,7 +21,7 @@
 
 #include "dolphincategorydrawer.h"
 #include "dolphincontroller.h"
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "dolphinviewautoscroller.h"
 #include "dolphin_iconsmodesettings.h"
 #include "dolphin_generalsettings.h"

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 9c55a40f4f82ca7547cb3bc1b6ca44b8dde5a1dd..c4d263bfd4f52d951d0cf2b98142946d5b97b653 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -25,20 +25,20 @@
 #include <config-nepomuk.h>
 
 #include "dolphinapplication.h"
-#include "dolphinfileplacesview.h"
+#include "panels/places/dolphinfileplacesview.h"
 #include "dolphinnewmenu.h"
-#include "dolphinsettings.h"
-#include "dolphinsettingsdialog.h"
+#include "settings/dolphinsettings.h"
+#include "settings/dolphinsettingsdialog.h"
 #include "dolphinstatusbar.h"
 #include "dolphinviewcontainer.h"
-#include "infosidebarpage.h"
-#include "metadatawidget.h"
+#include "panels/information/infosidebarpage.h"
+#include "panels/information/metadatawidget.h"
 #include "mainwindowadaptor.h"
-#include "treeviewsidebarpage.h"
+#include "panels/folders/treeviewsidebarpage.h"
 #include "viewproperties.h"
 
 #ifndef Q_OS_WIN
-#include "terminalsidebarpage.h"
+#include "panels/terminal/terminalsidebarpage.h"
 #endif
 
 #include "dolphin_generalsettings.h"

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 4220e825f13f1cd5e6d085663c50af10327ce755..b1e1ea5d0f9d1f814806f946084394a61ed80499 100644 (file)
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -23,7 +23,7 @@
 #define DOLPHIN_MAINWINDOW_H
 
 #include "dolphinview.h"
-#include "sidebarpage.h"
+#include "panels/sidebarpage.h"
 
 #include <config-nepomuk.h>
 

diff --git a/src/dolphinstatusbar.cpp b/src/dolphinstatusbar.cpp
index caa784049e654be149aa05f5a2c5b304f422b12b..7a9b5dc8a834fc88005504e28790f9319bcbf494 100644 (file)
--- a/src/dolphinstatusbar.cpp
+++ b/src/dolphinstatusbar.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include "dolphinstatusbar.h"
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "dolphinview.h"
 #include "dolphin_generalsettings.h"
 #include "statusbarmessagelabel.h"

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 0bd24ecb3a5a73f8f291efd5e9a2397864113984..6681fe1895421eca8dbfd26bff0da8909a89f6f2 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -57,12 +57,12 @@
 #include "dolphindetailsview.h"
 #include "dolphin_detailsmodesettings.h"
 #include "dolphiniconsview.h"
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "dolphin_generalsettings.h"
 #include "draganddrophelper.h"
 #include "folderexpander.h"
 #include "renamedialog.h"
-#include "tooltipmanager.h"
+#include "tooltips/tooltipmanager.h"
 #include "viewproperties.h"
 #include "zoomlevelinfo.h"
 

diff --git a/src/dolphinviewactionhandler.cpp b/src/dolphinviewactionhandler.cpp
index d563b3dd21808dc18042b2760c9b1969cd8e5d5f..45603c28682fc59d06157f2f87ad332f5c8468f1 100644 (file)
--- a/src/dolphinviewactionhandler.cpp
+++ b/src/dolphinviewactionhandler.cpp
@@ -19,7 +19,7 @@
 
 #include "dolphinviewactionhandler.h"
 
-#include "viewpropertiesdialog.h"
+#include "settings/viewpropertiesdialog.h"
 #include "dolphinview.h"
 #include "zoomlevelinfo.h"
 

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 3cd6b34f2e13a5cf6bf7537a7514ac78c34c3173..f09d3d1c926895573bf4fc55602c31ebe250f7f7 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -58,7 +58,7 @@
 #include "filterbar.h"
 #include "kurlnavigator.h"
 #include "viewproperties.h"
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "dolphin_generalsettings.h"
 
 DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,

diff --git a/src/folderexpander.cpp b/src/folderexpander.cpp
index 50f2bcf914a54dc2e77718b91508a7b251dbd2bc..091cd0c2c8bba57f01a77cb1f861a805b4dbd4a2 100644 (file)
--- a/src/folderexpander.cpp
+++ b/src/folderexpander.cpp
@@ -20,7 +20,7 @@
 #include "folderexpander.h"
 #include "dolphinview.h"
 
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "dolphin_generalsettings.h"
 
 #include <QtCore/QTimer>

diff --git a/src/kcmdolphin.cpp b/src/kcmdolphin.cpp
index f980fa502af4b6be3b45763b7e36532c4cb8ad56..21883e76ab8e32f890a8de15572070da112535fd 100644 (file)
--- a/src/kcmdolphin.cpp
+++ b/src/kcmdolphin.cpp
@@ -19,10 +19,10 @@
 
 #include "kcmdolphin.h"
 
-#include "columnviewsettingspage.h"
-#include "detailsviewsettingspage.h"
-#include "generalviewsettingspage.h"
-#include "iconsviewsettingspage.h"
+#include "settings/columnviewsettingspage.h"
+#include "settings/detailsviewsettingspage.h"
+#include "settings/generalviewsettingspage.h"
+#include "settings/iconsviewsettingspage.h"
 
 #include <ktabwidget.h>
 #include <kdialog.h>

diff --git a/src/dolphin_folderspanelsettings.kcfg b/src/panels/folders/dolphin_folderspanelsettings.kcfg
similarity index 100%
rename from src/dolphin_folderspanelsettings.kcfg
rename to src/panels/folders/dolphin_folderspanelsettings.kcfg

diff --git a/src/dolphin_folderspanelsettings.kcfgc b/src/panels/folders/dolphin_folderspanelsettings.kcfgc
similarity index 100%
rename from src/dolphin_folderspanelsettings.kcfgc
rename to src/panels/folders/dolphin_folderspanelsettings.kcfgc

diff --git a/src/ktreeview.cpp b/src/panels/folders/ktreeview.cpp
similarity index 100%
rename from src/ktreeview.cpp
rename to src/panels/folders/ktreeview.cpp

diff --git a/src/ktreeview.h b/src/panels/folders/ktreeview.h
similarity index 100%
rename from src/ktreeview.h
rename to src/panels/folders/ktreeview.h

diff --git a/src/ktreeview_p.h b/src/panels/folders/ktreeview_p.h
similarity index 100%
rename from src/ktreeview_p.h
rename to src/panels/folders/ktreeview_p.h

diff --git a/src/sidebartreeview.cpp b/src/panels/folders/sidebartreeview.cpp
similarity index 100%
rename from src/sidebartreeview.cpp
rename to src/panels/folders/sidebartreeview.cpp

diff --git a/src/sidebartreeview.h b/src/panels/folders/sidebartreeview.h
similarity index 98%
rename from src/sidebartreeview.h
rename to src/panels/folders/sidebartreeview.h
index 93bcbae2eb48e12764f0d6edb847779b50f55368..a5e8b63ced10860486687f733bf8d06fa8dd2eb0 100644 (file)
--- a/src/sidebartreeview.h
+++ b/src/panels/folders/sidebartreeview.h
@@ -21,7 +21,7 @@
 #define SIDEBARTREEVIEW_H
 
 #include <kurl.h>
-#include <ktreeview.h>
+#include <panels/folders/ktreeview.h>
 
 /**
  * @brief Tree view widget which is used for the sidebar panel.

diff --git a/src/treeviewcontextmenu.cpp b/src/panels/folders/treeviewcontextmenu.cpp
similarity index 100%
rename from src/treeviewcontextmenu.cpp
rename to src/panels/folders/treeviewcontextmenu.cpp

diff --git a/src/treeviewcontextmenu.h b/src/panels/folders/treeviewcontextmenu.h
similarity index 100%
rename from src/treeviewcontextmenu.h
rename to src/panels/folders/treeviewcontextmenu.h

diff --git a/src/treeviewsidebarpage.cpp b/src/panels/folders/treeviewsidebarpage.cpp
similarity index 99%
rename from src/treeviewsidebarpage.cpp
rename to src/panels/folders/treeviewsidebarpage.cpp
index d8387aea2ce3f9c6e46de41a31e19466f574ceca..7801a97cce5daacc832b2b3c0a3ef27a5dc49285 100644 (file)
--- a/src/treeviewsidebarpage.cpp
+++ b/src/panels/folders/treeviewsidebarpage.cpp
@@ -22,7 +22,7 @@
 #include "dolphinmodel.h"
 #include "dolphinsortfilterproxymodel.h"
 #include "dolphinview.h"
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "dolphin_folderspanelsettings.h"
 #include "dolphin_generalsettings.h"
 #include "draganddrophelper.h"

diff --git a/src/treeviewsidebarpage.h b/src/panels/folders/treeviewsidebarpage.h
similarity index 99%
rename from src/treeviewsidebarpage.h
rename to src/panels/folders/treeviewsidebarpage.h
index 84a9386ec23f118916f10dc577207aaa11f89693..39f2323ad4bc720731cc0d3c634302adaf97f9dd 100644 (file)
--- a/src/treeviewsidebarpage.h
+++ b/src/panels/folders/treeviewsidebarpage.h
@@ -21,7 +21,7 @@
 #define TREEVIEWSIDEBARPAGE_H
 
 #include <kurl.h>
-#include <sidebarpage.h>
+#include <panels/sidebarpage.h>
 
 class KDirLister;
 class DolphinModel;

diff --git a/src/commenteditwidget.cpp b/src/panels/information/commenteditwidget.cpp
similarity index 100%
rename from src/commenteditwidget.cpp
rename to src/panels/information/commenteditwidget.cpp

diff --git a/src/commenteditwidget.h b/src/panels/information/commenteditwidget.h
similarity index 100%
rename from src/commenteditwidget.h
rename to src/panels/information/commenteditwidget.h

diff --git a/src/commentwidget.cpp b/src/panels/information/commentwidget.cpp
similarity index 100%
rename from src/commentwidget.cpp
rename to src/panels/information/commentwidget.cpp

diff --git a/src/commentwidget.h b/src/panels/information/commentwidget.h
similarity index 100%
rename from src/commentwidget.h
rename to src/panels/information/commentwidget.h

diff --git a/src/infosidebarpage.cpp b/src/panels/information/infosidebarpage.cpp
similarity index 99%
rename from src/infosidebarpage.cpp
rename to src/panels/information/infosidebarpage.cpp
index aa8b20553cfca58c35013167e1730f9bf8891ad2..9eb35bc8d4b97dac3dcee9c249da6c60dea2d5fa 100644 (file)
--- a/src/infosidebarpage.cpp
+++ b/src/panels/information/infosidebarpage.cpp
@@ -45,7 +45,7 @@
 #include <QTimer>
 #include <QVBoxLayout>
 
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "metadatawidget.h"
 #include "metatextlabel.h"
 #include "pixmapviewer.h"

diff --git a/src/infosidebarpage.h b/src/panels/information/infosidebarpage.h
similarity index 99%
rename from src/infosidebarpage.h
rename to src/panels/information/infosidebarpage.h
index e6f5117149ca73a12bb8cdbcd16021f7c6b6615d..879a245adcd9a4a76359923a6e6d0ce36b9901cb 100644 (file)
--- a/src/infosidebarpage.h
+++ b/src/panels/information/infosidebarpage.h
@@ -20,7 +20,7 @@
 #ifndef INFOSIDEBARPAGE_H
 #define INFOSIDEBARPAGE_H
 
-#include <sidebarpage.h>
+#include <panels/sidebarpage.h>
 
 #include <QtGui/QPushButton>
 #include <QtGui/QPixmap>

diff --git a/src/metadatawidget.cpp b/src/panels/information/metadatawidget.cpp
similarity index 98%
rename from src/metadatawidget.cpp
rename to src/panels/information/metadatawidget.cpp
index 218a6d1ce4e53de20ee2003a846499b5e5a4b227..44a4c029f16e0d1292f82247af8b2fafc63b3080 100644 (file)
--- a/src/metadatawidget.cpp
+++ b/src/panels/information/metadatawidget.cpp
@@ -43,7 +43,7 @@
 #include <nepomuk/variant.h>
 #include <nepomuk/kratingwidget.h>
 #include <Soprano/Vocabulary/Xesam>
-#include "tagcloud/resourcetaggingwidget.h"
+#include "resourcetaggingwidget.h"
 #endif
 
 
@@ -66,7 +66,7 @@ public:
     CommentWidget* editComment;
     KRatingWidget* ratingWidget;
     Nepomuk::ResourceTaggingWidget* tagWidget;
-    
+
     // shared data between the GUI-thread and
     // the loader-thread (see LoadFilesThread):
     QMutex mutex;
@@ -77,7 +77,7 @@ public:
         QList<Nepomuk::Resource> fileRes;
         QMap<KUrl, Nepomuk::Resource> files;
     } sharedData;
-    
+
     /**
      * Loads the meta data of files and writes
      * the result into a shared data pool that
@@ -89,13 +89,13 @@ public:
         LoadFilesThread(SharedData* sharedData, QMutex* mutex);
         void setFiles(const KUrl::List& urls);
         virtual void run();
-        
+
     private:
         SharedData* m_sharedData;
         QMutex* m_mutex;
         KUrl::List m_urls;
     };
-    
+
     LoadFilesThread* loadFilesThread;
 #endif
 };
@@ -126,7 +126,7 @@ void MetaDataWidget::Private::LoadFilesThread::run()
     QMutexLocker locker( m_mutex );
     const KUrl::List urls = m_urls;
     locker.unlock();
-    
+
     bool first = true;
     QList<Nepomuk::Resource> fileRes;
     QMap<KUrl, Nepomuk::Resource> files;
@@ -152,7 +152,7 @@ void MetaDataWidget::Private::LoadFilesThread::run()
         }
         first = false;
     }
-    
+
     locker.relock();
     m_sharedData->rating = rating;
     m_sharedData->comment = comment;
@@ -174,7 +174,7 @@ MetaDataWidget::MetaDataWidget(QWidget* parent) :
     connect(d->ratingWidget, SIGNAL(ratingChanged(unsigned int)), this, SLOT(slotRatingChanged(unsigned int)));
     connect(d->editComment, SIGNAL(commentChanged(const QString&)), this, SLOT(slotCommentChanged(const QString&)));
     connect( d->tagWidget, SIGNAL( tagClicked( const Nepomuk::Tag& ) ), this, SLOT( slotTagClicked( const Nepomuk::Tag& ) ) );
-    
+
     d->sharedData.rating = 0;
     d->loadFilesThread = new Private::LoadFilesThread(&d->sharedData, &d->mutex);
     connect(d->loadFilesThread, SIGNAL(finished()), this, SLOT(slotLoadingFinished()));

diff --git a/src/metadatawidget.h b/src/panels/information/metadatawidget.h
similarity index 100%
rename from src/metadatawidget.h
rename to src/panels/information/metadatawidget.h

diff --git a/src/metatextlabel.cpp b/src/panels/information/metatextlabel.cpp
similarity index 100%
rename from src/metatextlabel.cpp
rename to src/panels/information/metatextlabel.cpp

diff --git a/src/metatextlabel.h b/src/panels/information/metatextlabel.h
similarity index 100%
rename from src/metatextlabel.h
rename to src/panels/information/metatextlabel.h

diff --git a/src/nepomukmassupdatejob.cpp b/src/panels/information/nepomukmassupdatejob.cpp
similarity index 100%
rename from src/nepomukmassupdatejob.cpp
rename to src/panels/information/nepomukmassupdatejob.cpp

diff --git a/src/nepomukmassupdatejob.h b/src/panels/information/nepomukmassupdatejob.h
similarity index 100%
rename from src/nepomukmassupdatejob.h
rename to src/panels/information/nepomukmassupdatejob.h

diff --git a/src/tagcloud/newtagdialog.cpp b/src/panels/information/newtagdialog.cpp
similarity index 100%
rename from src/tagcloud/newtagdialog.cpp
rename to src/panels/information/newtagdialog.cpp

diff --git a/src/tagcloud/newtagdialog.h b/src/panels/information/newtagdialog.h
similarity index 100%
rename from src/tagcloud/newtagdialog.h
rename to src/panels/information/newtagdialog.h

diff --git a/src/tagcloud/newtagdialog.ui b/src/panels/information/newtagdialog.ui
similarity index 100%
rename from src/tagcloud/newtagdialog.ui
rename to src/panels/information/newtagdialog.ui

diff --git a/src/tagcloud/resourcetaggingwidget.cpp b/src/panels/information/resourcetaggingwidget.cpp
similarity index 99%
rename from src/tagcloud/resourcetaggingwidget.cpp
rename to src/panels/information/resourcetaggingwidget.cpp
index 1e3fffe8f6b5172379b02b33b7a4a4ba43c8fdba..3a4da3ea99fe29a79efa4be3534676526119d95e 100644 (file)
--- a/src/tagcloud/resourcetaggingwidget.cpp
+++ b/src/panels/information/resourcetaggingwidget.cpp
@@ -20,7 +20,7 @@
 #include "resourcetaggingwidget.h"
 #include "tagcloud.h"
 #include "taggingpopup.h"
-#include "../nepomukmassupdatejob.h"
+#include "nepomukmassupdatejob.h"
 
 #include <QtGui/QVBoxLayout>
 #include <QtGui/QContextMenuEvent>

diff --git a/src/tagcloud/resourcetaggingwidget.h b/src/panels/information/resourcetaggingwidget.h
similarity index 100%
rename from src/tagcloud/resourcetaggingwidget.h
rename to src/panels/information/resourcetaggingwidget.h

diff --git a/src/tagcloud/tagcloud.cpp b/src/panels/information/tagcloud.cpp
similarity index 100%
rename from src/tagcloud/tagcloud.cpp
rename to src/panels/information/tagcloud.cpp

diff --git a/src/tagcloud/tagcloud.h b/src/panels/information/tagcloud.h
similarity index 100%
rename from src/tagcloud/tagcloud.h
rename to src/panels/information/tagcloud.h

diff --git a/src/tagcloud/taggingpopup.cpp b/src/panels/information/taggingpopup.cpp
similarity index 100%
rename from src/tagcloud/taggingpopup.cpp
rename to src/panels/information/taggingpopup.cpp

diff --git a/src/tagcloud/taggingpopup.h b/src/panels/information/taggingpopup.h
similarity index 100%
rename from src/tagcloud/taggingpopup.h
rename to src/panels/information/taggingpopup.h

diff --git a/src/dolphinfileplacesview.cpp b/src/panels/places/dolphinfileplacesview.cpp
similarity index 100%
rename from src/dolphinfileplacesview.cpp
rename to src/panels/places/dolphinfileplacesview.cpp

diff --git a/src/dolphinfileplacesview.h b/src/panels/places/dolphinfileplacesview.h
similarity index 100%
rename from src/dolphinfileplacesview.h
rename to src/panels/places/dolphinfileplacesview.h

diff --git a/src/sidebarpage.cpp b/src/panels/sidebarpage.cpp
similarity index 100%
rename from src/sidebarpage.cpp
rename to src/panels/sidebarpage.cpp

diff --git a/src/sidebarpage.h b/src/panels/sidebarpage.h
similarity index 100%
rename from src/sidebarpage.h
rename to src/panels/sidebarpage.h

diff --git a/src/terminalsidebarpage.cpp b/src/panels/terminal/terminalsidebarpage.cpp
similarity index 100%
rename from src/terminalsidebarpage.cpp
rename to src/panels/terminal/terminalsidebarpage.cpp

diff --git a/src/terminalsidebarpage.h b/src/panels/terminal/terminalsidebarpage.h
similarity index 98%
rename from src/terminalsidebarpage.h
rename to src/panels/terminal/terminalsidebarpage.h
index 875a6b706f5e0358a872cc6e4b06e36dacb39c56..4e8c405935b7c6812b15e478dbd54b278d155b67 100644 (file)
--- a/src/terminalsidebarpage.h
+++ b/src/panels/terminal/terminalsidebarpage.h
@@ -20,7 +20,7 @@
 #ifndef TERMINALSIDEBARPAGE_H
 #define TERMINALSIDEBARPAGE_H
 
-#include <sidebarpage.h>
+#include <panels/sidebarpage.h>
 
 class TerminalInterface;
 class QVBoxLayout;

diff --git a/src/additionalinfodialog.cpp b/src/settings/additionalinfodialog.cpp
similarity index 100%
rename from src/additionalinfodialog.cpp
rename to src/settings/additionalinfodialog.cpp

diff --git a/src/additionalinfodialog.h b/src/settings/additionalinfodialog.h
similarity index 100%
rename from src/additionalinfodialog.h
rename to src/settings/additionalinfodialog.h

diff --git a/src/applyviewpropsjob.cpp b/src/settings/applyviewpropsjob.cpp
similarity index 100%
rename from src/applyviewpropsjob.cpp
rename to src/settings/applyviewpropsjob.cpp

diff --git a/src/applyviewpropsjob.h b/src/settings/applyviewpropsjob.h
similarity index 100%
rename from src/applyviewpropsjob.h
rename to src/settings/applyviewpropsjob.h

diff --git a/src/columnviewsettingspage.cpp b/src/settings/columnviewsettingspage.cpp
similarity index 100%
rename from src/columnviewsettingspage.cpp
rename to src/settings/columnviewsettingspage.cpp

diff --git a/src/columnviewsettingspage.h b/src/settings/columnviewsettingspage.h
similarity index 98%
rename from src/columnviewsettingspage.h
rename to src/settings/columnviewsettingspage.h
index 5e16dc67bc47bfb4f4e83e051380212f4f06f2af..c723ed635b297ab96d1bc240d1e752b69b7206f4 100644 (file)
--- a/src/columnviewsettingspage.h
+++ b/src/settings/columnviewsettingspage.h
@@ -20,7 +20,7 @@
 #ifndef COLUMNVIEWSETTINGSPAGE_H
 #define COLUMNVIEWSETTINGSPAGE_H
 
-#include <viewsettingspagebase.h>
+#include <settings/viewsettingspagebase.h>
 
 class DolphinMainWindow;
 class DolphinFontRequester;

diff --git a/src/detailsviewsettingspage.cpp b/src/settings/detailsviewsettingspage.cpp
similarity index 99%
rename from src/detailsviewsettingspage.cpp
rename to src/settings/detailsviewsettingspage.cpp
index 4a439ab1d7c1d610cf783f684d1355b68ab98bd4..0c47caf246b42c8ad4664de2c8b5be64d3f9a9d9 100644 (file)
--- a/src/detailsviewsettingspage.cpp
+++ b/src/settings/detailsviewsettingspage.cpp
@@ -20,12 +20,12 @@
 #include "detailsviewsettingspage.h"
 
 #include "iconsizegroupbox.h"
+#include "dolphinfontrequester.h"
 #include "dolphinsettings.h"
 #include "dolphin_detailsmodesettings.h"
 #include "zoomlevelinfo.h"
 
 #include <kdialog.h>
-#include <dolphinfontrequester.h>
 #include <klocale.h>
 
 #include <QButtonGroup>

diff --git a/src/detailsviewsettingspage.h b/src/settings/detailsviewsettingspage.h
similarity index 98%
rename from src/detailsviewsettingspage.h
rename to src/settings/detailsviewsettingspage.h
index 587d42244862bbe67b2e82254a14073b465694f4..58e3fd905fa41bb0d070519e35b9a067cde35107 100644 (file)
--- a/src/detailsviewsettingspage.h
+++ b/src/settings/detailsviewsettingspage.h
@@ -20,7 +20,7 @@
 #ifndef DETAILSVIEWSETTINGSPAGE_H
 #define DETAILSVIEWSETTINGSPAGE_H
 
-#include <viewsettingspagebase.h>
+#include <settings/viewsettingspagebase.h>
 
 class DolphinFontRequester;
 class IconSizeGroupBox;

diff --git a/src/dolphin_columnmodesettings.kcfg b/src/settings/dolphin_columnmodesettings.kcfg
similarity index 100%
rename from src/dolphin_columnmodesettings.kcfg
rename to src/settings/dolphin_columnmodesettings.kcfg

diff --git a/src/dolphin_columnmodesettings.kcfgc b/src/settings/dolphin_columnmodesettings.kcfgc
similarity index 100%
rename from src/dolphin_columnmodesettings.kcfgc
rename to src/settings/dolphin_columnmodesettings.kcfgc

diff --git a/src/dolphin_detailsmodesettings.kcfg b/src/settings/dolphin_detailsmodesettings.kcfg
similarity index 100%
rename from src/dolphin_detailsmodesettings.kcfg
rename to src/settings/dolphin_detailsmodesettings.kcfg

diff --git a/src/dolphin_detailsmodesettings.kcfgc b/src/settings/dolphin_detailsmodesettings.kcfgc
similarity index 100%
rename from src/dolphin_detailsmodesettings.kcfgc
rename to src/settings/dolphin_detailsmodesettings.kcfgc

diff --git a/src/dolphin_directoryviewpropertysettings.kcfg b/src/settings/dolphin_directoryviewpropertysettings.kcfg
similarity index 100%
rename from src/dolphin_directoryviewpropertysettings.kcfg
rename to src/settings/dolphin_directoryviewpropertysettings.kcfg

diff --git a/src/dolphin_directoryviewpropertysettings.kcfgc b/src/settings/dolphin_directoryviewpropertysettings.kcfgc
similarity index 100%
rename from src/dolphin_directoryviewpropertysettings.kcfgc
rename to src/settings/dolphin_directoryviewpropertysettings.kcfgc

diff --git a/src/dolphin_generalsettings.kcfg b/src/settings/dolphin_generalsettings.kcfg
similarity index 100%
rename from src/dolphin_generalsettings.kcfg
rename to src/settings/dolphin_generalsettings.kcfg

diff --git a/src/dolphin_generalsettings.kcfgc b/src/settings/dolphin_generalsettings.kcfgc
similarity index 100%
rename from src/dolphin_generalsettings.kcfgc
rename to src/settings/dolphin_generalsettings.kcfgc

diff --git a/src/dolphin_iconsmodesettings.kcfg b/src/settings/dolphin_iconsmodesettings.kcfg
similarity index 100%
rename from src/dolphin_iconsmodesettings.kcfg
rename to src/settings/dolphin_iconsmodesettings.kcfg

diff --git a/src/dolphin_iconsmodesettings.kcfgc b/src/settings/dolphin_iconsmodesettings.kcfgc
similarity index 100%
rename from src/dolphin_iconsmodesettings.kcfgc
rename to src/settings/dolphin_iconsmodesettings.kcfgc

diff --git a/src/dolphinfontrequester.cpp b/src/settings/dolphinfontrequester.cpp
similarity index 100%
rename from src/dolphinfontrequester.cpp
rename to src/settings/dolphinfontrequester.cpp

diff --git a/src/dolphinfontrequester.h b/src/settings/dolphinfontrequester.h
similarity index 100%
rename from src/dolphinfontrequester.h
rename to src/settings/dolphinfontrequester.h

diff --git a/src/dolphinsettings.cpp b/src/settings/dolphinsettings.cpp
similarity index 100%
rename from src/dolphinsettings.cpp
rename to src/settings/dolphinsettings.cpp

diff --git a/src/dolphinsettings.h b/src/settings/dolphinsettings.h
similarity index 100%
rename from src/dolphinsettings.h
rename to src/settings/dolphinsettings.h

diff --git a/src/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp
similarity index 98%
rename from src/dolphinsettingsdialog.cpp
rename to src/settings/dolphinsettingsdialog.cpp
index 7b1e2326635118439be005beaf03a38ba73e6da4..54ac74bdee121ab6203038e811da9c0e25b48331 100644 (file)
--- a/src/dolphinsettingsdialog.cpp
+++ b/src/settings/dolphinsettingsdialog.cpp
@@ -20,8 +20,8 @@
 
 #include "dolphinsettingsdialog.h"
 
-#include "dolphinapplication.h"
-#include "dolphinmainwindow.h"
+#include <dolphinapplication.h>
+#include <dolphinmainwindow.h>
 #include "generalsettingspage.h"
 #include "startupsettingspage.h"
 #include "viewsettingspage.h"

diff --git a/src/dolphinsettingsdialog.h b/src/settings/dolphinsettingsdialog.h
similarity index 100%
rename from src/dolphinsettingsdialog.h
rename to src/settings/dolphinsettingsdialog.h

diff --git a/src/generalsettingspage.cpp b/src/settings/generalsettingspage.cpp
similarity index 99%
rename from src/generalsettingspage.cpp
rename to src/settings/generalsettingspage.cpp
index 68193b4e41b73d8733bb61fe35c51803c9b5621d..86b6f1939fa42f181bcd352ea60a744293c15255 100644 (file)
--- a/src/generalsettingspage.cpp
+++ b/src/settings/generalsettingspage.cpp
@@ -20,7 +20,7 @@
 
 #include "generalsettingspage.h"
 
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 
 #include "dolphin_generalsettings.h"
 

diff --git a/src/generalsettingspage.h b/src/settings/generalsettingspage.h
similarity index 98%
rename from src/generalsettingspage.h
rename to src/settings/generalsettingspage.h
index da7e72f0f2056236dab7c6411bf0e0fa7f5a0662..4059dc3c686ef35b87059e8cef8dadef28ae0aad 100644 (file)
--- a/src/generalsettingspage.h
+++ b/src/settings/generalsettingspage.h
@@ -20,7 +20,7 @@
 #ifndef GENERALSETTINGSPAGE_H
 #define GENERALSETTINGSPAGE_H
 
-#include <settingspagebase.h>
+#include <settings/settingspagebase.h>
 
 class DolphinMainWindow;
 class QLineEdit;

diff --git a/src/generalviewsettingspage.cpp b/src/settings/generalviewsettingspage.cpp
similarity index 99%
rename from src/generalviewsettingspage.cpp
rename to src/settings/generalviewsettingspage.cpp
index 9ef2ee97e1424d5ba3484a7aee8dc43f45ee22bc..acea9649c1a199fb3ebc0038b0349721690ee743 100644 (file)
--- a/src/generalviewsettingspage.cpp
+++ b/src/settings/generalviewsettingspage.cpp
@@ -19,7 +19,7 @@
 
 #include "generalviewsettingspage.h"
 #include "dolphinmainwindow.h"
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "dolphinviewcontainer.h"
 #include "viewproperties.h"
 

diff --git a/src/generalviewsettingspage.h b/src/settings/generalviewsettingspage.h
similarity index 98%
rename from src/generalviewsettingspage.h
rename to src/settings/generalviewsettingspage.h
index 9046223487408e13d43df9e4e298dc0e1a896e6f..b0bd7e005cb3b5554a497b2500fceb61382415ca 100644 (file)
--- a/src/generalviewsettingspage.h
+++ b/src/settings/generalviewsettingspage.h
@@ -21,7 +21,7 @@
 #define GENERALVIEWSETTINGSPAGE_H
 
 #include <kurl.h>
-#include <viewsettingspagebase.h>
+#include <settings/viewsettingspagebase.h>
 
 class DolphinMainWindow;
 class QCheckBox;

diff --git a/src/iconsizegroupbox.cpp b/src/settings/iconsizegroupbox.cpp
similarity index 100%
rename from src/iconsizegroupbox.cpp
rename to src/settings/iconsizegroupbox.cpp

diff --git a/src/iconsizegroupbox.h b/src/settings/iconsizegroupbox.h
similarity index 100%
rename from src/iconsizegroupbox.h
rename to src/settings/iconsizegroupbox.h

diff --git a/src/iconsviewsettingspage.cpp b/src/settings/iconsviewsettingspage.cpp
similarity index 99%
rename from src/iconsviewsettingspage.cpp
rename to src/settings/iconsviewsettingspage.cpp
index ca43841b8def068531120ca4dde9c7ef5c0cd13c..2acb4cd60dfe8ee27bbb850366668b9b48e033e4 100644 (file)
--- a/src/iconsviewsettingspage.cpp
+++ b/src/settings/iconsviewsettingspage.cpp
@@ -20,7 +20,7 @@
 #include "iconsviewsettingspage.h"
 
 #include "dolphinfontrequester.h"
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "iconsizegroupbox.h"
 #include "zoomlevelinfo.h"
 

diff --git a/src/iconsviewsettingspage.h b/src/settings/iconsviewsettingspage.h
similarity index 98%
rename from src/iconsviewsettingspage.h
rename to src/settings/iconsviewsettingspage.h
index 75db81e536b28558f2fb20c0d9508d7b013f4116..c30ade6733b80fab23ca25d6cd200b90720bc141 100644 (file)
--- a/src/iconsviewsettingspage.h
+++ b/src/settings/iconsviewsettingspage.h
@@ -21,7 +21,7 @@
 #define ICONSVIEWSETTINGSPAGE_H
 
 #include <dolphiniconsview.h>
-#include <viewsettingspagebase.h>
+#include <settings/viewsettingspagebase.h>
 
 class DolphinFontRequester;
 class IconSizeGroupBox;

diff --git a/src/settingspagebase.cpp b/src/settings/settingspagebase.cpp
similarity index 100%
rename from src/settingspagebase.cpp
rename to src/settings/settingspagebase.cpp

diff --git a/src/settingspagebase.h b/src/settings/settingspagebase.h
similarity index 100%
rename from src/settingspagebase.h
rename to src/settings/settingspagebase.h

diff --git a/src/startupsettingspage.cpp b/src/settings/startupsettingspage.cpp
similarity index 99%
rename from src/startupsettingspage.cpp
rename to src/settings/startupsettingspage.cpp
index 35fc47a57cfa83fc806f866a5845c5d3b5b6cdd5..767fcab667ffda49134bfe37765912da575bb174 100644 (file)
--- a/src/startupsettingspage.cpp
+++ b/src/settings/startupsettingspage.cpp
@@ -19,7 +19,7 @@
 
 #include "startupsettingspage.h"
 
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "dolphinmainwindow.h"
 #include "dolphinview.h"
 #include "dolphinviewcontainer.h"

diff --git a/src/startupsettingspage.h b/src/settings/startupsettingspage.h
similarity index 98%
rename from src/startupsettingspage.h
rename to src/settings/startupsettingspage.h
index a56869cd4bc96c989ef1979fbcf49d2a958827ff..04844f00c338b9cde932bc40733d6cbe6537cd03 100644 (file)
--- a/src/startupsettingspage.h
+++ b/src/settings/startupsettingspage.h
@@ -19,7 +19,7 @@
 #ifndef STARTUPSETTINGSPAGE_H
 #define STARTUPSETTINGSPAGE_H
 
-#include <settingspagebase.h>
+#include <settings/settingspagebase.h>
 
 class DolphinMainWindow;
 class KLineEdit;

diff --git a/src/viewpropertiesdialog.cpp b/src/settings/viewpropertiesdialog.cpp
similarity index 99%
rename from src/viewpropertiesdialog.cpp
rename to src/settings/viewpropertiesdialog.cpp
index 9302ba138f1e733fc689c4504cae89d09bdaec6c..700bdb90b4e2f4959d867ba9e44bda60fa3b8614 100644 (file)
--- a/src/viewpropertiesdialog.cpp
+++ b/src/settings/viewpropertiesdialog.cpp
@@ -22,7 +22,7 @@
 
 #include "additionalinfodialog.h"
 #include "dolphinview.h"
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "dolphinsortfilterproxymodel.h"
 #include "dolphin_generalsettings.h"
 #include "dolphin_iconsmodesettings.h"

diff --git a/src/viewpropertiesdialog.h b/src/settings/viewpropertiesdialog.h
similarity index 100%
rename from src/viewpropertiesdialog.h
rename to src/settings/viewpropertiesdialog.h

diff --git a/src/viewpropsprogressinfo.cpp b/src/settings/viewpropsprogressinfo.cpp
similarity index 100%
rename from src/viewpropsprogressinfo.cpp
rename to src/settings/viewpropsprogressinfo.cpp

diff --git a/src/viewpropsprogressinfo.h b/src/settings/viewpropsprogressinfo.h
similarity index 100%
rename from src/viewpropsprogressinfo.h
rename to src/settings/viewpropsprogressinfo.h

diff --git a/src/viewsettingspage.cpp b/src/settings/viewsettingspage.cpp
similarity index 95%
rename from src/viewsettingspage.cpp
rename to src/settings/viewsettingspage.cpp
index bef05f58f16b6df8c8b360cc9a1050a49a312adf..44d32af81b07f8ffe80a7be3d6a0b276e983187d 100644 (file)
--- a/src/viewsettingspage.cpp
+++ b/src/settings/viewsettingspage.cpp
@@ -20,12 +20,12 @@
 
 #include "viewsettingspage.h"
 
-#include "columnviewsettingspage.h"
-#include "detailsviewsettingspage.h"
+#include "settings/columnviewsettingspage.h"
+#include "settings/detailsviewsettingspage.h"
 #include "dolphinmainwindow.h"
 #include "dolphinviewcontainer.h"
-#include "generalviewsettingspage.h"
-#include "iconsviewsettingspage.h"
+#include "settings/generalviewsettingspage.h"
+#include "settings/iconsviewsettingspage.h"
 
 #include <QtGui/QBoxLayout>
 #include <QtGui/QLayout>

diff --git a/src/viewsettingspage.h b/src/settings/viewsettingspage.h
similarity index 98%
rename from src/viewsettingspage.h
rename to src/settings/viewsettingspage.h
index 21ce40039d40c8f673af3dafc41994a92446f389..5e76b30d1d65eae9ed707f156d98e8bd0ce95326 100644 (file)
--- a/src/viewsettingspage.h
+++ b/src/settings/viewsettingspage.h
@@ -21,7 +21,7 @@
 #define VIEWSETTINGSPAGE_H
 
 #include <QtGui/QWidget>
-#include <settingspagebase.h>
+#include <settings/settingspagebase.h>
 
 class ViewSettingsPageBase;
 class DolphinMainWindow;

diff --git a/src/viewsettingspagebase.cpp b/src/settings/viewsettingspagebase.cpp
similarity index 100%
rename from src/viewsettingspagebase.cpp
rename to src/settings/viewsettingspagebase.cpp

diff --git a/src/viewsettingspagebase.h b/src/settings/viewsettingspagebase.h
similarity index 100%
rename from src/viewsettingspagebase.h
rename to src/settings/viewsettingspagebase.h

diff --git a/src/dolphintooltip.cpp b/src/tooltips/dolphintooltip.cpp
similarity index 100%
rename from src/dolphintooltip.cpp
rename to src/tooltips/dolphintooltip.cpp

diff --git a/src/dolphintooltip.h b/src/tooltips/dolphintooltip.h
similarity index 96%
rename from src/dolphintooltip.h
rename to src/tooltips/dolphintooltip.h
index cfc4388311a925714cec816d8d49eb9b904baff3..5c0682171504d64d7b6535060abe6d449e54be04 100644 (file)
--- a/src/dolphintooltip.h
+++ b/src/tooltips/dolphintooltip.h
@@ -22,8 +22,8 @@
 #ifndef DOLPHINTOOLTIP_H
 #define DOLPHINTOOLTIP_H
 
-#include "ktooltip.h"
-#include "kformattedballoontipdelegate.h"
+#include <tooltips/ktooltip.h>
+#include <tooltips/kformattedballoontipdelegate.h>
 
 #include <kio/previewjob.h>
 #include <QtCore/QObject>

diff --git a/src/kformattedballoontipdelegate.cpp b/src/tooltips/kformattedballoontipdelegate.cpp
similarity index 100%
rename from src/kformattedballoontipdelegate.cpp
rename to src/tooltips/kformattedballoontipdelegate.cpp

diff --git a/src/kformattedballoontipdelegate.h b/src/tooltips/kformattedballoontipdelegate.h
similarity index 98%
rename from src/kformattedballoontipdelegate.h
rename to src/tooltips/kformattedballoontipdelegate.h
index 452b38a692d26fbc56975635dc864919a358923c..117d6eec7efd899b60b0ca16211a130201f8b713 100644 (file)
--- a/src/kformattedballoontipdelegate.h
+++ b/src/tooltips/kformattedballoontipdelegate.h
@@ -21,7 +21,7 @@
 #ifndef KFORMATTEDBALLOONTIPDELEGATE_H
 #define KFORMATTEDBALLOONTIPDELEGATE_H
 
-#include "ktooltip.h"
+#include <tooltips/ktooltip.h>
 #include <QPainter>
 
 class KFormattedBalloonTipDelegate : public KToolTipDelegate

diff --git a/src/ktooltip.cpp b/src/tooltips/ktooltip.cpp
similarity index 100%
rename from src/ktooltip.cpp
rename to src/tooltips/ktooltip.cpp

diff --git a/src/ktooltip.h b/src/tooltips/ktooltip.h
similarity index 100%
rename from src/ktooltip.h
rename to src/tooltips/ktooltip.h

diff --git a/src/ktooltip_p.h b/src/tooltips/ktooltip_p.h
similarity index 100%
rename from src/ktooltip_p.h
rename to src/tooltips/ktooltip_p.h

diff --git a/src/tooltipmanager.cpp b/src/tooltips/tooltipmanager.cpp
similarity index 99%
rename from src/tooltipmanager.cpp
rename to src/tooltips/tooltipmanager.cpp
index aefa846e91a9f8977e0265898882521dfaa44d6d..36a008f338777db76c5f23dd1cbc977b7513ff1a 100644 (file)
--- a/src/tooltipmanager.cpp
+++ b/src/tooltips/tooltipmanager.cpp
@@ -24,7 +24,7 @@
 #include "dolphinsortfilterproxymodel.h"
 
 #include <kicon.h>
-#include <ktooltip.h>
+#include <tooltips/ktooltip.h>
 #include <kio/previewjob.h>
 
 #include <QApplication>

diff --git a/src/tooltipmanager.h b/src/tooltips/tooltipmanager.h
similarity index 100%
rename from src/tooltipmanager.h
rename to src/tooltips/tooltipmanager.h

diff --git a/src/viewproperties.cpp b/src/viewproperties.cpp
index 9b173d1c4eb920bc5ed8aa124e40964ea6c06a83..62898e67004d43bb25a24db5a2194885244d5e7a 100644 (file)
--- a/src/viewproperties.cpp
+++ b/src/viewproperties.cpp
@@ -20,7 +20,7 @@
 
 #include "viewproperties.h"
 
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "dolphin_directoryviewpropertysettings.h"
 #include "dolphin_generalsettings.h"