Commit 3bb2fb14 authored by Nicolas Fella's avatar Nicolas Fella
Browse files

Remove defunct browser KCM loading

This code tries to load Konqueror-related KCMs and add them to the view

However, looking them up via X-KDE-PluginKeyword just doesn't work

Given that this seems to have been broken for a long time and no one complained just remove it
parent 1cae17ac
Pipeline #217867 passed with stage
in 46 seconds
......@@ -252,41 +252,11 @@ void Navigator::insertKCMDocs( const QString &name, NavigatorItem *topItem, cons
{
qCDebug(KHC_LOG) << "Requested KCM documents for ID" << name;
QString systemsettingskontrolconstraint = QStringLiteral("[X-KDE-System-Settings-Parent-Category] != ''");
QString konquerorcontrolconstraint = QStringLiteral("[X-KDE-PluginKeyword] == 'khtml_general'\
or [X-KDE-PluginKeyword] == 'performance'\
or [X-KDE-PluginKeyword] == 'bookmarks'");
QString filemanagercontrolconstraint = QStringLiteral("[X-KDE-PluginKeyword] == 'behavior'\
or [X-KDE-PluginKeyword] == 'dolphinviewmodes'\
or [X-KDE-PluginKeyword] == 'dolphinnavigation'\
or [X-KDE-PluginKeyword] == 'dolphinservices'\
or [X-KDE-PluginKeyword] == 'dolphingeneral'\
or [X-KDE-PluginKeyword] == 'trash'");
QString browsercontrolconstraint = QStringLiteral("[X-KDE-PluginKeyword] == 'khtml_behavior'\
or [X-KDE-PluginKeyword] == 'proxy'\
or [X-KDE-PluginKeyword] == 'khtml_appearance'\
or [X-KDE-PluginKeyword] == 'khtml_filter'\
or [X-KDE-PluginKeyword] == 'cache'\
or [X-KDE-PluginKeyword] == 'cookie'\
or [X-KDE-PluginKeyword] == 'useragent'\
or [X-KDE-PluginKeyword] == 'khtml_java_js'\
or [X-KDE-PluginKeyword] == 'khtml_plugins'");
/* missing in browsercontrolconstraint
History no X-KDE-PluginKeyword in kcmhistory.desktop
*/
QString othercontrolconstraint = QStringLiteral("[X-KDE-PluginKeyword] == 'cgi'");
KService::List list;
if ( type == QLatin1String("kcontrol") ) {
list = KServiceTypeTrader::self()->query( QStringLiteral("KCModule"), systemsettingskontrolconstraint );
} else if ( type == QLatin1String("konquerorcontrol") ) {
list = KServiceTypeTrader::self()->query( QStringLiteral("KCModule"), konquerorcontrolconstraint );
} else if ( type == QLatin1String("browsercontrol") ) {
list = KServiceTypeTrader::self()->query( QStringLiteral("KCModule"), browsercontrolconstraint );
} else if ( type == QLatin1String("filemanagercontrol") ) {
list = KServiceTypeTrader::self()->query( QStringLiteral("KCModule"), filemanagercontrolconstraint );
} else if ( type == QLatin1String("othercontrol") ) {
list = KServiceTypeTrader::self()->query( QStringLiteral("KCModule"), othercontrolconstraint );
} else if ( type == QLatin1String("kinfocenter") ) {
list = KServiceTypeTrader::self()->query( QStringLiteral("KCModule"), QStringLiteral("[X-KDE-ParentApp] == 'kinfocenter'") );
}
......
......@@ -12,9 +12,5 @@ install( FILES fundamentals.desktop plasma.desktop
onlinehelp.desktop
info.desktop kicmodules.desktop
kcontrolmodules.desktop
konquerorcontrolmodules.desktop
browsercontrolmodules.desktop
filemanagercontrolmodules.desktop
othercontrolmodules.desktop
kioworkers.desktop DESTINATION ${KDE_INSTALL_DATADIR}/khelpcenter/plugins )
[Desktop Entry]
Name=Browser Settings Modules
Name[ar]=وحدات إعدادات المتصفح
Name[ast]=Módulos de los axustes del restolador
Name[bg]=Модули за настройки на браузъра
Name[bs]=Postavke modula pretraživača
Name[ca]=Mòduls de configuració del navegador
Name[ca@valencia]=Mòduls de configuració del navegador
Name[cs]=Moduly nastavení prohlížeče
Name[da]=Moduler til browserindstillinger
Name[de]=Browser-Einstellungsmodule
Name[el]=Αρθρώματα ρυθμίσεων του περιηγητή
Name[en_GB]=Browser Settings Modules
Name[es]=Módulos de preferencias del navegador
Name[et]=Brauseriseadistuste moodulid
Name[eu]=Arakatzaile-ezarpenen moduluak
Name[fa]=مرور پیمانه‌های تنظیمات
Name[fi]=Selaimen asetusosiot
Name[fr]=Modules des paramètres du navigateur
Name[gl]=Módulos de configuración do navegador
Name[he]=מודולי הגדרות דפדפן
Name[hi]=ब्राउज़र विन्यास घटक
Name[hu]=Böngésző beállítási modulok
Name[ia]=Modulos pro navigar inter preferentias
Name[id]=Modul Pengaturan Penelusur
Name[is]=Stillingaeiningar vafra
Name[it]=Moduli delle impostazioni del browser
Name[ko]=브라우저 설정 모듈
Name[lt]=Naršyklės nuostatų moduliai
Name[nb]=Moduler for nettleser-innstillinger
Name[nds]=Nettkieker-Instellenmodulen
Name[nl]=Modules voor instellingen van de browser
Name[nn]=Modular for nettlesarinnstillingar
Name[pa]=ਬਰਾਊਜ਼ਰ ਸੈਟਿੰਗਾਂ ਮੋਡੀਊਲ
Name[pl]=Moduły ustawień przeglądarki
Name[pt]=Módulos de Configuração do Navegador
Name[pt_BR]=Módulos de configuração do Navegador
Name[ro]=Module de configurare navigator
Name[ru]=Модули настроек браузера
Name[sk]=Moduly nastavení prehliadača
Name[sl]=Moduli nastavitev brskalnika
Name[sr]=Модули поставки прегледача
Name[sr@ijekavian]=Модули поставки прегледача
Name[sr@ijekavianlatin]=Moduli postavki pregledača
Name[sr@latin]=Moduli postavki pregledača
Name[sv]=Inställningsmoduler för webbläsare
Name[ta]=உலாவி அமைப்புக்கூறுகள்
Name[tg]=Модулҳои танзими браузер
Name[tr]=Tarayıcı Ayar Modülleri
Name[uk]=Модулі параметрів перегляду інтернету
Name[vi]=Các khối thiết lập trình duyệt
Name[x-test]=xxBrowser Settings Modulesxx
Name[zh_CN]=浏览器设置模块
Name[zh_TW]=瀏覽器設定模組
Icon=preferences-system
X-DOC-Weight=370
X-KDE-KHelpcenter-Special=browsercontrol
[Desktop Entry]
Name=Filemanager Settings Modules
Name[ar]=وحدات إعدادات مدير الملفات
Name[ast]=Módulos de los axustes del xestor de ficheros
Name[bg]=Модули за настройки на файловия мениджър
Name[bs]=UpraviteljDatotekom postavke modula
Name[ca]=Mòduls de configuració del gestor de fitxers
Name[ca@valencia]=Mòduls de configuració del gestor de fitxers
Name[cs]=Moduly nastavení správce souborů
Name[da]=Moduler til filhåndteringindstillinger
Name[de]=Dateiverwaltungs-Einstellungsmodule
Name[el]=Αρθρώματα ρυθμίσεων του διαχειριστή αρχείων
Name[en_GB]=Filemanager Settings Modules
Name[es]=Módulos de preferencias del gestor de archivos
Name[et]=Failihalduri seadistuste moodulid
Name[eu]=Fitxategi-kudeatzaile-ezarpenen moduluak
Name[fa]=پیمانه‌های تنظیمات مدیر پنجره
Name[fi]=Tiedostonhallinnan asetusosiot
Name[fr]=Modules des paramètres du gestionnaire de fichiers
Name[gl]=Módulos de configuración do xestor de ficheiros
Name[he]=מודולי הגדרות מנהל הקבצים
Name[hi]=फ़ाइलप्रबंध विन्यास घटक
Name[hu]=Fájlkezelő beállítási modulok
Name[ia]=Modulos de Preferentias de gerente de file
Name[id]=Modul Pengaturan Pengelola File
Name[is]=Stillingaeiningar skráastjóra
Name[it]=Moduli delle impostazioni del gestore dei file
Name[ko]=파일 관리자 설정 모듈
Name[lt]=Failų tvarkyklės nuostatų moduliai
Name[nb]=Moduler for filbehandler-innstillinger
Name[nds]=Dateipleger-Instellenmodulen
Name[nl]=Modules voor instellingen van de bestandsbeheerder
Name[nn]=Modular for filhandsamarinnstillingar
Name[pa]=ਫਾਇਲ-ਮੈਨੇਜਰ ਸੈਟਿੰਗਾਂ ਮੋਡੀਊਲ
Name[pl]=Moduły ustawień przeglądarki plików
Name[pt]=Módulos de Configuração do Gestor de Ficheiros
Name[pt_BR]=Módulos de configuração do Gerenciador de Arquivos
Name[ro]=Module de configurare gestionar de fișiere
Name[ru]=Модули настройки диспетчера файлов
Name[sk]=Moduly nastavení správcu súborov
Name[sl]=Moduli nastavitev upravljalnika datotek
Name[sr]=Модули поставки менаџера фајлова
Name[sr@ijekavian]=Модули поставки менаџера фајлова
Name[sr@ijekavianlatin]=Moduli postavki menadžera fajlova
Name[sr@latin]=Moduli postavki menadžera fajlova
Name[sv]=Inställningsmoduler för filhanterare
Name[ta]=கோப்பு உலாவிக்கான அமைப்புக்கூறுகள்
Name[tr]=Dosya Yönetici Ayar Modülleri
Name[uk]=Модулі параметрів керування файлами
Name[vi]=Các khối thiết lập trình quản lí tệp
Name[x-test]=xxFilemanager Settings Modulesxx
Name[zh_CN]=文件管理器设置模块
Name[zh_TW]=檔案管理員設定模組
Icon=preferences-system
X-DOC-Weight=350
X-KDE-KHelpcenter-Special=filemanagercontrol
[Desktop Entry]
Name=Konqueror Settings Modules
Name[ar]=وحدات إعدادات كونكويرر
Name[ast]=Módulos de los axustes de Konqueror
Name[bg]=Модули с настройки на Konqueror
Name[bs]=Moduli Konqueror postavki
Name[ca]=Mòduls de configuració del Konqueror
Name[ca@valencia]=Mòduls de configuració de Konqueror
Name[cs]=Moduly nastavení Konqueroru
Name[da]=Moduler til Konqueror-indstillinger
Name[de]=Konqueror-Einstellungsmodule
Name[el]=Αρθρώματα ρυθμίσεων του Konqueror
Name[en_GB]=Konqueror Settings Modules
Name[es]=Módulos de preferencias de Konqueror
Name[et]=Konquerori seadistuste moodulid
Name[eu]=Konqueror-ezarpenen moduluak
Name[fa]=پیمانه‌های تنظیمات کانکرر
Name[fi]=Konquerorin asetusosiot
Name[fr]=Modules des paramètres de Konqueror
Name[gl]=Módulos de configuración de Konqueror
Name[he]=מודלי הגדרות Konqueror
Name[hi]=कॉन्करर विन्यास घटक
Name[hu]=Konqueror beállítási modulok
Name[ia]=Modulos de preferentias de Konqueror
Name[id]=Modul Pengaturan Konqueror
Name[is]=Stillingaeiningar Konqueror
Name[it]=Moduli delle impostazioni di Konqueror
Name[ja]=Konqueror 設定モジュール
Name[ko]=Konqueror 설정 모듈
Name[lt]=Konqueror nuostatų moduliai
Name[nb]=Modulen for Konqueror-innstillinger
Name[nds]=Konqueror-Instellenmodulen
Name[nl]=Modules voor instellingen van Konqueror
Name[nn]=Modular for Konqueror-innstillingar
Name[pa]=ਕੋਨਕਿਊਰੋਰ ਸੈਟਿੰਗਾਂ ਮੋਡੀਊਲ
Name[pl]=Moduły ustawień Konquerora
Name[pt]=Módulos de Configuração do Konqueror
Name[pt_BR]=Módulos de configuração do Konqueror
Name[ro]=Module de configurare Konqueror
Name[ru]=Модули настроек Konqueror
Name[sk]=Moduly nastavení Konquerora
Name[sl]=Moduli nastavitev Konquerorja
Name[sr]=Модули К‑освајачевих поставки
Name[sr@ijekavian]=Модули К‑освајачевих поставки
Name[sr@ijekavianlatin]=Moduli K‑osvajačevih postavki
Name[sr@latin]=Moduli K‑osvajačevih postavki
Name[sv]=Inställningsmoduler för Konqueror
Name[ta]=கான்கொரர் அமைப்புக்கூறுகள்
Name[tg]=Модулҳои танзими Konqueror
Name[tr]=Konqueror Ayar Modülleri
Name[uk]=Модулі параметрів Konqueror
Name[vi]=Các khối thiết lập Konqueror
Name[x-test]=xxKonqueror Settings Modulesxx
Name[zh_CN]=Konqueror 设置模块
Name[zh_TW]=Konqueror 設定模組
Icon=preferences-system
X-DOC-Weight=330
X-KDE-KHelpcenter-Special=konquerorcontrol
[Desktop Entry]
Name=Other Settings Modules
Name[ar]=وحدات الإعدادات الأخرى
Name[ast]=Otros módulos d'axustes
Name[bg]=Модули за други настройки
Name[bs]=Moduli ostalih postavki
Name[ca]=Altres mòduls de configuració
Name[ca@valencia]=Altres mòduls de configuració
Name[cs]=Moduly nastavení ostatního
Name[da]=Andre indstillingsmoduler
Name[de]=Andere Einstellungsmodule
Name[el]=Λοιπά αρθρώματα ρυθμίσεων
Name[en_GB]=Other Settings Modules
Name[es]=Módulos de otras preferencias
Name[et]=Muude seadistuste moodulid
Name[eu]=Beste ezarpen batzuen moduluak
Name[fa]=پیمانه‌های تنظیمات دیگر
Name[fi]=Muut asetusosiot
Name[fr]=Autres modules de paramètres
Name[gl]=Outros módulos de configuración
Name[he]=מודלי הגדרות אחרים
Name[hi]=अन्य विन्यास घटक
Name[hu]=Egyéb beállítási modulok
Name[ia]=altere modulos de preferentias
Name[id]=Modul Pengaturan Lainnya
Name[is]=Aðrar stillingaeiningar
Name[it]=Altri moduli di impostazioni
Name[ko]=기타 설정 모듈
Name[lt]=Kitų nuostatų moduliai
Name[nb]=Moduler for andre innstillinger
Name[nds]=Anner Instellenmodulen
Name[nl]=Overige modules voor instellingen
Name[nn]=Modular for andre innstillingar
Name[pa]=ਹੋਰ ਸੈਟਿੰਗਾਂ ਮੋਡੀਊਲ
Name[pl]=Moduły ustawień innych
Name[pt]=Outros Módulos de Configuração
Name[pt_BR]=Outros módulos de configuração
Name[ro]=Alte module de configurare
Name[ru]=Другие модули настройки
Name[sk]=Iné moduly nastavení
Name[sl]=Moduli ostalih nastavitev
Name[sr]=Остали модули поставки
Name[sr@ijekavian]=Остали модули поставки
Name[sr@ijekavianlatin]=Ostali moduli postavki
Name[sr@latin]=Ostali moduli postavki
Name[sv]=Övriga inställningsmoduler
Name[ta]=மற்ற அமைப்புக்கூறுகள்
Name[tr]=Diğer Ayar Modülleri
Name[uk]=Модулі інших параметрів
Name[vi]=Các khối thiết lập khác
Name[x-test]=xxOther Settings Modulesxx
Name[zh_CN]=其他设置模块
Name[zh_TW]=其他設定檢視
Icon=preferences-system
X-DOC-Weight=390
X-KDE-KHelpcenter-Special=othercontrol
......@@ -71,14 +71,6 @@ void PluginTraverser::process( DocEntry *entry )
mNavigator->insertParentAppDocs( entry->khelpcenterSpecial(), mCurrentItem );
} else if ( entry->khelpcenterSpecial() == QLatin1String("kcontrol") ) {
mNavigator->insertSystemSettingsDocs( entry->khelpcenterSpecial(), mCurrentItem, Navigator::SystemSettings );
} else if ( entry->khelpcenterSpecial() == QLatin1String("konquerorcontrol") ) {
mNavigator->insertKCMDocs( entry->khelpcenterSpecial(), mCurrentItem, QStringLiteral("konquerorcontrol") );
} else if ( entry->khelpcenterSpecial() == QLatin1String("filemanagercontrol") ) {
mNavigator->insertKCMDocs( entry->khelpcenterSpecial(), mCurrentItem, QStringLiteral("filemanagercontrol") );
} else if ( entry->khelpcenterSpecial() == QLatin1String("browsercontrol") ) {
mNavigator->insertKCMDocs( entry->khelpcenterSpecial(), mCurrentItem, QStringLiteral("browsercontrol") );
} else if ( entry->khelpcenterSpecial() == QLatin1String("othercontrol") ) {
mNavigator->insertKCMDocs( entry->khelpcenterSpecial(), mCurrentItem, QStringLiteral("othercontrol") );
} else if ( entry->khelpcenterSpecial() == QLatin1String("kinfocenter") ) {
mNavigator->insertSystemSettingsDocs( entry->khelpcenterSpecial(), mCurrentItem, Navigator::KInfoCenter);
} else if ( entry->khelpcenterSpecial() == QLatin1String("kioworker") ) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment