diff options
author | Walter Bender <walter@walter-laptop.(none)> | 2009-10-05 12:36:56 (GMT) |
---|---|---|
committer | Walter Bender <walter@walter-laptop.(none)> | 2009-10-05 12:36:56 (GMT) |
commit | 3f75178258abf94a12c20747a6e85bd1bc5f796d (patch) | |
tree | 57e2824da29fd0478fd61bf2a106337b75076804 | |
parent | 4a7caa0b29d116777e7f54afe60ead7bfba42bca (diff) |
v2v2
-rw-r--r-- | po/CardSort.pot | 37 | ||||
-rw-r--r-- | window.py | 26 |
2 files changed, 42 insertions, 21 deletions
diff --git a/po/CardSort.pot b/po/CardSort.pot index ef777a7..f7413f2 100644 --- a/po/CardSort.pot +++ b/po/CardSort.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-02 21:08+0000\n" +"POT-Creation-Date: 2009-10-04 19:33+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -20,25 +20,40 @@ msgstr "" msgid "Card Sort" msgstr "" -#: /home/walter/Desktop/cardsort/CardSortActivity.py:175 -msgid "Solve it" +#: /home/walter/Desktop/cardsort/CardSortActivity.py:71 +#: /home/walter/Desktop/cardsort/CardSortActivity.py:142 +msgid "Blank piece" msgstr "" -#: /home/walter/Desktop/cardsort/CardSortActivity.py:186 -#: /home/walter/Desktop/cardsort/CardSortActivity.bu.py:145 +#: /home/walter/Desktop/cardsort/CardSortActivity.py:83 +#: /home/walter/Desktop/cardsort/CardSortActivity.py:174 msgid "click to rotate; drag to swap" msgstr "" -#: /home/walter/Desktop/cardsort/CardSortActivity.py:249 -msgid "I don't know how to solve it." +#: /home/walter/Desktop/cardsort/CardSortActivity.py:110 +msgid "Project" msgstr "" -#: /home/walter/Desktop/cardsort/CardSortActivity.py:307 -#: /home/walter/Desktop/cardsort/CardSortActivity.bu.py:284 +#: /home/walter/Desktop/cardsort/CardSortActivity.py:136 +msgid "Restore piece" +msgstr "" + +#: /home/walter/Desktop/cardsort/CardSortActivity.py:137 +msgid "adding blank tile" +msgstr "" + +#: /home/walter/Desktop/cardsort/CardSortActivity.py:141 +msgid "removing blank tile" +msgstr "" + +#: /home/walter/Desktop/cardsort/CardSortActivity.py:160 +msgid "Blank it" +msgstr "" + +#: /home/walter/Desktop/cardsort/window.py:140 msgid "You solved the puzzle." msgstr "" -#: /home/walter/Desktop/cardsort/CardSortActivity.py:310 -#: /home/walter/Desktop/cardsort/CardSortActivity.bu.py:287 +#: /home/walter/Desktop/cardsort/window.py:143 msgid "Keep trying." msgstr "" @@ -45,17 +45,18 @@ def new_window(canvas, path, parent=None): tw = taWindow() tw.path = path tw.activity = parent + # starting from command line if parent is None: tw.sugar = False - win = gtk.Window(gtk.WINDOW_TOPLEVEL) - win.set_has_frame(True) - win.set_decorated(True) - tw.canvas = win - tw.canvas.set_size_request(gtk.gdk.screen_width(), \ - gtk.gdk.screen_height()) + tw.canvas = gtk.Window(gtk.WINDOW_TOPLEVEL) + tw.canvas.set_decorated(True) + tw.canvas.set_title(_("CardSort") + ": " + \ + _("click to rotate; drag to swap")) tw.canvas.connect("destroy", lambda w: gtk.main_quit()) - win.show_all() + tw.canvas.set_size_request(gtk.gdk.screen_width(), \ + gtk.gdk.screen_height()) + tw.canvas.show_all() # starting from Sugar else: @@ -90,7 +91,6 @@ def new_window(canvas, path, parent=None): return tw - # # Button press # @@ -135,13 +135,19 @@ def _button_release_cb(win, event, tw): redrawsprites(tw) tw.press = -1 tw.release = -1 - if tw.sugar is True: - if tw.grid.test() == True: + if tw.grid.test() == True: + if tw.sugar is True: tw.activity.results_label.set_text(_("You solved the puzzle.")) tw.activity.results_label.show() else: + tw.canvas.set_title(_("CardSort") + ": " + \ + _("You solved the puzzle.")) + else: + if tw.sugar is True: tw.activity.results_label.set_text(_("Keep trying.")) tw.activity.results_label.show() + else: + tw.canvas.set_title(_("CardSort") + ": " + _("Keep trying.")) return True # |