From 4a039b78853a87b665b7ab89d819f36af591a1b1 Mon Sep 17 00:00:00 2001
From: Floris Bos <bos@je-eigen-domein.nl>
Date: Fri, 7 May 2021 13:10:23 +0200
Subject: [PATCH] Add support for website links

---
 debian/changelog       |   7 +++++++
 icons/ic_info_12px.png | Bin 0 -> 244 bytes
 icons/ic_info_16px.png | Bin 0 -> 692 bytes
 main.qml               |  16 +++++++++++++---
 qml.qrc                |   2 ++
 5 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 icons/ic_info_12px.png
 create mode 100644 icons/ic_info_16px.png

diff --git a/debian/changelog b/debian/changelog
index 0af3529..19bdb9d 100644
--- 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 <bos@je-eigen-domein.nl>  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
new file mode 100644
index 0000000000000000000000000000000000000000..2990d44e39623bc800b7b42d7331563786d7375d
GIT binary patch
literal 244
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&k&H|6fVg?3oArNM~bhqvgP;i;2
zi(`n!#HkZ6@*Xnaaf#RZ7uhIi#1tf+AZq2Pc7iYG0^^D!9I}mqFIe2frKY&Ka(z#Y
zEVrBg_6*NK-piaE2UsmW9c1cx75!#@r+TBb8ov!!5-;a@vEMff_hx^JnWX#e=GH5o
zPj;8~#!vR{5PtF@OGIV5v+udrZ`MqS*|lr4^DPIa*36?yjqmPs8OFbS9h9c=daCfh
ox)`ptPX3H}p=wuO{XD{WueZZC`_9I*AU`p9y85}Sb4q9e02#PkRsaA1

literal 0
HcmV?d00001

diff --git a/icons/ic_info_16px.png b/icons/ic_info_16px.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2bfb4a6ef9ad3a139b1e940c20c1eaf90a572e6
GIT binary patch
literal 692
zcmV;l0!#ggP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iTWdvHMC>5qkfFM0K~%(1t5Adrp;l<s!Q|2pp-DrM
z;^HW{799LotU9<j>+0Yt2!bCVZf;JBE>hzEl0u6Z503ls?%w0>9pJB*nQC^70jg#h
z>10C4=2nEzD}v}m1S9B`n5oZ-VhWz)>mEM7-o<&A_qjhuM9G^B@Cn2-OgAjzb>gW_
zOXs{#9Aza*AwDM_HRyuGk6f2se&bwp*v~VgMkYN+93>WtZ7jDjD;X;BBymhpHOlvA
zT~;`6aaPM!*1RWwVK}cXFL9mbAd*<XB18y~QN;$zun?zJBgI6T_7fid0mm<rOD5L_
z7&+!qfeOj-ga5(rZq35PxSJGC0KpgA{uly6yFjC6+uz5w-8caP&%l+|@>lA>^e5@H
zmKHk#dbWX!>y{?(0hc>K|C25mk|PCZ`U?f%{fxdT2lU+n-K%bI&3&9c02%5kbpsq6
z0>eehUh{Z&S9@>&o@w^?13rLqlBB6QVgLXD24YJ`L;(K){{a7>y{D4^000SaNLh0L
z01FZT01FZU(%pXi00007bV*G`2jv9@4K5`w4ZZ~c006K_L_t(I%gvI(4FVw$MW1Bv
z+kz!ff{9zewz5`01#S&?KmluF30s0KP=OvmGYnufG0}e_Gk@NY5AbVkipsQX0SAmg
zpQ-`yfMXu6ZNRix;35XK0<dEq))EjmuX6Zy+(*;ltRePs6C)b##b&8Kc>(A|V=My7
zH&gR=ij2N~1N8Ko=JT|-XEG|BcNJ;?{{g_)08Wx+2J)Od?rR?@4>2|@a8j9sRI_sU
aKXeByj4$K1B()C!0000<MNUMnLSTXeU?e*L

literal 0
HcmV?d00001

diff --git a/main.qml b/main.qml
index ccf9f14..9ece54d 100644
--- 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
index fc65b57..b2465b2 100644
--- 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>