Merge pull request #10 from alexankitty/bug-fixing

Bug fixing Merge

Author: alexankitty

contents/ui/ConfigAppearance.qml

@@ -103,9 +103,14 @@ Kirigami.FormLayout {
         text: i18n("Override")
     }
 
+    Label {
+        text: i18n("Be sure to use this when using as a floating widget")
+        font: Kirigami.Theme.smallFont
+    }
+
     ComboBox {
         id: plasmaButtonDirection
-        enabled: overridePlasmaButtonDirection.checked
+        visible: overridePlasmaButtonDirection.checked
         //Kirigami.FormData.label: i18n("Indicator Location:")
         model: [
             i18n("North"),

contents/ui/ConfigIndicators.qml

@@ -59,6 +59,11 @@ Kirigami.FormLayout {
         text: i18n("Override location")
     }
 
+    Label {
+        text: i18n("Be sure to use this when using as a floating widget")
+        font: Kirigami.Theme.smallFont
+    }
+
     ComboBox {
         enabled: indicatorsEnabled.currentIndex
         visible: indicatorOverride.checked

contents/ui/Task.qml

@@ -394,8 +394,6 @@ MouseArea {
         Flow {
             id: indicator
             flow: Flow.LeftToRight
-            anchors.top: parent.top
-            anchors.horizontalCenter: parent.horizontalCenter
             spacing: PlasmaCore.Units.smallSpacing
             Repeater {
 
@@ -427,6 +425,8 @@ MouseArea {
                     readonly property bool isVertical: {
                         if(plasmoid.formFactor === PlasmaCore.Types.Vertical && !plasmoid.configuration.indicatorOverride)
                         return true;
+                        if(plasmoid.formFactor == PlasmaCore.Types.Floating && plasmoid.configuration.indicatorLocation === 1 || plasmoid.configuration.indicatorLocation === 2)
+                        return  true;
                         if(plasmoid.configuration.indicatorLocation === 1 || plasmoid.configuration.indicatorLocation === 2)
                         return true;
                         else{
@@ -548,6 +548,81 @@ MouseArea {
         }
 
         states:[
+            State {//safety case - use bottom when not override
+                name: "floating-fallback"
+                when: (plasmoid.location === PlasmaCore.Types.Floating && !plasmoid.configuration.indicatorOverride)
+
+                AnchorChanges {
+                    target: indicator
+                    anchors{ top:undefined; bottom:parent.bottom; left:undefined; right:undefined;
+                        horizontalCenter:parent.horizontalCenter; verticalCenter:undefined}
+                }
+                PropertyChanges {
+                    target: indicator
+                    width: undefined
+                    height: plasmoid.configuration.indicatorSize
+                }
+            },
+            State {
+                name: "floating-bottom"
+                when: (plasmoid.location === PlasmaCore.Types.Floating && plasmoid.configuration.indicatorLocation === 0)
+
+                AnchorChanges {
+                    target: indicator
+                    anchors{ top:undefined; bottom:parent.bottom; left:undefined; right:undefined;
+                        horizontalCenter:parent.horizontalCenter; verticalCenter:undefined}
+                }
+                PropertyChanges {
+                    target: indicator
+                    width: undefined
+                    height: plasmoid.configuration.indicatorSize
+                }
+            },
+            State {
+                name: "floating-left"
+                when: (plasmoid.location === PlasmaCore.Types.Floating && plasmoid.configuration.indicatorLocation === 0)
+
+                AnchorChanges {
+                    target: indicator
+                    anchors{ top:undefined; bottom:undefined; left:parent.left; right:undefined;
+                        horizontalCenter:undefined; verticalCenter:parent.verticalCenter}
+                }
+                PropertyChanges {
+                    target: indicator
+                    height: undefined
+                    width: plasmoid.configuration.indicatorSize
+                }
+            },
+            State {
+                name: "floating-right"
+                when: (plasmoid.location === PlasmaCore.Types.Floating && plasmoid.configuration.indicatorLocation === 0)
+
+                AnchorChanges {
+                    target: indicator
+                    anchors{ top:undefined; bottom:undefined; left:undefined; right:parent.right;
+                        horizontalCenter:undefined; verticalCenter:parent.verticalCenter}
+                }
+                PropertyChanges {
+                    target: indicator
+                    height: undefined
+                    width: plasmoid.configuration.indicatorSize
+                }
+            },
+            State {
+                name: "floating-top"
+                when: (plasmoid.location === PlasmaCore.Types.Floating && plasmoid.configuration.indicatorLocation === 0)
+
+                AnchorChanges {
+                    target: indicator
+                    anchors{ top:parent.top; bottom:undefined; left:undefined; right:undefined;
+                        horizontalCenter:parent.horizontalCenter; verticalCenter:undefined}
+                }
+                PropertyChanges {
+                    target: indicator
+                    width: undefined
+                    height: plasmoid.configuration.indicatorSize
+                }
+            },
             State {
                 name: "bottom"
                 when: (plasmoid.configuration.indicatorOverride && plasmoid.configuration.indicatorLocation === 0)

install.sh

@@ -1,3 +1,4 @@
 #!/bin/sh
-kpackagetool5 -i .
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+kpackagetool5 -i $SCRIPT_DIR
 cp ./FancyTasks.png ~/.local/share/icons/hicolor/256x256/apps/FancyTasks.png

update.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+kpackagetool5 -u $SCRIPT_DIR
+kquitapp5 plasmashell
+kstart5 plasmashell
+cp ./FancyTasks.png ~/.local/share/icons/hicolor/256x256/apps/FancyTasks.png