[network/kio-extras] /: kcms/netpref: Drop
Tobias Fella
null at kde.org
Mon Jul 13 20:15:30 BST 2026
Git commit 94960a933eef29c109a38cd98265b6880d38c6aa by Tobias Fella.
Committed on 13/07/2026 at 19:15.
Pushed by tfella into branch 'master'.
kcms/netpref: Drop
The kcm only adds a few options of questionable importance
M +0 -1 doc/kcontrol6/CMakeLists.txt
D +0 -2 doc/kcontrol6/netpref/CMakeLists.txt
D +0 -56 doc/kcontrol6/netpref/index.docbook
M +0 -1 kcms/CMakeLists.txt
D +0 -25 kcms/netpref/CMakeLists.txt
D +0 -123 kcms/netpref/kcm_netpref.json
D +0 -20 kcms/netpref/kio_ftprc.kcfg
D +0 -4 kcms/netpref/kio_ftprc.kcfgc
D +0 -4 kcms/netpref/kioslave.kcfgc
D +0 -125 kcms/netpref/netpref.cpp
D +0 -40 kcms/netpref/netpref.h
R +0 -0 kcms/proxy/kioslave.kcfg [from: kcms/netpref/kioslave.kcfg - 100% similarity]
M +1 -1 kcms/proxy/kioslave.kcfgc
https://invent.kde.org/network/kio-extras/-/commit/94960a933eef29c109a38cd98265b6880d38c6aa
diff --git a/doc/kcontrol6/CMakeLists.txt b/doc/kcontrol6/CMakeLists.txt
index 3e9df70e2..65d097d27 100644
--- a/doc/kcontrol6/CMakeLists.txt
+++ b/doc/kcontrol6/CMakeLists.txt
@@ -1,4 +1,3 @@
-add_subdirectory(netpref)
add_subdirectory(proxy)
add_subdirectory(trash)
add_subdirectory(webshortcuts)
diff --git a/doc/kcontrol6/netpref/CMakeLists.txt b/doc/kcontrol6/netpref/CMakeLists.txt
deleted file mode 100644
index 1f7485cfe..000000000
--- a/doc/kcontrol6/netpref/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-########### install files ###############
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol6/netpref)
diff --git a/doc/kcontrol6/netpref/index.docbook b/doc/kcontrol6/netpref/index.docbook
deleted file mode 100644
index 5b2c0dd82..000000000
--- a/doc/kcontrol6/netpref/index.docbook
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN"
-"dtd/kdedbx45.dtd" [
-<!ENTITY % addindex "IGNORE">
-<!ENTITY % English "INCLUDE" > <!-- change language only here -->
-]>
-
-<article id="netpref" lang="&language;">
-<articleinfo>
-<title>Connection Preferences</title>
-<authorgroup>
-<author>&Lauri.Watts; &Lauri.Watts.mail;</author>
-
-<!-- TRANS:ROLES_OF_TRANSLATORS -->
-</authorgroup>
-
-<date>2016-11-10</date>
-<releaseinfo>Frameworks 5.29</releaseinfo>
-
-<keywordset>
-<keyword>KDE</keyword>
-<keyword>kdebase</keyword>
-<keyword>kcontrol</keyword>
-<keyword>network</keyword>
-</keywordset>
-
-</articleinfo>
-
-<sect1>
-
-<title>Connection Preferences</title>
-
-<para>You can configure <guilabel>FTP Options</guilabel> here. At
-present there is just two options:</para>
-<variablelist>
-<varlistentry>
-<term><guilabel>Enable passive mode (PASV)</guilabel></term>
-<listitem><para>Passive &FTP; is often required when you are behind a firewall.
-Many firewalls only permit connections that were initiated from
-<quote>the inside</quote>. Passive &FTP; is controlled by the client,
-which makes it usable through firewalls.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><guilabel>Mark partially uploaded files</guilabel></term>
-<listitem><para>When a mark is placed in this box, partially uploaded files will
-have a <literal role="extension">.part</literal> extension added to the end
-of the file. This extension is removed once the file download is complete.</para></listitem>
-</varlistentry>
-
-</variablelist>
-
-
-
-</sect1>
-</article>
diff --git a/kcms/CMakeLists.txt b/kcms/CMakeLists.txt
index cd2191054..533af85f6 100644
--- a/kcms/CMakeLists.txt
+++ b/kcms/CMakeLists.txt
@@ -5,4 +5,3 @@ if(NOT WIN32)
endif()
add_subdirectory(webshortcuts)
add_subdirectory(proxy)
-add_subdirectory(netpref)
diff --git a/kcms/netpref/CMakeLists.txt b/kcms/netpref/CMakeLists.txt
deleted file mode 100644
index 70064e3bc..000000000
--- a/kcms/netpref/CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-kcoreaddons_add_plugin(kcm_netpref INSTALL_NAMESPACE "plasma/kcms/systemsettings_qwidgets")
-
-kcmutils_generate_desktop_file(kcm_netpref)
-target_sources(kcm_netpref PRIVATE
- netpref.cpp
- ../ksaveioconfig.cpp
-)
-
-kconfig_add_kcfg_files(kcm_netpref kio_ftprc.kcfgc)
-kconfig_add_kcfg_files(kcm_netpref kioslave.kcfgc)
-
-target_link_libraries(kcm_netpref
- PUBLIC
- KF6::ConfigCore
- KF6::KCMUtils
- KF6::KIOCore
- PRIVATE
- KF6::I18n
- KF6::CoreAddons
-)
-
-if(USE_DBUS)
- target_link_libraries(kcm_netpref PUBLIC Qt6::DBus)
- target_compile_definitions(kcm_netpref PUBLIC -DWITH_DBUS)
-endif()
diff --git a/kcms/netpref/kcm_netpref.json b/kcms/netpref/kcm_netpref.json
deleted file mode 100644
index 48f440821..000000000
--- a/kcms/netpref/kcm_netpref.json
+++ /dev/null
@@ -1,123 +0,0 @@
-{
- "KPlugin": {
- "BugReportUrl": "https://bugs.kde.org/enter_bug.cgi?product=systemsettings&component=kcm_netpref",
- "Description": "Configure generic network preferences",
- "Description[ar]": "اضبط تفضيلات الشبكة العامة",
- "Description[bg]": "Настройване на общите мрежови параметри",
- "Description[ca at valencia]": "Configura les preferències genèriques de la xarxa",
- "Description[ca]": "Configura les preferències genèriques de la xarxa",
- "Description[cs]": "Nastavit obecné předvolby sítě",
- "Description[de]": "Allgemeine Netzwerkeinstellungen vornehmen",
- "Description[eo]": "Agordi komunajn retajn preferojn",
- "Description[es]": "Configurar las preferencias de red genéricas",
- "Description[eu]": "Konfiguratu sareko hobespen generikoak",
- "Description[fi]": "Aseta yleiset verkkoasetukset",
- "Description[fr]": "Configurer les préférences génériques du réseau",
- "Description[gl]": "Configurar as preferencias xenéricas de rede.",
- "Description[he]": "הגדרת העדפות רשת כלליות",
- "Description[hu]": "Általános hálózati beállítások konfigurálása",
- "Description[ia]": "Configura le preferentia de rete generic",
- "Description[is]": "Grunnstilla almennar netstillingar",
- "Description[it]": "Configura le preferenze di rete generiche",
- "Description[ka]": "ქსელის ზოგადი პარამეტრების მორგება",
- "Description[ko]": "일반적 네트워크 설정 변경",
- "Description[lt]": "Konfigūruoti bendrines tinklo nuostatas",
- "Description[lv]": "Konfigurēt vispārīgos tīkla iestatījumus",
- "Description[nl]": "Algemene netwerkvoorkeuren configureren ",
- "Description[nn]": "Oppsett av generelle nettverksinnstillingar",
- "Description[pl]": "Ustawienia ogólnych ustawień sieciowych",
- "Description[pt_BR]": "Configurar preferências genéricas da rede",
- "Description[ro]": "Configurează opțiuni de rețea comune",
- "Description[ru]": "Настройка общих параметров сети",
- "Description[sk]": "Nastavenie všeobecných predvolieb siete, napr. hodnoty časových limitov",
- "Description[sl]": "Konfiguriraj generične mrežne preference",
- "Description[sv]": "Anpassa generella nätverksinställningar",
- "Description[ta]": "பொதுவான பிணைய விருப்பத்தேர்வுகளை அமைக்க உதவும்",
- "Description[tr]": "Genel ağ tercihlerini yapılandırın",
- "Description[uk]": "Налаштування загальних параметрів мережі",
- "Description[zh_CN]": "配置常规网络首选项",
- "Description[zh_TW]": "設定一般網路偏好設定",
- "Icon": "preferences-system-network-connection",
- "Name": "Connection Preferences",
- "Name[ar]": "تفضيلات الاتّصال",
- "Name[be]": "Налады злучэння",
- "Name[bg]": "Настройване на връзката",
- "Name[ca at valencia]": "Preferències de connexió",
- "Name[ca]": "Preferències de connexió",
- "Name[cs]": "Předvolby připojení",
- "Name[de]": "Verbindungseinstellungen",
- "Name[en_GB]": "Connection Preferences",
- "Name[eo]": "Konekto-Preferoj",
- "Name[es]": "Preferencias de la conexión",
- "Name[eu]": "Konexio hobespenak",
- "Name[fi]": "Yhteysasetukset",
- "Name[fr]": "Préférences de connexion",
- "Name[gl]": "Configuración da conexión",
- "Name[he]": "העדפות חיבור",
- "Name[hu]": "Kapcsolati beállítások",
- "Name[ia]": "Preferentias de connexion",
- "Name[is]": "Kjörstillingar tengingar",
- "Name[it]": "Preferenze delle connessioni",
- "Name[ja]": "接続設定",
- "Name[ka]": "კავშირის პარამეტრები",
- "Name[ko]": "연결 설정",
- "Name[lt]": "Ryšio nuostatos",
- "Name[lv]": "Savienojuma iestatījumi",
- "Name[nl]": "Verbindingsvoorkeuren",
- "Name[nn]": "Tilkoplingsinnstillingar",
- "Name[pa]": "ਕਨੈਕਸ਼ਨ ਪਸੰਦਾਂ",
- "Name[pl]": "Ustawienia połączeń",
- "Name[pt_BR]": "Preferências da conexão",
- "Name[ro]": "Preferințe conexiune",
- "Name[ru]": "Параметры подключения",
- "Name[sa]": "संयोजनप्राथमिकता",
- "Name[sk]": "Predvoľby pripojenia",
- "Name[sl]": "Preference povezave",
- "Name[sv]": "Anslutningsinställningar",
- "Name[ta]": "இணைப்பு விருப்பத்தேர்வுகள்",
- "Name[tr]": "Bağlantı Tercihleri",
- "Name[uk]": "Параметри з'єднання",
- "Name[zh_CN]": "连接首选项",
- "Name[zh_TW]": "連線偏好設定"
- },
- "X-DocPath": "kcontrol6/netpref/index.html",
- "X-KDE-Keywords": "iopref,netpref,network preferences,ftp",
- "X-KDE-Keywords[ar]": "iopref,netpref,تفضيلات الشبكة,ftp",
- "X-KDE-Keywords[bg]": "iopref, netpref, мрежови предпочитания, ftp",
- "X-KDE-Keywords[ca at valencia]": "iopref,netpref,preferències de xarxa,ftp",
- "X-KDE-Keywords[ca]": "iopref,netpref,preferències de xarxa,ftp",
- "X-KDE-Keywords[cs]": "iopref,netpref,předvolby sítě,ftp",
- "X-KDE-Keywords[de]": "Ein-/Ausgabemodul-Einstellungen,iopref,Netzwerkeinstellungen,netpref,Netzwerk-Präferenzen,FTP",
- "X-KDE-Keywords[eo]": "iopref,netpref,retaj preferoj,ftp",
- "X-KDE-Keywords[es]": "iopref,netpref,preferencias de redes,ftp",
- "X-KDE-Keywords[eu]": "iopref,si hobespenak,netpref,sareko hobespenak,ftp",
- "X-KDE-Keywords[fi]": "iopref,netpref,verkkoasetukset,ftp",
- "X-KDE-Keywords[fr]": "iopref, netpref, préférences réseau, ftp",
- "X-KDE-Keywords[gl]": "iopref,netpref,rede,preferencias,ftp",
- "X-KDE-Keywords[he]": "timeout,iopref,netpref,העדפות רשת,ftp,תום זמן המתנה,תום זמן",
- "X-KDE-Keywords[hu]": "iopref,netpref,hálózati beállítások,ftp",
- "X-KDE-Keywords[ia]": "iopref,netpref,preferentias de rete,network preferences,ftp",
- "X-KDE-Keywords[is]": "iopref,netpref,kjörstillingar nets,ftp",
- "X-KDE-Keywords[it]": "iopref,netpref,preferenze di rete,ftp",
- "X-KDE-Keywords[ka]": "timeout,iopref,netpref,network preferences,ftp,მოლოდინისვადა,ქსელის პარამეტრები",
- "X-KDE-Keywords[ko]": "네트워크 설정,ftp",
- "X-KDE-Keywords[lt]": "iopref,netpref,network preferences,ftp,tinklo nuostatos,tinklo nustatymai",
- "X-KDE-Keywords[lv]": "iopref,netpref,tīkla iestatījumi,ftp",
- "X-KDE-Keywords[nl]": "iopref,netpref,netwerk voorkeuren,ftp",
- "X-KDE-Keywords[nn]": "iopref,netpref,nettverksinnstillinger,ftp",
- "X-KDE-Keywords[pl]": "iopref,netpref,ustawienia sieciowe,ftp",
- "X-KDE-Keywords[pt_BR]": "iopref,netpref,preferências de rede,ftp",
- "X-KDE-Keywords[ro]": "iopref,netpref,preferințe rețea,preferințe de rețea,ftp",
- "X-KDE-Keywords[ru]": "iopref,netpref,network preferences,ftp,параметры сети",
- "X-KDE-Keywords[sk]": "iopref,netpref,sieťové nastavenia,ftp",
- "X-KDE-Keywords[sl]": "iopref,netpref,omrežne nastavitve,ftp",
- "X-KDE-Keywords[sv]": "iopref,netpref,nätverk inställningar,ftp",
- "X-KDE-Keywords[ta]": "iopref,netpref,network preferences,ftp,பிணைய அமைப்புகள்,இணைய அமைப்புகள்",
- "X-KDE-Keywords[tr]": "iopref,netpref,ağ tercihleri,ağ ayarları,ftp,network",
- "X-KDE-Keywords[uk]": "iopref,netpref,network preferences,ftp,мережа,параметри,налаштування",
- "X-KDE-Keywords[zh_CN]": "iopref,netpref,network preferences,ftp,网络首选项",
- "X-KDE-Keywords[zh_TW]": "網路設定,網路偏好設定",
- "X-KDE-ParentApp": "kcontrol",
- "X-KDE-System-Settings-Parent-Category": "networksettings",
- "X-KDE-Weight": 50
-}
diff --git a/kcms/netpref/kio_ftprc.kcfg b/kcms/netpref/kio_ftprc.kcfg
deleted file mode 100644
index f4a370e30..000000000
--- a/kcms/netpref/kio_ftprc.kcfg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
- http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
- <kcfgfile name="kio_ftprc" />
- <group name="<default>">
- <entry name="DisablePassiveMode" type="Bool">
- <label>Disable Passive FTP</label>
- <whatsthis>When FTP connections are passive the client connects to the server, instead of the other way round, so firewalls do not block the connection; old FTP servers may not support Passive FTP though.</whatsthis>
- <default>false</default>
- </entry>
-
- <entry name="MarkPartial" type="Bool">
- <label>Mark partially uploaded files</label>
- <whatsthis>While a file is being uploaded its extension is ".part". When fully uploaded it is renamed to its real name.</whatsthis>
- <default>true</default>
- </entry>
- </group>
-</kcfg>
diff --git a/kcms/netpref/kio_ftprc.kcfgc b/kcms/netpref/kio_ftprc.kcfgc
deleted file mode 100644
index 8e4685a89..000000000
--- a/kcms/netpref/kio_ftprc.kcfgc
+++ /dev/null
@@ -1,4 +0,0 @@
-File=kio_ftprc.kcfg
-ClassName=KioFtp
-Mutators=true
-
diff --git a/kcms/netpref/kioslave.kcfgc b/kcms/netpref/kioslave.kcfgc
deleted file mode 100644
index a4406612b..000000000
--- a/kcms/netpref/kioslave.kcfgc
+++ /dev/null
@@ -1,4 +0,0 @@
-File=kioslave.kcfg
-ClassName=KioSlave
-Mutators=true
-
diff --git a/kcms/netpref/netpref.cpp b/kcms/netpref/netpref.cpp
deleted file mode 100644
index 2899c93bb..000000000
--- a/kcms/netpref/netpref.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-
-// Own
-#include "netpref.h"
-
-// Qt
-#include <QCheckBox>
-#include <QFormLayout>
-#include <QGroupBox>
-#include <QSpinBox>
-
-// KDE
-#include <KLocalization>
-#include <KLocalizedString>
-#include <KPluginFactory>
-
-// Local
-#include "../ksaveioconfig.h"
-
-K_PLUGIN_CLASS_WITH_JSON(KIOPreferences, "kcm_netpref.json")
-
-KIOPreferences::KIOPreferences(QObject *parent, const KPluginMetaData &data)
- : KCModule(parent, data)
-{
- QVBoxLayout *mainLayout = new QVBoxLayout(widget());
-
- QGroupBox *gb_Global = new QGroupBox(i18n("Global Options"), widget());
- gb_Global->setFlat(true);
- mainLayout->addWidget(gb_Global);
- QVBoxLayout *globalLayout = new QVBoxLayout(gb_Global);
-
- cb_globalMarkPartial = new QCheckBox(i18n("Mark &partially uploaded files"), widget());
- cb_globalMarkPartial->setWhatsThis(
- i18n("<p>Marks partially uploaded files "
- "through SMB, SFTP and other protocols."
- "</p><p>When this option is "
- "enabled, partially uploaded files "
- "will have a \".part\" extension. "
- "This extension will be removed "
- "once the transfer is complete.</p>"));
- connect(cb_globalMarkPartial, &QAbstractButton::toggled, this, &KIOPreferences::configChanged);
- globalLayout->addWidget(cb_globalMarkPartial);
- globalLayout->setAlignment(cb_globalMarkPartial, Qt::AlignHCenter);
-
- auto partialWidget = new QWidget(widget());
- connect(cb_globalMarkPartial, &QAbstractButton::toggled, partialWidget, &QWidget::setEnabled);
- globalLayout->addWidget(partialWidget);
- auto partialLayout = new QFormLayout(partialWidget);
- partialLayout->setFormAlignment(Qt::AlignHCenter);
- partialLayout->setContentsMargins(0, 0, 0, 0);
-
- gb_Ftp = new QGroupBox(i18n("FTP Options"), widget());
- gb_Ftp->setFlat(true);
- mainLayout->addWidget(gb_Ftp);
- QVBoxLayout *ftpLayout = new QVBoxLayout(gb_Ftp);
- ftpLayout->setAlignment(Qt::AlignHCenter);
-
- cb_ftpEnablePasv = new QCheckBox(i18n("Enable passive &mode (PASV)"), widget());
- cb_ftpEnablePasv->setWhatsThis(
- i18n("Enables FTP's \"passive\" mode. "
- "This is required to allow FTP to "
- "work from behind firewalls."));
- connect(cb_ftpEnablePasv, &QAbstractButton::toggled, this, &KIOPreferences::configChanged);
- ftpLayout->addWidget(cb_ftpEnablePasv);
-
- cb_ftpMarkPartial = new QCheckBox(i18n("Mark &partially uploaded files"), widget());
- cb_ftpMarkPartial->setWhatsThis(
- i18n("<p>Marks partially uploaded FTP "
- "files.</p><p>When this option is "
- "enabled, partially uploaded files "
- "will have a \".part\" extension. "
- "This extension will be removed "
- "once the transfer is complete.</p>"));
- connect(cb_ftpMarkPartial, &QAbstractButton::toggled, this, &KIOPreferences::configChanged);
- ftpLayout->addWidget(cb_ftpMarkPartial);
-
- mainLayout->addStretch(1);
-}
-
-KIOPreferences::~KIOPreferences()
-{
-}
-
-void KIOPreferences::load()
-{
- kioConfig.load();
-
- cb_globalMarkPartial->setChecked(kioConfig.markPartial());
-
- ftpConfig.load();
-
- cb_ftpEnablePasv->setChecked(!ftpConfig.disablePassiveMode());
- cb_ftpMarkPartial->setChecked(ftpConfig.markPartial());
- setNeedsSave(false);
-}
-
-void KIOPreferences::save()
-{
- kioConfig.setMarkPartial(cb_globalMarkPartial->isChecked());
- kioConfig.save();
-
- ftpConfig.setDisablePassiveMode(!cb_ftpEnablePasv->isChecked());
- ftpConfig.setMarkPartial(cb_ftpMarkPartial->isChecked());
- ftpConfig.save();
-
- KSaveIOConfig::updateRunningWorkers(widget());
-
- setNeedsSave(false);
-}
-
-void KIOPreferences::defaults()
-{
- kioConfig.setDefaults();
- ftpConfig.setDefaults();
-
- cb_globalMarkPartial->setChecked(kioConfig.markPartial());
-
- cb_ftpEnablePasv->setChecked(!ftpConfig.disablePassiveMode());
- cb_ftpMarkPartial->setChecked(ftpConfig.markPartial());
-
- setNeedsSave(true);
-}
-
-#include "netpref.moc"
-
-#include "moc_netpref.cpp"
diff --git a/kcms/netpref/netpref.h b/kcms/netpref/netpref.h
deleted file mode 100644
index e9df7dc15..000000000
--- a/kcms/netpref/netpref.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef NETPREF_H
-#define NETPREF_H
-
-#include <KCModule>
-
-#include "kio_ftprc.h"
-#include "kioslave.h"
-
-class QCheckBox;
-class QGroupBox;
-class QSpinBox;
-
-class KIOPreferences : public KCModule
-{
- Q_OBJECT
-
-public:
- KIOPreferences(QObject *parent, const KPluginMetaData &data);
- ~KIOPreferences() override;
-
- void load() override;
- void save() override;
- void defaults() override;
-
-protected Q_SLOTS:
- void configChanged()
- {
- setNeedsSave(true);
- }
-
-private:
- QCheckBox *cb_globalMarkPartial;
- QCheckBox *cb_ftpEnablePasv;
- QCheckBox *cb_ftpMarkPartial;
- QGroupBox *gb_Ftp;
- KioFtp ftpConfig;
- KioSlave kioConfig;
-};
-
-#endif // NETPREF_H
diff --git a/kcms/netpref/kioslave.kcfg b/kcms/proxy/kioslave.kcfg
similarity index 100%
rename from kcms/netpref/kioslave.kcfg
rename to kcms/proxy/kioslave.kcfg
diff --git a/kcms/proxy/kioslave.kcfgc b/kcms/proxy/kioslave.kcfgc
index 628ec044d..508b22cf9 100644
--- a/kcms/proxy/kioslave.kcfgc
+++ b/kcms/proxy/kioslave.kcfgc
@@ -1,4 +1,4 @@
-File=../netpref/kioslave.kcfg
+File=kioslave.kcfg
ClassName=ProxySettings
Mutators=true
More information about the kde-doc-english
mailing list