From c5e3d972fccad4cddf4273829d02bca96d5bf44d Mon Sep 17 00:00:00 2001 From: flavio Date: Tue, 05 Jun 2012 20:10:40 +0000 Subject: Port Gtk3 --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..db73526 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +*.pyc +*.pyo +*.bak +*.??~ diff --git a/activity.py b/activity.py index 306b081..631cb8d 100644 --- a/activity.py +++ b/activity.py @@ -18,18 +18,17 @@ """Actividad HelloMesh: Un caso de estudio para colaboracion usando Tubos.""" import logging import telepathy - -from sugar.activity.activity import Activity, ActivityToolbox -from sugar.presence import presenceservice - -from sugar.presence.tubeconn import TubeConnection +import gi +from gi.repository import Gtk, Gdk, GObject +from sugar3.graphics.toolbarbox import ToolbarBox +from sugar3.activity.activity import Activity +from sugar3.presence import presenceservice +from sugar3.presence.tubeconn import TubeConnection import stopwatch -import gobject import dobject import cPickle -import gtk.gdk SERVICE = "org.laptop.StopWatch" @@ -40,20 +39,20 @@ class StopWatchActivity(Activity): Activity.__init__(self, handle) self._logger = logging.getLogger('stopwatch-activity') - gobject.threads_init() + GObject.threads_init() # top toolbar with share and close buttons: OLD_TOOLBAR = False try: - from sugar.graphics.toolbarbox import ToolbarBox, ToolbarButton - from sugar.activity.widgets import ActivityToolbarButton, StopButton, \ + from sugar3.graphics.toolbarbox import ToolbarBox, ToolbarButton + from sugar3.activity.widgets import ActivityToolbarButton, StopButton, \ ShareButton, TitleEntry, ActivityButton except ImportError: OLD_TOOLBAR = True if OLD_TOOLBAR: - toolbox = ActivityToolbox(self) + toolbox = ToolbarBox(self) self.set_toolbox(toolbox) toolbox.show() else: @@ -70,7 +69,7 @@ class StopWatchActivity(Activity): toolbar_box.toolbar.insert(share_button, -1) share_button.show() - separator = gtk.SeparatorToolItem() + separator = Gtk.SeparatorToolItem() separator.props.draw = False separator.set_expand(True) toolbar_box.toolbar.insert(separator, -1) @@ -100,7 +99,7 @@ class StopWatchActivity(Activity): self.connect('shared', self._shared_cb) self.connect('joined', self._joined_cb) - self.add_events(gtk.gdk.VISIBILITY_NOTIFY_MASK) + self.add_events(Gdk.EventMask.VISIBILITY_NOTIFY_MASK) self.connect("visibility-notify-event", self._visible_cb) self.connect("notify::active", self._active_cb) @@ -181,7 +180,7 @@ class StopWatchActivity(Activity): def _visible_cb(self, widget, event): self._logger.debug("_visible_cb") - if event.state == gtk.gdk.VISIBILITY_FULLY_OBSCURED: + if event.get_state() == Gdk.VisibilityState.FULLY_OBSCURED: self.gui.pause() else: self.gui.resume() diff --git a/locale/ak/LC_MESSAGES/org.laptop.StopWatchActivity.mo b/locale/ak/LC_MESSAGES/org.laptop.StopWatchActivity.mo new file mode 100644 index 0000000..86860f9 --- /dev/null +++ b/locale/ak/LC_MESSAGES/org.laptop.StopWatchActivity.mo Binary files differ diff --git a/locale/ak/activity.linfo b/locale/ak/activity.linfo new file mode 100644 index 0000000..4ca3bc1 --- /dev/null +++ b/locale/ak/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = StopWatch diff --git a/locale/cpp/LC_MESSAGES/org.laptop.StopWatchActivity.mo b/locale/cpp/LC_MESSAGES/org.laptop.StopWatchActivity.mo new file mode 100644 index 0000000..86860f9 --- /dev/null +++ b/locale/cpp/LC_MESSAGES/org.laptop.StopWatchActivity.mo Binary files differ diff --git a/locale/cpp/activity.linfo b/locale/cpp/activity.linfo new file mode 100644 index 0000000..4ca3bc1 --- /dev/null +++ b/locale/cpp/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = StopWatch diff --git a/locale/da/LC_MESSAGES/org.laptop.StopWatchActivity.mo b/locale/da/LC_MESSAGES/org.laptop.StopWatchActivity.mo new file mode 100644 index 0000000..b23dea0 --- /dev/null +++ b/locale/da/LC_MESSAGES/org.laptop.StopWatchActivity.mo Binary files differ diff --git a/locale/da/activity.linfo b/locale/da/activity.linfo new file mode 100644 index 0000000..ee2186d --- /dev/null +++ b/locale/da/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = StopUr diff --git a/locale/de/LC_MESSAGES/org.laptop.StopWatchActivity.mo b/locale/de/LC_MESSAGES/org.laptop.StopWatchActivity.mo new file mode 100644 index 0000000..03148b9 --- /dev/null +++ b/locale/de/LC_MESSAGES/org.laptop.StopWatchActivity.mo Binary files differ diff --git a/locale/de/activity.linfo b/locale/de/activity.linfo new file mode 100644 index 0000000..a0b6a70 --- /dev/null +++ b/locale/de/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Stoppuhr diff --git a/locale/el/LC_MESSAGES/org.laptop.StopWatchActivity.mo b/locale/el/LC_MESSAGES/org.laptop.StopWatchActivity.mo new file mode 100644 index 0000000..e5e47dd --- /dev/null +++ b/locale/el/LC_MESSAGES/org.laptop.StopWatchActivity.mo Binary files differ diff --git a/locale/el/activity.linfo b/locale/el/activity.linfo new file mode 100644 index 0000000..9e6b5f1 --- /dev/null +++ b/locale/el/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Ρολόι- διακοπή λειτουργίας diff --git a/locale/en/LC_MESSAGES/org.laptop.StopWatchActivity.mo b/locale/en/LC_MESSAGES/org.laptop.StopWatchActivity.mo new file mode 100644 index 0000000..47673f4 --- /dev/null +++ b/locale/en/LC_MESSAGES/org.laptop.StopWatchActivity.mo Binary files differ diff --git a/locale/en/activity.linfo b/locale/en/activity.linfo new file mode 100644 index 0000000..4ca3bc1 --- /dev/null +++ b/locale/en/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = StopWatch diff --git a/locale/en_GB/LC_MESSAGES/org.laptop.StopWatchActivity.mo b/locale/en_GB/LC_MESSAGES/org.laptop.StopWatchActivity.mo new file mode 100644 index 0000000..2f834c2 --- /dev/null +++ b/locale/en_GB/LC_MESSAGES/org.laptop.StopWatchActivity.mo Binary files differ diff --git a/locale/en_GB/activity.linfo b/locale/en_GB/activity.linfo new file mode 100644 index 0000000..4ca3bc1 --- /dev/null +++ b/locale/en_GB/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = StopWatch diff --git a/locale/en_US/LC_MESSAGES/org.laptop.StopWatchActivity.mo b/locale/en_US/LC_MESSAGES/org.laptop.StopWatchActivity.mo new file mode 100644 index 0000000..8787f38 --- /dev/null +++ b/locale/en_US/LC_MESSAGES/org.laptop.StopWatchActivity.mo Binary files differ diff --git a/locale/en_US/activity.linfo b/locale/en_US/activity.linfo new file mode 100644 index 0000000..4ca3bc1 --- /dev/null +++ b/locale/en_US/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = StopWatch diff --git a/locale/es/LC_MESSAGES/org.laptop.StopWatchActivity.mo b/locale/es/LC_MESSAGES/org.laptop.StopWatchActivity.mo new file mode 100644 index 0000000..dcd74e4 --- /dev/null +++ b/locale/es/LC_MESSAGES/org.laptop.StopWatchActivity.mo Binary files differ diff --git a/locale/es/activity.linfo b/locale/es/activity.linfo new file mode 100644 index 0000000..3507473 --- /dev/null +++ b/locale/es/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Cronómetro diff --git a/locale/fr/LC_MESSAGES/org.laptop.StopWatchActivity.mo b/locale/fr/LC_MESSAGES/org.laptop.StopWatchActivity.mo new file mode 100644 index 0000000..d13186a --- /dev/null +++ b/locale/fr/LC_MESSAGES/org.laptop.StopWatchActivity.mo Binary files differ diff --git a/locale/fr/activity.linfo b/locale/fr/activity.linfo new file mode 100644 index 0000000..4ca3bc1 --- /dev/null +++ b/locale/fr/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = StopWatch diff --git a/locale/hus/LC_MESSAGES/org.laptop.StopWatchActivity.mo b/locale/hus/LC_MESSAGES/org.laptop.StopWatchActivity.mo new file mode 100644 index 0000000..86860f9 --- /dev/null +++ b/locale/hus/LC_MESSAGES/org.laptop.StopWatchActivity.mo Binary files differ diff --git a/locale/hus/activity.linfo b/locale/hus/activity.linfo new file mode 100644 index 0000000..4ca3bc1 --- /dev/null +++ b/locale/hus/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = StopWatch diff --git a/locale/hy/LC_MESSAGES/org.laptop.StopWatchActivity.mo b/locale/hy/LC_MESSAGES/org.laptop.StopWatchActivity.mo new file mode 100644 index 0000000..49c53d4 --- /dev/null +++ b/locale/hy/LC_MESSAGES/org.laptop.StopWatchActivity.mo Binary files differ diff --git a/locale/hy/activity.linfo b/locale/hy/activity.linfo new file mode 100644 index 0000000..5e2367a --- /dev/null +++ b/locale/hy/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Ժամանակաչափ diff --git a/locale/id/LC_MESSAGES/org.laptop.StopWatchActivity.mo b/locale/id/LC_MESSAGES/org.laptop.StopWatchActivity.mo new file mode 100644 index 0000000..86860f9 --- /dev/null +++ b/locale/id/LC_MESSAGES/org.laptop.StopWatchActivity.mo Binary files differ diff --git a/locale/id/activity.linfo b/locale/id/activity.linfo new file mode 100644 index 0000000..4ca3bc1 --- /dev/null +++ b/locale/id/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = StopWatch diff --git a/locale/it/LC_MESSAGES/org.laptop.StopWatchActivity.mo b/locale/it/LC_MESSAGES/org.laptop.StopWatchActivity.mo new file mode 100644 index 0000000..7cad13c --- /dev/null +++ b/locale/it/LC_MESSAGES/org.laptop.StopWatchActivity.mo Binary files differ diff --git a/locale/it/activity.linfo b/locale/it/activity.linfo new file mode 100644 index 0000000..91ece26 --- /dev/null +++ b/locale/it/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Cronometro diff --git a/locale/km/LC_MESSAGES/org.laptop.StopWatchActivity.mo b/locale/km/LC_MESSAGES/org.laptop.StopWatchActivity.mo new file mode 100644 index 0000000..a430bc9 --- /dev/null +++ b/locale/km/LC_MESSAGES/org.laptop.StopWatchActivity.mo Binary files differ diff --git a/locale/km/activity.linfo b/locale/km/activity.linfo new file mode 100644 index 0000000..4ca3bc1 --- /dev/null +++ b/locale/km/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = StopWatch diff --git a/locale/ku/LC_MESSAGES/org.laptop.StopWatchActivity.mo b/locale/ku/LC_MESSAGES/org.laptop.StopWatchActivity.mo new file mode 100644 index 0000000..86860f9 --- /dev/null +++ b/locale/ku/LC_MESSAGES/org.laptop.StopWatchActivity.mo Binary files differ diff --git a/locale/ku/activity.linfo b/locale/ku/activity.linfo new file mode 100644 index 0000000..4ca3bc1 --- /dev/null +++ b/locale/ku/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = StopWatch diff --git a/locale/lt/LC_MESSAGES/org.laptop.StopWatchActivity.mo b/locale/lt/LC_MESSAGES/org.laptop.StopWatchActivity.mo new file mode 100644 index 0000000..86860f9 --- /dev/null +++ b/locale/lt/LC_MESSAGES/org.laptop.StopWatchActivity.mo Binary files differ diff --git a/locale/lt/activity.linfo b/locale/lt/activity.linfo new file mode 100644 index 0000000..4ca3bc1 --- /dev/null +++ b/locale/lt/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = StopWatch diff --git a/locale/nah/LC_MESSAGES/org.laptop.StopWatchActivity.mo b/locale/nah/LC_MESSAGES/org.laptop.StopWatchActivity.mo new file mode 100644 index 0000000..86860f9 --- /dev/null +++ b/locale/nah/LC_MESSAGES/org.laptop.StopWatchActivity.mo Binary files differ diff --git a/locale/nah/activity.linfo b/locale/nah/activity.linfo new file mode 100644 index 0000000..4ca3bc1 --- /dev/null +++ b/locale/nah/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = StopWatch diff --git a/locale/nl/LC_MESSAGES/org.laptop.StopWatchActivity.mo b/locale/nl/LC_MESSAGES/org.laptop.StopWatchActivity.mo new file mode 100644 index 0000000..bcfd18d --- /dev/null +++ b/locale/nl/LC_MESSAGES/org.laptop.StopWatchActivity.mo Binary files differ diff --git a/locale/nl/activity.linfo b/locale/nl/activity.linfo new file mode 100644 index 0000000..4ca3bc1 --- /dev/null +++ b/locale/nl/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = StopWatch diff --git a/locale/pl/LC_MESSAGES/org.laptop.StopWatchActivity.mo b/locale/pl/LC_MESSAGES/org.laptop.StopWatchActivity.mo new file mode 100644 index 0000000..8da00a1 --- /dev/null +++ b/locale/pl/LC_MESSAGES/org.laptop.StopWatchActivity.mo Binary files differ diff --git a/locale/pl/activity.linfo b/locale/pl/activity.linfo new file mode 100644 index 0000000..5d87476 --- /dev/null +++ b/locale/pl/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Stoper diff --git a/locale/pt/LC_MESSAGES/org.laptop.StopWatchActivity.mo b/locale/pt/LC_MESSAGES/org.laptop.StopWatchActivity.mo new file mode 100644 index 0000000..14dee14 --- /dev/null +++ b/locale/pt/LC_MESSAGES/org.laptop.StopWatchActivity.mo Binary files differ diff --git a/locale/pt/activity.linfo b/locale/pt/activity.linfo new file mode 100644 index 0000000..3507473 --- /dev/null +++ b/locale/pt/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Cronómetro diff --git a/locale/quz/LC_MESSAGES/org.laptop.StopWatchActivity.mo b/locale/quz/LC_MESSAGES/org.laptop.StopWatchActivity.mo new file mode 100644 index 0000000..bd31aa5 --- /dev/null +++ b/locale/quz/LC_MESSAGES/org.laptop.StopWatchActivity.mo Binary files differ diff --git a/locale/quz/activity.linfo b/locale/quz/activity.linfo new file mode 100644 index 0000000..4ca3bc1 --- /dev/null +++ b/locale/quz/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = StopWatch diff --git a/locale/si/LC_MESSAGES/org.laptop.StopWatchActivity.mo b/locale/si/LC_MESSAGES/org.laptop.StopWatchActivity.mo new file mode 100644 index 0000000..e82277f --- /dev/null +++ b/locale/si/LC_MESSAGES/org.laptop.StopWatchActivity.mo Binary files differ diff --git a/locale/si/activity.linfo b/locale/si/activity.linfo new file mode 100644 index 0000000..08f61d3 --- /dev/null +++ b/locale/si/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = විරාමඝටිකාව diff --git a/locale/son/LC_MESSAGES/org.laptop.StopWatchActivity.mo b/locale/son/LC_MESSAGES/org.laptop.StopWatchActivity.mo new file mode 100644 index 0000000..86860f9 --- /dev/null +++ b/locale/son/LC_MESSAGES/org.laptop.StopWatchActivity.mo Binary files differ diff --git a/locale/son/activity.linfo b/locale/son/activity.linfo new file mode 100644 index 0000000..4ca3bc1 --- /dev/null +++ b/locale/son/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = StopWatch diff --git a/locale/sr/LC_MESSAGES/org.laptop.StopWatchActivity.mo b/locale/sr/LC_MESSAGES/org.laptop.StopWatchActivity.mo new file mode 100644 index 0000000..86860f9 --- /dev/null +++ b/locale/sr/LC_MESSAGES/org.laptop.StopWatchActivity.mo Binary files differ diff --git a/locale/sr/activity.linfo b/locale/sr/activity.linfo new file mode 100644 index 0000000..4ca3bc1 --- /dev/null +++ b/locale/sr/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = StopWatch diff --git a/locale/sw/LC_MESSAGES/org.laptop.StopWatchActivity.mo b/locale/sw/LC_MESSAGES/org.laptop.StopWatchActivity.mo new file mode 100644 index 0000000..86860f9 --- /dev/null +++ b/locale/sw/LC_MESSAGES/org.laptop.StopWatchActivity.mo Binary files differ diff --git a/locale/sw/activity.linfo b/locale/sw/activity.linfo new file mode 100644 index 0000000..4ca3bc1 --- /dev/null +++ b/locale/sw/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = StopWatch diff --git a/locale/ta/LC_MESSAGES/org.laptop.StopWatchActivity.mo b/locale/ta/LC_MESSAGES/org.laptop.StopWatchActivity.mo new file mode 100644 index 0000000..7d14d36 --- /dev/null +++ b/locale/ta/LC_MESSAGES/org.laptop.StopWatchActivity.mo Binary files differ diff --git a/locale/ta/activity.linfo b/locale/ta/activity.linfo new file mode 100644 index 0000000..825800e --- /dev/null +++ b/locale/ta/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = நிறுத்தும் கடிகாரம் diff --git a/locale/templates/LC_MESSAGES/org.laptop.StopWatchActivity.mo b/locale/templates/LC_MESSAGES/org.laptop.StopWatchActivity.mo new file mode 100644 index 0000000..86860f9 --- /dev/null +++ b/locale/templates/LC_MESSAGES/org.laptop.StopWatchActivity.mo Binary files differ diff --git a/locale/templates/activity.linfo b/locale/templates/activity.linfo new file mode 100644 index 0000000..4ca3bc1 --- /dev/null +++ b/locale/templates/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = StopWatch diff --git a/locale/tyv/LC_MESSAGES/org.laptop.StopWatchActivity.mo b/locale/tyv/LC_MESSAGES/org.laptop.StopWatchActivity.mo new file mode 100644 index 0000000..86860f9 --- /dev/null +++ b/locale/tyv/LC_MESSAGES/org.laptop.StopWatchActivity.mo Binary files differ diff --git a/locale/tyv/activity.linfo b/locale/tyv/activity.linfo new file mode 100644 index 0000000..4ca3bc1 --- /dev/null +++ b/locale/tyv/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = StopWatch diff --git a/locale/tzm/LC_MESSAGES/org.laptop.StopWatchActivity.mo b/locale/tzm/LC_MESSAGES/org.laptop.StopWatchActivity.mo new file mode 100644 index 0000000..86860f9 --- /dev/null +++ b/locale/tzm/LC_MESSAGES/org.laptop.StopWatchActivity.mo Binary files differ diff --git a/locale/tzm/activity.linfo b/locale/tzm/activity.linfo new file mode 100644 index 0000000..4ca3bc1 --- /dev/null +++ b/locale/tzm/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = StopWatch diff --git a/locale/zh_HK/LC_MESSAGES/org.laptop.StopWatchActivity.mo b/locale/zh_HK/LC_MESSAGES/org.laptop.StopWatchActivity.mo new file mode 100644 index 0000000..86860f9 --- /dev/null +++ b/locale/zh_HK/LC_MESSAGES/org.laptop.StopWatchActivity.mo Binary files differ diff --git a/locale/zh_HK/activity.linfo b/locale/zh_HK/activity.linfo new file mode 100644 index 0000000..4ca3bc1 --- /dev/null +++ b/locale/zh_HK/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = StopWatch diff --git a/po/templates.po b/po/templates.po new file mode 100755 index 0000000..d8f79f3 --- /dev/null +++ b/po/templates.po @@ -0,0 +1,37 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-12-06 00:41+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Translate Toolkit 1.7.0\n" + +#: activity/activity.info:2 +msgid "StopWatch" +msgstr "" + +#: stopwatch.py:162 +msgid "Start/Stop" +msgstr "" + +#: stopwatch.py:170 +msgid "Zero" +msgstr "" + +#: stopwatch.py:177 +msgid "Mark" +msgstr "" + +#: stopwatch.py:410 +msgid "Stopwatch" +msgstr "" diff --git a/setup.py b/setup.py index 530f97c..c60f4d0 100755 --- a/setup.py +++ b/setup.py @@ -16,6 +16,6 @@ # 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() diff --git a/stopwatch.py b/stopwatch.py index ddb4c3c..a72d2ef 100644 --- a/stopwatch.py +++ b/stopwatch.py @@ -15,16 +15,14 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA import dbus -import gtk -import gtk.gdk -import gobject +import gi +from gi.repository import Gtk, Gdk, GObject, Pango import dobject import logging import time import thread import threading import locale -import pango from gettext import gettext import powerd @@ -158,46 +156,46 @@ class OneWatchView(): self._offset = self._timer.get_offset() - self._name = gtk.Entry() + self._name = Gtk.Entry() self._name_changed_handler = self._name.connect('changed', self._name_cb) self._name_lock = threading.Lock() self._name_model.register_listener(self._update_name_cb) - check = gtk.Image() + check = Gtk.Image() check.set_from_file('check.svg') - self._run_button = gtk.ToggleButton(gettext("Start/Stop")) + self._run_button = Gtk.ToggleButton(gettext("Start/Stop")) self._run_button.set_image(check) - self._run_button.props.focus_on_click = False + self._run_button.props.focus_on_click = False self._run_handler = self._run_button.connect('clicked', self._run_cb) self._run_button_lock = threading.Lock() - circle = gtk.Image() + circle = Gtk.Image() circle.set_from_file('circle.svg') - self._reset_button = gtk.Button(gettext("Zero")) + self._reset_button = Gtk.Button(gettext("Zero")) self._reset_button.set_image(circle) self._reset_button.props.focus_on_click = False self._reset_button.connect('clicked', self._reset_cb) - x = gtk.Image() + x = Gtk.Image() x.set_from_file('x.svg') - self._mark_button = gtk.Button(gettext("Mark")) + self._mark_button = Gtk.Button(gettext("Mark")) self._mark_button.set_image(x) self._mark_button.props.focus_on_click = False self._mark_button.connect('clicked', self._mark_cb) - timefont = pango.FontDescription() + timefont = Pango.FontDescription() timefont.set_family("monospace") - timefont.set_size(pango.SCALE*14) - self._time_label = gtk.Label(self._format(0)) + timefont.set_size(Pango.SCALE*14) + self._time_label = Gtk.Label(label=self._format(0)) self._time_label.modify_font(timefont) self._time_label.set_single_line_mode(True) self._time_label.set_selectable(True) self._time_label.set_width_chars(10) self._time_label.set_alignment(1,0.5) #justify right self._time_label.set_padding(6,0) - eb = gtk.EventBox() + eb = Gtk.EventBox() eb.add(self._time_label) - eb.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse("white")) + eb.modify_bg(Gtk.StateType.NORMAL, Gdk.color_parse("white")) self._should_update = threading.Event() self._is_visible = threading.Event() @@ -205,46 +203,46 @@ class OneWatchView(): self._update_lock = threading.Lock() self._label_lock = threading.Lock() - self.box = gtk.HBox() - self.box.pack_start(self._name, padding=6) - self.box.pack_start(self._run_button, expand=False) - self.box.pack_start(self._reset_button, expand=False) - self.box.pack_start(self._mark_button, expand=False) - self.box.pack_end(eb, expand=False, padding=6) + self.box = Gtk.HBox() + self.box.pack_start(self._name, True, True, 6) + self.box.pack_start(self._run_button, False, True, 0) + self.box.pack_start(self._reset_button, False, True, 0) + self.box.pack_start(self._mark_button, False, True, 0) + self.box.pack_end(eb, False, False, 6) - markfont = pango.FontDescription() + markfont = Pango.FontDescription() markfont.set_family("monospace") - markfont.set_size(pango.SCALE*10) - self._marks_label = gtk.Label() + markfont.set_size(Pango.SCALE*10) + self._marks_label = Gtk.Label() self._marks_label.modify_font(markfont) self._marks_label.set_single_line_mode(True) self._marks_label.set_selectable(True) self._marks_label.set_alignment(0, 0.5) #justify left self._marks_label.set_padding(6,0) self._marks_model.register_listener(self._update_marks) - eb2 = gtk.EventBox() + eb2 = Gtk.EventBox() eb2.add(self._marks_label) - eb2.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse("white")) + eb2.modify_bg(Gtk.StateType.NORMAL, Gdk.color_parse("white")) - filler0 = gtk.VBox() - filler0.pack_start(self.box, expand=False, fill=False) - filler0.pack_start(eb2, expand=False, fill=False) + filler0 = Gtk.VBox() + filler0.pack_start(self.box, False, False, 0) + filler0.pack_start(eb2, False, False, 0) - filler = gtk.VBox() - filler.pack_start(filler0, expand=True, fill=False) + filler = Gtk.VBox() + filler.pack_start(filler0, True, False, 0) - self.backbox = gtk.EventBox() + self.backbox = Gtk.EventBox() self.backbox.add(filler) - self._black = gtk.gdk.color_parse("black") - self._gray = gtk.gdk.Color(256*192, 256*192, 256*192) + self._black = Gdk.color_parse("black") + self._gray = Gdk.Color(256*192, 256*192, 256*192) - self.display = gtk.EventBox() + self.display = Gtk.EventBox() self.display.add(self.backbox) #self.display.set_above_child(True) self.display.props.can_focus = True self.display.connect('focus-in-event', self._got_focus_cb) self.display.connect('focus-out-event', self._lost_focus_cb) - self.display.add_events(gtk.gdk.ALL_EVENTS_MASK) + self.display.add_events(Gdk.EventMask.ALL_EVENTS_MASK) self.display.connect('key-press-event', self._keypress_cb) #self.display.connect('key-release-event', self._keyrelease_cb) @@ -268,7 +266,7 @@ class OneWatchView(): self._label_lock.acquire() self._timeval = q[0] ev = threading.Event() - gobject.idle_add(self._update_label, self._format(self._timeval), ev) + GObject.idle_add(self._update_label, self._format(self._timeval), ev) ev.wait() self._label_lock.release() self._update_lock.release() @@ -283,7 +281,7 @@ class OneWatchView(): self._name.set_editable(False) self._name.handler_block(self._name_changed_handler) ev = threading.Event() - gobject.idle_add(self._set_name, name, ev) + GObject.idle_add(self._set_name, name, ev) ev.wait() self._name.handler_unblock(self._name_changed_handler) self._name.set_editable(True) @@ -312,7 +310,7 @@ class OneWatchView(): if self._should_update.isSet() and self._is_visible.isSet(): s = self._format(time.time() + self._timer.offset - self._timeval) ev.clear() - gobject.idle_add(self._update_label, s, ev) + GObject.idle_add(self._update_label, s, ev) ev.wait() time.sleep(0.07) self._label_lock.release() @@ -380,14 +378,14 @@ class OneWatchView(): def _got_focus_cb(self, widget, event): self._logger.debug("got focus") - self.backbox.modify_bg(gtk.STATE_NORMAL, self._black) - self._name.modify_bg(gtk.STATE_NORMAL, self._black) + self.backbox.modify_bg(Gtk.StateType.NORMAL, self._black) + self._name.modify_bg(Gtk.StateType.NORMAL, self._black) return True def _lost_focus_cb(self, widget, event): self._logger.debug("lost focus") - self.backbox.modify_bg(gtk.STATE_NORMAL, self._gray) - self._name.modify_bg(gtk.STATE_NORMAL, self._gray) + self.backbox.modify_bg(Gtk.StateType.NORMAL, self._gray) + self._name.modify_bg(Gtk.StateType.NORMAL, self._gray) return True # KP_End == check gamekey = 65436 @@ -395,7 +393,7 @@ class OneWatchView(): # KP_Home == box gamekey = 65429 # KP_Page_Up == O gamekey = 65434 def _keypress_cb(self, widget, event): - self._logger.debug("key press: " + gtk.gdk.keyval_name(event.keyval)+ " " + str(event.keyval)) + self._logger.debug("key press: " + Gdk.keyval_name(event.keyval)+ " " + str(event.keyval)) if event.keyval == 65436: self._run_button.clicked() elif event.keyval == 65434: @@ -426,9 +424,9 @@ class GUIView(): watch_view = OneWatchView(watch_model, name_model, marks_model, timer) self._views.append(watch_view) - self.display = gtk.VBox() + self.display = Gtk.VBox() for x in self._views: - self.display.pack_start(x.display, expand=True, fill=True) + self.display.pack_start(x.display, True, True, 0) self._pause_lock = threading.Lock() -- cgit v0.9.1