From 7f8411c3b775bf4281d79dea34b9b13f17b0a689 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 18 Apr 2019 22:38:12 +0200 Subject: [PATCH] [welcome] Add standard language-chooser icon - After discussion with Red Hat UI advice, switch to standard icon - Tooltip as well --- src/modules/welcome/CMakeLists.txt | 2 + src/modules/welcome/WelcomePage.ui | 40 +++++++------------- src/modules/welcome/language-icon-128px.png | Bin 0 -> 4634 bytes src/modules/welcome/language-icon-48px.png | Bin 0 -> 2315 bytes src/modules/welcome/welcome.qrc | 6 +++ 5 files changed, 21 insertions(+), 27 deletions(-) create mode 100644 src/modules/welcome/language-icon-128px.png create mode 100644 src/modules/welcome/language-icon-48px.png create mode 100644 src/modules/welcome/welcome.qrc diff --git a/src/modules/welcome/CMakeLists.txt b/src/modules/welcome/CMakeLists.txt index 415faa500..d702321f7 100644 --- a/src/modules/welcome/CMakeLists.txt +++ b/src/modules/welcome/CMakeLists.txt @@ -32,6 +32,8 @@ calamares_add_plugin( welcome WelcomePage.cpp UI WelcomePage.ui + RESOURCES + welcome.qrc LINK_PRIVATE_LIBRARIES calamaresui ${CHECKER_LINK_LIBRARIES} diff --git a/src/modules/welcome/WelcomePage.ui b/src/modules/welcome/WelcomePage.ui index a5197fef5..51fa19c04 100644 --- a/src/modules/welcome/WelcomePage.ui +++ b/src/modules/welcome/WelcomePage.ui @@ -13,6 +13,9 @@ Form + + Select language + @@ -46,7 +49,7 @@ - + @@ -64,21 +67,15 @@ - - - - 1 - 0 - + + + Select language - &Language: + - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - languageWidget + + :/welcome/language-icon-48px.png @@ -92,19 +89,6 @@ - - - - Qt::Horizontal - - - - 40 - 20 - - - - @@ -217,6 +201,8 @@ - + + + diff --git a/src/modules/welcome/language-icon-128px.png b/src/modules/welcome/language-icon-128px.png new file mode 100644 index 0000000000000000000000000000000000000000..9f4bf21477c314cdc5e459fe3beb457abda077a8 GIT binary patch literal 4634 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 literal 0 HcmV?d00001 diff --git a/src/modules/welcome/language-icon-48px.png b/src/modules/welcome/language-icon-48px.png new file mode 100644 index 0000000000000000000000000000000000000000..4012a4bee05f8f3e38a6f9efe0ff705361b094a7 GIT binary patch literal 2315 zcma)8XHXN`5>5hGKoA8(HDII$2wg*{N&->^Bs3|ZM2dvuL8N(+qF$sU0V7?J0SN*c z+NC6*NW0V#5CuXJFd&8|oq#X?et+JN-92;8w>$HFyE}7|>}<^i`6c-Q0Dz#y4U_{n zYW%TNC%E1jw4cZgr-?UQ!vFw*^M4HZiTQxTy#$lcE+o@XoHr?u5F+ash{pjmG}X2A z)HSt@iJ6^Tg!CW8Ey5jAgm)+oaLte4gOfE248=tdLhpvjn%>g=PyPHA001Nv=;%Un zv9U(_67X>EKQMSCo(KQ}Fpg$w2*Cfo1jMr^`_l6@L{H4d6nzM7&-K#zG9D&@RS3Scl&o1+V)JN(E4>uw?MZE6BE*=HY%~YImW&wHRg~ia3 znSxhuO>K(^tJ>!v7_TOAck(mgka6X%!Uv5h%4yILI&$DHZe*}BFQOaDLTZosmA%Hl zRH3!mQVu%1vUhsM5bVk~>ULv$iG~Nca97G_>%9UG*jh?UfSxX_enPcwTA{me=7L%M zM6je5UFQ58ZOVV$+XRvf8^?>hn{1uQan#W!z4Jr(LgDNdCU%TqbCWjKUool&h1` z<}~Vx=kQG^cpe<^H#9qj_@a39tO_kFo`AsdV_>yoieR1$wKvTYA7_bLbxxF=a)**m zol>~Rr|*oNxd*T@of;dNlPhNj6U$gg)g?C8-}D7RR3oiUmI4%O=yGYt43}(P)ZOmD@J8sY&m_ z+O*;6#102HH{=Rv;T0Iv9A{_}$Ug~s0YMP7ayci3r0rT-T5u$iW7(!MuQlHL#l=14 z378Z>ir7G-X$_B#mWD?}SgC@^et!i4$@uH`*)^i*<;JhU^C6A5rx`ISRI0)~POO=U zt84BTc6cCxK%r7$xyG>!mnx?~JU%BrKE4iWloW^SdzQoup;TAHlTc77baR!d&*dSr zbxRcex$3rJcZLkbJOg5(BYD)tS8x(lK9bbycfN%QZwz5(&CSg{$|A&`@F}KeS{4JJ*T92lqpiiyE77PUi1>M^oTx?+$Rj+K3{clu_EL*!U?~YgZ zHsB{qOG{CyX0Nt(cm0oeqoboyC=>>xnLkibWa0`t8HUVst#VQY3kW6hWOSRN(R_3| z-MuMP{_^2irE~4Q6(@iw`Xz&5Bz84UnorfURh-h-nIxhZxxXpj63+f`r}iBGV=Y<) zLRwT*R5;BH$j}46b4e9b_Zpw*AL8!yVH6ap-)RTNc#c!m{=F|AN;?o;kl23xCTU~97jgGF> zTR!7SOG_)EQh6U<8xO7ETrVh?xN7Jc_Di)jtdKRgx?b9sve8Wm@-hKjW{HJ{Sjm?7O* z4FGX#$sS_-puZ`MB`zc5Kai*E=;+x0u`n<XUsr~wKG1S7#tN1k)MuB_e#Q--V-P5J@ zpjA~>r~T!)RkeHsRvy?nyb@vD-H4fFHa*4 z28V}*O-)TDCQZPgPv?XZH=^lNtx>n8LK=T_W%B}EjazIVibrBkYa7hOS`UIykL;8l z4YB6A1GJ$Zv3iCPz5SzaV`D>T_R@s>xE#J6iWPV(vUdsV^LI^3=EJz&^`)hy7v<&t zU)FYGfm6K4$>ILUi=Z<+gQ>?L8NTowPn_ZF>4G1aX2RxYupXQbDIo zwlYVoz14^kdxq;)=S^P&T+onBIflsNEMhsXF1N{=Xwm%qtl3}hJE81wB(vs2Pf5_ycTi;$1eNWOiT2VcN$`F4Os z0N^;y$=>MjU=6VDUst2&wHP?g(8q{{jm-KtKQh literal 0 HcmV?d00001 diff --git a/src/modules/welcome/welcome.qrc b/src/modules/welcome/welcome.qrc new file mode 100644 index 000000000..37462e0a6 --- /dev/null +++ b/src/modules/welcome/welcome.qrc @@ -0,0 +1,6 @@ + + + language-icon-128px.png + language-icon-48px.png + +