Clean up/formatting; Tracklist shuffle fix; Track tooltip fix

noee · Jan 17, 2019 · c73531a · c73531a
1 parent fd72443
commit c73531a
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 14 deletions.
diff --git a/plasmoid/contents/ui/FullView.qml b/plasmoid/contents/ui/FullView.qml
@@ -8,6 +8,7 @@ import org.kde.plasma.plasmoid 2.0
 import org.kde.kirigami 2.4 as Kirigami
 import Qt.labs.platform 1.0
 
+import 'helpers/utils.js' as Utils
 import 'helpers'
 import 'models'
 import 'controls'
@@ -859,7 +860,7 @@ Item {
                     MenuItem {
                         text: "Shuffle Playing Now"
                         enabled: !trackView.searchMode
-                        onTriggered: mcws.setShuffle(zoneView.currentIndex, 'reshuffle')
+                        onTriggered: zoneView.currentPlayer.setShuffle('reshuffle')
                     }
                     MenuItem {
                         text: "Clear Playing Now"

diff --git a/plasmoid/contents/ui/McwsConnection.qml b/plasmoid/contents/ui/McwsConnection.qml
@@ -310,8 +310,9 @@ Item {
                                 zone.track = {}
                             }
                             trackKeyChanged(obj)
-                            debugLogger('Zone during trackChange', 'Obj: %1, Zone: %2'
-                                        .arg(obj.zonename).arg(zone.zonename))
+                            if (obj.zonename !== zone.zonename)
+                                debugLogger('Zone during trackChange', 'Obj: %1, Zone: %2'
+                                            .arg(obj.zonename).arg(zone.zonename))
                         }
 
                         // Next file info

diff --git a/plasmoid/contents/ui/helpers/LogWindow.qml b/plasmoid/contents/ui/helpers/LogWindow.qml
@@ -23,25 +23,30 @@ ApplicationWindow {
     property string windowTitle: ''
 
     header: RowLayout {
-        CheckBox {
-            id: autoScroll
-            checked: true
-            text: 'Auto Scroll'
-        }
         ToolButton {
             icon.name: 'format-align-vertical-top'
+            Layout.preferredHeight: units.iconSizes.medium
+            Layout.preferredWidth: units.iconSizes.medium
             onClicked: msgs.positionViewAtBeginning()
         }
         ToolButton {
             icon.name: 'format-align-vertical-bottom'
+            Layout.preferredHeight: units.iconSizes.medium
+            Layout.preferredWidth: units.iconSizes.medium
             onClicked: msgs.positionViewAtEnd()
         }
-
         Item {
             Layout.fillWidth: true
         }
+        CheckBox {
+            id: autoScroll
+            checked: true
+            text: 'Auto Scroll'
+        }
         ToolButton {
             icon.name: 'edit-clear'
+            Layout.preferredHeight: units.iconSizes.medium
+            Layout.preferredWidth: units.iconSizes.medium
             onClicked: msgModel.clear()
         }
     }
@@ -109,13 +114,15 @@ ApplicationWindow {
             width: parent.width
             Kirigami.BasicListItem {
                 text: title
+                separatorVisible: false
                 icon: iconString
                 textColor: type !== LoggerType.Info ? 'red' : 'green'
-                Label {
-                    text: message
-                    Layout.preferredWidth: parent.width/1.8
-                    wrapMode: Text.WrapAnywhere
-                }
+                onClicked: msgs.currentIndex = index
+            }
+            Label {
+                text: message
+                Layout.preferredWidth: parent.width/1.6
+                wrapMode: Text.WrapAnywhere
             }
         }
     }