From b73cd4d5ef7b603aa25802f9fd55e9f9cbd8f925 Mon Sep 17 00:00:00 2001 From: Jarol Rodriguez Date: Tue, 31 Jan 2023 18:37:36 -0500 Subject: [PATCH 1/2] qml: replace the current export icon with the export-outline icon Currently we included the export filled icon from the icon set, but the design file now specifies that we use the export-outline icon as the export icon. --- src/qml/res/icons/export.png | Bin 695 -> 785 bytes src/qml/res/src/export.svg | 7 +++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/qml/res/icons/export.png b/src/qml/res/icons/export.png index 636e8221b35e02505446d82b3b98dad677c713ee..b972487e046f417b953f6c334297bec960fb296e 100644 GIT binary patch literal 785 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H0wgodS2{2-Fx~KUaSW-r_4bxywy>iF+k@>} zqq3Tx1igv$$X~iw`{IqsORscq)A+~D&t-dLa=7M{xBLPsymCzc8pGb~-0~&l!fYk3 zy;ICWwme?CMtHW#Zfon$XVc=I8O5K_`)!w!Zfwomxj?N+)NL+Rz)0) zT6VK~)z9ClA6pp=+Qfe(R!nO7{QdOfZiWQ6-=7mJ|J~Ey$H4IJvBvUfYoq@6G7O?J z&qVgW*PWoUue#xF-zS#nZEOcqKFTsbSQz%_nD!JExtd7~@{it0PD`ElyNN;Ky58%x z@*nRqoyj;VYyW6B>x}DNlR$i(zuGmO_5lo$kN5=+w3gR$bM|K+x$D-*xanB9gYCO( z+}smv_c5J%&YfkgAue)2<=@X)NxY^#5%=X2*cEPHP~YTygss7+CZA!+qiQAv@%!8i zCx6H>B%I56qHlL#UrLQUL*L}%$8{EM`OWZ`J!5IdeZS3p0U`~YTMC+L&wTxxHYH7V z;e+?gpJu-k!XExeq6au0Obp|(WUi1eH($c|F7v2wI)nVmdKI;Vst084K<+yDRo literal 695 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H0wgodS2{2-Fx7dwIEGX(zP-ZSBNxqZ^yB|m zKU<|g&n#`0a?I5(3!0sndpxuG*0#58TXT2MZL_|bVp+W}zpBnWYx?v0d@*Ax%QmhkokcT*|Xx{{1PerxbO#oY?ij62W#d7jNY<*|&TPddvJpu_^b{;!`)8S9>w<$ON=%syT| zVS3#@BZuI>kFT>utlVFl+8|%C3`72v3^5(HRgx8R>DsXB}(sege zd!B%pUkt+Bru&7yb4(IRP>yt+H@|@)Uo-s3@%a-NW_O#~GcvLXtUAhlsDICbz%P&e z{TldM`rOa+=i6s8-V&~w^8c;6zC*kd_viWZ_b|NXe7b2uyUfBgpu)I@>wg@#eE23T zt&m_T`SZMgQA0x_kSc3vFiiQl(#=N2qpIP9%mTZ_mi;r&MmHT{>#!(~IIT0S(CE+p zFPsV%d=D6KB83ZHG6{A`TaPd4x zv-W4pm$b-i<9uenj7L*>dhAl0|9o3LH18XAhA%a%x86Uo>0bg{c+$LoQ&LUTT2nt* on`R21UU~li9|yyk$Y3wKE^qfDmQeY*zy!(Q>FVdQ&MBb@03@+G*8l(j diff --git a/src/qml/res/src/export.svg b/src/qml/res/src/export.svg index 6bcb7e4a94..e3531ee05c 100644 --- a/src/qml/res/src/export.svg +++ b/src/qml/res/src/export.svg @@ -1,5 +1,4 @@ - - - - + + + From 515e2fae2d48470dcd5318b6a0c985eab5eaa912 Mon Sep 17 00:00:00 2001 From: jarolrod Date: Tue, 31 Jan 2023 02:50:15 -0500 Subject: [PATCH 2/2] qml: make external links follow the specs in the design file --- src/qml/components/AboutOptions.qml | 5 ++--- src/qml/controls/ExternalLink.qml | 32 ++++++++++++++--------------- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/src/qml/components/AboutOptions.qml b/src/qml/components/AboutOptions.qml index d14d91dde9..45deeb7e0a 100644 --- a/src/qml/components/AboutOptions.qml +++ b/src/qml/components/AboutOptions.qml @@ -17,7 +17,6 @@ ColumnLayout { parentState: websiteLink.state description: "bitcoincore.org" link: "https://bitcoincore.org" - iconSource: "image://images/caret-right" } onClicked: loadedItem.clicked() } @@ -29,7 +28,6 @@ ColumnLayout { parentState: sourceLink.state description: "github.com/bitcoin/bitcoin" link: "https://github.com/bitcoin/bitcoin" - iconSource: "image://images/caret-right" } onClicked: loadedItem.clicked() } @@ -41,7 +39,6 @@ ColumnLayout { parentState: licenseLink.state description: "MIT" link: "https://opensource.org/licenses/MIT" - iconSource: "image://images/caret-right" } onClicked: loadedItem.clicked() } @@ -54,6 +51,8 @@ ColumnLayout { description: "v22.99.0-1e7564eca8a6" link: "https://bitcoin.org/en/download" iconSource: "image://images/caret-right" + iconWidth: 18 + iconHeight: 18 } onClicked: loadedItem.clicked() } diff --git a/src/qml/controls/ExternalLink.qml b/src/qml/controls/ExternalLink.qml index cb71151737..9cb7a1b2fd 100644 --- a/src/qml/controls/ExternalLink.qml +++ b/src/qml/controls/ExternalLink.qml @@ -12,9 +12,9 @@ AbstractButton { required property string link property string description: "" property int descriptionSize: 18 - property url iconSource: "" - property int iconWidth: 18 - property int iconHeight: 18 + property url iconSource: "image://images/export" + property int iconWidth: 22 + property int iconHeight: 22 property color iconColor property color textColor state: root.parentState @@ -66,21 +66,19 @@ AbstractButton { } } } - Loader { - Layout.fillWidth: true - active: root.iconSource.toString().length > 0 - visible: active - sourceComponent: Button { - icon.source: root.iconSource - icon.color: root.iconColor - icon.height: root.iconHeight - icon.width: root.iconWidth - background: null - onClicked: root.clicked() + Button { + leftPadding: 0 + topPadding: 0 + bottomPadding: 0 + icon.source: root.iconSource + icon.color: root.iconColor + icon.height: root.iconHeight + icon.width: root.iconWidth + background: null + onClicked: root.clicked() - Behavior on icon.color { - ColorAnimation { duration: 150 } - } + Behavior on icon.color { + ColorAnimation { duration: 150 } } } }