From bea205425ee70214da90e056ff344f57a32d0594 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milie=20Feral?= Date: Tue, 24 Jan 2017 13:28:02 +0100 Subject: [PATCH] [apps] Change app icons Change-Id: I8857c28eb4669d974eb8747f3e62862ab9e79174 --- apps/calculation/calculation_icon.png | Bin 459 -> 1096 bytes apps/graph/graph_icon.png | Bin 459 -> 1290 bytes apps/home/app_cell.cpp | 6 +++--- apps/home/app_cell.h | 3 ++- apps/home/controller.cpp | 4 ++-- apps/probability/Makefile | 3 ++- apps/probability/app.cpp | 2 +- apps/probability/probability_icon.png | Bin 440 -> 1906 bytes apps/regression/regression_icon.png | Bin 459 -> 1642 bytes apps/statistics/stat_icon.png | Bin 459 -> 1517 bytes escher/image/inliner.c | 3 +++ 11 files changed, 13 insertions(+), 8 deletions(-) diff --git a/apps/calculation/calculation_icon.png b/apps/calculation/calculation_icon.png index 3818c7bf1f4fb512cdbab499d0d20a7572f41314..06fcc45baae43a1426b1d8cca321865bde96f165 100644 GIT binary patch delta 1087 zcmX@je1b!P%&GQx4R3&e-K=-cll(X2xoyuWHAGSxDW_4 zrq90wG@aSY)5S3)ZoBp9?O3)>iYe?x)WDS?Y;kL5W-JXlxM|I^qG_r1rY667_wsS&l)LWl zek)cY^L%~G)~L7TKDI}{2HxqCP+2m?qObYUGJ}j8+j<|R@_4I>d#H*3lC6)<+A8IB zVb_xGDVyr%a7#H`?ib3~S+M(;GqCR_}gvFI8Xi)wd{i z#S1f~PyL*_a85jDwdD%~t=sj90x!<+KK}+e;3|w>SBu^*%ozFVy{V$>q}-wNnJr(LSK9Xd$GiKh=qw1wi>mu}~tIPFI^qBKe?&Q^a{(F7Z z)eBRDkLOt$E}ZCPt1Q?5mSa}hMn|2gRmYCBlwFv8H~5?F-(Np3Kl%80`IDl`l3F%~ z!x8VjauSxu=dqR6vK@{%ZgB15SIJ8+pEjP3xL&kj?}nrPZ=%oD9=p@CQ?g|KLC2JM z`HpX5{UueB3F)`*X}#*K3pt&ZG|Q}SS#SMhKYjC%i;jzupKZF?|KzjV+!@{4FZdqa zeB=J?`SU%lm(-Z!CI}tsd%Pv)E1QA6eY-%@=5%4--E*}o6gE09$a1`~Y0b7GhvS-4 zm-X^bkvI@$Ds{)zEcGdimx+{WMw2La${Vq+Rja0WEv-9#IoMA8*oE}`g&c|;lNNlG z?K^i*y&Cryu;t$KUiz3h6tC7lAxQrd#8(1i_^l!Sti~)V@*!&PdGf~ z&xU^E;*WeEi%;(QE0w0PYL$_hncK#QB{6!*v()xR75u7yn?28G8+-iwsR9odAGa{7 zoOJSYxJ9X6r;uFcjko+>+Wm)T7bSsmoN9?{L`h0wNvc(HQ7VvPFfuSS*EKNIH8Kt{ zG_(RD0|RXX5c&ANUKfgn-29Zxv`RD$2Bubq#@eD_9m|(~?g#2%@O1TaS?83{1OWcg B=Sctn literal 459 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NSwWJ?9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fg!ItFh?!xdN1Q+aGJ{c&o z*VDx@B;xSfi+cr|90b}P@=q=FdD$eFalp*uq^uFAWRdg&aplZ{w~Pg*Dp>Qy&>`x~^KW=cKg^!-A96S6t<7_#SX`bV?j^ zZxHCntYNz$oY)=BSgkPaQ8&YUj_^C29~vXN*E4NX&?ppgXj*XWBm-ZQa5|#~N8TLX z0!5WV!2@j*jxjz^+4V~?C;y$&o?zvD-wZB_YdA1+1vD^;EMS=bo1tH+C`~4jYd_E< zswJ)wB`Jv|saDBFsX&Us$iUD{*U&)Mz&OOv*vin{%Gg-jz{twLAn2YLKZ=Ij{FKbJ zN^}ioR;CsZ4IG*?J^(dHf@}!RPb(=;EJ|f?Ovz75Rq)JBOiv9;O-!jQJedj#VFpiE KKbLh*2~7Yx=$7ID diff --git a/apps/graph/graph_icon.png b/apps/graph/graph_icon.png index 3818c7bf1f4fb512cdbab499d0d20a7572f41314..593a3508831314c6dcd065b5c79e11cf42c4c9c1 100644 GIT binary patch delta 1282 zcmV+d1^xQV1BwbEiBL{Q4GJ0x0000DNk~Le0000t0000u2nGNE09lP-laV1Be{Glm z0CSE20Q)!q0E2k|0C52T0PBSS056sR01)cuy6Woy000JJOGiWi{{a60|De66lK=n! z32;bRa{vGr5&!@f5&>tQ(oz5b1Pn<;K~!ko-I_s98%G$1pPBXIf<=-B7bH%2Z#{G4 z*ng5skCl4ut%v51v{esn)kCC8e?2r(4;4~c6g5d{QV<{-FkmkP*tNa8Gdn#j4w%?r z%-Xy0D_PpzncaOK&&)UD@h6NihAz@tqm;rJLmbECO+pAP%X<6iTIVvH)|xO3>A{>! z2_cx6n0N=W11^dpqA1GR>%g*Y8{4+uo)_8&VHl#6%G%$p)NYtIpoH`Be>Dz@q6n?^ zIb0ZqS$j%VZ64Wfef_Oyfs9e?z%P;e>kCh3WrZ99Q~O(P-bvKdDsV!DIC8T$@@kFXB2krH*EI_ zFuHlQ&}=rZt<+DQo-b(aFkO3u)Pp}`P)|c_Im6V^?@S*5akJav5Y!t`r=Wa@8_6_a zBDfei7e3DhPQ(Fs_J5=h?DuzrI)Pvx!de2Al2V70>Xf_H?~vNRf4ZX4(At64>r{b; z1}D`qcXz)*##j9KH8HgQgT_YE1&65A;H2`nxAQf^TrqD2d*Ho-xHVL$RN+J%aJTwx zZ?HH7Z#5ZLBUB1-hC6%TBXy&Dap=P7v!Qpvp}ti90noyS2^a z>GLin22TG@qG5&_e;7^}#q{1!T}om&c{cL#l`356;1Pn$n@a{x{(|5jYc62GZ3Zi> zQ*3U&TX6C`H(&$9P4E8zh|Y`tzYtWj=D8i*g#Qxj@(MqwCXq2`x-nd-{!8Ztb&^EJ z9O_1Jc5?%1E(8&ylK^7$O&*g^xT%AmJ1=;v&}(Iq0~K7?f4#Pn>$=$bn3*^LarS)# z`_S6W%y>V(`);|9{Kw~D?S*j8)i+$pT==)gf0fBXcqnkw!74%)lauHu)9#o$+`ZP* zvm*oEKUsTD7w!YjB4TrUX!{+R!3kMR#+bjJwcqsN0BEd(dB4&*`h!!)(0rY>*CD}q zFUe}FU{DDme<(;PuguDmQu4`H05e(py`;~$fB!=sKK!yLoLF01GkHuoOhYmVf~-9Z zML`fCi^U>Rj#pBHl#vbxX3Q|f*xm+Hbl*Awin4O))vaDn( za2yBE^WJ;FFbrunn>daGTu1{p#<0A+j4_6}xw%{>e{J`Yl#*(-ij%&vcmlQJTo&hSeAt`CRaI`LI{KqXsvNwm)+f678e((R4SeIx~1O7am>cX23uQO z)a!M8-_KP`N+~IoN|eiG78Vw89H(o<{~z<+?3=Q6v5f!#03~!qSaf7zbY(hYa%Ew3 zWdJfTSTQ#(FflDMGgL7#Ix#UiFfc1HF*-0X$F*-0cIy5;eFflqXFiSO}r2qf`07*qoM6N<$f}7nzrvLx| delta 426 zcmeC;I?b%u8Q|y6%O%Cdz`(%k>ERLtq!mDzgAGU)S5!9r%sfuY8gWV%NiPsro_&BV;~|g9gXb1y(;xeM>(;wjIe%t%-uKm- z@|^!R?s`#Jv#q``^^x(W>#7xdPFl+_EI4U>#Z}&h?*TVQr^GS$27!*u8nzq4iQUnR z)e6%dbu-N82*1Pmp)sO+J<~P?jY1)ZrUl1NGVnDCr!#7Bx|t6Jh3QIe8al4_M) zlnSI6j0_CTbPWx34U9t!jjasLt&EMe4UDV|41(^7@lQU>BJPbWZDwU^0g>j=obdq| wG?F0mg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4hf k_iconSize) { - m_nameView.setFrame(KDRect(0, k_iconSize, bounds().width(), bounds().height()-k_iconSize)); + m_iconView.setFrame(KDRect(0,0,k_iconWidth,k_iconHeight)); + if (bounds().height() > k_iconHeight) { + m_nameView.setFrame(KDRect(0, k_iconHeight, bounds().width(), bounds().height()-k_iconHeight)); } } diff --git a/apps/home/app_cell.h b/apps/home/app_cell.h index c8b1da3e6..307e221eb 100644 --- a/apps/home/app_cell.h +++ b/apps/home/app_cell.h @@ -17,7 +17,8 @@ public: void reloadCell() override; void setApp(::App * app); private: - static constexpr KDCoordinate k_iconSize = 32; + static constexpr KDCoordinate k_iconWidth = 55; + static constexpr KDCoordinate k_iconHeight = 56; ImageView m_iconView; PointerTextView m_nameView; bool m_visible; diff --git a/apps/home/controller.cpp b/apps/home/controller.cpp index 68bc54ea1..727e1326c 100644 --- a/apps/home/controller.cpp +++ b/apps/home/controller.cpp @@ -43,11 +43,11 @@ int Controller::numberOfColumns() { } KDCoordinate Controller::cellHeight() { - return 50; + return 98; } KDCoordinate Controller::cellWidth() { - return 50; + return 104; } TableViewCell * Controller::reusableCell(int index) { diff --git a/apps/probability/Makefile b/apps/probability/Makefile index 2557b86c2..b8b370c2f 100644 --- a/apps/probability/Makefile +++ b/apps/probability/Makefile @@ -20,6 +20,8 @@ app_objs += $(addprefix apps/probability/,\ parameters_controller.o\ ) +app_images += apps/probability/probability_icon.png + app_images += $(addprefix apps/probability/images/,\ binomial_icon.png\ calcul1_icon.png\ @@ -36,6 +38,5 @@ app_images += $(addprefix apps/probability/images/,\ focused_uniform_icon.png\ normal_icon.png\ poisson_icon.png\ - probability_icon.png\ uniform_icon.png\ ) \ No newline at end of file diff --git a/apps/probability/app.cpp b/apps/probability/app.cpp index 28146ebfc..ea0267da9 100644 --- a/apps/probability/app.cpp +++ b/apps/probability/app.cpp @@ -1,5 +1,5 @@ #include "app.h" -#include "images/probability_icon.h" +#include "probability_icon.h" namespace Probability { diff --git a/apps/probability/probability_icon.png b/apps/probability/probability_icon.png index e8dbe4dc8b7b86db79487598e18d7575d749d014..464db94e1edf5411ecf9dcf359d6e904068bbec4 100644 GIT binary patch delta 1903 zcmV-#2ax!<1M&_biBL{Q4GJ0x0000DNk~Le0000t0000u2nGNE09lP-laV1Be{Glm z0CSE20Q)!q0E2k|0C52T0PBSS056sR01)cuy6Woy000JJOGiWi{{a60|De66lK=n! z32;bRa{vGr5&!@f5&>tQ(oz5b26Rb8K~!ko)tXyu6xSKYf9K51-n_f^`i^ZJoF*z! zNYe(Rn- zYKE%S+uOsbQ$J?!-e*^aGsbY?!rNTD_{XhoYt1@-{1r}|con4-01LK!o>N#9UG$S*Kc5NW|xeXQ~^{N z7fsu7>+ao2Y~S}c9IC%F#rMC{&9gh3Id>_C@k-3xn_%+JElTsVD5YYDES1XG^%t|Y zjt+M6+Q@bsJ8ZmCXeULkqmOJ$8+VKU;m++_Xe4&P4TBRAUU|Noe^aB|S52dwG_9R| zXl-%(^Uu&a-fpTl3hY~7ZQ`|&z6YjNPMVgsF0%P%R`B5)3r<8xSn$gq4ODFf<)rE8 z+=dZ}6);vf3E_VAgI1Es^r9CY?ic^y*2kBT(iGy(g{dPtO(K&go6R>coCr-xpFL0Z zR3c3o?)?pK`V)*-e*zKk%SdTD_#N@tNwWC@#>8j6*x&>ZBmCrW4rMK}+SK2{n_eM< zLEPEOv(n^RS`jhCWxMz+CxVD!-_zSFaq~C9y}NoI&H|1K8m_}VZmJ8RXM|+zqaqc=C@>J2bT~`; zv*6FIqW}{GKxrE%k&L5R@mcQaflTGOJhA>VOl5b{T7RmRBT(VSCu8}Nf*wz-p&EHxWKkF<7!dcU@9h^k6F)X*E z-6xR@$K3qQ+RKW(6{X4L3qh~gD!8aijywY>2i*UGH&uIq#t(wh6xup4M(T3K>VpF; zWf=NK*d^yasi(N0Oh0hP5~&QCY<**|X1HhxRR3K@3XUw0Cr4 zjHwy0cFT$2SUx}eb{P`wF!Rs)!J?wQdC)dZ*&LZVX3m=6L=6J%u6uV=KdW&SX7@^ z1|1x&ZtK~OlSm<^dIzCuI1xdNVQgfEojp+n3cN2j3=XL{(@Jal`Ug;2SKU3Uf{Va@ zc5sIMPlS6fom%^RBu>Ea{L@J!>3ifc1XUH_e*@tnu%8~7<>lS(q8DBeHXKft%vI@h zhQ9uRh24M6a3X@naBg^pV|&W?z1#$_N@Yu)GEF)9`X5Eq+7?_D&WMmt`TX|ymmL0@ zOQR{%l;e>dkE1OsIEJqlPDI%Ec$wdynBwdG@!a1j1(uHYiYl2(v*Rl}$!7B_I@oIe zfBr+uVj~a4_x&IkgP8iZA8OGLfx6awMR3)nEsbSaLC|{H#mlPqb4n?6aAAfOnY}J2 zL_jGN(L_*(6&LO?6*>$n$zFOxUC9LD7XkI~EXS({X?4~WuAPlB!JW8e*;QqDm?R?T zhZ$fkIgW+y?d_?*qy|)PZx8zD(Iafef9D#TDc|>a>7^s+k&$7H*-UR^<0WDk9UVre zQYp@!JNSwWJ?9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fg!ItFh?!xdN1Q+aGJ{c&o z%G1R$B;xSVb8C4U0(e*+EOu;6Qj=lcC@Vej!G;AM91s6~zqRVyx<{{{mG0m6xaIl@ zquv?I5AriG%;TsO({I_s&)-tRoZa%Lbs7h!Xc$N5R51=u+YN%A4AK)>6O=YF>bM9t zG-|MAD6e9e)sfX8wuo~UzPMpgy}VcN%xP&DM`r(~v8;?|&ER@VpAAPKS|I6tkVJh3R1 k!7(L2DOJHUH!(dmC^a#qvhZXoC^#8BUHx3vIVCg!07C1A?*IS* diff --git a/apps/regression/regression_icon.png b/apps/regression/regression_icon.png index 3818c7bf1f4fb512cdbab499d0d20a7572f41314..09552a31fbc5202be5733b2031cb06527c66dd15 100644 GIT binary patch delta 1637 zcmV-r2AcWH1L_PRiBL{Q4GJ0x0000DNk~Le0000t0000u2nGNE09lP-laV1Be{Glm z0CSE20Q)!q0E2k|0C52T0PBSS056sR01)cuy6Woy000JJOGiWi{{a60|De66lK=n! z32;bRa{vGr5&!@f5&>tQ(oz5b1#C$~K~!ko-I`rf6IU3=|9du@KrmE71SU#NmJw^A z5X4kKrGq-7z3KF(SG{O$XF6W>e>2z{K1ZFYz35GETU(GqW}xO5&?-x^*^ung|4b&?C(m>C{Bq8o=h@An6h%>>B1w`UiXs$6fh@}~n<$C`P1CzC zRi8KEBuN6#^Vo;kl%gmKR;zUnCW`QbE9+4*{~Hb{I7OIEWv994_dW;~}{f(d=5^h$ArZ2z}?@E9k2z z3M5GaDKyMCZhU1l7r31aejd7yu8vlmY;MvNBZ?wOp&Yik88sA4Q55_#JPBuAE&ONC zXpWO*8N}>U^8W7&*xF9wf9ilA6h#&FqY$GzpHIP+FlOhU;ri7cRN1UW$D0=J)m9Qi zzfIv%Zzqnqj_PW|lyIUb;iq3G(Be6cGp9Ye+c72Fy|HP~G(rD`&XU@(loVYC&CW03 z#p*gf`S`MGwNG!}1G91)gj=mn)i}dPF7$j2PZyu# za(@@BRwl2n%zmkEfA@Z&YBv;aYdeLkA3ZE)7r7W7X!dV$VC;D{HXEZO(YL8NN? zRQ(NGEd@cu@aQyJJZ_v~k86tIc^-))J+Sv?(}W~RNT<{L-jC{rv&KhZ58na3^Ab|k zaira!f_L_7jt@-Cfnh8-e@=U)p99o-bFFJyTK^h@V`&gHf42fCB4};}j-^3Zh{R@1!LDX;+UFwiVrUOP-Cwu8<=i5vh%VidroOC zgOR{P_&QF(-Be#zFx_ylHy39|_Re@@YzD_%N72#7mK{ttT(S8E048Uig4^M7skfsd zV7lRo%{Rf7e+d43_9C08naX7!U1usL-@MvNA}}$B3+LNWchpfaFx_xDz(V$&%`GfrWAhaTF8a!vsPm~TS9fGBhUrI( zxOT-4yT(LaYB^UCxKw%vBY}tL_O+s^!Kn@GpK>mze_T1207?Qp(D@?EGVYDdpsCS` z_A_41aix@V`DBU3Vg;SF_yEA{LI@nU1HZ3Da|{5~=PBokX=hJ-Nk7eh^x|a{tKk^@ zU8i8N(8UGoDCa5$x1C61b|C~`yBCfl)kVjPo*U}+lb;(4Cx{XzXBOdUZh*T<+XC{Y zHt9~)e{ycq;w!0dC9js#kCsqXWyQOv^-rNhA^|wsQUCsTU>F91ARrctW$i}6MdRDp zPNdP_+g8+nXZrz`3Ui=vE@v&S^miCmffQ27y)rA)bsXxP!qUrlzLgcDqquUk{q5 zf1xOfsrF=26a|W+AW0Hpu^7VPFuJ?D;q|`$XoFJQdN0c|mY0_i3WX4jMv+RTOf`~( z5Y*Jvz~yqm05UK!H!UzR zEiyAyF)=zZF*-0XD=;xSFfilaE{XsEI{+ngMObuXVRU6WZEs|0W_bWIFflhRFflDM jGgL7#IxsgnG&w6UF*-0XPr!1R00000NkvXXu0mjfloIht delta 426 zcmaFGbDCMPGr-TCmrII^fq{Y7)59eQNGpIa2OE$quB!SnQBkVCN{xY`p@o6r7f`I> z1p`B=0RzLU1O^7H84L{K1#@-<+5jcklDyqr82*Fcg1yTp14Z_Fx;TbJ9DaLouV9md zK-)w9sf9i-o8&SMn0cI(HR6;kl3pOLJo^A!#zP*H2hT0ara$)i)~$E5a{kQjyzi?u z>LcS#*HtU_oV1oSmbF5q^jBLt{kudZuj(8ihg*O$&~lWZ-KOPG{8M$eY7kpr}$Pc%W^2OC7#SFv=^7g78W@Kd8e18fTNxW`8yHy`7zEuDj=obdq| wG?F0mg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4hftQ(oz5b1n)^iK~!ko?V8VT8$}eyzdPP_nxt(irQwVOrzl`V zfCMK_Tt|wCXcV=S8xo?BO7zYjf71i^ik7xf`58rOs8otnCD^n%w+Ss!5_@;O-d(R} zXNH5ZiEGE%wbxlE;&Zb-Z}xpXv)}jD9!Urx@B*&Okj^|pIdvdhZ~FI zoa4r=@3Fk{Q`ot-%zLv*oLiWKBuM}Ox$?o)ua>ZS_kP&;e#9jz@{LDLNo&Ux5*bOcIixfC2#{ug&xInv_f_NS;N z5+S&7?kvW~-b8OcW#j%YYq);%8!#5Uu>~ql2!RXd&tm4xq^I$HeZ81TO@g{E zzP|ZwwVMx$z_z6j0-SRsCdPcnrjl`R&e7nxxqHMh#t@AvzGL&6e*wl=;Nk+?mKAY+ zW7MpMl0(5bN2FWDRg(1zV;s3{6_nC)YzI1}V8wYHM=3>aTdP^=N^FpB8+a+$kD~2B z&1wx-IcT>%&?0UYEaZ07J%t7Bwg)CoSM$)-y&tbChE%kRzUPicqYd4*i)zvc(2Ya2_aaRpT*mwG4%EIHl5J2Y&=-YVCnX9jjcCxM6WnS2S&bt6DNWHnNW_2*vUt8Bu9AgZM;w_oP{YuMtNi z30A>hq1+wY4(-HSrrj`JTKxQr>LD9SDICWEbzN|ef2|maM4-rWwI`*Nh7#Y?(*s3O zK*)c0T6N_lNrEhwUn+_M?r~odNdh4Rkx2RM6(J;)cv+U~e*Kb#5RfDZ(!YZgMe%L> zmH0|>Va4wj$2o({mMqhMVaHd+F$MzO+Jj)XLkK_y2Tz5aM@Kk4cnTzyoP_I! z+YASde@iJ+$w`n@DhbCj!ph1?`J%I`~=x-7LLbz6E0h z{mS?N001R)MObuXVRU6WV{&C-bY%cCFflhRFflDMGgL7#Ix#UiFfc1HF*-0X z1p`B=0RzLU1O^7H84L{K1#@-<+5jcklDyqr82*Fcg1yTp14Z_Fx;TbJ9DaLouV9md zK-)w9sf9i-o8&SMn0cI(HR6;kl3pOLJo^A!#zP*H2hT0ara$)i)~$E5a{kQjyzi?u z>LcS#*HtU_oV1oSmbF5q^jBLt{kudZuj(8ihg*O$&~lWZ-KOPG{8M$eY7kpr}$Pc%W^