diff --git a/mtg-collector/cardlist.py b/mtg-collector/cardlist.py index 64e38fb..c5cf2e3 100644 --- a/mtg-collector/cardlist.py +++ b/mtg-collector/cardlist.py @@ -21,7 +21,8 @@ class CardList(Gtk.ScrolledWindow): # 7 Printings (Sets with this card in it) # 8 Mana Cost(Form: {G}{2}) # 9 CMC - self.store = Gtk.ListStore(int, str, str, str, str, str, str, str, GdkPixbuf.Pixbuf, int) + # 10 Edition + self.store = Gtk.ListStore(int, str, str, str, str, str, str, str, GdkPixbuf.Pixbuf, int, str) self.list = Gtk.TreeView(self.store) self.add(self.list) @@ -72,11 +73,16 @@ class CardList(Gtk.ScrolledWindow): col_cmc = Gtk.TreeViewColumn(title="CMC", cell_renderer=text_renderer, text=9) col_cmc.set_visible(False) + col_set_name = Gtk.TreeViewColumn(title="Edition", cell_renderer=text_renderer, text=10) + col_set_name.set_expand(False) + col_set_name.set_sort_column_id(10) + self.list.append_column(col_id) self.list.append_column(col_title) self.list.append_column(col_supertypes) self.list.append_column(col_types) self.list.append_column(col_rarity) + self.list.append_column(col_set_name) self.list.append_column(col_power) self.list.append_column(col_thoughness) self.list.append_column(col_printings) diff --git a/mtg-collector/config.py b/mtg-collector/config.py index 63d674f..dc7db14 100644 --- a/mtg-collector/config.py +++ b/mtg-collector/config.py @@ -16,4 +16,4 @@ green_color = Gdk.color_parse('#87ff89') red_color = Gdk.color_parse('#ff6d6d') # When True Search view will list a card multiple times for each set they appear in -show_from_all_sets = False +show_from_all_sets = True diff --git a/mtg-collector/library.py b/mtg-collector/library.py index 31e1890..b34da35 100644 --- a/mtg-collector/library.py +++ b/mtg-collector/library.py @@ -100,7 +100,8 @@ class LibraryView(Gtk.Grid): card.toughness, ", ".join(card.printings), util.create_mana_icons(card.mana_cost), - card.cmc]) + card.cmc, + card.set_name]) def card_clicked(self, flowbox, flowboxchild): card_id = self.flowbox_ids[flowboxchild.get_index()] diff --git a/mtg-collector/search.py b/mtg-collector/search.py index ee1158d..314f482 100644 --- a/mtg-collector/search.py +++ b/mtg-collector/search.py @@ -320,7 +320,8 @@ class SearchView(Gtk.Grid): card.toughness, ", ".join(card.printings), util.create_mana_icons(card.mana_cost), - card.cmc]) + card.cmc, + card.set_name]) # update progress bar progress += loadprogress_step GObject.idle_add(self.progressbar.set_fraction, progress, priorty=GObject.PRIORITY_DEFAULT)