diff options
Diffstat (limited to 'measure.py')
| -rw-r--r-- | measure.py | 81 |
1 files changed, 40 insertions, 41 deletions
@@ -5,6 +5,7 @@ # Copyright (C) 2007, Arjun Sarwal # Copyright (C) 2009-13 Walter Bender # Copyright (C) 2009, Benjamin Berg, Sebastian Berg +# Copyright (C) 2013, Ignacio Rodriguez # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,24 +17,25 @@ # Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA -import pygst -pygst.require("0.10") -import gtk -import pango +from gi.repository import Gtk +from gi.repository import Gdk +from gi.repository import GdkPixbuf +from gi.repository import Pango + import os import subprocess import csv from gettext import gettext as _ -from sugar.activity import activity -from sugar.activity.widgets import ActivityToolbarButton -from sugar.activity.widgets import StopButton -from sugar.graphics.toolbarbox import ToolbarBox -from sugar.graphics.toolbarbox import ToolbarButton -from sugar.graphics.toolbutton import ToolButton -from sugar.graphics import style -from sugar.datastore import datastore +from sugar3.activity import activity +from sugar3.activity.widgets import ActivityToolbarButton +from sugar3.activity.widgets import StopButton +from sugar3.graphics.toolbarbox import ToolbarBox +from sugar3.graphics.toolbarbox import ToolbarButton +from sugar3.graphics.toolbutton import ToolButton +from sugar3.graphics import style +from sugar3.datastore import datastore from sugar import profile @@ -100,11 +102,11 @@ class MeasureActivity(activity.Activity): activity.Activity.__init__(self, handle) self.mode_images = {} - self.mode_images['sound'] = gtk.gdk.pixbuf_new_from_file_at_size( + self.mode_images['sound'] = GdkPixbuf.Pixbuf.new_from_file_at_size( os.path.join(ICONS_DIR, 'media-audio.svg'), 45, 45) - self.mode_images['resistance'] = gtk.gdk.pixbuf_new_from_file_at_size( + self.mode_images['resistance'] = GdkPixbuf.Pixbuf.new_from_file_at_size( os.path.join(ICONS_DIR, 'resistance.svg'), 45, 45) - self.mode_images['voltage'] = gtk.gdk.pixbuf_new_from_file_at_size( + self.mode_images['voltage'] = GdkPixbuf.Pixbuf.new_from_file_at_size( os.path.join(ICONS_DIR, 'voltage.svg'), 45, 45) self.icon_colors = self.get_icon_colors_from_sugar() @@ -144,31 +146,29 @@ class MeasureActivity(activity.Activity): # no sharing self.max_participants = 1 - box3 = gtk.HBox(False, 0) + box3 = Gtk.HBox(False, 0) box3.pack_start(self.wave, True, True, 0) # We need event boxes in order to set the background color. side_eventboxes = [] self.side_toolbars = [] for i in range(self.audiograb.channels): - side_eventboxes.append(gtk.EventBox()) + side_eventboxes.append(Gtk.EventBox()) side_eventboxes[i].modify_bg( - gtk.STATE_NORMAL, style.COLOR_TOOLBAR_GREY.get_gdk_color()) + Gtk.StateType.NORMAL, style.COLOR_TOOLBAR_GREY.get_gdk_color()) self.side_toolbars.append(SideToolbar(self, channel=i)) side_eventboxes[i].add(self.side_toolbars[i].box1) box3.pack_start(side_eventboxes[i], False, True, 0) - event_box = gtk.EventBox() - self.text_box = gtk.Label() - self.text_box.set_justify(gtk.JUSTIFY_LEFT) - alist = pango.AttrList() - alist.insert(pango.AttrForeground(65535, 65535, 65535, 0, -1)) - self.text_box.set_attributes(alist) + event_box = Gtk.EventBox() + self.text_box = Gtk.Label() + self.text_box.set_justify(Gtk.Justification.LEFT) + self.text_box.modify_fg(Gtk.StateType.NORMAL, Gdk.color_parse('white')) event_box.add(self.text_box) event_box.modify_bg( - gtk.STATE_NORMAL, style.COLOR_TOOLBAR_GREY.get_gdk_color()) + Gtk.StateType.NORMAL, style.COLOR_TOOLBAR_GREY.get_gdk_color()) - box1 = gtk.VBox(False, 0) + box1 = Gtk.VBox(False, 0) box1.pack_start(box3, True, True, 0) box1.pack_start(event_box, False, True, 0) @@ -183,8 +183,8 @@ class MeasureActivity(activity.Activity): self.sensor_toolbar = SensorToolbar(self, self.audiograb.channels) self.tuning_toolbar = TuningToolbar(self) self.new_instrument_toolbar = InstrumentToolbar(self) - self._extras_toolbar = gtk.Toolbar() - self.control_toolbar = gtk.Toolbar() + self._extras_toolbar = Gtk.Toolbar() + self.control_toolbar = Gtk.Toolbar() sensor_button = ToolbarButton( label=_('Sensors'), @@ -209,12 +209,12 @@ class MeasureActivity(activity.Activity): page=self._extras_toolbar, icon_name='domain-time') toolbox.toolbar.insert(self._extras_button, -1) - self._extras_toolbar_item = gtk.ToolItem() + self._extras_toolbar_item = Gtk.ToolItem() self._extras_toolbar.insert(self._extras_toolbar_item, -1) self._extras_button.hide() self.sensor_toolbar.show() - self._extra_tools = gtk.HBox() + self._extra_tools = Gtk.HBox() # Set up Frequency-domain Button self.freq = ToolButton('domain-time') @@ -225,7 +225,7 @@ class MeasureActivity(activity.Activity): self.sensor_toolbar.add_frequency_slider(self._extra_tools) - self._extra_item = gtk.ToolItem() + self._extra_item = Gtk.ToolItem() self._extra_item.add(self._extra_tools) self._extra_tools.show() toolbox.toolbar.insert(self._extra_item, -1) @@ -243,18 +243,17 @@ class MeasureActivity(activity.Activity): self._capture.show() toolbox.toolbar.insert(self._capture, -1) - separator = gtk.SeparatorToolItem() + separator = Gtk.SeparatorToolItem() separator.props.draw = False separator.set_expand(True) toolbox.toolbar.insert(separator, -1) separator.show() stop_button = StopButton(self) - stop_button.props.accelerator = _('<Ctrl>Q') toolbox.toolbar.insert(stop_button, -1) stop_button.show() - self.set_toolbox(toolbox) + self.set_toolbar_box(toolbox) sensor_button.set_expanded(True) toolbox.show() @@ -271,14 +270,14 @@ class MeasureActivity(activity.Activity): self.wave.set_active(True) self.wave.set_context_on() - gtk.gdk.screen_get_default().connect('size-changed', + Gdk.Screen.get_default().connect('size-changed', self._configure_cb) self._configure_cb(None) def _configure_cb(self, event): ''' Screen size has changed, so check to see if the toolbar elements still fit.''' - self.width = gtk.gdk.screen_width() + self.width = Gdk.Screen.width() if self.width < style.GRID_CELL_SIZE * 14: self._extras_button.show() if self._extra_tools in self._extra_item: @@ -408,12 +407,12 @@ class MeasureActivity(activity.Activity): ''' Callback for Pause Button ''' if self.audiograb.get_freeze_the_display(): self.audiograb.set_freeze_the_display(False) - self._pause.set_icon('media-playback-start') + self._pause.set_icon_name('media-playback-start') self._pause.set_tooltip(_('Unfreeze the display')) self._pause.show() else: self.audiograb.set_freeze_the_display(True) - self._pause.set_icon('media-playback-pause') + self._pause.set_icon_name('media-playback-pause') self._pause.set_tooltip(_('Freeze the display')) self._pause.show() return False @@ -429,11 +428,11 @@ class MeasureActivity(activity.Activity): self.sensor_toolbar.record_control_cb() if self.wave.get_fft_mode(): self.wave.set_fft_mode(False) - self.freq.set_icon('domain-time') + self.freq.set_icon_name('domain-time') self.freq.set_tooltip(_('Time Base')) else: self.wave.set_fft_mode(True) - self.freq.set_icon('domain-freq') + self.freq.set_icon_name('domain-freq') self.freq.set_tooltip(_('Frequency Base')) # Turn off triggering in Frequencey Base self.sensor_toolbar.trigger_none.set_active(True) @@ -453,4 +452,4 @@ class MeasureActivity(activity.Activity): ''' Returns nick from Sugar ''' return profile.get_nick_name() -gtk.gdk.threads_init() +Gdk.threads_init() |