From 5082df3f24c88e150a7a79b5d1666f5784f8d2d1 Mon Sep 17 00:00:00 2001 From: Simon Schampijer Date: Wed, 23 Jan 2013 13:13:14 +0000 Subject: More gobject and gdk import fixups --- diff --git a/cardlist.py b/cardlist.py index 2e8f383..4a8d37e 100644 --- a/cardlist.py +++ b/cardlist.py @@ -38,9 +38,9 @@ class CardList(Gtk.EventBox): __gsignals__ = { 'pair-selected': (GObject.SignalFlags.RUN_FIRST, - None, 9 * [object]), + None, 9 * [GObject.TYPE_PYOBJECT]), 'update-create-toolbar': (GObject.SignalFlags.RUN_FIRST, - None, 3 * [object]), + None, 3 * [GObject.TYPE_PYOBJECT]), } def __init__(self): @@ -248,8 +248,10 @@ class CardList(Gtk.EventBox): class CardPair(Gtk.EventBox): __gsignals__ = { - 'pair-selected': (GObject.SignalFlags.RUN_FIRST, None, [object]), - 'pair-closed': (GObject.SignalFlags.RUN_FIRST, None, [object]), + 'pair-selected': (GObject.SignalFlags.RUN_FIRST, + None, [GObject.TYPE_PYOBJECT]), + 'pair-closed': (GObject.SignalFlags.RUN_FIRST, + None, [GObject.TYPE_PYOBJECT]), } def __init__(self, text1, text2=None, aimg=None, bimg=None, diff --git a/cardtable.py b/cardtable.py index 2c4a712..bcb44e4 100644 --- a/cardtable.py +++ b/cardtable.py @@ -34,9 +34,11 @@ import theme class CardTable(Gtk.EventBox): __gsignals__ = { - 'card-flipped': (GObject.SignalFlags.RUN_FIRST, None, [int, object]), + 'card-flipped': (GObject.SignalFlags.RUN_FIRST, + None, [int, GObject.TYPE_PYOBJECT]), 'card-overflipped': (GObject.SignalFlags.RUN_FIRST, None, [int]), - 'card-highlighted': (GObject.SignalFlags.RUN_FIRST, None, [int, object]), + 'card-highlighted': (GObject.SignalFlags.RUN_FIRST, + None, [int, GObject.TYPE_PYOBJECT]), } def __init__(self): diff --git a/createcardpanel.py b/createcardpanel.py index 0bb3c91..5af3f8c 100644 --- a/createcardpanel.py +++ b/createcardpanel.py @@ -49,9 +49,9 @@ _logger = logging.getLogger('memorize-activity') class CreateCardPanel(Gtk.EventBox): __gsignals__ = { - 'add-pair': (GObject.SignalFlags.RUN_FIRST, None, 10 * [object]), - 'update-pair': (GObject.SignalFlags.RUN_FIRST, None, 8 * [object]), - 'change-font': (GObject.SignalFlags.RUN_FIRST, None, 2 * [object]), + 'add-pair': (GObject.SignalFlags.RUN_FIRST, None, 10 * [GObject.TYPE_PYOBJECT]), + 'update-pair': (GObject.SignalFlags.RUN_FIRST, None, 8 * [GObject.TYPE_PYOBJECT]), + 'change-font': (GObject.SignalFlags.RUN_FIRST, None, 2 * [GObject.TYPE_PYOBJECT]), } def __init__(self): @@ -274,10 +274,10 @@ class CreateCardPanel(Gtk.EventBox): class CardEditor(Gtk.EventBox): __gsignals__ = { - 'has-text': (SIGNAL_RUN_FIRST, None, [TYPE_PYOBJECT]), - 'has-picture': (SIGNAL_RUN_FIRST, None, [TYPE_PYOBJECT]), - 'has-sound': (SIGNAL_RUN_FIRST, None, [TYPE_PYOBJECT]), - 'change-font': (SIGNAL_RUN_FIRST, None, [TYPE_PYOBJECT]), + 'has-text': (GObject.SignalFlags.RUN_FIRST, None, [GObject.TYPE_PYOBJECT]), + 'has-picture': (GObject.SignalFlags.RUN_FIRST, None, [GObject.TYPE_PYOBJECT]), + 'has-sound': (GObject.SignalFlags.RUN_FIRST, None, [GObject.TYPE_PYOBJECT]), + 'change-font': (GObject.SignalFlags.RUN_FIRST, None, [GObject.TYPE_PYOBJECT]), } def __init__(self, editor_index): diff --git a/createtoolbar.py b/createtoolbar.py index 86ca582..78d1ba8 100644 --- a/createtoolbar.py +++ b/createtoolbar.py @@ -34,7 +34,8 @@ class CreateToolbarBuilder(GObject.GObject): __gsignals__ = { 'create_new_game': (GObject.SignalFlags.RUN_FIRST, None, []), - 'create_equal_pairs': (GObject.SignalFlags.RUN_FIRST, None, [object]), + 'create_equal_pairs': (GObject.SignalFlags.RUN_FIRST, + None, [GObject.TYPE_PYOBJECT]), } def __init__(self, activity): diff --git a/game.py b/game.py index c573bef..4ea725c 100644 --- a/game.py +++ b/game.py @@ -20,8 +20,6 @@ from gi.repository import GObject from os.path import join from gettext import gettext as _ -from gobject import SIGNAL_RUN_FIRST, TYPE_PYOBJECT, GObject, timeout_add -from gobject import source_remove from model import Model from audio import Audio @@ -34,27 +32,27 @@ IFACE = SERVICE PATH = '/org/laptop/Memorize' -class MemorizeGame(GObject): +class MemorizeGame(GObject.GObject): __gsignals__ = { - 'reset_scoreboard': (SIGNAL_RUN_FIRST, None, []), - 'reset_table': (SIGNAL_RUN_FIRST, None, []), - 'load_mode': (SIGNAL_RUN_FIRST, None, [TYPE_PYOBJECT]), - 'load_game': (SIGNAL_RUN_FIRST, None, 2 * [TYPE_PYOBJECT]), - 'change_game': (SIGNAL_RUN_FIRST, None, 2 * [TYPE_PYOBJECT]), - 'change_game_signal': (SIGNAL_RUN_FIRST, None, 5 * [TYPE_PYOBJECT]), - 'set-border': (SIGNAL_RUN_FIRST, None, 3 * [TYPE_PYOBJECT]), - 'flip-card': (SIGNAL_RUN_FIRST, None, [int, bool]), - 'flip-card-signal': (SIGNAL_RUN_FIRST, None, [int]), - 'cement-card': (SIGNAL_RUN_FIRST, None, [int]), - 'flop-card': (SIGNAL_RUN_FIRST, None, [int]), - 'highlight-card': (SIGNAL_RUN_FIRST, None, 2 * [TYPE_PYOBJECT]), - 'add_buddy': (SIGNAL_RUN_FIRST, None, 2 * [TYPE_PYOBJECT]), - 'rem_buddy': (SIGNAL_RUN_FIRST, None, [TYPE_PYOBJECT]), - 'increase-score': (SIGNAL_RUN_FIRST, None, [TYPE_PYOBJECT]), - 'wait_mode_buddy': (SIGNAL_RUN_FIRST, None, 2 * [TYPE_PYOBJECT]), - 'msg_buddy': (SIGNAL_RUN_FIRST, None, 2 * [TYPE_PYOBJECT]), - 'change-turn': (SIGNAL_RUN_FIRST, None, [TYPE_PYOBJECT]), + 'reset_scoreboard': (GObject.SignalFlags.RUN_FIRST, None, []), + 'reset_table': (GObject.SignalFlags.RUN_FIRST, None, []), + 'load_mode': (GObject.SignalFlags.RUN_FIRST, None, [GObject.TYPE_PYOBJECT]), + 'load_game': (GObject.SignalFlags.RUN_FIRST, None, 2 * [GObject.TYPE_PYOBJECT]), + 'change_game': (GObject.SignalFlags.RUN_FIRST, None, 2 * [GObject.TYPE_PYOBJECT]), + 'change_game_signal': (GObject.SignalFlags.RUN_FIRST, None, 5 * [GObject.TYPE_PYOBJECT]), + 'set-border': (GObject.SignalFlags.RUN_FIRST, None, 3 * [GObject.TYPE_PYOBJECT]), + 'flip-card': (GObject.SignalFlags.RUN_FIRST, None, [int, bool]), + 'flip-card-signal': (GObject.SignalFlags.RUN_FIRST, None, [int]), + 'cement-card': (GObject.SignalFlags.RUN_FIRST, None, [int]), + 'flop-card': (GObject.SignalFlags.RUN_FIRST, None, [int]), + 'highlight-card': (GObject.SignalFlags.RUN_FIRST, None, 2 * [GObject.TYPE_PYOBJECT]), + 'add_buddy': (GObject.SignalFlags.RUN_FIRST, None, 2 * [GObject.TYPE_PYOBJECT]), + 'rem_buddy': (GObject.SignalFlags.RUN_FIRST, None, [GObject.TYPE_PYOBJECT]), + 'increase-score': (GObject.SignalFlags.RUN_FIRST, None, [GObject.TYPE_PYOBJECT]), + 'wait_mode_buddy': (GObject.SignalFlags.RUN_FIRST, None, 2 * [GObject.TYPE_PYOBJECT]), + 'msg_buddy': (GObject.SignalFlags.RUN_FIRST, None, 2 * [GObject.TYPE_PYOBJECT]), + 'change-turn': (GObject.SignalFlags.RUN_FIRST, None, [GObject.TYPE_PYOBJECT]), } def __init__(self): diff --git a/memorizetoolbar.py b/memorizetoolbar.py index f83fedf..78fc76b 100644 --- a/memorizetoolbar.py +++ b/memorizetoolbar.py @@ -15,9 +15,11 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # -from gi.repository import GObject +import logging from os.path import join, dirname +from gi.repository import GObject + from gettext import gettext as _ from sugar3.graphics.toolbutton import ToolButton from sugar3.graphics.toolcombobox import ToolComboBox @@ -26,9 +28,6 @@ from sugar3.graphics.icon import Icon from sugar3.activity.widgets import RadioMenuButton from sugar3.graphics.menuitem import MenuItem -import logging -from gobject import SIGNAL_RUN_FIRST, TYPE_PYOBJECT - _logger = logging.getLogger('memorize-activity') @@ -46,7 +45,7 @@ class MemorizeToolbarBuilder(GObject.GObject): ] __gsignals__ = { - 'game_changed': (SIGNAL_RUN_FIRST, None, 5 * [TYPE_PYOBJECT]) + 'game_changed': (GObject.SignalFlags.RUN_FIRST, None, 5 * [GObject.TYPE_PYOBJECT]) } def __init__(self, activity): diff --git a/playerscoreboard.py b/playerscoreboard.py index e26c2bb..68eecb2 100644 --- a/playerscoreboard.py +++ b/playerscoreboard.py @@ -16,6 +16,7 @@ # from gi.repository import Gtk +from gi.repository import Gdk import svglabel import logging -- cgit v0.9.1