Merge branch 'Plasma/5.12' into Plasma/5.14

applets/batterymonitor/package/metadata.desktop

@@ -16,7 +16,7 @@ Name[fr]=Batterie et luminosité
 Name[gl]=Batería e brillo
 Name[he]=סוללה ובהירות
 Name[hu]=Akkumulátor és fényerő
-Name[id]=Battery and Brightness
+Name[id]=Baterai dan Kecerahan
 Name[is]=Rafhlaða og skjábirta
 Name[it]=Batteria e luminosità
 Name[ja]=バッテリーと明るさ

dataengines/statusnotifieritem/statusnotifieritemsource.cpp

@@ -291,7 +291,7 @@ void StatusNotifierItemSource::refreshCallback(QDBusPendingCallWatcher *call)
             if (image.isEmpty()) {
                 iconName = properties[QStringLiteral("IconName")].toString();
                 if (!iconName.isEmpty()) {
-                    icon = QIcon(new KIconEngine(iconName, iconLoader()));
+                    icon = QIcon(new KIconEngine(iconName, iconLoader(), overlayNames));
 
                     if (overlayNames.isEmpty() && !overlay.isNull()) {
                         overlayIcon(&icon, &overlay);
@@ -317,7 +317,7 @@ void StatusNotifierItemSource::refreshCallback(QDBusPendingCallWatcher *call)
                 QString iconName = properties[QStringLiteral("AttentionIconName")].toString();
                 setData(QStringLiteral("AttentionIconName"), iconName);
                 if (!iconName.isEmpty()) {
-                    attentionIcon = QIcon(new KIconEngine(iconName, iconLoader()));
+                    attentionIcon = QIcon(new KIconEngine(iconName, iconLoader(), overlayNames));
 
                     if (overlayNames.isEmpty() && !overlay.isNull()) {
                         overlayIcon(&attentionIcon, &overlay);

dataengines/weather/ions/bbcukmet/ion_bbcukmet.cpp

@@ -749,7 +749,8 @@ bool UKMETIon::readObservationXMLData(const QString& source, QXmlStreamReader& x
             (data.observationDateTime.isValid() &&
             (!qIsNaN(data.stationLatitude) && !qIsNaN(data.stationLongitude)));
         if (canCalculateElevation) {
-            data.solarDataTimeEngineSourceName = QStringLiteral("Local|Solar|Latitude=%1|Longitude=%2|DateTime=%3")
+            data.solarDataTimeEngineSourceName = QStringLiteral("%1|Solar|Latitude=%2|Longitude=%3|DateTime=%4")
+                .arg(QString::fromUtf8(data.observationDateTime.timeZone().id()))
                 .arg(data.stationLatitude)
                 .arg(data.stationLongitude)
                 .arg(data.observationDateTime.toString(Qt::ISODate));
@@ -848,7 +849,11 @@ void UKMETIon::parseFiveDayForecast(const QString& source, QXmlStreamReader& xml
 
             const QString summaryLC = summary.toLower();
             forecast->period = period;
-            forecast->iconName = getWeatherIcon(dayIcons(), summaryLC);
+            if (forecast->period == QLatin1String("Tonight")) {
+                forecast->iconName = getWeatherIcon(nightIcons(), summaryLC);
+            } else {
+                forecast->iconName = getWeatherIcon(dayIcons(), summaryLC);
+            }
             // db uses original strings normalized to lowercase, but we prefer the unnormalized if without translation
             const QString summaryTranslated = i18nc("weather forecast", summaryLC.toUtf8().data());
             forecast->summary = (summaryTranslated != summaryLC) ? summaryTranslated : summary;

dataengines/weather/ions/data/noaa_i18n.dat

@@ -175,6 +175,7 @@ weather condition|Partly Cloudy
 weather condition|Partly Cloudy and Breezy
 weather condition|Partly Cloudy and Windy
 weather condition|Partly Cloudy with Haze
+weather condition|Patchy Freezing Fog
 weather condition|Patches of Fog
 weather condition|Patches of Fog in Vicinity
 weather condition|Rain Fog
@@ -266,26 +267,34 @@ weather forecast|Volcanic Ash
 weather forecast|Water Spout
 weather forecast|Freezing Spray
 weather forecast|Frost
+weather forecast|Slight Chance Thunderstorms
 weather forecast|Chance Thunderstorms
 weather forecast|Thunderstorms Likely
 weather forecast|Thunderstorms
 weather forecast|Severe Tstms
+weather forecast|Slight Chance Snow/Sleet
 weather forecast|Chance Snow/Sleet
 weather forecast|Snow/Sleet Likely
 weather forecast|Snow/Sleet
+weather forecast|Slight Chance Rain/Sleet
 weather forecast|Chance Rain/Sleet
 weather forecast|Rain/Sleet Likely
 weather forecast|Rain/Sleet
+weather forecast|Slight Chance Rain/Freezing Rain
 weather forecast|Chance Rain/Freezing Rain
 weather forecast|Rain/Freezing Rain Likely
 weather forecast|Rain/Freezing Rain
+weather forecast|Wintry Mix Likely
 weather forecast|Wintry Mix
+weather forecast|Slight Chance Freezing Drizzle
 weather forecast|Chance Freezing Drizzle
 weather forecast|Freezing Drizzle Likely
 weather forecast|Freezing Drizzle
+weather forecast|Slight Chance Freezing Rain
 weather forecast|Chance Freezing Rain
 weather forecast|Freezing Rain Likely
 weather forecast|Freezing Rain
+weather forecast|Slight Chance Rain/Snow
 weather forecast|Chance Rain/Snow
 weather forecast|Rain/Snow Likely
 weather forecast|Rain/Snow
@@ -294,6 +303,7 @@ weather forecast|Chance Snow
 weather forecast|Snow Likely
 weather forecast|Snow
 weather forecast|Heavy Snow
+weather forecast|Slight Chance Flurries
 weather forecast|Chance Flurries
 weather forecast|Flurries Likely
 weather forecast|Flurries
@@ -301,6 +311,7 @@ weather forecast|Slight Chance Snow Showers
 weather forecast|Chance Snow Showers
 weather forecast|Snow Showers Likely
 weather forecast|Snow Showers
+weather forecast|Slight Chance Drizzle
 weather forecast|Chance Drizzle
 weather forecast|Drizzle Likely
 weather forecast|Drizzle
@@ -309,6 +320,7 @@ weather forecast|Chance Rain
 weather forecast|Rain Likely
 weather forecast|Rain
 weather forecast|Heavy Rain
+weather forecast|Slight Chance Rain Showers
 weather forecast|Chance Rain Showers
 weather forecast|Rain Showers Likely
 weather forecast|Rain Showers
@@ -342,4 +354,3 @@ weather forecast|Decreasing Clouds
 weather forecast|Becoming Sunny
 weather forecast|Clear
 weather forecast|Mostly Clear
-weather forecast|Slight Chance Thunderstorms

dataengines/weather/ions/envcan/ion_envcan.cpp

@@ -245,10 +245,10 @@ QMap<QString, IonInterface::ConditionIcons> EnvCanadaIon::setupForecastIconMappi
         { QStringLiteral("ice fog"), Mist },
         { QStringLiteral("ice fog developing"), Mist },
         { QStringLiteral("ice fog dissipating"), Mist },
-        { QStringLiteral("ice pellet"), Hail },
+        { QStringLiteral("ice pellets"), Hail },
-        { QStringLiteral("ice pellet mixed with freezing rain"), Hail },
+        { QStringLiteral("ice pellets mixed with freezing rain"), Hail },
-        { QStringLiteral("ice pellet mixed with snow"), Hail },
+        { QStringLiteral("ice pellets mixed with snow"), Hail },
-        { QStringLiteral("ice pellet or snow"), RainSnow },
+        { QStringLiteral("ice pellets or snow"), RainSnow },
         { QStringLiteral("light snow"), LightSnow },
         { QStringLiteral("light snow and blizzard"), LightSnow },
         { QStringLiteral("light snow and blizzard and blowing snow"), Snow },
@@ -280,11 +280,11 @@ QMap<QString, IonInterface::ConditionIcons> EnvCanadaIon::setupForecastIconMappi
         { QStringLiteral("periods of freezing rain or ice pellets"), FreezingRain },
         { QStringLiteral("periods of freezing rain or rain"), FreezingRain },
         { QStringLiteral("periods of freezing rain or snow"), FreezingRain },
-        { QStringLiteral("periods of ice pellet"), Hail },
+        { QStringLiteral("periods of ice pellets"), Hail },
-        { QStringLiteral("periods of ice pellet mixed with freezing rain"), Hail },
+        { QStringLiteral("periods of ice pellets mixed with freezing rain"), Hail },
-        { QStringLiteral("periods of ice pellet mixed with snow"), Hail },
+        { QStringLiteral("periods of ice pellets mixed with snow"), Hail },
-        { QStringLiteral("periods of ice pellet or freezing rain"), Hail },
+        { QStringLiteral("periods of ice pellets or freezing rain"), Hail },
-        { QStringLiteral("periods of ice pellet or snow"), Hail },
+        { QStringLiteral("periods of ice pellets or snow"), Hail },
         { QStringLiteral("periods of light snow"), LightSnow },
         { QStringLiteral("periods of light snow and blizzard"), Snow },
         { QStringLiteral("periods of light snow and blizzard and blowing snow"), Snow },
@@ -739,7 +739,8 @@ bool EnvCanadaIon::readXMLData(const QString& source, QXmlStreamReader& xml)
             (data.observationDateTime.isValid() &&
             (!qIsNaN(data.stationLatitude) && !qIsNaN(data.stationLongitude)));
         if (canCalculateElevation) {
-            data.solarDataTimeEngineSourceName = QStringLiteral("Local|Solar|Latitude=%1|Longitude=%2|DateTime=%3")
+            data.solarDataTimeEngineSourceName = QStringLiteral("%1|Solar|Latitude=%2|Longitude=%3|DateTime=%4")
+                .arg(QString::fromUtf8(data.observationDateTime.timeZone().id()))
                 .arg(data.stationLatitude)
                 .arg(data.stationLongitude)
                 .arg(data.observationDateTime.toString(Qt::ISODate));

dataengines/weather/ions/noaa/ion_noaa.cpp

@@ -491,7 +491,8 @@ bool NOAAIon::readXMLData(const QString& source, QXmlStreamReader& xml)
             (data.observationDateTime.isValid() &&
             (!qIsNaN(data.stationLatitude) && !qIsNaN(data.stationLongitude)));
         if (canCalculateElevation) {
-            data.solarDataTimeEngineSourceName = QStringLiteral("Local|Solar|Latitude=%1|Longitude=%2|DateTime=%3")
+            data.solarDataTimeEngineSourceName = QStringLiteral("%1|Solar|Latitude=%2|Longitude=%3|DateTime=%4")
+                .arg(QString::fromUtf8(data.observationDateTime.timeZone().id()))
                 .arg(data.stationLatitude)
                 .arg(data.stationLongitude)
                 .arg(data.observationDateTime.toString(Qt::ISODate));

kioslave/applications/kio_applications.cpp

@@ -193,6 +193,5 @@ void ApplicationsProtocol::listDir(const QUrl& url)
     }
 
     totalSize(count);
-    listEntry(entry);
     finished();
 }

plasma-windowed/CMakeLists.txt

@@ -18,6 +18,7 @@ target_link_libraries(
     KF5::I18n
     KF5::IconThemes
     KF5::XmlGui
+    KF5::QuickAddons
     KF5::PlasmaQuick
     KF5::Plasma
     KF5::DBusAddons

plasma-windowed/main.cpp

@@ -23,6 +23,7 @@
 #include <qcommandlineparser.h>
 #include <qcommandlineoption.h>
 
+#include <KQuickAddons/QtQuickSettings>
 #include <KDBusService>
 #include <KLocalizedString>
 
@@ -41,6 +42,8 @@ int main(int argc, char **argv)
 
     KDBusService service(KDBusService::Unique);
 
+    KQuickAddons::QtQuickSettings::init();
+
     QCommandLineParser parser;
     parser.setApplicationDescription(i18n("Plasma Windowed"));
     parser.addOption(QCommandLineOption(QStringLiteral("statusnotifier"), i18n("Makes the plasmoid stay alive in the Notification Area, even when the window is closed.")));