diff --git a/gui.py b/gui.py index d7d0716..73d0659 100644 --- a/gui.py +++ b/gui.py @@ -34,7 +34,7 @@ class MainWindow(Gtk.Window): win = MainWindow() # Load local image Data -util.imagecache = util.reload_image_cache() +util.reload_image_cache() win.connect('delete-event', Gtk.main_quit) win.show_all() Gtk.main() diff --git a/resources/mana_icons/0.png b/resources/mana_icons/0.png new file mode 100644 index 0000000..ccf4745 Binary files /dev/null and b/resources/mana_icons/0.png differ diff --git a/resources/mana_icons/1.png b/resources/mana_icons/1.png new file mode 100644 index 0000000..25910d5 Binary files /dev/null and b/resources/mana_icons/1.png differ diff --git a/resources/mana_icons/10.png b/resources/mana_icons/10.png new file mode 100644 index 0000000..0c7df91 Binary files /dev/null and b/resources/mana_icons/10.png differ diff --git a/resources/mana_icons/11.png b/resources/mana_icons/11.png new file mode 100644 index 0000000..8981a63 Binary files /dev/null and b/resources/mana_icons/11.png differ diff --git a/resources/mana_icons/12.png b/resources/mana_icons/12.png new file mode 100644 index 0000000..491f57c Binary files /dev/null and b/resources/mana_icons/12.png differ diff --git a/resources/mana_icons/13.png b/resources/mana_icons/13.png new file mode 100644 index 0000000..9bf560d Binary files /dev/null and b/resources/mana_icons/13.png differ diff --git a/resources/mana_icons/14.png b/resources/mana_icons/14.png new file mode 100644 index 0000000..5b3d3e1 Binary files /dev/null and b/resources/mana_icons/14.png differ diff --git a/resources/mana_icons/15.png b/resources/mana_icons/15.png new file mode 100644 index 0000000..c141fc1 Binary files /dev/null and b/resources/mana_icons/15.png differ diff --git a/resources/mana_icons/16.png b/resources/mana_icons/16.png new file mode 100644 index 0000000..9cedaab Binary files /dev/null and b/resources/mana_icons/16.png differ diff --git a/resources/mana_icons/17.png b/resources/mana_icons/17.png new file mode 100644 index 0000000..151ed3b Binary files /dev/null and b/resources/mana_icons/17.png differ diff --git a/resources/mana_icons/18.png b/resources/mana_icons/18.png new file mode 100644 index 0000000..3570589 Binary files /dev/null and b/resources/mana_icons/18.png differ diff --git a/resources/mana_icons/19.png b/resources/mana_icons/19.png new file mode 100644 index 0000000..03a11f8 Binary files /dev/null and b/resources/mana_icons/19.png differ diff --git a/resources/mana_icons/2.png b/resources/mana_icons/2.png new file mode 100644 index 0000000..ba97c06 Binary files /dev/null and b/resources/mana_icons/2.png differ diff --git a/resources/mana_icons/20.png b/resources/mana_icons/20.png new file mode 100644 index 0000000..d26b949 Binary files /dev/null and b/resources/mana_icons/20.png differ diff --git a/resources/mana_icons/2b.png b/resources/mana_icons/2b.png new file mode 100644 index 0000000..d43c422 Binary files /dev/null and b/resources/mana_icons/2b.png differ diff --git a/resources/mana_icons/2g.png b/resources/mana_icons/2g.png new file mode 100644 index 0000000..dfb55de Binary files /dev/null and b/resources/mana_icons/2g.png differ diff --git a/resources/mana_icons/2r.png b/resources/mana_icons/2r.png new file mode 100644 index 0000000..d96ae08 Binary files /dev/null and b/resources/mana_icons/2r.png differ diff --git a/resources/mana_icons/2u.png b/resources/mana_icons/2u.png new file mode 100644 index 0000000..139cd80 Binary files /dev/null and b/resources/mana_icons/2u.png differ diff --git a/resources/mana_icons/2w.png b/resources/mana_icons/2w.png new file mode 100644 index 0000000..cc94187 Binary files /dev/null and b/resources/mana_icons/2w.png differ diff --git a/resources/mana_icons/3.png b/resources/mana_icons/3.png new file mode 100644 index 0000000..e17feb1 Binary files /dev/null and b/resources/mana_icons/3.png differ diff --git a/resources/mana_icons/4.png b/resources/mana_icons/4.png new file mode 100644 index 0000000..5c0ff85 Binary files /dev/null and b/resources/mana_icons/4.png differ diff --git a/resources/mana_icons/5.png b/resources/mana_icons/5.png new file mode 100644 index 0000000..fbaaea9 Binary files /dev/null and b/resources/mana_icons/5.png differ diff --git a/resources/mana_icons/6.png b/resources/mana_icons/6.png new file mode 100644 index 0000000..44685bd Binary files /dev/null and b/resources/mana_icons/6.png differ diff --git a/resources/mana_icons/7.png b/resources/mana_icons/7.png new file mode 100644 index 0000000..65ceb52 Binary files /dev/null and b/resources/mana_icons/7.png differ diff --git a/resources/mana_icons/8.png b/resources/mana_icons/8.png new file mode 100644 index 0000000..81817e5 Binary files /dev/null and b/resources/mana_icons/8.png differ diff --git a/resources/mana_icons/9.png b/resources/mana_icons/9.png new file mode 100644 index 0000000..33cd6df Binary files /dev/null and b/resources/mana_icons/9.png differ diff --git a/resources/mana_icons/b.png b/resources/mana_icons/b.png new file mode 100644 index 0000000..9bdeb95 Binary files /dev/null and b/resources/mana_icons/b.png differ diff --git a/resources/mana_icons/bg.png b/resources/mana_icons/bg.png new file mode 100644 index 0000000..16ff5a1 Binary files /dev/null and b/resources/mana_icons/bg.png differ diff --git a/resources/mana_icons/bp.png b/resources/mana_icons/bp.png new file mode 100644 index 0000000..b8a95ab Binary files /dev/null and b/resources/mana_icons/bp.png differ diff --git a/resources/mana_icons/br.png b/resources/mana_icons/br.png new file mode 100644 index 0000000..9206ae0 Binary files /dev/null and b/resources/mana_icons/br.png differ diff --git a/resources/mana_icons/flip.png b/resources/mana_icons/flip.png new file mode 100644 index 0000000..cacd12f Binary files /dev/null and b/resources/mana_icons/flip.png differ diff --git a/resources/mana_icons/g.png b/resources/mana_icons/g.png new file mode 100644 index 0000000..0b9de84 Binary files /dev/null and b/resources/mana_icons/g.png differ diff --git a/resources/mana_icons/gp.png b/resources/mana_icons/gp.png new file mode 100644 index 0000000..6505e9d Binary files /dev/null and b/resources/mana_icons/gp.png differ diff --git a/resources/mana_icons/gu.png b/resources/mana_icons/gu.png new file mode 100644 index 0000000..d5534df Binary files /dev/null and b/resources/mana_icons/gu.png differ diff --git a/resources/mana_icons/gw.png b/resources/mana_icons/gw.png new file mode 100644 index 0000000..58ecb1b Binary files /dev/null and b/resources/mana_icons/gw.png differ diff --git a/resources/mana_icons/half.png b/resources/mana_icons/half.png new file mode 100644 index 0000000..89a03ba Binary files /dev/null and b/resources/mana_icons/half.png differ diff --git a/resources/mana_icons/infinite.png b/resources/mana_icons/infinite.png new file mode 100644 index 0000000..963d7fa Binary files /dev/null and b/resources/mana_icons/infinite.png differ diff --git a/resources/mana_icons/r.png b/resources/mana_icons/r.png new file mode 100644 index 0000000..aae184b Binary files /dev/null and b/resources/mana_icons/r.png differ diff --git a/resources/mana_icons/rg.png b/resources/mana_icons/rg.png new file mode 100644 index 0000000..28352fc Binary files /dev/null and b/resources/mana_icons/rg.png differ diff --git a/resources/mana_icons/rp.png b/resources/mana_icons/rp.png new file mode 100644 index 0000000..a4c609f Binary files /dev/null and b/resources/mana_icons/rp.png differ diff --git a/resources/mana_icons/rw.png b/resources/mana_icons/rw.png new file mode 100644 index 0000000..299bae4 Binary files /dev/null and b/resources/mana_icons/rw.png differ diff --git a/resources/mana_icons/s.png b/resources/mana_icons/s.png new file mode 100644 index 0000000..6800592 Binary files /dev/null and b/resources/mana_icons/s.png differ diff --git a/resources/mana_icons/tap.png b/resources/mana_icons/tap.png new file mode 100644 index 0000000..4237b55 Binary files /dev/null and b/resources/mana_icons/tap.png differ diff --git a/resources/mana_icons/tap_old.png b/resources/mana_icons/tap_old.png new file mode 100644 index 0000000..1ab17d4 Binary files /dev/null and b/resources/mana_icons/tap_old.png differ diff --git a/resources/mana_icons/u.png b/resources/mana_icons/u.png new file mode 100644 index 0000000..add2250 Binary files /dev/null and b/resources/mana_icons/u.png differ diff --git a/resources/mana_icons/ub.png b/resources/mana_icons/ub.png new file mode 100644 index 0000000..a51d5c8 Binary files /dev/null and b/resources/mana_icons/ub.png differ diff --git a/resources/mana_icons/untap.png b/resources/mana_icons/untap.png new file mode 100644 index 0000000..7dc4008 Binary files /dev/null and b/resources/mana_icons/untap.png differ diff --git a/resources/mana_icons/up.png b/resources/mana_icons/up.png new file mode 100644 index 0000000..8305d69 Binary files /dev/null and b/resources/mana_icons/up.png differ diff --git a/resources/mana_icons/ur.png b/resources/mana_icons/ur.png new file mode 100644 index 0000000..97042c2 Binary files /dev/null and b/resources/mana_icons/ur.png differ diff --git a/resources/mana_icons/w.png b/resources/mana_icons/w.png new file mode 100644 index 0000000..2c84442 Binary files /dev/null and b/resources/mana_icons/w.png differ diff --git a/resources/mana_icons/wb.png b/resources/mana_icons/wb.png new file mode 100644 index 0000000..921efb0 Binary files /dev/null and b/resources/mana_icons/wb.png differ diff --git a/resources/mana_icons/wp.png b/resources/mana_icons/wp.png new file mode 100644 index 0000000..b9530f1 Binary files /dev/null and b/resources/mana_icons/wp.png differ diff --git a/resources/mana_icons/wu.png b/resources/mana_icons/wu.png new file mode 100644 index 0000000..59afef4 Binary files /dev/null and b/resources/mana_icons/wu.png differ diff --git a/resources/mana_icons/x.png b/resources/mana_icons/x.png new file mode 100644 index 0000000..1be868c Binary files /dev/null and b/resources/mana_icons/x.png differ diff --git a/resources/mana_icons/y.png b/resources/mana_icons/y.png new file mode 100644 index 0000000..53e453b Binary files /dev/null and b/resources/mana_icons/y.png differ diff --git a/resources/mana_icons/z.png b/resources/mana_icons/z.png new file mode 100644 index 0000000..d0f1963 Binary files /dev/null and b/resources/mana_icons/z.png differ diff --git a/search.py b/search.py index c71bc97..cbf1c46 100644 --- a/search.py +++ b/search.py @@ -36,7 +36,7 @@ class SearchView(Gtk.Grid): self.searchresults = Gtk.ScrolledWindow(hexpand=True, vexpand=True) self.searchresults.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC) - self.store = Gtk.ListStore(GdkPixbuf.Pixbuf, str, str) + self.store = Gtk.ListStore(GdkPixbuf.Pixbuf, str, str, str) self.list = Gtk.TreeView(self.store) self.searchresults.add(self.list) @@ -50,18 +50,23 @@ class SearchView(Gtk.Grid): info.set_property("wrap-width", 100) info.set_padding = 2 + manacost = Gtk.CellRendererText() + self.column1 = Gtk.TreeViewColumn(title="Image", cell_renderer=image, pixbuf=0) self.column2 = Gtk.TreeViewColumn(title="Card Name", cell_renderer=title, text=1) self.column3 = Gtk.TreeViewColumn(title="Card Text", cell_renderer=info, text=2) + self.column4 = Gtk.TreeViewColumn(title="Mana Cost", cell_renderer=manacost, text=3) self.column3.set_max_width(100) self.column1.pack_start(image, True) self.column2.pack_start(title, True) self.column3.pack_start(info, True) + self.column4.pack_start(manacost, True) self.list.append_column(self.column1) self.list.append_column(self.column2) self.list.append_column(self.column3) + self.list.append_column(self.column4) # Bring it all together self.attach(self.searchbox, 0, 0, 1, 1) @@ -73,14 +78,17 @@ class SearchView(Gtk.Grid): if not term == "": print("Search for \"" + term + "\" online.") - cards = Card.where(name=term).all() + cards = Card.where(name=term).where(pageSize=50).where(page=1).all() self.store.clear() for card in cards: if card.multiverse_id is not None: - print("Found ID: " + card.multiverse_id.__str__() + " | " + card.name) + print("Found: " + card.name + + " (" + card.multiverse_id.__str__() + ")") self.store.append([util.load_card_image(card), - card.name, - card.original_text]) + card.name, + card.original_text, + card.mana_cost]) + util.reload_image_cache() diff --git a/util.py b/util.py index b886b3f..1cbb062 100644 --- a/util.py +++ b/util.py @@ -18,11 +18,10 @@ def reload_image_cache(): # return array of images imageslist = os.listdir(config.cachepath) - loadedimages = [] + imagecache.clear() for image in imageslist: img = PImage.open(config.cachepath + image) - loadedimages.append(img) - return loadedimages + imagecache.append(img) def add_test_image():