Port to Gtk3

Author: Saumya-Mishra9129

arithmetic.py

@@ -14,8 +14,10 @@
 cgitb.handler = sys.excepthook
 
 import logging
-import gtk
-import pango
+import gi
+gi.require_version('Gtk','3.0')
+from gi.repository import Gtk
+from gi.repository import Pango
 import random
 import gobject
 import math
@@ -28,18 +30,12 @@
 import dobject.groupthink.sugar_tools as sugar_tools
 
 from gettext import gettext as _
-from sugar.activity import activity
-from sugar import profile
-
-try:
-    # 0.86+ toolbar widgets
-    from sugar.activity.widgets import ActivityToolbarButton, StopButton
-    from sugar.graphics.toolbarbox import ToolbarBox, ToolbarButton
-    _USE_OLD_TOOLBARS = False
-except ImportError:
-    # Pre-0.86 toolbar widgets
-    from sugar.activity.activity import ActivityToolbox
-    _USE_OLD_TOOLBARS = True
+from sugar3.activity import activity
+from sugar3 import profile
+
+from sugar3.activity.widgets import ActivityToolbarButton, StopButton
+from sugar3.graphics.toolbarbox import ToolbarBox, ToolbarButton
+
 
 def score_codec(score_or_opaque, pack_or_unpack):
     v = score_or_opaque
@@ -93,37 +89,33 @@ def __init__(self, handle):
         self._configure_toolbars()
 
     def _configure_toolbars(self):
-        if _USE_OLD_TOOLBARS:
-            toolbox = ActivityToolbox(self)
-            toolbar = gtk.Toolbar()
-        else:
-            toolbar_box = ToolbarBox()
-            toolbar = toolbar_box.toolbar
 
-            activity_button = ActivityToolbarButton(self)
-            toolbar_box.toolbar.insert(activity_button, 0)
-            activity_button.show()
 
-            self._add_expander(toolbar_box.toolbar)
+        toolbar_box = ToolbarBox()
+        toolbar = toolbar_box.toolbar
 
-            toolbar.add(gtk.SeparatorToolItem())
+        activity_button = ActivityToolbarButton(self)
+        toolbar_box.toolbar.insert(activity_button, 0)
+        activity_button.show()
 
-        if _USE_OLD_TOOLBARS:
-            self.set_toolbox(toolbox)
-            toolbox.show()
-        else:
-            stop_button = StopButton(self)
-            stop_button.props.accelerator = '<Ctrl><Shift>Q'
-            toolbar_box.toolbar.insert(stop_button, -1)
-            stop_button.show()
+        self._add_expander(toolbar_box.toolbar)
+
+        toolbar.add(Gtk.SeparatorToolItem())
+
+
+
+        stop_button = StopButton(self)
+        stop_button.props.accelerator = '<Ctrl><Shift>Q'
+        toolbar_box.toolbar.insert(stop_button, -1)
+        stop_button.show()
 
-            self.set_toolbar_box(toolbar_box)
-            toolbar_box.show()
+        self.set_toolbar_box(toolbar_box)
+        toolbar_box.show()
 
     def _add_expander(self, toolbar):
         """Insert a toolbar item which will expand to fill the available
         space."""
-        separator = gtk.SeparatorToolItem()
+        separator = Gtk.SeparatorToolItem()
         separator.props.draw = False
         separator.set_expand(True)
         toolbar.insert(separator, -1)
@@ -157,23 +149,23 @@ def initialize_display(self):
         self._active_mode_hashes = set()
 
         # Main layout
-        vbox = gtk.VBox()
+        vbox = Gtk.VBox()
 
         # Set a startpoint for a shared seed
         self.cloud.startpoint = groupthink.HighScore(self.timer.time(), 0)
 
         # Scoreboard
-        scorebox = gtk.VBox()
-        self.model = gtk.TreeStore(gobject.TYPE_STRING, # name
+        scorebox = Gtk.VBox()
+        self.model = Gtk.TreeStore(gobject.TYPE_STRING, # name
                                    gobject.TYPE_INT,    # last round score
                                    gobject.TYPE_INT,    # total score
                                    gobject.TYPE_FLOAT)  # time for last question
-        self.treeview = treeview = gtk.TreeView(self.model)
-        cellrenderer = gtk.CellRendererText()
-        col1 = gtk.TreeViewColumn(_("Name"), cellrenderer, text=0)
-        col2 = gtk.TreeViewColumn(_("Round score"), cellrenderer, text=1)
-        col3 = gtk.TreeViewColumn(_("Total score"), cellrenderer, text=2)
-        col4 = gtk.TreeViewColumn(_("Time for answering last question"), cellrenderer, text=3)
+        self.treeview = treeview = Gtk.TreeView(self.model)
+        cellrenderer = Gtk.CellRendererText()
+        col1 = Gtk.TreeViewColumn(_("Name"), cellrenderer, text=0)
+        col2 = Gtk.TreeViewColumn(_("Round score"), cellrenderer, text=1)
+        col3 = Gtk.TreeViewColumn(_("Total score"), cellrenderer, text=2)
+        col4 = Gtk.TreeViewColumn(_("Time for answering last question"), cellrenderer, text=3)
         treeview.append_column(col1)
         treeview.append_column(col2)
         treeview.append_column(col3)
@@ -190,30 +182,30 @@ def initialize_display(self):
         scorebox.pack_start(treeview)
 
         # Horizontal fields
-        difficultybox = gtk.HBox()
-        periodbox     = gtk.HBox()
-        toprowbox     = gtk.HBox()
-        modebox       = gtk.HBox()
-        self.inner_modebox = gtk.HBox()
-        questionbox   = gtk.HBox()
-        answerbox     = gtk.HBox()
-        decisionbox   = gtk.HBox()
-        lastroundbox  = gtk.HBox()
-        bottomrowbox  = gtk.HBox()
-        countdownbox  = gtk.HBox()
+        difficultybox = Gtk.HBox()
+        periodbox     = Gtk.HBox()
+        toprowbox     = Gtk.HBox()
+        modebox       = Gtk.HBox()
+        self.inner_modebox = Gtk.HBox()
+        questionbox   = Gtk.HBox()
+        answerbox     = Gtk.HBox()
+        decisionbox   = Gtk.HBox()
+        lastroundbox  = Gtk.HBox()
+        bottomrowbox  = Gtk.HBox()
+        countdownbox  = Gtk.HBox()
 
         # Labels
-        difficultylabel = gtk.Label(_("Difficulty: "))
-        periodlabel     = gtk.Label(_("Period: "))
-        periodunitslabel= gtk.Label(" sec  ")
-        modelabel       = gtk.Label(_("Puzzles: "))
-        questionlabel   = gtk.Label(_("Question: "))
-        answerlabel     = gtk.Label(_("Answer: "))
-        decisionlabel   = gtk.Label(_("You were: "))
-        lastroundlabel  = gtk.Label(_("Last round: "))
-        self.lastanswerlabel = gtk.Label("")
-        staticcountdownlabel = gtk.Label(_("Time until next question: "))
-        self.countdownlabel  = gtk.Label("")
+        difficultylabel = Gtk.Label(_("Difficulty: "))
+        periodlabel     = Gtk.Label(_("Period: "))
+        periodunitslabel= Gtk.Label(" sec  ")
+        modelabel       = Gtk.Label(_("Puzzles: "))
+        questionlabel   = Gtk.Label(_("Question: "))
+        answerlabel     = Gtk.Label(_("Answer: "))
+        decisionlabel   = Gtk.Label(_("You were: "))
+        lastroundlabel  = Gtk.Label(_("Last round: "))
+        self.lastanswerlabel = Gtk.Label("")
+        staticcountdownlabel = Gtk.Label(_("Time until next question: "))
+        self.countdownlabel  = Gtk.Label("")
 
         # ToggleButtons for difficulty
         self.cloud.easytoggle      = groupthink.gtk_tools.SharedToggleButton("< 10")
@@ -229,7 +221,7 @@ def initialize_display(self):
 
         # Entry for puzzle period
         self.cloud.periodentry = groupthink.gtk_tools.RecentEntry(max=2)
-        self.cloud.periodentry.modify_font(pango.FontDescription("Mono 14"))
+        self.cloud.periodentry.modify_font(Pango.FontDescription("Mono 14"))
         self.cloud.periodentry.set_text(str(self.period))
         self.cloud.periodentry.set_width_chars(2)
         self.cloud.periodentry.connect("changed", self._period_cb)
@@ -239,18 +231,18 @@ def initialize_display(self):
         self.cloud.puzzles.register_listener(self.new_puzzles_cb)
 
         # Text entry box for question
-        self.questionentry = gtk.TextView()
-        self.questionentry.modify_font(pango.FontDescription("Mono 14"))
+        self.questionentry = Gtk.TextView()
+        self.questionentry.modify_font(Pango.FontDescription("Mono 14"))
         self.questionentry.set_property("editable", False)
 
         # Text entry box for answer
-        self.answerentry = gtk.Entry(max=50)
-        self.answerentry.modify_font(pango.FontDescription("Sans 14"))
+        self.answerentry = Gtk.Entry(max=50)
+        self.answerentry.modify_font(Pango.FontDescription("Sans 14"))
         self.answerentry.connect("activate", self.answer_cb)
 
         # Whether the user was correct
-        self.decisionentry = gtk.Entry(max=50)
-        self.decisionentry.modify_font(pango.FontDescription("Sans 14"))
+        self.decisionentry = Gtk.Entry(max=50)
+        self.decisionentry.modify_font(Pango.FontDescription("Sans 14"))
         self.decisionentry.set_property("editable", False)
 
         # Packing
@@ -423,7 +415,7 @@ def onesecond_cb(self):
             self.start_question()
             self.answerentry.set_text("")
 
-        self.model = gtk.TreeStore(gobject.TYPE_STRING, # name
+        self.model = Gtk.TreeStore(gobject.TYPE_STRING, # name
                                    gobject.TYPE_INT,    # last round score
                                    gobject.TYPE_INT,    # total score
                                    gobject.TYPE_FLOAT)  # time for last question

setup.py

@@ -16,7 +16,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-from sugar.activity import bundlebuilder
+from sugar3.activity import bundlebuilder
 
 bundlebuilder.start()