File 2000-applet.patch of Package bluedevil5

Overview Repositories Revisions Requests Users Attributes Meta

File 2000-applet.patch of Package bluedevil5

diff --git a/src/applet/package/contents/ui/FullRepresentation.qml b/src/applet/package/contents/ui/FullRepresentation.qml
index 2b8620982903cb225020440fa74b8f294a38ff18..891c384b5217531ccb0419fd670c03961f176b46 100644
--- a/src/applet/package/contents/ui/FullRepresentation.qml
+++ b/src/applet/package/contents/ui/FullRepresentation.qml
@@ -39,34 +39,6 @@ PlasmaExtras.Representation {
         }
     }
 
-    Action {
-        id: addBluetoothDeviceAction
-
-        enabled: root.emptyList
-
-        text: Plasmoid.action("addNewDevice").text
-        icon.name: "list-add"
-
-        onTriggered: Plasmoid.action("addNewDevice").trigger()
-    }
-
-    Action {
-        id: enableBluetoothAction
-
-        enabled: btManager.bluetoothBlocked
-
-        text: i18n("Enable")
-        icon.name: "preferences-system-bluetooth"
-
-        onTriggered: bluetoothApplet.toggleBluetooth()
-    }
-
-    header: Toolbar {
-        id: toolbar
-        visible: btManager.adapters.length > 0
-        focus: true
-    }
-
     PlasmaComponents3.ScrollView {
         id: scrollView
         anchors.fill: parent
@@ -154,18 +126,6 @@ PlasmaExtras.Representation {
                             return "";
                         }
                     }
-
-                    helpfulAction: {
-                        if (BluezQt.Manager.rfkill.state === BluezQt.Rfkill.Unknown) {
-                            return null;
-                        } else if (btManager.bluetoothBlocked) {
-                            return enableBluetoothAction;
-                        } else if (root.emptyList) {
-                            return addBluetoothDeviceAction;
-                        } else {
-                            return null;
-                        }
-                    }
                 }
             }
         }
diff --git a/src/applet/package/contents/ui/main.qml b/src/applet/package/contents/ui/main.qml
index 91db98eab9bdcbcb77336acfe9734fc33e7eb140..41e2f1f65c3e683fae489b0b95e4069511ddc953 100644
--- a/src/applet/package/contents/ui/main.qml
+++ b/src/applet/package/contents/ui/main.qml
@@ -143,8 +143,12 @@ Item {
         Plasmoid.setAction("addNewDevice", i18n("Add New Device…"), "list-add");
         Plasmoid.action("addNewDevice").visible = Qt.binding(() => !btManager.bluetoothBlocked);
 
+        plasmoid.setActionSeparator("sep1");
+        plasmoid.action("sep1").visible = Qt.binding(() => {
+            return plasmoid.action("addNewDevice").visible;
+        });
+
         Plasmoid.setAction("btSwitch", i18n("Enable Bluetooth"), "preferences-system-bluetooth");
-        Plasmoid.action("btSwitch").priority = 0;
         Plasmoid.action("btSwitch").checkable = true;
         Plasmoid.action("btSwitch").checked = Qt.binding(() => btManager.bluetoothOperational);
         Plasmoid.action("btSwitch").visible = Qt.binding(() => btManager.bluetoothBlocked || btManager.adapters.length > 0);

Places

File 2000-applet.patch of Package bluedevil5

Places