Plasma 6

README.md

@@ -2,18 +2,34 @@
 
 This plasmoid displays the current phase of the moon.
 
-If you click on it, a dialog appears which shows the dates of the important moon 
+If you click on it, a dialog appears which shows the dates of the important moon
 phases in the same month (last new moon, first quarter, full moon, third quarter
 and next new moon).
 
 The format in which these dates are shown can be customized.
 
-You can navigate to previous or future moon phases by clicking the arrow buttons or by 
-pressing the arrow keys. Clicking the middle button or pressing the "Home" key 
+You can navigate to previous or future moon phases by clicking the arrow buttons or by
+pressing the arrow keys. Clicking the middle button or pressing the "Home" key
 returns to the current dates.
 
-This is a port to Plasma 5 of:
+This is a port to Plasma 6 of:
 
 * Luna QML
 * Version 1.4
 * <https://store.kde.org/p/1002036/>
+
+## Installation
+
+Currently, the existing installation tools need updating.
+
+Alternatively, you can copy the contents of the `package` directory to `$HOME/.local/share/plasma/plasmoids/org.kde.userbase.plasma.luna-ii/`.
+
+## Development
+
+In order to test the applet during development, install the `plasma-sdk` package.
+
+Then, run the applet with:
+
+```
+$ plasmoidviewer -a <path-to-repository>/package/ -l topedge -f horizontal
+```

package/contents/config/config.qml

@@ -15,9 +15,9 @@
     along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.1
+import QtQuick
 
-import org.kde.plasma.configuration 2.0
+import org.kde.plasma.configuration
 
 ConfigModel {
     ConfigCategory {

package/contents/ui/ImageChoices.qml

@@ -15,7 +15,7 @@
     along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-import QtQuick 2.1 as QtQuick
+import QtQuick as QtQuick
 
 /*lunarIndex
 Defines the list of images of the moon.

package/contents/ui/LunaIcon.qml

@@ -18,10 +18,10 @@
 
 */
 
-import QtQuick 2.1
-import QtGraphicalEffects 1.12
-import org.kde.plasma.core 2.0 as PlasmaCore
-import org.kde.plasma.plasmoid 2.0
+import QtQuick
+import Qt5Compat.GraphicalEffects as GE
+import org.kde.ksvg as KSvg
+import org.kde.plasma.plasmoid
 
 import "../code/shadowcalcs.js" as ShadowCalcs
 
@@ -44,25 +44,21 @@ Item {
     // Degrees. 0= new moon, 90= first quarter, 180= full moon, 270= third quarter
     property int theta: 45
 
-    PlasmaCore.Svg {
-        id: lunaSvg
-        imagePath: lunarImage === '' ? '' : plasmoid.file("data", lunarImage)
-    }
-
-    PlasmaCore.SvgItem {
+    KSvg.SvgItem {
         id: lunaSvgItem
-        visible: false 
+        visible: false
 
         anchors.centerIn: parent
         width: Math.min(parent.width, parent.height)
         height: Math.min(parent.width, parent.height)
 
-        svg: lunaSvg
+        // TODO: KF6. How to find and load the svg images??
+        imagePath: Qt.resolvedUrl(`../data/${lunarImage}`)
 
         // Rotation to compensate the moon's image basic position to a north pole view
         // FIXME: Somehow it does not work when applied to OpacityMask or Blend
         transformOrigin: Item.Center
-        rotation: -lunarImageTweak  
+        rotation: -lunarImageTweak
     }
 
     Canvas {
@@ -101,11 +97,18 @@ Item {
             context.globalAlpha = 0.9
             context.fillStyle = '#000000'
 
+            //console.log("Angle: " + theta.toString())
+
+            var ct = Math.cos(theta/180*Math.PI)
+            var radius = ShadowCalcs.setup(Math.floor(shadow.height/2))
+
+            //console.log("radius: " + radius.toString())
+
             function radians(deg) {
                 return deg / 180.0 * Math.PI;
             }
 
-            function marker(latitude,longitude) {
+            function marker(latitude, longitude) {
               var dy = radius * Math.sin(radians(latitude))
               var dx = radius * Math.cos(radians(latitude)) * Math.sin(radians(longitude))
               //console.log("dx: " + dx.toString())
@@ -142,13 +145,6 @@ Item {
               context.stroke()
             }
 
-            //console.log("Angle: " + theta.toString())
-
-            var ct = Math.cos(theta/180*Math.PI)
-            var radius = ShadowCalcs.setup(Math.floor(shadow.height/2))
-
-            //console.log("radius: " + radius.toString())
-
             context.translate(radius,radius)
 
             // These two determine which side of the centre meridan to draw
@@ -196,7 +192,7 @@ Item {
     }
 
     // Shadow acts as a transparecy mask
-    OpacityMask {
+    GE.OpacityMask {
         anchors.fill: lunaSvgItem
         source: lunaSvgItem
         maskSource: shadow
@@ -206,7 +202,7 @@ Item {
     }
 
     // Shadow is printed on top of the moon image
-    Blend {
+    GE.Blend {
         anchors.fill: lunaSvgItem
         source: lunaSvgItem
         foregroundSource: shadow

package/contents/ui/LunaWidget.qml

@@ -19,10 +19,10 @@
 
 */
 
-import QtQuick 2.7
-import QtQuick.Layouts 1.2 as QtLayouts
-import org.kde.plasma.components 2.0 as PlasmaComponents
-import org.kde.plasma.plasmoid 2.0
+import QtQuick
+import QtQuick.Layouts as QtLayouts
+import org.kde.plasma.components as PlasmaComponents
+import org.kde.plasma.plasmoid
 
 import "../code/phases.js" as Phases
 import "../code/lunacalc.js" as LunaCalc
@@ -152,17 +152,17 @@ Item {
             anchors.horizontalCenter: parent.horizontalCenter
             PlasmaComponents.ToolButton {
                 id: previousButton
-                iconSource: "go-previous"
+                icon.name: "go-previous"
                 onClicked: showPreviousPhases();
             }
             PlasmaComponents.ToolButton {
                 id: todayButton
-                iconSource: "go-jump-today"
+                icon.name: "go-jump-today"
                 onClicked: showTodayPhases();
             }
             PlasmaComponents.ToolButton {
                 id: nextButton
-                iconSource: "go-next"
+                icon.name: "go-next"
                 onClicked: showNextPhases();
             }
         }

package/contents/ui/configGeneral.qml

@@ -15,13 +15,13 @@
     along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-import QtQuick 2.1
-import QtQuick.Controls 1.2 as QtControls
-import QtQuick.Layouts 1.2 as QtLayouts
-import QtQuick.Dialogs 1.0 as QtDialogs
+import QtQuick
+import QtQuick.Controls as QtControls
+import QtQuick.Layouts as QtLayouts
+import QtQuick.Dialogs as QtDialogs
 
-import org.kde.plasma.components 2.0 as PlasmaComponents
-import org.kde.plasma.core 2.0 as PlasmaCore
+import org.kde.plasma.components as PlasmaComponents
+import org.kde.plasma.plasma5support as P5Support
 
 
 Item {
@@ -61,7 +61,7 @@ Item {
         id: imageChoices
     }
 
-    PlasmaCore.DataSource {
+    P5Support.DataSource {
         id: geoSource
         engine: "geolocation"
         connectedSources: ["location"]
@@ -94,7 +94,7 @@ Item {
 
             PlasmaComponents.ToolButton {
                 id: previousButton
-                iconSource: "go-previous"
+                icon.name: "go-previous"
                 enabled: cfg_lunarIndex > 0
                 onClicked: {
                     cfg_lunarIndex -= 1
@@ -118,7 +118,7 @@ Item {
 
             PlasmaComponents.ToolButton {
                 id: nextButton
-                iconSource: "go-next"
+                icon.name: "go-next"
                 enabled: cfg_lunarIndex < imageChoices.count-1
                 onClicked: {
                     cfg_lunarIndex += 1
@@ -184,10 +184,9 @@ Item {
             QtControls.Slider {
                 id: latitude
                 QtLayouts.Layout.fillWidth: true
-                minimumValue: -90.0
-                maximumValue: 90.0
+                from: -90.0
+                to: 90.0
                 stepSize: 5.0
-                tickmarksEnabled: true
                 enabled: !cfg_latitudeAuto
             }
         }

package/contents/ui/main.qml

@@ -18,17 +18,14 @@
 
 */
 
-import QtQuick 2.1
-import org.kde.plasma.core 2.0 as PlasmaCore
-import org.kde.plasma.plasmoid 2.0
-import QtQuick.Layouts 1.2 as QtLayouts
-import QtQuick.Controls 1.2 as QtControls
-import org.kde.plasma.components 2.0 as PlasmaComponents
+import QtQuick
+import org.kde.plasma.plasmoid
+import QtQuick.Layouts as QtLayouts
 
 import "../code/phases.js" as Phases
 import "../code/lunacalc.js" as LunaCalc
 
-Item {
+PlasmoidItem {
     id: main
     property int minimumWidth
     property int minimumHeight
@@ -50,13 +47,13 @@ Item {
     property int lunarImageTweak: 0
 
     Plasmoid.backgroundHints: showBackground ? "DefaultBackground" : "NoBackground"
-    Plasmoid.preferredRepresentation: Plasmoid.compactRepresentation
-
     Plasmoid.icon: ""
-    Plasmoid.toolTipMainText: currentPhase.text
-    Plasmoid.toolTipSubText: currentPhase.subText
 
-    Plasmoid.compactRepresentation: Item {
+    preferredRepresentation: compactRepresentation
+    toolTipMainText: currentPhase.text
+    toolTipSubText: currentPhase.subText
+
+    compactRepresentation: Item {
         id: compact
 
         property int latitude: main.latitude
@@ -104,13 +101,13 @@ Item {
 
             MouseArea {
                 anchors.fill: parent
-                onClicked: plasmoid.expanded = !plasmoid.expanded
+                onClicked: main.expanded = !main.expanded
             }
         }
 
     }
 
-    Plasmoid.fullRepresentation: Item {
+    fullRepresentation: Item {
         id: full
 
         QtLayouts.Layout.preferredWidth: lunaWidget.QtLayouts.Layout.minimumWidth