From 9a0552d51d60e40bd3045ea1f2fb483a65b55568 Mon Sep 17 00:00:00 2001 From: Duong Do Minh Chau Date: Fri, 11 Dec 2020 01:47:50 +0700 Subject: [PATCH] Remove context menu settings KCM --- src/CMakeLists.txt | 16 ----- src/settings/kcm/kcmdolphincontextmenu.cpp | 47 -------------- .../kcm/kcmdolphincontextmenu.desktop | 62 ------------------- src/settings/kcm/kcmdolphincontextmenu.h | 32 ---------- 4 files changed, 157 deletions(-) delete mode 100644 src/settings/kcm/kcmdolphincontextmenu.cpp delete mode 100644 src/settings/kcm/kcmdolphincontextmenu.desktop delete mode 100644 src/settings/kcm/kcmdolphincontextmenu.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1d70848548..26e02cfb5c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -371,13 +371,6 @@ set(kcm_dolphinnavigation_PART_SRCS settings/navigation/navigationsettingspage.cpp settings/settingspagebase.cpp) -set(kcm_dolphincontextmenu_PART_SRCS - settings/kcm/kcmdolphincontextmenu.cpp - settings/contextmenu/contextmenusettingspage.cpp - settings/settingspagebase.cpp - settings/serviceitemdelegate.cpp - settings/servicemodel.cpp) - set(kcm_dolphingeneral_PART_SRCS settings/kcm/kcmdolphingeneral.cpp settings/general/behaviorsettingspage.cpp @@ -400,11 +393,6 @@ kconfig_add_kcfg_files(kcm_dolphinviewmodes_PART_SRCS kconfig_add_kcfg_files(kcm_dolphinnavigation_PART_SRCS settings/dolphin_generalsettings.kcfgc) -kconfig_add_kcfg_files(kcm_dolphincontextmenu_PART_SRCS - settings/dolphin_generalsettings.kcfgc - settings/dolphin_contextmenusettings.kcfgc - settings/dolphin_versioncontrolsettings.kcfgc) - kconfig_add_kcfg_files(kcm_dolphingeneral_PART_SRCS settings/dolphin_generalsettings.kcfgc) @@ -413,23 +401,19 @@ if(NOT WIN32) # The settings are still accessible from the hamburger menu add_library(kcm_dolphinviewmodes MODULE ${kcm_dolphinviewmodes_PART_SRCS}) add_library(kcm_dolphinnavigation MODULE ${kcm_dolphinnavigation_PART_SRCS}) - add_library(kcm_dolphincontextmenu MODULE ${kcm_dolphincontextmenu_PART_SRCS}) add_library(kcm_dolphingeneral MODULE ${kcm_dolphingeneral_PART_SRCS}) target_link_libraries(kcm_dolphinviewmodes dolphinprivate) target_link_libraries(kcm_dolphinnavigation dolphinprivate) - target_link_libraries(kcm_dolphincontextmenu dolphinprivate) target_link_libraries(kcm_dolphingeneral dolphinprivate) install( FILES org.kde.dolphin.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR} ) install( FILES settings/kcm/kcmdolphinviewmodes.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} ) install( FILES settings/kcm/kcmdolphinnavigation.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} ) - install( FILES settings/kcm/kcmdolphincontextmenu.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} ) install( FILES settings/kcm/kcmdolphingeneral.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} ) install(TARGETS kcm_dolphinviewmodes DESTINATION ${KDE_INSTALL_PLUGINDIR} ) install(TARGETS kcm_dolphinnavigation DESTINATION ${KDE_INSTALL_PLUGINDIR} ) - install(TARGETS kcm_dolphincontextmenu DESTINATION ${KDE_INSTALL_PLUGINDIR} ) install(TARGETS kcm_dolphingeneral DESTINATION ${KDE_INSTALL_PLUGINDIR} ) endif() diff --git a/src/settings/kcm/kcmdolphincontextmenu.cpp b/src/settings/kcm/kcmdolphincontextmenu.cpp deleted file mode 100644 index a730dfcfef..0000000000 --- a/src/settings/kcm/kcmdolphincontextmenu.cpp +++ /dev/null @@ -1,47 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2009 Peter Penz - * - * SPDX-License-Identifier: GPL-2.0-or-later - */ - -#include "kcmdolphincontextmenu.h" - -#include "settings/contextmenu/contextmenusettingspage.h" - -#include -#include -#include - -#include - -K_PLUGIN_FACTORY(KCMDolphinContextMenuConfigFactory, registerPlugin(QStringLiteral("dolphincontextmenu"));) - -DolphinContextMenuConfigModule::DolphinContextMenuConfigModule(QWidget* parent, const QVariantList& args) : - KCModule(parent, args), - m_contextMenu(nullptr) -{ - setButtons(KCModule::Default | KCModule::Help); - - QVBoxLayout* topLayout = new QVBoxLayout(this); - topLayout->setContentsMargins(0, 0, 0, 0); - - m_contextMenu = new ContextMenuSettingsPage(this); - connect(m_contextMenu, &ContextMenuSettingsPage::changed, this, &DolphinContextMenuConfigModule::markAsChanged); - topLayout->addWidget(m_contextMenu, 0, {}); -} - -DolphinContextMenuConfigModule::~DolphinContextMenuConfigModule() -{ -} - -void DolphinContextMenuConfigModule::save() -{ - m_contextMenu->applySettings(); -} - -void DolphinContextMenuConfigModule::defaults() -{ - m_contextMenu->restoreDefaults(); -} - -#include "kcmdolphincontextmenu.moc" diff --git a/src/settings/kcm/kcmdolphincontextmenu.desktop b/src/settings/kcm/kcmdolphincontextmenu.desktop deleted file mode 100644 index 17f16cd812..0000000000 --- a/src/settings/kcm/kcmdolphincontextmenu.desktop +++ /dev/null @@ -1,62 +0,0 @@ -Name=Dolphin Context Menu - -[Desktop Entry] -Icon=application-menu -Type=Service -X-KDE-ServiceTypes=KCModule - -X-KDE-Library=kcm_dolphincontextmenu -X-KDE-PluginKeyword=dolphincontextmenu -X-DocPath=dolphin/index.html#preferences-dialog-services -Name=Dolphin Context Menu - - -X-KDE-Keywords=file manager -X-KDE-Keywords[ar]=مدير ملفّات ملفات الملفّات الملفات -X-KDE-Keywords[ast]=xestor de ficheros -X-KDE-Keywords[az]=fayl meneceri -X-KDE-Keywords[ca]=gestor de fitxers -X-KDE-Keywords[ca@valencia]=gestor de fitxers -X-KDE-Keywords[cs]=správce souborů -X-KDE-Keywords[da]=filhåndtering -X-KDE-Keywords[de]=Dateiverwaltung -X-KDE-Keywords[el]=διαχειριστής αρχείων -X-KDE-Keywords[en_GB]=file manager -X-KDE-Keywords[es]=gestor de archivos -X-KDE-Keywords[et]=failihaldur -X-KDE-Keywords[eu]=Fitxategi-kudeatzailea -X-KDE-Keywords[fi]=tiedostonhallinta -X-KDE-Keywords[fr]=gestionnaire de fichiers -X-KDE-Keywords[gl]=xestor de ficheiros -X-KDE-Keywords[he]=מנהל קבצים -X-KDE-Keywords[hu]=fájlkezelő -X-KDE-Keywords[ia]=gerente de file -X-KDE-Keywords[id]=pengelola file -X-KDE-Keywords[it]=gestore dei file -X-KDE-Keywords[ja]=ファイルマネージャ -X-KDE-Keywords[ko]=파일 관리자 -X-KDE-Keywords[lt]=failų tvarkytuvė -X-KDE-Keywords[lv]=datņu pārvaldnieks -X-KDE-Keywords[ml]=ഫയൽ മാനേജർ -X-KDE-Keywords[nb]=filbehandler -X-KDE-Keywords[nl]=bestandsbeheerder -X-KDE-Keywords[nn]=filhandsamar -X-KDE-Keywords[pa]=ਫਾਇਲ ਮੈਨੇਜਰ -X-KDE-Keywords[pl]=zarządzanie plikami -X-KDE-Keywords[pt]=gestor de ficheiros -X-KDE-Keywords[pt_BR]=gerenciador de arquivos -X-KDE-Keywords[ro]=gestionar de fișiere -X-KDE-Keywords[ru]=диспетчер файлов -X-KDE-Keywords[sk]=správca súborov -X-KDE-Keywords[sl]=upravljalnik datotek -X-KDE-Keywords[sr]=file manager,менаџер фајлова -X-KDE-Keywords[sr@ijekavian]=file manager,менаџер фајлова -X-KDE-Keywords[sr@ijekavianlatin]=file manager,menadžer fajlova -X-KDE-Keywords[sr@latin]=file manager,menadžer fajlova -X-KDE-Keywords[sv]=filhanterare -X-KDE-Keywords[tr]=dosya yöneticisi -X-KDE-Keywords[uk]=менеджер,керування,файл,файли -X-KDE-Keywords[vi]=file manager,trình quản lí tệp -X-KDE-Keywords[x-test]=xxfile managerxx -X-KDE-Keywords[zh_CN]=文件管理器 -X-KDE-Keywords[zh_TW]=檔案管理員 diff --git a/src/settings/kcm/kcmdolphincontextmenu.h b/src/settings/kcm/kcmdolphincontextmenu.h deleted file mode 100644 index bfe55d2542..0000000000 --- a/src/settings/kcm/kcmdolphincontextmenu.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2009 Peter Penz - * - * SPDX-License-Identifier: GPL-2.0-or-later - */ - -#ifndef KCMDOLPHINCONTEXTMENU_H -#define KCMDOLPHINCONTEXTMENU_H - -#include - -class ContextMenuSettingsPage; - -/** - * @brief Allow to configure the Dolphin context menu. - */ -class DolphinContextMenuConfigModule : public KCModule -{ - Q_OBJECT - -public: - DolphinContextMenuConfigModule(QWidget* parent, const QVariantList& args); - ~DolphinContextMenuConfigModule() override; - - void save() override; - void defaults() override; - -private: - ContextMenuSettingsPage *m_contextMenu; -}; - -#endif