Add support for website links

raspberrypi · May 7, 2021 · 4a039b7 · 4a039b7
1 parent 86cf72b
commit 4a039b7
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 3 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,10 @@
+rpi-imager (1.6.2) unstable; urgency=medium
+
+  * Add website link support
+  * Add CLI support 
+
+ -- Floris Bos <[email protected]>  Fri, 07 May 2021 13:19:19 +0200
+
 rpi-imager (1.6.1) unstable; urgency=medium
 
   * When saving advanced options delay modifying files

diff --git a/icons/ic_info_12px.png b/icons/ic_info_12px.png
diff --git a/icons/ic_info_16px.png b/icons/ic_info_16px.png
diff --git a/main.qml b/main.qml
@@ -374,6 +374,7 @@ ApplicationWindow {
                     name: qsTr("Back")
                     description: qsTr("Go back to main menu")
                     tooltip: ""
+                    website: ""
                 }
             }
 
@@ -414,6 +415,7 @@ ApplicationWindow {
             name: qsTr("Erase")
             description: qsTr("Format card as FAT32")
             tooltip: ""
+            website: ""
         }
 
         ListElement {
@@ -479,8 +481,11 @@ ApplicationWindow {
                         font.family: roboto.name
                         textFormat: Text.RichText
                         text: {
-                            var txt = "<p style='margin-bottom: 5px;'><b>"+name+"</b></p>"
-                            txt += "<font color='#1a1a1a'>"+description+"</font><font style='font-weight: 200' color='#646464'>"
+                            var txt = "<p style='margin-bottom: 5px; font-weight: bold;'>"+name
+                            if (typeof(website) == "string" && website) {
+                                txt += " &nbsp; <a href='"+website+"'> <img src='icons/ic_info_16px.png' align='top'></a>"
+                            }
+                            txt += "</p><font color='#1a1a1a'>"+description+"</font><font style='font-weight: 200' color='#646464'>"
                             if (typeof(release_date) == "string" && release_date)
                                 txt += "<br>"+qsTr("Released: %1").arg(release_date)
                             if (typeof(url) == "string" && url != "" && url != "internal://format") {
@@ -496,6 +501,7 @@ ApplicationWindow {
 
                             return txt;
                         }
+                        id: osText
 
                         /*
                         Accessible.role: Accessible.ListItem
@@ -538,7 +544,11 @@ ApplicationWindow {
                 }
 
                 onClicked: {
-                    selectOSitem(model)
+                    if (osText.hoveredLink) {
+                        Qt.openUrlExternally(osText.hoveredLink)
+                    } else {
+                        selectOSitem(model)
+                    }
                 }
             }
         }

diff --git a/qml.qrc b/qml.qrc
@@ -26,5 +26,7 @@
         <file>countries.txt</file>
         <file>timezones.txt</file>
         <file>UseSavedSettingsPopup.qml</file>
+        <file>icons/ic_info_16px.png</file>
+        <file>icons/ic_info_12px.png</file>
     </qresource>
 </RCC>