cleaned up cmdline version

1 files changed, 78 insertions, 7 deletions

diff --git a/cardsort.py b/cardsort.py
index 01a4403..136528d 100755
--- a/cardsort.py
+++ b/cardsort.py
@@ -1,21 +1,92 @@
 #!/usr/bin/env python
 
+#Copyright (c) 2009, Walter Bender
+
+#Permission is hereby granted, free of charge, to any person obtaining a copy
+#of this software and associated documentation files (the "Software"), to deal
+#in the Software without restriction, including without limitation the rights
+#to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#copies of the Software, and to permit persons to whom the Software is
+#furnished to do so, subject to the following conditions:
+
+#The above copyright notice and this permission notice shall be included in
+#all copies or substantial portions of the Software.
+
+#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+#THE SOFTWARE.
+
 import pygtk
 pygtk.require('2.0')
 import gtk
+
+from gettext import gettext as _
 import os.path
 
 import window
+import grid
+import sprites
+
+class CardSortMain:
+    def __init__(self):
+        self.tw = None
+        # create a new window
+        self.win = gtk.Window(gtk.WINDOW_TOPLEVEL)
+        # for some reason, full screen width/height doesn't work
+        self.win.set_size_request(
+                                  int(gtk.gdk.screen_width()*.9), \
+                                  int(gtk.gdk.screen_height()*.9))
+        self.win.set_title(_("CardSort") + ": " + \
+                           _("click to rotate; drag to swap"))
+        self.win.connect("delete_event", lambda w,e: gtk.main_quit())
+
+        menu = gtk.Menu()
+        menu_items = gtk.MenuItem(_("Toggle blank card"))
+        menu.append(menu_items)
+        menu_items.connect("activate", self._toggle_card_cb)
+        menu_items.show()
+        root_menu = gtk.MenuItem("Tools")
+        root_menu.show()
+        root_menu.set_submenu(menu)
+
+        # A vbox to put a menu and the canvas in:
+        vbox = gtk.VBox(False, 0)
+        self.win.add(vbox)
+        vbox.show()
+
+        menu_bar = gtk.MenuBar()
+        vbox.pack_start(menu_bar, False, False, 2)
+        menu_bar.show()
+
+        canvas = gtk.DrawingArea()
+        vbox.pack_end(canvas, True, True)
+        canvas.show()
+
+        menu_bar.append (root_menu)
+        self.win.show_all()
+
+        # Join the activity
+        self.tw = window.new_window(canvas, \
+                               os.path.join(os.path.abspath('.'), \
+                                            'images/card'))
+        self.tw.win = self.win
+
+    def set_title(self, title):
+        self.win.set_title(title)
+
+    # Print a string when a menu item is selected
+    def _toggle_card_cb(self, widget):
+        self.tw.grid.toggle_blank()
+        sprites.redrawsprites(self.tw)
 
 def main():
-    # All PyGTK applications must have a gtk.main(). Control ends here
-    # and waits for an event to occur (like a key press or mouse event).
-    tw = window.new_window(None, \
-                           os.path.join(os.path.abspath('.'), \
-                                        'images/card'))
     gtk.main()
-
+    return 0
 
 if __name__ == "__main__":
+    CardSortMain()
     main()
-