[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-workspace/mart/AppletAttached] plasma/generic/applets/systemtray/package/contents/ui: ditch the
From:       Marco Martin <notmart () gmail ! com>
Date:       2014-01-31 17:56:09
Message-ID: E1W9IK1-0006I7-SD () scm ! kde ! org
[Download RAW message or body]

Git commit 2bc047f120c9dd42b8fbbf6ae69532c3730f8f48 by Marco Martin.
Committed on 31/01/2014 at 17:44.
Pushed by mart into branch 'mart/AppletAttached'.

ditch the expandedstatusnotifieritem

M  +4    -1    plasma/generic/applets/systemtray/package/contents/ui/ExpandedRepresentation.qml
 M  +1    -6    plasma/generic/applets/systemtray/package/contents/ui/TaskDelegate.qml


http://commits.kde.org/kde-workspace/2bc047f120c9dd42b8fbbf6ae69532c3730f8f48

diff --git a/plasma/generic/applets/systemtray/package/contents/ui/ExpandedRepresentation.qml \
b/plasma/generic/applets/systemtray/package/contents/ui/ExpandedRepresentation.qml \
                index d6d81cc..87b00f1 100644
--- a/plasma/generic/applets/systemtray/package/contents/ui/ExpandedRepresentation.qml
                
+++ b/plasma/generic/applets/systemtray/package/contents/ui/ExpandedRepresentation.qml
 @@ -50,7 +50,10 @@ Item {
         }
         onClicked: {
             expandedItemContainer.clear();
-            root.expandedTask = null;
+            if (root.expandedTask) {
+                root.expandedTask.expanded = false;
+                root.expandedTask = null;
+            }
         }
     }
 
diff --git a/plasma/generic/applets/systemtray/package/contents/ui/TaskDelegate.qml \
b/plasma/generic/applets/systemtray/package/contents/ui/TaskDelegate.qml index \
                4ca778a..262d174 100644
--- a/plasma/generic/applets/systemtray/package/contents/ui/TaskDelegate.qml
+++ b/plasma/generic/applets/systemtray/package/contents/ui/TaskDelegate.qml
@@ -143,12 +143,7 @@ QtExtraComponents.MouseEventListener {
     Component.onCompleted: {
         if (taskType == SystemTray.Task.TypeStatusItem) {
             sniLoader.source = "StatusNotifierItem.qml";
-            var component = Qt.createComponent("ExpandedStatusNotifier.qml");
-            if (component.status == Component.Ready) {
-                expandedItem = component.createObject(taskItemContainer, {"x": 300, \
                "y": 300});
-            } else {
-                print("Error loading statusitem: " + component.errorString());
-            }
+
         } else if (taskItem != undefined) {
             sniLoader.source = "PlasmoidItem.qml";
             taskItem.parent = taskItemContainer;


[prev in list] [next in list] [prev in thread] [next in thread]