From 13258e00c562cdd7aa1f812fffbf5b5edd095828 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 23 May 2019 07:22:07 +0200 Subject: GIT_SILENT made messages (after extraction) --- src/org.kde.dolphin.appdata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org.kde.dolphin.appdata.xml b/src/org.kde.dolphin.appdata.xml index d850b0916..011bad45f 100644 --- a/src/org.kde.dolphin.appdata.xml +++ b/src/org.kde.dolphin.appdata.xml @@ -453,7 +453,7 @@
  • תמיכה בביטול וביצוע חוזר
  • Visszavonás/ismétlés támogatás
  • Supporto de annulla/reface
  • -
  • Dukungan takjadi/jadilagi
  • +
  • Dukungan urungkan/lanjurkan
  • Supporto di annulla/rifai
  • 실행 취소/다시 실행 지원
  • Støtte for angring/omgjøring
  • -- cgit v1.3 From 73e6d074e69ca7d16d8deb9b6eec0a685230e53b Mon Sep 17 00:00:00 2001 From: Christoph Feck Date: Fri, 31 May 2019 12:26:13 +0200 Subject: GIT_SILENT Upgrade KDE Applications version to 19.04.2. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1d8c46c57..56e00749e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0) # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "19") set (KDE_APPLICATIONS_VERSION_MINOR "04") -set (KDE_APPLICATIONS_VERSION_MICRO "1") +set (KDE_APPLICATIONS_VERSION_MICRO "2") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") project(Dolphin VERSION ${KDE_APPLICATIONS_VERSION}) -- cgit v1.3 From c43165a1c42f623a5b183c84083633df9cf35e93 Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik Date: Tue, 4 Jun 2019 08:58:28 +0200 Subject: [Places Panel] Pass iconName to KFilePlaceEditDialog Ensures that editing an entry with a custom icon doesn't have its icon discarded. Differential Revision: https://phabricator.kde.org/D21558 --- src/panels/places/placespanel.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp index 224eb0c64..4e99daf7a 100644 --- a/src/panels/places/placespanel.cpp +++ b/src/panels/places/placespanel.cpp @@ -490,9 +490,10 @@ void PlacesPanel::editEntry(int index) QHash data = m_model->data(index); const QUrl url = data.value("url").toUrl(); const QString text = data.value("text").toString(); + const QString iconName = data.value("iconName").toString(); const bool applicationLocal = !data.value("applicationName").toString().isEmpty(); - QPointer dialog = new KFilePlaceEditDialog(true, url, text, QString(), true, applicationLocal, KIconLoader::SizeMedium, this); + QPointer dialog = new KFilePlaceEditDialog(true, url, text, iconName, true, applicationLocal, KIconLoader::SizeMedium, this); if (dialog->exec() == QDialog::Accepted) { PlacesItem* oldItem = m_model->placesItem(index); if (oldItem) { -- cgit v1.3