From 307285e9635a4bf584d6e5d7478876b90ef870f0 Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Wed, 14 Jan 2009 19:26:23 +0000 Subject: [PATCH] Group classes into folders, Dolphin is too big in the meantime for having a flat directory hierarchy. dolphin/src/CMakeLists.txt will be cleaned up later. svn path=/trunk/KDE/kdebase/apps/; revision=911065 --- src/CMakeLists.txt | 118 +++++++++--------- src/dolphincolumnview.cpp | 2 +- src/dolphincolumnwidget.cpp | 4 +- src/dolphincontextmenu.cpp | 2 +- src/dolphindetailsview.cpp | 2 +- src/dolphiniconsview.cpp | 2 +- src/dolphinmainwindow.cpp | 14 +-- src/dolphinmainwindow.h | 2 +- src/dolphinstatusbar.cpp | 2 +- src/dolphinview.cpp | 4 +- src/dolphinviewactionhandler.cpp | 2 +- src/dolphinviewcontainer.cpp | 2 +- src/folderexpander.cpp | 2 +- src/kcmdolphin.cpp | 8 +- .../dolphin_folderspanelsettings.kcfg | 0 .../dolphin_folderspanelsettings.kcfgc | 0 src/{ => panels/folders}/ktreeview.cpp | 0 src/{ => panels/folders}/ktreeview.h | 0 src/{ => panels/folders}/ktreeview_p.h | 0 src/{ => panels/folders}/sidebartreeview.cpp | 0 src/{ => panels/folders}/sidebartreeview.h | 2 +- .../folders}/treeviewcontextmenu.cpp | 0 .../folders}/treeviewcontextmenu.h | 0 .../folders}/treeviewsidebarpage.cpp | 2 +- .../folders}/treeviewsidebarpage.h | 2 +- .../information}/commenteditwidget.cpp | 0 .../information}/commenteditwidget.h | 0 .../information}/commentwidget.cpp | 0 src/{ => panels/information}/commentwidget.h | 0 .../information}/infosidebarpage.cpp | 2 +- .../information}/infosidebarpage.h | 2 +- .../information}/metadatawidget.cpp | 16 +-- src/{ => panels/information}/metadatawidget.h | 0 .../information}/metatextlabel.cpp | 0 src/{ => panels/information}/metatextlabel.h | 0 .../information}/nepomukmassupdatejob.cpp | 0 .../information}/nepomukmassupdatejob.h | 0 .../information}/newtagdialog.cpp | 0 .../information}/newtagdialog.h | 0 .../information}/newtagdialog.ui | 0 .../information}/resourcetaggingwidget.cpp | 2 +- .../information}/resourcetaggingwidget.h | 0 .../information}/tagcloud.cpp | 0 .../information}/tagcloud.h | 0 .../information}/taggingpopup.cpp | 0 .../information}/taggingpopup.h | 0 .../places}/dolphinfileplacesview.cpp | 0 .../places}/dolphinfileplacesview.h | 0 src/{ => panels}/sidebarpage.cpp | 0 src/{ => panels}/sidebarpage.h | 0 .../terminal}/terminalsidebarpage.cpp | 0 .../terminal}/terminalsidebarpage.h | 2 +- src/{ => settings}/additionalinfodialog.cpp | 0 src/{ => settings}/additionalinfodialog.h | 0 src/{ => settings}/applyviewpropsjob.cpp | 0 src/{ => settings}/applyviewpropsjob.h | 0 src/{ => settings}/columnviewsettingspage.cpp | 0 src/{ => settings}/columnviewsettingspage.h | 2 +- .../detailsviewsettingspage.cpp | 2 +- src/{ => settings}/detailsviewsettingspage.h | 2 +- .../dolphin_columnmodesettings.kcfg | 0 .../dolphin_columnmodesettings.kcfgc | 0 .../dolphin_detailsmodesettings.kcfg | 0 .../dolphin_detailsmodesettings.kcfgc | 0 ...dolphin_directoryviewpropertysettings.kcfg | 0 ...olphin_directoryviewpropertysettings.kcfgc | 0 .../dolphin_generalsettings.kcfg | 0 .../dolphin_generalsettings.kcfgc | 0 .../dolphin_iconsmodesettings.kcfg | 0 .../dolphin_iconsmodesettings.kcfgc | 0 src/{ => settings}/dolphinfontrequester.cpp | 0 src/{ => settings}/dolphinfontrequester.h | 0 src/{ => settings}/dolphinsettings.cpp | 0 src/{ => settings}/dolphinsettings.h | 0 src/{ => settings}/dolphinsettingsdialog.cpp | 4 +- src/{ => settings}/dolphinsettingsdialog.h | 0 src/{ => settings}/generalsettingspage.cpp | 2 +- src/{ => settings}/generalsettingspage.h | 2 +- .../generalviewsettingspage.cpp | 2 +- src/{ => settings}/generalviewsettingspage.h | 2 +- src/{ => settings}/iconsizegroupbox.cpp | 0 src/{ => settings}/iconsizegroupbox.h | 0 src/{ => settings}/iconsviewsettingspage.cpp | 2 +- src/{ => settings}/iconsviewsettingspage.h | 2 +- src/{ => settings}/settingspagebase.cpp | 0 src/{ => settings}/settingspagebase.h | 0 src/{ => settings}/startupsettingspage.cpp | 2 +- src/{ => settings}/startupsettingspage.h | 2 +- src/{ => settings}/viewpropertiesdialog.cpp | 2 +- src/{ => settings}/viewpropertiesdialog.h | 0 src/{ => settings}/viewpropsprogressinfo.cpp | 0 src/{ => settings}/viewpropsprogressinfo.h | 0 src/{ => settings}/viewsettingspage.cpp | 8 +- src/{ => settings}/viewsettingspage.h | 2 +- src/{ => settings}/viewsettingspagebase.cpp | 0 src/{ => settings}/viewsettingspagebase.h | 0 src/{ => tooltips}/dolphintooltip.cpp | 0 src/{ => tooltips}/dolphintooltip.h | 4 +- .../kformattedballoontipdelegate.cpp | 0 .../kformattedballoontipdelegate.h | 2 +- src/{ => tooltips}/ktooltip.cpp | 0 src/{ => tooltips}/ktooltip.h | 0 src/{ => tooltips}/ktooltip_p.h | 0 src/{ => tooltips}/tooltipmanager.cpp | 2 +- src/{ => tooltips}/tooltipmanager.h | 0 src/viewproperties.cpp | 2 +- 106 files changed, 121 insertions(+), 123 deletions(-) rename src/{ => panels/folders}/dolphin_folderspanelsettings.kcfg (100%) rename src/{ => panels/folders}/dolphin_folderspanelsettings.kcfgc (100%) rename src/{ => panels/folders}/ktreeview.cpp (100%) rename src/{ => panels/folders}/ktreeview.h (100%) rename src/{ => panels/folders}/ktreeview_p.h (100%) rename src/{ => panels/folders}/sidebartreeview.cpp (100%) rename src/{ => panels/folders}/sidebartreeview.h (98%) rename src/{ => panels/folders}/treeviewcontextmenu.cpp (100%) rename src/{ => panels/folders}/treeviewcontextmenu.h (100%) rename src/{ => panels/folders}/treeviewsidebarpage.cpp (99%) rename src/{ => panels/folders}/treeviewsidebarpage.h (99%) rename src/{ => panels/information}/commenteditwidget.cpp (100%) rename src/{ => panels/information}/commenteditwidget.h (100%) rename src/{ => panels/information}/commentwidget.cpp (100%) rename src/{ => panels/information}/commentwidget.h (100%) rename src/{ => panels/information}/infosidebarpage.cpp (99%) rename src/{ => panels/information}/infosidebarpage.h (99%) rename src/{ => panels/information}/metadatawidget.cpp (98%) rename src/{ => panels/information}/metadatawidget.h (100%) rename src/{ => panels/information}/metatextlabel.cpp (100%) rename src/{ => panels/information}/metatextlabel.h (100%) rename src/{ => panels/information}/nepomukmassupdatejob.cpp (100%) rename src/{ => panels/information}/nepomukmassupdatejob.h (100%) rename src/{tagcloud => panels/information}/newtagdialog.cpp (100%) rename src/{tagcloud => panels/information}/newtagdialog.h (100%) rename src/{tagcloud => panels/information}/newtagdialog.ui (100%) rename src/{tagcloud => panels/information}/resourcetaggingwidget.cpp (99%) rename src/{tagcloud => panels/information}/resourcetaggingwidget.h (100%) rename src/{tagcloud => panels/information}/tagcloud.cpp (100%) rename src/{tagcloud => panels/information}/tagcloud.h (100%) rename src/{tagcloud => panels/information}/taggingpopup.cpp (100%) rename src/{tagcloud => panels/information}/taggingpopup.h (100%) rename src/{ => panels/places}/dolphinfileplacesview.cpp (100%) rename src/{ => panels/places}/dolphinfileplacesview.h (100%) rename src/{ => panels}/sidebarpage.cpp (100%) rename src/{ => panels}/sidebarpage.h (100%) rename src/{ => panels/terminal}/terminalsidebarpage.cpp (100%) rename src/{ => panels/terminal}/terminalsidebarpage.h (98%) rename src/{ => settings}/additionalinfodialog.cpp (100%) rename src/{ => settings}/additionalinfodialog.h (100%) rename src/{ => settings}/applyviewpropsjob.cpp (100%) rename src/{ => settings}/applyviewpropsjob.h (100%) rename src/{ => settings}/columnviewsettingspage.cpp (100%) rename src/{ => settings}/columnviewsettingspage.h (98%) rename src/{ => settings}/detailsviewsettingspage.cpp (99%) rename src/{ => settings}/detailsviewsettingspage.h (98%) rename src/{ => settings}/dolphin_columnmodesettings.kcfg (100%) rename src/{ => settings}/dolphin_columnmodesettings.kcfgc (100%) rename src/{ => settings}/dolphin_detailsmodesettings.kcfg (100%) rename src/{ => settings}/dolphin_detailsmodesettings.kcfgc (100%) rename src/{ => settings}/dolphin_directoryviewpropertysettings.kcfg (100%) rename src/{ => settings}/dolphin_directoryviewpropertysettings.kcfgc (100%) rename src/{ => settings}/dolphin_generalsettings.kcfg (100%) rename src/{ => settings}/dolphin_generalsettings.kcfgc (100%) rename src/{ => settings}/dolphin_iconsmodesettings.kcfg (100%) rename src/{ => settings}/dolphin_iconsmodesettings.kcfgc (100%) rename src/{ => settings}/dolphinfontrequester.cpp (100%) rename src/{ => settings}/dolphinfontrequester.h (100%) rename src/{ => settings}/dolphinsettings.cpp (100%) rename src/{ => settings}/dolphinsettings.h (100%) rename src/{ => settings}/dolphinsettingsdialog.cpp (98%) rename src/{ => settings}/dolphinsettingsdialog.h (100%) rename src/{ => settings}/generalsettingspage.cpp (99%) rename src/{ => settings}/generalsettingspage.h (98%) rename src/{ => settings}/generalviewsettingspage.cpp (99%) rename src/{ => settings}/generalviewsettingspage.h (98%) rename src/{ => settings}/iconsizegroupbox.cpp (100%) rename src/{ => settings}/iconsizegroupbox.h (100%) rename src/{ => settings}/iconsviewsettingspage.cpp (99%) rename src/{ => settings}/iconsviewsettingspage.h (98%) rename src/{ => settings}/settingspagebase.cpp (100%) rename src/{ => settings}/settingspagebase.h (100%) rename src/{ => settings}/startupsettingspage.cpp (99%) rename src/{ => settings}/startupsettingspage.h (98%) rename src/{ => settings}/viewpropertiesdialog.cpp (99%) rename src/{ => settings}/viewpropertiesdialog.h (100%) rename src/{ => settings}/viewpropsprogressinfo.cpp (100%) rename src/{ => settings}/viewpropsprogressinfo.h (100%) rename src/{ => settings}/viewsettingspage.cpp (95%) rename src/{ => settings}/viewsettingspage.h (98%) rename src/{ => settings}/viewsettingspagebase.cpp (100%) rename src/{ => settings}/viewsettingspagebase.h (100%) rename src/{ => tooltips}/dolphintooltip.cpp (100%) rename src/{ => tooltips}/dolphintooltip.h (96%) rename src/{ => tooltips}/kformattedballoontipdelegate.cpp (100%) rename src/{ => tooltips}/kformattedballoontipdelegate.h (98%) rename src/{ => tooltips}/ktooltip.cpp (100%) rename src/{ => tooltips}/ktooltip.h (100%) rename src/{ => tooltips}/ktooltip_p.h (100%) rename src/{ => tooltips}/tooltipmanager.cpp (99%) rename src/{ => tooltips}/tooltipmanager.h (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9cd091045..708271d00 100644 --- 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 05c33d7dd..bc488b8ae 100644 --- 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 d7d8bb500..b86cd7269 100644 --- 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 #include diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index 99735ea9e..a7f7df36c 100644 --- 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 2d18c8e18..acfff6a65 100644 --- 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 f32ecbd3d..885a49101 100644 --- 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 9c55a40f4..c4d263bfd 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -25,20 +25,20 @@ #include #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 4220e825f..b1e1ea5d0 100644 --- 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 diff --git a/src/dolphinstatusbar.cpp b/src/dolphinstatusbar.cpp index caa784049..7a9b5dc8a 100644 --- 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 0bd24ecb3..6681fe189 100644 --- 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 d563b3dd2..45603c286 100644 --- 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 3cd6b34f2..f09d3d1c9 100644 --- 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 50f2bcf91..091cd0c2c 100644 --- 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 diff --git a/src/kcmdolphin.cpp b/src/kcmdolphin.cpp index f980fa502..21883e76a 100644 --- 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 #include 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 93bcbae2e..a5e8b63ce 100644 --- a/src/sidebartreeview.h +++ b/src/panels/folders/sidebartreeview.h @@ -21,7 +21,7 @@ #define SIDEBARTREEVIEW_H #include -#include +#include /** * @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 d8387aea2..7801a97cc 100644 --- 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 84a9386ec..39f2323ad 100644 --- a/src/treeviewsidebarpage.h +++ b/src/panels/folders/treeviewsidebarpage.h @@ -21,7 +21,7 @@ #define TREEVIEWSIDEBARPAGE_H #include -#include +#include 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 aa8b20553..9eb35bc8d 100644 --- a/src/infosidebarpage.cpp +++ b/src/panels/information/infosidebarpage.cpp @@ -45,7 +45,7 @@ #include #include -#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 e6f511714..879a245ad 100644 --- a/src/infosidebarpage.h +++ b/src/panels/information/infosidebarpage.h @@ -20,7 +20,7 @@ #ifndef INFOSIDEBARPAGE_H #define INFOSIDEBARPAGE_H -#include +#include #include #include 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 218a6d1ce..44a4c029f 100644 --- a/src/metadatawidget.cpp +++ b/src/panels/information/metadatawidget.cpp @@ -43,7 +43,7 @@ #include #include #include -#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 fileRes; QMap 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 fileRes; QMap 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 1e3fffe8f..3a4da3ea9 100644 --- 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 #include 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 875a6b706..4e8c40593 100644 --- a/src/terminalsidebarpage.h +++ b/src/panels/terminal/terminalsidebarpage.h @@ -20,7 +20,7 @@ #ifndef TERMINALSIDEBARPAGE_H #define TERMINALSIDEBARPAGE_H -#include +#include 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 5e16dc67b..c723ed635 100644 --- a/src/columnviewsettingspage.h +++ b/src/settings/columnviewsettingspage.h @@ -20,7 +20,7 @@ #ifndef COLUMNVIEWSETTINGSPAGE_H #define COLUMNVIEWSETTINGSPAGE_H -#include +#include 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 4a439ab1d..0c47caf24 100644 --- 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 -#include #include #include 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 587d42244..58e3fd905 100644 --- a/src/detailsviewsettingspage.h +++ b/src/settings/detailsviewsettingspage.h @@ -20,7 +20,7 @@ #ifndef DETAILSVIEWSETTINGSPAGE_H #define DETAILSVIEWSETTINGSPAGE_H -#include +#include 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 7b1e23266..54ac74bde 100644 --- a/src/dolphinsettingsdialog.cpp +++ b/src/settings/dolphinsettingsdialog.cpp @@ -20,8 +20,8 @@ #include "dolphinsettingsdialog.h" -#include "dolphinapplication.h" -#include "dolphinmainwindow.h" +#include +#include #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 68193b4e4..86b6f1939 100644 --- 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 da7e72f0f..4059dc3c6 100644 --- a/src/generalsettingspage.h +++ b/src/settings/generalsettingspage.h @@ -20,7 +20,7 @@ #ifndef GENERALSETTINGSPAGE_H #define GENERALSETTINGSPAGE_H -#include +#include 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 9ef2ee97e..acea9649c 100644 --- 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 904622348..b0bd7e005 100644 --- a/src/generalviewsettingspage.h +++ b/src/settings/generalviewsettingspage.h @@ -21,7 +21,7 @@ #define GENERALVIEWSETTINGSPAGE_H #include -#include +#include 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 ca43841b8..2acb4cd60 100644 --- 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 75db81e53..c30ade673 100644 --- a/src/iconsviewsettingspage.h +++ b/src/settings/iconsviewsettingspage.h @@ -21,7 +21,7 @@ #define ICONSVIEWSETTINGSPAGE_H #include -#include +#include 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 35fc47a57..767fcab66 100644 --- 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 a56869cd4..04844f00c 100644 --- a/src/startupsettingspage.h +++ b/src/settings/startupsettingspage.h @@ -19,7 +19,7 @@ #ifndef STARTUPSETTINGSPAGE_H #define STARTUPSETTINGSPAGE_H -#include +#include 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 9302ba138..700bdb90b 100644 --- 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 bef05f58f..44d32af81 100644 --- 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 #include 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 21ce40039..5e76b30d1 100644 --- a/src/viewsettingspage.h +++ b/src/settings/viewsettingspage.h @@ -21,7 +21,7 @@ #define VIEWSETTINGSPAGE_H #include -#include +#include 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 cfc438831..5c0682171 100644 --- 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 +#include #include #include 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 452b38a69..117d6eec7 100644 --- a/src/kformattedballoontipdelegate.h +++ b/src/tooltips/kformattedballoontipdelegate.h @@ -21,7 +21,7 @@ #ifndef KFORMATTEDBALLOONTIPDELEGATE_H #define KFORMATTEDBALLOONTIPDELEGATE_H -#include "ktooltip.h" +#include #include 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 aefa846e9..36a008f33 100644 --- a/src/tooltipmanager.cpp +++ b/src/tooltips/tooltipmanager.cpp @@ -24,7 +24,7 @@ #include "dolphinsortfilterproxymodel.h" #include -#include +#include #include #include 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 9b173d1c4..62898e670 100644 --- 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" -- 2.47.3