Add shiny new icons and Eliminate the about toolbar.

3 files changed, 28 insertions, 33 deletions

diff --git a/ConstellationsFlashCards.py b/ConstellationsFlashCards.py
index 5c8d481..b919cdb 100755
--- a/ConstellationsFlashCards.py
+++ b/ConstellationsFlashCards.py
@@ -138,11 +138,6 @@ labelr1 = Gtk.Label(_(" constellations seen."))
 labelr2 = Gtk.Label(" ")
 labelr3 = Gtk.Label(_(" correct on first try."))
 labelr4 = Gtk.Label(_(" correct on second try."))
-# controls on last menubar ("About"):
-labela1 = Gtk.Label(_("Version 1.0 (build 10) of 2010.05.19.1500 UT"))
-labela2 = Gtk.Label(" ")
-labela3 = Gtk.Label(_("See http://wiki.laptop.org/go/ConstellationsFlashCards for help."))
-labela4 = Gtk.Label(" ")
 
 name_from_abbrev = {}
 constellations = []
@@ -707,7 +702,7 @@ class ConstellationsFlashCards(activity.Activity):
 
     quiz_toolbar_button = ToolbarButton(
                     page=self.quiz_toolbar,
-                    label='Quiz')
+                    icon_name='ConstellationQuestion')
     quiz_toolbar_button.show()
     toolbar_box.toolbar.insert(quiz_toolbar_button, -1)
 
@@ -734,36 +729,10 @@ class ConstellationsFlashCards(activity.Activity):
 
     result_toolbar_button = ToolbarButton(
                     page=self.result_toolbar,
-                    label='Result')
+                    icon_name='ConstellationAnswer')
     toolbar_box.toolbar.insert(result_toolbar_button, -1)
     result_toolbar_button.show()
 
-    # About toolbar
-    self.about_toolbar = Gtk.Toolbar()
-    label_container = Gtk.ToolItem()
-    label_container.add(labela1)
-    label_container.show_all()
-    self.about_toolbar.insert(label_container, -1)
-    label_container = Gtk.ToolItem()
-    label_container.add(labela2)
-    label_container.show_all()
-    self.about_toolbar.insert(label_container, -1)
-    label_container = Gtk.ToolItem()
-    label_container.add(labela3)
-    label_container.show_all()
-    self.about_toolbar.insert(label_container, -1)
-    label_container = Gtk.ToolItem()
-    label_container.add(labela4)
-    label_container.show_all()
-    self.about_toolbar.insert(label_container, -1)
-    self.about_toolbar.show_all()
-
-    about_toolbar_button = ToolbarButton(
-                    page=self.about_toolbar,
-                    label='About')
-    toolbar_box.toolbar.insert(about_toolbar_button, -1)
-    about_toolbar_button.show()
-
     separator = Gtk.SeparatorToolItem()
     toolbar_box.toolbar.insert(separator, -1)
     separator.show()
diff --git a/icons/ConstellationAnswer.svg b/icons/ConstellationAnswer.svg
new file mode 100644
index 0000000..67be43a
--- /dev/null
+++ b/icons/ConstellationAnswer.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="44" height="44" viewBox="0 0 44 44" id="svg2" xml:space="preserve"><metadata id="metadata13"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><dc:title/></cc:Work></rdf:RDF></metadata>
+<defs id="defs4">
+</defs>
+<polygon points="34.857,39.584 32.25,39.852 30.991,42.15 29.934,39.754 27.357,39.268 29.311,37.52 28.977,34.92 31.242,36.236 33.611,35.115 33.061,37.678 33.061,37.678 " transform="translate(-9.1428571,-31.904761)" id="polygon239_1_" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-linejoin:round;stroke-opacity:1"/>
+
+
+<polygon points="26,40.852 24.346,41.41 23.867,43.091 22.825,41.689 21.079,41.755 22.089,40.329 21.489,38.689 23.156,39.211 24.529,38.133 24.55,39.879 24.55,39.879 " transform="translate(0.8571429,-2.2857143)" id="polygon245_1_" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-linejoin:round;stroke-opacity:1"/>
+
+
+<polygon points="34.857,39.584 32.25,39.852 30.991,42.15 29.934,39.754 27.357,39.268 29.311,37.52 28.977,34.92 31.242,36.236 33.611,35.115 33.061,37.678 33.061,37.678 " transform="translate(-24.059381,-26.630237)" id="polygon2388" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-linejoin:round;stroke-opacity:1"/><polygon points="26,40.852 24.346,41.41 23.867,43.091 22.825,41.689 21.079,41.755 22.089,40.329 21.489,38.689 23.156,39.211 24.529,38.133 24.55,39.879 24.55,39.879 " transform="translate(-15.729977,-9.4691425)" id="polygon2390" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-linejoin:round;stroke-opacity:1"/><polygon points="26,40.852 24.346,41.41 23.867,43.091 22.825,41.689 21.079,41.755 22.089,40.329 21.489,38.689 23.156,39.211 24.529,38.133 24.55,39.879 24.55,39.879 " transform="translate(14.555738,-23.850095)" id="polygon2392" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-linejoin:round;stroke-opacity:1"/><path d="M 6.542215,16.622298 6.6958803,26.806273" id="path3174" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/><path d="M 10.190476,33.142857 20.761905,37.52381" id="path3182" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/><polygon points="34.857,39.584 32.25,39.852 30.991,42.15 29.934,39.754 27.357,39.268 29.311,37.52 28.977,34.92 31.242,36.236 33.611,35.115 33.061,37.678 33.061,37.678 " transform="translate(6.5120481,-4.2492857)" id="polygon3184" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-linejoin:round;stroke-opacity:1"/><path d="m 27.238095,36.952381 5.52381,-1.523809" id="path3186" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/><path d="m 37.955841,20.730447 -0.197396,8.443868" id="path3188" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/><path d="m 11.238095,9.9047617 5.428572,-2.190476" id="path3190" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/><path d="m 27.047619,8.2857147 8.095238,5.4285713" id="path3192" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/><text x="12.761905" y="30.857143" id="text2998" xml:space="preserve" style="font-size:11px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"><tspan x="12.761905" y="30.857143" id="tspan3000" style="font-size:24px;font-weight:bold;fill:#ffffff;fill-opacity:1;stroke:none;-inkscape-font-specification:Sans Bold">✓</tspan></text>
+</svg>
\ No newline at end of file
diff --git a/icons/ConstellationQuestion.svg b/icons/ConstellationQuestion.svg
new file mode 100644
index 0000000..7aed95a
--- /dev/null
+++ b/icons/ConstellationQuestion.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="44" height="44" viewBox="0 0 44 44" id="svg2" xml:space="preserve"><metadata id="metadata13"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><dc:title/></cc:Work></rdf:RDF></metadata>
+<defs id="defs4">
+</defs>
+<polygon points="34.857,39.584 32.25,39.852 30.991,42.15 29.934,39.754 27.357,39.268 29.311,37.52 28.977,34.92 31.242,36.236 33.611,35.115 33.061,37.678 33.061,37.678 " transform="translate(-9.1428571,-31.904761)" id="polygon239_1_" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-linejoin:round;stroke-opacity:1"/>
+
+
+<polygon points="26,40.852 24.346,41.41 23.867,43.091 22.825,41.689 21.079,41.755 22.089,40.329 21.489,38.689 23.156,39.211 24.529,38.133 24.55,39.879 24.55,39.879 " transform="translate(0.8571429,-2.2857143)" id="polygon245_1_" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-linejoin:round;stroke-opacity:1"/>
+
+
+<polygon points="34.857,39.584 32.25,39.852 30.991,42.15 29.934,39.754 27.357,39.268 29.311,37.52 28.977,34.92 31.242,36.236 33.611,35.115 33.061,37.678 33.061,37.678 " transform="translate(-24.059381,-26.630237)" id="polygon2388" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-linejoin:round;stroke-opacity:1"/><polygon points="26,40.852 24.346,41.41 23.867,43.091 22.825,41.689 21.079,41.755 22.089,40.329 21.489,38.689 23.156,39.211 24.529,38.133 24.55,39.879 24.55,39.879 " transform="translate(-15.729977,-9.4691425)" id="polygon2390" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-linejoin:round;stroke-opacity:1"/><polygon points="26,40.852 24.346,41.41 23.867,43.091 22.825,41.689 21.079,41.755 22.089,40.329 21.489,38.689 23.156,39.211 24.529,38.133 24.55,39.879 24.55,39.879 " transform="translate(14.555738,-23.850095)" id="polygon2392" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-linejoin:round;stroke-opacity:1"/><path d="M 6.542215,16.622298 6.6958803,26.806273" id="path3174" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/><path d="M 10.190476,33.142857 20.761905,37.52381" id="path3182" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/><polygon points="34.857,39.584 32.25,39.852 30.991,42.15 29.934,39.754 27.357,39.268 29.311,37.52 28.977,34.92 31.242,36.236 33.611,35.115 33.061,37.678 33.061,37.678 " transform="translate(6.5120481,-4.2492857)" id="polygon3184" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-linejoin:round;stroke-opacity:1"/><path d="m 27.238095,36.952381 5.52381,-1.523809" id="path3186" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/><path d="m 37.955841,20.730447 -0.197396,8.443868" id="path3188" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/><path d="m 11.238095,9.9047617 5.428572,-2.190476" id="path3190" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/><path d="m 27.047619,8.2857147 8.095238,5.4285713" id="path3192" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/><text x="16.476191" y="28.857143" id="text2998" xml:space="preserve" style="font-size:11px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"><tspan x="16.476191" y="28.857143" id="tspan3000" style="font-size:20px;font-weight:bold;fill:#ffffff;fill-opacity:1;stroke:none;-inkscape-font-specification:Sans Bold">?</tspan></text>
+</svg>
\ No newline at end of file