Fill single card window

cardvault/gui/detailswindow.glade

@@ -4,20 +4,28 @@
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkWindow" id="cardDetails">
     <property name="can_focus">False</property>
+    <property name="default_width">600</property>
     <child>
       <object class="GtkGrid">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="hexpand">False</property>
+        <property name="vexpand">False</property>
+        <property name="row_spacing">5</property>
+        <property name="column_spacing">5</property>
         <child>
           <object class="GtkGrid">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">start</property>
+            <property name="row_spacing">10</property>
+            <property name="column_spacing">5</property>
             <child>
               <object class="GtkLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">end</property>
+                <property name="valign">start</property>
                 <property name="margin_right">2</property>
                 <property name="label" translatable="yes">Card Name:</property>
                 <property name="justify">right</property>
@@ -32,6 +40,7 @@
               <object class="GtkLabel" id="cardName">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="halign">start</property>
                 <property name="label" translatable="yes">Loading...</property>
                 <property name="xalign">0.10000000149011612</property>
                 <attributes>
@@ -49,6 +58,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">end</property>
+                <property name="valign">start</property>
                 <property name="margin_right">2</property>
                 <property name="label" translatable="yes">Type:</property>
                 <property name="justify">right</property>
@@ -63,6 +73,7 @@
               <object class="GtkLabel" id="cardTypes">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="halign">start</property>
                 <property name="label" translatable="yes">Loading...</property>
                 <property name="xalign">0.10000000149011612</property>
               </object>
@@ -76,6 +87,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">end</property>
+                <property name="valign">start</property>
                 <property name="margin_right">2</property>
                 <property name="label" translatable="yes">Rarity:</property>
                 <property name="justify">right</property>
@@ -90,6 +102,7 @@
               <object class="GtkLabel" id="cardRarity">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="halign">start</property>
                 <property name="label" translatable="yes">Loading...</property>
                 <property name="xalign">0.10000000149011612</property>
               </object>
@@ -103,6 +116,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">end</property>
+                <property name="valign">start</property>
                 <property name="margin_right">2</property>
                 <property name="label" translatable="yes">Release:</property>
                 <property name="justify">right</property>
@@ -117,6 +131,7 @@
               <object class="GtkLabel" id="cardReleaseDate">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="halign">start</property>
                 <property name="label" translatable="yes">Loading...</property>
                 <property name="xalign">0.10000000149011612</property>
               </object>
@@ -130,6 +145,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">end</property>
+                <property name="valign">start</property>
                 <property name="margin_right">2</property>
                 <property name="label" translatable="yes">Edition:</property>
                 <property name="justify">right</property>
@@ -144,6 +160,7 @@
               <object class="GtkLabel" id="cardSet">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="halign">start</property>
                 <property name="label" translatable="yes">Loading...</property>
                 <property name="xalign">0.10000000149011612</property>
               </object>
@@ -157,6 +174,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">end</property>
+                <property name="valign">start</property>
                 <property name="margin_right">2</property>
                 <property name="label" translatable="yes">Other Printings:</property>
                 <property name="justify">right</property>
@@ -171,6 +189,7 @@
               <object class="GtkLabel" id="cardPrintings">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="halign">start</property>
                 <property name="label" translatable="yes">Loading...</property>
                 <property name="wrap">True</property>
                 <property name="max_width_chars">50</property>
@@ -181,12 +200,29 @@
                 <property name="top_attach">5</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkGrid" id="legalitiesGrid">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="halign">start</property>
+                <property name="row_spacing">2</property>
+                <property name="column_spacing">2</property>
+                <child>
+                  <placeholder/>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">6</property>
+              </packing>
+            </child>
             <child>
               <object class="GtkLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">end</property>
-                <property name="label" translatable="yes">Legalities:</property>
+                <property name="valign">start</property>
+                <property name="label" translatable="yes">Legality:</property>
                 <property name="justify">right</property>
                 <property name="xalign">0.89999997615814209</property>
               </object>
@@ -195,33 +231,9 @@
                 <property name="top_attach">6</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkLabel" id="cardLegalities">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Loading...</property>
-                <property name="xalign">0.10000000149011612</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">6</property>
-              </packing>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
           </object>
           <packing>
-            <property name="left_attach">1</property>
+            <property name="left_attach">2</property>
             <property name="top_attach">0</property>
           </packing>
         </child>
@@ -239,14 +251,92 @@
           </packing>
         </child>
         <child>
-          <placeholder/>
+          <object class="GtkSeparator">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">center</property>
+            <property name="orientation">vertical</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">0</property>
+          </packing>
         </child>
         <child>
-          <placeholder/>
+          <object class="GtkBox" id="ruleBox">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="no_show_all">True</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="GtkLabel">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Rulings</property>
+                <attributes>
+                  <attribute name="scale" value="1.2"/>
+                </attributes>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkScrolledWindow">
+                <property name="height_request">200</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <property name="shadow_type">in</property>
+                <child>
+                  <object class="GtkViewport">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
+                    <child>
+                      <object class="GtkGrid" id="rulesGrid">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="row_spacing">10</property>
+                        <property name="column_spacing">20</property>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="valign">start</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">0</property>
+                            <property name="width">2</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">1</property>
+            <property name="width">3</property>
+          </packing>
         </child>
       </object>
     </child>
-    <child>
+    <child type="titlebar">
       <placeholder/>
     </child>
   </object>

cardvault/gui/overlays.glade

@@ -73,6 +73,7 @@
   <object class="GtkGrid" id="searchOverlay">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
+    <property name="no_show_all">True</property>
     <property name="halign">center</property>
     <property name="valign">center</property>
     <property name="row_spacing">10</property>
@@ -81,6 +82,7 @@
       <object class="GtkImage">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="no_show_all">True</property>
         <property name="valign">end</property>
         <property name="pixel_size">100</property>
         <property name="icon_name">edit-find-symbolic</property>
@@ -94,6 +96,7 @@
       <object class="GtkLabel">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="no_show_all">True</property>
         <property name="valign">center</property>
         <property name="label" translatable="yes">Search</property>
         <attributes>
@@ -110,6 +113,7 @@
       <object class="GtkLabel">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="no_show_all">True</property>
         <property name="valign">start</property>
         <property name="label" translatable="yes">Use the entry on the left to search for cards</property>
       </object>

cardvault/handlers.py

@@ -26,7 +26,7 @@ class Handlers:
             container = self.app.ui.get_object("contentPage")
             new_page = self.app.pages[item.get_name()]
             if self.app.current_page:
-               container.remove(self.app.current_page)
+                container.remove(self.app.current_page)
             self.app.current_page = new_page
             container.pack_start(self.app.current_page, True, True, 0)
             container.show_all()

cardvault/util.py

@@ -26,6 +26,12 @@ status_bar = None
 app = None
 unsaved_changes = False
 
+legality_colors ={
+    "Banned": "#C65642",
+    "Restricted": "#D39F30",
+    "Legal": "#62B62F"
+}
+
 rarity_dict = {
     "special": 0,
     "common": 1,

cardvault/window.py

@@ -2,8 +2,9 @@ import config
 import handlers
 import util
 import search_funct
+import re
 import gi
-from gi.repository import Gtk
+from gi.repository import Gtk, Pango
 gi.require_version('Gtk', '3.0')
 
 
@@ -62,8 +63,6 @@ class MainWindow:
         pixbuf = util.load_card_image(card, 63 * 5, 88 * 5)
         image = Gtk.Image().new_from_pixbuf(pixbuf)
         container.add(image)
-
-
         # Name
         builder.get_object("cardName").set_text(card.name)
         # Types
@@ -82,12 +81,58 @@ class MainWindow:
         prints = []
         for set in card.printings:
             prints.append(util.set_dict[set].name)
-
         builder.get_object("cardPrintings").set_text(", ".join(prints))
         # Legalities
-        #builder.get_object("cardLegalities").set_text(", ".join(card.legalities))
+        grid = builder.get_object("legalitiesGrid")
+        rows = 1
+        for legality in card.legalities:
+            date_label = Gtk.Label()
+            date_label.set_halign(Gtk.Align.END)
+            text_label = Gtk.Label()
+            text_label.set_line_wrap_mode(Pango.WrapMode.WORD)
+            text_label.set_line_wrap(True)
+            text_label.set_halign(Gtk.Align.END)
+            color = util.legality_colors[legality["legality"]]
+            date_label.set_markup("<span fgcolor=\""+color+"\">" + legality["format"] + ":" + "</span>")
+            text_label.set_markup("<span fgcolor=\""+color+"\">" + legality["legality"] + "</span>")
+            grid.attach(date_label, 0, rows + 2, 1, 1)
+            grid.attach(text_label, 1, rows + 2, 1, 1)
+
+            rows += 1
+        grid.show_all()
+
+        # Rulings
+        if card.rulings:
+            grid = builder.get_object("rulesGrid")
+            rows = 1
+            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()
+        else:
+            builder.get_object("ruleBox").set_visible(False)
+
         window.show_all()
 
 
+        def eval_key_pressed(widget,event):
+            key, modifier = Gtk.accelerator_parse('Escape')
+            keyval = event.keyval
+            if keyval == key:
+                window.destroy()
+
+        window.connect("key-press-event", eval_key_pressed)
+
+
+
 win = MainWindow()
 Gtk.main()