diff options
Diffstat (limited to 'visualmatch.py')
| -rwxr-xr-x | visualmatch.py | 80 |
1 files changed, 39 insertions, 41 deletions
diff --git a/visualmatch.py b/visualmatch.py index 809f556..3fa1211 100755 --- a/visualmatch.py +++ b/visualmatch.py @@ -12,9 +12,9 @@ # Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. -import pygtk -pygtk.require('2.0') -import gtk +import gi +from gi.repository import Gtk +from gi.repository import Gdk from gettext import gettext as _ import os @@ -27,130 +27,128 @@ from constants import PRODUCT, HASH, ROMAN, WORD, CHINESE, MAYAN, DICE, DOTS, \ class VisualMatchMain: def __init__(self): - self.r = 0 - self.tw = None # create a new window - self.win = gtk.Window(gtk.WINDOW_TOPLEVEL) + self.win = Gtk.Window(type=Gtk.WindowType.TOPLEVEL) self.win.maximize() self.win.set_title("%s: %s" % (_("Visual Match"), _("Click on cards to create sets of three."))) - self.win.connect("delete_event", lambda w, e: gtk.main_quit()) + self.win.connect("delete_event", lambda w, e: Gtk.main_quit()) - menu0 = gtk.Menu() - menu_items = gtk.MenuItem(_("Toggle level")) + menu0 = Gtk.Menu() + menu_items = Gtk.MenuItem(_("Toggle level")) menu0.append(menu_items) menu_items.connect("activate", self._level_cb) menu_items.show() - level_menu = gtk.MenuItem("Level") + level_menu = Gtk.MenuItem("Level") level_menu.show() level_menu.set_submenu(menu0) - menu1 = gtk.Menu() - menu_items = gtk.MenuItem(_("New pattern game")) + menu1 = Gtk.Menu() + menu_items = Gtk.MenuItem(_("New pattern game")) menu1.append(menu_items) menu_items.connect("activate", self._new_game_cb, 'pattern') menu_items.show() - menu_items = gtk.MenuItem(_("New number game")) + menu_items = Gtk.MenuItem(_("New number game")) menu1.append(menu_items) menu_items.connect("activate", self._new_game_cb, 'number') menu_items.show() - menu_items = gtk.MenuItem(_("New word game")) + menu_items = Gtk.MenuItem(_("New word game")) menu1.append(menu_items) menu_items.connect("activate", self._new_game_cb, 'word') menu_items.show() - game_menu = gtk.MenuItem("Games") + game_menu = Gtk.MenuItem("Games") game_menu.show() game_menu.set_submenu(menu1) - menu2 = gtk.Menu() - menu_items = gtk.MenuItem(_("Robot on/off")) + menu2 = Gtk.Menu() + menu_items = Gtk.MenuItem(_("Robot on/off")) menu2.append(menu_items) menu_items.connect("activate", self._robot_cb) menu_items.show() - menu_items = gtk.MenuItem(_("90 sec.")) + menu_items = Gtk.MenuItem(_("90 sec.")) menu2.append(menu_items) menu_items.connect("activate", self._robot_time_cb, 90) menu_items.show() - menu_items = gtk.MenuItem(_("60 sec.")) + menu_items = Gtk.MenuItem(_("60 sec.")) menu2.append(menu_items) menu_items.connect("activate", self._robot_time_cb, 60) menu_items.show() - menu_items = gtk.MenuItem(_("45 sec.")) + menu_items = Gtk.MenuItem(_("45 sec.")) menu2.append(menu_items) menu_items.connect("activate", self._robot_time_cb, 45) menu_items.show() - menu_items = gtk.MenuItem(_("30 sec.")) + menu_items = Gtk.MenuItem(_("30 sec.")) menu2.append(menu_items) menu_items.connect("activate", self._robot_time_cb, 30) menu_items.show() - menu_items = gtk.MenuItem(_("15 sec.")) + menu_items = Gtk.MenuItem(_("15 sec.")) menu2.append(menu_items) menu_items.connect("activate", self._robot_time_cb, 15) menu_items.show() - tool_menu = gtk.MenuItem("Robot") + tool_menu = Gtk.MenuItem("Robot") tool_menu.show() tool_menu.set_submenu(menu2) - menu3 = gtk.Menu() - menu_items = gtk.MenuItem(_("Product")) + menu3 = Gtk.Menu() + menu_items = Gtk.MenuItem(_("Product")) menu3.append(menu_items) menu_items.connect("activate", self._number_card_O_cb, PRODUCT) menu_items.show() - menu_items = gtk.MenuItem(_("Roman")) + menu_items = Gtk.MenuItem(_("Roman")) menu3.append(menu_items) menu_items.connect("activate", self._number_card_O_cb, ROMAN) menu_items.show() - menu_items = gtk.MenuItem(_("Word")) + menu_items = Gtk.MenuItem(_("Word")) menu3.append(menu_items) menu_items.connect("activate", self._number_card_O_cb, WORD) menu_items.show() - menu_items = gtk.MenuItem(_("Chinese")) + menu_items = Gtk.MenuItem(_("Chinese")) menu3.append(menu_items) menu_items.connect("activate", self._number_card_O_cb, CHINESE) menu_items.show() - menu_items = gtk.MenuItem(_("Mayan")) + menu_items = Gtk.MenuItem(_("Mayan")) menu3.append(menu_items) menu_items.connect("activate", self._number_card_O_cb, MAYAN) menu_items.show() - menu_items = gtk.MenuItem(_("Quipu")) + menu_items = Gtk.MenuItem(_("Quipu")) menu3.append(menu_items) menu_items.connect("activate", self._number_card_O_cb, INCAN) menu_items.show() - menu_items = gtk.MenuItem(_("Hash")) + menu_items = Gtk.MenuItem(_("Hash")) menu3.append(menu_items) menu_items.connect("activate", self._number_card_C_cb, HASH) menu_items.show() - menu_items = gtk.MenuItem(_("Dice")) + menu_items = Gtk.MenuItem(_("Dice")) menu3.append(menu_items) menu_items.connect("activate", self._number_card_C_cb, DICE) menu_items.show() - menu_items = gtk.MenuItem(_("Dots")) + menu_items = Gtk.MenuItem(_("Dots")) menu3.append(menu_items) menu_items.connect("activate", self._number_card_C_cb, DOTS) menu_items.show() - menu_items = gtk.MenuItem(_("Star")) + menu_items = Gtk.MenuItem(_("Star")) menu3.append(menu_items) menu_items.connect("activate", self._number_card_C_cb, STAR) menu_items.show() - menu_items = gtk.MenuItem(_("Lines")) + menu_items = Gtk.MenuItem(_("Lines")) menu3.append(menu_items) menu_items.connect("activate", self._number_card_C_cb, LINES) menu_items.show() - num_menu = gtk.MenuItem("Numbers") + num_menu = Gtk.MenuItem("Numbers") num_menu.show() num_menu.set_submenu(menu3) # A vbox to put a menu and the canvas in: - vbox = gtk.VBox(False, 0) + vbox = Gtk.VBox(False, 0) self.win.add(vbox) vbox.show() - menu_bar = gtk.MenuBar() + 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 = Gtk.DrawingArea() + vbox.pack_end(canvas, True, True, 0) canvas.show() menu_bar.append(game_menu) @@ -229,7 +227,7 @@ class VisualMatchMain: def main(): - gtk.main() + Gtk.main() return 0 |