Merge branch 'v0.6' into master

app/dockcorona.cpp

@@ -33,6 +33,7 @@
 #include <QDBusConnection>
 #include <QDebug>
 #include <QDesktopWidget>
+#include <QFontDatabase>
 #include <QQmlContext>
 
 #include <Plasma>
@@ -71,6 +72,8 @@ DockCorona::DockCorona(QObject *parent)
 
     setKPackage(package);
     qmlRegisterTypes();
+    QFontDatabase::addApplicationFont(kPackage().filePath("tangerineFont"));
+
     connect(this, &Corona::containmentAdded, this, &DockCorona::addDock);
 
     if (m_activityConsumer && (m_activityConsumer->serviceStatus() == KActivities::Consumer::Running)) {

app/packageplugins/shell/dockpackage.cpp

@@ -45,6 +45,7 @@ void DockPackage::initPackage(KPackage::Package *package)
     //Configuration
     package->addFileDefinition("lattedockconfigurationui", QStringLiteral("configuration/LatteDockConfiguration.qml"), i18n("Dock configuration UI"));
     package->addFileDefinition("configmodel", QStringLiteral("configuration/config.qml"), i18n("Config model"));
+    package->addFileDefinition("tangerineFont", QStringLiteral("fonts/tangerine.ttf"), i18n("Tangerine Font"));
     package->setFallbackPackage(fallback);
     qDebug() << "package is valid" << package->isValid();
 }
@@ -53,9 +54,9 @@ void DockPackage::pathChanged(KPackage::Package *package)
 {
     if (!package->metadata().isValid())
         return;
-        
+
     const QString pluginName = package->metadata().pluginId();
-    
+
     if (!pluginName.isEmpty() && pluginName != "org.kde.latte.shell") {
         auto fallback = KPackage::PackageLoader::self()->loadPackage("Plasma/Shell", "org.kde.latte.shell");
         package->setFallbackPackage(fallback);

plasmoid/contents/ui/main.qml

@@ -502,7 +502,9 @@ Item {
             //! otherwise it crashes.
             //! frameworks 5.29.0 provide id 335104
             //! work only after Plasma 5.9 and frameworks 5.29
-            if (Latte.WindowSystem.frameworksVersion >= 335104) {
+            //! + added a check for groupDialog also when it is present
+            //!   in plasma 5.8 (that was introduced after 5.8.5)
+            if (Latte.WindowSystem.frameworksVersion >= 335104 || (groupDialog !== undefined)) {
                 groupDialog = groupDialogGhost;
             }
         }

shell/contents/configuration/LatteDockConfiguration.qml

@@ -46,12 +46,6 @@ PlasmaCore.FrameSvgItem {
 
     property bool panelIsVertical: plasmoid.formFactor === PlasmaCore.Types.Vertical
 
-    FontLoader {
-        id: tangerineFont
-        name: "Tangerine"
-        source: "../fonts/tangerine.ttf"
-    }
-
     PlasmaComponents.ToolButton {
         id: pinButton
 
@@ -130,7 +124,7 @@ PlasmaCore.FrameSvgItem {
                     height: logo.height
                     verticalAlignment: Text.AlignVCenter
                     text: "atte"
-                    font.family: tangerineFont.name
+                    font.family: "Tangerine"
                     font.pointSize: 2 * theme.defaultFont.pointSize
                     font.italic: true