From 20195315bb8c637f28d892323e6cdc43604d38ae Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 21 Feb 2007 09:31:52 +0000 Subject: installing a file called generalsettings.kcfgc just asks for trouble - always prefix installed files svn path=/trunk/KDE/kdebase/apps/; revision=635877 --- src/CMakeLists.txt | 10 ++--- src/detailsmodesettings.kcfg | 41 ------------------- src/detailsmodesettings.kcfgc | 4 -- src/directoryviewpropertysettings.kcfg | 53 ------------------------- src/directoryviewpropertysettings.kcfgc | 6 --- src/dolphin_detailsmodesettings.kcfg | 41 +++++++++++++++++++ src/dolphin_detailsmodesettings.kcfgc | 4 ++ src/dolphin_directoryviewpropertysettings.kcfg | 53 +++++++++++++++++++++++++ src/dolphin_directoryviewpropertysettings.kcfgc | 6 +++ src/dolphin_generalsettings.kcfg | 30 ++++++++++++++ src/dolphin_generalsettings.kcfgc | 4 ++ src/dolphin_iconsmodesettings.kcfg | 52 ++++++++++++++++++++++++ src/dolphin_iconsmodesettings.kcfgc | 4 ++ src/generalsettings.kcfg | 30 -------------- src/generalsettings.kcfgc | 4 -- src/iconsmodesettings.kcfg | 52 ------------------------ src/iconsmodesettings.kcfgc | 4 -- 17 files changed, 199 insertions(+), 199 deletions(-) delete mode 100644 src/detailsmodesettings.kcfg delete mode 100644 src/detailsmodesettings.kcfgc delete mode 100644 src/directoryviewpropertysettings.kcfg delete mode 100644 src/directoryviewpropertysettings.kcfgc create mode 100644 src/dolphin_detailsmodesettings.kcfg create mode 100644 src/dolphin_detailsmodesettings.kcfgc create mode 100644 src/dolphin_directoryviewpropertysettings.kcfg create mode 100644 src/dolphin_directoryviewpropertysettings.kcfgc create mode 100644 src/dolphin_generalsettings.kcfg create mode 100644 src/dolphin_generalsettings.kcfgc create mode 100644 src/dolphin_iconsmodesettings.kcfg create mode 100644 src/dolphin_iconsmodesettings.kcfgc delete mode 100644 src/generalsettings.kcfg delete mode 100644 src/generalsettings.kcfgc delete mode 100644 src/iconsmodesettings.kcfg delete mode 100644 src/iconsmodesettings.kcfgc (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ba6ed88fa..d07886a1b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -51,10 +51,10 @@ set(dolphin_SRCS kde4_automoc(${dolphin_SRCS}) kde4_add_kcfg_files(dolphin_SRCS - directoryviewpropertysettings.kcfgc - generalsettings.kcfgc - iconsmodesettings.kcfgc - detailsmodesettings.kcfgc ) + dolphin_directoryviewpropertysettings.kcfgc + dolphin_generalsettings.kcfgc + dolphin_iconsmodesettings.kcfgc + dolphin_detailsmodesettings.kcfgc ) qt4_add_dbus_adaptor(dolphin_SRCS org.kde.dolphin.Application.xml @@ -72,7 +72,7 @@ install(TARGETS dolphin DESTINATION ${BIN_INSTALL_DIR}) ########### install files ############### install( FILES dolphin.desktop DESTINATION ${XDG_APPS_DIR} ) -install( FILES directoryviewpropertysettings.kcfg generalsettings.kcfg iconsmodesettings.kcfg detailsmodesettings.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) +install( FILES dolphin_directoryviewpropertysettings.kcfg dolphin_generalsettings.kcfg dolphin_iconsmodesettings.kcfg dolphin_detailsmodesettings.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) install( FILES dolphinui.rc DESTINATION ${DATA_INSTALL_DIR}/dolphin ) kde4_install_icons( ${ICON_INSTALL_DIR} ) diff --git a/src/detailsmodesettings.kcfg b/src/detailsmodesettings.kcfg deleted file mode 100644 index ce4a53325..000000000 --- a/src/detailsmodesettings.kcfg +++ /dev/null @@ -1,41 +0,0 @@ - - - - - kiconloader.h - kglobalsettings.h - - - - KGlobalSettings::generalFont().family() - - - - KGlobalSettings::generalFont().pointSize() - - - - K3Icon::SizeSmall - - - - true - - - - false - - - - false - - - - false - - - - false - - - \ No newline at end of file diff --git a/src/detailsmodesettings.kcfgc b/src/detailsmodesettings.kcfgc deleted file mode 100644 index 4853c37d0..000000000 --- a/src/detailsmodesettings.kcfgc +++ /dev/null @@ -1,4 +0,0 @@ -File=detailsmodesettings.kcfg -ClassName=DetailsModeSettings -Singleton=false -Mutators=true \ No newline at end of file diff --git a/src/directoryviewpropertysettings.kcfg b/src/directoryviewpropertysettings.kcfg deleted file mode 100644 index e1ab73b64..000000000 --- a/src/directoryviewpropertysettings.kcfg +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - When this option is enabled hidden files, such as those starting with a '.', will be shown in the file view. - false - - - - - - - This option controls the style of the view. Currently supported values include icons (0) and details (1) views. - DolphinView::IconsView - 0 - DolphinView::MaxModeEnum - - - - - When this option is enabled, a preview of the file content is shown as icon. - false - - - - - This option defines which attribute (name, size, date, etc) sorting is performed on. - DolphinView::SortByName - 0 - DolphinView::MaxSortEnum - - - - - Qt::Ascending - Qt::Ascending - Qt::Descending - - - - - The last time these properties were changed by the user. - - - - - diff --git a/src/directoryviewpropertysettings.kcfgc b/src/directoryviewpropertysettings.kcfgc deleted file mode 100644 index 09a91d8d1..000000000 --- a/src/directoryviewpropertysettings.kcfgc +++ /dev/null @@ -1,6 +0,0 @@ -File=directoryviewpropertysettings.kcfg -Singleton=false -ClassName=ViewPropertySettings -Mutators=true -GlobalEnums=true -IncludeFiles=dolphinview.h,qnamespace.h diff --git a/src/dolphin_detailsmodesettings.kcfg b/src/dolphin_detailsmodesettings.kcfg new file mode 100644 index 000000000..ce4a53325 --- /dev/null +++ b/src/dolphin_detailsmodesettings.kcfg @@ -0,0 +1,41 @@ + + + + + kiconloader.h + kglobalsettings.h + + + + KGlobalSettings::generalFont().family() + + + + KGlobalSettings::generalFont().pointSize() + + + + K3Icon::SizeSmall + + + + true + + + + false + + + + false + + + + false + + + + false + + + \ No newline at end of file diff --git a/src/dolphin_detailsmodesettings.kcfgc b/src/dolphin_detailsmodesettings.kcfgc new file mode 100644 index 000000000..06da2e9e0 --- /dev/null +++ b/src/dolphin_detailsmodesettings.kcfgc @@ -0,0 +1,4 @@ +File=dolphin_detailsmodesettings.kcfg +ClassName=DetailsModeSettings +Singleton=false +Mutators=true diff --git a/src/dolphin_directoryviewpropertysettings.kcfg b/src/dolphin_directoryviewpropertysettings.kcfg new file mode 100644 index 000000000..e1ab73b64 --- /dev/null +++ b/src/dolphin_directoryviewpropertysettings.kcfg @@ -0,0 +1,53 @@ + + + + + + + + When this option is enabled hidden files, such as those starting with a '.', will be shown in the file view. + false + + + + + + + This option controls the style of the view. Currently supported values include icons (0) and details (1) views. + DolphinView::IconsView + 0 + DolphinView::MaxModeEnum + + + + + When this option is enabled, a preview of the file content is shown as icon. + false + + + + + This option defines which attribute (name, size, date, etc) sorting is performed on. + DolphinView::SortByName + 0 + DolphinView::MaxSortEnum + + + + + Qt::Ascending + Qt::Ascending + Qt::Descending + + + + + The last time these properties were changed by the user. + + + + + diff --git a/src/dolphin_directoryviewpropertysettings.kcfgc b/src/dolphin_directoryviewpropertysettings.kcfgc new file mode 100644 index 000000000..753642f8c --- /dev/null +++ b/src/dolphin_directoryviewpropertysettings.kcfgc @@ -0,0 +1,6 @@ +File=dolphin_directoryviewpropertysettings.kcfg +Singleton=false +ClassName=ViewPropertySettings +Mutators=true +GlobalEnums=true +IncludeFiles=dolphinview.h,qnamespace.h diff --git a/src/dolphin_generalsettings.kcfg b/src/dolphin_generalsettings.kcfg new file mode 100644 index 000000000..37fe8d18e --- /dev/null +++ b/src/dolphin_generalsettings.kcfg @@ -0,0 +1,30 @@ + + + + + + + + false + + + + true + + + + ~ + + + + false + + + + false + + + + + + \ No newline at end of file diff --git a/src/dolphin_generalsettings.kcfgc b/src/dolphin_generalsettings.kcfgc new file mode 100644 index 000000000..91b1fee46 --- /dev/null +++ b/src/dolphin_generalsettings.kcfgc @@ -0,0 +1,4 @@ +File=dolphin_generalsettings.kcfg +ClassName=GeneralSettings +Singleton=false +Mutators=true diff --git a/src/dolphin_iconsmodesettings.kcfg b/src/dolphin_iconsmodesettings.kcfg new file mode 100644 index 000000000..23ee5ec93 --- /dev/null +++ b/src/dolphin_iconsmodesettings.kcfg @@ -0,0 +1,52 @@ + + + + + kiconloader.h + kglobalsettings.h + + + + LeftToRight + + + + KGlobalSettings::generalFont().family() + + + + KGlobalSettings::generalFont().pointSize() + + + + K3Icon::SizeMedium + + + + 0 + + + + + + + K3Icon::SizeMedium + + + + 2 + + + + true + + + + K3Icon::SizeMedium + + + + 0 + + + \ No newline at end of file diff --git a/src/dolphin_iconsmodesettings.kcfgc b/src/dolphin_iconsmodesettings.kcfgc new file mode 100644 index 000000000..9987ce938 --- /dev/null +++ b/src/dolphin_iconsmodesettings.kcfgc @@ -0,0 +1,4 @@ +File=dolphin_iconsmodesettings.kcfg +ClassName=IconsModeSettings +Singleton=false +Mutators=true diff --git a/src/generalsettings.kcfg b/src/generalsettings.kcfg deleted file mode 100644 index 37fe8d18e..000000000 --- a/src/generalsettings.kcfg +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - false - - - - true - - - - ~ - - - - false - - - - false - - - - - - \ No newline at end of file diff --git a/src/generalsettings.kcfgc b/src/generalsettings.kcfgc deleted file mode 100644 index 96d4c1fb5..000000000 --- a/src/generalsettings.kcfgc +++ /dev/null @@ -1,4 +0,0 @@ -File=generalsettings.kcfg -ClassName=GeneralSettings -Singleton=false -Mutators=true \ No newline at end of file diff --git a/src/iconsmodesettings.kcfg b/src/iconsmodesettings.kcfg deleted file mode 100644 index 23ee5ec93..000000000 --- a/src/iconsmodesettings.kcfg +++ /dev/null @@ -1,52 +0,0 @@ - - - - - kiconloader.h - kglobalsettings.h - - - - LeftToRight - - - - KGlobalSettings::generalFont().family() - - - - KGlobalSettings::generalFont().pointSize() - - - - K3Icon::SizeMedium - - - - 0 - - - - - - - K3Icon::SizeMedium - - - - 2 - - - - true - - - - K3Icon::SizeMedium - - - - 0 - - - \ No newline at end of file diff --git a/src/iconsmodesettings.kcfgc b/src/iconsmodesettings.kcfgc deleted file mode 100644 index 31f564a2a..000000000 --- a/src/iconsmodesettings.kcfgc +++ /dev/null @@ -1,4 +0,0 @@ -File=iconsmodesettings.kcfg -ClassName=IconsModeSettings -Singleton=false -Mutators=true \ No newline at end of file -- cgit v1.3