From 0195a64a2a61a636e31dc6f61a5cf639141a09f1 Mon Sep 17 00:00:00 2001 From: guinux Date: Sat, 8 Feb 2014 12:10:55 +0100 Subject: [PATCH] rework on icons display --- data/applications/pamac-install.desktop | 2 +- data/applications/pamac-manager.desktop | 2 +- data/applications/pamac-updater.desktop | 2 +- data/icons/16x16/apps/exit.png | Bin 630 -> 0 bytes data/icons/16x16/apps/pamac-updater.png | Bin 793 -> 0 bytes ...{pamac.png => system-software-install.png} | Bin data/icons/24x24/status/package-update.png | Bin 1541 -> 0 bytes .../status/{package-add.png => pamac-add.png} | Bin ...{package-cleanup.png => pamac-cleanup.png} | Bin .../{package-delete.png => pamac-delete.png} | Bin ...ackage-download.png => pamac-download.png} | Bin .../{refresh-cache.png => pamac-refresh.png} | Bin .../{package-search.png => pamac-search.png} | Bin .../{package-setup.png => pamac-setup.png} | Bin ...amac-tray.png => pamac-tray-no-update.png} | Bin data/icons/24x24/status/pamac-tray-update.png | Bin 0 -> 1050 bytes data/icons/24x24/status/pamac-update.png | Bin 1050 -> 1541 bytes .../{package-wait.png => pamac-wait.png} | Bin data/icons/32x32/apps/pamac-updater.png | Bin 3429 -> 0 bytes data/icons/32x32/apps/pamac.png | Bin 3269 -> 0 bytes .../32x32/apps/system-software-install.png | Bin 0 -> 1910 bytes gui/dialogs.ui | 1 + pamac-daemon.py | 42 +++++++++--------- pamac-manager.py | 19 +++----- pamac-tray.py | 14 +++--- pamac/transaction.py | 14 +++--- 26 files changed, 45 insertions(+), 51 deletions(-) delete mode 100644 data/icons/16x16/apps/exit.png delete mode 100644 data/icons/16x16/apps/pamac-updater.png rename data/icons/16x16/apps/{pamac.png => system-software-install.png} (100%) delete mode 100644 data/icons/24x24/status/package-update.png rename data/icons/24x24/status/{package-add.png => pamac-add.png} (100%) rename data/icons/24x24/status/{package-cleanup.png => pamac-cleanup.png} (100%) rename data/icons/24x24/status/{package-delete.png => pamac-delete.png} (100%) rename data/icons/24x24/status/{package-download.png => pamac-download.png} (100%) rename data/icons/24x24/status/{refresh-cache.png => pamac-refresh.png} (100%) rename data/icons/24x24/status/{package-search.png => pamac-search.png} (100%) rename data/icons/24x24/status/{package-setup.png => pamac-setup.png} (100%) rename data/icons/24x24/status/{pamac-tray.png => pamac-tray-no-update.png} (100%) create mode 100644 data/icons/24x24/status/pamac-tray-update.png rename data/icons/24x24/status/{package-wait.png => pamac-wait.png} (100%) delete mode 100644 data/icons/32x32/apps/pamac-updater.png delete mode 100644 data/icons/32x32/apps/pamac.png create mode 100644 data/icons/32x32/apps/system-software-install.png diff --git a/data/applications/pamac-install.desktop b/data/applications/pamac-install.desktop index 75bea8f..eeef2c6 100644 --- a/data/applications/pamac-install.desktop +++ b/data/applications/pamac-install.desktop @@ -125,7 +125,7 @@ Categories=System; Exec=pamac-install %F Terminal=false Type=Application -Icon=/usr/share/pamac/icons/32x32/apps/pamac.png +Icon=system-software-install StartupNotify=true NoDisplay=true MimeType=application/x-xz-compressed-tar; diff --git a/data/applications/pamac-manager.desktop b/data/applications/pamac-manager.desktop index dd5c231..b510029 100644 --- a/data/applications/pamac-manager.desktop +++ b/data/applications/pamac-manager.desktop @@ -130,7 +130,7 @@ Comment[vi]=Thêm hoặc gỡ phần mềm cài đặt trên hệ thống Comment[zh_CN]=添加或删除系统中安装的软件 Comment[zh_HK]=加入或移除系統上安裝的軟件 Comment[zh_TW]=加入或移除系統上安裝的軟體 -Icon=/usr/share/pamac/icons/32x32/apps/pamac.png +Icon=system-software-install Exec=pamac-manager Terminal=false Type=Application diff --git a/data/applications/pamac-updater.desktop b/data/applications/pamac-updater.desktop index b8de826..a24cb54 100644 --- a/data/applications/pamac-updater.desktop +++ b/data/applications/pamac-updater.desktop @@ -126,7 +126,7 @@ Comment[vi]=Cập nhật phần mềm đã cài đặt trên hệ thống Comment[zh_CN]=更新本系统中安装的软件 Comment[zh_HK]=更新系統中已安裝的軟件 Comment[zh_TW]=更新系統中已安裝的軟體 -Icon=/usr/share/pamac/icons/32x32/apps/pamac-updater.png +Icon=system-software-update Exec=pamac-updater Terminal=false Type=Application diff --git a/data/icons/16x16/apps/exit.png b/data/icons/16x16/apps/exit.png deleted file mode 100644 index c2c972759deddaec7df12dc898fb17fc4909a69c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 630 zcmV-+0*U>JP)jK~y-6m61HODdJsH% z>QPVawHu^@6tTx1D%nGz+M9xh9t1BIB7(`SK|;M5dx&gHP>`Y)(QGoi<6+G|QY3va zFz=i1d-J{bL^;U~1do9v$BP{l_e3el&grRGB6@xrO*aNo2EOFS=Uoo=svnG|PhxDy zz$?84Uk>)SZZI|((Q9Anb;^0 zSjRMA;-BYA4LA;Ei;v=CmaV5>n^FrHc?U@6>kVxsb8|FcTJL!fK1(JaPE5`IHet{+9-5URR%{0^kGiS>p3{UxE0%&G>S*hue^#wH!1h z1gSK!g^qYD=dhLQv=dvf2~wSPdOqm0L#&(?;ZP1;m-4|+F5SGv>zu={hZ!30^0+6W zOkcBjaX*9qY7_a=N}K{I QRsaA107*qoM6N<$f(m^WHvj+t diff --git a/data/icons/16x16/apps/pamac-updater.png b/data/icons/16x16/apps/pamac-updater.png deleted file mode 100644 index 2f07dba88e2eec18e00ba93c9907ffa0792d7f04..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 793 zcmV+!1LpjRP)i8xs@yW`GucXf4FeN`SNi92jT z9qKKDI?$JbI3{ ze2i}!Txao}rP$gfNi|OhREH1Id7murqk9G8(TK^xw9pa);u?sNlP5+8;iomOZABRwq-G&qs0r}8nlA-Vb1z62O#ek_zxkVrR z#+ygqvwf~0RS8}Ke?2;;w(gJQqpO#$*4BUReAqoz=Mb112f+FuL!D@5rq%wiuRr+@ X?x%>yTxKp>00000NkvXXu0mjf+E#5> diff --git a/data/icons/16x16/apps/pamac.png b/data/icons/16x16/apps/system-software-install.png similarity index 100% rename from data/icons/16x16/apps/pamac.png rename to data/icons/16x16/apps/system-software-install.png diff --git a/data/icons/24x24/status/package-update.png b/data/icons/24x24/status/package-update.png deleted file mode 100644 index d2e17181102f8cc21d09d8ff303c55f63e975361..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1541 zcmZ{kdpOez7{`BFY?z{?xh2xv+1$}VC32nHXf#GPx{#7(LTsmGDo5+kDN-%O zQsk0LE(cLzsTj)UcFZkj&VT2R^Stl({XWn4c|Xtl-+Rr&{g9lDiVOe%a;{j6r`Tbe zf=G!ck76ehn^ef*Lm1%KW=+HT(!_~$EY>$(Obl#FBA1lJ+6)t89SLIpmj|dv*be|e zQrZ>ch{LvUna862o77wE%>+Nst+o&ap%r%v@_vjy~8r4$yp~ zK%OkVSvn=z<7LC~&-E~-?Gf#CcTg?c4?#$Tgy>wAR~4XETQ(AxIt!PNZtsfwaf@i% zd(3R!ob;+*u(VpJEYh$#+m62YYf{Hx`^ZN7N(_f=)HeCf!>b3&8DX9Kto=Z_sq$7r z_o;w7;j7&*uW`6Nt(250!Gg*8sy@5YFGKBZpwxZ~aWkis-XmDuj%@Jr}cI#2~ z7C+}QQ&&@1cm09_s#W2N0tx~lE1#Myu$F(myzmoHZM8oj9Y-jTigT%p{XjFqO zJzi;u&ghmM0RCb}7h11$eBdR@VOusFQ&%%0-dm4v+@`9`oQNz;?#Tr*4x@ zGsMZ?Ym`?%$lseGL-wuM!thMhf?h_;3kdh>zyitbzE|B!7+~{LQO~#Ccuff16(+s4 z)|DT9r&352EPWdV^MqrLdUYp1Wi@e21HIMzT9_tKj>%)9h!_ zxQj4Em^T(66Y|WWK(AJH!Yj^b^S3<*`l40KK!-v3JT1CF?%4NcU5OhEzqz=H>9{^s31AFJbTD8yXY+b zWo>hX@r8CwO_p76a2a2C@jK#m+xMhQjxFLHP1_ag<(vo0>w%c5cvkyiv+bLh)BCbi zZ_xa|E4@A9i38#R|#2~d!| zY4M3whR+(cv=*$u(JgX2LX#3KbEsd2>enut-94Yas|iz)ZU(2jXYdD+EF|vb<4O?R zb|SXSk#&#Je%e>>1z39crzRX)6Z*8Z-XxH%YDJxHklJ}16Gs4PT%{6~?UNOmUHhWk zp4K$sr3S)3u6BS-oHV!1PM^ePv4=+^IQFl79MhAUS7TU6MiBKVl<}q-o|ZN4WCk=%~>PjnYAh>^7``bCm!3F+n3XgJ}X0j5=nKJ zV2$Lq@6J%qd|q^0f0Myl_45u6J6uc7j646Nf9z)k3YOmsYrk=eahfF8+)N`{0D0~i z$*^9T%(??9zZN8b3AF)jpZr|UIRrH@uFZF;MGp=Rs z{C4=OV%x3=0-<#G-oRzWUd=o>x^h98pUT`9?||i4%Xw{Ru8U31Rqz za8xKcTx@_T0*N%*Y;zpa3}tSPGPN;4AW;ZJGUt5Ye}EWLSX4yP{{yo8w_{>JdGmr7 pDI$S_Cx-(R3dK0;3^6_w9~*8=A`=Q{&?@33z}3YaQ|=U;_77a)#R>ob diff --git a/data/icons/24x24/status/package-add.png b/data/icons/24x24/status/pamac-add.png similarity index 100% rename from data/icons/24x24/status/package-add.png rename to data/icons/24x24/status/pamac-add.png diff --git a/data/icons/24x24/status/package-cleanup.png b/data/icons/24x24/status/pamac-cleanup.png similarity index 100% rename from data/icons/24x24/status/package-cleanup.png rename to data/icons/24x24/status/pamac-cleanup.png diff --git a/data/icons/24x24/status/package-delete.png b/data/icons/24x24/status/pamac-delete.png similarity index 100% rename from data/icons/24x24/status/package-delete.png rename to data/icons/24x24/status/pamac-delete.png diff --git a/data/icons/24x24/status/package-download.png b/data/icons/24x24/status/pamac-download.png similarity index 100% rename from data/icons/24x24/status/package-download.png rename to data/icons/24x24/status/pamac-download.png diff --git a/data/icons/24x24/status/refresh-cache.png b/data/icons/24x24/status/pamac-refresh.png similarity index 100% rename from data/icons/24x24/status/refresh-cache.png rename to data/icons/24x24/status/pamac-refresh.png diff --git a/data/icons/24x24/status/package-search.png b/data/icons/24x24/status/pamac-search.png similarity index 100% rename from data/icons/24x24/status/package-search.png rename to data/icons/24x24/status/pamac-search.png diff --git a/data/icons/24x24/status/package-setup.png b/data/icons/24x24/status/pamac-setup.png similarity index 100% rename from data/icons/24x24/status/package-setup.png rename to data/icons/24x24/status/pamac-setup.png diff --git a/data/icons/24x24/status/pamac-tray.png b/data/icons/24x24/status/pamac-tray-no-update.png similarity index 100% rename from data/icons/24x24/status/pamac-tray.png rename to data/icons/24x24/status/pamac-tray-no-update.png diff --git a/data/icons/24x24/status/pamac-tray-update.png b/data/icons/24x24/status/pamac-tray-update.png new file mode 100644 index 0000000000000000000000000000000000000000..c18c5e5bb668c3362fcdcf6cf2cfd05d8fabe40f GIT binary patch literal 1050 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEa{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YPV z+ueoXKL{?^yL>WGgtNdSvKVOfbr5EB(wJSrz`*p%)5S5wBVg7w+dz%g_IvSG@0e`8oc7 zuP;b_2yKuMU^r8+JoCk?BR76t?cDg;;miCm0j5I@d@CFh-d%~--~RelHDjO$&lj0} zwzm5>1pTs)`1GBjZ0n}git~1Ucz1nTrf%-D?RgSA|J=QIJlbBse4RVvmU;Ww?f<9k zxqM6HRacAL+mAnM=We{X`FLZ>UdE`&`FpCai+8q7UB=;M(6RZ0@Fgv;^*{c+IB(N^ z=ceN`vyEo*Imh*Dudzx@b(t4+>!#-66lKwMzb>8(o-zC9;qX(leAkO9FlemH1S7;dapohY6$OS10o(s$p~&)>MduRdzl*Sl^<-yg63^3!^ISlIFTv;X~& zR&ZbW@F{~=dhuuB&H4Q`k8~|Ke_vBln!K)i50CD(rtQBuwz>b`SYPyN>(ZQWb_%D3 zPA<*4_UFT?tFx8kR4)n?M=nbdQlFV}YMS}YS;JP0qO=1=Z(XYkhm6!}8@8yDMVy%XV0O3$SFb zn?KPiZo{{=Q+7Qt4q`rFnXtMhY^RozR?jh0({EGUFUEiPAy<8LJ-?jGubnSze#Rb* zir4c{*SyoiE#7c8it$u$KI0=_soMK&@|E%I^`=GaXT;0p=AGeO7aUWP=^&#bsLIZ4 zP}Fo~QRdn2S+6$craW7uypCzkwXF*cymA6}e6~CoexPbCSGL}6p`z|Xd%vyLmWvbl z^v$e>(Lno7@8wxV8roA?yRskVJG1_3G}p9qNNw>>|NCZt=YQire4L!K5`OjYTm)tX z)e_f;l9a@fRIB8oR3OD*WMF8dYiOWrY!G5-Ze?g;Wn!UiU}$Av5dUIjK8l9i{FKbJ zO57UswhCSbYLEok5S*V@Ql40p%1~Zju9umYU7Va)kgAtols@~NjTBH3gQu&X%Q~lo FCIH9o&Nl!6 literal 0 HcmV?d00001 diff --git a/data/icons/24x24/status/pamac-update.png b/data/icons/24x24/status/pamac-update.png index c18c5e5bb668c3362fcdcf6cf2cfd05d8fabe40f..d2e17181102f8cc21d09d8ff303c55f63e975361 100644 GIT binary patch delta 1478 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 F1u^E_zsLXp diff --git a/data/icons/24x24/status/package-wait.png b/data/icons/24x24/status/pamac-wait.png similarity index 100% rename from data/icons/24x24/status/package-wait.png rename to data/icons/24x24/status/pamac-wait.png diff --git a/data/icons/32x32/apps/pamac-updater.png b/data/icons/32x32/apps/pamac-updater.png deleted file mode 100644 index ab481abe25f3ccf6bdae0c4b19230e58b3e7387d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3429 zcmV-r4Vv;%ye02J{((H?EkIr)Ko3p=83|y)k>pTz1V`~Qq83sVIh=)@ znVz1WuCBWGoIF%@b@wc!L_`m{z@1xtYdhch&USB&m>K_{oBN!fFIE5CT0HSKkqBr4 z>F>SpZ0qY^duIN^xzlqqGt=#;<*153cJibO!_L_WEIO@1WaV zU*GG#@y=@ZKmO}i8IS{+nS~<&M5OVjfAHePzy990Uum}&pB51@4QME^5D4nA;L+ew z^_Y4>2<4mxOg*N7V1`Rl07~n0xF`{#B+*bj8AlP~z&Qbz;#`D?E5|4*M>jcs>rcK; zQRIX5%{#CC&ELQJJrP+mvq24@()_|-{l#})YtOYW6$iTnpJS$&222&RfU4HVrsX*` zt&dHWp#DUK_3}`w9#s;TwM9%zx>W0wtn>Xd*2q3Ei(&4 zA7}yR7MD(~6j>JyMR}(wW>x|*J7G>ob5wIDG?UUDtomzK(lmT_J!0kg;W&2w(uFVn zHgK+zxpv|NSP~bB`uvE1R^5F3oK4IHJsE)Nrw|r978KR_W@{=1mMWQR01?or1IDM) z{0Va!4$D1`pcbU=c0xaN-3SPjvJ#C05I{uaGid(!IW;{|ej|K3lR1F}tAUNevpe*L z2iJUcta>s44I?3r3Ogc%F=Y>RUXOct^%ey0$?GpJB-r6xG-W&3R`99W5HG6$4!5dfiVj2 zXY(h`sT!sg0Ie9%D!UUV8Mqe{_qgsj2Hc2&2ls%2#d(lt1BxQxLm(8M-~&Mw@qsib5rJkB zm=z^71V5F~ZMJZ6ii;+byd!Yw%rtY;P2xDlMGZ-v)U}yarXD&X?AnP5=fB?=H1H8}42N`BY2%gQg zb&5fih$_KF9E)d{nVVk#5r)~_Fw_JWC%7m&#DE7IZBmT6R22Xy!*CU$%Cg*Q`!5C= z-scp9Y{fA5j!JU%2!zpIm((pBF??T+=Tmn3VbqM#aEnl6Pul%BTy6 z@~>9Uz^uv>CA@m|Rp%He@~jNCV=J-=6H-+|2-T{}VP+J0fjCF-0Y5wr0T)H6TII}E zn!#{;#5u$rG9ec+%wv`PUY&JRm~=s-a#Mni*-c ziHjnpW@kxTO`V%;5W-nu>9z$o&;-*gl!c*^G zp;z=->wZGm`#G*+bqGM!j{`WufHPIp`_hRj0Hb3a)gs2kScbgHAcFFfEANo!ImI9+ z&vQav5H#@E<@5A3=HStnDHa|h^UA;*gKqhb7jJyba_o4dwaC`u@AB@}n>e>$m)Yt) z;wIPf6Naj)XqaR`>l&Df*3#LmayaLP8ZT3Rvzamz`b3Qe(fkx~)l~)}xTz@?mzR0|)C>G)_e1Ef0)mE6mLFqn0)VNaVZ=b` zSVMbNEL1kB!vZd#VYoF|KDe1CG}GjW1$FX--AjMOMn~D)*`mMSA@+S9noHQ;>(Pp* z(4s)%7{9xV-`gYJ-Q}yx%e-DRNTUo59yuWjLG8r8W*|xu4to1M@!Yc@4prsXzWO{O zj+-BRfU4F-nN_LyxV`kE2yCAJ2Dc6(PB)Zq{Ki=>oO+a{nFauV`^uZN*ER^=6QwE9 zxpVlnHHurei1M6=&p*$H+y71o9`5JFqbOv|EzHx|-l21M8xdER4^AQ$mX}Ka)!kBM zv%~&tW~|9MHd>Fc(aE^$gx~*CS_=knir2E-a8d_85bA-^H)5b1{y2 zzi|QY2SWx6>Kwj+EvL0_jW&~fLrXyL@ z5UJLpHcb6i#(EJ%T^al9J@QEadG6VtJ54t$0Qjv-Gt5t=+}R)S$=x171Cq38?{1<+ zc};(7i}~qkqVwk&T)PHE!F*xd9OU;jA*h`=l#W{^DOat)gBZ?~Aa25>h6|IrBpqu9 zy^Ni+OXPW}-SZ1m-0kK3>wn+ijgNagb*72Bn1#+}%|K{0a7#->RaggD=oK~)d1BS8-Og8|)sPGRM%nn}c+{Q*CE zZky`=q1PjNzC`RFTZ&CH?69D?$?H*A7}gH%|&p2-m&uDKXCQo zZ;>Z$iej`4f2Om=?klgb`s%ARMMy+g5Mie|%RkQxUs#NYBZndU_*d({0y>qLs=D_a9&S~2_e{^Oy^0^W(%oBg>sIyopa1!~w^q!I|If{R#P657e`GCP z_%)FP=m7a=e(9N&Pyh1M8)r`6-(OqnuCEp={VZoaOI*+4dJgL)j-HwJM0Cy6)&#$X zNx%ER#~zm?Ny^Dsy6Yz>Cqpy!{^pzK-%_)E!R;9`P}6~$+ec(Ss11B@18-q4o!VeH z4*UC~!C-rPfAH;BUmv{uUl%4o2~5l^904FA#czM^xwC)zr7!&B`ud3{MMO*k8Y(OV zf_f}?G(f+KIo;lQ|C@jQxBv7d5xHt+(-uIj`OQE1;`85J@2@{vjcyZsiJ4*=FjdR~ zs@h(g#(QeoUYjaG{jqfWvcwfR4p0OqikU+M3=oT;kBmTGtQ6a-z5|@bj@`!*|KfHX-7UqH;4?y(;2#YNRMSZ`svYG>1wahJm z1Sr~o@qsjd%$$b9a?c}Z1!=n-(+{ni0f8th$vgl7L_|J>=9kZ@>9O(~;e(mXF)UaM zY!;r~pwb>AwHn<9=>0P z>9#zXcVcHtH2Oj38a7l7EW}QjU0aAI^b=tL*ML~4g_sj=nU;^R!7*%vGQKZVm{zmD z>*u8wM(Sr5N9y}gLgQ#=o^SI2+`VYNovVSV&Hz{_+YYldFfWW4i^A3!dMUUX{JiNe zGB8Ks-E982IaR~72B0+qT4#5{A_I3~;tuPUG2mtl+`AvNq0~# zTQ`$;feJuwT)&P>^Lx^KGZ$(TioL3PiTY`buyX?6)p?JsgR57r!(0@aHzBE}2W*@? zg@%ByMj#I71e3IOeya`5X3CiVAv3%ilCQ4goCBAWuk=aM3=K-rJ3+Cw3J4+~2#6r! zKqNjR4sr2s1k9xN6Cp`5Ld^6_0g%`j1Ki36-Tp}?lL^zwq#eiO36sf~@p#N+9OuX5 zdVV@(GM+FP4Eg=vfh39K4tL%Lzz5}}um3x1t1EPhjJ%UmX1F9d#DE8z9a7A>R2=|_VYrS^u`IXN z{;TN(?@Oxbq+#GlCKgl0ms3JH#Z=k3e2w0T4Z3SRaDtPhb+)&E_*w*jv{^_H1VfSx zmo5Sj6SS6Ch@hJ+n5>urrCo#q&m>K0{!sWLwQdK1nJ^C1z-h2yRRwPN<(k~{MM12OMW?(VNJGGcH z+QK3JtMxlDtMf#J*Y3XB90OH3iJ^9GN48)>s!9l<-c>owjH;{<=LkOFo9hs8NrI}? z&TP>Pn&T1Y5O>IgTtbt_YWu+qLNG$DZAX2=p^93pYNM}My*9+(TapK)0iYV%ZK0Ww zcRIKvVYSyIU+IvfDcydb>3EE_o0rHIBK5fuN1K6Zj5;AGS{vMdQ@ zMbN;{JpKqHD+!;-(NiU(aGg?zOs59`6x}uQUYFu*4}W!)@Siuy+sYKwd&Dj7fVMR-HLcOvtado(8jZ)4-|6J6g)vD{kZi1yCXOUY5D`Wj%Jh@M0hhSBcagFh zwUMYbHH17{W$VOabU%BNgY&moy%_*OLx|{W&*(eQvLe*PH{hpO__Fa81|j>|v#5vtl2Wmc!+WoPMC6&O4*eCb4vkSId}~<&rbCYRmZdb%p)Y<84-eqyE*YJ3K{*)4fb|#v3GM95!aRv zP7*dxor(bJr=`wjhyB;gxRDLn-?+){@Jcj8z?aI2;-{7Z@MWMe^WEVU()+uVy^OwZ z893gF;}Lq?1&Iio_iaVtox|1P(IqM31oIwT%<8tFmpNgAve)0|{e$-?!|d3xD&hW> zvt zdM0aQhSMR;@l%z?$+gFh0bocvTkHLh?s}lSQQpynpmpL99k)(WuHJzMF`Owu+=59p z8q%g2RRr|rwk_}d>Zlfs&jntSO1R8<)lfz6u_T-_B@rA z{MEN!V35Cy2psqWCexCP;~8+OO7I>H3L>l&8AXAEjhZG4X}qkL{|S_0@#?-{@fng7=2^@mreT+~vi;e;ywye5m5}=5D-Kud@T;zBhVo zbTc$~wr`F0iQ9;1qV+fh_Rhby{rYb{_xPu*u6^#-8f#o;`}55u@X&gf_s@?w_|ydL z)bDn}W%~ht`O+T)aM^x9?i{|(cW&%h{ceYc`(4t+VF>?mVfzBGSIdl;86wgHp2}1A z8=v{)* zliN|^&cPk`khT4-P&M%C1rbeIQaJeUVZmlufF>)rPr?m|6^u@27mykfS&`N z2F?NNcctLoS_<^<|JmZq*2nS_8)vfB-h){eU~sh>-hQtd-F&0mz47|=JzyVbzL@L* zKL)-J{1CWqW+u&PuS9ii0uR)}FV8YRnU(-+#E;eMK);^fuLT_g2f+L{+p@m54cxNY z##;bQ6OojtrH}f5vNX+6fAb{@e4O(s;LU8|8`l2;nILL-dUn|o00000NkvXXu0mjf DfTTe6 diff --git a/data/icons/32x32/apps/system-software-install.png b/data/icons/32x32/apps/system-software-install.png new file mode 100644 index 0000000000000000000000000000000000000000..6e02c4dfd39f4e3f0b7113009802fafb6480bf92 GIT binary patch literal 1910 zcmV-+2Z{KJP)u&8_n&OjqMh7y>s#E zWcQ`>Z|uJChnM$&+RP$=m>D9H|K<5-o;`8=#J5d@XlRJBMnfRR8jB4v1T@y|s*#m5 zU!|!^di^0WG+e##TfFx;pW=Li^9kN32lgr6C)A;--g@WK(@#A0%umd$N<>6}wUZ}K zJW)+H#WbQC(HKw-XpC65w);Q`VIh>U2{;kVDVTy8)+wDDMxHO_58nUj9{@iWkt+`H zz)8ThA1J1J`_*&-fSF<#m@+@d4(!a=dxgI;ok*EgkOW_#9%Gg7!dO1ryVX)Fi zeUJVqTS$RetPt<`_}y1%nm`PZ7y~gH8Wo939wUiYT&^TpkG6}0xP-fgDT8HC;=%if zvl1UFw3t%VDPig;CL0_-^F^lHTMGbOIoYQ6d!R<8P);Y5)5)PeAON8(Xvzr|BLcks(s}Bl z;=;MV;he*)Jro1X@L6xJF3mg2(E*%!4B9oQ7$c^Urkqlj#f$_pk3ftOvGxOvN(hmr z>E?j$KRgE{g6=48Ga$yC0Wro|oDS81k1=!rA|itKjx5h{ z-s41CqhhqzhVu5C?@-q@RasNlCC66!Y_68L&v`;xFpXm}H=xG~^?McRg_=YSiJ@)B z?HI6M0~!M2S^#YyfEcyyp4#?*5eH&qX-X{i=sRIFND;}{I$KiQbA`>F_c?f3n;C;+ zcW~$08T{`j^g}qh6NU~zjFC{+oIL$0Vho(R|2~?!X)9U`LvRB9rEG5GYJZpU`up72 zzC1*v-Gnvy+V*qUdEDicpMaAaTtBCguhbt{W z5kwqHTMqzL6WDxs%*M_o3}axcoLc_UegvvFxIBH0Mkb8cE@H`X1}#+%(a^fxHx95J3O1UHRH5}Mb$4)jbsxaqUO}~Gh`{yc8c9B6pvwyY zh%wALJK39J0?s9@jQTk55jSTng3Nxh;Wn8RQ-T`zjvnE@!K2*2{^dD#CS zIJfajUVQl%hX7pJ`hcIl_&vytx;B#QzUyd*N3!l#aH!m6tarTN>I2 z$jVa2QtDaGQ}Wc4r3s+}c(W#AoVmP;Z8)0Rkfp$nfAd{7C)arTx$iUf|DtJ(P#L51 zeb$yzu8jA#fD$m@0kEB-e(>b_@c3xZ%bib=B*iBgKFRTEPLlOn&6i2@K54H{)@#?% zaD@IlXFC*>{f0W3^1>gVo;Q#;t07*qoM6N<$f+S3z-~a#s literal 0 HcmV?d00001 diff --git a/gui/dialogs.ui b/gui/dialogs.ui index 021f6cc..2907484 100644 --- a/gui/dialogs.ui +++ b/gui/dialogs.ui @@ -281,6 +281,7 @@ center 300 250 + system-software-install diff --git a/pamac-daemon.py b/pamac-daemon.py index 242714c..673bdac 100755 --- a/pamac-daemon.py +++ b/pamac-daemon.py @@ -161,7 +161,7 @@ class PamacDBusService(dbus.service.Object): if event == 'ALPM_EVENT_CHECKDEPS_START': action = _('Checking dependencies')+'...' action_long = action+'\n' - icon = '/usr/share/pamac/icons/24x24/status/package-search.png' + icon = 'pamac-search' elif event == 'ALPM_EVENT_CHECKDEPS_DONE': if self.warning: self.EmitLogWarning(self.warning) @@ -169,13 +169,13 @@ class PamacDBusService(dbus.service.Object): elif event == 'ALPM_EVENT_FILECONFLICTS_START': action = _('Checking file conflicts')+'...' action_long = action+'\n' - icon = '/usr/share/pamac/icons/24x24/status/package-search.png' + icon = 'pamac-search' elif event == 'ALPM_EVENT_FILECONFLICTS_DONE': pass elif event == 'ALPM_EVENT_RESOLVEDEPS_START': action = _('Resolving dependencies')+'...' action_long = action+'\n' - icon = '/usr/share/pamac/icons/24x24/status/package-setup.png' + icon = 'pamac-setup' elif event == 'ALPM_EVENT_RESOLVEDEPS_DONE': if self.warning: self.EmitLogWarning(self.warning) @@ -183,7 +183,7 @@ class PamacDBusService(dbus.service.Object): elif event == 'ALPM_EVENT_INTERCONFLICTS_START': action = _('Checking inter conflicts')+'...' action_long = action+'\n' - icon = '/usr/share/pamac/icons/24x24/status/package-search.png' + icon = 'pamac-search' elif event == 'ALPM_EVENT_INTERCONFLICTS_DONE': if self.warning: self.EmitLogWarning(self.warning) @@ -192,7 +192,7 @@ class PamacDBusService(dbus.service.Object): string = _('Installing {pkgname}').format(pkgname = tupel[0].name) action = string+'...' action_long = '{} ({})...\n'.format(string, tupel[0].version) - icon = '/usr/share/pamac/icons/24x24/status/package-add.png' + icon = 'pamac-add' elif event == 'ALPM_EVENT_ADD_DONE': formatted_event = 'Installed {pkgname} ({pkgversion})'.format(pkgname = tupel[0].name, pkgversion = tupel[0].version) common.write_log_file(formatted_event) @@ -200,7 +200,7 @@ class PamacDBusService(dbus.service.Object): string = _('Removing {pkgname}').format(pkgname = tupel[0].name) action = string+'...' action_long = '{} ({})...\n'.format(string, tupel[0].version) - icon = '/usr/share/pamac/icons/24x24/status/package-delete.png' + icon = 'pamac-delete' elif event == 'ALPM_EVENT_REMOVE_DONE': formatted_event = 'Removed {pkgname} ({pkgversion})'.format(pkgname = tupel[0].name, pkgversion = tupel[0].version) common.write_log_file(formatted_event) @@ -208,7 +208,7 @@ class PamacDBusService(dbus.service.Object): string = _('Upgrading {pkgname}').format(pkgname = tupel[1].name) action = string+'...' action_long = '{} ({} => {})...\n'.format(string, tupel[1].version, tupel[0].version) - icon = '/usr/share/pamac/icons/24x24/status/package-update.png' + icon = 'pamac-update' elif event == 'ALPM_EVENT_UPGRADE_DONE': formatted_event = 'Upgraded {pkgname} ({oldversion} -> {newversion})'.format(pkgname = tupel[1].name, oldversion = tupel[1].version, newversion = tupel[0].version) common.write_log_file(formatted_event) @@ -216,7 +216,7 @@ class PamacDBusService(dbus.service.Object): string = _('Downgrading {pkgname}').format(pkgname = tupel[1].name) action = string+'...' action_long = '{} ({} => {})...\n'.format(string, tupel[1].version, tupel[0].version) - icon = '/usr/share/pamac/icons/24x24/status/package-add.png' + icon = 'pamac-add' elif event == 'ALPM_EVENT_DOWNGRADE_DONE': formatted_event = 'Downgraded {pkgname} ({oldversion} -> {newversion})'.format(pkgname = tupel[1].name, oldversion = tupel[1].version, newversion = tupel[0].version) common.write_log_file(formatted_event) @@ -224,39 +224,39 @@ class PamacDBusService(dbus.service.Object): string = _('Reinstalling {pkgname}').format(pkgname = tupel[0].name) action = string+'...' action_long = '{} ({})...\n'.format(string, tupel[0].version) - icon = '/usr/share/pamac/icons/24x24/status/package-add.png' + icon = 'pamac-add' elif event == 'ALPM_EVENT_REINSTALL_DONE': formatted_event = 'Reinstalled {pkgname} ({pkgversion})'.format(pkgname = tupel[0].name, pkgversion = tupel[0].version) common.write_log_file(formatted_event) elif event == 'ALPM_EVENT_INTEGRITY_START': action = _('Checking integrity')+'...' action_long = action+'\n' - icon = '/usr/share/pamac/icons/24x24/status/package-search.png' + icon = 'pamac-search' self.already_transferred = 0 elif event == 'ALPM_EVENT_INTEGRITY_DONE': pass elif event == 'ALPM_EVENT_LOAD_START': action = _('Loading packages files')+'...' action_long = action+'\n' - icon = '/usr/share/pamac/icons/24x24/status/package-search.png' + icon = 'pamac-search' elif event == 'ALPM_EVENT_LOAD_DONE': pass elif event == 'ALPM_EVENT_DELTA_INTEGRITY_START': action = _('Checking delta integrity')+'...' action_long = action+'\n' - icon = '/usr/share/pamac/icons/24x24/status/package-search.png' + icon = 'pamac-search' elif event == 'ALPM_EVENT_DELTA_INTEGRITY_DONE': pass elif event == 'ALPM_EVENT_DELTA_PATCHES_START': action = _('Applying deltas')+'...' action_long = action+'\n' - icon = '/usr/share/pamac/icons/24x24/status/package-setup.png' + icon = 'pamac-setup' elif event == 'ALPM_EVENT_DELTA_PATCHES_DONE': pass elif event == 'ALPM_EVENT_DELTA_PATCH_START': action = _('Generating {} with {}').format(tupel[0], tupel[1])+'...' action_long = action+'\n' - icon = '/usr/share/pamac/icons/24x24/status/package-setup.png' + icon = 'pamac-setup' elif event == 'ALPM_EVENT_DELTA_PATCH_DONE': action = _('Generation succeeded!') action_long = action+'\n' @@ -266,16 +266,16 @@ class PamacDBusService(dbus.service.Object): elif event == 'ALPM_EVENT_SCRIPTLET_INFO': action =_('Configuring {pkgname}').format(pkgname = self.previous_target)+'...' action_long = tupel[0] - icon = '/usr/share/pamac/icons/24x24/status/package-setup.png' + icon = 'pamac-setup' self.EmitNeedDetails(True) elif event == 'ALPM_EVENT_RETRIEVE_START': action = _('Downloading')+'...' action_long = action+'\n' - icon = '/usr/share/pamac/icons/24x24/status/package-download.png' + icon = 'pamac-download' elif event == 'ALPM_EVENT_DISKSPACE_START': action = _('Checking available disk space')+'...' action_long = action+'\n' - icon = '/usr/share/pamac/icons/24x24/status/package-search.png' + icon = 'pamac-search' elif event == 'ALPM_EVENT_OPTDEP_REQUIRED': print('Optionnal deps exist') elif event == 'ALPM_EVENT_DATABASE_MISSING': @@ -285,7 +285,7 @@ class PamacDBusService(dbus.service.Object): elif event == 'ALPM_EVENT_KEYRING_START': action = _('Checking keyring')+'...' action_long = action+'\n' - icon = '/usr/share/pamac/icons/24x24/status/package-search.png' + icon = 'pamac-search' elif event == 'ALPM_EVENT_KEYRING_DONE': pass elif event == 'ALPM_EVENT_KEY_DOWNLOAD_START': @@ -358,11 +358,11 @@ class PamacDBusService(dbus.service.Object): if _target.endswith('.db'): action = _('Refreshing {repo}').format(repo = _target.replace('.db', ''))+'...' action_long = '' - icon = '/usr/share/pamac/icons/24x24/status/refresh-cache.png' + icon = 'pamac-refresh' else: action = _('Downloading {pkgname}').format(pkgname = _target.replace('.pkg.tar.xz', ''))+'...' action_long = action+'\n' - icon = '/usr/share/pamac/icons/24x24/status/package-download.png' + icon = 'pamac-download' if self.total_size > 0: percent = round((_transferred+self.already_transferred)/self.total_size, 2) if _transferred+self.already_transferred <= self.total_size: @@ -549,7 +549,7 @@ class PamacDBusService(dbus.service.Object): error = '' try: for db in self.syncdbs: - pkg = db.get_pkg(pkgname) + pkg = pyalpm.find_satisfier(db.pkgcache, pkgname) if pkg: self.t.add_pkg(pkg) break diff --git a/pamac-manager.py b/pamac-manager.py index 6af0e1e..cee292a 100755 --- a/pamac-manager.py +++ b/pamac-manager.py @@ -21,7 +21,6 @@ version = '0.9.7' from gi.repository import Gtk, Gdk -from gi.repository.GdkPixbuf import Pixbuf import pyalpm import dbus from time import strftime, localtime @@ -93,12 +92,12 @@ repos_dict = {} current_filter = (None, None) right_click_menu = Gtk.Menu() -installed_icon = Pixbuf.new_from_file('/usr/share/pamac/icons/16x16/actions/package-installed-updated.png') -uninstalled_icon = Pixbuf.new_from_file('/usr/share/pamac/icons/16x16/actions/package-available.png') -to_install_icon = Pixbuf.new_from_file('/usr/share/pamac/icons/16x16/actions/package-install.png') -to_reinstall_icon = Pixbuf.new_from_file('/usr/share/pamac/icons/16x16/actions/package-reinstall.png') -to_remove_icon = Pixbuf.new_from_file('/usr/share/pamac/icons/16x16/actions/package-remove.png') -locked_icon = Pixbuf.new_from_file('/usr/share/pamac/icons/16x16/actions/package-installed-locked.png') +installed_icon = Gtk.IconTheme.get_default().load_icon('package-installed-updated', 16, 0) +uninstalled_icon = Gtk.IconTheme.get_default().load_icon('package-available', 16, 0) +to_install_icon = Gtk.IconTheme.get_default().load_icon('package-install', 16, 0) +to_reinstall_icon = Gtk.IconTheme.get_default().load_icon('package-reinstall', 16, 0) +to_remove_icon = Gtk.IconTheme.get_default().load_icon('package-remove', 16, 0) +locked_icon = Gtk.IconTheme.get_default().load_icon('package-installed-locked', 16, 0) def state_column_display_func(column, cell, treemodel, treeiter, data): if treemodel[treeiter][0] == _('No package found'): @@ -639,20 +638,17 @@ def on_list_treeview_button_press_event(treeview, event): if liststore[treeiter][0].name in transaction.to_add | transaction.to_remove or liststore[treeiter][0] in transaction.to_build: item = Gtk.ImageMenuItem(_('Deselect')) item.set_image(Gtk.Image.new_from_stock('gtk-undo', Gtk.IconSize.MENU)) - item.set_always_show_image(True) item.connect('activate', mark_to_deselect, liststore[treeiter][0]) right_click_menu.append(item) elif liststore[treeiter][0].db.name == 'local': item = Gtk.ImageMenuItem(_('Remove')) item.set_image(Gtk.Image.new_from_pixbuf(to_remove_icon)) - item.set_always_show_image(True) item.connect('activate', mark_to_remove, liststore[treeiter][0]) right_click_menu.append(item) if transaction.get_syncpkg(liststore[treeiter][0].name): if not pyalpm.sync_newversion(liststore[treeiter][0], transaction.syncdbs): item = Gtk.ImageMenuItem(_('Reinstall')) item.set_image(Gtk.Image.new_from_pixbuf(to_reinstall_icon)) - item.set_always_show_image(True) item.connect('activate', mark_to_reinstall, liststore[treeiter][0]) right_click_menu.append(item) optdeps_strings = liststore[treeiter][0].optdepends @@ -664,7 +660,6 @@ def on_list_treeview_button_press_event(treeview, event): if available_optdeps: item = Gtk.ImageMenuItem(_('Install optional deps')) item.set_image(Gtk.Image.new_from_pixbuf(to_install_icon)) - item.set_always_show_image(True) item.connect('activate', select_optdeps, liststore[treeiter][0], available_optdeps) right_click_menu.append(item) if liststore[treeiter][0].reason == pyalpm.PKG_REASON_DEPEND: @@ -674,7 +669,6 @@ def on_list_treeview_button_press_event(treeview, event): else: item = Gtk.ImageMenuItem(_('Install')) item.set_image(Gtk.Image.new_from_pixbuf(to_install_icon)) - item.set_always_show_image(True) item.connect('activate', mark_to_install, liststore[treeiter][0]) right_click_menu.append(item) optdeps_strings = liststore[treeiter][0].optdepends @@ -686,7 +680,6 @@ def on_list_treeview_button_press_event(treeview, event): if available_optdeps: item = Gtk.ImageMenuItem(_('Install with optional deps')) item.set_image(Gtk.Image.new_from_pixbuf(to_install_icon)) - item.set_always_show_image(True) item.connect('activate', install_with_optdeps, liststore[treeiter][0], available_optdeps) right_click_menu.append(item) treeview.grab_focus() diff --git a/pamac-tray.py b/pamac-tray.py index 7d36f06..0d533b8 100755 --- a/pamac-tray.py +++ b/pamac-tray.py @@ -33,10 +33,10 @@ gettext.bindtextdomain('pamac', '/usr/share/locale') gettext.textdomain('pamac') _ = gettext.gettext -update_icon = '/usr/share/pamac/icons/24x24/status/pamac-update.png' +update_icon = 'pamac-tray-update' update_info = _('{number} available updates') one_update_info = _('1 available update') -noupdate_icon = '/usr/share/pamac/icons/24x24/status/pamac-tray.png' +noupdate_icon = 'pamac-tray-no-update' noupdate_info = _('Your system is up-to-date') icon = noupdate_icon info = noupdate_info @@ -48,15 +48,15 @@ class Tray: self.menu = Gtk.Menu() self.menuItem = Gtk.ImageMenuItem(_('Update Manager')) - self.menuItem.set_image(Gtk.Image.new_from_file('/usr/share/pamac/icons/16x16/apps/pamac-updater.png')) + self.menuItem.set_image(Gtk.Image.new_from_icon_name('system-software-update', Gtk.IconSize.MENU)) self.menuItem.connect('activate', self.execute_update, self.statusIcon) self.menu.append(self.menuItem) self.menuItem = Gtk.ImageMenuItem(_('Package Manager')) - self.menuItem.set_image(Gtk.Image.new_from_file('/usr/share/pamac/icons/16x16/apps/pamac.png')) + self.menuItem.set_image(Gtk.Image.new_from_icon_name('system-software-install', Gtk.IconSize.MENU)) self.menuItem.connect('activate', self.execute_manager, self.statusIcon) self.menu.append(self.menuItem) self.menuItem = Gtk.ImageMenuItem(_('Quit')) - self.menuItem.set_image(Gtk.Image.new_from_file('/usr/share/pamac/icons/16x16/apps/exit.png')) + self.menuItem.set_image(Gtk.Image.new_from_icon_name('application-exit', Gtk.IconSize.MENU)) self.menuItem.connect('activate', self.quit_tray, self.statusIcon) self.menu.append(self.menuItem) @@ -85,7 +85,7 @@ class Tray: Thread(target = call, args = (['/usr/bin/pamac-updater'],)).start() def update_icon(self, icon, info): - self.statusIcon.set_from_file(icon) + self.statusIcon.set_from_icon_name(icon) self.statusIcon.set_tooltip_markup(info) def set_visible(self, boolean): @@ -123,7 +123,7 @@ def set_icon(update_data): else: info = update_info.format(number = len(updates)) if not common.pid_file_exists(): - Notify.Notification.new(_('Update Manager'), info, '/usr/share/pamac/icons/32x32/apps/pamac-updater.png').show() + Notify.Notification.new(_('Update Manager'), info, 'system-software-update').show() else: icon = noupdate_icon info = noupdate_info diff --git a/pamac/transaction.py b/pamac/transaction.py index 6a85da6..e6900b5 100644 --- a/pamac/transaction.py +++ b/pamac/transaction.py @@ -156,7 +156,7 @@ def need_details_handler(need): progress_expander.set_expanded(need) def icon_handler(icon): - action_icon.set_from_file(icon) + action_icon.set_from_icon_name(icon, Gtk.IconSize.BUTTON) def target_handler(target): progress_bar.set_text(target) @@ -255,7 +255,7 @@ def refresh(force_update = False): while Gtk.events_pending(): Gtk.main_iteration() action_handler(_('Refreshing')+'...') - icon_handler('/usr/share/pamac/icons/24x24/status/refresh-cache.png') + icon_handler('pamac-refresh') target_handler('') percent_handler(0) ProgressCancelButton.set_visible(True) @@ -404,7 +404,7 @@ def run(cascade = True, recurse = False): if to_add or to_remove or to_load or to_build: global progress_buffer action_handler(_('Preparing')+'...') - icon_handler('/usr/share/pamac/icons/24x24/status/package-setup.png') + icon_handler('pamac-setup') target_handler('') percent_handler(0) progress_buffer.delete(progress_buffer.get_start_iter(), progress_buffer.get_end_iter()) @@ -585,7 +585,7 @@ def download(url_list, path): ftp = None total_size = 0 transferred = 0 - icon_handler('/usr/share/pamac/icons/24x24/status/package-download.png') + icon_handler('pamac-download') ProgressCancelButton.set_visible(True) ProgressCloseButton.set_visible(False) parsed_urls = [] @@ -644,7 +644,7 @@ def build_next(): action = _('Building {pkgname}').format(pkgname = pkg.name)+'...' action_handler(action) action_long_handler(action+'\n') - icon_handler('/usr/share/pamac/icons/24x24/status/package-setup.png') + icon_handler('pamac-setup') target_handler('') percent_handler(0) ProgressCancelButton.set_visible(True) @@ -683,7 +683,7 @@ def get_updates(): while Gtk.events_pending(): Gtk.main_iteration() action_handler(_('Checking for updates')+'...') - icon_handler('/usr/share/pamac/icons/24x24/status/package-search.png') + icon_handler('pamac-search') target_handler('') percent_handler(0) ProgressCancelButton.set_visible(False) @@ -797,7 +797,7 @@ def sysupgrade(show_updates = True): to_add.clear() to_remove.clear() action_handler(_('Preparing')+'...') - icon_handler('/usr/share/pamac/icons/24x24/status/package-setup.png') + icon_handler('pamac-setup') target_handler('') percent_handler(0) progress_buffer.delete(progress_buffer.get_start_iter(), progress_buffer.get_end_iter())