Port to Gtk3: Initial run of py-giconvert.sh and sugar-convert.sh

1 files changed, 45 insertions, 45 deletions

diff --git a/resources.py b/resources.py
index 878f0f1..28cfddf 100644
--- a/resources.py
+++ b/resources.py
@@ -1,6 +1,6 @@
-import gtk
-import gobject
-import webkit
+from gi.repository import Gtk
+from gi.repository import GObject
+from gi.repository import WebKit
 import logging
 import os
 import shutil
@@ -9,12 +9,12 @@ from gettext import gettext as _
 
 from gobject import SIGNAL_RUN_FIRST
 
-from sugar.activity import activity
-from sugar.graphics.icon import Icon
-from sugar.graphics.objectchooser import ObjectChooser
+from sugar3.activity import activity
+from sugar3.graphics.icon import Icon
+from sugar3.graphics.objectchooser import ObjectChooser
 
 
-class CollectResourcesWin(gtk.HBox):
+class CollectResourcesWin(Gtk.HBox):
 
     __gsignals__ = {
         'resource_updated': (SIGNAL_RUN_FIRST, None, [])
@@ -22,7 +22,7 @@ class CollectResourcesWin(gtk.HBox):
 
     def __init__(self, activity):
         self._activity = activity
-        gtk.HBox.__init__(self)
+        GObject.GObject.__init__(self)
         self.model = activity.model
         """
         +---------+------------------------------+
@@ -39,82 +39,82 @@ class CollectResourcesWin(gtk.HBox):
         +---------+------------------------------+
         """
         # Listview
-        self.resource_listview = gtk.TreeView()
-        width = int(gtk.gdk.screen_width() / 3)
+        self.resource_listview = Gtk.TreeView()
+        width = int(Gdk.Screen.width() / 3)
         self.resource_listview.set_size_request(width, -1)
 
         self.resource_listview.connect('cursor-changed', self.select_resource)
 
         # title and id_resource
-        self.treemodel = gtk.ListStore(gobject.TYPE_STRING,
-                gobject.TYPE_STRING)
+        self.treemodel = Gtk.ListStore(GObject.TYPE_STRING,
+                GObject.TYPE_STRING)
         self.resource_listview.set_model(self.treemodel)
-        renderer = gtk.CellRendererText()
-        renderer.set_property('wrap-mode', gtk.WRAP_WORD)
-        self.treecol = gtk.TreeViewColumn(_('Resources'), renderer, text=0)
+        renderer = Gtk.CellRendererText()
+        renderer.set_property('wrap-mode', Gtk.WrapMode.WORD)
+        self.treecol = Gtk.TreeViewColumn(_('Resources'), renderer, text=0)
         self.resource_listview.append_column(self.treecol)
-        self.tree_scroller = gtk.ScrolledWindow(hadjustment=None,
+        self.tree_scroller = Gtk.ScrolledWindow(hadjustment=None,
                 vadjustment=None)
-        self.tree_scroller.set_policy(gtk.POLICY_NEVER,
-                gtk.POLICY_AUTOMATIC)
+        self.tree_scroller.set_policy(Gtk.PolicyType.NEVER,
+                Gtk.PolicyType.AUTOMATIC)
         self.tree_scroller.add(self.resource_listview)
         self.pack_start(self.tree_scroller, False)
 
-        vbox = gtk.VBox()
+        vbox = Gtk.VBox()
         self.pack_start(vbox, True)
 
-        hbox_title = gtk.HBox()
-        hbox_title.pack_start(gtk.Label(_('Title')), False, padding=5)
-        self.title_entry = gtk.Entry()
+        hbox_title = Gtk.HBox()
+        hbox_title.pack_start(Gtk.Label(_('Title', True, True, 0)), False, padding=5)
+        self.title_entry = Gtk.Entry()
         self.title_entry.connect('changed', self.__information_changed_cb)
         hbox_title.pack_start(self.title_entry, True, padding=5)
         vbox.pack_start(hbox_title, False, padding=5)
 
-        hbox_image = gtk.HBox()
-        scrollwin = gtk.ScrolledWindow()
-        scrollwin.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
-        self.image = gtk.Image()
+        hbox_image = Gtk.HBox()
+        scrollwin = Gtk.ScrolledWindow()
+        scrollwin.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
+        self.image = Gtk.Image()
         scrollwin.add_with_viewport(self.image)
         hbox_image.pack_start(scrollwin, True, padding=5)
-        vbox_image = gtk.VBox()
-        self.load_image_button = gtk.Button(_('Load Image'))
+        vbox_image = Gtk.VBox()
+        self.load_image_button = Gtk.Button(_('Load Image'))
         self.load_image_button.connect('clicked', self.__load_image_cb)
         vbox_image.pack_start(self.load_image_button, False, padding=5)
 
-        size_label = gtk.Label(_('Image size:'))
+        size_label = Gtk.Label(label=_('Image size:'))
         vbox_image.pack_start(size_label, False, padding=5)
-        self.size_label_value = gtk.Label('')
+        self.size_label_value = Gtk.Label(label='')
         vbox_image.pack_start(self.size_label_value, False, padding=5)
         hbox_image.pack_start(vbox_image, False, padding=5)
         vbox.pack_start(hbox_image, True, padding=5)
 
         # show as icon
-        self.show_as_icon_check = gtk.CheckButton()
+        self.show_as_icon_check = Gtk.CheckButton()
         self._set_show_as_icon_label()
         self.show_as_icon_check.connect('toggled', self.__show_as_toggled_cb)
         vbox_image.pack_start(self.show_as_icon_check, False, padding=5)
 
-        self._icons_store = gtk.ListStore(str, gtk.gdk.Pixbuf, str)
-        self._icons_store.set_sort_column_id(0, gtk.SORT_ASCENDING)
-        self._iconview = gtk.IconView(self._icons_store)
+        self._icons_store = Gtk.ListStore(str, GdkPixbuf.Pixbuf, str)
+        self._icons_store.set_sort_column_id(0, Gtk.SortType.ASCENDING)
+        self._iconview = Gtk.IconView(self._icons_store)
         self._iconview.set_text_column(0)
         self._iconview.set_pixbuf_column(1)
         self._iconview.set_sensitive(False)
-        self._iconview.set_selection_mode(gtk.SELECTION_SINGLE)
+        self._iconview.set_selection_mode(Gtk.SelectionMode.SINGLE)
         self.load_icons()
         self._iconview.connect('item-activated', self.__iconview_activated_cb)
-        scrolled = gtk.ScrolledWindow()
-        scrolled.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
+        scrolled = Gtk.ScrolledWindow()
+        scrolled.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
         scrolled.add_with_viewport(self._iconview)
 
         vbox_image.pack_start(scrolled, True, padding=5)
 
-        #hbox_editor = gtk.HBox()
+        #hbox_editor = Gtk.HBox()
         self.editor = webkit.WebView()
         self.title_entry.connect('changed',
                 self.__information_changed_cb)
         self.editor.set_editable(True)
-        height = int(gtk.gdk.screen_height() / 3)
+        height = int(Gdk.Screen.height() / 3)
         self.editor.set_size_request(-1, height)
         #hbox_editor.pack_start(self.editor, False, padding=5)
         vbox.pack_start(self.editor, False, padding=5)
@@ -155,22 +155,22 @@ class CollectResourcesWin(gtk.HBox):
             if not file_name.endswith('.txt'):
                 image_file_name = os.path.join(images_path, file_name)
                 logging.error('Adding %s', image_file_name)
-                pxb = gtk.gdk.pixbuf_new_from_file_at_size(image_file_name,
+                pxb = GdkPixbuf.Pixbuf.new_from_file_at_size(image_file_name,
                         100, 100)
                 self._icons_store.append(['', pxb, image_file_name])
 
     def __load_image_cb(self, button):
         try:
             chooser = ObjectChooser(_('Choose image'),
-                self._activity, gtk.DIALOG_MODAL |
-                gtk.DIALOG_DESTROY_WITH_PARENT, what_filter='Image')
+                self._activity, Gtk.DialogFlags.MODAL |
+                Gtk.DialogFlags.DESTROY_WITH_PARENT, what_filter='Image')
         except:
             chooser = ObjectChooser(_('Choose image'),
-                self._activity, gtk.DIALOG_MODAL |
-                gtk.DIALOG_DESTROY_WITH_PARENT)
+                self._activity, Gtk.DialogFlags.MODAL |
+                Gtk.DialogFlags.DESTROY_WITH_PARENT)
         try:
             result = chooser.run()
-            if result == gtk.RESPONSE_ACCEPT:
+            if result == Gtk.ResponseType.ACCEPT:
                 logging.debug('ObjectChooser: %r',
                         chooser.get_selected_object())
                 jobject = chooser.get_selected_object()