From f14b496869e9e679f45e941328aec6d355f7e613 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Candice=20Bent=C3=A9jac?= Date: Mon, 6 Jan 2025 15:31:01 +0100 Subject: [PATCH 1/4] [ui] "About" dialog: Replace 32x32px GitHub icon by SVG file --- meshroom/ui/img/GitHub-Mark-Light-32px.png | Bin 1571 -> 0 bytes meshroom/ui/img/github-mark-white.svg | 1 + meshroom/ui/qml/AboutDialog.qml | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) delete mode 100644 meshroom/ui/img/GitHub-Mark-Light-32px.png create mode 100644 meshroom/ui/img/github-mark-white.svg diff --git a/meshroom/ui/img/GitHub-Mark-Light-32px.png b/meshroom/ui/img/GitHub-Mark-Light-32px.png deleted file mode 100644 index 628da97c70890c73e59204f5b140c4e67671e92d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1571 zcmaJ>c~BE~6izDPQq)#Nu*KOf(n^(VHY9;fiINM65``pc+9*v(mL$bwfCjbc%v9V{8r9iX|O%>Nr%pLD2qT{mty}c=LVleeamv znz3SOSm@kP8jThvOOq(56Yzh*fz(booe!uZij=BJC6+_lbvQ~B8nA2>kXdv_RDtRY z`5QXWWEySCe6vbTs^#f?J!WC*{1~RgVx!nJTJjQyO{dRANgx|FnymtGbD9%JmCh9^y)##j7{Dcqfn*1ta$rG89pJF6w-S7Z037$rr|y0;1Onp_ zGFJdT6Q!1C0AdVB0WOmpuV=AgAQ550Tn+-mivTtYPJmz*#75#_n9oV%!#rSOfmAfy zki%C~=fTp1{O#BLpJ|0jj#m6#|LRWit-vq3PE1z9ZqyvET4sX$-Icqy7t z<=aq5ff86AuBZBu6EjJsYWM0uejufWFTwPA7Su}0Bm$7KFb!q{Um_8~A{LUG#1l(l zSehUda@kU8LIRg9fkk2tZ;~ss5~R+mM<==F7hLHpxqLB>>PQS%Vc7b~?q!%T5+h8Q z4G=4Nzyi5WZ?^gkasJ{?Xhm`JC#WG6$1K2jb@=9&D3EgD#3UhGh#*21rJjulVXjCF zvp76q62jt0zzMG5C7DlfMgPl%C^3+~wf|}Lq=}jz|MmIcQjh1Ok6NjD$Em^Iv26D> z8tt_TnM9~^Tt8mflRGPOrrX|HtT3gG4LEuuk{g2Rn}QgJIa?gZo))!!=o_l9bvD%A zZ`aHajl8#~u?!4f7F#*b*->A=R2L)6!>saz?h>#wTXT-I(XmQ zx{84skS>k=i~i`(6k4C7;Zpfx%dCPVjPayMf8pugtGM=~s=Id1l#8MZJ1-73wV#Q3 zR3>v3%}jbQs1f_Z0xo;%=LILlA+nTpKI4ha%xWW}uqHrNao~&T4AY6m`P$_n-6h*g zhoX+e4n%~gl_lhe#s+AMb7d{5WzvYTa%6Q~si@@4{;s(0zU|H&P3fE+t{7X`S#Cj@ zC#vd}^4pcBD*77Ny5=j$h8EL2_t$O38$SQiJ6fPjJMimypr~MB2(&P0aI|h}$64<0 z>_~duqNjaT=DM^6+N{&B_lED;F2wrl?!4Lk*2((x!fmrcsw+=cI^qttuZ9C}-m~5E z-ryYVpL%^xR#&(0YI5hz<(}F7-p)?FPcyJO-zVO>%9ZDXJH8pnY;GJYFDQ>vd#j_* zRrd}L(r=!g+1#nQwsO?kpS`Qq8`NxE+Zy{gf7*_7J*U2V_|NpLo{iasj7VCg_V9&| ShohtYzipXxh2)4xTk \ No newline at end of file diff --git a/meshroom/ui/qml/AboutDialog.qml b/meshroom/ui/qml/AboutDialog.qml index ed25fde087..a9cb1379d7 100644 --- a/meshroom/ui/qml/AboutDialog.qml +++ b/meshroom/ui/qml/AboutDialog.qml @@ -85,7 +85,7 @@ Dialog { onClicked: Qt.openUrlExternally("https://alicevision.org/association/#donate") } ToolButton { - icon.source: "../img/GitHub-Mark-Light-32px.png" + icon.source: "../img/github-mark-white.svg" icon.width: 24 icon.height: 24 ToolTip.text: "Meshroom on Github" From efb1d80032d699a6ea191dc8cb7b95feeba48eef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Candice=20Bent=C3=A9jac?= Date: Mon, 6 Jan 2025 15:31:35 +0100 Subject: [PATCH 2/4] [ui] "About" dialog: Use correct MaterialIcon for website icon --- meshroom/ui/qml/AboutDialog.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meshroom/ui/qml/AboutDialog.qml b/meshroom/ui/qml/AboutDialog.qml index a9cb1379d7..bf5be49e7a 100644 --- a/meshroom/ui/qml/AboutDialog.qml +++ b/meshroom/ui/qml/AboutDialog.qml @@ -71,7 +71,7 @@ Dialog { spacing: 4 Layout.alignment: Qt.AlignHCenter MaterialToolButton { - text: MaterialIcons._public + text: MaterialIcons.public_ font.pointSize: 21 palette.buttonText: root.palette.link ToolTip.text: "AliceVision Website" From 170c683db51c291c380f3adfee7a13c837d5d998 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Candice=20Bent=C3=A9jac?= Date: Mon, 6 Jan 2025 15:32:11 +0100 Subject: [PATCH 3/4] [ui] "About" dialog: Harmonize colors across all icons --- meshroom/ui/qml/AboutDialog.qml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/meshroom/ui/qml/AboutDialog.qml b/meshroom/ui/qml/AboutDialog.qml index bf5be49e7a..9e044b87a7 100644 --- a/meshroom/ui/qml/AboutDialog.qml +++ b/meshroom/ui/qml/AboutDialog.qml @@ -73,14 +73,12 @@ Dialog { MaterialToolButton { text: MaterialIcons.public_ font.pointSize: 21 - palette.buttonText: root.palette.link ToolTip.text: "AliceVision Website" onClicked: Qt.openUrlExternally("https://alicevision.org") } MaterialToolButton { text: MaterialIcons.favorite font.pointSize: 21 - palette.buttonText: root.palette.link ToolTip.text: "Donate to get a better software" onClicked: Qt.openUrlExternally("https://alicevision.org/association/#donate") } @@ -88,6 +86,7 @@ Dialog { icon.source: "../img/github-mark-white.svg" icon.width: 24 icon.height: 24 + icon.color: palette.text ToolTip.text: "Meshroom on Github" ToolTip.visible: hovered onClicked: Qt.openUrlExternally("https://github.com/alicevision/meshroom") @@ -96,21 +95,18 @@ Dialog { text: MaterialIcons.bug_report font.pointSize: 21 ToolTip.text: "Report a Bug (GitHub account required)" - palette.buttonText: "#F44336" property string body: "**Configuration**\n" + config.text onClicked: Qt.openUrlExternally("https://github.com/alicevision/meshroom/issues/new?body="+body) } MaterialToolButton { text: MaterialIcons.forum font.pointSize: 21 - palette.buttonText: Qt.lighter(systemPalette.buttonText, 1.3) ToolTip.text: "Public Mailing-List (open discussions, use-cases, problems, best practices...)" onClicked: Qt.openUrlExternally("https://groups.google.com/forum/#!forum/alicevision") } MaterialToolButton { text: MaterialIcons.mail font.pointSize: 21 - palette.buttonText: Qt.lighter(systemPalette.buttonText, 1.3) ToolTip.text: "Private Contact (alicevision-team@googlegroups.com)" onClicked: Qt.openUrlExternally("mailto:alicevision-team@googlegroups.com") } From 728f2ea22fb1058be7ba13059709b9318df492b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Candice=20Bent=C3=A9jac?= Date: Mon, 6 Jan 2025 15:40:42 +0100 Subject: [PATCH 4/4] [ui] "About" dialog: Update GitHub links to Meshroom's repo --- meshroom/ui/qml/AboutDialog.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meshroom/ui/qml/AboutDialog.qml b/meshroom/ui/qml/AboutDialog.qml index 9e044b87a7..554b4c3d7f 100644 --- a/meshroom/ui/qml/AboutDialog.qml +++ b/meshroom/ui/qml/AboutDialog.qml @@ -89,14 +89,14 @@ Dialog { icon.color: palette.text ToolTip.text: "Meshroom on Github" ToolTip.visible: hovered - onClicked: Qt.openUrlExternally("https://github.com/alicevision/meshroom") + onClicked: Qt.openUrlExternally("https://github.com/alicevision/Meshroom") } MaterialToolButton { text: MaterialIcons.bug_report font.pointSize: 21 ToolTip.text: "Report a Bug (GitHub account required)" - property string body: "**Configuration**\n" + config.text - onClicked: Qt.openUrlExternally("https://github.com/alicevision/meshroom/issues/new?body="+body) + property string body: "**Configuration**\n\n" + config.text + onClicked: Qt.openUrlExternally("https://github.com/alicevision/Meshroom/issues/new?body="+body) } MaterialToolButton { text: MaterialIcons.forum