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

List:       kde-commits
Subject:    [kde-workspace] plasma/generic/applets/devicenotifier/package/contents/ui: Port config to
From:       David Edmundson <kde () davidedmundson ! co ! uk>
Date:       2014-02-10 17:32:20
Message-ID: E1WCuiS-000444-DW () scm ! kde ! org
[Download RAW message or body]

Git commit a85bc3be20b5345d048c76e8402a6ee6af1bbf2a by David Edmundson.
Committed on 10/02/2014 at 17:32.
Pushed by davidedmundson into branch 'master'.

Port config to Plasmoid.configuration

Remove FIXME which appears to be fixed

M  +2    -24   plasma/generic/applets/devicenotifier/package/contents/ui/devicenotifier.qml


http://commits.kde.org/kde-workspace/a85bc3be20b5345d048c76e8402a6ee6af1bbf2a

diff --git a/plasma/generic/applets/devicenotifier/package/contents/ui/devicenotifier.qml \
b/plasma/generic/applets/devicenotifier/package/contents/ui/devicenotifier.qml index \
                e867791..579d742 100644
--- a/plasma/generic/applets/devicenotifier/package/contents/ui/devicenotifier.qml
+++ b/plasma/generic/applets/devicenotifier/package/contents/ui/devicenotifier.qml
@@ -128,30 +128,11 @@ Item {
     }
 
     Component.onCompleted: {
-        //plasmoid.addEventListener ('ConfigChanged', configChanged);
         if (sdSource.connectedSources.count == 0) {
             plasmoid.status = PlasmaCore.Types.PassiveStatus;
         }
     }
 
-    function configChanged()
-    {
-        var all = plasmoid.configuration.allDevices;
-        var removable = plasmoid.configuration.removableDevices;
-        if (all == true) {
-            devicesType = "all";
-            filterModel.filterRegExp = "";
-        } else if (removable == true) {
-            devicesType = "removable";
-            filterModel.filterRegExp = "true";
-        } else {
-            devicesType = "nonRemovable";
-            filterModel.filterRegExp = "false";
-        }
-        notifierDialog.currentIndex = -1;
-        notifierDialog.currentExpanded = -1;
-    }
-
     function expandDevice(udi)
     {
         if (hpSource.data[udi]["actions"].length > 1) {
@@ -239,11 +220,8 @@ Item {
                     }
                     filterRole: "Removable"
                     filterRegExp: {
-                        var all = Plasmoid.configuration.allDevices;
-                        var removable = Plasmoid.configuration.removableDevices;
-                        print("FIXME: Disabled reading from config due to crash");
-                        var all = false;
-                        var removable = true;
+                        var all = devicenotifier.Plasmoid.configuration.allDevices;
+                        var removable = \
devicenotifier.Plasmoid.configuration.removableDevices;  
                         if (all == true) {
                             devicesType = "all";


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