diff options
Diffstat (limited to 'mmm_modules')
| -rw-r--r-- | mmm_modules/borderframe.py | 20 | ||||
| -rw-r--r-- | mmm_modules/buddy_panel.py | 40 | ||||
| -rw-r--r-- | mmm_modules/i18n.py | 12 | ||||
| -rwxr-xr-x | mmm_modules/image_category.py | 59 | ||||
| -rw-r--r-- | mmm_modules/notebook_reader.py | 12 | ||||
| -rw-r--r-- | mmm_modules/timer.py | 28 | ||||
| -rw-r--r-- | mmm_modules/tube_helper.py | 4 | ||||
| -rw-r--r-- | mmm_modules/utils.py | 12 |
8 files changed, 87 insertions, 100 deletions
diff --git a/mmm_modules/borderframe.py b/mmm_modules/borderframe.py index 14d55d1..b97920f 100644 --- a/mmm_modules/borderframe.py +++ b/mmm_modules/borderframe.py @@ -18,9 +18,7 @@ # own creations we would love to hear from you at info@WorldWideWorkshop.org ! # -import pygtk -pygtk.require('2.0') -import gtk, gobject, pango +from gi.repository import Gtk, GObject BORDER_LEFT = 1 BORDER_RIGHT = 2 @@ -33,15 +31,15 @@ BORDER_ALL_BUT_BOTTOM = BORDER_HORIZONTAL | BORDER_TOP BORDER_ALL_BUT_TOP = BORDER_HORIZONTAL | BORDER_BOTTOM BORDER_ALL_BUT_LEFT = BORDER_VERTICAL | BORDER_RIGHT -class BorderFrame (gtk.EventBox): +class BorderFrame (Gtk.EventBox): def __init__ (self, border=BORDER_ALL, size=5, bg_color=None, border_color=None): - gtk.EventBox.__init__(self) + Gtk.EventBox.__init__(self) if border_color is not None: - self.set_border_color(gtk.gdk.color_parse(border_color)) - self.inner = gtk.EventBox() + self.set_border_color(Gdk.color_parse(border_color)) + self.inner = Gtk.EventBox() if bg_color is not None: - self.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse(bg_color)) - align = gtk.Alignment(1.0,1.0,1.0,1.0) + self.modify_bg(Gtk.StateType.NORMAL, Gdk.color_parse(bg_color)) + align = Gtk.Alignment(1.0,1.0,1.0,1.0) self.padding = [0,0,0,0] if (border & BORDER_TOP) != 0: self.padding[0] = size @@ -55,11 +53,11 @@ class BorderFrame (gtk.EventBox): align.add(self.inner) align.show() self.inner.show() - gtk.EventBox.add(self, align) + Gtk.EventBox.add(self, align) self.stack = [] def set_border_color (self, color): - gtk.EventBox.modify_bg(self, gtk.STATE_NORMAL, color) + Gtk.EventBox.modify_bg(self, Gtk.StateType.NORMAL, color) def modify_bg (self, state, color): self.inner.modify_bg(state, color) diff --git a/mmm_modules/buddy_panel.py b/mmm_modules/buddy_panel.py index 6f5e32e..3255382 100644 --- a/mmm_modules/buddy_panel.py +++ b/mmm_modules/buddy_panel.py @@ -18,27 +18,25 @@ # own creations we would love to hear from you at info@WorldWideWorkshop.org ! # -import pygtk -pygtk.require('2.0') -import gtk +from gi.repository import Gtk import logging from tube_helper import GAME_IDLE, GAME_STARTED, GAME_FINISHED, GAME_QUIT -#from sugar.graphics.icon import CanvasIcon +#from sugar3.graphics.icon import CanvasIcon BUDDYMODE_CONTEST = 0 BUDDYMODE_COLLABORATION = 1 -class BuddyPanel (gtk.ScrolledWindow): +class BuddyPanel (Gtk.ScrolledWindow): def __init__ (self, mode=BUDDYMODE_CONTEST): super(BuddyPanel, self).__init__() - self.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) + self.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC) - self.model = gtk.ListStore(str, str, str, str) - self.model.set_sort_column_id(0, gtk.SORT_ASCENDING) - self.treeview = gtk.TreeView() + self.model = Gtk.ListStore(str, str, str, str) + self.model.set_sort_column_id(0, Gtk.SortType.ASCENDING) + self.treeview = Gtk.TreeView() #col = gtk.TreeViewColumn(_("Icon")) #r = gtk.CellRendererText() @@ -46,29 +44,29 @@ class BuddyPanel (gtk.ScrolledWindow): #col.set_attributes(r, stock_id=0) #self.treeview.append_column(col) - col = gtk.TreeViewColumn(_("Buddy")) - r = gtk.CellRendererText() - col.pack_start(r, True) + col = Gtk.TreeViewColumn(_("Buddy")) + r = Gtk.CellRendererText() + col.pack_start(r, True, True, 0) col.set_attributes(r, text=0) self.treeview.append_column(col) - col = gtk.TreeViewColumn(_("Status")) - r = gtk.CellRendererText() - col.pack_start(r, True) + col = Gtk.TreeViewColumn(_("Status")) + r = Gtk.CellRendererText() + col.pack_start(r, True, True, 0) col.set_attributes(r, text=1) self.treeview.append_column(col) col.set_visible(mode == BUDDYMODE_CONTEST) - col = gtk.TreeViewColumn(_("Play Time")) - r = gtk.CellRendererText() - col.pack_start(r, True) + col = Gtk.TreeViewColumn(_("Play Time")) + r = Gtk.CellRendererText() + col.pack_start(r, True, True, 0) col.set_attributes(r, text=2) self.treeview.append_column(col) col.set_visible(mode == BUDDYMODE_CONTEST) - col = gtk.TreeViewColumn(_("Joined at")) - r = gtk.CellRendererText() - col.pack_start(r, True) + col = Gtk.TreeViewColumn(_("Joined at")) + r = Gtk.CellRendererText() + col.pack_start(r, True, True, 0) col.set_attributes(r, text=3) self.treeview.append_column(col) col.set_visible(mode == BUDDYMODE_COLLABORATION) diff --git a/mmm_modules/i18n.py b/mmm_modules/i18n.py index 34b61e4..dc0e557 100644 --- a/mmm_modules/i18n.py +++ b/mmm_modules/i18n.py @@ -25,7 +25,7 @@ import os import gettext import locale -import gtk, gobject +from gi.repository import Gtk, GObject _ = lambda x: x @@ -111,13 +111,13 @@ def list_available_translations (domain): pass return rv -class LanguageComboBox (gtk.ComboBox): +class LanguageComboBox (Gtk.ComboBox): def __init__ (self, domain): - liststore = gtk.ListStore(gobject.TYPE_STRING) - gtk.ComboBox.__init__(self, liststore) + liststore = Gtk.ListStore(GObject.TYPE_STRING) + Gtk.ComboBox.__init__(self, liststore) - self.cell = gtk.CellRendererText() - self.pack_start(self.cell, True) + self.cell = Gtk.CellRendererText() + self.pack_start(self.cell, True, True, 0) self.add_attribute(self.cell, 'text', 0) self.translations = list_available_translations(domain) diff --git a/mmm_modules/image_category.py b/mmm_modules/image_category.py index 4ea4782..92af2ee 100755 --- a/mmm_modules/image_category.py +++ b/mmm_modules/image_category.py @@ -17,18 +17,15 @@ # If you find this activity useful or end up using parts of it in one of your # own creations we would love to hear from you at info@WorldWideWorkshop.org ! # - -import pygtk -pygtk.require('2.0') -import gtk, gobject +from gi.repository import Gtk, GObject import os from glob import glob import logging import md5 -from sugar import mime -from sugar.graphics.objectchooser import ObjectChooser +from sugar3 import mime +from sugar3.graphics.objectchooser import ObjectChooser from borderframe import BorderFrame from utils import load_image, resize_image, RESIZE_CUT @@ -156,7 +153,7 @@ class CategoryDirectory (object): return load_image(thumbs[0], self.twidth, self.theight) -class ImageSelectorWidget (gtk.Table): +class ImageSelectorWidget (Gtk.Table): __gsignals__ = {'category_press' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, ()), 'image_press' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, ()),} @@ -167,12 +164,12 @@ class ImageSelectorWidget (gtk.Table): prepare_btn_cb=prepare_btn, method=RESIZE_CUT, image_dir=None): - gtk.Table.__init__(self, 2,5,False) + Gtk.Table.__init__(self, 2,5,False) self._signals = [] self.parentp = parentp self.width = width self.height = height - self.image = gtk.Image() + self.image = Gtk.Image() self.method = method #self.set_myownpath(MYOWNPIC_FOLDER) img_box = BorderFrame(border_color=frame_color) @@ -180,30 +177,30 @@ class ImageSelectorWidget (gtk.Table): img_box.set_border_width(5) self._signals.append((img_box, img_box.connect('button_press_event', self.emit_image_pressed))) self.attach(img_box, 0,5,0,1,0,0) - self.attach(gtk.Label(), 0,1,1,2) - self.bl = gtk.Button() + self.attach(Gtk.Label(), 0,1,1,2) + self.bl = Gtk.Button() - il = gtk.Image() + il = Gtk.Image() il.set_from_pixbuf(load_image(os.path.join(iconpath, 'arrow_left.png'))) self.bl.set_image(il) self.bl.connect('clicked', self.previous) self.attach(prepare_btn_cb(self.bl), 1,2,1,2,0,0) - cteb = gtk.EventBox() - self.cat_thumb = gtk.Image() + cteb = Gtk.EventBox() + self.cat_thumb = Gtk.Image() self.cat_thumb.set_size_request(THUMB_SIZE, THUMB_SIZE) cteb.add(self.cat_thumb) self._signals.append((cteb, cteb.connect('button_press_event', self.emit_cat_pressed))) self.attach(cteb, 2,3,1,2,0,0,xpadding=10) - self.br = gtk.Button() - ir = gtk.Image() + self.br = Gtk.Button() + ir = Gtk.Image() ir.set_from_pixbuf(load_image(os.path.join(iconpath,'arrow_right.png'))) self.br.set_image(ir) self.br.connect('clicked', self.next) self.attach(prepare_btn_cb(self.br), 3,4,1,2,0,0) - self.attach(gtk.Label(),4,5,1,2) + self.attach(Gtk.Label(),4,5,1,2) self.filename = None self.show_all() self.image.set_size_request(width, height) @@ -220,17 +217,17 @@ class ImageSelectorWidget (gtk.Table): filter = { } chooser = ObjectChooser(_('Choose image'), self.parentp, #self._parent, - gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, + Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT, **filter) try: result = chooser.run() - if result == gtk.RESPONSE_ACCEPT: + if result == Gtk.ResponseType.ACCEPT: jobject = chooser.get_selected_object() if jobject and jobject.file_path: if self.load_image(str(jobject.file_path), True): pass else: - err = gtk.MessageDialog(self._parent, gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, + err = Gtk.MessageDialog(self._parent, Gtk.DialogFlags.MODAL, Gtk.MESSAGE_ERROR, Gtk.BUTTONS_OK, _("Not a valid image file")) err.run() err.destroy() @@ -395,12 +392,12 @@ class ImageSelectorWidget (gtk.Table): self.set_image_dir(obj.get('image_dir', None)) self.image.set_from_pixbuf(self.category.get_image(obj.get('filename', None))) -class CategorySelector (gtk.ScrolledWindow): +class CategorySelector (Gtk.ScrolledWindow): __gsignals__ = {'selected' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, (str,))} def __init__ (self, title=None, selected_category_path=None, path=None, extra=()): - gtk.ScrolledWindow.__init__ (self) - self.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) + Gtk.ScrolledWindow.__init__ (self) + self.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC) if path is None: path = os.path.join(mmmpath, 'mmm_images') self.path = path @@ -408,12 +405,12 @@ class CategorySelector (gtk.ScrolledWindow): model, selected = self.get_model(path, selected_category_path, extra) self.ignore_first = selected is not None - self.treeview = gtk.TreeView() - col = gtk.TreeViewColumn(title) - r1 = gtk.CellRendererPixbuf() - r2 = gtk.CellRendererText() - col.pack_start(r1, False) - col.pack_start(r2, True) + self.treeview = Gtk.TreeView() + col = Gtk.TreeViewColumn(title) + r1 = Gtk.CellRendererPixbuf() + r2 = Gtk.CellRendererText() + col.pack_start(r1, False, True, 0) + col.pack_start(r2, True, True, 0) col.set_cell_data_func(r1, self.cell_pb) col.set_attributes(r2, text=1) self.treeview.append_column(col) @@ -442,8 +439,8 @@ class CategorySelector (gtk.ScrolledWindow): def get_model (self, path, selected_path, extra): # Each row is (path/dirname, pretty name, 0 based index) selected = None - store = gtk.ListStore(str, str, int) - store.set_sort_column_id(1, gtk.SORT_ASCENDING) + store = Gtk.ListStore(str, str, int) + store.set_sort_column_id(1, Gtk.SortType.ASCENDING) files = [os.path.join(path, x) for x in os.listdir(path) if not x.startswith('.')] files.extend(extra) for fullpath, prettyname in [(x, _(os.path.basename(x))) for x in files if os.path.isdir(x)]: diff --git a/mmm_modules/notebook_reader.py b/mmm_modules/notebook_reader.py index 9d70fd3..b4ecb16 100644 --- a/mmm_modules/notebook_reader.py +++ b/mmm_modules/notebook_reader.py @@ -18,9 +18,7 @@ # own creations we would love to hear from you at info@WorldWideWorkshop.org ! # -import pygtk -pygtk.require('2.0') -import gtk, gobject, pango +from gi.repository import Gtk, GObject, Pango import os from abiword import Canvas @@ -66,13 +64,13 @@ class ReaderProvider (object): for name, path in self.lesson_array: yield (name, path) -class BasicReaderWidget (gtk.HBox): +class BasicReaderWidget (Gtk.HBox): def __init__ (self, path, lang_details=None): super(BasicReaderWidget, self).__init__() self.provider = ReaderProvider(path, lang_details) self._canvas = Canvas() self._canvas.show() - self.pack_start(self._canvas) + self.pack_start(self._canvas, True, True, 0) self._canvas.connect_after('map-event', self._map_event_cb) def get_lessons(self): @@ -95,7 +93,7 @@ class BasicReaderWidget (gtk.HBox): -class NotebookReaderWidget (gtk.Notebook): +class NotebookReaderWidget (Gtk.Notebook): def __init__ (self, path, lang_details=None): super(NotebookReaderWidget, self).__init__() self.provider = ReaderProvider(path, lang_details) @@ -109,7 +107,7 @@ class NotebookReaderWidget (gtk.Notebook): canvas.load_file('file://' + path, '') except: canvas.load_file(path) - self.append_page(canvas, gtk.Label(name)) + self.append_page(canvas, Gtk.Label(name)) def _map_event_cb(self, o, e, path): logger.debug("map-event: %s" % path) diff --git a/mmm_modules/timer.py b/mmm_modules/timer.py index 92390e0..80eaaf4 100644 --- a/mmm_modules/timer.py +++ b/mmm_modules/timer.py @@ -18,9 +18,7 @@ # own creations we would love to hear from you at info@WorldWideWorkshop.org ! # -import pygtk -pygtk.require('2.0') -import gtk, gobject, pango +from gi.repository import Gtk, GObject, Pango import os from time import time @@ -42,26 +40,26 @@ else: from utils import load_image -class TimerWidget (gtk.HBox): +class TimerWidget (Gtk.HBox): __gsignals__ = {'timer_toggle' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, (bool,)),} def __init__ (self, bg_color="#DD4040", fg_color="#4444FF", lbl_color="#DD4040", can_stop=True): - gtk.HBox.__init__(self) - self.counter = gtk.EventBox() - self.counter.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse(bg_color)) + Gtk.HBox.__init__(self) + self.counter = Gtk.EventBox() + self.counter.modify_bg(Gtk.StateType.NORMAL, Gdk.color_parse(bg_color)) self.counter.set_size_request(120, -1) - hb = gtk.HBox() + hb = Gtk.HBox() self.counter.add(hb) - self.lbl_time = gtk.Label() - self.lbl_time.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(lbl_color)) - self.pack_start(self.lbl_time, False) - self.time_label = gtk.Label("--:--") - self.time_label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(fg_color)) + self.lbl_time = Gtk.Label() + self.lbl_time.modify_fg(Gtk.StateType.NORMAL, Gdk.color_parse(lbl_color)) + self.pack_start(self.lbl_time, False, True, 0) + self.time_label = Gtk.Label("--:--") + self.time_label.modify_fg(Gtk.StateType.NORMAL, Gdk.color_parse(fg_color)) hb.pack_start(self.time_label, False, False, 5) self.prepare_icons() - self.icon = gtk.Image() + self.icon = Gtk.Image() self.icon.set_from_pixbuf(self.icons[1]) hb.pack_end(self.icon, False, False, 5) - self.pack_start(self.counter, False) + self.pack_start(self.counter, False, True, 0) self.connect("button-press-event", self.process_click) self.start_time = 0 self.timer_id = None diff --git a/mmm_modules/tube_helper.py b/mmm_modules/tube_helper.py index 8436cfc..ea45f5c 100644 --- a/mmm_modules/tube_helper.py +++ b/mmm_modules/tube_helper.py @@ -20,8 +20,8 @@ import telepathy #import telepathy.client -from sugar.presence.tubeconn import TubeConnection -from sugar.presence import presenceservice +from sugar3.presence.tubeconn import TubeConnection +from sugar3.presence import presenceservice #import dbus import logging logger = logging.getLogger('tube_helper') diff --git a/mmm_modules/utils.py b/mmm_modules/utils.py index 1db4fca..3eeade0 100644 --- a/mmm_modules/utils.py +++ b/mmm_modules/utils.py @@ -18,9 +18,7 @@ # own creations we would love to hear from you at info@WorldWideWorkshop.org ! # -import pygtk -pygtk.require('2.0') -import gtk +from gi.repository import Gtk, GdkPixbuf import logging RESIZE_STRETCH = 1 @@ -92,7 +90,7 @@ def load_image (filename, width=-1, height=-1, method=RESIZE_CUT): # slider.prepare_stringed(2,2) # return slider # - img = gtk.Image() + img = Gtk.Image() try: img.set_from_file(filename) pb = img.get_pixbuf() @@ -106,7 +104,7 @@ def resize_image (pb, width=-1, height=-1, method=RESIZE_CUT): logging.debug("utils: method=%i" % method) if method == RESIZE_STRETCH or width == -1 or height == -1: w,h = calculate_relative_size(pb.get_width(), pb.get_height(), width, height) - scaled_pb = pb.scale_simple(w,h, gtk.gdk.INTERP_BILINEAR) + scaled_pb = pb.scale_simple(w,h, GdkPixbuf.InterpType.BILINEAR) elif method == RESIZE_PAD: w,h = pb.get_width(), pb.get_height() hr = float(height)/h @@ -115,7 +113,7 @@ def resize_image (pb, width=-1, height=-1, method=RESIZE_CUT): w = w * factor h = h * factor logging.debug("RESIZE_PAD: %i,%i,%f" % (w,h,factor)) - scaled_pb = pb.scale_simple(int(w), int(h), gtk.gdk.INTERP_BILINEAR) + scaled_pb = pb.scale_simple(int(w), int(h), GdkPixbuf.InterpType.BILINEAR) else: # RESIZE_CUT / default w,h = pb.get_width(), pb.get_height() if width > w: @@ -151,7 +149,7 @@ def resize_image (pb, width=-1, height=-1, method=RESIZE_CUT): # w, h now have -1 for the side that should be relatively scaled, to keep the aspect ratio and # assuring that the image is at least as big as the request. w,h = calculate_relative_size(pb.get_width(), pb.get_height(), w,h) - scaled_pb = pb.scale_simple(w,h, gtk.gdk.INTERP_BILINEAR) + scaled_pb = pb.scale_simple(w,h, GdkPixbuf.InterpType.BILINEAR) # now we cut whatever is left to make the requested size scaled_pb = scaled_pb.subpixbuf(abs((width-w)/2),abs((height-h)/2), width, height) return scaled_pb |