Fixes. [Almost Done]

11 files changed, 48 insertions, 46 deletions

diff --git a/SliderPuzzleActivity.py b/SliderPuzzleActivity.py
index b38c1e9..eb21daf 100644
--- a/SliderPuzzleActivity.py
+++ b/SliderPuzzleActivity.py
@@ -313,7 +313,7 @@ class SliderPuzzleActivity(Activity, TubeHelper):
         toolbox = ActivityToolbar(self)
         self.set_toolbar_box(toolbox)
         toolbox.show()
-        title_widget = toolbox._activity_toolbar.title
+        title_widget = toolbox.title
         title_widget.set_size_request(title_widget.get_layout().get_pixel_size()[0] + 20, -1)
 		
         self.ui = SliderPuzzleUI(self)
diff --git a/SliderPuzzleUI.py b/SliderPuzzleUI.py
index ab48577..33e6a8f 100755
--- a/SliderPuzzleUI.py
+++ b/SliderPuzzleUI.py
@@ -17,7 +17,7 @@
 # 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 !
 #
-from gi.repository import Gtk, GObject, Pango
+from gi.repository import Gtk, GObject, Pango, Gdk
 
 from mamamedia_modules import utils
 from mamamedia_modules import NotebookReaderWidget
@@ -77,11 +77,11 @@ COLOR_FG_BUTTONS = (
     (Gtk.StateType.INSENSITIVE,"#CCFF99"),
     )
 COLOR_BG_BUTTONS = (
-    (Gtk.StateTypeNORMAL,"#027F01"),
-    (Gtk.StateTypeACTIVE,"#014D01"),
-    (Gtk.StateTypePRELIGHT,"#016D01"),
-    (Gtk.StateTypeSELECTED,"#027F01"),
-    (Gtk.StateTypeINSENSITIVE,"#CCCCCC"),
+    (Gtk.StateType.NORMAL,"#027F01"),
+    (Gtk.StateType.ACTIVE,"#014D01"),
+    (Gtk.StateType.PRELIGHT,"#016D01"),
+    (Gtk.StateType.SELECTED,"#027F01"),
+    (Gtk.StateType.INSENSITIVE,"#CCCCCC"),
     )
 
 def prepare_btn(btn, w=-1, h=-1):
@@ -252,6 +252,7 @@ class SliderPuzzleUI (Gtk.Table):
                                  lbl_color=COLOR_BG_BUTTONS[1][1])
         self.timer.set_sensitive(False)
         self.timer.set_border_width(3)
+
         self.labels_to_translate.append((self.timer, _("Time: ")))
         timer_hbox.pack_start(self.timer, False, True, 8)
         self.timer.connect('timer_toggle', self.timer_toggle_cb)
@@ -264,7 +265,7 @@ class SliderPuzzleUI (Gtk.Table):
         self.notebook.show()
         self.notebook.props.show_border = False
         self.notebook.props.show_tabs = False
-        self.notebook.append_page(self.game_box)
+        self.notebook.append_page(self.game_box, None)
         inner_table.attach(self.notebook, 1,2,0,1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
         self.btn_lesson = prepare_btn(Gtk.Button(" "))
@@ -282,7 +283,7 @@ class SliderPuzzleUI (Gtk.Table):
         self.buddy_panel = BuddyPanel()
         self.buddy_panel.show()
 
-        if not parent._shared_activity:
+        if not parent.shared_activity:
             self.do_select_category(self)
         else:
             self.set_message(_("Waiting for remote game..."))
@@ -560,7 +561,7 @@ class SliderPuzzleUI (Gtk.Table):
                             self.selected_lang_details)
                     lessons.connect('parent-set', self.do_lesson_plan_reparent)
                     lessons.show_all()
-                    self.notebook.append_page(lessons)
+                    self.notebook.append_page(lessons, None)
             else:
                 self.timer.props.sensitive = True
             self.notebook.set_current_page(int(not page))
@@ -640,7 +641,7 @@ class SliderPuzzleUI (Gtk.Table):
     @utils.trace
     def _send_status_update (self):
         """ Send a status update signal """
-        if self._parent._shared_activity:
+        if self._parent.shared_activity:
             if self.get_game_state() == GAME_STARTED:
                 if self.thumb.has_image():
                     self.set_message(_("Game Started!"))
diff --git a/SliderPuzzleWidget.py b/SliderPuzzleWidget.py
index 6a92739..d455eff 100644
--- a/SliderPuzzleWidget.py
+++ b/SliderPuzzleWidget.py
@@ -18,7 +18,7 @@
 # own creations we would love to hear from you at info@WorldWideWorkshop.org !
 #
 
-from gi.respository import Gtk, GObject, Pango, GdkPixbuf
+from gi.repository import Gtk, GObject, Pango, GdkPixbuf, Gdk
 import md5
 import logging
 
@@ -54,7 +54,7 @@ def calculate_matrix (pieces):
     return rows*cols, rows, cols
 
 
-class SliderCreator (GdkPixbuf):
+class SliderCreator (GdkPixbuf.Pixbuf):
     def __init__ (self, width, height, fname=None, tlist=None): #tlist):
         if width == -1:
             width = 564
@@ -438,7 +438,7 @@ class SliderPuzzleWidget (Gtk.Table):
             for y in range(self.jumbler.rowsize):
                 for x in range(self.jumbler.colsize):
                     img = Gtk.Image()
-                    img.set_from_pixbuf(self.image.subpixbuf(x*w, y*h, w-1, h-1))
+                    img.set_from_pixbuf(self.image.new_subpixbuf(x*w, y*h, w-1, h-1))
                     img.show()
                     self.pieces.append(Gtk.EventBox())
                     self.pieces[-1].add(img)
@@ -450,7 +450,7 @@ class SliderPuzzleWidget (Gtk.Table):
     @utils.trace
     def full_refresh (self):
         # Delete everything
-        self.foreach(self.remove)
+        self.foreach(self.remove, None)
         self.prepare_pieces()
         # Add the pieces in their respective places
         for y in range(self.jumbler.rowsize):
@@ -548,7 +548,7 @@ class SliderPuzzleWidget (Gtk.Table):
     def show_image (self):
         """ Shows the full image, used as visual clue for solved puzzle """
         # Delete everything
-        self.foreach(self.remove)
+        self.foreach(self.remove, None)
         if hasattr(self, 'pieces'):
             del self.pieces
         # Resize to a single cell and use that for the image
@@ -565,7 +565,7 @@ class SliderPuzzleWidget (Gtk.Table):
         if cb is None:
             rv = StringIO()
             cb = rv.write
-        self.image.save_to_callback(cb, "png")
+        self.image.save_to_callbackv(cb, None, "png", [], [])
         if rv is not None:
             return rv.getvalue()
         else:
diff --git a/mmm_modules/borderframe.py b/mmm_modules/borderframe.py
index b97920f..f693abc 100644
--- a/mmm_modules/borderframe.py
+++ b/mmm_modules/borderframe.py
@@ -18,7 +18,7 @@
 # own creations we would love to hear from you at info@WorldWideWorkshop.org !
 #
 
-from gi.repository import Gtk, GObject
+from gi.repository import Gtk, GObject, Gdk
 
 BORDER_LEFT = 1
 BORDER_RIGHT = 2
@@ -39,7 +39,8 @@ class BorderFrame (Gtk.EventBox):
         self.inner = Gtk.EventBox()
         if bg_color is not None:
             self.modify_bg(Gtk.StateType.NORMAL, Gdk.color_parse(bg_color))
-        align = Gtk.Alignment(1.0,1.0,1.0,1.0)
+        align = Gtk.Alignment()
+        align.set(1.0,1.0,1.0,1.0)
         self.padding = [0,0,0,0]
         if (border & BORDER_TOP) != 0:
             self.padding[0] = size
@@ -65,21 +66,21 @@ class BorderFrame (Gtk.EventBox):
     def add (self, widget):
         self.stack.append(widget)
         self.inner.add(widget)
-        self.inner.child.show_now()
+        self.inner.get_child().show_now()
 
     def push (self, widget):
-        widget.set_size_request(*self.inner.child.get_size_request())
-        self.inner.remove(self.inner.child)
+        widget.set_size_request(*self.inner.get_child().get_size_request())
+        self.inner.remove(self.inner.get_child())
         self.add(widget)
 
     def pop (self):
         if len(self.stack) > 1:
-            self.inner.remove(self.inner.child)
+            self.inner.remove(self.inner.get_child())
             del self.stack[-1]
             self.inner.add(self.stack[-1])
 
     def get_child (self):
-        return self.inner.child
+        return self.inner.get_child()
 
     def set_size_request (self, w, h):
         self.inner.set_size_request(w,h)
diff --git a/mmm_modules/buddy_panel.py b/mmm_modules/buddy_panel.py
index 3255382..3ee07f9 100644
--- a/mmm_modules/buddy_panel.py
+++ b/mmm_modules/buddy_panel.py
@@ -46,27 +46,27 @@ class BuddyPanel (Gtk.ScrolledWindow):
 
         col = Gtk.TreeViewColumn(_("Buddy"))
         r = Gtk.CellRendererText()
-        col.pack_start(r, True, True, 0)
+        col.pack_start(r, True)
         col.set_attributes(r, text=0)
         self.treeview.append_column(col)
 
         col = Gtk.TreeViewColumn(_("Status"))
         r = Gtk.CellRendererText()
-        col.pack_start(r, True, True, 0)
+        col.pack_start(r, True)
         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, True, 0)
+        col.pack_start(r, True)
         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, True, 0)
+        col.pack_start(r, True)
         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 dc0e557..a01d613 100644
--- a/mmm_modules/i18n.py
+++ b/mmm_modules/i18n.py
@@ -114,10 +114,11 @@ def list_available_translations (domain):
 class LanguageComboBox (Gtk.ComboBox):
     def __init__ (self, domain):
         liststore = Gtk.ListStore(GObject.TYPE_STRING)
-        Gtk.ComboBox.__init__(self, liststore)
+        Gtk.ComboBox.__init__(self)
 
+        self.set_model(liststore)
         self.cell = Gtk.CellRendererText()
-        self.pack_start(self.cell, True, True, 0)
+        self.pack_start(self.cell, True)
         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 30cc866..cf27bee 100755
--- a/mmm_modules/image_category.py
+++ b/mmm_modules/image_category.py
@@ -401,7 +401,7 @@ class CategorySelector (Gtk.ScrolledWindow):
         if path is None:
             path = os.path.join(mmmpath, 'mmm_images')
         self.path = path
-        self.thumbs = []
+        self.thumbs = {}
         model, selected = self.get_model(path, selected_category_path, extra)
         self.ignore_first = selected is not None
         
@@ -409,8 +409,8 @@ class CategorySelector (Gtk.ScrolledWindow):
         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.pack_start(r1, False)
+        col.pack_start(r2, True)
         col.set_cell_data_func(r1, self.cell_pb)
         col.set_attributes(r2, text=1)
         self.treeview.append_column(col)
@@ -425,9 +425,9 @@ class CategorySelector (Gtk.ScrolledWindow):
     def grab_focus (self):
         self.treeview.grab_focus()
 
-    def cell_pb (self, tvcolumn, cell, model, it):
+    def cell_pb (self, tvcolumn, cell, model, it, w):
         # Renders a pixbuf stored in the thumbs cache
-        cell.set_property('pixbuf', self.thumbs[model.get_value(it, 2)])
+        cell.set_property('pixbuf', self.thumbs[it.stamp])
 
     def get_pb (self, path):
         thumbs = glob(os.path.join(path, "thumb.*"))
@@ -446,8 +446,8 @@ class CategorySelector (Gtk.ScrolledWindow):
         for fullpath, prettyname in [(x, _(os.path.basename(x))) for x in files if os.path.isdir(x)]:
             count = CategoryDirectory(fullpath).count_images()
             logging.debug("%s %s %s" % (fullpath, prettyname, count))
-            store.append([fullpath, prettyname + (" (%i)" % count), len(self.thumbs)])
-            self.thumbs.append(self.get_pb(fullpath))
+            tree_iter = store.append([fullpath, prettyname + (" (%i)" % count), len(self.thumbs)])
+            self.thumbs[tree_iter.stamp] = self.get_pb(fullpath)
         #if os.path.isdir(MYOWNPIC_FOLDER):
         #    count = CategoryDirectory(MYOWNPIC_FOLDER).count_images()
         #    store.append([MYOWNPIC_FOLDER, _("My Pictures") + (" (%i)" % count), len(self.thumbs)])
diff --git a/mmm_modules/notebook_reader.py b/mmm_modules/notebook_reader.py
index b4ecb16..2d502ee 100644
--- a/mmm_modules/notebook_reader.py
+++ b/mmm_modules/notebook_reader.py
@@ -21,7 +21,6 @@
 from gi.repository import Gtk, GObject, Pango
 
 import os
-from abiword import Canvas
 
 from gettext import gettext as _
 import locale
@@ -65,10 +64,10 @@ class ReaderProvider (object):
             yield (name, path)
 
 class BasicReaderWidget (Gtk.HBox):
-    def __init__ (self, path, lang_details=None):
+    def __init__ (self, pc, path, lang_details=None):
         super(BasicReaderWidget, self).__init__()
         self.provider = ReaderProvider(path, lang_details)
-        self._canvas = Canvas()
+        self._canvas = pc.abiword_canvas
         self._canvas.show()
         self.pack_start(self._canvas, True, True, 0)
         self._canvas.connect_after('map-event', self._map_event_cb)
@@ -94,12 +93,12 @@ class BasicReaderWidget (Gtk.HBox):
 
 
 class NotebookReaderWidget (Gtk.Notebook):
-    def __init__ (self, path, lang_details=None):
+    def __init__ (self, pc, path, lang_details=None):
         super(NotebookReaderWidget, self).__init__()
         self.provider = ReaderProvider(path, lang_details)
         self.set_scrollable(True)
         for name, path in self.provider.get_lessons():
-            canvas = Canvas()
+            canvas = pc.abiword_canvas
             canvas.connect_after('map-event', self._map_event_cb, path)
             canvas.show()
             canvas._mapped = False
diff --git a/mmm_modules/timer.py b/mmm_modules/timer.py
index 0a4c104..5f40a80 100644
--- a/mmm_modules/timer.py
+++ b/mmm_modules/timer.py
@@ -18,7 +18,7 @@
 # own creations we would love to hear from you at info@WorldWideWorkshop.org !
 #
 
-from gi.repository import Gtk, GObject, Pango
+from gi.repository import Gtk, GObject, Pango, Gdk
 
 import os
 from time import time
diff --git a/mmm_modules/tube_helper.py b/mmm_modules/tube_helper.py
index ea45f5c..608aaeb 100644
--- a/mmm_modules/tube_helper.py
+++ b/mmm_modules/tube_helper.py
@@ -42,8 +42,7 @@ class TubeHelper (object):
 
         #bus = dbus.Bus()
 
-
-        name, path = self.pservice.get_preferred_connection()
+        name, path = self.pservice.get_preferred_connection() or (None, None)
         self.tp_conn_name = name
         self.tp_conn_path = path
         #self.conn = telepathy.client.Connection(name, path)
diff --git a/mmm_modules/utils.py b/mmm_modules/utils.py
index 3eeade0..4ddfa2a 100644
--- a/mmm_modules/utils.py
+++ b/mmm_modules/utils.py
@@ -151,7 +151,8 @@ def resize_image (pb, width=-1, height=-1, method=RESIZE_CUT):
         w,h = calculate_relative_size(pb.get_width(), pb.get_height(), w,h)
         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)
+        scaled_pb = scaled_pb.new_subpixbuf(abs((width - w) / 2), 
+                                            abs((height - h) / 2), width, height)
     return scaled_pb
 
 ### Helper decorators