From 5f78e920c1c9cba3fc7a0d14ed876af1327a1910 Mon Sep 17 00:00:00 2001 From: luxick Date: Wed, 15 Mar 2017 14:25:13 +0100 Subject: [PATCH] Search view hides card images in list --- mtg-collector/library.py | 9 --------- mtg-collector/search.py | 16 ++++++++-------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/mtg-collector/library.py b/mtg-collector/library.py index 15eda65..df43ffe 100644 --- a/mtg-collector/library.py +++ b/mtg-collector/library.py @@ -32,15 +32,6 @@ class LibraryView(Gtk.Grid): self.filterBox.add(self.testRow) # endregion - # The Small Card Flow - # self.cardScroller = Gtk.ScrolledWindow(hexpand=True, vexpand=True) - # self.cardScroller.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC) - # self.cardFlow = Gtk.FlowBox() - # self.cardFlow.set_valign(Gtk.Align.START) - # self.cardFlow.set_max_children_per_line(50) - # self.cardFlow.set_selection_mode(Gtk.SelectionMode.SINGLE) - # self.cardFlow.connect("child-activated", self.card_clicked) - # self.cardScroller.add(self.cardFlow) # 0=ID, 1=Name, 2=Types, 3=Rarity, 4=Mana, 5=CMC(for sorting), self.store = Gtk.ListStore(int, str, str, str, GdkPixbuf.Pixbuf, int) diff --git a/mtg-collector/search.py b/mtg-collector/search.py index ef502d4..ff4d5e3 100644 --- a/mtg-collector/search.py +++ b/mtg-collector/search.py @@ -147,7 +147,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(int, GdkPixbuf.Pixbuf, str, str, GdkPixbuf.Pixbuf) + self.store = Gtk.ListStore(int, str, str, GdkPixbuf.Pixbuf) self.list = Gtk.TreeView(self.store) self.list.set_rules_hint(True) self.searchresults.add(self.list) @@ -163,20 +163,21 @@ class SearchView(Gtk.Grid): info.set_padding(5, 5) index = Gtk.CellRendererText() + col_id = Gtk.TreeViewColumn(title=index, cell_renderer=index, text=0) col_id.set_visible(False) - col_image = Gtk.TreeViewColumn(title="Image", cell_renderer=image, pixbuf=1) - col_image.set_sizing(Gtk.TreeViewColumnSizing.AUTOSIZE) - col_name = Gtk.TreeViewColumn(title="Card Name", cell_renderer=title, text=2) + # col_image = Gtk.TreeViewColumn(title="Image", cell_renderer=image, pixbuf=1) + # col_image.set_sizing(Gtk.TreeViewColumnSizing.AUTOSIZE) + col_name = Gtk.TreeViewColumn(title="Card Name", cell_renderer=title, text=1) col_name.set_sizing(Gtk.TreeViewColumnSizing.AUTOSIZE) - col_text = Gtk.TreeViewColumn(title="Card Text", cell_renderer=info, text=3) + col_text = Gtk.TreeViewColumn(title="Card Text", cell_renderer=info, text=2) col_text.set_sizing(Gtk.TreeViewColumnSizing.AUTOSIZE) col_text.set_resizable(True) col_text.set_expand(True) - col_mana = Gtk.TreeViewColumn(title="Mana Cost", cell_renderer=image, pixbuf=4) + col_mana = Gtk.TreeViewColumn(title="Mana Cost", cell_renderer=image, pixbuf=3) col_mana.set_sizing(Gtk.TreeViewColumnSizing.AUTOSIZE) - self.list.append_column(col_image) + # self.list.append_column(col_image) self.list.append_column(col_name) self.list.append_column(col_text) self.list.append_column(col_mana) @@ -347,7 +348,6 @@ class SearchView(Gtk.Grid): for card in self.cards: if card.multiverse_id is not None: self.store.append([card.multiverse_id, - util.load_card_image(card, 63 * 2, 88 * 2), card.name, card.original_text, util.create_mana_icons(card.mana_cost)])