From 7bbfc843b0208ea6f6947b1c7cdcdbdc274faa0b Mon Sep 17 00:00:00 2001
From: luxick <git@luxick.com>
Date: Fri, 11 Aug 2017 23:19:35 +0200
Subject: [PATCH] Improve page titles.

---
 cardvault/gui/library.glade |  2 +-
 cardvault/gui/search.glade  | 39 ++++++++++++++++++++++++++++++-------
 cardvault/gui/wants.glade   | 25 ++++++++++++++++++------
 cardvault/library.py        |  2 +-
 cardvault/search.py         |  7 ++-----
 cardvault/wants.py          |  5 +----
 6 files changed, 56 insertions(+), 24 deletions(-)

diff --git a/cardvault/gui/library.glade b/cardvault/gui/library.glade
index e3b5d95..d207ef9 100644
--- a/cardvault/gui/library.glade
+++ b/cardvault/gui/library.glade
@@ -247,7 +247,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="searchTitle">
+              <object class="GtkLabel" id="lib_title">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="margin_left">5</property>
diff --git a/cardvault/gui/search.glade b/cardvault/gui/search.glade
index fb25b9d..2acd24f 100644
--- a/cardvault/gui/search.glade
+++ b/cardvault/gui/search.glade
@@ -330,7 +330,37 @@
         <child>
           <object class="GtkBox" id="selectionToolsBox">
             <property name="can_focus">False</property>
+            <property name="margin_left">2</property>
+            <property name="margin_right">2</property>
             <property name="spacing">2</property>
+            <child>
+              <object class="GtkLabel" id="search_title_label">
+                <property name="can_focus">False</property>
+                <property name="no_show_all">True</property>
+                <property name="label" translatable="yes">Showing results for:</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="search_title">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_left">2</property>
+                <property name="margin_right">2</property>
+                <attributes>
+                  <attribute name="weight" value="semibold"/>
+                </attributes>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
             <child>
               <object class="GtkButton" id="addRemoveButton">
                 <property name="label" translatable="yes">Add to Library</property>
@@ -343,15 +373,10 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">0</property>
+                <property name="pack_type">end</property>
+                <property name="position">2</property>
               </packing>
             </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/cardvault/gui/wants.glade b/cardvault/gui/wants.glade
index 7b43dcc..9ae4038 100644
--- a/cardvault/gui/wants.glade
+++ b/cardvault/gui/wants.glade
@@ -112,23 +112,36 @@
           <object class="GtkBox" id="wantsToolBar">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="margin_left">2</property>
+            <property name="margin_right">2</property>
             <property name="spacing">2</property>
             <child>
-              <object class="GtkLabel" id="wantsTileLabel">
+              <object class="GtkLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Showing:</property>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">0</property>
+                <property name="position">1</property>
               </packing>
             </child>
             <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
+              <object class="GtkLabel" id="wants_title">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_left">2</property>
+                <property name="margin_right">2</property>
+                <attributes>
+                  <attribute name="weight" value="semibold"/>
+                </attributes>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
             </child>
           </object>
           <packing>
diff --git a/cardvault/library.py b/cardvault/library.py
index 16fd088..1158b76 100644
--- a/cardvault/library.py
+++ b/cardvault/library.py
@@ -207,7 +207,7 @@ class LibraryHandlers:
             card_tree.store.clear()
             self.app.ui.get_object("noResults").set_visible(True)
 
-        self.app.ui.get_object("searchTitle").set_text(tag)
+        self.app.ui.get_object("lib_title").set_text(tag)
 
     def lib_new_tag_and_add(self, item, cards):
         response = self.app.show_name_enter_dialog("Enter name for new Tag", "")
diff --git a/cardvault/search.py b/cardvault/search.py
index 6f64572..aaf75b6 100644
--- a/cardvault/search.py
+++ b/cardvault/search.py
@@ -11,17 +11,12 @@ class SearchHandlers:
     def __init__(self, app: 'application.Application'):
         self.app = app
 
-        # set mana icons on filter buttons
         buttons = [x for x in self.app.ui.get_object("manaFilterGrid").get_children()
                    if isinstance(x, Gtk.ToggleButton)]
         self._init_mana_buttons(buttons)
-        # set auto completion for filter entry
         self._init_set_entry(self.app.ui.get_object("setEntry"))
-        # Fill rarity box
         self._init_combo_box(self.app.ui.get_object("rarityCombo"), util.rarity_dict.keys())
-        # Fill type box
         self._init_combo_box(self.app.ui.get_object("typeCombo"), util.card_types)
-        # Create Model for search results
         self._init_results_tree()
 
     def do_search_cards(self, sender):
@@ -35,6 +30,8 @@ class SearchHandlers:
         card_list.update(results)
 
         self.app.ui.get_object("searchOverlay").set_visible(False)
+        self.app.ui.get_object("search_title_label").set_visible(True)
+        self.app.ui.get_object("search_title").set_text(search_term)
 
     @staticmethod
     def do_clear_mana_filter(mana_filter_grid):
diff --git a/cardvault/wants.py b/cardvault/wants.py
index 056b5b7..4248d1e 100644
--- a/cardvault/wants.py
+++ b/cardvault/wants.py
@@ -158,10 +158,7 @@ class WantsHandlers:
             tree.store.clear()
             self.app.ui.get_object("wantsOverlay").set_visible(True)
 
-        # Set Title
-        label = self.app.ui.get_object("wantsTileLabel")  # type: Gtk.Label
-        label.set_markup("<big>" + str(selected_list) + "</big>")
-
+        self.app.ui.get_object("wants_title").set_text(str(selected_list))
 
     def reload_wants_list(self, preserve=False):
         tree = self.app.ui.get_object("wantsListsTree")