diff --git a/cardvault/application.py b/cardvault/application.py index a6db8cf..4c59ea4 100644 --- a/cardvault/application.py +++ b/cardvault/application.py @@ -134,21 +134,9 @@ class Application: # Rulings if card.rulings: - grid = builder.get_object("rulesGrid") - rows = 1 + store = builder.get_object("rulesStore") for rule in card.rulings: - date_label = Gtk.Label(rule["date"]) - text_label = Gtk.Label(rule["text"]) - text_label.set_line_wrap_mode(Pango.WrapMode.WORD) - text_label.set_line_wrap(True) - text_label.set_justify(Gtk.Justification.LEFT) - text_label.set_halign(Gtk.Align.START) - - grid.attach(date_label, 0, rows+2, 1, 1) - grid.attach(text_label, 1, rows+2, 1, 1) - - rows += 1 - grid.show_all() + store.append([rule["date"], rule["text"]]) else: builder.get_object("ruleBox").set_visible(False) @@ -322,6 +310,14 @@ class Application: self.push_status(card.name + " added to library") self.unsaved_changes = True + def bulk_add_card_to_lib(self, cards: list, tag: str = None): + for card in cards: + self.add_card_to_lib(card, tag) + util.log("Added {} cards to library.".format(str(len(cards))), util.LogLevel.Info) + self.push_status("Added {} cards to library.".format(str(len(cards)))) + + + def remove_card_from_lib(self, card): # Check if card is tagged for card_ids in self.tags.values(): diff --git a/cardvault/cardlist.py b/cardvault/cardlist.py index a41432c..b0b9eec 100644 --- a/cardvault/cardlist.py +++ b/cardvault/cardlist.py @@ -78,7 +78,8 @@ class CardList(Gtk.ScrolledWindow): mana_cost, card.cmc, card.set_name, - color] + color, + card.original_text] self.store.append(item) end = time.time() util.log("Time to build Table: " + str(round(end - start, 3)) + "s", util.LogLevel.Info) diff --git a/cardvault/gui/cardtree.glade b/cardvault/gui/cardtree.glade index f5aae41..bfdd2bf 100644 --- a/cardvault/gui/cardtree.glade +++ b/cardvault/gui/cardtree.glade @@ -28,6 +28,8 @@ + + @@ -66,6 +68,24 @@ + + + False + True + autosize + Card Text + + + word-char + 400 + + + 11 + 12 + + + + True diff --git a/cardvault/gui/detailswindow.glade b/cardvault/gui/detailswindow.glade index 1576cc2..e42900d 100644 --- a/cardvault/gui/detailswindow.glade +++ b/cardvault/gui/detailswindow.glade @@ -2,6 +2,14 @@ + + + + + + + + False 600 @@ -68,29 +76,41 @@ True in - + True - False - True - True + True + rulesStore + False + False + False + + + none + + - - True - False - 10 - 20 + + autosize + Date - - True - False - start - vertical + + + 0 + + + + + + + Rule + + + word-char + 300 - - 0 - 0 - 2 - + + 1 +