From ad373d892efce251b9e99de2a46761487701715f Mon Sep 17 00:00:00 2001 From: Vincent Le Date: Thu, 03 Dec 2009 00:29:39 +0000 Subject: Merge branch 'master' of git://git.sugarlabs.org/visualmatch/mainline --- diff --git a/VisualMatchActivity.py b/VisualMatchActivity.py index 6b41463..a199607 100644 --- a/VisualMatchActivity.py +++ b/VisualMatchActivity.py @@ -96,7 +96,7 @@ class VisualMatchActivity(activity.Activity): toolbar_box.toolbar.insert(separator, -1) # Label for showing deck status - self.deck_label = gtk.Label(_("%d cards remain in the deck") % (96)) + self.deck_label = gtk.Label(_("%d cards remaining") % (96)) self.deck_label.show() deck_toolitem = gtk.ToolItem() deck_toolitem.add(self.deck_label) @@ -107,7 +107,7 @@ class VisualMatchActivity(activity.Activity): toolbar_box.toolbar.insert(separator, -1) # Label for showing match status - self.match_label = gtk.Label(_("%d matches found.") % (0)) + self.match_label = gtk.Label(_("%d matches") % (0)) self.match_label.show() match_toolitem = gtk.ToolItem() match_toolitem.add(self.match_label) @@ -117,8 +117,19 @@ class VisualMatchActivity(activity.Activity): separator.show() toolbar_box.toolbar.insert(separator, -1) + # Label for showing counter + self.clock_label = gtk.Label(_("-")) + self.clock_label.show() + clock_toolitem = gtk.ToolItem() + clock_toolitem.add(self.clock_label) + toolbar_box.toolbar.insert(clock_toolitem,-1) + + separator = gtk.SeparatorToolItem() + separator.show() + toolbar_box.toolbar.insert(separator, -1) + # Label for showing play status - self.status_label = gtk.Label(_("Try to find a match.")) + self.status_label = gtk.Label(_("Find a match.")) self.status_label.show() status_toolitem = gtk.ToolItem() status_toolitem.add(self.status_label) @@ -192,7 +203,7 @@ class VisualMatchActivity(activity.Activity): def show_button2(self, tw): self.button2.set_icon("plus-3on") tw.deck.deal_3_extra_cards(tw) - tw.activity.deck_label.set_text(_("%d cards remain in the deck") % \ + tw.activity.deck_label.set_text(_("%d cards remaining") % \ (tw.deck.count-tw.deck.index)) self.button2.set_icon("plus-3") @@ -205,7 +216,7 @@ class VisualMatchActivity(activity.Activity): tw.activity.status_label.set_text(_("Keep looking.")) print tw.msg else: - tw.activity.status_label.set_text(_("No matches found.")) + tw.activity.status_label.set_text(_("No matches.")) def _journal_cb(self, button, path): title_alert = NamingAlert(self, path) @@ -270,7 +281,7 @@ class ProjectToolbar(gtk.Toolbar): separator.show() # Label for showing match status - self.activity.match_label = gtk.Label(_("%d matches found.") % (0)) + self.activity.match_label = gtk.Label(_("%d matches") % (0)) self.activity.match_label.show() self.activity.match_toolitem = gtk.ToolItem() self.activity.match_toolitem.add(self.activity.match_label) @@ -282,8 +293,21 @@ class ProjectToolbar(gtk.Toolbar): self.insert(separator, -1) separator.show() - # Label for showing play status - self.activity.status_label = gtk.Label(_("Try to find a match.")) + # Label for showing counter + self.activity.clock_label = gtk.Label(_("-")) + self.activity.clock_label.show() + self.activity.clock_toolitem = gtk.ToolItem() + self.activity.clock_toolitem.add(self.activity.clock_label) + self.insert(self.activity.clock_toolitem, -1) + self.activity.clock_toolitem.show() + + separator = gtk.SeparatorToolItem() + separator.set_draw(True) + self.insert(separator, -1) + separator.show() + + # Label for showing play status + self.activity.status_label = gtk.Label(_("Find a match.")) self.activity.status_label.show() self.activity.status_toolitem = gtk.ToolItem() self.activity.status_toolitem.add(self.activity.status_label) diff --git a/gen-cards.py b/gen-cards.py index a28a760..11700fd 100755 --- a/gen-cards.py +++ b/gen-cards.py @@ -19,14 +19,14 @@ #OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN #THE SOFTWARE. -RED_STROKE = "#FF0000" -RED_FILL = "#FFA0A0" -BLUE_STROKE = "#0000FF" -BLUE_FILL = "#A0A0FF" -GREEN_STROKE = "#00C000" -GREEN_FILL = "#90D090" -PURPLE_STROKE = "#E000E0" -PURPLE_FILL = "#FFA0FF" +RED_STROKE = "#FF6040" +RED_FILL = "#FFC4B8" +BLUE_STROKE = "#0060C8" +BLUE_FILL = "#ACC8E4" +GREEN_STROKE = "#00B418" +GREEN_FILL = "#AFE8A8" +PURPLE_STROKE = "#780078" +PURPLE_FILL = "#E4AAE4" color_pairs = ([RED_STROKE,RED_FILL], [GREEN_STROKE,GREEN_FILL], diff --git a/images/card-1.svg b/images/card-1.svg index 76d07b9..0e9b5cb 100644 --- a/images/card-1.svg +++ b/images/card-1.svg @@ -11,6 +11,6 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FFFFFF;stroke:#FF6040;stroke-width:1.8;" /> diff --git a/images/card-10.svg b/images/card-10.svg index b16b483..bede569 100644 --- a/images/card-10.svg +++ b/images/card-10.svg @@ -11,6 +11,6 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FFFFFF;stroke:#00B418;stroke-width:1.8;" /> diff --git a/images/card-100.svg b/images/card-100.svg index d420893..1f58e91 100644 --- a/images/card-100.svg +++ b/images/card-100.svg @@ -11,6 +11,6 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FFFFFF;stroke:#780078;stroke-width:1.8;" /> diff --git a/images/card-101.svg b/images/card-101.svg index 300aa57..6a9ba77 100644 --- a/images/card-101.svg +++ b/images/card-101.svg @@ -11,6 +11,6 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#E4AAE4;stroke:#780078;stroke-width:1.8;" /> diff --git a/images/card-102.svg b/images/card-102.svg index 4f3c279..cf31dd3 100644 --- a/images/card-102.svg +++ b/images/card-102.svg @@ -11,6 +11,6 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#780078;stroke:#780078;stroke-width:1.8;" /> diff --git a/images/card-103.svg b/images/card-103.svg index bf3b7a4..70366b9 100644 --- a/images/card-103.svg +++ b/images/card-103.svg @@ -11,9 +11,9 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FFFFFF;stroke:#780078;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#780078;stroke-width:1.8;" /> diff --git a/images/card-104.svg b/images/card-104.svg index 266d941..b274ac0 100644 --- a/images/card-104.svg +++ b/images/card-104.svg @@ -11,9 +11,9 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#E4AAE4;stroke:#780078;stroke-width:1.8;" /> + style="fill:#E4AAE4;stroke:#780078;stroke-width:1.8;" /> diff --git a/images/card-105.svg b/images/card-105.svg index 10a68b3..bc0860d 100644 --- a/images/card-105.svg +++ b/images/card-105.svg @@ -11,9 +11,9 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#780078;stroke:#780078;stroke-width:1.8;" /> + style="fill:#780078;stroke:#780078;stroke-width:1.8;" /> diff --git a/images/card-106.svg b/images/card-106.svg index 4b9a953..fb247b9 100644 --- a/images/card-106.svg +++ b/images/card-106.svg @@ -11,12 +11,12 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FFFFFF;stroke:#780078;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#780078;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#780078;stroke-width:1.8;" /> diff --git a/images/card-107.svg b/images/card-107.svg index 7e47363..9066da5 100644 --- a/images/card-107.svg +++ b/images/card-107.svg @@ -11,12 +11,12 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#E4AAE4;stroke:#780078;stroke-width:1.8;" /> + style="fill:#E4AAE4;stroke:#780078;stroke-width:1.8;" /> + style="fill:#E4AAE4;stroke:#780078;stroke-width:1.8;" /> diff --git a/images/card-108.svg b/images/card-108.svg index f4f621f..7a2bc8b 100644 --- a/images/card-108.svg +++ b/images/card-108.svg @@ -11,12 +11,12 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#780078;stroke:#780078;stroke-width:1.8;" /> + style="fill:#780078;stroke:#780078;stroke-width:1.8;" /> + style="fill:#780078;stroke:#780078;stroke-width:1.8;" /> diff --git a/images/card-11.svg b/images/card-11.svg index fdda36b..e1a6dee 100644 --- a/images/card-11.svg +++ b/images/card-11.svg @@ -11,6 +11,6 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#AFE8A8;stroke:#00B418;stroke-width:1.8;" /> diff --git a/images/card-12.svg b/images/card-12.svg index 5cd34b2..c50f3a7 100644 --- a/images/card-12.svg +++ b/images/card-12.svg @@ -11,6 +11,6 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#00B418;stroke:#00B418;stroke-width:1.8;" /> diff --git a/images/card-13.svg b/images/card-13.svg index e706363..5f2f21e 100644 --- a/images/card-13.svg +++ b/images/card-13.svg @@ -11,9 +11,9 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FFFFFF;stroke:#00B418;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#00B418;stroke-width:1.8;" /> diff --git a/images/card-14.svg b/images/card-14.svg index 8127dfd..0eb4d83 100644 --- a/images/card-14.svg +++ b/images/card-14.svg @@ -11,9 +11,9 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#AFE8A8;stroke:#00B418;stroke-width:1.8;" /> + style="fill:#AFE8A8;stroke:#00B418;stroke-width:1.8;" /> diff --git a/images/card-15.svg b/images/card-15.svg index 48377d0..939ebe0 100644 --- a/images/card-15.svg +++ b/images/card-15.svg @@ -11,9 +11,9 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#00B418;stroke:#00B418;stroke-width:1.8;" /> + style="fill:#00B418;stroke:#00B418;stroke-width:1.8;" /> diff --git a/images/card-16.svg b/images/card-16.svg index 22bb08e..9323732 100644 --- a/images/card-16.svg +++ b/images/card-16.svg @@ -11,12 +11,12 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FFFFFF;stroke:#00B418;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#00B418;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#00B418;stroke-width:1.8;" /> diff --git a/images/card-17.svg b/images/card-17.svg index ee206f3..e3c9093 100644 --- a/images/card-17.svg +++ b/images/card-17.svg @@ -11,12 +11,12 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#AFE8A8;stroke:#00B418;stroke-width:1.8;" /> + style="fill:#AFE8A8;stroke:#00B418;stroke-width:1.8;" /> + style="fill:#AFE8A8;stroke:#00B418;stroke-width:1.8;" /> diff --git a/images/card-18.svg b/images/card-18.svg index 6640f17..83a6431 100644 --- a/images/card-18.svg +++ b/images/card-18.svg @@ -11,12 +11,12 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#00B418;stroke:#00B418;stroke-width:1.8;" /> + style="fill:#00B418;stroke:#00B418;stroke-width:1.8;" /> + style="fill:#00B418;stroke:#00B418;stroke-width:1.8;" /> diff --git a/images/card-19.svg b/images/card-19.svg index 5501675..52914e5 100644 --- a/images/card-19.svg +++ b/images/card-19.svg @@ -11,6 +11,6 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FFFFFF;stroke:#0060C8;stroke-width:1.8;" /> diff --git a/images/card-2.svg b/images/card-2.svg index 0b36e46..c4c449e 100644 --- a/images/card-2.svg +++ b/images/card-2.svg @@ -11,6 +11,6 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FFC4B8;stroke:#FF6040;stroke-width:1.8;" /> diff --git a/images/card-20.svg b/images/card-20.svg index fa5a166..d0c2ae4 100644 --- a/images/card-20.svg +++ b/images/card-20.svg @@ -11,6 +11,6 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#ACC8E4;stroke:#0060C8;stroke-width:1.8;" /> diff --git a/images/card-21.svg b/images/card-21.svg index 560cece..71c9eb6 100644 --- a/images/card-21.svg +++ b/images/card-21.svg @@ -11,6 +11,6 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#0060C8;stroke:#0060C8;stroke-width:1.8;" /> diff --git a/images/card-22.svg b/images/card-22.svg index 2f6669b..ea48065 100644 --- a/images/card-22.svg +++ b/images/card-22.svg @@ -11,9 +11,9 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FFFFFF;stroke:#0060C8;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#0060C8;stroke-width:1.8;" /> diff --git a/images/card-23.svg b/images/card-23.svg index 0029543..912b7b2 100644 --- a/images/card-23.svg +++ b/images/card-23.svg @@ -11,9 +11,9 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#ACC8E4;stroke:#0060C8;stroke-width:1.8;" /> + style="fill:#ACC8E4;stroke:#0060C8;stroke-width:1.8;" /> diff --git a/images/card-24.svg b/images/card-24.svg index b33e014..71ba140 100644 --- a/images/card-24.svg +++ b/images/card-24.svg @@ -11,9 +11,9 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#0060C8;stroke:#0060C8;stroke-width:1.8;" /> + style="fill:#0060C8;stroke:#0060C8;stroke-width:1.8;" /> diff --git a/images/card-25.svg b/images/card-25.svg index f5dde78..7963c7f 100644 --- a/images/card-25.svg +++ b/images/card-25.svg @@ -11,12 +11,12 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FFFFFF;stroke:#0060C8;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#0060C8;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#0060C8;stroke-width:1.8;" /> diff --git a/images/card-26.svg b/images/card-26.svg index f9b637b..8514114 100644 --- a/images/card-26.svg +++ b/images/card-26.svg @@ -11,12 +11,12 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#ACC8E4;stroke:#0060C8;stroke-width:1.8;" /> + style="fill:#ACC8E4;stroke:#0060C8;stroke-width:1.8;" /> + style="fill:#ACC8E4;stroke:#0060C8;stroke-width:1.8;" /> diff --git a/images/card-27.svg b/images/card-27.svg index 95a7512..74a0fbc 100644 --- a/images/card-27.svg +++ b/images/card-27.svg @@ -11,12 +11,12 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#0060C8;stroke:#0060C8;stroke-width:1.8;" /> + style="fill:#0060C8;stroke:#0060C8;stroke-width:1.8;" /> + style="fill:#0060C8;stroke:#0060C8;stroke-width:1.8;" /> diff --git a/images/card-28.svg b/images/card-28.svg index d162740..d77cdd8 100644 --- a/images/card-28.svg +++ b/images/card-28.svg @@ -11,6 +11,6 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FFFFFF;stroke:#780078;stroke-width:1.8;" /> diff --git a/images/card-29.svg b/images/card-29.svg index 92a4807..30c7354 100644 --- a/images/card-29.svg +++ b/images/card-29.svg @@ -11,6 +11,6 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#E4AAE4;stroke:#780078;stroke-width:1.8;" /> diff --git a/images/card-3.svg b/images/card-3.svg index 728d603..a1b9d1e 100644 --- a/images/card-3.svg +++ b/images/card-3.svg @@ -11,6 +11,6 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FF6040;stroke:#FF6040;stroke-width:1.8;" /> diff --git a/images/card-30.svg b/images/card-30.svg index 6fd70e9..dc2b4cf 100644 --- a/images/card-30.svg +++ b/images/card-30.svg @@ -11,6 +11,6 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#780078;stroke:#780078;stroke-width:1.8;" /> diff --git a/images/card-31.svg b/images/card-31.svg index 8f4d96c..22d51e3 100644 --- a/images/card-31.svg +++ b/images/card-31.svg @@ -11,9 +11,9 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FFFFFF;stroke:#780078;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#780078;stroke-width:1.8;" /> diff --git a/images/card-32.svg b/images/card-32.svg index 7d42f32..d110376 100644 --- a/images/card-32.svg +++ b/images/card-32.svg @@ -11,9 +11,9 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#E4AAE4;stroke:#780078;stroke-width:1.8;" /> + style="fill:#E4AAE4;stroke:#780078;stroke-width:1.8;" /> diff --git a/images/card-33.svg b/images/card-33.svg index 13a3571..2d57c6d 100644 --- a/images/card-33.svg +++ b/images/card-33.svg @@ -11,9 +11,9 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#780078;stroke:#780078;stroke-width:1.8;" /> + style="fill:#780078;stroke:#780078;stroke-width:1.8;" /> diff --git a/images/card-34.svg b/images/card-34.svg index 0f662db..6e5f4e0 100644 --- a/images/card-34.svg +++ b/images/card-34.svg @@ -11,12 +11,12 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FFFFFF;stroke:#780078;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#780078;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#780078;stroke-width:1.8;" /> diff --git a/images/card-35.svg b/images/card-35.svg index 5e629d7..b79b2c3 100644 --- a/images/card-35.svg +++ b/images/card-35.svg @@ -11,12 +11,12 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#E4AAE4;stroke:#780078;stroke-width:1.8;" /> + style="fill:#E4AAE4;stroke:#780078;stroke-width:1.8;" /> + style="fill:#E4AAE4;stroke:#780078;stroke-width:1.8;" /> diff --git a/images/card-36.svg b/images/card-36.svg index ca47994..01a7956 100644 --- a/images/card-36.svg +++ b/images/card-36.svg @@ -11,12 +11,12 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#780078;stroke:#780078;stroke-width:1.8;" /> + style="fill:#780078;stroke:#780078;stroke-width:1.8;" /> + style="fill:#780078;stroke:#780078;stroke-width:1.8;" /> diff --git a/images/card-37.svg b/images/card-37.svg index 232c57d..aa47ae9 100644 --- a/images/card-37.svg +++ b/images/card-37.svg @@ -11,9 +11,9 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FFFFFF;stroke:#FF6040;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#FF6040;stroke-width:1.8;" /> diff --git a/images/card-38.svg b/images/card-38.svg index aea0417..0fd92c9 100644 --- a/images/card-38.svg +++ b/images/card-38.svg @@ -11,9 +11,9 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FFC4B8;stroke:#FF6040;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#FF6040;stroke-width:1.8;" /> diff --git a/images/card-39.svg b/images/card-39.svg index 02f206e..a685c3d 100644 --- a/images/card-39.svg +++ b/images/card-39.svg @@ -11,9 +11,9 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FF6040;stroke:#FF6040;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#FF6040;stroke-width:1.8;" /> diff --git a/images/card-4.svg b/images/card-4.svg index b171a54..eaf2023 100644 --- a/images/card-4.svg +++ b/images/card-4.svg @@ -11,9 +11,9 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FFFFFF;stroke:#FF6040;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#FF6040;stroke-width:1.8;" /> diff --git a/images/card-40.svg b/images/card-40.svg index 8f88249..7cf62ec 100644 --- a/images/card-40.svg +++ b/images/card-40.svg @@ -11,15 +11,15 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FFFFFF;stroke:#FF6040;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#FF6040;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#FF6040;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#FF6040;stroke-width:1.8;" /> diff --git a/images/card-41.svg b/images/card-41.svg index 92aa8a3..299c504 100644 --- a/images/card-41.svg +++ b/images/card-41.svg @@ -11,15 +11,15 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FFC4B8;stroke:#FF6040;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#FF6040;stroke-width:1.8;" /> + style="fill:#FFC4B8;stroke:#FF6040;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#FF6040;stroke-width:1.8;" /> diff --git a/images/card-42.svg b/images/card-42.svg index ddb74dc..ae833a6 100644 --- a/images/card-42.svg +++ b/images/card-42.svg @@ -11,15 +11,15 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FF6040;stroke:#FF6040;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#FF6040;stroke-width:1.8;" /> + style="fill:#FF6040;stroke:#FF6040;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#FF6040;stroke-width:1.8;" /> diff --git a/images/card-43.svg b/images/card-43.svg index 9af5395..5ff9fb6 100644 --- a/images/card-43.svg +++ b/images/card-43.svg @@ -11,21 +11,21 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FFFFFF;stroke:#FF6040;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#FF6040;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#FF6040;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#FF6040;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#FF6040;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#FF6040;stroke-width:1.8;" /> diff --git a/images/card-44.svg b/images/card-44.svg index f5e9d6d..6097ec6 100644 --- a/images/card-44.svg +++ b/images/card-44.svg @@ -11,21 +11,21 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FFC4B8;stroke:#FF6040;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#FF6040;stroke-width:1.8;" /> + style="fill:#FFC4B8;stroke:#FF6040;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#FF6040;stroke-width:1.8;" /> + style="fill:#FFC4B8;stroke:#FF6040;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#FF6040;stroke-width:1.8;" /> diff --git a/images/card-45.svg b/images/card-45.svg index a84a90b..1b79922 100644 --- a/images/card-45.svg +++ b/images/card-45.svg @@ -11,21 +11,21 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FF6040;stroke:#FF6040;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#FF6040;stroke-width:1.8;" /> + style="fill:#FF6040;stroke:#FF6040;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#FF6040;stroke-width:1.8;" /> + style="fill:#FF6040;stroke:#FF6040;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#FF6040;stroke-width:1.8;" /> diff --git a/images/card-46.svg b/images/card-46.svg index eee5499..6b12bf5 100644 --- a/images/card-46.svg +++ b/images/card-46.svg @@ -11,9 +11,9 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FFFFFF;stroke:#00B418;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#00B418;stroke-width:1.8;" /> diff --git a/images/card-47.svg b/images/card-47.svg index 4f8d135..2fbcbd5 100644 --- a/images/card-47.svg +++ b/images/card-47.svg @@ -11,9 +11,9 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#AFE8A8;stroke:#00B418;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#00B418;stroke-width:1.8;" /> diff --git a/images/card-48.svg b/images/card-48.svg index ccdf62e..3e00472 100644 --- a/images/card-48.svg +++ b/images/card-48.svg @@ -11,9 +11,9 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#00B418;stroke:#00B418;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#00B418;stroke-width:1.8;" /> diff --git a/images/card-49.svg b/images/card-49.svg index f6867c2..f902457 100644 --- a/images/card-49.svg +++ b/images/card-49.svg @@ -11,15 +11,15 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FFFFFF;stroke:#00B418;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#00B418;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#00B418;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#00B418;stroke-width:1.8;" /> diff --git a/images/card-5.svg b/images/card-5.svg index a3970f0..223db9d 100644 --- a/images/card-5.svg +++ b/images/card-5.svg @@ -11,9 +11,9 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FFC4B8;stroke:#FF6040;stroke-width:1.8;" /> + style="fill:#FFC4B8;stroke:#FF6040;stroke-width:1.8;" /> diff --git a/images/card-50.svg b/images/card-50.svg index 7ca3f6a..f1f4a94 100644 --- a/images/card-50.svg +++ b/images/card-50.svg @@ -11,15 +11,15 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#AFE8A8;stroke:#00B418;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#00B418;stroke-width:1.8;" /> + style="fill:#AFE8A8;stroke:#00B418;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#00B418;stroke-width:1.8;" /> diff --git a/images/card-51.svg b/images/card-51.svg index b882964..a1f1b09 100644 --- a/images/card-51.svg +++ b/images/card-51.svg @@ -11,15 +11,15 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#00B418;stroke:#00B418;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#00B418;stroke-width:1.8;" /> + style="fill:#00B418;stroke:#00B418;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#00B418;stroke-width:1.8;" /> diff --git a/images/card-52.svg b/images/card-52.svg index 557ed4e..f29e1e7 100644 --- a/images/card-52.svg +++ b/images/card-52.svg @@ -11,21 +11,21 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FFFFFF;stroke:#00B418;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#00B418;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#00B418;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#00B418;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#00B418;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#00B418;stroke-width:1.8;" /> diff --git a/images/card-53.svg b/images/card-53.svg index 47d81f0..865869a 100644 --- a/images/card-53.svg +++ b/images/card-53.svg @@ -11,21 +11,21 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#AFE8A8;stroke:#00B418;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#00B418;stroke-width:1.8;" /> + style="fill:#AFE8A8;stroke:#00B418;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#00B418;stroke-width:1.8;" /> + style="fill:#AFE8A8;stroke:#00B418;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#00B418;stroke-width:1.8;" /> diff --git a/images/card-54.svg b/images/card-54.svg index 9b517cf..99c10e2 100644 --- a/images/card-54.svg +++ b/images/card-54.svg @@ -11,21 +11,21 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#00B418;stroke:#00B418;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#00B418;stroke-width:1.8;" /> + style="fill:#00B418;stroke:#00B418;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#00B418;stroke-width:1.8;" /> + style="fill:#00B418;stroke:#00B418;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#00B418;stroke-width:1.8;" /> diff --git a/images/card-55.svg b/images/card-55.svg index 02c6e7d..fb998c9 100644 --- a/images/card-55.svg +++ b/images/card-55.svg @@ -11,9 +11,9 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FFFFFF;stroke:#0060C8;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#0060C8;stroke-width:1.8;" /> diff --git a/images/card-56.svg b/images/card-56.svg index 5bf02e1..9274b28 100644 --- a/images/card-56.svg +++ b/images/card-56.svg @@ -11,9 +11,9 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#ACC8E4;stroke:#0060C8;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#0060C8;stroke-width:1.8;" /> diff --git a/images/card-57.svg b/images/card-57.svg index 4d978e8..358c21f 100644 --- a/images/card-57.svg +++ b/images/card-57.svg @@ -11,9 +11,9 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#0060C8;stroke:#0060C8;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#0060C8;stroke-width:1.8;" /> diff --git a/images/card-58.svg b/images/card-58.svg index 2807d91..07db4da 100644 --- a/images/card-58.svg +++ b/images/card-58.svg @@ -11,15 +11,15 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FFFFFF;stroke:#0060C8;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#0060C8;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#0060C8;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#0060C8;stroke-width:1.8;" /> diff --git a/images/card-59.svg b/images/card-59.svg index b654bd5..84d07fb 100644 --- a/images/card-59.svg +++ b/images/card-59.svg @@ -11,15 +11,15 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#ACC8E4;stroke:#0060C8;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#0060C8;stroke-width:1.8;" /> + style="fill:#ACC8E4;stroke:#0060C8;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#0060C8;stroke-width:1.8;" /> diff --git a/images/card-6.svg b/images/card-6.svg index 109c880..1041f20 100644 --- a/images/card-6.svg +++ b/images/card-6.svg @@ -11,9 +11,9 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FF6040;stroke:#FF6040;stroke-width:1.8;" /> + style="fill:#FF6040;stroke:#FF6040;stroke-width:1.8;" /> diff --git a/images/card-60.svg b/images/card-60.svg index 8631338..1fc7ca8 100644 --- a/images/card-60.svg +++ b/images/card-60.svg @@ -11,15 +11,15 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#0060C8;stroke:#0060C8;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#0060C8;stroke-width:1.8;" /> + style="fill:#0060C8;stroke:#0060C8;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#0060C8;stroke-width:1.8;" /> diff --git a/images/card-61.svg b/images/card-61.svg index 8f1baf0..baeb684 100644 --- a/images/card-61.svg +++ b/images/card-61.svg @@ -11,21 +11,21 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FFFFFF;stroke:#0060C8;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#0060C8;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#0060C8;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#0060C8;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#0060C8;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#0060C8;stroke-width:1.8;" /> diff --git a/images/card-62.svg b/images/card-62.svg index 837ae2a..c769959 100644 --- a/images/card-62.svg +++ b/images/card-62.svg @@ -11,21 +11,21 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#ACC8E4;stroke:#0060C8;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#0060C8;stroke-width:1.8;" /> + style="fill:#ACC8E4;stroke:#0060C8;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#0060C8;stroke-width:1.8;" /> + style="fill:#ACC8E4;stroke:#0060C8;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#0060C8;stroke-width:1.8;" /> diff --git a/images/card-63.svg b/images/card-63.svg index 5e9e732..c461553 100644 --- a/images/card-63.svg +++ b/images/card-63.svg @@ -11,21 +11,21 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#0060C8;stroke:#0060C8;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#0060C8;stroke-width:1.8;" /> + style="fill:#0060C8;stroke:#0060C8;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#0060C8;stroke-width:1.8;" /> + style="fill:#0060C8;stroke:#0060C8;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#0060C8;stroke-width:1.8;" /> diff --git a/images/card-64.svg b/images/card-64.svg index 91b9f6b..350467d 100644 --- a/images/card-64.svg +++ b/images/card-64.svg @@ -11,9 +11,9 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FFFFFF;stroke:#780078;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#780078;stroke-width:1.8;" /> diff --git a/images/card-65.svg b/images/card-65.svg index 1e5c0f7..7ee33bf 100644 --- a/images/card-65.svg +++ b/images/card-65.svg @@ -11,9 +11,9 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#E4AAE4;stroke:#780078;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#780078;stroke-width:1.8;" /> diff --git a/images/card-66.svg b/images/card-66.svg index bfbb4b1..914f428 100644 --- a/images/card-66.svg +++ b/images/card-66.svg @@ -11,9 +11,9 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#780078;stroke:#780078;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#780078;stroke-width:1.8;" /> diff --git a/images/card-67.svg b/images/card-67.svg index 06a737b..ad86531 100644 --- a/images/card-67.svg +++ b/images/card-67.svg @@ -11,15 +11,15 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FFFFFF;stroke:#780078;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#780078;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#780078;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#780078;stroke-width:1.8;" /> diff --git a/images/card-68.svg b/images/card-68.svg index 7ccc595..85446ec 100644 --- a/images/card-68.svg +++ b/images/card-68.svg @@ -11,15 +11,15 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#E4AAE4;stroke:#780078;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#780078;stroke-width:1.8;" /> + style="fill:#E4AAE4;stroke:#780078;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#780078;stroke-width:1.8;" /> diff --git a/images/card-69.svg b/images/card-69.svg index 01e4f2b..4473d59 100644 --- a/images/card-69.svg +++ b/images/card-69.svg @@ -11,15 +11,15 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#780078;stroke:#780078;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#780078;stroke-width:1.8;" /> + style="fill:#780078;stroke:#780078;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#780078;stroke-width:1.8;" /> diff --git a/images/card-7.svg b/images/card-7.svg index dca744d..e69212b 100644 --- a/images/card-7.svg +++ b/images/card-7.svg @@ -11,12 +11,12 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FFFFFF;stroke:#FF6040;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#FF6040;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#FF6040;stroke-width:1.8;" /> diff --git a/images/card-70.svg b/images/card-70.svg index 77bb530..611d173 100644 --- a/images/card-70.svg +++ b/images/card-70.svg @@ -11,21 +11,21 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FFFFFF;stroke:#780078;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#780078;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#780078;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#780078;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#780078;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#780078;stroke-width:1.8;" /> diff --git a/images/card-71.svg b/images/card-71.svg index 531baba..742ac5e 100644 --- a/images/card-71.svg +++ b/images/card-71.svg @@ -11,21 +11,21 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#E4AAE4;stroke:#780078;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#780078;stroke-width:1.8;" /> + style="fill:#E4AAE4;stroke:#780078;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#780078;stroke-width:1.8;" /> + style="fill:#E4AAE4;stroke:#780078;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#780078;stroke-width:1.8;" /> diff --git a/images/card-72.svg b/images/card-72.svg index 2a0e049..0fc9b6c 100644 --- a/images/card-72.svg +++ b/images/card-72.svg @@ -11,21 +11,21 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#780078;stroke:#780078;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#780078;stroke-width:1.8;" /> + style="fill:#780078;stroke:#780078;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#780078;stroke-width:1.8;" /> + style="fill:#780078;stroke:#780078;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#780078;stroke-width:1.8;" /> diff --git a/images/card-73.svg b/images/card-73.svg index 3563b05..63ab656 100644 --- a/images/card-73.svg +++ b/images/card-73.svg @@ -11,6 +11,6 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FFFFFF;stroke:#FF6040;stroke-width:1.8;" /> diff --git a/images/card-74.svg b/images/card-74.svg index 85a40d9..7ad4130 100644 --- a/images/card-74.svg +++ b/images/card-74.svg @@ -11,6 +11,6 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FFC4B8;stroke:#FF6040;stroke-width:1.8;" /> diff --git a/images/card-75.svg b/images/card-75.svg index f5e3f28..50bde58 100644 --- a/images/card-75.svg +++ b/images/card-75.svg @@ -11,6 +11,6 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FF6040;stroke:#FF6040;stroke-width:1.8;" /> diff --git a/images/card-76.svg b/images/card-76.svg index 60e3360..97782a8 100644 --- a/images/card-76.svg +++ b/images/card-76.svg @@ -11,9 +11,9 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FFFFFF;stroke:#FF6040;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#FF6040;stroke-width:1.8;" /> diff --git a/images/card-77.svg b/images/card-77.svg index d93462e..acd4605 100644 --- a/images/card-77.svg +++ b/images/card-77.svg @@ -11,9 +11,9 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FFC4B8;stroke:#FF6040;stroke-width:1.8;" /> + style="fill:#FFC4B8;stroke:#FF6040;stroke-width:1.8;" /> diff --git a/images/card-78.svg b/images/card-78.svg index eef12da..70bf733 100644 --- a/images/card-78.svg +++ b/images/card-78.svg @@ -11,9 +11,9 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FF6040;stroke:#FF6040;stroke-width:1.8;" /> + style="fill:#FF6040;stroke:#FF6040;stroke-width:1.8;" /> diff --git a/images/card-79.svg b/images/card-79.svg index 0e89c10..513f5b4 100644 --- a/images/card-79.svg +++ b/images/card-79.svg @@ -11,12 +11,12 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FFFFFF;stroke:#FF6040;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#FF6040;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#FF6040;stroke-width:1.8;" /> diff --git a/images/card-8.svg b/images/card-8.svg index 39a0acb..24e533c 100644 --- a/images/card-8.svg +++ b/images/card-8.svg @@ -11,12 +11,12 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FFC4B8;stroke:#FF6040;stroke-width:1.8;" /> + style="fill:#FFC4B8;stroke:#FF6040;stroke-width:1.8;" /> + style="fill:#FFC4B8;stroke:#FF6040;stroke-width:1.8;" /> diff --git a/images/card-80.svg b/images/card-80.svg index fb1d094..31d39ec 100644 --- a/images/card-80.svg +++ b/images/card-80.svg @@ -11,12 +11,12 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FFC4B8;stroke:#FF6040;stroke-width:1.8;" /> + style="fill:#FFC4B8;stroke:#FF6040;stroke-width:1.8;" /> + style="fill:#FFC4B8;stroke:#FF6040;stroke-width:1.8;" /> diff --git a/images/card-81.svg b/images/card-81.svg index 79fe929..dd70a15 100644 --- a/images/card-81.svg +++ b/images/card-81.svg @@ -11,12 +11,12 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FF6040;stroke:#FF6040;stroke-width:1.8;" /> + style="fill:#FF6040;stroke:#FF6040;stroke-width:1.8;" /> + style="fill:#FF6040;stroke:#FF6040;stroke-width:1.8;" /> diff --git a/images/card-82.svg b/images/card-82.svg index 3c4918d..46f8f48 100644 --- a/images/card-82.svg +++ b/images/card-82.svg @@ -11,6 +11,6 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FFFFFF;stroke:#00B418;stroke-width:1.8;" /> diff --git a/images/card-83.svg b/images/card-83.svg index 54c700c..74a38be 100644 --- a/images/card-83.svg +++ b/images/card-83.svg @@ -11,6 +11,6 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#AFE8A8;stroke:#00B418;stroke-width:1.8;" /> diff --git a/images/card-84.svg b/images/card-84.svg index 9467252..8cba89e 100644 --- a/images/card-84.svg +++ b/images/card-84.svg @@ -11,6 +11,6 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#00B418;stroke:#00B418;stroke-width:1.8;" /> diff --git a/images/card-85.svg b/images/card-85.svg index b88e113..504a93c 100644 --- a/images/card-85.svg +++ b/images/card-85.svg @@ -11,9 +11,9 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FFFFFF;stroke:#00B418;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#00B418;stroke-width:1.8;" /> diff --git a/images/card-86.svg b/images/card-86.svg index 541a86b..57e9cad 100644 --- a/images/card-86.svg +++ b/images/card-86.svg @@ -11,9 +11,9 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#AFE8A8;stroke:#00B418;stroke-width:1.8;" /> + style="fill:#AFE8A8;stroke:#00B418;stroke-width:1.8;" /> diff --git a/images/card-87.svg b/images/card-87.svg index cf10031..af7f3dc 100644 --- a/images/card-87.svg +++ b/images/card-87.svg @@ -11,9 +11,9 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#00B418;stroke:#00B418;stroke-width:1.8;" /> + style="fill:#00B418;stroke:#00B418;stroke-width:1.8;" /> diff --git a/images/card-88.svg b/images/card-88.svg index c2d03c1..e460f6d 100644 --- a/images/card-88.svg +++ b/images/card-88.svg @@ -11,12 +11,12 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FFFFFF;stroke:#00B418;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#00B418;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#00B418;stroke-width:1.8;" /> diff --git a/images/card-89.svg b/images/card-89.svg index e3a7f8f..cc5da3d 100644 --- a/images/card-89.svg +++ b/images/card-89.svg @@ -11,12 +11,12 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#AFE8A8;stroke:#00B418;stroke-width:1.8;" /> + style="fill:#AFE8A8;stroke:#00B418;stroke-width:1.8;" /> + style="fill:#AFE8A8;stroke:#00B418;stroke-width:1.8;" /> diff --git a/images/card-9.svg b/images/card-9.svg index f01b66d..d7bbeb6 100644 --- a/images/card-9.svg +++ b/images/card-9.svg @@ -11,12 +11,12 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FF6040;stroke:#FF6040;stroke-width:1.8;" /> + style="fill:#FF6040;stroke:#FF6040;stroke-width:1.8;" /> + style="fill:#FF6040;stroke:#FF6040;stroke-width:1.8;" /> diff --git a/images/card-90.svg b/images/card-90.svg index 6c780af..f6ba877 100644 --- a/images/card-90.svg +++ b/images/card-90.svg @@ -11,12 +11,12 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#00B418;stroke:#00B418;stroke-width:1.8;" /> + style="fill:#00B418;stroke:#00B418;stroke-width:1.8;" /> + style="fill:#00B418;stroke:#00B418;stroke-width:1.8;" /> diff --git a/images/card-91.svg b/images/card-91.svg index d348888..7353ccc 100644 --- a/images/card-91.svg +++ b/images/card-91.svg @@ -11,6 +11,6 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FFFFFF;stroke:#0060C8;stroke-width:1.8;" /> diff --git a/images/card-92.svg b/images/card-92.svg index 391eacc..506691d 100644 --- a/images/card-92.svg +++ b/images/card-92.svg @@ -11,6 +11,6 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#ACC8E4;stroke:#0060C8;stroke-width:1.8;" /> diff --git a/images/card-93.svg b/images/card-93.svg index 7a7eaae..f0bb251 100644 --- a/images/card-93.svg +++ b/images/card-93.svg @@ -11,6 +11,6 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#0060C8;stroke:#0060C8;stroke-width:1.8;" /> diff --git a/images/card-94.svg b/images/card-94.svg index fb239a8..47c5bf6 100644 --- a/images/card-94.svg +++ b/images/card-94.svg @@ -11,9 +11,9 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FFFFFF;stroke:#0060C8;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#0060C8;stroke-width:1.8;" /> diff --git a/images/card-95.svg b/images/card-95.svg index 025d2f1..25ad727 100644 --- a/images/card-95.svg +++ b/images/card-95.svg @@ -11,9 +11,9 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#ACC8E4;stroke:#0060C8;stroke-width:1.8;" /> + style="fill:#ACC8E4;stroke:#0060C8;stroke-width:1.8;" /> diff --git a/images/card-96.svg b/images/card-96.svg index d7c6f47..de452ce 100644 --- a/images/card-96.svg +++ b/images/card-96.svg @@ -11,9 +11,9 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#0060C8;stroke:#0060C8;stroke-width:1.8;" /> + style="fill:#0060C8;stroke:#0060C8;stroke-width:1.8;" /> diff --git a/images/card-97.svg b/images/card-97.svg index a558322..3d17cb3 100644 --- a/images/card-97.svg +++ b/images/card-97.svg @@ -11,12 +11,12 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#FFFFFF;stroke:#0060C8;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#0060C8;stroke-width:1.8;" /> + style="fill:#FFFFFF;stroke:#0060C8;stroke-width:1.8;" /> diff --git a/images/card-98.svg b/images/card-98.svg index 05ab9ec..4753e7e 100644 --- a/images/card-98.svg +++ b/images/card-98.svg @@ -11,12 +11,12 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#ACC8E4;stroke:#0060C8;stroke-width:1.8;" /> + style="fill:#ACC8E4;stroke:#0060C8;stroke-width:1.8;" /> + style="fill:#ACC8E4;stroke:#0060C8;stroke-width:1.8;" /> diff --git a/images/card-99.svg b/images/card-99.svg index 320ad14..a2eb221 100644 --- a/images/card-99.svg +++ b/images/card-99.svg @@ -11,12 +11,12 @@ style="fill:#FFFFFF;fill-opacity:1;stroke:#000000;stroke-width:0.5" /> + style="fill:#0060C8;stroke:#0060C8;stroke-width:1.8;" /> + style="fill:#0060C8;stroke:#0060C8;stroke-width:1.8;" /> + style="fill:#0060C8;stroke:#0060C8;stroke-width:1.8;" /> diff --git a/po/VisualMatch.pot b/po/VisualMatch.pot index 0fd5ede..693ce8f 100644 --- a/po/VisualMatch.pot +++ b/po/VisualMatch.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-29 22:47+0000\n" +"POT-Creation-Date: 2009-12-01 22:47+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -20,72 +20,81 @@ msgstr "" msgid "Visual Match" msgstr "" -#: /home/walter/Desktop/set/window.py:160 -msgid "The deck is empty." +#: /home/walter/Desktop/set/window.py:169 +msgid "No more cards" msgstr "" -#: /home/walter/Desktop/set/window.py:163 +#: /home/walter/Desktop/set/window.py:172 #: /home/walter/Desktop/set/VisualMatchActivity.py:99 -#: /home/walter/Desktop/set/VisualMatchActivity.py:195 -#: /home/walter/Desktop/set/VisualMatchActivity.py:260 +#: /home/walter/Desktop/set/VisualMatchActivity.py:206 #, python-format -msgid "%d cards remain in the deck" +msgid "%d cards remaining" msgstr "" -#: /home/walter/Desktop/set/window.py:166 -msgid "Found a match." +#: /home/walter/Desktop/set/window.py:175 +msgid "Match" msgstr "" -#: /home/walter/Desktop/set/window.py:169 +#: /home/walter/Desktop/set/window.py:178 #, python-format -msgid "%d match found." +msgid "%d match" msgstr "" -#: /home/walter/Desktop/set/window.py:172 +#: /home/walter/Desktop/set/window.py:181 #: /home/walter/Desktop/set/VisualMatchActivity.py:110 -#: /home/walter/Desktop/set/VisualMatchActivity.py:273 +#: /home/walter/Desktop/set/VisualMatchActivity.py:284 #, python-format -msgid "%d matches found." +msgid "%d matches" msgstr "" -#: /home/walter/Desktop/set/window.py:175 -msgid "Not a match." +#: /home/walter/Desktop/set/window.py:191 +msgid "No match" msgstr "" #: /home/walter/Desktop/set/VisualMatchActivity.py:72 -#: /home/walter/Desktop/set/VisualMatchActivity.py:228 +#: /home/walter/Desktop/set/VisualMatchActivity.py:239 msgid "New game" msgstr "" #: /home/walter/Desktop/set/VisualMatchActivity.py:80 -#: /home/walter/Desktop/set/VisualMatchActivity.py:237 +#: /home/walter/Desktop/set/VisualMatchActivity.py:248 msgid "Add three extra cards" msgstr "" #: /home/walter/Desktop/set/VisualMatchActivity.py:88 -#: /home/walter/Desktop/set/VisualMatchActivity.py:246 +#: /home/walter/Desktop/set/VisualMatchActivity.py:257 msgid "Is there a match?" msgstr "" #: /home/walter/Desktop/set/VisualMatchActivity.py:121 -#: /home/walter/Desktop/set/VisualMatchActivity.py:286 -msgid "Try to find a match." +#: /home/walter/Desktop/set/VisualMatchActivity.py:297 +msgid "-" msgstr "" -#: /home/walter/Desktop/set/VisualMatchActivity.py:135 +#: /home/walter/Desktop/set/VisualMatchActivity.py:132 +#: /home/walter/Desktop/set/VisualMatchActivity.py:310 +msgid "Find a match." +msgstr "" + +#: /home/walter/Desktop/set/VisualMatchActivity.py:146 msgid "Write in Journal" msgstr "" -#: /home/walter/Desktop/set/VisualMatchActivity.py:157 +#: /home/walter/Desktop/set/VisualMatchActivity.py:168 msgid "Project" msgstr "" -#: /home/walter/Desktop/set/VisualMatchActivity.py:205 +#: /home/walter/Desktop/set/VisualMatchActivity.py:216 msgid "Keep looking." msgstr "" -#: /home/walter/Desktop/set/VisualMatchActivity.py:208 -msgid "No matches found." +#: /home/walter/Desktop/set/VisualMatchActivity.py:219 +msgid "No matches." +msgstr "" + +#: /home/walter/Desktop/set/VisualMatchActivity.py:271 +#, python-format +msgid "%d cards remain in the deck" msgstr "" #: /home/walter/Desktop/set/namingalert.py:82 diff --git a/window.py b/window.py index 3755ccb..9056f65 100644 --- a/window.py +++ b/window.py @@ -23,6 +23,7 @@ import pygtk pygtk.require('2.0') import gtk +import gobject from gettext import gettext as _ try: @@ -100,8 +101,12 @@ def new_window(canvas, path, parent=None): tw.release = -1 tw.start_drag = [0,0] + tw.start_time = gobject.get_current_time() + tw.timeout_id = None + _counter(tw) return tw + # # Button press # @@ -161,22 +166,29 @@ def _button_release_cb(win, event, tw): tw.deck.spr_to_card(tw.clicked[1]), tw.deck.spr_to_card(tw.clicked[2])]): if tw.deck.remove_and_replace(tw.clicked, tw) is None: - tw.activity.deck_label.set_text(_("The deck is empty.")) + tw.activity.deck_label.set_text(_("No more cards")) else: tw.activity.deck_label.set_text( - _("%d cards remain in the deck") % \ + _("%d cards remaining") % \ (tw.deck.count-tw.deck.index)) tw.matches += 1 - tw.activity.status_label.set_text(_("Found a match.")) + tw.activity.status_label.set_text(_("Match")) if tw.matches == 1: tw.activity.match_label.set_text( - _("%d match found.") % (tw.matches)) + _("%d match") % (tw.matches)) else: tw.activity.match_label.set_text( - _("%d matches found.") % (tw.matches)) + _("%d matches") % (tw.matches)) + + # reset the game clock + if tw.timeout_id is not None: + gobject.source_remove(tw.timeout_id) + tw.start_time = gobject.get_current_time() + tw.timeout_id = None + _counter(tw) else: - tw.activity.status_label.set_text(_("Not a match.")) + tw.activity.status_label.set_text(_("No match")) tw.clicked = [None, None, None] for a in tw.selected: a.hide_card() @@ -204,6 +216,14 @@ def _destroy_cb(win, event, tw): # +# Display # of seconds since start_time +# +def _counter(tw): + tw.activity.clock_label.set_text(str(int(gobject.get_current_time()-\ + tw.start_time))) + tw.timeout_id = gobject.timeout_add(1000,_counter,tw) + +# # Check to see whether there are any matches on the board # def find_a_match(tw): -- cgit v0.9.1