Add custom bfb icon in /custom/graphics

With this commit, a custom SVG file will be loaded from /custom/graphics/homebutton.svg and used rather than the default icon. This allows distributors to have their own logo or another symbol as the bfb icon. This repurposes the WallpaperResolver, so I've renamed it to ImageResolver to better suit its new job.
ubports · Oct 14, 2020 · e9db69f · e9db69f
1 parent 271e579
commit e9db69f
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 11 deletions.
diff --git a/qml/Components/WallpaperResolver.qml → qml/Components/ImageResolver.qml b/qml/Components/WallpaperResolver.qml → qml/Components/ImageResolver.qml
diff --git a/qml/Launcher/LauncherPanel.qml b/qml/Launcher/LauncherPanel.qml
@@ -90,16 +90,27 @@ Rectangle {
             color: UbuntuColors.orange
             readonly property bool highlighted: root.highlightIndex == -1;
 
-            Icon {
+            Image {
                 objectName: "dashItem"
                 width: parent.width * .6
                 height: width
                 anchors.centerIn: parent
-                source: "graphics/home.svg"
-                color: "white"
+                source: homeIconResolver.background
                 rotation: root.rotation
             }
 
+            ImageResolver {
+                id: homeIconResolver
+                objectName: "homeIconResolver"
+
+                readonly property url defaultHomeIcon: "graphics/home.svg"
+
+                candidates: [
+                    "file:///custom/graphics/homebutton.svg",
+                    defaultHomeIcon
+                ]
+            }
+
             AbstractButton {
                 id: dashItem
                 anchors.fill: parent

diff --git a/qml/Shell.qml b/qml/Shell.qml
@@ -157,7 +157,7 @@ StyledItem {
 
     property real edgeSize: units.gu(settings.edgeDragWidth)
 
-    WallpaperResolver {
+    ImageResolver {
         id: wallpaperResolver
         objectName: "wallpaperResolver"
 

diff --git a/tests/qmltests/CMakeLists.txt b/tests/qmltests/CMakeLists.txt
@@ -24,7 +24,7 @@ add_unity8_qmltest(Components ResponsiveGridView)
 add_unity8_qmltest(Components SharingPicker)
 add_unity8_qmltest(Components Showable)
 add_unity8_qmltest(Components VirtualTouchPad)
-add_unity8_qmltest(Components WallpaperResolver)
+add_unity8_qmltest(Components ImageResolver)
 add_unity8_qmltest(Components ZoomableImage)
 add_unity8_qmltest(Greeter Clock)
 add_unity8_qmltest(Greeter Greeter)

diff --git a/...ests/Components/tst_WallpaperResolver.qml → ...qmltests/Components/tst_ImageResolver.qml b/...ests/Components/tst_WallpaperResolver.qml → ...qmltests/Components/tst_ImageResolver.qml
@@ -26,15 +26,15 @@ Image {
     width: units.gu(70)
     height: units.gu(70)
 
-    source: wallpaperResolver.background
+    source: imageResolver.background
 
-    WallpaperResolver {
-        id: wallpaperResolver
+    ImageResolver {
+        id: imageResolver
     }
 
     UnityTestCase {
         id: testCase
-        name: "WallpaperResolver"
+        name: "ImageResolver"
         when: windowShown
 
         function test_background_data() {
@@ -68,8 +68,8 @@ Image {
         }
 
         function test_background(data) {
-            wallpaperResolver.candidates = data.list;
-            tryCompare(wallpaperResolver, "background", data.output);
+            imageResolver.candidates = data.list;
+            tryCompare(imageResolver, "background", data.output);
         }
     }
 }