From 111cd04f339da8eea9ceae2729c07dad438923d9 Mon Sep 17 00:00:00 2001 From: Doug Bell Date: Sun, 8 Apr 2018 13:12:04 -0400 Subject: [PATCH] change main icon from png to svg format --- icons/calc_lg.png | Bin 241 -> 1578 bytes icons/calc_sm.png | Bin 216 -> 756 bytes icons/rpcalc-icon.png | Bin 241 -> 1578 bytes icons/rpcalc-icon.svg | 235 ++++++++++++++++++++++++++++++++++++++++++ install.py | 18 ++-- uninstall.py | 4 +- 6 files changed, 246 insertions(+), 11 deletions(-) create mode 100644 icons/rpcalc-icon.svg diff --git a/icons/calc_lg.png b/icons/calc_lg.png index 48f5f912b62d89c3a1cf4668c6b262012738ec23..f22871cf40a61febad3b447ea0d188db603687fc 100644 GIT binary patch delta 1573 zcmV+=2HN@Y0jdm;7=H)`0001UdV2H#000DYLP=Bz2nYy#2xN!=000SaNLh0L00AHX z00AHY-}qLu0000PbVXQnQ*UN;cVTj60C#tHE@^ISb7Ns}WiD@WXPfRk8UO$Vr%6OX zR9JL|pnNcj##jPzK^C`2u&C^`(*kWNrO?tcOQ+M$_TKfwo4!uzGG+OHnRDO$ zpL_oA-t*2qBPdl5qc9ao7NF3JY(ON9CE!ok0R%dd5Qr#3hLHpSFG9AW^8+>hKN$wB z2izYL@l zpl~@*2Y3L2l}!&E9KfnN$y_+m7znYP@{Ih{0ssVu0e?d0TF^Qo4<$lfYVM$&sD0h= z1Za8%fQ)PSkJmkv0B3P7_JT}fAXqy*0kwhu5Yz+seyl;pQzq|_7%_Kj!jdy6%_|;? zYc(yMg9zS?-VV~ZC$t^=@P<$ChfJTzVB7t^?42FVa zI9+5oT`Zb8-=x$vH!`VU9OXrBW|mH4%7oq=Yk%>!Q8uxJ@*+1&<~*Go5sKUe-nT#FNn$H>dd0VKYlpFk+cm8Na(Tck{gh`l~8cKSA)uKx!WjayK6TrhA_%{dhut|LB7Qh}8qd z8-M6r6x?bPP++&&*t78?>^2+GSd32(?&rd_Y5*3`TFBZ(D*$M0xyid<>@XMDwc$N- zvs7a7IA0yB;E!{sdZI0$+V@xAVEv(k_zoZ%i*co?jtr-ZoXl+ImCrUw=dNDH7s063FAhMG3PGTd&qFQP)B63VA`Cdm4C(a_XZpI#?MdpgM0-b5DKE{IxXHdx+7uE z)EZw?DBOkBYNb8krMbO@Hve62-)#lJ7Yv{Xg;rl1k!XZ}J?D{9f?zD|;g3mbVFs_Q zZuKfKdC>U>g%nRx<2}_g9K7erca8?;16ULbE=M|cn;pB&PE3oNG>1J6huwkQW`9Qr zfu9biOy2Kj0p0J^TzaQlWy8-F`;G--CD zrT2FD@C5?^IMW;yTfj~$%sA!PvC6wbv!Vn_!=RngOQBeU)yR|+YjsoKoJTbzPcH!#R&Dz=i8~ieg&km3OGA>681okeF;PWn(o}< zX4`FZYR;7Drd^qojMIzDaet;6EnO(wMODLI9%LzktI00sw+tAuiQ>5-hEFm;%(Lz)!>C-WSBC;Rygs zqF*e0wDCEbItdMEAlHFd24WP*Tm&wp$OI`67}ZCbf9W$ZYD^G__a0wPMiC-}6kY!V X9Hkduks5TS00000NkvXXu0mjf7@f+{ delta 225 zcmZ3*^O13aL_HHT0|Nt}$fR^2#S`EY;u`Z{0k?}5knCN2GR$n-IiNUWNswPKgTu2M zX&_FLx4R2N2dk_Hki%Kv5n0T@z%2;EjP)t;6M=&4C7!;n?3YpMO3Hg;ITXe;zi1`&8c(K>HfUiyS*L!`zrN4KF{-g_8yOvU>EZRe4|?|N?bI{V8n9z)Bj6qG!>RY>QUfASRs0Vd<)J9h>&KIInH z`faDG5wf($ynm_WM3}XSxvPNgfkZ+2kWXeaE1!S-(+pq_ctO*8@OX4l1pu|qx01!s zWpLU|69bCv_7VmUv3ku4_^x*cyRp=w=N9=aINbyPjBDHWGtffXfvb3BQzfN1LFLq zOWyK3EI*O7p_$06F&v#I6pavCj4(6zo25jYP&7g~8eu-RNFup<5PR`M;u&R|U^L@W=NGoX$ReABcJ)qH}FA<=*(n2adZ;%aEbCC%pr;t-sY!)kOUL~z$C^ngqC7EO< zmC^FjK0U#=a0+-MOA?Q7-ea))3IIdB13bEM7hzeFX>SQIIy{1}@}L<*;f$UDpwE_!@hljQC0!qCAg>jC6&7I;J!Gca%qf-qx!O8i8iAbW|YuPggy78XH$uCp88HUWiP zJzX3_D&{07Ffd-cz`)ja;er5L+ltU&2}g+|VY;lHtwshL?yoORNZ{oK5`XIK8yXEo rmTdU;TXaR%&s*yQTGuG(2{15h))CA-Bkyz`Xd;8BtDnm{r-UW|G^s&0 diff --git a/icons/rpcalc-icon.png b/icons/rpcalc-icon.png index 48f5f912b62d89c3a1cf4668c6b262012738ec23..f22871cf40a61febad3b447ea0d188db603687fc 100644 GIT binary patch delta 1573 zcmV+=2HN@Y0jdm;7=H)`0001UdV2H#000DYLP=Bz2nYy#2xN!=000SaNLh0L00AHX z00AHY-}qLu0000PbVXQnQ*UN;cVTj60C#tHE@^ISb7Ns}WiD@WXPfRk8UO$Vr%6OX zR9JL|pnNcj##jPzK^C`2u&C^`(*kWNrO?tcOQ+M$_TKfwo4!uzGG+OHnRDO$ zpL_oA-t*2qBPdl5qc9ao7NF3JY(ON9CE!ok0R%dd5Qr#3hLHpSFG9AW^8+>hKN$wB z2izYL@l zpl~@*2Y3L2l}!&E9KfnN$y_+m7znYP@{Ih{0ssVu0e?d0TF^Qo4<$lfYVM$&sD0h= z1Za8%fQ)PSkJmkv0B3P7_JT}fAXqy*0kwhu5Yz+seyl;pQzq|_7%_Kj!jdy6%_|;? zYc(yMg9zS?-VV~ZC$t^=@P<$ChfJTzVB7t^?42FVa zI9+5oT`Zb8-=x$vH!`VU9OXrBW|mH4%7oq=Yk%>!Q8uxJ@*+1&<~*Go5sKUe-nT#FNn$H>dd0VKYlpFk+cm8Na(Tck{gh`l~8cKSA)uKx!WjayK6TrhA_%{dhut|LB7Qh}8qd z8-M6r6x?bPP++&&*t78?>^2+GSd32(?&rd_Y5*3`TFBZ(D*$M0xyid<>@XMDwc$N- zvs7a7IA0yB;E!{sdZI0$+V@xAVEv(k_zoZ%i*co?jtr-ZoXl+ImCrUw=dNDH7s063FAhMG3PGTd&qFQP)B63VA`Cdm4C(a_XZpI#?MdpgM0-b5DKE{IxXHdx+7uE z)EZw?DBOkBYNb8krMbO@Hve62-)#lJ7Yv{Xg;rl1k!XZ}J?D{9f?zD|;g3mbVFs_Q zZuKfKdC>U>g%nRx<2}_g9K7erca8?;16ULbE=M|cn;pB&PE3oNG>1J6huwkQW`9Qr zfu9biOy2Kj0p0J^TzaQlWy8-F`;G--CD zrT2FD@C5?^IMW;yTfj~$%sA!PvC6wbv!Vn_!=RngOQBeU)yR|+YjsoKoJTbzPcH!#R&Dz=i8~ieg&km3OGA>681okeF;PWn(o}< zX4`FZYR;7Drd^qojMIzDaet;6EnO(wMODLI9%LzktI00sw+tAuiQ>5-hEFm;%(Lz)!>C-WSBC;Rygs zqF*e0wDCEbItdMEAlHFd24WP*Tm&wp$OI`67}ZCbf9W$ZYD^G__a0wPMiC-}6kY!V X9Hkduks5TS00000NkvXXu0mjf7@f+{ delta 225 zcmZ3*^O13aL_HHT0|Nt}$fR^2#S`EY;u`Z{0k?}5knCN2GR$n-IiNUWNswPKgTu2M zX&_FLx4R2N2dk_Hki%Kv5n0T@z%2;EjP)t;6M=&4C7!;n?3Y + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/install.py b/install.py index 656fba5..900927a 100755 --- a/install.py +++ b/install.py @@ -258,15 +258,15 @@ def main(): 'iconPath = None', 'iconPath = \'{0}\' # modified by install script\n' .format(iconPrefixDir)) - if os.path.isfile(os.path.join('icons', progName + '-icon.png')): - pngIconPrefixDir = os.path.join(prefixDir, 'share', 'icons', - 'hicolor', '32x32', 'apps') - pngIconBuildDir = os.path.join(buildRoot, pngIconPrefixDir[1:]) - print(' Copying app icon files to {0}'.format(pngIconBuildDir)) - if not os.path.isdir(pngIconBuildDir): - os.makedirs(pngIconBuildDir) - shutil.copy2(os.path.join('icons', progName + '-icon.png'), - pngIconBuildDir) + if os.path.isfile(os.path.join('icons', progName + '-icon.svg')): + svgIconPrefixDir = os.path.join(prefixDir, 'share', 'icons', + 'hicolor', 'scalable', 'apps') + svgIconBuildDir = os.path.join(buildRoot, svgIconPrefixDir[1:]) + print(' Copying app icon files to {0}'.format(svgIconBuildDir)) + if not os.path.isdir(svgIconBuildDir): + os.makedirs(svgIconBuildDir) + shutil.copy2(os.path.join('icons', progName + '-icon.svg'), + svgIconBuildDir) if os.path.isfile(progName + '.desktop'): desktopPrefixDir = os.path.join(prefixDir, 'share', 'applications') desktopBuildDir = os.path.join(buildRoot, desktopPrefixDir[1:]) diff --git a/uninstall.py b/uninstall.py index 4a63bf8..d79842b 100755 --- a/uninstall.py +++ b/uninstall.py @@ -74,8 +74,8 @@ def main(): removeAll(os.path.join(prefixDir, 'share', 'doc', progName)) removeAll(os.path.join(prefixDir, 'share', progName)) removeAll(os.path.join(prefixDir, 'share', 'icons', progName)) - removeAll(os.path.join(prefixDir, 'share', 'icons', 'hicolor', '32x32', - 'apps', progName + '-icon.png')) + removeAll(os.path.join(prefixDir, 'share', 'icons', 'hicolor', 'scalable', + 'apps', progName + '-icon.svg')) removeAll(os.path.join(prefixDir, 'share', 'applications', progName + '.desktop')) removeAll(os.path.join(prefixDir, 'bin', progName))