┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/settings
diff options
context:
space:
mode:
Diffstat (limited to 'src/settings')
-rw-r--r--src/settings/applyviewpropsjob.cpp2
-rw-r--r--src/settings/dolphinsettingsdialog.cpp12
-rw-r--r--src/settings/general/behaviorsettingspage.cpp2
-rw-r--r--src/settings/general/confirmationssettingspage.cpp49
-rw-r--r--src/settings/general/confirmationssettingspage.h3
-rw-r--r--src/settings/kcm/kcmdolphingeneral.desktop12
-rw-r--r--src/settings/kcm/kcmdolphinnavigation.desktop12
-rw-r--r--src/settings/kcm/kcmdolphinservices.desktop8
-rw-r--r--src/settings/kcm/kcmdolphinviewmodes.desktop12
-rw-r--r--src/settings/services/servicemenuinstaller/servicemenuinstaller.cpp38
-rw-r--r--src/settings/services/servicessettingspage.cpp2
11 files changed, 75 insertions, 77 deletions
diff --git a/src/settings/applyviewpropsjob.cpp b/src/settings/applyviewpropsjob.cpp
index b274bb8fb..183c85225 100644
--- a/src/settings/applyviewpropsjob.cpp
+++ b/src/settings/applyviewpropsjob.cpp
@@ -54,7 +54,7 @@ void ApplyViewPropsJob::slotEntries(KIO::Job*, const KIO::UDSEntryList& list)
{
foreach (const KIO::UDSEntry& entry, list) {
const QString name = entry.stringValue(KIO::UDSEntry::UDS_NAME);
- if (name != QLatin1String(".") && name != QLatin1String("..") && entry.isDir()) {
+ if (name != QLatin1Char('.') && name != QLatin1String("..") && entry.isDir()) {
++m_progress;
QUrl url(m_dir);
diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp
index f4da53c9d..01cfd9f86 100644
--- a/src/settings/dolphinsettingsdialog.cpp
+++ b/src/settings/dolphinsettingsdialog.cpp
@@ -61,35 +61,35 @@ DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent) :
GeneralSettingsPage* generalSettingsPage = new GeneralSettingsPage(url, this);
KPageWidgetItem* generalSettingsFrame = addPage(generalSettingsPage,
i18nc("@title:group General settings", "General"));
- generalSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("view-preview")));
+ generalSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("system-file-manager")));
connect(generalSettingsPage, &GeneralSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
// Startup
StartupSettingsPage* startupSettingsPage = new StartupSettingsPage(url, this);
KPageWidgetItem* startupSettingsFrame = addPage(startupSettingsPage,
i18nc("@title:group", "Startup"));
- startupSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("go-home")));
+ startupSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("preferences-desktop-launch-feedback")));
connect(startupSettingsPage, &StartupSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
// View Modes
ViewSettingsPage* viewSettingsPage = new ViewSettingsPage(this);
KPageWidgetItem* viewSettingsFrame = addPage(viewSettingsPage,
i18nc("@title:group", "View Modes"));
- viewSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("view-choose")));
+ viewSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("preferences-desktop-icons")));
connect(viewSettingsPage, &ViewSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
// Navigation
NavigationSettingsPage* navigationSettingsPage = new NavigationSettingsPage(this);
KPageWidgetItem* navigationSettingsFrame = addPage(navigationSettingsPage,
i18nc("@title:group", "Navigation"));
- navigationSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("edit-select")));
+ navigationSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("preferences-desktop-navigation")));
connect(navigationSettingsPage, &NavigationSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
// Services
ServicesSettingsPage* servicesSettingsPage = new ServicesSettingsPage(this);
KPageWidgetItem* servicesSettingsFrame = addPage(servicesSettingsPage,
i18nc("@title:group", "Services"));
- servicesSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("flag")));
+ servicesSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("preferences-system-services")));
connect(servicesSettingsPage, &ServicesSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
// Trash
@@ -97,7 +97,7 @@ DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent) :
if (trashSettingsPage) {
KPageWidgetItem* trashSettingsFrame = addPage(trashSettingsPage,
i18nc("@title:group", "Trash"));
- trashSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("trash-empty")));
+ trashSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("user-trash")));
connect(trashSettingsPage, &TrashSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
}
diff --git a/src/settings/general/behaviorsettingspage.cpp b/src/settings/general/behaviorsettingspage.cpp
index c7a909eca..df7ea2113 100644
--- a/src/settings/general/behaviorsettingspage.cpp
+++ b/src/settings/general/behaviorsettingspage.cpp
@@ -50,7 +50,7 @@ BehaviorSettingsPage::BehaviorSettingsPage(const QUrl& url, QWidget* parent) :
// View properties
m_globalViewProps = new QRadioButton(i18nc("@option:radio", "Use common properties for all folders"));
m_localViewProps = new QRadioButton(i18nc("@option:radio", "Remember properties for each folder"));
- m_localViewProps->setToolTip(i18nc("@info", "Dolphin will create an hidden .directory file in each folder you change view properties for."));
+ m_localViewProps->setToolTip(i18nc("@info", "Dolphin will create a hidden .directory file in each folder you change view properties for."));
QButtonGroup* viewGroup = new QButtonGroup(this);
viewGroup->addButton(m_globalViewProps);
diff --git a/src/settings/general/confirmationssettingspage.cpp b/src/settings/general/confirmationssettingspage.cpp
index 1d0eebdd3..dd4d60f3b 100644
--- a/src/settings/general/confirmationssettingspage.cpp
+++ b/src/settings/general/confirmationssettingspage.cpp
@@ -25,14 +25,23 @@
#include <KLocalizedString>
#include <QCheckBox>
+#include <QComboBox>
#include <QLabel>
+#include <QHBoxLayout>
#include <QVBoxLayout>
namespace {
+ enum ScriptExecution
+ {
+ AlwaysAsk = 0,
+ Open = 1,
+ Execute = 2
+ };
+
const bool ConfirmEmptyTrash = true;
const bool ConfirmTrash = false;
const bool ConfirmDelete = true;
- const bool ConfirmScriptExecution = true;
+ const int ConfirmScriptExecution = ScriptExecution::AlwaysAsk;
}
ConfirmationsSettingsPage::ConfirmationsSettingsPage(QWidget* parent) :
@@ -58,8 +67,6 @@ ConfirmationsSettingsPage::ConfirmationsSettingsPage(QWidget* parent) :
"Emptying trash"), this);
m_confirmDelete = new QCheckBox(i18nc("@option:check Ask for confirmation when",
"Deleting files or folders"), this);
- m_confirmScriptExecution = new QCheckBox(i18nc("@option:check Ask for confirmation when",
- "Executing scripts or desktop files"), this);
QLabel* confirmLabelDolphin = new QLabel(i18nc("@title:group", "Ask for confirmation in Dolphin when:"), this);
confirmLabelDolphin->setWordWrap(true);
@@ -72,11 +79,19 @@ ConfirmationsSettingsPage::ConfirmationsSettingsPage(QWidget* parent) :
"Closing windows with a program running in the Terminal panel"), this);
#endif
+ QHBoxLayout* executableScriptLayout = new QHBoxLayout();
+ QLabel* executableScriptLabel = new QLabel(i18nc("@title:group", "When opening an executable file:"), this);
+ confirmLabelKde->setWordWrap(true);
+ executableScriptLayout->addWidget(executableScriptLabel);
+
+ m_confirmScriptExecution = new QComboBox(this);
+ m_confirmScriptExecution->addItems({i18n("Always ask"), i18n("Open in application"), i18n("Run script")});
+ executableScriptLayout->addWidget(m_confirmScriptExecution);
+
topLayout->addWidget(confirmLabelKde);
topLayout->addWidget(m_confirmMoveToTrash);
topLayout->addWidget(m_confirmEmptyTrash);
topLayout->addWidget(m_confirmDelete);
- topLayout->addWidget(m_confirmScriptExecution);
topLayout->addSpacing(Dolphin::VERTICAL_SPACER_HEIGHT);
topLayout->addWidget(confirmLabelDolphin);
topLayout->addWidget(m_confirmClosingMultipleTabs);
@@ -85,6 +100,9 @@ ConfirmationsSettingsPage::ConfirmationsSettingsPage(QWidget* parent) :
topLayout->addWidget(m_confirmClosingTerminalRunningProgram);
#endif
+ topLayout->addSpacing(Dolphin::VERTICAL_SPACER_HEIGHT);
+ topLayout->addLayout(executableScriptLayout);
+
topLayout->addStretch();
loadSettings();
@@ -92,7 +110,7 @@ ConfirmationsSettingsPage::ConfirmationsSettingsPage(QWidget* parent) :
connect(m_confirmMoveToTrash, &QCheckBox::toggled, this, &ConfirmationsSettingsPage::changed);
connect(m_confirmEmptyTrash, &QCheckBox::toggled, this, &ConfirmationsSettingsPage::changed);
connect(m_confirmDelete, &QCheckBox::toggled, this, &ConfirmationsSettingsPage::changed);
- connect(m_confirmScriptExecution, &QCheckBox::toggled, this, &ConfirmationsSettingsPage::changed);
+ connect(m_confirmScriptExecution, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ConfirmationsSettingsPage::changed);
connect(m_confirmClosingMultipleTabs, &QCheckBox::toggled, this, &ConfirmationsSettingsPage::changed);
#ifdef HAVE_TERMINAL
@@ -113,10 +131,17 @@ void ConfirmationsSettingsPage::applySettings()
confirmationGroup.writeEntry("ConfirmDelete", m_confirmDelete->isChecked());
KConfigGroup scriptExecutionGroup(kioConfig, "Executable scripts");
- if (m_confirmScriptExecution->isChecked()) {
+ const int index = m_confirmScriptExecution->currentIndex();
+ switch (index) {
+ case ScriptExecution::AlwaysAsk:
scriptExecutionGroup.writeEntry("behaviourOnLaunch", "alwaysAsk");
- } else {
+ break;
+ case ScriptExecution::Open:
scriptExecutionGroup.writeEntry("behaviourOnLaunch", "dontAsk");
+ break;
+ case ScriptExecution::Execute:
+ scriptExecutionGroup.writeEntry("behaviourOnLaunch", "execute");
+ break;
}
kioConfig->sync();
@@ -140,7 +165,7 @@ void ConfirmationsSettingsPage::restoreDefaults()
m_confirmMoveToTrash->setChecked(ConfirmTrash);
m_confirmEmptyTrash->setChecked(ConfirmEmptyTrash);
m_confirmDelete->setChecked(ConfirmDelete);
- m_confirmScriptExecution->setChecked(ConfirmScriptExecution);
+ m_confirmScriptExecution->setCurrentIndex(ConfirmScriptExecution);
}
void ConfirmationsSettingsPage::loadSettings()
@@ -153,7 +178,13 @@ void ConfirmationsSettingsPage::loadSettings()
const KConfigGroup scriptExecutionGroup(KSharedConfig::openConfig(QStringLiteral("kiorc")), "Executable scripts");
const QString value = scriptExecutionGroup.readEntry("behaviourOnLaunch", "alwaysAsk");
- m_confirmScriptExecution->setChecked(value == QLatin1String("alwaysAsk"));
+ if (value == QLatin1String("dontAsk")) {
+ m_confirmScriptExecution->setCurrentIndex(ScriptExecution::Open);
+ } else if (value == QLatin1String("execute")) {
+ m_confirmScriptExecution->setCurrentIndex(ScriptExecution::Execute);
+ } else /* if (value == QLatin1String("alwaysAsk"))*/ {
+ m_confirmScriptExecution->setCurrentIndex(ScriptExecution::AlwaysAsk);
+ }
m_confirmClosingMultipleTabs->setChecked(GeneralSettings::confirmClosingMultipleTabs());
diff --git a/src/settings/general/confirmationssettingspage.h b/src/settings/general/confirmationssettingspage.h
index 52b101b2a..c15afdc38 100644
--- a/src/settings/general/confirmationssettingspage.h
+++ b/src/settings/general/confirmationssettingspage.h
@@ -23,6 +23,7 @@
#include "settings/settingspagebase.h"
class QCheckBox;
+class QComboBox;
/**
* @brief Page for the enabling or disabling confirmation dialogs.
@@ -54,7 +55,7 @@ private:
#endif
QCheckBox* m_confirmClosingMultipleTabs;
- QCheckBox* m_confirmScriptExecution;
+ QComboBox* m_confirmScriptExecution;
};
#endif
diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop
index ac3956144..75a5aaf0c 100644
--- a/src/settings/kcm/kcmdolphingeneral.desktop
+++ b/src/settings/kcm/kcmdolphingeneral.desktop
@@ -20,7 +20,7 @@ Name[id]=Dolphin Umum
Name[it]=Impostazioni generali di Dolphin
Name[ja]=Dolphin 全般
Name[ko]=Dolphin 일반
-Name[lt]=Dolphin bendrieji
+Name[lt]=Dolphin bendrosios
Name[ml]=പൊതു സജ്ജീകരണങ്ങള്‍
Name[nb]=Dolphin generelt
Name[nl]=Dolphin algemeen
@@ -65,7 +65,7 @@ Comment[id]=Layanan ini memungkinkan konfigurasi pengaturan umum Dolphin.
Comment[it]=Questo servizio permette di configurare le impostazioni generali di Dolphin.
Comment[ja]=Dolphin の全般的な設定を行います
Comment[ko]=이 서비스는 일반 Dolphin 설정을 담당합니다.
-Comment[lt]=Ši tarnyba leidžia konfigūruoti Dolphin bendrąsias nuostatas.
+Comment[lt]=Ši paslauga leidžia bendrųjų Dolphin nuostatų konfigūravimą.
Comment[ml]=പൊതുവായ ഡോള്‍ഫിന്‍ സജ്ജീകരണങ്ങള്‍ ക്രമീകരിയ്ക്കാന്‍ ഈ സേവനം അനുവദിക്കുന്നു.
Comment[nb]=Med denne tjenesten kan du sette opp generelle innstillinger for Dolphin.
Comment[nl]=Met deze dienst kunt u algemene Dolphin-instellingen configureren.
@@ -89,7 +89,7 @@ Comment[zh_CN]=此服务允许您配置 Dolphin 的常规设置。
Comment[zh_TW]=此服務允許設定 Dolphin 的一般設定。
[Desktop Entry]
-Icon=system-run
+Icon=system-file-manager
Type=Service
X-KDE-ServiceTypes=KCModule
Exec=kcmshell5 kcmdolphingeneral
@@ -122,7 +122,7 @@ Name[id]=Umum
Name[it]=Generale
Name[ja]=全般
Name[ko]=일반
-Name[lt]=Bendra
+Name[lt]=Bendrosios
Name[ml]=പൊതുവായതു്
Name[nb]=Generelt
Name[nl]=Algemeen
@@ -166,7 +166,7 @@ Comment[id]=Konfigurasikan pengaturan pengelola file umum
Comment[it]=Configura le impostazioni generali del gestore dei file
Comment[ja]=ファイルマネージャの全般的な設定を行います
Comment[ko]=일반 파일 관리자 설정
-Comment[lt]=Bendrųjų failų tvarkyklės nuostatų konfigūravimas
+Comment[lt]=Konfigūruoti bendras failų tvarkytuvės nuostatas
Comment[ml]=ഫയൽ മാനേജറിന്റെ പൊതുവായ സജ്ജീകരണങ്ങള്‍ ക്രമീകരിയ്ക്കുക
Comment[nb]=Sett opp generelle innstillinger for filbehandleren
Comment[nl]=Algemene bestandsbeheerderinstellingen configureren
@@ -211,7 +211,7 @@ 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ų tvarkyklė
+X-KDE-Keywords[lt]=failų tvarkytuvė
X-KDE-Keywords[ml]=ഫയൽ മാനേജർ
X-KDE-Keywords[nb]=filbehandler
X-KDE-Keywords[nl]=bestandsbeheerder
diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop
index f6686fbc8..24bf0dff5 100644
--- a/src/settings/kcm/kcmdolphinnavigation.desktop
+++ b/src/settings/kcm/kcmdolphinnavigation.desktop
@@ -20,7 +20,7 @@ Name[id]=Navigasi Dolphin
Name[it]=Navigazione di Dolphin
Name[ja]=Dolphin ナビゲーション
Name[ko]=Dolphin 탐색
-Name[lt]=Dolphin navigacija
+Name[lt]=Dolphin naršymas
Name[ml]=ഡോള്‍ഫിന്‍ നാവിഗേഷന്‍
Name[nb]=Navigasjon i Dolphin
Name[nl]=Dolphin-navigatie
@@ -65,7 +65,7 @@ Comment[id]=Layanan ini memungkinkan konfigurasi navigasi Dolphin.
Comment[it]=Questo servizio permette di configurare la navigazione con Dolphin.
Comment[ja]=Dolphin でのナビゲーションを設定します
Comment[ko]=이 서비스는 Dolphin 탐색을 설정합니다.
-Comment[lt]=Ši tarnyba leidžia konfigūruoti Dolphin navigaciją.
+Comment[lt]=Ši paslauga leidžia Dolphin naršymo konfigūravimą.
Comment[ml]=ഡോള്‍ഫിന്‍ നാവിഗേഷൻ ക്രമീകരിയ്ക്കാന്‍ ഈ സേവനം അനുവദിയ്ക്കുന്നു.
Comment[nb]=Med denne tjenesten kan du sette opp navigasjon for Dolphin.
Comment[nl]=Met deze dienst kunt u Dolphin-navigatie configureren.
@@ -89,7 +89,7 @@ Comment[zh_CN]=此服务允许您配置 Dolphin 的导航。
Comment[zh_TW]=此服務允許設定 Dolphin 的導覽。
[Desktop Entry]
-Icon=input-mouse
+Icon=preferences-desktop-navigation
Type=Service
X-KDE-ServiceTypes=KCModule
Exec=kcmshell5 kcmdolphinnavigation
@@ -121,7 +121,7 @@ Name[id]=Navigasi
Name[it]=Navigazione
Name[ja]=ナビゲーション
Name[ko]=탐색
-Name[lt]=Navigacija
+Name[lt]=Naršymas
Name[ml]=നാവിഗേഷന്‍
Name[nb]=Navigasjon
Name[nl]=Navigatie
@@ -166,7 +166,7 @@ Comment[id]=Konfigurasikan navigasi pengelola file
Comment[it]=Configura la navigazione col gestore dei file
Comment[ja]=ファイルマネージャでのナビゲーションを設定します
Comment[ko]=파일 관리자 탐색 설정
-Comment[lt]=Konfigūruokite failų tvarkyklės navigaciją
+Comment[lt]=Konfigūruoti failų tvarkytuvės naršymą
Comment[ml]=ഫയല്‍ മാനേജർ നാവിഗേഷൻ ക്രമീകരിയ്ക്കുക
Comment[nb]=Sett opp navigasjon i filbehandleren
Comment[nl]=Bestandsbeheerdernavigatie configureren
@@ -212,7 +212,7 @@ 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ų tvarkyklė
+X-KDE-Keywords[lt]=failų tvarkytuvė
X-KDE-Keywords[ml]=ഫയൽ മാനേജർ
X-KDE-Keywords[nb]=filbehandler
X-KDE-Keywords[nl]=bestandsbeheerder
diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop
index 07ac89c52..e3330af5d 100644
--- a/src/settings/kcm/kcmdolphinservices.desktop
+++ b/src/settings/kcm/kcmdolphinservices.desktop
@@ -20,7 +20,7 @@ Name[id]=Layanan Dolphin
Name[it]=Servizi di Dolphin
Name[ja]=Dolphin サービス
Name[ko]=Dolphin 서비스
-Name[lt]=Dolphin tarnybos
+Name[lt]=Dolphin paslaugos
Name[ml]=ഡോള്‍ഫിന്‍ സേവനങ്ങള്‍
Name[nb]=Dolphin-tjenester
Name[nl]=Dolphin-services
@@ -44,7 +44,7 @@ Name[zh_CN]=Dolphin 服务
Name[zh_TW]=Dolphin 服務
[Desktop Entry]
-Icon=services
+Icon=preferences-system-services
Type=Service
X-KDE-ServiceTypes=KCModule
Exec=kcmshell5 kcmdolphinservices
@@ -120,7 +120,7 @@ Comment[id]=Konfigurasikan layanan pengelola file
Comment[it]=Configura i servizi del gestore dei file
Comment[ja]=ファイルマネージャのサービスを設定します
Comment[ko]=파일 관리자 서비스 설정
-Comment[lt]=Konfigūruokite failų tvarkyklės tarnybas
+Comment[lt]=Konfigūruoti failų tvarkytuvės paslaugas
Comment[ml]=ഫയല്‍ മാനേജർ സേവനങ്ങള്‍ ക്രമീകരിയ്ക്കുക
Comment[nb]=Sett opp tjenester i filbehandleren
Comment[nl]=Bestandsbeheerderservices configureren
@@ -165,7 +165,7 @@ 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ų tvarkyklė
+X-KDE-Keywords[lt]=failų tvarkytuvė
X-KDE-Keywords[ml]=ഫയൽ മാനേജർ
X-KDE-Keywords[nb]=filbehandler
X-KDE-Keywords[nl]=bestandsbeheerder
diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop
index c50fa3800..f093f49a1 100644
--- a/src/settings/kcm/kcmdolphinviewmodes.desktop
+++ b/src/settings/kcm/kcmdolphinviewmodes.desktop
@@ -20,7 +20,7 @@ Name[id]=Mode Tampilan Dolphin
Name[it]=Viste di Dolphin
Name[ja]=Dolphin 表示モード
Name[ko]=Dolphin 보기 모드
-Name[lt]=Dolphin rodymo būdai
+Name[lt]=Dolphin rodinio veiksenos
Name[ml]=ഡോള്‍ഫിന്‍ അവതരണദശകള്‍
Name[nb]=Dolphin visningsmåter
Name[nl]=Dolphin-weergavemodussen
@@ -65,7 +65,7 @@ Comment[id]=Layanan ini memungkinkan konfigurasi mode tampilan Dolphin.
Comment[it]=Questo servizio permette di configurare le viste di Dolphin.
Comment[ja]=Dolphin の表示モードを設定します
Comment[ko]=이 서비스는 Dolphin 보기 모드를 설정합니다.
-Comment[lt]=Ši tarnyba leidžia konfigūruoti Dolphin rodymo būdus.
+Comment[lt]=Ši paslauga leidžia Dolphin rodinio veiksenų konfigūravimą.
Comment[ml]=ഡോള്‍ഫിന്‍ അവതരണദശകള്‍ ക്രമീകരിയ്ക്കാന്‍ ഈ സേവനം അനുവദിയ്ക്കുന്നു.
Comment[nb]=Med denne tjenesten kan du sette opp Dolphins visningsmåter.
Comment[nl]=Met deze dienst kunt u Dolphin-weergavemodussen configureren.
@@ -89,7 +89,7 @@ Comment[zh_CN]=此服务允许您配置 Dolphin 的视图模式。
Comment[zh_TW]=此服務允許設定 Dolphin 的檢視模式。
[Desktop Entry]
-Icon=view-choose
+Icon=preferences-desktop-icons
Type=Service
X-KDE-ServiceTypes=KCModule
Exec=kcmshell5 kcmdolphinviewmodes
@@ -120,7 +120,7 @@ Name[id]=Mode Tampilan
Name[it]=Viste
Name[ja]=表示モード
Name[ko]=보기 모드
-Name[lt]=Rodymo būdai
+Name[lt]=Rodinio veiksenos
Name[ml]=അവതരണ ദശകള്‍
Name[nb]=Visningsmåter
Name[nl]=Weergavemodi
@@ -165,7 +165,7 @@ Comment[id]=Konfigurasikan mode tampilan pengelola file
Comment[it]=Configura le viste del gestore dei file
Comment[ja]=ファイルマネージャの表示モードを設定します
Comment[ko]=파일 관리자 보기 모드 설정
-Comment[lt]=Failų tvarkyklės rodymo būdų konfigūravimas
+Comment[lt]=Konfigūruoti failų tvarkytuvės rodinio veiksenas
Comment[ml]=ഫയല്‍ മാനേജറിന്റെ അവതരണ ദശകള്‍ ക്രമീകരിയ്ക്കുക
Comment[nb]=Tilpass filbehandlerens visningsmåter
Comment[nl]=Bestandsbeheerderweergavemodussen configureren
@@ -211,7 +211,7 @@ 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ų tvarkyklė
+X-KDE-Keywords[lt]=failų tvarkytuvė
X-KDE-Keywords[ml]=ഫയൽ മാനേജർ
X-KDE-Keywords[nb]=filbehandler
X-KDE-Keywords[nl]=bestandsbeheerder
diff --git a/src/settings/services/servicemenuinstaller/servicemenuinstaller.cpp b/src/settings/services/servicemenuinstaller/servicemenuinstaller.cpp
index 037874539..1144a50b8 100644
--- a/src/settings/services/servicemenuinstaller/servicemenuinstaller.cpp
+++ b/src/settings/services/servicemenuinstaller/servicemenuinstaller.cpp
@@ -24,6 +24,7 @@
#include <QDir>
#include <QDirIterator>
#include <QCommandLineParser>
+#include <QMimeDatabase>
#include <KLocalizedString>
@@ -42,41 +43,6 @@ Q_NORETURN void fail(const QString &str)
exit(1);
}
-bool evaluateShell(const QString &program, const QStringList &arguments, QString &output, QString &errorText)
-{
- QProcess process;
- process.start(program, arguments, QIODevice::ReadOnly);
- if (!process.waitForStarted()) {
- fail(i18n("Failed to run process: %1 %2", program, arguments.join(" ")));
- }
-
- if (!process.waitForFinished()) {
- fail(i18n("Process did not finish in reasonable time: %1 %2", program, arguments.join(" ")));
- }
-
- const auto stdoutResult = QString::fromUtf8(process.readAllStandardOutput()).trimmed();
- const auto stderrResult = QString::fromUtf8(process.readAllStandardError()).trimmed();
-
- if (process.exitStatus() == QProcess::NormalExit && process.exitCode() == 0) {
- output = stdoutResult;
- return true;
- } else {
- errorText = stderrResult + stdoutResult;
- return false;
- }
-}
-
-QString mimeType(const QString &path)
-{
- QString result;
- QString errorText;
- if (evaluateShell("xdg-mime", QStringList{"query", "filetype", path}, result, errorText)) {
- return result;
- } else {
- fail(i18n("Failed to run xdg-mime %1: %2", path, errorText));
- }
-}
-
QString getServiceMenusDir()
{
const QString dataLocation = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation);
@@ -114,7 +80,7 @@ void runUncompress(const QString &inputPath, const QString &outputPath) {
"multipart/x-zip"},
UncompressCommand{"unzip", QStringList{}, QStringList{"-d"}}});
- const auto mime = mimeType(inputPath);
+ const auto mime = QMimeDatabase().mimeTypeForFile(inputPath).name();
UncompressCommand command{};
for (const auto &pair : mimeTypeToCommand) {
diff --git a/src/settings/services/servicessettingspage.cpp b/src/settings/services/servicessettingspage.cpp
index ff00ca177..83672b556 100644
--- a/src/settings/services/servicessettingspage.cpp
+++ b/src/settings/services/servicessettingspage.cpp
@@ -222,7 +222,7 @@ void ServicesSettingsPage::loadServices()
// Load JSON-based plugins that implement the KFileItemActionPlugin interface
const auto jsonPlugins = KPluginLoader::findPlugins(QStringLiteral("kf5/kfileitemaction"), [](const KPluginMetaData& metaData) {
- return metaData.serviceTypes().contains(QStringLiteral("KFileItemAction/Plugin"));
+ return metaData.serviceTypes().contains(QLatin1String("KFileItemAction/Plugin"));
});
foreach (const auto& jsonMetadata, jsonPlugins) {
generated by cgit v1.3 (git 2.53.0) at 2026-04-28 08:57:39 +0000