Start port of TamTamJam to Gtk3

Using pygi-convert.sh, sugar-convert.sh and a few manual fixes.

Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>

1 files changed, 71 insertions, 73 deletions

diff --git a/Jam/Toolbars.py b/Jam/Toolbars.py
index 23da473..7d54a10 100644
--- a/Jam/Toolbars.py
+++ b/Jam/Toolbars.py
@@ -1,41 +1,39 @@
-
-import pygtk
-pygtk.require('2.0')
-import gtk
-import gobject
+from gi.repository import Gtk
+from gi.repository import Gdk
+from gi.repository import GObject
 
 import os, commands
 
 from gettext import gettext as _
 
-from sugar.graphics.palette import Palette, WidgetInvoker
-from sugar.graphics.radiotoolbutton import RadioToolButton
-from sugar.graphics.toolbutton import ToolButton
-from sugar.graphics.toggletoolbutton import ToggleToolButton
-from sugar.graphics.combobox import ComboBox
-from sugar.graphics.toolcombobox import ToolComboBox
+from sugar3.graphics.palette import Palette, WidgetInvoker
+from sugar3.graphics.radiotoolbutton import RadioToolButton
+from sugar3.graphics.toolbutton import ToolButton
+from sugar3.graphics.toggletoolbutton import ToggleToolButton
+from sugar3.graphics.combobox import ComboBox
+from sugar3.graphics.toolcombobox import ToolComboBox
 
 from common.Util.ThemeWidgets import *
 import common.Config as Config
 from common.Util import OS
 
 
-class JamToolbar(gtk.Toolbar):
+class JamToolbar(Gtk.Toolbar):
 
     def __init__(self, owner):
-        gtk.Toolbar.__init__(self)
+        GObject.GObject.__init__(self)
 
         self.owner = owner
 
         self.toolItem = {}
 
-        self.volumeImg = gtk.Image()
+        self.volumeImg = Gtk.Image()
 
         self._insert_separator(True)
 
-        self.volumeAdjustment = gtk.Adjustment(0.0, 0, 1.0, 0.1, 0.1, 0)
+        self.volumeAdjustment = Gtk.Adjustment(0.0, 0, 1.0, 0.1, 0.1, 0)
         self.volumeAdjustment.connect('value-changed', self.handleVolume)
-        self.volumeSlider = gtk.HScale(adjustment=self.volumeAdjustment)
+        self.volumeSlider = Gtk.HScale(adjustment=self.volumeAdjustment)
         self.volumeSlider.set_size_request(260, -1)
         self.volumeSlider.set_draw_value(False)
         self._add_tooltip(self.volumeSlider, _("Master volume"))
@@ -44,18 +42,18 @@ class JamToolbar(gtk.Toolbar):
 
         self._insert_separator(True)
 
-        self.tempoImg = gtk.Image()
+        self.tempoImg = Gtk.Image()
 
         # used to store tempo updates while the slider is active
         self.delayedTempo = 0
         self.tempoSliderActive = False
 
-        self.tempoAdjustment = gtk.Adjustment(
+        self.tempoAdjustment = Gtk.Adjustment(
             Config.PLAYER_TEMPO_LOWER, Config.PLAYER_TEMPO_LOWER,
             Config.PLAYER_TEMPO_UPPER + 1, 10, 10, 0)
         self.tempoAdjustmentHandler = self.tempoAdjustment.connect(
             'value-changed', self.handleTempo)
-        self.tempoSlider = gtk.HScale(adjustment=self.tempoAdjustment)
+        self.tempoSlider = Gtk.HScale(adjustment=self.tempoAdjustment)
         self.tempoSlider.set_size_request(260, -1)
         self.tempoSlider.set_draw_value(False)
         self.tempoSlider.connect("button-press-event",
@@ -81,12 +79,12 @@ class JamToolbar(gtk.Toolbar):
         self._add_palette(widget, Palette(tooltip))
 
     def _insert_widget(self, widget, pos):
-        self.toolItem[widget] = gtk.ToolItem()
+        self.toolItem[widget] = Gtk.ToolItem()
         self.toolItem[widget].add(widget)
         self.insert(self.toolItem[widget], pos)
 
     def _insert_separator(self, expand=False):
-        separator = gtk.SeparatorToolItem()
+        separator = Gtk.SeparatorToolItem()
         separator.set_draw(False)
         separator.set_expand(expand)
         self.insert(separator, -1)
@@ -159,10 +157,10 @@ def common_playback_buttons(toolbar, owner):
     toolbar.muteButton.set_tooltip(_('Mute Loops'))
 
 
-class PlaybackToolbar(gtk.Toolbar):
+class PlaybackToolbar(Gtk.Toolbar):
 
     def __init__(self, owner):
-        gtk.Toolbar.__init__(self)
+        GObject.GObject.__init__(self)
 
         self.owner = owner
 
@@ -172,10 +170,10 @@ class PlaybackToolbar(gtk.Toolbar):
 
         self.show_all()
 
-class BeatToolbar(gtk.Toolbar):
+class BeatToolbar(Gtk.Toolbar):
 
     def __init__(self, owner):
-        gtk.Toolbar.__init__(self)
+        GObject.GObject.__init__(self)
 
         self.owner = owner
 
@@ -199,8 +197,8 @@ class BeatToolbar(gtk.Toolbar):
             self.insert(btn, -1)
             self.beatWheel.append(btn)
 
-        label = gtk.Label(_("Synch to:"))
-        self.syncLabel = gtk.ToolItem()
+        label = Gtk.Label(label=_("Synch to:"))
+        self.syncLabel = Gtk.ToolItem()
         self.syncLabel.add(label)
         self.insert(self.syncLabel, 0)
 
@@ -235,12 +233,12 @@ class BeatToolbar(gtk.Toolbar):
         self._add_palette(widget, Palette(tooltip))
 
     def _insert_widget(self, widget, pos):
-        self.toolItem[widget] = gtk.ToolItem()
+        self.toolItem[widget] = Gtk.ToolItem()
         self.toolItem[widget].add(widget)
         self.insert(self.toolItem[widget], pos)
 
     def _insert_separator(self, expand=False):
-        separator = gtk.SeparatorToolItem()
+        separator = Gtk.SeparatorToolItem()
         separator.set_draw(False)
         separator.set_expand(expand)
         self.insert(separator, -1)
@@ -267,10 +265,10 @@ class BeatToolbar(gtk.Toolbar):
         self.owner._setSyncBeats(beats)
 
 
-class DesktopToolbar(gtk.Toolbar):
+class DesktopToolbar(Gtk.Toolbar):
 
     def __init__(self, owner):
-        gtk.Toolbar.__init__(self)
+        GObject.GObject.__init__(self)
 
         self.owner = owner
 
@@ -298,7 +296,7 @@ class DesktopToolbar(gtk.Toolbar):
         self.show_all()
 
     def _insert_separator(self, expand=False):
-        separator = gtk.SeparatorToolItem()
+        separator = Gtk.SeparatorToolItem()
         separator.set_draw(False)
         separator.set_expand(expand)
         self.insert(separator, -1)
@@ -311,13 +309,13 @@ class DesktopToolbar(gtk.Toolbar):
             self.owner._setDesktop(which)
 
 
-class RecordToolbar(gtk.Toolbar):
+class RecordToolbar(Gtk.Toolbar):
     def __init__(self, jam):
-        gtk.Toolbar.__init__(self)
+        GObject.GObject.__init__(self)
 
         def _insertSeparator(x=1):
             for i in range(x):
-                self.separator = gtk.SeparatorToolItem()
+                self.separator = Gtk.SeparatorToolItem()
                 self.separator.set_draw(True)
                 self.insert(self.separator, -1)
                 self.separator.show()
@@ -372,7 +370,7 @@ class LoopSettingsPalette(Palette):
 
         self.jam = jam
 
-        self.tooltips = gtk.Tooltips()
+        self.tooltips = Gtk.Tooltips()
         self.loopedSound = False
         self.soundLength = 1.00
         self.start = 0
@@ -382,14 +380,14 @@ class LoopSettingsPalette(Palette):
         self.register = 0
         self.ok = True
 
-        self.mainBox = gtk.VBox()
+        self.mainBox = Gtk.VBox()
 
-        self.controlsBox = gtk.HBox()
+        self.controlsBox = Gtk.HBox()
 
         self.GUI = {}
 
-        self.soundBox = gtk.HBox()
-        self.soundLabel = gtk.Label(_('Sound: '))
+        self.soundBox = Gtk.HBox()
+        self.soundLabel = Gtk.Label(label=_('Sound: '))
         self.soundMenuBox = BigComboBox()
         self.sounds = [snd for snd in os.listdir(Config.DATA_DIR) \
                            if snd != 'snds_info']
@@ -401,16 +399,16 @@ class LoopSettingsPalette(Palette):
 
         self.mainBox.pack_start(self.soundBox, False, False, 10)
 
-        nameBox = gtk.VBox()
-        self.nameEntry = gtk.Entry()
-        entrycolor = gtk.gdk.Color()
-        self.nameEntry.modify_text(gtk.STATE_NORMAL, entrycolor)
+        nameBox = Gtk.VBox()
+        self.nameEntry = Gtk.Entry()
+        entrycolor = Gdk.Color()
+        self.nameEntry.modify_text(Gtk.StateType.NORMAL, entrycolor)
         self.nameEntry.set_text("name_of_the_sound")
-        nameBox.pack_start(self.nameEntry)
+        nameBox.pack_start(self.nameEntry, True, True, 0)
         self.mainBox.pack_start(nameBox, False, False, 10)
 
-        registerBox = gtk.HBox()
-        self.registerBoxLabel = gtk.Label(_('Register: '))
+        registerBox = Gtk.HBox()
+        self.registerBoxLabel = Gtk.Label(label=_('Register: '))
         self.registerMenuBox = BigComboBox()
         self.registers = ['LOW', 'MID', 'HIGH', 'PUNCH']
         for reg in self.registers:
@@ -420,17 +418,17 @@ class LoopSettingsPalette(Palette):
         registerBox.pack_end(self.registerMenuBox, False, False, padding=10)
         self.mainBox.pack_start(registerBox, False, False, 10)
 
-        loopedBox = gtk.HBox()
-        loopedLabel = gtk.Label("Looped sound: ")
+        loopedBox = Gtk.HBox()
+        loopedLabel = Gtk.Label(label="Looped sound: ")
         loopedToggle = ImageToggleButton('checkOff.png', 'checkOn.png')
         loopedToggle.connect('button-press-event', self.handleLooped)
         loopedBox.pack_start(loopedLabel, False, False, padding=10)
         loopedBox.pack_end(loopedToggle, False, False, padding=10)
         self.mainBox.pack_start(loopedBox, False, False, 10)
 
-        startBox = gtk.VBox()
-        self.startAdjust = gtk.Adjustment(0.01, 0, 1., .001, .001, 0)
-        self.GUI['startSlider'] = gtk.VScale(adjustment=self.startAdjust)
+        startBox = Gtk.VBox()
+        self.startAdjust = Gtk.Adjustment(0.01, 0, 1., .001, .001, 0)
+        self.GUI['startSlider'] = Gtk.VScale(adjustment=self.startAdjust)
         self.startAdjust.connect("value-changed", self.handleStart)
         self.GUI['startSlider'].set_inverted(True)
         self.GUI['startSlider'].set_size_request(50, 200)
@@ -439,54 +437,54 @@ class LoopSettingsPalette(Palette):
         #self._add_tooltip(self.GUI['startSlider'], _("Loop start position"))
         self.handleStart(self.startAdjust)
         startBox.pack_start(self.GUI['startSlider'], True, True, 5)
-        self.controlsBox.pack_start(startBox)
+        self.controlsBox.pack_start(startBox, True, True, 0)
 
-        endBox = gtk.VBox()
-        self.endAdjust = gtk.Adjustment(0.9, 0, 1, .001, .001, 0)
-        self.GUI['endSlider'] = gtk.VScale(adjustment=self.endAdjust)
+        endBox = Gtk.VBox()
+        self.endAdjust = Gtk.Adjustment(0.9, 0, 1, .001, .001, 0)
+        self.GUI['endSlider'] = Gtk.VScale(adjustment=self.endAdjust)
         self.endAdjust.connect("value-changed", self.handleEnd)
         self.GUI['endSlider'].set_inverted(True)
         self.GUI['endSlider'].set_size_request(50, 200)
         self.GUI['endSlider'].set_digits(3)
         self.handleEnd(self.endAdjust)
         endBox.pack_start(self.GUI['endSlider'], True, True, 5)
-        self.controlsBox.pack_start(endBox)
+        self.controlsBox.pack_start(endBox, True, True, 0)
 
-        durBox = gtk.VBox()
-        self.durAdjust = gtk.Adjustment(0.01, 0, 0.2, .001, .001, 0)
-        self.GUI['durSlider'] = gtk.VScale(adjustment=self.durAdjust)
+        durBox = Gtk.VBox()
+        self.durAdjust = Gtk.Adjustment(0.01, 0, 0.2, .001, .001, 0)
+        self.GUI['durSlider'] = Gtk.VScale(adjustment=self.durAdjust)
         self.durAdjust.connect("value-changed", self.handleDur)
         self.GUI['durSlider'].set_inverted(True)
         self.GUI['durSlider'].set_size_request(50, 200)
         self.GUI['durSlider'].set_digits(3)
         self.handleDur(self.durAdjust)
         durBox.pack_start(self.GUI['durSlider'], True, True, 5)
-        self.controlsBox.pack_start(durBox)
+        self.controlsBox.pack_start(durBox, True, True, 0)
 
-        volBox = gtk.VBox()
-        self.volAdjust = gtk.Adjustment(1, 0, 2, .01, .01, 0)
-        self.GUI['volSlider'] = gtk.VScale(adjustment=self.volAdjust)
+        volBox = Gtk.VBox()
+        self.volAdjust = Gtk.Adjustment(1, 0, 2, .01, .01, 0)
+        self.GUI['volSlider'] = Gtk.VScale(adjustment=self.volAdjust)
         self.volAdjust.connect("value-changed", self.handleVol)
         self.GUI['volSlider'].set_inverted(True)
         self.GUI['volSlider'].set_size_request(50, 200)
         self.GUI['volSlider'].set_digits(3)
         self.handleVol(self.volAdjust)
         volBox.pack_start(self.GUI['volSlider'], True, True, 5)
-        self.controlsBox.pack_start(volBox)
+        self.controlsBox.pack_start(volBox, True, True, 0)
 
         self.mainBox.pack_start(self.controlsBox, False, False, 10)
 
-        previewBox = gtk.VBox()
+        previewBox = Gtk.VBox()
         self.playStopButton = ImageToggleButton('miniplay.png', 'stop.png')
         self.playStopButton.connect('button-press-event',
                                     self.handlePlayButton)
-        previewBox.pack_start(self.playStopButton)
+        previewBox.pack_start(self.playStopButton, True, True, 0)
         self.mainBox.pack_start(previewBox, False, False, 10)
 
-        checkBox = gtk.VBox()
+        checkBox = Gtk.VBox()
         checkButton = ImageButton(Config.TAM_TAM_ROOT + '/icons/accept.svg')
         checkButton.connect('clicked', self.handleCheck)
-        checkBox.pack_start(checkButton)
+        checkBox.pack_start(checkButton, True, True, 0)
         self.mainBox.pack_start(checkBox, False, False, 10)
 
         self.mainBox.show_all()
@@ -526,11 +524,11 @@ class LoopSettingsPalette(Palette):
         self.startAdjust.set_all(0.01, 0, soundLength, .001, .001, 0)
         self.endAdjust.set_all(
             soundLength - 0.01, 0, soundLength, .001, .001, 0)
-        self.timeoutLoad = gobject.timeout_add(2000, self.loopSettingsDelay)
+        self.timeoutLoad = GObject.timeout_add(2000, self.loopSettingsDelay)
 
     def loopSettingsDelay(self):
         self.jam.load_ls_instrument(self.sndname)
-        gobject.source_remove(self.timeoutLoad)
+        GObject.source_remove(self.timeoutLoad)
 
     def handleCheck(self, widget):
         if self.nameEntry.get_text() != self.sndname:
@@ -607,7 +605,7 @@ class LoopSettingsPalette(Palette):
             self.jam.loopSettingsPlayStop(widget.get_active(),
                                           self.loopedSound)
             if self.loopedSound == False and widget.get_active() == False:
-                self.timeoutStop = gobject.timeout_add(
+                self.timeoutStop = GObject.timeout_add(
                     int(self.soundLength * 1000) + 500, self.playButtonState)
 
     def setButtonState(self):
@@ -618,5 +616,5 @@ class LoopSettingsPalette(Palette):
     def playButtonState(self):
         self.ok = False
         self.playStopButton.set_active(False)
-        gobject.source_remove(self.timeoutStop)
+        GObject.source_remove(self.timeoutStop)
         self.ok = True