diff -Nru kiconthemes-5.43.0/CMakeLists.txt kiconthemes-5.44.0/CMakeLists.txt --- kiconthemes-5.43.0/CMakeLists.txt 2018-02-05 12:00:27.000000000 +0000 +++ kiconthemes-5.44.0/CMakeLists.txt 2018-03-03 10:04:07.000000000 +0000 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.43.0") # handled by release scripts -set(KF5_DEP_VERSION "5.43.0") # handled by release scripts +set(KF5_VERSION "5.44.0") # handled by release scripts +set(KF5_DEP_VERSION "5.44.0") # handled by release scripts project(KIconThemes VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.43.0 NO_MODULE) +find_package(ECM 5.44.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules") feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -Nru kiconthemes-5.43.0/debian/changelog kiconthemes-5.44.0/debian/changelog --- kiconthemes-5.43.0/debian/changelog 2018-02-11 11:15:20.000000000 +0000 +++ kiconthemes-5.44.0/debian/changelog 2018-03-12 19:57:44.000000000 +0000 @@ -1,3 +1,9 @@ +kiconthemes (5.44.0-0ubuntu1) bionic; urgency=medium + + * New upstream release (5.44.0) + + -- Rik Mills Mon, 12 Mar 2018 19:57:44 +0000 + kiconthemes (5.43.0-0ubuntu1) bionic; urgency=medium * New upstream release (5.43.0) diff -Nru kiconthemes-5.43.0/debian/control kiconthemes-5.44.0/debian/control --- kiconthemes-5.43.0/debian/control 2018-02-11 11:15:20.000000000 +0000 +++ kiconthemes-5.44.0/debian/control 2018-03-12 19:57:44.000000000 +0000 @@ -5,13 +5,13 @@ Uploaders: Maximiliano Curia Build-Depends: cmake (>= 2.8.12), debhelper (>= 9), - extra-cmake-modules (>= 5.43.0~), - libkf5archive-dev (>= 5.43.0~), - libkf5configwidgets-dev (>= 5.43.0~), - libkf5coreaddons-dev (>= 5.43.0~), - libkf5i18n-dev (>= 5.43.0~), - libkf5itemviews-dev (>= 5.43.0~), - libkf5widgetsaddons-dev (>= 5.43.0~), + extra-cmake-modules (>= 5.44.0~), + libkf5archive-dev (>= 5.44.0~), + libkf5configwidgets-dev (>= 5.44.0~), + libkf5coreaddons-dev (>= 5.44.0~), + libkf5i18n-dev (>= 5.44.0~), + libkf5itemviews-dev (>= 5.44.0~), + libkf5widgetsaddons-dev (>= 5.44.0~), libqt5svg5-dev (>= 5.6.1~), pkg-kde-tools (>= 0.15.15ubuntu1~), qtbase5-dev (>= 5.6.1~) @@ -42,11 +42,11 @@ Package: libkf5iconthemes-dev Architecture: any Section: libdevel -Depends: libkf5configwidgets-dev (>= 5.43.0~), - libkf5i18n-dev (>= 5.43.0~), +Depends: libkf5configwidgets-dev (>= 5.44.0~), + libkf5i18n-dev (>= 5.44.0~), libkf5iconthemes5 (= ${binary:Version}), - libkf5itemviews-dev (>= 5.43.0~), - libkf5widgetsaddons-dev (>= 5.43.0~), + libkf5itemviews-dev (>= 5.44.0~), + libkf5widgetsaddons-dev (>= 5.44.0~), qtbase5-dev (>= 5.6.1~), ${misc:Depends} Description: development files for kiconthemes diff -Nru kiconthemes-5.43.0/po/id/kiconthemes5.po kiconthemes-5.44.0/po/id/kiconthemes5.po --- kiconthemes-5.43.0/po/id/kiconthemes5.po 2018-02-05 12:00:27.000000000 +0000 +++ kiconthemes-5.44.0/po/id/kiconthemes5.po 2018-03-03 10:04:07.000000000 +0000 @@ -7,7 +7,7 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2016-11-19 20:11+0100\n" -"PO-Revision-Date: 2018-01-27 07:05+0700\n" +"PO-Revision-Date: 2018-03-02 21:29+0700\n" "Last-Translator: Wantoyo \n" "Language-Team: Indonesian \n" "Language: id\n" @@ -105,4 +105,4 @@ #: kicondialog.cpp:602 #, kde-format msgid "*.png *.xpm *.svg *.svgz|Icon Files (*.png *.xpm *.svg *.svgz)" -msgstr "*.png *.xpm *.svg *.svgz|File Ikon (*.png *.xpm *.svg *.svgz)" +msgstr "*.png *.xpm *.svg *.svgz|Fail Ikon (*.png *.xpm *.svg *.svgz)" diff -Nru kiconthemes-5.43.0/po/zh_CN/kiconthemes5.po kiconthemes-5.44.0/po/zh_CN/kiconthemes5.po --- kiconthemes-5.43.0/po/zh_CN/kiconthemes5.po 2018-02-05 12:00:27.000000000 +0000 +++ kiconthemes-5.44.0/po/zh_CN/kiconthemes5.po 2018-03-03 10:04:07.000000000 +0000 @@ -17,7 +17,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2016-11-19 20:11+0100\n" -"PO-Revision-Date: 2018-02-01 07:11-0500\n" +"PO-Revision-Date: 2018-02-28 02:23-0500\n" "Last-Translator: guoyunhebrave \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -Nru kiconthemes-5.43.0/src/kiconloader.cpp kiconthemes-5.44.0/src/kiconloader.cpp --- kiconthemes-5.43.0/src/kiconloader.cpp 2018-02-05 12:00:27.000000000 +0000 +++ kiconthemes-5.44.0/src/kiconloader.cpp 2018-03-03 10:04:07.000000000 +0000 @@ -508,33 +508,39 @@ //TODO: should we pass in the kstate? it results in a slower // path, and perhaps emblems should remain in the default state // anyways? - const QPixmap pixmap = iconLoader->loadIcon(overlay, group, overlaySize, state, QStringList(), nullptr, true); + QPixmap pixmap = iconLoader->loadIcon(overlay, group, overlaySize, state, QStringList(), nullptr, true); if (pixmap.isNull()) { continue; } + // match the emblem's devicePixelRatio to the original pixmap's + pixmap.setDevicePixelRatio(pix.devicePixelRatio()); + const int margin = 2 * pixmap.devicePixelRatio(); + QPoint startPoint; switch (count) { case 0: // bottom left corner - startPoint = QPoint(2, height - overlaySize - 2); + startPoint = QPoint(margin, height - overlaySize - margin); break; case 1: // bottom right corner - startPoint = QPoint(width - overlaySize - 2, - height - overlaySize - 2); + startPoint = QPoint(width - overlaySize - margin, + height - overlaySize - margin); break; case 2: // top right corner - startPoint = QPoint(width - overlaySize - 2, 2); + startPoint = QPoint(width - overlaySize - margin, margin); break; case 3: // top left corner - startPoint = QPoint(2, 2); + startPoint = QPoint(margin, margin); break; } + startPoint /= pix.devicePixelRatio(); + painter.drawPixmap(startPoint, pixmap); ++count;