Git commit af4f30caf94fc2f60b77e9844b7af04003c47f80 by Luigi Toscano, on behalf of Harald Sitter. Committed on 08/07/2022 at 20:17. Pushed by ltoscano into branch 'master'.
move to worker nomenclature it's less contentious and also where the technology as a whole is moving M +2 -2 README.metadata M +7 -7 doc/glossary/index.docbook M +1 -1 doc/khelpcenter/index.docbook M +2 -2 navigator.cpp M +1 -1 navigator.h M +1 -1 plugins/CMakeLists.txt D +0 -97 plugins/kioslaves.desktop A +9 -0 plugins/kioworkers.desktop M +2 -2 plugintraverser.cpp https://invent.kde.org/system/khelpcenter/commit/af4f30caf94fc2f60b77e9844b7af04003c47f80 diff --git a/README.metadata b/README.metadata index bcf6c6f3..7e63321c 100644 --- a/README.metadata +++ b/README.metadata @@ -30,7 +30,7 @@ Icon string Name of icon for document X-DocPath URI Location of document. In addition to the standard URI schemes like http: and file: all schemes which are supported through - kioslaves can be used. In particular the + kioworkers can be used. In particular the following non-standard URI schemes are supported: help: KDE manual identified by app name @@ -90,7 +90,7 @@ X-KDE-KHelpcenter string If this entry is set to one of the 'kinfocenter' kinfocenter docs 'kcontrol' kcontrol module docs 'konqueror' konqueror plugin docs - 'kioslave' kioslave docs + 'kioworker' kioworker docs 'info' info pages X-DOC-DocumentType string Type of document. The type is used to look up corresponding search handlers. diff --git a/doc/glossary/index.docbook b/doc/glossary/index.docbook index 1982282f..b7f5d721 100644 --- a/doc/glossary/index.docbook +++ b/doc/glossary/index.docbook @@ -115,9 +115,9 @@ Project Neon <glossseealso otherterm="gloss-ghns">Get Hot New Stuff</glossseealso> </glossdef> </glossentry> - <glossentry id="gloss-ioslave"> - <glossterm><acronym>IO</acronym> Slave</glossterm> - <glossdef><para><acronym>IO</acronym> Slaves enable &kde; applications to + <glossentry id="gloss-ioworker"> + <glossterm><acronym>IO</acronym> Worker</glossterm> + <glossdef><para><acronym>IO</acronym> Workers enable &kde; applications to access remote resources as easily as local resources (making them "network transparent"). Remote resources (⪚ files) might be stored on <acronym>SMB</acronym> shares or similar.</para> @@ -138,9 +138,9 @@ Project Neon <glossentry id="gloss-kio"> <glossterm><acronym>KIO</acronym></glossterm> <glossdef><para>The &kde; Input/Output system which makes use of so-called - "<acronym>IO</acronym> Slaves".</para> - <glossseealso otherterm="gloss-ioslave"><acronym>IO</acronym> -Slave</glossseealso> + "<acronym>IO</acronym> Workers".</para> + <glossseealso otherterm="gloss-ioworker"><acronym>IO</acronym> +Worker</glossseealso> <glossseealso otherterm="gloss-kde">&kde;</glossseealso> </glossdef> </glossentry> @@ -618,7 +618,7 @@ otherterm="gloss-kbuildsycoca"><application>KBuildSycoca</application></glosssee <glossdef><para>&emstart;S&emend;erver &emstart;M&emend;essage &emstart;B&emend;lock. A network protocol used in &Microsoft; &Windows; networks to access the file systems of other computers.</para> - <glossseealso otherterm="gloss-ioslave"><acronym>IO</acronym> Slave</glossseealso> + <glossseealso otherterm="gloss-ioworker"><acronym>IO</acronym> Worker</glossseealso> </glossdef> </glossentry> <glossentry id="gloss-irc"> diff --git a/doc/khelpcenter/index.docbook b/doc/khelpcenter/index.docbook index 42d329c0..65196683 100644 --- a/doc/khelpcenter/index.docbook +++ b/doc/khelpcenter/index.docbook @@ -296,7 +296,7 @@ Contains a list of links to various KInfocenter modules documentation. </varlistentry> <varlistentry> -<term><guilabel>Kioslaves</guilabel></term> +<term><guilabel>KIO Workers</guilabel></term> <listitem> <para> Contains a list of links to various <acronym>KIO</acronym> modules documentation. diff --git a/navigator.cpp b/navigator.cpp index c4dba0f1..f1ca78d7 100644 --- a/navigator.cpp +++ b/navigator.cpp @@ -214,9 +214,9 @@ History no X-KDE-PluginKeyword in kcmhistory.desktop topItem->setHidden(no_children_present); } -void Navigator::insertIOSlaveDocs( const QString &name, NavigatorItem *topItem ) +void Navigator::insertIOWorkerDocs( const QString &name, NavigatorItem *topItem ) { - qCDebug(KHC_LOG) << "Requested IOSlave documents for ID" << name; + qCDebug(KHC_LOG) << "Requested IOWorker documents for ID" << name; QStringList list = KProtocolInfo::protocols(); list.sort(); diff --git a/navigator.h b/navigator.h index 9b010b54..34850fb0 100644 --- a/navigator.h +++ b/navigator.h @@ -46,8 +46,8 @@ class Navigator : public QWidget void insertScrollKeeperDocs( NavigatorItem *parent ); void insertInfoDocs( NavigatorItem *parentItem ); void insertKCMDocs(const QString &, NavigatorItem*parent, const QString &); - void insertIOSlaveDocs(const QString &, NavigatorItem*parent); + void insertIOWorkerDocs(const QString &, NavigatorItem*parent); void createItemFromDesktopFile( NavigatorItem *item, const QString &name ); void clearSelection(); diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index caf2fe02..1d2bdee6 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -16,5 +16,5 @@ install( FILES fundamentals.desktop plasma.desktop browsercontrolmodules.desktop filemanagercontrolmodules.desktop othercontrolmodules.desktop - kioslaves.desktop DESTINATION ${KDE_INSTALL_DATADIR}/khelpcenter/plugins ) + kioworkers.desktop DESTINATION ${KDE_INSTALL_DATADIR}/khelpcenter/plugins ) diff --git a/plugins/kioslaves.desktop b/plugins/kioslaves.desktop deleted file mode 100644 index 3418fffa..00000000 --- a/plugins/kioslaves.desktop +++ /dev/null @@ -1,97 +0,0 @@ -[Desktop Entry] -Name=Kioslaves -Name[af]=Kioslaves -Name[ar]=خوادم دخل وخرج كدي -Name[ast]=Kioslaves -Name[be]=Kioslaves -Name[be@latin]=Słužby „kioslave” -Name[bg]=Kioslaves -Name[bn]=Kioslaves -Name[bn_IN]=Kioslaves -Name[br]=Kioslaves -Name[bs]=U/I zahvati -Name[ca]=Kioslaves -Name[ca@valencia]=Kioslaves -Name[cs]=Pomocné protokoly KDE -Name[csb]=wtëkôczë wéńdzeniô/wińdzeniô -Name[cy]=Kioslaves -Name[da]=Kioslaver -Name[de]=Ein-/Ausgabemodule -Name[el]=Kioslaves -Name[en_GB]=Kioslaves -Name[eo]=Kioslaves -Name[es]=Kioslaves -Name[et]=KIO-moodulid -Name[eu]=Kioslaves -Name[fa]=Kioslaves -Name[fi]=KIO-palvelut -Name[fr]=Modules d'entrées / sorties -Name[fy]=Kioslaves -Name[ga]=Sclábhaithe KIO -Name[gl]=Kioslaves -Name[gu]=Kioslaves -Name[he]=פרוטוקולים -Name[hi]=केआईओ-स्लेव्स -Name[hne]=केआईओ-स्लेव्स -Name[hr]=Kioslaves -Name[hsb]=Kioslaves -Name[hu]=KDE-protokollok -Name[ia]=Kioslaves -Name[id]=Kioslaves -Name[is]=Kioslaves -Name[it]=Kioslave -Name[ja]=Kioslave -Name[ka]=Kioslaves -Name[kk]=Kioslaves -Name[km]=Kioslaves -Name[kn]=ಕಐಓಸ್ಲೇವ್ಸ್ -Name[ko]=KIO 슬레이브 -Name[ku]=Kioslaves -Name[lt]=Kio protokolai -Name[lv]=KIO vergi -Name[mai]=केआईओ-स्लेव्स -Name[mk]=Kioslaves -Name[ml]=കിയോസ്ലേവുകള് -Name[mr]=Kioslaves -Name[ms]=Kioslaves -Name[nb]=Kioslaver -Name[nds]=In-/Utgaavmodulen -Name[ne]=किओस्लाभ -Name[nl]=Kioslaves -Name[nn]=Kioslavar -Name[oc]=Kioslaves -Name[or]=Kioslaves -Name[pa]=Kioslaves -Name[pl]=Wtyczki wejścia/wyjścia -Name[pt]=Kioslaves -Name[pt_BR]=Kioslaves -Name[ro]=Dispozitive KIO -Name[ru]=Поддержка протоколов -Name[se]=KIO-šlávat -Name[si]=Kioslaves -Name[sk]=Kioslaves -Name[sl]=Kioslaves -Name[sr]=У/И захвати -Name[sr@ijekavian]=У/И захвати -Name[sr@ijekavianlatin]=U/I zahvati -Name[sr@latin]=U/I zahvati -Name[sv]=I/O-slavar -Name[ta]=Kioslaves -Name[te]=కెఐఒ బానిసలు -Name[tg]=Kioslaves -Name[th]=Kioslaves -Name[tr]=Kioslaves -Name[ug]=Kioslaves -Name[uk]=Підлеглі В/В -Name[uz]=Kioslaves -Name[uz@cyrillic]=Kioslaves -Name[vi]=Kioslaves -Name[wa]=Vårlets d' I/R (kioslaves) -Name[x-test]=xxKioslavesxx -Name[zh_CN]=Kioslaves -Name[zh_TW]=Kioslaves -Icon=help-contents - -X-DOC-Weight=500 - -X-KDE-KHelpcenter-Special=kioslave diff --git a/plugins/kioworkers.desktop b/plugins/kioworkers.desktop new file mode 100644 index 00000000..294a4207 --- /dev/null +++ b/plugins/kioworkers.desktop @@ -0,0 +1,9 @@ +# SPDX-License-Identifier: CC0-1.0 +# SPDX-FileCopyrightText: 2022 Harald Sitter <[email protected]> +[Desktop Entry] +Name=KIO Workers +Icon=help-contents + +X-DOC-Weight=500 + +X-KDE-KHelpcenter-Special=kioworker diff --git a/plugintraverser.cpp b/plugintraverser.cpp index 36b6205d..9fc890d1 100644 --- a/plugintraverser.cpp +++ b/plugintraverser.cpp @@ -81,8 +81,8 @@ void PluginTraverser::process( DocEntry *entry ) mNavigator->insertKCMDocs( entry->khelpcenterSpecial(), mCurrentItem, QStringLiteral("othercontrol") ); } else if ( entry->khelpcenterSpecial() == QLatin1String("kinfocenter") ) { mNavigator->insertKCMDocs( entry->khelpcenterSpecial(), mCurrentItem, QStringLiteral("kinfocenter") ); - } else if ( entry->khelpcenterSpecial() == QLatin1String("kioslave") ) { - mNavigator->insertIOSlaveDocs( entry->khelpcenterSpecial(), mCurrentItem ); + } else if ( entry->khelpcenterSpecial() == QLatin1String("kioworker") ) { + mNavigator->insertIOWorkerDocs( entry->khelpcenterSpecial(), mCurrentItem ); } else if ( entry->khelpcenterSpecial() == QLatin1String("info") ) { mNavigator->insertInfoDocs( mCurrentItem ); } else if ( entry->khelpcenterSpecial() == QLatin1String("scrollkeeper") ) {
