From 69cafd84b47d58d6226ad9d7d08d811ac88f4c48 Mon Sep 17 00:00:00 2001 From: luxick Date: Wed, 15 Mar 2017 14:45:02 +0100 Subject: [PATCH] Fix loading of mana icons. Focus search entry if no results were found --- .../resources/mana_icons/{bg.png => BG.png} | Bin .../resources/mana_icons/{bp.png => BP.png} | Bin .../resources/mana_icons/{br.png => BR.png} | Bin .../resources/mana_icons/{gp.png => GP.png} | Bin .../resources/mana_icons/{gu.png => GU.png} | Bin .../resources/mana_icons/{gw.png => GW.png} | Bin .../resources/mana_icons/{rg.png => RG.png} | Bin .../resources/mana_icons/{rp.png => RP.png} | Bin .../resources/mana_icons/{rw.png => RW.png} | Bin mtg-collector/resources/mana_icons/{s.png => S.png} | Bin .../resources/mana_icons/{tap.png => T.png} | Bin .../resources/mana_icons/{ub.png => UB.png} | Bin .../resources/mana_icons/{up.png => UP.png} | Bin .../resources/mana_icons/{ur.png => UR.png} | Bin .../resources/mana_icons/{wb.png => WB.png} | Bin .../resources/mana_icons/{wp.png => WP.png} | Bin .../resources/mana_icons/{wu.png => WU.png} | Bin mtg-collector/search.py | 4 +--- mtg-collector/util.py | 3 ++- 19 files changed, 3 insertions(+), 4 deletions(-) rename mtg-collector/resources/mana_icons/{bg.png => BG.png} (100%) rename mtg-collector/resources/mana_icons/{bp.png => BP.png} (100%) rename mtg-collector/resources/mana_icons/{br.png => BR.png} (100%) rename mtg-collector/resources/mana_icons/{gp.png => GP.png} (100%) rename mtg-collector/resources/mana_icons/{gu.png => GU.png} (100%) rename mtg-collector/resources/mana_icons/{gw.png => GW.png} (100%) rename mtg-collector/resources/mana_icons/{rg.png => RG.png} (100%) rename mtg-collector/resources/mana_icons/{rp.png => RP.png} (100%) rename mtg-collector/resources/mana_icons/{rw.png => RW.png} (100%) rename mtg-collector/resources/mana_icons/{s.png => S.png} (100%) rename mtg-collector/resources/mana_icons/{tap.png => T.png} (100%) rename mtg-collector/resources/mana_icons/{ub.png => UB.png} (100%) rename mtg-collector/resources/mana_icons/{up.png => UP.png} (100%) rename mtg-collector/resources/mana_icons/{ur.png => UR.png} (100%) rename mtg-collector/resources/mana_icons/{wb.png => WB.png} (100%) rename mtg-collector/resources/mana_icons/{wp.png => WP.png} (100%) rename mtg-collector/resources/mana_icons/{wu.png => WU.png} (100%) diff --git a/mtg-collector/resources/mana_icons/bg.png b/mtg-collector/resources/mana_icons/BG.png similarity index 100% rename from mtg-collector/resources/mana_icons/bg.png rename to mtg-collector/resources/mana_icons/BG.png diff --git a/mtg-collector/resources/mana_icons/bp.png b/mtg-collector/resources/mana_icons/BP.png similarity index 100% rename from mtg-collector/resources/mana_icons/bp.png rename to mtg-collector/resources/mana_icons/BP.png diff --git a/mtg-collector/resources/mana_icons/br.png b/mtg-collector/resources/mana_icons/BR.png similarity index 100% rename from mtg-collector/resources/mana_icons/br.png rename to mtg-collector/resources/mana_icons/BR.png diff --git a/mtg-collector/resources/mana_icons/gp.png b/mtg-collector/resources/mana_icons/GP.png similarity index 100% rename from mtg-collector/resources/mana_icons/gp.png rename to mtg-collector/resources/mana_icons/GP.png diff --git a/mtg-collector/resources/mana_icons/gu.png b/mtg-collector/resources/mana_icons/GU.png similarity index 100% rename from mtg-collector/resources/mana_icons/gu.png rename to mtg-collector/resources/mana_icons/GU.png diff --git a/mtg-collector/resources/mana_icons/gw.png b/mtg-collector/resources/mana_icons/GW.png similarity index 100% rename from mtg-collector/resources/mana_icons/gw.png rename to mtg-collector/resources/mana_icons/GW.png diff --git a/mtg-collector/resources/mana_icons/rg.png b/mtg-collector/resources/mana_icons/RG.png similarity index 100% rename from mtg-collector/resources/mana_icons/rg.png rename to mtg-collector/resources/mana_icons/RG.png diff --git a/mtg-collector/resources/mana_icons/rp.png b/mtg-collector/resources/mana_icons/RP.png similarity index 100% rename from mtg-collector/resources/mana_icons/rp.png rename to mtg-collector/resources/mana_icons/RP.png diff --git a/mtg-collector/resources/mana_icons/rw.png b/mtg-collector/resources/mana_icons/RW.png similarity index 100% rename from mtg-collector/resources/mana_icons/rw.png rename to mtg-collector/resources/mana_icons/RW.png diff --git a/mtg-collector/resources/mana_icons/s.png b/mtg-collector/resources/mana_icons/S.png similarity index 100% rename from mtg-collector/resources/mana_icons/s.png rename to mtg-collector/resources/mana_icons/S.png diff --git a/mtg-collector/resources/mana_icons/tap.png b/mtg-collector/resources/mana_icons/T.png similarity index 100% rename from mtg-collector/resources/mana_icons/tap.png rename to mtg-collector/resources/mana_icons/T.png diff --git a/mtg-collector/resources/mana_icons/ub.png b/mtg-collector/resources/mana_icons/UB.png similarity index 100% rename from mtg-collector/resources/mana_icons/ub.png rename to mtg-collector/resources/mana_icons/UB.png diff --git a/mtg-collector/resources/mana_icons/up.png b/mtg-collector/resources/mana_icons/UP.png similarity index 100% rename from mtg-collector/resources/mana_icons/up.png rename to mtg-collector/resources/mana_icons/UP.png diff --git a/mtg-collector/resources/mana_icons/ur.png b/mtg-collector/resources/mana_icons/UR.png similarity index 100% rename from mtg-collector/resources/mana_icons/ur.png rename to mtg-collector/resources/mana_icons/UR.png diff --git a/mtg-collector/resources/mana_icons/wb.png b/mtg-collector/resources/mana_icons/WB.png similarity index 100% rename from mtg-collector/resources/mana_icons/wb.png rename to mtg-collector/resources/mana_icons/WB.png diff --git a/mtg-collector/resources/mana_icons/wp.png b/mtg-collector/resources/mana_icons/WP.png similarity index 100% rename from mtg-collector/resources/mana_icons/wp.png rename to mtg-collector/resources/mana_icons/WP.png diff --git a/mtg-collector/resources/mana_icons/wu.png b/mtg-collector/resources/mana_icons/WU.png similarity index 100% rename from mtg-collector/resources/mana_icons/wu.png rename to mtg-collector/resources/mana_icons/WU.png diff --git a/mtg-collector/search.py b/mtg-collector/search.py index 5109e05..487cf42 100644 --- a/mtg-collector/search.py +++ b/mtg-collector/search.py @@ -292,14 +292,12 @@ class SearchView(Gtk.Grid): if typefilter == "Any": typefilter = "" - # tree_iter = self.set_combo.get_active_iter() set_filter = "" if not self.set_entry.get_text() == "": for row in self.set_store: if row[1] == self.set_entry.get_text(): set_filter = row[0] - # Load card info from internet print("\nStart online search") GObject.idle_add(util.push_status, "Searching for cards", priorty=GObject.PRIORITY_DEFAULT) @@ -323,6 +321,7 @@ class SearchView(Gtk.Grid): GObject.idle_add(util.show_message, "No Results", messagetext, priority=GObject.PRIORITY_DEFAULT) # Reactivate search controls GObject.idle_add(self._do_activate_controls, True, priority=GObject.PRIORITY_DEFAULT) + GObject.idle_add(self.searchEntry.grab_focus, priority=GObject.PRIORITY_DEFAULT) return # Remove duplicate entries @@ -399,7 +398,6 @@ class SearchView(Gtk.Grid): # Set default rarity and type filters to "Any" self.rarity_combo.set_active(0) self.type_combo.set_active(0) - #self.set_combo.set_active(0) def _do_activate_controls(self, active): self.searchEntry.set_editable(active) diff --git a/mtg-collector/util.py b/mtg-collector/util.py index 1e7bea6..67fdc66 100644 --- a/mtg-collector/util.py +++ b/mtg-collector/util.py @@ -72,6 +72,7 @@ def import_library(): print("Library imported") dialog.destroy() + def save_library(): if not os.path.exists(config.cache_path): os.makedirs(config.cache_path) @@ -223,7 +224,7 @@ def create_mana_icons(mana_string): # Go through all entries an add the correspondent icon to the final image for icon in list: xpos = poscounter * 105 - loaded = manaicons.get(icon) + loaded = manaicons.get(icon.replace("/", "")) if loaded is None: print("ERROR: No icon file named \"" + icon + "\" found.") else: