From 2ef459a2581b4271985fa2677df09bc65b4e98b0 Mon Sep 17 00:00:00 2001 From: eLtMosen Date: Sun, 26 Dec 2021 22:19:28 +0100 Subject: [PATCH 1/5] Correct display on square screens and adapt images to new guidelines --- ...ng => numerals-duo-synth-neon-green-0.png} | Bin ...ng => numerals-duo-synth-neon-green-1.png} | Bin ...ng => numerals-duo-synth-neon-green-2.png} | Bin ...ng => numerals-duo-synth-neon-green-3.png} | Bin ...ng => numerals-duo-synth-neon-green-4.png} | Bin ...ng => numerals-duo-synth-neon-green-5.png} | Bin ...ng => numerals-duo-synth-neon-green-6.png} | Bin ...ng => numerals-duo-synth-neon-green-7.png} | Bin ...ng => numerals-duo-synth-neon-green-8.png} | Bin ...ng => numerals-duo-synth-neon-green-9.png} | Bin .../numerals-duo-synth-neon-green.qml | 21 +++++++++--------- 11 files changed, 11 insertions(+), 10 deletions(-) rename numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/{neon0.png => numerals-duo-synth-neon-green-0.png} (100%) rename numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/{neon1.png => numerals-duo-synth-neon-green-1.png} (100%) rename numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/{neon2.png => numerals-duo-synth-neon-green-2.png} (100%) rename numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/{neon3.png => numerals-duo-synth-neon-green-3.png} (100%) rename numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/{neon4.png => numerals-duo-synth-neon-green-4.png} (100%) rename numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/{neon5.png => numerals-duo-synth-neon-green-5.png} (100%) rename numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/{neon6.png => numerals-duo-synth-neon-green-6.png} (100%) rename numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/{neon7.png => numerals-duo-synth-neon-green-7.png} (100%) rename numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/{neon8.png => numerals-duo-synth-neon-green-8.png} (100%) rename numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/{neon9.png => numerals-duo-synth-neon-green-9.png} (100%) diff --git a/numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/neon0.png b/numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/numerals-duo-synth-neon-green-0.png similarity index 100% rename from numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/neon0.png rename to numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/numerals-duo-synth-neon-green-0.png diff --git a/numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/neon1.png b/numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/numerals-duo-synth-neon-green-1.png similarity index 100% rename from numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/neon1.png rename to numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/numerals-duo-synth-neon-green-1.png diff --git a/numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/neon2.png b/numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/numerals-duo-synth-neon-green-2.png similarity index 100% rename from numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/neon2.png rename to numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/numerals-duo-synth-neon-green-2.png diff --git a/numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/neon3.png b/numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/numerals-duo-synth-neon-green-3.png similarity index 100% rename from numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/neon3.png rename to numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/numerals-duo-synth-neon-green-3.png diff --git a/numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/neon4.png b/numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/numerals-duo-synth-neon-green-4.png similarity index 100% rename from numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/neon4.png rename to numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/numerals-duo-synth-neon-green-4.png diff --git a/numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/neon5.png b/numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/numerals-duo-synth-neon-green-5.png similarity index 100% rename from numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/neon5.png rename to numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/numerals-duo-synth-neon-green-5.png diff --git a/numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/neon6.png b/numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/numerals-duo-synth-neon-green-6.png similarity index 100% rename from numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/neon6.png rename to numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/numerals-duo-synth-neon-green-6.png diff --git a/numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/neon7.png b/numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/numerals-duo-synth-neon-green-7.png similarity index 100% rename from numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/neon7.png rename to numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/numerals-duo-synth-neon-green-7.png diff --git a/numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/neon8.png b/numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/numerals-duo-synth-neon-green-8.png similarity index 100% rename from numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/neon8.png rename to numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/numerals-duo-synth-neon-green-8.png diff --git a/numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/neon9.png b/numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/numerals-duo-synth-neon-green-9.png similarity index 100% rename from numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/neon9.png rename to numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces-img/numerals-duo-synth-neon-green-9.png diff --git a/numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces/numerals-duo-synth-neon-green.qml b/numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces/numerals-duo-synth-neon-green.qml index 708b37be..80a120a5 100644 --- a/numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces/numerals-duo-synth-neon-green.qml +++ b/numerals-duo-synth-neon-green/usr/share/asteroid-launcher/watchfaces/numerals-duo-synth-neon-green.qml @@ -29,6 +29,7 @@ import org.asteroid.controls 1.0 Item { property int length: width > height ? height : width + property string imgPath: "../watchfaces-img/numerals-duo-synth-neon-green-" id: root @@ -45,7 +46,7 @@ Item { horizontalAlignment: Text.AlignHCenter anchors { bottom: root.verticalCenter - bottomMargin: root.height*0.387 + bottomMargin: DeviceInfo.hasRoundScreen ? root.height*0.387 : root.height*0.402 horizontalCenter: root.horizontalCenter } text: wallClock.time.toLocaleString(Qt.locale(), "dddd").toUpperCase() @@ -72,7 +73,7 @@ Item { horizontalAlignment: Text.AlignHCenter anchors { top: root.verticalCenter - topMargin: root.height*0.394 + topMargin: DeviceInfo.hasRoundScreen ? root.height*0.394 : root.height*0.406 horizontalCenter: root.horizontalCenter } text: wallClock.time.toLocaleString(Qt.locale(), "yyyy-MM-dd") @@ -88,10 +89,10 @@ Item { } Item { - x: DeviceInfo.hasRoundScreen ? length * 0.1 : (root.width != length ? root.width/2 - length/2 : 0) - y: DeviceInfo.hasRoundScreen ? length * 0.1 : (root.height != length ? root.height/2 - length/2 : 0) - width: DeviceInfo.hasRoundScreen ? length * 0.8 : length - height: DeviceInfo.hasRoundScreen ? length * 0.8 : length + x: DeviceInfo.hasRoundScreen ? length * 0.1 : (root.width != length ? root.width/2 - length/2 : !displayAmbient ? length * 0.1 : 0) + y: DeviceInfo.hasRoundScreen ? length * 0.1 : (root.height != length ? root.height/2 - length/2 : !displayAmbient ? length * 0.1 : 0) + width: DeviceInfo.hasRoundScreen ? length * 0.8 : displayAmbient ? length : length * 0.8 + height: DeviceInfo.hasRoundScreen ? length * 0.8 : displayAmbient ? length : length * 0.8 LinearGradient { id: greenColor @@ -127,7 +128,7 @@ Item { x: parseInt(parent.width*0.135) y: parseInt(parent.height*0.045) sourceSize: Qt.size(parent.width/2 - parent.width*0.15, parent.height/2 - parent.height*0.15) - source: "../watchfaces-img/neon" + wallClock.time.toLocaleString(Qt.locale(), "HH").slice(0, 1) + ".png" + source: imgPath + wallClock.time.toLocaleString(Qt.locale(), "HH").slice(0, 1) + ".png" } Image { id: topRight @@ -137,7 +138,7 @@ Item { x: parseInt(parent.width/2 + parent.width*0.03) y: parseInt(parent.height*0.045) sourceSize: Qt.size(parent.width/2 - parent.width*0.15, parent.height/2 - parent.height*0.15) - source: "../watchfaces-img/neon" + wallClock.time.toLocaleString(Qt.locale(), "HH").slice(1, 2) + ".png" + source: imgPath + wallClock.time.toLocaleString(Qt.locale(), "HH").slice(1, 2) + ".png" } Image { id: bottomLeft @@ -147,7 +148,7 @@ Item { x: parseInt(parent.width*0.135) y: parseInt(parent.height/2 + parent.height*0.025) sourceSize: Qt.size(parent.width/2 - parent.width*0.15, parent.height/2 - parent.height*0.15) - source: "../watchfaces-img/neon" + wallClock.time.toLocaleString(Qt.locale(), "mm").slice(0, 1) + ".png" + source: imgPath + wallClock.time.toLocaleString(Qt.locale(), "mm").slice(0, 1) + ".png" } Image { id: bottomRight @@ -157,7 +158,7 @@ Item { x: parseInt(parent.width/2 + parent.width*0.03) y: parseInt(parent.height/2 + parent.height*0.025) sourceSize: Qt.size(parent.width/2 - parent.width*0.15, parent.height/2 - parent.height*0.15) - source: "../watchfaces-img/neon" + wallClock.time.toLocaleString(Qt.locale(), "mm").slice(1, 2) + ".png" + source: imgPath + wallClock.time.toLocaleString(Qt.locale(), "mm").slice(1, 2) + ".png" } OpacityMask { From 002130a6ac753d40ee58ef0064536b53ad27a6c3 Mon Sep 17 00:00:00 2001 From: eLtMosen Date: Mon, 27 Dec 2021 02:43:53 +0100 Subject: [PATCH 2/5] Adapt pathes and image names to new guideline in numerals-duo-neon-green --- .../watchfaces/analog-scientific.qml | 3 ++- .../{neon0.png => numerals-duo-neon-green-0.png} | Bin .../{neon1.png => numerals-duo-neon-green-1.png} | Bin .../{neon2.png => numerals-duo-neon-green-2.png} | Bin .../{neon3.png => numerals-duo-neon-green-3.png} | Bin .../{neon4.png => numerals-duo-neon-green-4.png} | Bin .../{neon5.png => numerals-duo-neon-green-5.png} | Bin .../{neon6.png => numerals-duo-neon-green-6.png} | Bin .../{neon7.png => numerals-duo-neon-green-7.png} | Bin .../{neon8.png => numerals-duo-neon-green-8.png} | Bin .../{neon9.png => numerals-duo-neon-green-9.png} | Bin .../watchfaces/numerals-duo-neon-green.qml | 9 +++++---- 12 files changed, 7 insertions(+), 5 deletions(-) rename numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/{neon0.png => numerals-duo-neon-green-0.png} (100%) rename numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/{neon1.png => numerals-duo-neon-green-1.png} (100%) rename numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/{neon2.png => numerals-duo-neon-green-2.png} (100%) rename numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/{neon3.png => numerals-duo-neon-green-3.png} (100%) rename numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/{neon4.png => numerals-duo-neon-green-4.png} (100%) rename numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/{neon5.png => numerals-duo-neon-green-5.png} (100%) rename numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/{neon6.png => numerals-duo-neon-green-6.png} (100%) rename numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/{neon7.png => numerals-duo-neon-green-7.png} (100%) rename numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/{neon8.png => numerals-duo-neon-green-8.png} (100%) rename numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/{neon9.png => numerals-duo-neon-green-9.png} (100%) diff --git a/analog-scientific/usr/share/asteroid-launcher/watchfaces/analog-scientific.qml b/analog-scientific/usr/share/asteroid-launcher/watchfaces/analog-scientific.qml index ce5e7122..0306ce55 100644 --- a/analog-scientific/usr/share/asteroid-launcher/watchfaces/analog-scientific.qml +++ b/analog-scientific/usr/share/asteroid-launcher/watchfaces/analog-scientific.qml @@ -183,6 +183,8 @@ Item { Canvas { z: 4 id: secondCanvas + + visible: !displayAmbient property var second: 0 anchors.fill: parent smooth: true @@ -211,7 +213,6 @@ Item { ctx.arc(parent.width/2, parent.height/2, parent.height*0.006, 0, 2*Math.PI, false) ctx.fill() ctx.closePath() - } } diff --git a/numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/neon0.png b/numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/numerals-duo-neon-green-0.png similarity index 100% rename from numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/neon0.png rename to numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/numerals-duo-neon-green-0.png diff --git a/numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/neon1.png b/numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/numerals-duo-neon-green-1.png similarity index 100% rename from numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/neon1.png rename to numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/numerals-duo-neon-green-1.png diff --git a/numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/neon2.png b/numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/numerals-duo-neon-green-2.png similarity index 100% rename from numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/neon2.png rename to numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/numerals-duo-neon-green-2.png diff --git a/numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/neon3.png b/numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/numerals-duo-neon-green-3.png similarity index 100% rename from numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/neon3.png rename to numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/numerals-duo-neon-green-3.png diff --git a/numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/neon4.png b/numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/numerals-duo-neon-green-4.png similarity index 100% rename from numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/neon4.png rename to numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/numerals-duo-neon-green-4.png diff --git a/numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/neon5.png b/numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/numerals-duo-neon-green-5.png similarity index 100% rename from numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/neon5.png rename to numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/numerals-duo-neon-green-5.png diff --git a/numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/neon6.png b/numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/numerals-duo-neon-green-6.png similarity index 100% rename from numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/neon6.png rename to numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/numerals-duo-neon-green-6.png diff --git a/numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/neon7.png b/numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/numerals-duo-neon-green-7.png similarity index 100% rename from numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/neon7.png rename to numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/numerals-duo-neon-green-7.png diff --git a/numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/neon8.png b/numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/numerals-duo-neon-green-8.png similarity index 100% rename from numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/neon8.png rename to numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/numerals-duo-neon-green-8.png diff --git a/numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/neon9.png b/numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/numerals-duo-neon-green-9.png similarity index 100% rename from numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/neon9.png rename to numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces-img/numerals-duo-neon-green-9.png diff --git a/numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces/numerals-duo-neon-green.qml b/numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces/numerals-duo-neon-green.qml index 1e857d04..bfb9c412 100755 --- a/numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces/numerals-duo-neon-green.qml +++ b/numerals-duo-neon-green/usr/share/asteroid-launcher/watchfaces/numerals-duo-neon-green.qml @@ -29,6 +29,7 @@ import org.asteroid.controls 1.0 Item { property int length: width > height ? height : width + property string imgPath: "../watchfaces-img/numerals-duo-neon-green-" id: root @@ -61,7 +62,7 @@ Item { x: parseInt(parent.width*0.135) y: parseInt(parent.height*0.045) sourceSize: Qt.size(parent.width/2 - parent.width*0.15, parent.height/2 - parent.height*0.15) - source: "../watchfaces-img/neon" + wallClock.time.toLocaleString(Qt.locale(), "HH").slice(0, 1) + ".png" + source: imgPath + wallClock.time.toLocaleString(Qt.locale(), "HH").slice(0, 1) + ".png" } Image { id: topRight @@ -71,7 +72,7 @@ Item { x: parseInt(parent.width/2 + parent.width*0.03) y: parseInt(parent.height*0.045) sourceSize: Qt.size(parent.width/2 - parent.width*0.15, parent.height/2 - parent.height*0.15) - source: "../watchfaces-img/neon" + wallClock.time.toLocaleString(Qt.locale(), "HH").slice(1, 2) + ".png" + source: imgPath + wallClock.time.toLocaleString(Qt.locale(), "HH").slice(1, 2) + ".png" } Image { id: bottomLeft @@ -81,7 +82,7 @@ Item { x: parseInt(parent.width*0.135) y: parseInt(parent.height/2 + parent.height*0.025) sourceSize: Qt.size(parent.width/2 - parent.width*0.15, parent.height/2 - parent.height*0.15) - source: "../watchfaces-img/neon" + wallClock.time.toLocaleString(Qt.locale(), "mm").slice(0, 1) + ".png" + source: imgPath + wallClock.time.toLocaleString(Qt.locale(), "mm").slice(0, 1) + ".png" } Image { id: bottomRight @@ -91,7 +92,7 @@ Item { x: parseInt(parent.width/2 + parent.width*0.03) y: parseInt(parent.height/2 + parent.height*0.025) sourceSize: Qt.size(parent.width/2 - parent.width*0.15, parent.height/2 - parent.height*0.15) - source: "../watchfaces-img/neon" + wallClock.time.toLocaleString(Qt.locale(), "mm").slice(1, 2) + ".png" + source: imgPath + wallClock.time.toLocaleString(Qt.locale(), "mm").slice(1, 2) + ".png" } OpacityMask { From a81d20c4e13f68124e47d83c6c61545e844352ea Mon Sep 17 00:00:00 2001 From: eLtMosen Date: Mon, 27 Dec 2021 17:16:46 +0100 Subject: [PATCH 3/5] Adapt image name and pathes in analog-neon-diver --- ...analog-neon-diver-backplate-12hindicator.svg} | 0 ...analog-neon-diver-backplate-24hindicator.svg} | 0 ...-neon.svg => analog-neon-diver-backplate.svg} | 0 ...er-12h.svg => analog-neon-diver-hour-12h.svg} | 0 ...er-24h.svg => analog-neon-diver-hour-24h.svg} | 0 ...on-diver.svg => analog-neon-diver-minute.svg} | 0 ...on-diver.svg => analog-neon-diver-second.svg} | 0 .../watchfaces/analog-neon-diver.qml | 16 +++++++++------- 8 files changed, 9 insertions(+), 7 deletions(-) rename analog-neon-diver/usr/share/asteroid-launcher/watchface-img/{backplate-neon-12hindicator.svg => analog-neon-diver-backplate-12hindicator.svg} (100%) rename analog-neon-diver/usr/share/asteroid-launcher/watchface-img/{backplate-neon-24hindicator.svg => analog-neon-diver-backplate-24hindicator.svg} (100%) rename analog-neon-diver/usr/share/asteroid-launcher/watchface-img/{backplate-neon.svg => analog-neon-diver-backplate.svg} (100%) rename analog-neon-diver/usr/share/asteroid-launcher/watchface-img/{hour-neon-diver-12h.svg => analog-neon-diver-hour-12h.svg} (100%) rename analog-neon-diver/usr/share/asteroid-launcher/watchface-img/{hour-neon-diver-24h.svg => analog-neon-diver-hour-24h.svg} (100%) rename analog-neon-diver/usr/share/asteroid-launcher/watchface-img/{minute-neon-diver.svg => analog-neon-diver-minute.svg} (100%) rename analog-neon-diver/usr/share/asteroid-launcher/watchface-img/{second-neon-diver.svg => analog-neon-diver-second.svg} (100%) diff --git a/analog-neon-diver/usr/share/asteroid-launcher/watchface-img/backplate-neon-12hindicator.svg b/analog-neon-diver/usr/share/asteroid-launcher/watchface-img/analog-neon-diver-backplate-12hindicator.svg similarity index 100% rename from analog-neon-diver/usr/share/asteroid-launcher/watchface-img/backplate-neon-12hindicator.svg rename to analog-neon-diver/usr/share/asteroid-launcher/watchface-img/analog-neon-diver-backplate-12hindicator.svg diff --git a/analog-neon-diver/usr/share/asteroid-launcher/watchface-img/backplate-neon-24hindicator.svg b/analog-neon-diver/usr/share/asteroid-launcher/watchface-img/analog-neon-diver-backplate-24hindicator.svg similarity index 100% rename from analog-neon-diver/usr/share/asteroid-launcher/watchface-img/backplate-neon-24hindicator.svg rename to analog-neon-diver/usr/share/asteroid-launcher/watchface-img/analog-neon-diver-backplate-24hindicator.svg diff --git a/analog-neon-diver/usr/share/asteroid-launcher/watchface-img/backplate-neon.svg b/analog-neon-diver/usr/share/asteroid-launcher/watchface-img/analog-neon-diver-backplate.svg similarity index 100% rename from analog-neon-diver/usr/share/asteroid-launcher/watchface-img/backplate-neon.svg rename to analog-neon-diver/usr/share/asteroid-launcher/watchface-img/analog-neon-diver-backplate.svg diff --git a/analog-neon-diver/usr/share/asteroid-launcher/watchface-img/hour-neon-diver-12h.svg b/analog-neon-diver/usr/share/asteroid-launcher/watchface-img/analog-neon-diver-hour-12h.svg similarity index 100% rename from analog-neon-diver/usr/share/asteroid-launcher/watchface-img/hour-neon-diver-12h.svg rename to analog-neon-diver/usr/share/asteroid-launcher/watchface-img/analog-neon-diver-hour-12h.svg diff --git a/analog-neon-diver/usr/share/asteroid-launcher/watchface-img/hour-neon-diver-24h.svg b/analog-neon-diver/usr/share/asteroid-launcher/watchface-img/analog-neon-diver-hour-24h.svg similarity index 100% rename from analog-neon-diver/usr/share/asteroid-launcher/watchface-img/hour-neon-diver-24h.svg rename to analog-neon-diver/usr/share/asteroid-launcher/watchface-img/analog-neon-diver-hour-24h.svg diff --git a/analog-neon-diver/usr/share/asteroid-launcher/watchface-img/minute-neon-diver.svg b/analog-neon-diver/usr/share/asteroid-launcher/watchface-img/analog-neon-diver-minute.svg similarity index 100% rename from analog-neon-diver/usr/share/asteroid-launcher/watchface-img/minute-neon-diver.svg rename to analog-neon-diver/usr/share/asteroid-launcher/watchface-img/analog-neon-diver-minute.svg diff --git a/analog-neon-diver/usr/share/asteroid-launcher/watchface-img/second-neon-diver.svg b/analog-neon-diver/usr/share/asteroid-launcher/watchface-img/analog-neon-diver-second.svg similarity index 100% rename from analog-neon-diver/usr/share/asteroid-launcher/watchface-img/second-neon-diver.svg rename to analog-neon-diver/usr/share/asteroid-launcher/watchface-img/analog-neon-diver-second.svg diff --git a/analog-neon-diver/usr/share/asteroid-launcher/watchfaces/analog-neon-diver.qml b/analog-neon-diver/usr/share/asteroid-launcher/watchfaces/analog-neon-diver.qml index 3b8c7384..c44ea2c8 100644 --- a/analog-neon-diver/usr/share/asteroid-launcher/watchfaces/analog-neon-diver.qml +++ b/analog-neon-diver/usr/share/asteroid-launcher/watchfaces/analog-neon-diver.qml @@ -26,10 +26,12 @@ import QtGraphicalEffects 1.15 Item { + property string imgPath: "../watchface-img/analog-neon-diver-" + Image { z: 0 id: backplate - source: "../watchface-img/backplate-neon.svg" + source: imgPath + "backplate.svg" antialiasing: true anchors.centerIn: parent width: parent.width @@ -48,8 +50,8 @@ Item { z: 0 id: modeDisplay source: hourSVG.toggle24h ? - "../watchface-img/backplate-neon-24hindicator.svg" : - "../watchface-img/backplate-neon-12hindicator.svg" + imgPath + "backplate-24hindicator.svg" : + imgPath + "backplate-12hindicator.svg" antialiasing: true anchors.centerIn: parent width: parent.width @@ -179,8 +181,8 @@ Item { z: 2 property bool toggle24h: false source: hourSVG.toggle24h ? - "../watchface-img/hour-neon-diver-24h.svg" : - "../watchface-img/hour-neon-diver-12h.svg" + imgPath + "hour-24h.svg" : + imgPath + "hour-12h.svg" antialiasing: true anchors.centerIn: parent width: parent.width @@ -220,7 +222,7 @@ Item { Image { id: minuteSVG z: 3 - source: "../watchface-img/minute-neon-diver.svg" + source: imgPath + "minute.svg" antialiasing: true anchors.centerIn: parent width: parent.width @@ -252,7 +254,7 @@ Item { z: 4 antialiasing: true visible: !displayAmbient - source: "../watchface-img/second-neon-diver.svg" + source: imgPath + "second.svg" anchors.centerIn: parent width: parent.width height: parent.height From a8be8853e9609d1531e27835f7c003e2b8867e1e Mon Sep 17 00:00:00 2001 From: eLtMosen Date: Mon, 27 Dec 2021 17:57:43 +0100 Subject: [PATCH 4/5] Adapt image name and pathes, refactor 0.X to .X in analog-classy-roman --- ... analog-classy-roman-asteroid_logo_bw.png} | Bin ... analog-classy-roman-asteroid_logo_wb.png} | Bin ... analog-classy-roman-background-white.svg} | 0 ...svg => analog-classy-roman-background.svg} | 0 ...an-v3.svg => analog-classy-roman-hour.svg} | 0 ...-v3.svg => analog-classy-roman-minute.svg} | 0 ...man.svg => analog-classy-roman-second.svg} | 0 .../watchfaces/analog-classy-roman.qml | 70 +++++++++--------- 8 files changed, 35 insertions(+), 35 deletions(-) rename analog-classy-roman/usr/share/asteroid-launcher/watchface-img/{asteroid_logo_bw.png => analog-classy-roman-asteroid_logo_bw.png} (100%) rename analog-classy-roman/usr/share/asteroid-launcher/watchface-img/{asteroid_logo_wb.png => analog-classy-roman-asteroid_logo_wb.png} (100%) rename analog-classy-roman/usr/share/asteroid-launcher/watchface-img/{background-classy-roman-white.svg => analog-classy-roman-background-white.svg} (100%) rename analog-classy-roman/usr/share/asteroid-launcher/watchface-img/{background-classy-roman.svg => analog-classy-roman-background.svg} (100%) rename analog-classy-roman/usr/share/asteroid-launcher/watchface-img/{hour-classy-roman-v3.svg => analog-classy-roman-hour.svg} (100%) rename analog-classy-roman/usr/share/asteroid-launcher/watchface-img/{minute-classy-roman-v3.svg => analog-classy-roman-minute.svg} (100%) rename analog-classy-roman/usr/share/asteroid-launcher/watchface-img/{second-classy-roman.svg => analog-classy-roman-second.svg} (100%) diff --git a/analog-classy-roman/usr/share/asteroid-launcher/watchface-img/asteroid_logo_bw.png b/analog-classy-roman/usr/share/asteroid-launcher/watchface-img/analog-classy-roman-asteroid_logo_bw.png similarity index 100% rename from analog-classy-roman/usr/share/asteroid-launcher/watchface-img/asteroid_logo_bw.png rename to analog-classy-roman/usr/share/asteroid-launcher/watchface-img/analog-classy-roman-asteroid_logo_bw.png diff --git a/analog-classy-roman/usr/share/asteroid-launcher/watchface-img/asteroid_logo_wb.png b/analog-classy-roman/usr/share/asteroid-launcher/watchface-img/analog-classy-roman-asteroid_logo_wb.png similarity index 100% rename from analog-classy-roman/usr/share/asteroid-launcher/watchface-img/asteroid_logo_wb.png rename to analog-classy-roman/usr/share/asteroid-launcher/watchface-img/analog-classy-roman-asteroid_logo_wb.png diff --git a/analog-classy-roman/usr/share/asteroid-launcher/watchface-img/background-classy-roman-white.svg b/analog-classy-roman/usr/share/asteroid-launcher/watchface-img/analog-classy-roman-background-white.svg similarity index 100% rename from analog-classy-roman/usr/share/asteroid-launcher/watchface-img/background-classy-roman-white.svg rename to analog-classy-roman/usr/share/asteroid-launcher/watchface-img/analog-classy-roman-background-white.svg diff --git a/analog-classy-roman/usr/share/asteroid-launcher/watchface-img/background-classy-roman.svg b/analog-classy-roman/usr/share/asteroid-launcher/watchface-img/analog-classy-roman-background.svg similarity index 100% rename from analog-classy-roman/usr/share/asteroid-launcher/watchface-img/background-classy-roman.svg rename to analog-classy-roman/usr/share/asteroid-launcher/watchface-img/analog-classy-roman-background.svg diff --git a/analog-classy-roman/usr/share/asteroid-launcher/watchface-img/hour-classy-roman-v3.svg b/analog-classy-roman/usr/share/asteroid-launcher/watchface-img/analog-classy-roman-hour.svg similarity index 100% rename from analog-classy-roman/usr/share/asteroid-launcher/watchface-img/hour-classy-roman-v3.svg rename to analog-classy-roman/usr/share/asteroid-launcher/watchface-img/analog-classy-roman-hour.svg diff --git a/analog-classy-roman/usr/share/asteroid-launcher/watchface-img/minute-classy-roman-v3.svg b/analog-classy-roman/usr/share/asteroid-launcher/watchface-img/analog-classy-roman-minute.svg similarity index 100% rename from analog-classy-roman/usr/share/asteroid-launcher/watchface-img/minute-classy-roman-v3.svg rename to analog-classy-roman/usr/share/asteroid-launcher/watchface-img/analog-classy-roman-minute.svg diff --git a/analog-classy-roman/usr/share/asteroid-launcher/watchface-img/second-classy-roman.svg b/analog-classy-roman/usr/share/asteroid-launcher/watchface-img/analog-classy-roman-second.svg similarity index 100% rename from analog-classy-roman/usr/share/asteroid-launcher/watchface-img/second-classy-roman.svg rename to analog-classy-roman/usr/share/asteroid-launcher/watchface-img/analog-classy-roman-second.svg diff --git a/analog-classy-roman/usr/share/asteroid-launcher/watchfaces/analog-classy-roman.qml b/analog-classy-roman/usr/share/asteroid-launcher/watchfaces/analog-classy-roman.qml index 86161e25..5ce85b2d 100644 --- a/analog-classy-roman/usr/share/asteroid-launcher/watchfaces/analog-classy-roman.qml +++ b/analog-classy-roman/usr/share/asteroid-launcher/watchfaces/analog-classy-roman.qml @@ -21,15 +21,15 @@ import QtQuick 2.9 Item { property string currentColor: "black" property string userColor: "" - property string imgPath: "../watchface-img/" + property string imgPath: "../watchface-img/analog-classy-roman-" property var numeral: ["\u216B", "\u2160", "\u2161", "\u2162", "\u2163", "\u2164", "\u2165", "\u2166", "\u2167", "\u2168", "\u2169", "\u216A"] Image { z: 0 id: background property var toggle: 1 - source: !displayAmbient ? imgPath + "background-classy-roman-white.svg" : - imgPath + "background-classy-roman.svg" + source: !displayAmbient ? imgPath + "background-white.svg" : + imgPath + "background.svg" anchors.horizontalCenter: parent.horizontalCenter anchors.verticalCenter: parent.verticalCenter width: parent.width @@ -50,7 +50,7 @@ Item { states: State { name: "black" PropertyChanges { target: background - source: imgPath + "background-classy-roman.svg" + source: imgPath + "background.svg" } } transitions: Transition { @@ -68,7 +68,7 @@ Item { imgPath + "asteroid_logo_wb.png" anchors.horizontalCenter: parent.horizontalCenter anchors.verticalCenter: parent.verticalCenter - anchors.verticalCenterOffset: -parent.height * 0.37 + anchors.verticalCenterOffset: -parent.height * .37 width: parent.width / 4.4 height: parent.height / 4.4 state: currentColor @@ -89,14 +89,14 @@ Item { Text { z: 1 id: asteroidSlogan - font.pixelSize: parent.height * 0.042 + font.pixelSize: parent.height * .042 font.family: "Raleway" color: "black" - opacity: 0.8 + opacity: .8 horizontalAlignment: Text.AlignHCenter anchors { top: parent.top - topMargin: parent.height * 0.24 + topMargin: parent.height * .24 horizontalCenter: parent.horizontalCenter } text: "AsteroidOS
Hack Your Wrist" @@ -117,16 +117,16 @@ Item { Text { z: 1 id: dayDisplay - font.pixelSize: parent.height * 0.08 + font.pixelSize: parent.height * .08 font.family: "Roboto" font.styleName: "Bold" color: "black" - opacity: 0.8 + opacity: .8 horizontalAlignment: Text.AlignHCenter anchors { verticalCenter: parent.verticalCenter horizontalCenter: parent.horizontalCenter - horizontalCenterOffset: parent.width * 0.215 + horizontalCenterOffset: parent.width * .215 } text: wallClock.time.toLocaleString(Qt.locale(), "d").toUpperCase() state: currentColor @@ -147,16 +147,16 @@ Item { Text { z: 1 id: dowDisplay - font.pixelSize: parent.height * 0.08 + font.pixelSize: parent.height * .08 font.family: "Roboto" font.styleName: "Bold" color: "black" - opacity: 0.8 + opacity: .8 horizontalAlignment: Text.AlignHCenter anchors { verticalCenter: parent.verticalCenter horizontalCenter: parent.horizontalCenter - horizontalCenterOffset: -parent.width * 0.215 + horizontalCenterOffset: -parent.width * .215 } text: wallClock.time.toLocaleString(Qt.locale(), "ddd").toUpperCase().slice(0, 2) state: currentColor @@ -177,15 +177,15 @@ Item { Text { z: 1 id: monthDisplay - font.pixelSize: parent.height * 0.042 + font.pixelSize: parent.height * .042 font.family: "Raleway" color: "black" - opacity: 0.8 + opacity: .8 horizontalAlignment: Text.AlignHCenter anchors { horizontalCenter: parent.horizontalCenter verticalCenter: parent.verticalCenter - verticalCenterOffset: parent.width * 0.22 + verticalCenterOffset: parent.width * .22 } text: wallClock.time.toLocaleString(Qt.locale(), "MMMM
yyyy") state: currentColor @@ -212,18 +212,18 @@ Item { property var rotM: (index - 15) / 60 property var centerX: parent.width / 2 - width / 2 property var centerY: parent.height / 2 - height / 2 - x: centerX + Math.cos(rotM * 2 * Math.PI) * parent.width * 0.47 - y: centerY + Math.sin(rotM * 2 * Math.PI) * parent.width * 0.47 + x: centerX + Math.cos(rotM * 2 * Math.PI) * parent.width * .47 + y: centerY + Math.sin(rotM * 2 * Math.PI) * parent.width * .47 color: "black" width: if (index % 5 == 0) - parent.width * 0.02 + parent.width * .02 else - parent.width * 0.003 + parent.width * .003 height: if (index % 5 == 0) - parent.width * 0.02 + parent.width * .02 else - parent.width * 0.02 - opacity: 0.6 + parent.width * .02 + opacity: .6 transform: Rotation { origin.x: width / 2 origin.y: height / 2 @@ -254,11 +254,11 @@ Item { Text { id: hourText z: 2 - property var heightFontOffest: -parent.height * 0.002 + property var heightFontOffest: -parent.height * .002 font.pixelSize: if (index == 0) - parent.height * 0.113 + parent.height * .113 else - parent.height * 0.10 + parent.height * .10 antialiasing: true font.family: "Roboto Condensed" font.styleName: "Bold" @@ -266,13 +266,13 @@ Item { property var centerX: parent.width / 2 - width / 2 property var centerY: parent.height / 2 - height / 2 x: if (index == 0) - centerX + Math.cos(rotM * 2 * Math.PI) * (parent.width * 0.356) + centerX + Math.cos(rotM * 2 * Math.PI) * (parent.width * .356) else - centerX + Math.cos(rotM * 2 * Math.PI) * (parent.width * 0.41) + centerX + Math.cos(rotM * 2 * Math.PI) * (parent.width * .41) y: if (index == 0) - centerY + Math.sin(rotM * 2 * Math.PI) * (parent.width * 0.356) + heightFontOffest + centerY + Math.sin(rotM * 2 * Math.PI) * (parent.width * .356) + heightFontOffest else - centerY + Math.sin(rotM * 2 * Math.PI) * (parent.width * 0.41) + heightFontOffest + centerY + Math.sin(rotM * 2 * Math.PI) * (parent.width * .41) + heightFontOffest color: "black" text: numeral[index] transform: Rotation { @@ -299,7 +299,7 @@ Item { Image { id: hourSVG z: 3 - source: imgPath + "hour-classy-roman-v3.svg" + source: imgPath + "hour.svg" anchors.horizontalCenter: parent.horizontalCenter anchors.verticalCenter: parent.verticalCenter width: parent.width @@ -307,14 +307,14 @@ Item { transform: Rotation { origin.x: parent.width / 2 origin.y: parent.height / 2 - angle: (wallClock.time.getHours() * 30) + (wallClock.time.getMinutes() * 0.5) + angle: (wallClock.time.getHours() * 30) + (wallClock.time.getMinutes() * .5) } } Image { id: minuteSVG z: 4 - source: imgPath + "minute-classy-roman-v3.svg" + source: imgPath + "minute.svg" anchors.horizontalCenter: parent.horizontalCenter anchors.verticalCenter: parent.verticalCenter width: parent.width @@ -330,7 +330,7 @@ Item { id: secondSVG z: 4 visible: !displayAmbient - source: imgPath + "second-classy-roman.svg" + source: imgPath + "second.svg" anchors.horizontalCenter: parent.horizontalCenter anchors.verticalCenter: parent.verticalCenter width: parent.width From 581bbfcc5318a6b05732c5a62800bb0ef526de5d Mon Sep 17 00:00:00 2001 From: eLtMosen Date: Mon, 27 Dec 2021 18:03:46 +0100 Subject: [PATCH 5/5] Adapt image name and pathes in nixie-delight --- .../{nixie.png => nixie-delight-nixie.png} | Bin .../asteroid-launcher/watchfaces/nixie-delight.qml | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename nixie-delight/usr/share/asteroid-launcher/watchface-img/{nixie.png => nixie-delight-nixie.png} (100%) diff --git a/nixie-delight/usr/share/asteroid-launcher/watchface-img/nixie.png b/nixie-delight/usr/share/asteroid-launcher/watchface-img/nixie-delight-nixie.png similarity index 100% rename from nixie-delight/usr/share/asteroid-launcher/watchface-img/nixie.png rename to nixie-delight/usr/share/asteroid-launcher/watchface-img/nixie-delight-nixie.png diff --git a/nixie-delight/usr/share/asteroid-launcher/watchfaces/nixie-delight.qml b/nixie-delight/usr/share/asteroid-launcher/watchfaces/nixie-delight.qml index fb0dca31..8f8dbee7 100644 --- a/nixie-delight/usr/share/asteroid-launcher/watchfaces/nixie-delight.qml +++ b/nixie-delight/usr/share/asteroid-launcher/watchfaces/nixie-delight.qml @@ -45,7 +45,7 @@ Item { verticalCenterOffset: parent.height * 0.15 } opacity: displayAmbient ? 0.6 : 1.0 - source: "../watchface-img/nixie.png" + source: "../watchface-img/nixie-delight-nixie.png" } Text {