From 69f1210bc946fb3ea343c37cdd4f65f3d68fdc16 Mon Sep 17 00:00:00 2001 From: Stephan Lachnit Date: Tue, 12 Jan 2021 00:14:14 +0100 Subject: [PATCH] icon rework * normal icon names * icon size enums * update icon from icon theme Signed-off-by: Stephan Lachnit --- data/images/update_available.png | Bin 1568 -> 0 bytes data/ui/gametile.ui | 2 +- minigalaxy/paths.py | 4 ---- minigalaxy/ui/gametile.py | 16 ++++++---------- 4 files changed, 7 insertions(+), 15 deletions(-) delete mode 100644 data/images/update_available.png diff --git a/data/images/update_available.png b/data/images/update_available.png deleted file mode 100644 index e523718d0919c19b6d559585f6929aa1bd215c39..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1568 zcmV+*2H*LKP)EX>4Tx04R}tkv&MmKpe$iQ){JE9PA+C5TQC*C@SKpRVYG*P%E_RU~=h)(4-+r zad8w}3l4rPRvlcNb#-tR1i=pwCr2km7b)?7Nufoo2gm(*ckglc4iM^PrdeHaK+|nA zolJ`{MF8ChVHk0lS;nj+rOveD2TDtL7~R_(b9vW|%hdI`Pz| zZE)TvjTnMuzPM~KB@8!K(hN~T6UNgP!*o$`gO z$13M7&RV(3n)l={4CnRbC9cyPLJ|vDgai=^s@OmoHe$5uq*zGPexiea(Dh5?QpmLd zMvi$@ph0&1;D7MDTdOcJ?j?m2K;Xr3K1P7xF3_ks&iAq7G)@5jGjOH1{FOQ|{YiSQ zrA3c`zHQ**x}_<5z~v4w@MOrQ>`H!`LZJY>pV2qvfc{$`wCeTN+{ftykfE+pH^9Lm zFj}PSwGQv@Y47ddGtK^f0BECfqnLb=0{{R7R!KxbR5;6xl6y?mbr{A!-`}}#KtVuE z@`8E}6^eip53y*~hNYWy*_?@OwPsEa;wFw%Y$e{(Y%VSFwl-TAN^Q8%+?caDGxf(2 zyr8HoE{a-eDYt`%bNjvhf#)c>wVr>z+xx!H^FH7AeGw6yCGH!BVW3`kzxFFJ)VnwD z8z>QB?)r0b?79z=h){iZ+Cj63NOw>}*G<2>@HnQb-`Cl=H|su zFWlNfQ?rLfQxp3uXO^FSYutiU^3Bnf7{f3yrx(|Hog=NbmL1uoE_C*bRc@%H)?DR!4Gm4{lyFbvtcw@K_SU9R8ilFpt!vAcA!yL8d+d99TIcf0+h zE_Ac`Xa@k5H8+SGWJTy7h7u7RMYRHOaZ5HftBHUiSTsdx#RaM_d2z&R4G%m*aYf^d znnushkNQirs$1?Y&L<;^0Qw(jAAasW(AF(8hDB?CjTmHw7u!Ner(Sxtb8%{`lK$n*d%I?xd zFo?I9=n6>0-LX{@NQ}3UQE~>KVbo~=3XS^Do#c+NMG6z*qOe-b2#}Vb{X)SC_aVDW zm(nj9#4rr;1r0Hbko5KiBI^qoq5kot7S&3)X=(mY&a`+qdesL&X0mnN{*{wHiVWPj z*xh{3FOG*ZR7@VO3ip*y**jn}VZ68T%+%x8d|N}JrSTs~ic+`6C8)(etemp%(Rf7g z<)tU)wRtRGhOa7&=SNw|O^XFloNMjoNSpsL@$@ImtE*Q{UKJ56_`rSea)%U%fTrN3 z6bqY*$1^0>h5#W$0EJoWfBnHAo4##g_vzkW%XHB@MR&p8>3UeK>{F z#sJ_C1}WLx$l*5M05>TyP_;6Hgt%y`j$CE={yUM}*f?XO7802m4%D3OLJ<1=0WP<8 zlQA}$VK!}mVEcV=mNl^B$7Yh^tpjpRo#dN4dxO6Nc>uq)_u+8WB4U67lV%=37#X9n zcFt&WGn24dOn~s(sk;>TII7^QPbmlI2PanmOb zV&YTrSS=?0?({Ny^;t$GJaidjHC8AQ;hi;ldfjbR=QD`h_H>7hl36LFrVIg8gw%SY zn@xM#INa)o2S!YqV#+A%iNS15>-=nwPt6G_lk-k*XgCUzV@w@AKL1I3g6XHJInm!27i8T3H}@Z`hYcnd S(#;+K0000 True False - gtk-cancel + process-stop diff --git a/minigalaxy/paths.py b/minigalaxy/paths.py index 5c88788b..525fa7a3 100644 --- a/minigalaxy/paths.py +++ b/minigalaxy/paths.py @@ -24,10 +24,6 @@ if not os.path.exists(ICON_WINE_PATH): ICON_WINE_PATH = os.path.abspath(os.path.join(LAUNCH_DIR, "../share/minigalaxy/images/winehq_logo_glass.png")) -ICON_UPDATE_PATH = os.path.abspath(os.path.join(LAUNCH_DIR, "../data/images/update_available.png")) -if not os.path.exists(ICON_UPDATE_PATH): - ICON_UPDATE_PATH = os.path.abspath(os.path.join(LAUNCH_DIR, "../share/minigalaxy/images/update_available.png")) - LOCALE_DIR = os.path.abspath(os.path.join(LAUNCH_DIR, "../data/mo")) if not os.path.exists(LOCALE_DIR): LOCALE_DIR = os.path.abspath(os.path.join(LAUNCH_DIR, "../share/minigalaxy/translations")) diff --git a/minigalaxy/ui/gametile.py b/minigalaxy/ui/gametile.py index 0fa60a39..13af8b5c 100644 --- a/minigalaxy/ui/gametile.py +++ b/minigalaxy/ui/gametile.py @@ -20,7 +20,6 @@ from minigalaxy.installer import uninstall_game, install_game from minigalaxy.css import CSS_PROVIDER from minigalaxy.paths import ICON_WINE_PATH -from minigalaxy.paths import ICON_UPDATE_PATH from minigalaxy.api import NoDownloadLinkFound @@ -377,7 +376,7 @@ def update_gtk_box_for_dlc(self, icon, title, installer): dlc_box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL) dlc_box.set_spacing(8) image = Gtk.Image() - image.set_from_icon_name("media-optical-symbolic.symbolic", 1) + image.set_from_icon_name("media-optical", Gtk.IconSize.BUTTON) dlc_box.pack_start(image, False, True, 0) label = Gtk.Label(label=title, xalign=0) dlc_box.pack_start(label, True, True, 0) @@ -390,19 +389,16 @@ def update_gtk_box_for_dlc(self, icon, title, installer): self.get_async_image_dlc_icon(icon, title) download_info = self.api.get_download_info(self.game, dlc_installers=installer) if self.game.is_update_available(version_from_api=download_info["version"], dlc_title=title): - icon_name = ICON_UPDATE_PATH + icon_name = "emblem-synchronizing" self.dlc_dict[title][0].set_sensitive(True) elif self.game.is_installed(dlc_title=title): - icon_name = "emblem-default-symbolic.symbolic" + icon_name = "object-select" self.dlc_dict[title][0].set_sensitive(False) else: - icon_name = "go-bottom-symbolic.symbolic" + icon_name = "document-save" self.dlc_dict[title][0].set_sensitive(True) install_button_image = Gtk.Image() - if icon_name in [ICON_UPDATE_PATH]: - install_button_image.set_from_file(ICON_UPDATE_PATH) - else: - install_button_image.set_from_icon_name(icon_name, 1) + install_button_image.set_from_icon_name(icon_name, Gtk.IconSize.BUTTON) self.dlc_dict[title][0].set_image(install_button_image) def get_async_image_dlc_icon(self, icon, title): @@ -552,7 +548,7 @@ def update_to_state(self, state): elif state == self.state.UPDATABLE: self.update_icon.show() - self.update_icon.set_from_file(ICON_UPDATE_PATH) + self.update_icon.set_from_icon_name("emblem-synchronizing", Gtk.IconSize.LARGE_TOOLBAR) self.button.set_label(_("play")) self.menu_button.show() tooltip_text = "{} (update{})".format(self.game.name, ", Wine" if self.game.platform == "windows" else "")