diff options
| -rw-r--r-- | activity/activity.info | 4 | ||||
| -rw-r--r-- | cairoutils.py | 4 | ||||
| -rw-r--r-- | dominoactivity.py | 74 | ||||
| -rw-r--r-- | dominogame.py | 10 | ||||
| -rw-r--r-- | dominopiece.py | 14 | ||||
| -rw-r--r-- | dominopieceprocessor.py | 14 | ||||
| -rw-r--r-- | dominoplayer.py | 16 | ||||
| -rw-r--r-- | dominoview.py | 17 | ||||
| -rw-r--r-- | setup.py | 5 |
9 files changed, 85 insertions, 73 deletions
diff --git a/activity/activity.info b/activity/activity.info index f75a949..763f5ac 100644 --- a/activity/activity.info +++ b/activity/activity.info @@ -1,7 +1,7 @@ [Activity] name = Domino -service_name = org.laptop.Domino +bundle_id = org.laptop.Domino icon = domino-icon -class = dominoactivity.Domino +exec = sugar-activity dominoactivity.Domino activity_version = 8 host_version = 1 diff --git a/cairoutils.py b/cairoutils.py index e2d7ac8..12ea349 100644 --- a/cairoutils.py +++ b/cairoutils.py @@ -1,5 +1,5 @@ -import gobject -import gtk +from gi.repository import GObject +from gi.repository import Gtk import cairo diff --git a/dominoactivity.py b/dominoactivity.py index 9e7751e..1a4ccd6 100644 --- a/dominoactivity.py +++ b/dominoactivity.py @@ -11,24 +11,26 @@ # Style guide : http://www.python.org/dev/peps/pep-0008/ -import gobject -import gtk +from gi.repository import GObject +from gi.repository import Gtk import cairo -import pango +from gi.repository import Pango import math, random import os,sys -import simplejson +import json -import pygtk -pygtk.require('2.0') import getopt import logging from gettext import gettext as _ -import sugar -from sugar.activity import activity -from sugar.graphics.toolbutton import ToolButton +import sugar3 +from sugar3.activity import activity +from sugar3.graphics.toolbutton import ToolButton + +from sugar3.graphics.toolbarbox import ToolbarBox +from sugar3.activity.widgets import ActivityToolbarButton +from sugar3.activity.widgets import StopButton import dominoview from dominoview import DominoTableView @@ -52,8 +54,14 @@ class Domino(activity.Activity): # Creo la toolbar y agrego los botones - toolbox = activity.ActivityToolbox(self) - self.toolbar = gtk.Toolbar() + toolbar_box = ToolbarBox() + self.set_toolbar_box(toolbar_box) + + self._activity_toolbar_button = ActivityToolbarButton(self) + + toolbar_box.toolbar.insert(self._activity_toolbar_button, 0) + self._activity_toolbar_button.show() + # lista con los puntajes self.list_points = [] @@ -75,8 +83,8 @@ class Domino(activity.Activity): # agrego combo para tipo de juego - cmbItem = gtk.ToolItem() - self.cmbTipoPiezas = gtk.combo_box_new_text() + cmbItem = Gtk.ToolItem() + self.cmbTipoPiezas = Gtk.ComboBoxText() self.read_file() @@ -90,7 +98,7 @@ class Domino(activity.Activity): cmbItem.add(self.cmbTipoPiezas) - self.toolbar.insert(cmbItem, -1) + toolbar_box.toolbar.insert(cmbItem, -1) self.cmbTipoPiezas.show() cmbItem.show() self.cmbTipoPiezas.set_active(0) @@ -98,40 +106,46 @@ class Domino(activity.Activity): self.btnStart = ToolButton('dialog-ok') self.btnStart.connect('clicked', self._start_game) self.btnStart.set_tooltip(_('Start')) - self.toolbar.insert(self.btnStart, -1) + toolbar_box.toolbar.insert(self.btnStart, -1) self.btnStart.show() self.btnNew = ToolButton('list-add') self.btnNew.connect('clicked', self._add_piece) self.btnNew.set_tooltip(_('Get piece')) - self.toolbar.insert(self.btnNew, -1) + toolbar_box.toolbar.insert(self.btnNew, -1) self.btnNew.show() self.btnPass = ToolButton('go-next') self.btnPass.connect('clicked', self._pass_next_player) self.btnPass.set_tooltip(_('Pass')) - self.toolbar.insert(self.btnPass, -1) + toolbar_box.toolbar.insert(self.btnPass, -1) self.btnPass.show() self.btnScores = ToolButton('scores') self.btnScores.connect('clicked', self._show_scores) self.btnScores.set_tooltip(_('Scores')) - self.toolbar.insert(self.btnScores, -1) + toolbar_box.toolbar.insert(self.btnScores, -1) self.btnScores.show() - - toolbox.add_toolbar(_('Domino'), self.toolbar) - self.toolbar.show() - self.set_toolbox(toolbox) - toolbox.show() - toolbox.set_current_toolbar(1) + separator = Gtk.SeparatorToolItem() + separator.props.draw = False + separator.set_size_request(0, -1) + separator.set_expand(True) + toolbar_box.toolbar.insert(separator, -1) + separator.show() + + stop_button = StopButton(self) + toolbar_box.toolbar.insert(stop_button, -1) + stop_button.show() + + toolbar_box.show_all() # Creo el Canvas y el CanvasBox donde dibujaremos todo el tablero y las fichas - self.drawingarea = gtk.DrawingArea() + self.drawingarea = Gtk.DrawingArea() self.drawingarea.set_size_request(dominoview.SCREEN_WIDTH,dominoview.SCREEN_HEIGHT) self.drawingarea.show() - self.drawingarea.connect('expose-event', self.on_drawing_area_exposed) + #self.drawingarea.connect('expose-event', self.on_drawing_area_exposed) self.connect('key-press-event',self.on_keypress) self.set_canvas(self.drawingarea) @@ -311,7 +325,7 @@ class Domino(activity.Activity): def on_keypress(self, widget, event): - key = gtk.gdk.keyval_name(event.keyval) + key = Gdk.keyval_name(event.keyval) # Agrego las teclas de juego de la XO (Circulo arriba = KP_Page_Up , X = KP_Page_Down, Check = KP_End @@ -334,7 +348,7 @@ class Domino(activity.Activity): self.key_action(key) # Para saber que codigo viene #else: - # print gtk.gdk.keyval_name(event.keyval) + # print Gdk.keyval_name(event.keyval) # sys.stdout.write("keyval "+str(event.keyval)+" key "+key+"\n") # sys.stdout.flush() return True @@ -446,7 +460,7 @@ class Domino(activity.Activity): print "antes de abrir archivo" fd = open(file_name, 'wt') print "antes de json" - simplejson.dump(data_points, fd) + json.dump(data_points, fd) print "desppues de json" print "antes de cerrar" fd.close() @@ -468,7 +482,7 @@ class Domino(activity.Activity): fd = open(file_name, 'rt') try: # lo meto en una variable intermedia por si hay problemas - data_points = simplejson.load(fd) + data_points = json.load(fd) self.list_points = [] for data in data_points: diff --git a/dominogame.py b/dominogame.py index 59b0203..87791b5 100644 --- a/dominogame.py +++ b/dominogame.py @@ -1,15 +1,15 @@ -import gobject -import gtk +from gi.repository import GObject +from gi.repository import Gtk import math, random -import pygtk -pygtk.require('2.0') +import gi +gi.require_version('Gtk', '3.0') import getopt import sys from gettext import gettext as _ -from sugar import profile +from sugar3 import profile from dominopiece import DominoPiece import dominoview diff --git a/dominopiece.py b/dominopiece.py index e6acf57..bf484c3 100644 --- a/dominopiece.py +++ b/dominopiece.py @@ -5,20 +5,20 @@ ### GPL License - http://www.gnu.org/copyleft/gpl.html -import gobject -import gtk +from gi.repository import GObject +from gi.repository import Gtk import cairo import math, random -import pygtk -pygtk.require('2.0') +import gi +gi.require_version('Gtk', '3.0') import getopt import logging from gettext import gettext as _ -import sugar -from sugar.graphics import xocolor -from sugar.graphics import style +import sugar3 +from sugar3.graphics import xocolor +from sugar3.graphics import style import dominoview import cairoutils diff --git a/dominopieceprocessor.py b/dominopieceprocessor.py index 567d635..5b908bc 100644 --- a/dominopieceprocessor.py +++ b/dominopieceprocessor.py @@ -1,18 +1,18 @@ -import gobject -import gtk +from gi.repository import GObject +from gi.repository import Gtk import cairo -import pango +from gi.repository import Pango import math, random -import pygtk -pygtk.require('2.0') +import gi +gi.require_version('Gtk', '3.0') import getopt import logging from gettext import gettext as _ -import sugar -from sugar.graphics import style +import sugar3 +from sugar3.graphics import style import dominoview M_PI = 3.14159265358979323846 diff --git a/dominoplayer.py b/dominoplayer.py index 0e389b0..493fd0c 100644 --- a/dominoplayer.py +++ b/dominoplayer.py @@ -1,17 +1,17 @@ -import gobject -import gtk +from gi.repository import GObject +from gi.repository import Gtk import math, random -import pygtk -pygtk.require('2.0') +import gi +gi.require_version('Gtk', '3.0') import getopt import logging from gettext import gettext as _ -import sugar -from sugar.activity import activity -from sugar.graphics.toolbutton import ToolButton -from sugar.graphics.xocolor import XoColor +import sugar3 +from sugar3.activity import activity +from sugar3.graphics.toolbutton import ToolButton +from sugar3.graphics.xocolor import XoColor import dominoview from dominoview import Tile diff --git a/dominoview.py b/dominoview.py index ba3e7a0..3a25bef 100644 --- a/dominoview.py +++ b/dominoview.py @@ -5,19 +5,18 @@ ### GPL License - http://www.gnu.org/copyleft/gpl.html -import gobject -import gtk +from gi.repository import GObject +from gi.repository import Gtk +from gi.repository import Gdk import cairo -import rsvg +#import rsvg -import pygtk -pygtk.require('2.0') import getopt import logging from gettext import gettext as _ -import sugar -from sugar.graphics.icon import Icon +import sugar3 +from sugar3.graphics.icon import Icon import cairoutils @@ -28,8 +27,8 @@ SIZE = 60 # Si se quiere usar fichas mas grandes, se puede usar SIZE = 70 y cambiar _drawLabel el scale = 3 -SCREEN_HEIGHT = gtk.gdk.screen_height() -SCREEN_WIDTH = gtk.gdk.screen_width() +SCREEN_HEIGHT = Gdk.Screen.height() +SCREEN_WIDTH = Gdk.Screen.width() class Tile: @@ -1,5 +1,4 @@ #!/usr/bin/env python -from sugar.activity import bundlebuilder -if __name__ == "__main__": - bundlebuilder.start() +from sugar3.activity import bundlebuilder +bundlebuilder.start() |