Make Tooltips more legible. Fix Firefox media info

Author: alexankitty

package/contents/config/config.qml

@@ -24,11 +24,4 @@ ConfigModel {
         icon: "preferences-desktop-navigation"
         source: "ConfigIndicators.qml"
     }
-    property int test: {
-        for(var key in parent){
-            console.log(key)
-            console.log(parent[key])
-        }
-        return 0
-    }
 }

package/contents/ui/PlayerController.qml

@@ -21,8 +21,9 @@ RowLayout {
     readonly property string mprisSourceName: mpris2Source.sourceNameForLauncherUrl(launcherUrl, appPid)
     readonly property var playerData: mprisSourceName != "" ? mpris2Source.data[mprisSourceName] : 0
     readonly property bool playing: !!(playerData.PlaybackStatus === "Playing")
+    property string parentTitle
 
-    readonly property var currentMetadata: !!playerData ? playerData.Metadata : ""
+    property var currentMetadata: !!playerData ? playerData.Metadata : ""
 
     readonly property string track: {
         const xesamTitle = currentMetadata["xesam:title"]
@@ -68,6 +69,7 @@ RowLayout {
                 wrapMode: Text.NoWrap
                 elide: parent.state ? Text.ElideNone : Text.ElideRight
                 text: track
+                visible: !parentTitle.includes(track)
                 textFormat: Text.PlainText
             }
         }

package/contents/ui/Task.qml

@@ -377,10 +377,6 @@ MouseArea {
             leftMargin: ((inPopup || tasks.vertical) && taskList.columns > 1) ? LayoutManager.iconMargin : 0
             rightMargin: ((inPopup || tasks.vertical) && taskList.columns > 1) ? LayoutManager.iconMargin : 0           
         }
-        property int test: {
-            console.log(task.state);
-            return 0
-        }
         imagePath: plasmoid.configuration.disableButtonSvg ? "" : "widgets/tasks"
         enabledBorders: plasmoid.configuration.useBorders ? 1 | 2 | 4 | 8 : 0
         property bool isHovered: task.highlighted && plasmoid.configuration.taskHoverEffect

package/contents/ui/ToolTipInstance.qml

@@ -39,12 +39,7 @@ ColumnLayout {
         } else {
             text = displayParent;
         }
-
-        // KWin appends increasing integers in between pointy brackets to otherwise equal window titles.
-        // In this case save <#number> as counter and delete it at the end of text.
-        text = `${(text.match(/.*(?=\s*(—|-))/) || [""])[0]}${(text.match(/<\d+>/) || [""]).pop()}`;
-
-        // In case the window title had only redundant information (i.e. appName), text is now empty.
+        // KWin only appends brackets to names that are duplicated, therefore this feature has been removed as unnecessary and probably self-obsoleted, and only worked in reverse.
         // Add a hyphen to indicate that and avoid empty space.
         if (text === "") {
             text = "—";
@@ -72,28 +67,29 @@ ColumnLayout {
         // all textlabels
         ColumnLayout {
             spacing: 0
-            // app name
+            
+
+            // window title
             PlasmaExtras.Heading {
-                id: appNameHeading
+                id: winTitle
                 level: 3
                 maximumLineCount: 1
                 lineHeight: isWin ? 1 : appNameHeading.lineHeight
                 Layout.fillWidth: true
                 elide: Text.ElideRight
-                text: appName
-                opacity: flatIndex == 0
-                visible: text.length !== 0
+                text: title
+                visible: title.length !== 0 
                 textFormat: Text.PlainText
             }
-            // window title
+            // app name
             PlasmaComponents3.Label {
-                id: winTitle
+                id: appNameHeading
                 maximumLineCount: 1
                 Layout.fillWidth: true
                 elide: Text.ElideRight
-                text: titleIncludesTrack ? "" : title
+                text: appName
                 opacity: 0.75
-                visible: title.length !== 0 && title !== appNameHeading.text
+                visible: text.length !== 0 && appNameHeading.text !== title
                 textFormat: Text.PlainText
             }
             // subtext
@@ -102,7 +98,7 @@ ColumnLayout {
                 maximumLineCount: 1
                 Layout.fillWidth: true
                 elide: Text.ElideRight
-                text: isWin ? generateSubText() : ""
+                text: generateSubText()
                 opacity: 0.6
                 visible: text.length !== 0 && text !== appNameHeading.text
                 textFormat: Text.PlainText
@@ -253,14 +249,13 @@ ColumnLayout {
             // in all other cases we can safely show the album art without checking the title
             readonly property bool available: (status === Image.Ready || status === Image.Loading)
                 && (!(isGroup || backend.applicationCategories(launcherUrl).includes("WebBrowser")) || titleIncludesTrack)
-
             anchors.fill: hoverHandler
             // Indent by one pixel to make sure we never cover up the entire highlight
             anchors.margins: 1
             sourceSize: Qt.size(parent.width, parent.height)
 
             asynchronous: true
-            source: playerController.item ? playerController.item.albumArt : ""
+            source: playerController.item ? playerController.item.albumArt.split("?")[0] : ""
             fillMode: Image.PreserveAspectFit
             visible: available
         }
@@ -284,6 +279,11 @@ ColumnLayout {
         active: hasPlayer && flatIndex !== -1 // Avoid loading when the instance is going to be destroyed
         asynchronous: true
         visible: active
+        Binding {
+            target: playerController.item
+            property: "parentTitle"
+            value: title
+        }
         Layout.fillWidth: true
         Layout.maximumWidth: header.Layout.maximumWidth
         Layout.leftMargin: header.Layout.margins

package/contents/ui/main.qml

@@ -216,6 +216,7 @@ MouseArea {
     PlasmaCore.DataSource {
         id: mpris2Source
         engine: "mpris2"
+        interval: 100 // update ondemand
         connectedSources: sources
         onSourceAdded: {
             connectSource(source);
@@ -243,12 +244,18 @@ MouseArea {
                 if (source === "@multiplex") {
                     continue;
                 }
-
+                
                 var sourceData = data[source];
-                if (!sourceData) {
+                if (!sourceData && mpris2Source.data[source]['Metadata']["xesam:artist"] != "" ) {
                     continue;
                 }
-
+                if(desktopFileName === "firefox"){//Hack to replace firefox with the plasma browser integration if it's availalbe.
+                    for (var x = 0, length = connectedSources.length; x < length; ++x) {
+                        if(connectedSources[x] === "plasma-browser-integration"){
+                            return connectedSources[x]
+                        }
+                    }
+                }
                 /**
                  * If the task is in a group, we can't use desktopFileName to match the task.
                  * but in case PID match fails, use the match result from desktopFileName.