diff options
| author | Simon Schampijer <simon@laptop.org> | 2012-09-03 08:17:48 (GMT) |
|---|---|---|
| committer | Simon Schampijer <simon@laptop.org> | 2012-09-07 09:14:24 (GMT) |
| commit | 3007f43996b5ef9a9fb4ccf37906f17612438c68 (patch) | |
| tree | c91708f35f18baef6ef60779165bb14a85f0c09e /extensions | |
| parent | 98f5b640ad4c3f1d67622a031629af42f0b96997 (diff) | |
Run pygi-convert.sh for automatic conversion from GTK+ 2 to GTK+ 3
Run pygi-convert.sh for automatic conversion from GTK+ 2 to GTK+ 3 and
pygobject+gobject-introspection. This is only on a best-effort basis;
the code will be in a broken state after this patch and need to be
fixed manually.
The purpose of committing the intermediate, non-working output is to make it
reproducible. It's impractical to manually review the changes.
The exact version used was 2d8f48f4ff56bb75985136452b50b75895258608 from the
main pygobject repository [1].
[1] git://git.gnome.org/pygobject
Signed-off-by: Simon Schampijer <simon@laptop.org>
Acked-by: Manuel Quiñones <manuq@laptop.org>
Diffstat (limited to 'extensions')
27 files changed, 558 insertions, 558 deletions
diff --git a/extensions/cpsection/aboutcomputer/view.py b/extensions/cpsection/aboutcomputer/view.py index 6b16005..dbd38ae 100644 --- a/extensions/cpsection/aboutcomputer/view.py +++ b/extensions/cpsection/aboutcomputer/view.py @@ -18,7 +18,7 @@ from gettext import gettext as _ -import gtk +from gi.repository import Gtk from sugar.graphics import style @@ -35,14 +35,14 @@ class AboutComputer(SectionView): self.set_border_width(style.DEFAULT_SPACING * 2) self.set_spacing(style.DEFAULT_SPACING) - self._group = gtk.SizeGroup(gtk.SIZE_GROUP_HORIZONTAL) + self._group = Gtk.SizeGroup(Gtk.SizeGroupMode.HORIZONTAL) - scrollwindow = gtk.ScrolledWindow() - scrollwindow.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC) - self.pack_start(scrollwindow, expand=True) + scrollwindow = Gtk.ScrolledWindow() + scrollwindow.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC) + self.pack_start(scrollwindow, True, True, 0) scrollwindow.show() - self._vbox = gtk.VBox() + self._vbox = Gtk.VBox() scrollwindow.add_with_viewport(self._vbox) self._vbox.show() @@ -52,161 +52,161 @@ class AboutComputer(SectionView): self._setup_copyright() def _setup_identity(self): - separator_identity = gtk.HSeparator() - self._vbox.pack_start(separator_identity, expand=False) + separator_identity = Gtk.HSeparator() + self._vbox.pack_start(separator_identity, False, True, 0) separator_identity.show() - label_identity = gtk.Label(_('Identity')) + label_identity = Gtk.Label(label=_('Identity')) label_identity.set_alignment(0, 0) - self._vbox.pack_start(label_identity, expand=False) + self._vbox.pack_start(label_identity, False, True, 0) label_identity.show() - vbox_identity = gtk.VBox() + vbox_identity = Gtk.VBox() vbox_identity.set_border_width(style.DEFAULT_SPACING * 2) vbox_identity.set_spacing(style.DEFAULT_SPACING) - box_identity = gtk.HBox(spacing=style.DEFAULT_SPACING) - label_serial = gtk.Label(_('Serial Number:')) + box_identity = Gtk.HBox(spacing=style.DEFAULT_SPACING) + label_serial = Gtk.Label(label=_('Serial Number:')) label_serial.set_alignment(1, 0) - label_serial.modify_fg(gtk.STATE_NORMAL, + label_serial.modify_fg(Gtk.StateType.NORMAL, style.COLOR_SELECTION_GREY.get_gdk_color()) - box_identity.pack_start(label_serial, expand=False) + box_identity.pack_start(label_serial, False, True, 0) self._group.add_widget(label_serial) label_serial.show() - label_serial_no = gtk.Label(self._model.get_serial_number()) + label_serial_no = Gtk.Label(label=self._model.get_serial_number()) label_serial_no.set_alignment(0, 0) - box_identity.pack_start(label_serial_no, expand=False) + box_identity.pack_start(label_serial_no, False, True, 0) label_serial_no.show() - vbox_identity.pack_start(box_identity, expand=False) + vbox_identity.pack_start(box_identity, False, True, 0) box_identity.show() - self._vbox.pack_start(vbox_identity, expand=False) + self._vbox.pack_start(vbox_identity, False, True, 0) vbox_identity.show() def _setup_software(self): - separator_software = gtk.HSeparator() - self._vbox.pack_start(separator_software, expand=False) + separator_software = Gtk.HSeparator() + self._vbox.pack_start(separator_software, False, True, 0) separator_software.show() - label_software = gtk.Label(_('Software')) + label_software = Gtk.Label(label=_('Software')) label_software.set_alignment(0, 0) - self._vbox.pack_start(label_software, expand=False) + self._vbox.pack_start(label_software, False, True, 0) label_software.show() - box_software = gtk.VBox() + box_software = Gtk.VBox() box_software.set_border_width(style.DEFAULT_SPACING * 2) box_software.set_spacing(style.DEFAULT_SPACING) - box_build = gtk.HBox(spacing=style.DEFAULT_SPACING) - label_build = gtk.Label(_('Build:')) + box_build = Gtk.HBox(spacing=style.DEFAULT_SPACING) + label_build = Gtk.Label(label=_('Build:')) label_build.set_alignment(1, 0) - label_build.modify_fg(gtk.STATE_NORMAL, + label_build.modify_fg(Gtk.StateType.NORMAL, style.COLOR_SELECTION_GREY.get_gdk_color()) - box_build.pack_start(label_build, expand=False) + box_build.pack_start(label_build, False, True, 0) self._group.add_widget(label_build) label_build.show() - label_build_no = gtk.Label(self._model.get_build_number()) + label_build_no = Gtk.Label(label=self._model.get_build_number()) label_build_no.set_alignment(0, 0) - box_build.pack_start(label_build_no, expand=False) + box_build.pack_start(label_build_no, False, True, 0) label_build_no.show() - box_software.pack_start(box_build, expand=False) + box_software.pack_start(box_build, False, True, 0) box_build.show() - box_sugar = gtk.HBox(spacing=style.DEFAULT_SPACING) - label_sugar = gtk.Label(_('Sugar:')) + box_sugar = Gtk.HBox(spacing=style.DEFAULT_SPACING) + label_sugar = Gtk.Label(label=_('Sugar:')) label_sugar.set_alignment(1, 0) - label_sugar.modify_fg(gtk.STATE_NORMAL, + label_sugar.modify_fg(Gtk.StateType.NORMAL, style.COLOR_SELECTION_GREY.get_gdk_color()) - box_sugar.pack_start(label_sugar, expand=False) + box_sugar.pack_start(label_sugar, False, True, 0) self._group.add_widget(label_sugar) label_sugar.show() - label_sugar_ver = gtk.Label(config.version) + label_sugar_ver = Gtk.Label(label=config.version) label_sugar_ver.set_alignment(0, 0) - box_sugar.pack_start(label_sugar_ver, expand=False) + box_sugar.pack_start(label_sugar_ver, False, True, 0) label_sugar_ver.show() - box_software.pack_start(box_sugar, expand=False) + box_software.pack_start(box_sugar, False, True, 0) box_sugar.show() - box_firmware = gtk.HBox(spacing=style.DEFAULT_SPACING) - label_firmware = gtk.Label(_('Firmware:')) + box_firmware = Gtk.HBox(spacing=style.DEFAULT_SPACING) + label_firmware = Gtk.Label(label=_('Firmware:')) label_firmware.set_alignment(1, 0) - label_firmware.modify_fg(gtk.STATE_NORMAL, + label_firmware.modify_fg(Gtk.StateType.NORMAL, style.COLOR_SELECTION_GREY.get_gdk_color()) - box_firmware.pack_start(label_firmware, expand=False) + box_firmware.pack_start(label_firmware, False, True, 0) self._group.add_widget(label_firmware) label_firmware.show() - label_firmware_no = gtk.Label(self._model.get_firmware_number()) + label_firmware_no = Gtk.Label(label=self._model.get_firmware_number()) label_firmware_no.set_alignment(0, 0) - box_firmware.pack_start(label_firmware_no, expand=False) + box_firmware.pack_start(label_firmware_no, False, True, 0) label_firmware_no.show() - box_software.pack_start(box_firmware, expand=False) + box_software.pack_start(box_firmware, False, True, 0) box_firmware.show() - box_wireless_fw = gtk.HBox(spacing=style.DEFAULT_SPACING) - label_wireless_fw = gtk.Label(_('Wireless Firmware:')) + box_wireless_fw = Gtk.HBox(spacing=style.DEFAULT_SPACING) + label_wireless_fw = Gtk.Label(label=_('Wireless Firmware:')) label_wireless_fw.set_alignment(1, 0) - label_wireless_fw.modify_fg(gtk.STATE_NORMAL, + label_wireless_fw.modify_fg(Gtk.StateType.NORMAL, style.COLOR_SELECTION_GREY.get_gdk_color()) - box_wireless_fw.pack_start(label_wireless_fw, expand=False) + box_wireless_fw.pack_start(label_wireless_fw, False, True, 0) self._group.add_widget(label_wireless_fw) label_wireless_fw.show() wireless_fw_no = self._model.get_wireless_firmware() - label_wireless_fw_no = gtk.Label(wireless_fw_no) + label_wireless_fw_no = Gtk.Label(label=wireless_fw_no) label_wireless_fw_no.set_alignment(0, 0) - box_wireless_fw.pack_start(label_wireless_fw_no, expand=False) + box_wireless_fw.pack_start(label_wireless_fw_no, False, True, 0) label_wireless_fw_no.show() - box_software.pack_start(box_wireless_fw, expand=False) + box_software.pack_start(box_wireless_fw, False, True, 0) box_wireless_fw.show() - self._vbox.pack_start(box_software, expand=False) + self._vbox.pack_start(box_software, False, True, 0) box_software.show() def _setup_copyright(self): - separator_copyright = gtk.HSeparator() - self._vbox.pack_start(separator_copyright, expand=False) + separator_copyright = Gtk.HSeparator() + self._vbox.pack_start(separator_copyright, False, True, 0) separator_copyright.show() - label_copyright = gtk.Label(_('Copyright and License')) + label_copyright = Gtk.Label(label=_('Copyright and License')) label_copyright.set_alignment(0, 0) - self._vbox.pack_start(label_copyright, expand=False) + self._vbox.pack_start(label_copyright, False, True, 0) label_copyright.show() - vbox_copyright = gtk.VBox() + vbox_copyright = Gtk.VBox() vbox_copyright.set_border_width(style.DEFAULT_SPACING * 2) vbox_copyright.set_spacing(style.DEFAULT_SPACING) copyright_text = '© 2006-2012 One Laptop per Child Association Inc,' \ ' Sugar Labs Inc, Red Hat Inc, Collabora Ltd and' \ ' Contributors.' - label_copyright = gtk.Label(copyright_text) + label_copyright = Gtk.Label(label=copyright_text) label_copyright.set_alignment(0, 0) - label_copyright.set_size_request(gtk.gdk.screen_width() / 2, -1) + label_copyright.set_size_request(Gdk.Screen.width() / 2, -1) label_copyright.set_line_wrap(True) label_copyright.show() - vbox_copyright.pack_start(label_copyright, expand=False) + vbox_copyright.pack_start(label_copyright, False, True, 0) info_text = _('Sugar is the graphical user interface that you are' ' looking at. Sugar is free software, covered by the' ' GNU General Public License, and you are welcome to' ' change it and/or distribute copies of it under' ' certain conditions described therein.') - label_info = gtk.Label(info_text) + label_info = Gtk.Label(label=info_text) label_info.set_alignment(0, 0) label_info.set_line_wrap(True) - label_info.set_size_request(gtk.gdk.screen_width() / 2, -1) + label_info.set_size_request(Gdk.Screen.width() / 2, -1) label_info.show() - vbox_copyright.pack_start(label_info, expand=False) + vbox_copyright.pack_start(label_info, False, True, 0) - expander = gtk.Expander(_('Full license:')) + expander = Gtk.Expander(_('Full license:')) expander.connect('notify::expanded', self.license_expander_cb) expander.show() - vbox_copyright.pack_start(expander, expand=True) + vbox_copyright.pack_start(expander, True, True, 0) - self._vbox.pack_start(vbox_copyright, expand=True) + self._vbox.pack_start(vbox_copyright, True, True, 0) vbox_copyright.show() def license_expander_cb(self, expander, param_spec): # load/destroy the license viewer on-demand, to avoid storing the # GPL in memory at all times if expander.get_expanded(): - view_license = gtk.TextView() + view_license = Gtk.TextView() view_license.set_editable(False) view_license.get_buffer().set_text(self._model.get_license()) view_license.show() diff --git a/extensions/cpsection/aboutme/__init__.py b/extensions/cpsection/aboutme/__init__.py index 7ded428..67e1dd5 100644 --- a/extensions/cpsection/aboutme/__init__.py +++ b/extensions/cpsection/aboutme/__init__.py @@ -15,12 +15,12 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA from gettext import gettext as _ -import gconf +from gi.repository import GConf from sugar.graphics.xocolor import XoColor CLASS = 'AboutMe' ICON = 'module-about_me' TITLE = _('About Me') -client = gconf.client_get_default() +client = GConf.Client.get_default() COLOR = XoColor(client.get_string('/desktop/sugar/user/color')) diff --git a/extensions/cpsection/aboutme/model.py b/extensions/cpsection/aboutme/model.py index fb4c2f1..ad1de66 100644 --- a/extensions/cpsection/aboutme/model.py +++ b/extensions/cpsection/aboutme/model.py @@ -16,7 +16,7 @@ # from gettext import gettext as _ -import gconf +from gi.repository import GConf _COLORS = { @@ -32,7 +32,7 @@ _MODIFIERS = ('dark', 'medium', 'light') def get_nick(): - client = gconf.client_get_default() + client = GConf.Client.get_default() return client.get_string('/desktop/sugar/user/nick') @@ -48,13 +48,13 @@ def set_nick(nick): raise ValueError(_('You must enter a name.')) if not isinstance(nick, unicode): nick = unicode(nick, 'utf-8') - client = gconf.client_get_default() + client = GConf.Client.get_default() client.set_string('/desktop/sugar/user/nick', nick) return 1 def get_color(): - client = gconf.client_get_default() + client = GConf.Client.get_default() return client.get_string('/desktop/sugar/user/color') @@ -106,13 +106,13 @@ def set_color(stroke, fill, stroke_modifier='medium', fill_modifier='medium'): color = _COLORS[stroke][stroke_modifier] + ',' \ + _COLORS[fill][fill_modifier] - client = gconf.client_get_default() + client = GConf.Client.get_default() client.set_string('/desktop/sugar/user/color', color) return 1 def get_color_xo(): - client = gconf.client_get_default() + client = GConf.Client.get_default() return client.get_string('/desktop/sugar/user/color') @@ -120,6 +120,6 @@ def set_color_xo(color): """Set a color with an XoColor This method is used by the graphical user interface """ - client = gconf.client_get_default() + client = GConf.Client.get_default() client.set_string('/desktop/sugar/user/color', color) return 1 diff --git a/extensions/cpsection/aboutme/view.py b/extensions/cpsection/aboutme/view.py index ea7c7c8..143ec26 100644 --- a/extensions/cpsection/aboutme/view.py +++ b/extensions/cpsection/aboutme/view.py @@ -15,8 +15,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -import gtk -import gobject +from gi.repository import Gtk +from gi.repository import GObject from gettext import gettext as _ from sugar.graphics import style @@ -113,8 +113,8 @@ _PREVIOUS_STROKE_COLOR = 4 class ColorPicker(EventIcon): __gsignals__ = { - 'color-changed': (gobject.SIGNAL_RUN_FIRST, - gobject.TYPE_NONE, + 'color-changed': (GObject.SignalFlags.RUN_FIRST, + None, ([object])), } @@ -157,11 +157,11 @@ class AboutMe(SectionView): self.set_border_width(style.DEFAULT_SPACING * 2) self.set_spacing(style.DEFAULT_SPACING) - self._group = gtk.SizeGroup(gtk.SIZE_GROUP_HORIZONTAL) + self._group = Gtk.SizeGroup(Gtk.SizeGroupMode.HORIZONTAL) - self._color_label = gtk.HBox(spacing=style.DEFAULT_SPACING) - self._color_box = gtk.HBox(spacing=style.DEFAULT_SPACING) - self._color_alert_box = gtk.HBox(spacing=style.DEFAULT_SPACING) + self._color_label = Gtk.HBox(spacing=style.DEFAULT_SPACING) + self._color_box = Gtk.HBox(spacing=style.DEFAULT_SPACING) + self._color_alert_box = Gtk.HBox(spacing=style.DEFAULT_SPACING) self._color_alert = None self._pickers = { @@ -176,35 +176,35 @@ class AboutMe(SectionView): initial_color = XoColor(self._model.get_color_xo()) self._update_pickers(initial_color) - self._nick_box = gtk.HBox(spacing=style.DEFAULT_SPACING) - self._nick_alert_box = gtk.HBox(spacing=style.DEFAULT_SPACING) + self._nick_box = Gtk.HBox(spacing=style.DEFAULT_SPACING) + self._nick_alert_box = Gtk.HBox(spacing=style.DEFAULT_SPACING) self._nick_entry = None self._nick_alert = None self._setup_nick() self.setup() def _setup_nick(self): - self._nick_entry = gtk.Entry() - self._nick_entry.modify_bg(gtk.STATE_INSENSITIVE, + self._nick_entry = Gtk.Entry() + self._nick_entry.modify_bg(Gtk.StateType.INSENSITIVE, style.COLOR_WHITE.get_gdk_color()) - self._nick_entry.modify_base(gtk.STATE_INSENSITIVE, + self._nick_entry.modify_base(Gtk.StateType.INSENSITIVE, style.COLOR_WHITE.get_gdk_color()) self._nick_entry.set_width_chars(25) - self._nick_box.pack_start(self._nick_entry, expand=False) + self._nick_box.pack_start(self._nick_entry, False, True, 0) self._nick_entry.show() - label_entry_error = gtk.Label() + label_entry_error = Gtk.Label() self._group.add_widget(label_entry_error) - self._nick_alert_box.pack_start(label_entry_error, expand=False) + self._nick_alert_box.pack_start(label_entry_error, False, True, 0) label_entry_error.show() self._nick_alert = InlineAlert() - self._nick_alert_box.pack_start(self._nick_alert) + self._nick_alert_box.pack_start(self._nick_alert, True, True, 0) if 'nick' in self.restart_alerts: self._nick_alert.props.msg = self.restart_msg self._nick_alert.show() - self._center_in_panel = gtk.Alignment(0.5) + self._center_in_panel = Gtk.Alignment.new(0.5) self._center_in_panel.add(self._nick_box) self.pack_start(self._center_in_panel, False) self.pack_start(self._nick_alert_box, False) @@ -213,40 +213,40 @@ class AboutMe(SectionView): self._center_in_panel.show() def _setup_color(self): - label_color = gtk.Label(_('Click to change your color:')) - label_color.modify_fg(gtk.STATE_NORMAL, + label_color = Gtk.Label(label=_('Click to change your color:')) + label_color.modify_fg(Gtk.StateType.NORMAL, style.COLOR_SELECTION_GREY.get_gdk_color()) self._group.add_widget(label_color) - self._color_label.pack_start(label_color, expand=False) + self._color_label.pack_start(label_color, False, True, 0) label_color.show() for picker_index in sorted(self._pickers.keys()): if picker_index == _CURRENT_COLOR: - left_separator = gtk.SeparatorToolItem() + left_separator = Gtk.SeparatorToolItem() left_separator.show() - self._color_box.pack_start(left_separator, expand=False) + self._color_box.pack_start(left_separator, False, True, 0) picker = self._pickers[picker_index] picker.show() - self._color_box.pack_start(picker, expand=False) + self._color_box.pack_start(picker, False, True, 0) if picker_index == _CURRENT_COLOR: - right_separator = gtk.SeparatorToolItem() + right_separator = Gtk.SeparatorToolItem() right_separator.show() - self._color_box.pack_start(right_separator, expand=False) + self._color_box.pack_start(right_separator, False, True, 0) - label_color_error = gtk.Label() + label_color_error = Gtk.Label() self._group.add_widget(label_color_error) - self._color_alert_box.pack_start(label_color_error, expand=False) + self._color_alert_box.pack_start(label_color_error, False, True, 0) label_color_error.show() self._color_alert = InlineAlert() - self._color_alert_box.pack_start(self._color_alert) + self._color_alert_box.pack_start(self._color_alert, True, True, 0) if 'color' in self.restart_alerts: self._color_alert.props.msg = self.restart_msg self._color_alert.show() - self._center_in_panel = gtk.Alignment(0.5) + self._center_in_panel = Gtk.Alignment.new(0.5) self._center_in_panel.add(self._color_box) self.pack_start(self._color_label, False) self.pack_start(self._center_in_panel, False) @@ -283,8 +283,8 @@ class AboutMe(SectionView): def __nick_changed_cb(self, widget, data=None): if self._nick_sid: - gobject.source_remove(self._nick_sid) - self._nick_sid = gobject.timeout_add(self._APPLY_TIMEOUT, + GObject.source_remove(self._nick_sid) + self._nick_sid = GObject.timeout_add(self._APPLY_TIMEOUT, self.__nick_timeout_cb, widget) def __nick_timeout_cb(self, widget): diff --git a/extensions/cpsection/datetime/model.py b/extensions/cpsection/datetime/model.py index 84e1259..c9b4586 100644 --- a/extensions/cpsection/datetime/model.py +++ b/extensions/cpsection/datetime/model.py @@ -22,7 +22,7 @@ import os from gettext import gettext as _ -import gconf +from gi.repository import GConf _zone_tab = '/usr/share/zoneinfo/zone.tab' @@ -71,7 +71,7 @@ def read_all_timezones(fn=_zone_tab): def get_timezone(): - client = gconf.client_get_default() + client = GConf.Client.get_default() return client.get_string('/desktop/sugar/date/timezone') @@ -86,7 +86,7 @@ def set_timezone(timezone): timezones = read_all_timezones() if timezone in timezones: os.environ['TZ'] = timezone - client = gconf.client_get_default() + client = GConf.Client.get_default() client.set_string('/desktop/sugar/date/timezone', timezone) else: raise ValueError(_('Error timezone does not exist.')) diff --git a/extensions/cpsection/datetime/view.py b/extensions/cpsection/datetime/view.py index 1cef78f..e800856 100644 --- a/extensions/cpsection/datetime/view.py +++ b/extensions/cpsection/datetime/view.py @@ -14,8 +14,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -import gtk -import gobject +from gi.repository import Gtk +from gi.repository import GObject from gettext import gettext as _ from sugar.graphics import style @@ -43,45 +43,45 @@ class TimeZone(SectionView): self._entry.set_icon_from_name(iconentry.ICON_ENTRY_PRIMARY, 'system-search') self._entry.add_clear_button() - self._entry.modify_bg(gtk.STATE_INSENSITIVE, + self._entry.modify_bg(Gtk.StateType.INSENSITIVE, style.COLOR_WHITE.get_gdk_color()) - self._entry.modify_base(gtk.STATE_INSENSITIVE, + self._entry.modify_base(Gtk.StateType.INSENSITIVE, style.COLOR_WHITE.get_gdk_color()) self.pack_start(self._entry, False) self._entry.show() - self._scrolled_window = gtk.ScrolledWindow() - self._scrolled_window.set_policy(gtk.POLICY_NEVER, - gtk.POLICY_AUTOMATIC) - self._scrolled_window.set_shadow_type(gtk.SHADOW_IN) + self._scrolled_window = Gtk.ScrolledWindow() + self._scrolled_window.set_policy(Gtk.PolicyType.NEVER, + Gtk.PolicyType.AUTOMATIC) + self._scrolled_window.set_shadow_type(Gtk.ShadowType.IN) - self._store = gtk.ListStore(gobject.TYPE_STRING) + self._store = Gtk.ListStore(GObject.TYPE_STRING) zones = model.read_all_timezones() for zone in zones: self._store.append([zone]) - self._treeview = gtk.TreeView(self._store) + self._treeview = Gtk.TreeView(self._store) self._treeview.set_search_entry(self._entry) self._treeview.set_search_equal_func(self._search) self._treeview.set_search_column(0) self._scrolled_window.add(self._treeview) self._treeview.show() - self._timezone_column = gtk.TreeViewColumn(_('Timezone')) - self._cell = gtk.CellRendererText() + self._timezone_column = Gtk.TreeViewColumn(_('Timezone')) + self._cell = Gtk.CellRendererText() self._timezone_column.pack_start(self._cell, True) self._timezone_column.add_attribute(self._cell, 'text', 0) self._timezone_column.set_sort_column_id(0) self._treeview.append_column(self._timezone_column) - self.pack_start(self._scrolled_window) + self.pack_start(self._scrolled_window, True, True, 0) self._scrolled_window.show() - self._zone_alert_box = gtk.HBox(spacing=style.DEFAULT_SPACING) + self._zone_alert_box = Gtk.HBox(spacing=style.DEFAULT_SPACING) self.pack_start(self._zone_alert_box, False) self._zone_alert = InlineAlert() - self._zone_alert_box.pack_start(self._zone_alert) + self._zone_alert_box.pack_start(self._zone_alert, True, True, 0) if 'zone' in self.restart_alerts: self._zone_alert.props.msg = self.restart_msg self._zone_alert.show() @@ -125,8 +125,8 @@ class TimeZone(SectionView): return False if self._zone_sid: - gobject.source_remove(self._zone_sid) - self._zone_sid = gobject.timeout_add(self._APPLY_TIMEOUT, + GObject.source_remove(self._zone_sid) + self._zone_sid = GObject.timeout_add(self._APPLY_TIMEOUT, self.__zone_timeout_cb, row) return True diff --git a/extensions/cpsection/frame/model.py b/extensions/cpsection/frame/model.py index 4796062..d4039f6 100644 --- a/extensions/cpsection/frame/model.py +++ b/extensions/cpsection/frame/model.py @@ -16,11 +16,11 @@ # from gettext import gettext as _ -import gconf +from gi.repository import GConf def get_corner_delay(): - client = gconf.client_get_default() + client = GConf.Client.get_default() corner_delay = client.get_int('/desktop/sugar/frame/corner_delay') return corner_delay @@ -39,13 +39,13 @@ def set_corner_delay(delay): int(delay) except ValueError: raise ValueError(_('Value must be an integer.')) - client = gconf.client_get_default() + client = GConf.Client.get_default() client.set_int('/desktop/sugar/frame/corner_delay', int(delay)) return 0 def get_edge_delay(): - client = gconf.client_get_default() + client = GConf.Client.get_default() edge_delay = client.get_int('/desktop/sugar/frame/edge_delay') return edge_delay @@ -64,6 +64,6 @@ def set_edge_delay(delay): int(delay) except ValueError: raise ValueError(_('Value must be an integer.')) - client = gconf.client_get_default() + client = GConf.Client.get_default() client.set_int('/desktop/sugar/frame/edge_delay', int(delay)) return 0 diff --git a/extensions/cpsection/frame/view.py b/extensions/cpsection/frame/view.py index 8b4ab83..6d314f0 100644 --- a/extensions/cpsection/frame/view.py +++ b/extensions/cpsection/frame/view.py @@ -14,8 +14,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -import gtk -import gobject +from gi.repository import Gtk +from gi.repository import GObject from gettext import gettext as _ from sugar.graphics import style @@ -45,18 +45,18 @@ class Frame(SectionView): self.set_border_width(style.DEFAULT_SPACING * 2) self.set_spacing(style.DEFAULT_SPACING) - self._group = gtk.SizeGroup(gtk.SIZE_GROUP_HORIZONTAL) + self._group = Gtk.SizeGroup(Gtk.SizeGroupMode.HORIZONTAL) - separator = gtk.HSeparator() - self.pack_start(separator, expand=False) + separator = Gtk.HSeparator() + self.pack_start(separator, False, True, 0) separator.show() - label_activation = gtk.Label(_('Activation Delay')) + label_activation = Gtk.Label(label=_('Activation Delay')) label_activation.set_alignment(0, 0) - self.pack_start(label_activation, expand=False) + self.pack_start(label_activation, False, True, 0) label_activation.show() - self._box_sliders = gtk.VBox() + self._box_sliders = Gtk.VBox() self._box_sliders.set_border_width(style.DEFAULT_SPACING * 2) self._box_sliders.set_spacing(style.DEFAULT_SPACING) @@ -68,76 +68,76 @@ class Frame(SectionView): self._edge_delay_alert = None self._setup_edge() - self.pack_start(self._box_sliders, expand=False) + self.pack_start(self._box_sliders, False, True, 0) self._box_sliders.show() self.setup() def _setup_corner(self): - box_delay = gtk.HBox(spacing=style.DEFAULT_SPACING) - label_delay = gtk.Label(_('Corner')) + box_delay = Gtk.HBox(spacing=style.DEFAULT_SPACING) + label_delay = Gtk.Label(label=_('Corner')) label_delay.set_alignment(1, 0.75) - label_delay.modify_fg(gtk.STATE_NORMAL, + label_delay.modify_fg(Gtk.StateType.NORMAL, style.COLOR_SELECTION_GREY.get_gdk_color()) - box_delay.pack_start(label_delay, expand=False) + box_delay.pack_start(label_delay, False, True, 0) self._group.add_widget(label_delay) label_delay.show() - adj = gtk.Adjustment(value=100, lower=0, upper=_MAX_DELAY, + adj = Gtk.Adjustment(value=100, lower=0, upper=_MAX_DELAY, step_incr=100, page_incr=100, page_size=0) - self._corner_delay_slider = gtk.HScale(adj) + self._corner_delay_slider = Gtk.HScale(adj) self._corner_delay_slider.set_digits(0) self._corner_delay_slider.connect('format-value', self.__corner_delay_format_cb) - box_delay.pack_start(self._corner_delay_slider) + box_delay.pack_start(self._corner_delay_slider, True, True, 0) self._corner_delay_slider.show() - self._box_sliders.pack_start(box_delay, expand=False) + self._box_sliders.pack_start(box_delay, False, True, 0) box_delay.show() self._corner_delay_alert = InlineAlert() - label_delay_error = gtk.Label() + label_delay_error = Gtk.Label() self._group.add_widget(label_delay_error) - delay_alert_box = gtk.HBox(spacing=style.DEFAULT_SPACING) - delay_alert_box.pack_start(label_delay_error, expand=False) + delay_alert_box = Gtk.HBox(spacing=style.DEFAULT_SPACING) + delay_alert_box.pack_start(label_delay_error, False, True, 0) label_delay_error.show() - delay_alert_box.pack_start(self._corner_delay_alert, expand=False) - self._box_sliders.pack_start(delay_alert_box, expand=False) + delay_alert_box.pack_start(self._corner_delay_alert, False, True, 0) + self._box_sliders.pack_start(delay_alert_box, False, True, 0) delay_alert_box.show() if 'corner_delay' in self.restart_alerts: self._corner_delay_alert.props.msg = self.restart_msg self._corner_delay_alert.show() def _setup_edge(self): - box_delay = gtk.HBox(spacing=style.DEFAULT_SPACING) - label_delay = gtk.Label(_('Edge')) + box_delay = Gtk.HBox(spacing=style.DEFAULT_SPACING) + label_delay = Gtk.Label(label=_('Edge')) label_delay.set_alignment(1, 0.75) - label_delay.modify_fg(gtk.STATE_NORMAL, + label_delay.modify_fg(Gtk.StateType.NORMAL, style.COLOR_SELECTION_GREY.get_gdk_color()) - box_delay.pack_start(label_delay, expand=False) + box_delay.pack_start(label_delay, False, True, 0) self._group.add_widget(label_delay) label_delay.show() - adj = gtk.Adjustment(value=100, lower=0, upper=_MAX_DELAY, + adj = Gtk.Adjustment(value=100, lower=0, upper=_MAX_DELAY, step_incr=100, page_incr=100, page_size=0) - self._edge_delay_slider = gtk.HScale(adj) + self._edge_delay_slider = Gtk.HScale(adj) self._edge_delay_slider.set_digits(0) self._edge_delay_slider.connect('format-value', self.__edge_delay_format_cb) - box_delay.pack_start(self._edge_delay_slider) + box_delay.pack_start(self._edge_delay_slider, True, True, 0) self._edge_delay_slider.show() - self._box_sliders.pack_start(box_delay, expand=False) + self._box_sliders.pack_start(box_delay, False, True, 0) box_delay.show() self._edge_delay_alert = InlineAlert() - label_delay_error = gtk.Label() + label_delay_error = Gtk.Label() self._group.add_widget(label_delay_error) - delay_alert_box = gtk.HBox(spacing=style.DEFAULT_SPACING) - delay_alert_box.pack_start(label_delay_error, expand=False) + delay_alert_box = Gtk.HBox(spacing=style.DEFAULT_SPACING) + delay_alert_box.pack_start(label_delay_error, False, True, 0) label_delay_error.show() - delay_alert_box.pack_start(self._edge_delay_alert, expand=False) - self._box_sliders.pack_start(delay_alert_box, expand=False) + delay_alert_box.pack_start(self._edge_delay_alert, False, True, 0) + self._box_sliders.pack_start(delay_alert_box, False, True, 0) delay_alert_box.show() if 'edge_delay' in self.restart_alerts: self._edge_delay_alert.props.msg = self.restart_msg @@ -169,8 +169,8 @@ class Frame(SectionView): def __corner_delay_changed_cb(self, scale, data=None): if self._corner_delay_sid: - gobject.source_remove(self._corner_delay_sid) - self._corner_delay_sid = gobject.timeout_add( \ + GObject.source_remove(self._corner_delay_sid) + self._corner_delay_sid = GObject.timeout_add( \ self._APPLY_TIMEOUT, self.__corner_delay_timeout_cb, scale) def __corner_delay_timeout_cb(self, scale): @@ -202,8 +202,8 @@ class Frame(SectionView): def __edge_delay_changed_cb(self, scale, data=None): if self._edge_delay_sid: - gobject.source_remove(self._edge_delay_sid) - self._edge_delay_sid = gobject.timeout_add( \ + GObject.source_remove(self._edge_delay_sid) + self._edge_delay_sid = GObject.timeout_add( \ self._APPLY_TIMEOUT, self.__edge_delay_timeout_cb, scale) def __edge_delay_timeout_cb(self, scale): diff --git a/extensions/cpsection/keyboard/model.py b/extensions/cpsection/keyboard/model.py index 1f92973..b5bc53a 100644 --- a/extensions/cpsection/keyboard/model.py +++ b/extensions/cpsection/keyboard/model.py @@ -17,7 +17,7 @@ # import xklavier -import gconf +from gi.repository import GConf _GROUP_NAME = 'grp' # The XKB name for group switch options @@ -35,7 +35,7 @@ class KeyboardManager(object): self._configrec = xklavier.ConfigRec() self._configrec.get_from_server(self._engine) - self._gconf_client = gconf.client_get_default() + self._gconf_client = GConf.Client.get_default() def _populate_one(self, config_registry, item, store): store.append([item.get_description(), item.get_name()]) @@ -94,7 +94,7 @@ class KeyboardManager(object): def get_current_layouts(self): """Return the enabled keyboard layouts with variants""" - layouts = self._gconf_client.get_list(_LAYOUTS_KEY, gconf.VALUE_STRING) + layouts = self._gconf_client.get_list(_LAYOUTS_KEY, GConf.ValueType.STRING) if layouts: return layouts @@ -116,7 +116,7 @@ class KeyboardManager(object): def get_current_option_group(self): """Return the enabled option for switching keyboard group""" - options = self._gconf_client.get_list(_OPTIONS_KEY, gconf.VALUE_STRING) + options = self._gconf_client.get_list(_OPTIONS_KEY, GConf.ValueType.STRING) if not options: options = self._configrec.get_options() @@ -149,7 +149,7 @@ class KeyboardManager(object): options = option_group else: options = [option_group] - self._gconf_client.set_list(_OPTIONS_KEY, gconf.VALUE_STRING, options) + self._gconf_client.set_list(_OPTIONS_KEY, GConf.ValueType.STRING, options) self._configrec.set_options(options) self._configrec.activate(self._engine) @@ -157,7 +157,7 @@ class KeyboardManager(object): """Sets the supplied keyboard layouts (with variants)""" if layouts is None or not layouts: return - self._gconf_client.set_list(_LAYOUTS_KEY, gconf.VALUE_STRING, layouts) + self._gconf_client.set_list(_LAYOUTS_KEY, GConf.ValueType.STRING, layouts) layouts_list = [] variants_list = [] for layout in layouts: diff --git a/extensions/cpsection/keyboard/view.py b/extensions/cpsection/keyboard/view.py index e349255..9f8b5e3 100644 --- a/extensions/cpsection/keyboard/view.py +++ b/extensions/cpsection/keyboard/view.py @@ -15,9 +15,9 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -import gtk -import gobject -import pango +from gi.repository import Gtk +from gi.repository import GObject +from gi.repository import Pango import logging from gettext import gettext as _ @@ -39,7 +39,7 @@ _APPLY_TIMEOUT = 500 # For more information, see: http://dev.sugarlabs.org/ticket/407 -class LayoutCombo(gtk.HBox): +class LayoutCombo(Gtk.HBox): """ Custom GTK widget with two comboboxes side by side, one for layout, and @@ -47,49 +47,49 @@ class LayoutCombo(gtk.HBox): """ __gsignals__ = { - 'selection-changed': (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, - (gobject.TYPE_STRING, gobject.TYPE_INT)), + 'selection-changed': (GObject.SignalFlags.RUN_LAST, None, + (GObject.TYPE_STRING, GObject.TYPE_INT)), } def __init__(self, keyboard_manager, n): - gtk.HBox.__init__(self) + GObject.GObject.__init__(self) self._keyboard_manager = keyboard_manager self._index = n self.set_border_width(style.DEFAULT_SPACING) self.set_spacing(style.DEFAULT_SPACING) - label = gtk.Label(' <b>%s</b> ' % str(n + 1)) + label = Gtk.Label(label=' <b>%s</b> ' % str(n + 1)) label.set_use_markup(True) - label.modify_fg(gtk.STATE_NORMAL, + label.modify_fg(Gtk.StateType.NORMAL, style.COLOR_SELECTION_GREY.get_gdk_color()) label.set_alignment(0.5, 0.5) - self.pack_start(label, expand=False) + self.pack_start(label, False, True, 0) - self._klang_store = gtk.ListStore(gobject.TYPE_STRING, \ - gobject.TYPE_STRING) + self._klang_store = Gtk.ListStore(GObject.TYPE_STRING, \ + GObject.TYPE_STRING) for description, name in self._keyboard_manager.get_languages(): self._klang_store.append([name, description]) - self._klang_combo = gtk.ComboBox(model=self._klang_store) + self._klang_combo = Gtk.ComboBox(model=self._klang_store) self._klang_combo_changed_id = \ self._klang_combo.connect('changed', self._klang_combo_changed_cb) - cell = gtk.CellRendererText() - cell.props.ellipsize = pango.ELLIPSIZE_MIDDLE + cell = Gtk.CellRendererText() + cell.props.ellipsize = Pango.EllipsizeMode.MIDDLE cell.props.ellipsize_set = True - self._klang_combo.pack_start(cell) + self._klang_combo.pack_start(cell, True, True, 0) self._klang_combo.add_attribute(cell, 'text', 1) self.pack_start(self._klang_combo, expand=True, fill=True) self._kvariant_store = None - self._kvariant_combo = gtk.ComboBox(model=None) + self._kvariant_combo = Gtk.ComboBox(model=None) self._kvariant_combo_changed_id = \ self._kvariant_combo.connect('changed', \ self._kvariant_combo_changed_cb) - cell = gtk.CellRendererText() - cell.props.ellipsize = pango.ELLIPSIZE_MIDDLE + cell = Gtk.CellRendererText() + cell.props.ellipsize = Pango.EllipsizeMode.MIDDLE cell.props.ellipsize_set = True - self._kvariant_combo.pack_start(cell) + self._kvariant_combo.pack_start(cell, True, True, 0) self._kvariant_combo.add_attribute(cell, 'text', 1) self.pack_start(self._kvariant_combo, expand=True, fill=True) @@ -118,8 +118,8 @@ class LayoutCombo(gtk.HBox): return model.get(it, 0)[0] def _set_kvariant_store(self, lang): - self._kvariant_store = gtk.ListStore(gobject.TYPE_STRING, \ - gobject.TYPE_STRING) + self._kvariant_store = Gtk.ListStore(GObject.TYPE_STRING, \ + GObject.TYPE_STRING) layouts = self._keyboard_manager.get_layouts_for_language(lang) for description, name in layouts: self._kvariant_store.append([name, description]) @@ -157,18 +157,18 @@ class Keyboard(SectionView): self.set_border_width(style.DEFAULT_SPACING * 2) self.set_spacing(style.DEFAULT_SPACING) - self._layout_table = gtk.Table(rows=4, columns=2, homogeneous=False) + self._layout_table = Gtk.Table(rows=4, columns=2, homogeneous=False) self._keyboard_manager = model.KeyboardManager(self.get_display()) self._layout_combo_list = [] self._layout_addremovebox_list = [] - scrollwindow = gtk.ScrolledWindow() - scrollwindow.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC) - self.pack_start(scrollwindow, expand=True) + scrollwindow = Gtk.ScrolledWindow() + scrollwindow.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC) + self.pack_start(scrollwindow, True, True, 0) scrollwindow.show() - self._vbox = gtk.VBox() + self._vbox = Gtk.VBox() scrollwindow.add_with_viewport(self._vbox) self.__kmodel_sid = None @@ -183,29 +183,29 @@ class Keyboard(SectionView): def _setup_kmodel(self): """Adds the controls for changing the keyboard model""" - separator_kmodel = gtk.HSeparator() - self._vbox.pack_start(separator_kmodel, expand=False) + separator_kmodel = Gtk.HSeparator() + self._vbox.pack_start(separator_kmodel, False, True, 0) separator_kmodel.show_all() - label_kmodel = gtk.Label(_('Keyboard Model')) + label_kmodel = Gtk.Label(label=_('Keyboard Model')) label_kmodel.set_alignment(0, 0) - self._vbox.pack_start(label_kmodel, expand=False) + self._vbox.pack_start(label_kmodel, False, True, 0) label_kmodel.show_all() - box_kmodel = gtk.VBox() + box_kmodel = Gtk.VBox() box_kmodel.set_border_width(style.DEFAULT_SPACING * 2) box_kmodel.set_spacing(style.DEFAULT_SPACING) - kmodel_store = gtk.ListStore(gobject.TYPE_STRING, \ - gobject.TYPE_STRING) + kmodel_store = Gtk.ListStore(GObject.TYPE_STRING, \ + GObject.TYPE_STRING) for description, name in self._keyboard_manager.get_models(): kmodel_store.append([name, description]) - kmodel_combo = gtk.ComboBox(model=kmodel_store) - cell = gtk.CellRendererText() - cell.props.ellipsize = pango.ELLIPSIZE_MIDDLE + kmodel_combo = Gtk.ComboBox(model=kmodel_store) + cell = Gtk.CellRendererText() + cell.props.ellipsize = Pango.EllipsizeMode.MIDDLE cell.props.ellipsize_set = True - kmodel_combo.pack_start(cell) + kmodel_combo.pack_start(cell, True, True, 0) kmodel_combo.add_attribute(cell, 'text', 1) self._kmodel = self._keyboard_manager.get_current_model() @@ -215,16 +215,16 @@ class Keyboard(SectionView): kmodel_combo.set_active_iter(row.iter) break - box_kmodel.pack_start(kmodel_combo, expand=False) - self._vbox.pack_start(box_kmodel, expand=False) + box_kmodel.pack_start(kmodel_combo, False, True, 0) + self._vbox.pack_start(box_kmodel, False, True, 0) box_kmodel.show_all() kmodel_combo.connect('changed', self.__kmodel_changed_cb) def __kmodel_changed_cb(self, combobox): if self.__kmodel_sid is not None: - gobject.source_remove(self.__kmodel_sid) - self.__kmodel_sid = gobject.timeout_add(_APPLY_TIMEOUT, + GObject.source_remove(self.__kmodel_sid) + self.__kmodel_sid = GObject.timeout_add(_APPLY_TIMEOUT, self.__kmodel_timeout_cb, combobox) def __kmodel_timeout_cb(self, combobox): @@ -243,29 +243,29 @@ class Keyboard(SectionView): def _setup_group_switch_option(self): """Adds the controls for changing the group switch option of keyboard """ - separator_group_option = gtk.HSeparator() - self._vbox.pack_start(separator_group_option, expand=False) + separator_group_option = Gtk.HSeparator() + self._vbox.pack_start(separator_group_option, False, True, 0) separator_group_option.show_all() - label_group_option = gtk.Label(_('Key(s) to change layout')) + label_group_option = Gtk.Label(label=_('Key(s) to change layout')) label_group_option.set_alignment(0, 0) - self._vbox.pack_start(label_group_option, expand=False) + self._vbox.pack_start(label_group_option, False, True, 0) label_group_option.show_all() - box_group_option = gtk.VBox() + box_group_option = Gtk.VBox() box_group_option.set_border_width(style.DEFAULT_SPACING * 2) box_group_option.set_spacing(style.DEFAULT_SPACING) - group_option_store = gtk.ListStore(gobject.TYPE_STRING, \ - gobject.TYPE_STRING) + group_option_store = Gtk.ListStore(GObject.TYPE_STRING, \ + GObject.TYPE_STRING) for description, name in self._keyboard_manager.get_options_group(): group_option_store.append([name, description]) - group_option_combo = gtk.ComboBox(model=group_option_store) - cell = gtk.CellRendererText() - cell.props.ellipsize = pango.ELLIPSIZE_MIDDLE + group_option_combo = Gtk.ComboBox(model=group_option_store) + cell = Gtk.CellRendererText() + cell.props.ellipsize = Pango.EllipsizeMode.MIDDLE cell.props.ellipsize_set = True - group_option_combo.pack_start(cell) + group_option_combo.pack_start(cell, True, True, 0) group_option_combo.add_attribute(cell, 'text', 1) self._group_switch_option = \ @@ -282,8 +282,8 @@ class Keyboard(SectionView): if not found: group_option_combo.set_active(0) - box_group_option.pack_start(group_option_combo, expand=False) - self._vbox.pack_start(box_group_option, expand=False) + box_group_option.pack_start(group_option_combo, False, True, 0) + self._vbox.pack_start(box_group_option, False, True, 0) box_group_option.show_all() group_option_combo.connect('changed', \ @@ -291,8 +291,8 @@ class Keyboard(SectionView): def __group_switch_changed_cb(self, combobox): if self.__group_switch_sid is not None: - gobject.source_remove(self.__group_switch_sid) - self.__group_switch_sid = gobject.timeout_add(_APPLY_TIMEOUT, + GObject.source_remove(self.__group_switch_sid) + self.__group_switch_sid = GObject.timeout_add(_APPLY_TIMEOUT, self.__group_switch_timeout_cb, combobox) def __group_switch_timeout_cb(self, combobox): @@ -312,14 +312,14 @@ class Keyboard(SectionView): def _setup_layouts(self): """Adds the controls for changing the keyboard layouts""" - separator_klayout = gtk.HSeparator() - self._vbox.pack_start(separator_klayout, expand=False) + separator_klayout = Gtk.HSeparator() + self._vbox.pack_start(separator_klayout, False, True, 0) separator_klayout.show_all() - label_klayout = gtk.Label(_('Keyboard Layout(s)')) + label_klayout = Gtk.Label(label=_('Keyboard Layout(s)')) label_klayout.set_alignment(0, 0) label_klayout.show_all() - self._vbox.pack_start(label_klayout, expand=False) + self._vbox.pack_start(label_klayout, False, True, 0) self._klayouts = self._keyboard_manager.get_current_layouts() for i in range(0, self._keyboard_manager.get_max_layouts()): @@ -337,7 +337,7 @@ class Keyboard(SectionView): layout_combo.show_all() layout_combo.select_layout(self._klayouts[i]) - self._vbox.pack_start(self._layout_table, expand=False) + self._vbox.pack_start(self._layout_table, False, True, 0) self._layout_table.set_size_request(self._vbox.size_request()[0], -1) self._layout_table.show() self._update_klayouts() @@ -360,25 +360,25 @@ class Keyboard(SectionView): i += 1 def __create_add_remove_box(self): - """Creates gtk.Hbox with add/remove buttons""" + """Creates Gtk.Hbox with add/remove buttons""" add_icon = Icon(icon_name='list-add') - add_button = gtk.Button() + add_button = Gtk.Button() add_button.set_image(add_icon) add_button.connect('clicked', self.__add_button_clicked_cb) remove_icon = Icon(icon_name='list-remove') - remove_button = gtk.Button() + remove_button = Gtk.Button() remove_button.set_image(remove_icon) remove_button.connect('clicked', self.__remove_button_clicked_cb) - add_remove_box = gtk.HButtonBox() - add_remove_box.set_layout(gtk.BUTTONBOX_START) + add_remove_box = Gtk.HButtonBox() + add_remove_box.set_layout(Gtk.ButtonBoxStyle.START) add_remove_box.set_spacing(10) - add_remove_box.pack_start(add_button) - add_remove_box.pack_start(remove_button) + add_remove_box.pack_start(add_button, True, True, 0) + add_remove_box.pack_start(remove_button, True, True, 0) return add_remove_box @@ -403,8 +403,8 @@ class Keyboard(SectionView): self.__determine_add_remove_box_visibility() if self.__layout_sid is not None: - gobject.source_remove(self.__layout_sid) - self.__layout_sid = gobject.timeout_add(_APPLY_TIMEOUT, + GObject.source_remove(self.__layout_sid) + self.__layout_sid = GObject.timeout_add(_APPLY_TIMEOUT, self.__layout_timeout_cb) def __layout_timeout_cb(self): diff --git a/extensions/cpsection/language/view.py b/extensions/cpsection/language/view.py index 1553959..5c02a0a 100644 --- a/extensions/cpsection/language/view.py +++ b/extensions/cpsection/language/view.py @@ -15,8 +15,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -import gtk -import gobject +from gi.repository import Gtk +from gi.repository import GObject import gettext from sugar.graphics import style @@ -57,28 +57,28 @@ class Language(SectionView): explanation = gettext.gettext('Add languages in the order you prefer.' ' If a translation is not available,' ' the next in the list will be used.') - self._text = gtk.Label(explanation) + self._text = Gtk.Label(label=explanation) self._text.set_width_chars(100) self._text.set_line_wrap(True) self._text.set_alignment(0, 0) self.pack_start(self._text, False) self._text.show() - 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.show() - self.pack_start(scrolled, expand=True) + self.pack_start(scrolled, True, True, 0) - self._table = gtk.Table(rows=1, columns=3, homogeneous=False) + self._table = Gtk.Table(rows=1, columns=3, homogeneous=False) self._table.set_border_width(style.DEFAULT_SPACING * 2) self._table.show() scrolled.add_with_viewport(self._table) - self._lang_alert_box = gtk.HBox(spacing=style.DEFAULT_SPACING) + self._lang_alert_box = Gtk.HBox(spacing=style.DEFAULT_SPACING) self.pack_start(self._lang_alert_box, False) self._lang_alert = InlineAlert() - self._lang_alert_box.pack_start(self._lang_alert) + self._lang_alert_box.pack_start(self._lang_alert, True, True, 0) if 'lang' in self.restart_alerts: self._lang_alert.props.msg = self.restart_msg self._lang_alert.show() @@ -93,22 +93,22 @@ class Language(SectionView): self._table.resize(self._selected_lang_count, 3) - label = gtk.Label(str=str(self._selected_lang_count)) - label.modify_fg(gtk.STATE_NORMAL, + label = Gtk.Label(label=str=str(self._selected_lang_count)) + label.modify_fg(Gtk.StateType.NORMAL, style.COLOR_SELECTION_GREY.get_gdk_color()) self._labels.append(label) self._attach_to_table(label, 0, 1, padding=1) label.show() - store = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING) + store = Gtk.ListStore(GObject.TYPE_STRING, GObject.TYPE_STRING) for language, country, code in self._available_locales: description = '%s (%s)' % (_translate_language(language), \ _translate_country(country)) store.append([code, description]) - combobox = gtk.ComboBox(model=store) - cell = gtk.CellRendererText() - combobox.pack_start(cell) + combobox = Gtk.ComboBox(model=store) + cell = Gtk.CellRendererText() + combobox.pack_start(cell, True, True, 0) combobox.add_attribute(cell, 'text', 1) if locale_code: @@ -125,7 +125,7 @@ class Language(SectionView): self._stores.append(store) self._comboboxes.append(combobox) - self._attach_to_table(combobox, 1, 2, yoptions=gtk.SHRINK) + self._attach_to_table(combobox, 1, 2, yoptions=Gtk.AttachOptions.SHRINK) add_remove_box = self._create_add_remove_box() self._add_remove_boxes.append(add_remove_box) @@ -142,10 +142,10 @@ class Language(SectionView): combobox.show() def _attach_to_table(self, widget, row, column, padding=20, \ - yoptions=gtk.FILL): + yoptions=Gtk.AttachOptions.FILL): self._table.attach(widget, row, column, \ self._selected_lang_count - 1, self._selected_lang_count, \ - xoptions=gtk.FILL, yoptions=yoptions, xpadding=padding, \ + xoptions=Gtk.AttachOptions.FILL, yoptions=yoptions, xpadding=padding, \ ypadding=padding) def _delete_last_row(self): @@ -180,25 +180,25 @@ class Language(SectionView): self._lang_alert.hide() def _create_add_remove_box(self): - """Creates gtk.Hbox with add/remove buttons""" + """Creates Gtk.Hbox with add/remove buttons""" add_icon = Icon(icon_name='list-add') - add_button = gtk.Button() + add_button = Gtk.Button() add_button.set_image(add_icon) add_button.connect('clicked', self.__add_button_clicked_cb) remove_icon = Icon(icon_name='list-remove') - remove_button = gtk.Button() + remove_button = Gtk.Button() remove_button.set_image(remove_icon) remove_button.connect('clicked', self.__remove_button_clicked_cb) - add_remove_box = gtk.HButtonBox() - add_remove_box.set_layout(gtk.BUTTONBOX_START) + add_remove_box = Gtk.HButtonBox() + add_remove_box.set_layout(Gtk.ButtonBoxStyle.START) add_remove_box.set_spacing(10) - add_remove_box.pack_start(add_button) - add_remove_box.pack_start(remove_button) + add_remove_box.pack_start(add_button, True, True, 0) + add_remove_box.pack_start(remove_button, True, True, 0) return add_remove_box @@ -228,13 +228,13 @@ class Language(SectionView): self.restart_alerts.remove('lang') self._lang_alert.hide() if self._lang_sid: - gobject.source_remove(self._lang_sid) + GObject.source_remove(self._lang_sid) self._model.undo() return False if self._lang_sid: - gobject.source_remove(self._lang_sid) - self._lang_sid = gobject.timeout_add(self._APPLY_TIMEOUT, + GObject.source_remove(self._lang_sid) + self._lang_sid = GObject.timeout_add(self._APPLY_TIMEOUT, self.__lang_timeout_cb, selected_langs) diff --git a/extensions/cpsection/modemconfiguration/model.py b/extensions/cpsection/modemconfiguration/model.py index 969b5d9..f457293 100755 --- a/extensions/cpsection/modemconfiguration/model.py +++ b/extensions/cpsection/modemconfiguration/model.py @@ -17,7 +17,7 @@ import logging import dbus -import gtk +from gi.repository import Gtk from jarabe.model import network @@ -61,7 +61,7 @@ def get_modem_settings(): # wait til asynchronous execution completes while not secrets_call_done[0]: - gtk.main_iteration() + Gtk.main_iteration() return modem_settings diff --git a/extensions/cpsection/modemconfiguration/view.py b/extensions/cpsection/modemconfiguration/view.py index 4ce6c0d..62b6099 100644 --- a/extensions/cpsection/modemconfiguration/view.py +++ b/extensions/cpsection/modemconfiguration/view.py @@ -17,8 +17,8 @@ from gettext import gettext as _ import logging -import gtk -import gobject +from gi.repository import Gtk +from gi.repository import GObject from sugar.graphics import style @@ -28,28 +28,28 @@ from jarabe.controlpanel.sectionview import SectionView APPLY_TIMEOUT = 1000 -class EntryWithLabel(gtk.HBox): +class EntryWithLabel(Gtk.HBox): __gtype_name__ = 'SugarEntryWithLabel' def __init__(self, label_text): - gtk.HBox.__init__(self, spacing=style.DEFAULT_SPACING) + GObject.GObject.__init__(self, spacing=style.DEFAULT_SPACING) - self.label = gtk.Label(label_text) - self.label.modify_fg(gtk.STATE_NORMAL, + self.label = Gtk.Label(label=label_text) + self.label.modify_fg(Gtk.StateType.NORMAL, style.COLOR_SELECTION_GREY.get_gdk_color()) self.label.set_alignment(1, 0.5) - self.pack_start(self.label, expand=False) + self.pack_start(self.label, False, True, 0) self.label.show() - self._entry = gtk.Entry(25) + self._entry = Gtk.Entry(25) self._entry.set_width_chars(25) - self.pack_start(self._entry, expand=False) + self.pack_start(self._entry, False, True, 0) self._entry.show() def get_entry(self): return self._entry - entry = gobject.property(type=object, getter=get_entry) + entry = GObject.property(type=object, getter=get_entry) class ModemConfiguration(SectionView): @@ -62,12 +62,12 @@ class ModemConfiguration(SectionView): self.set_border_width(style.DEFAULT_SPACING) self.set_spacing(style.DEFAULT_SPACING) - self._group = gtk.SizeGroup(gtk.SIZE_GROUP_HORIZONTAL) + self._group = Gtk.SizeGroup(Gtk.SizeGroupMode.HORIZONTAL) explanation = _('You will need to provide the following information' ' to set up a mobile broadband connection to a' ' cellular (3G) network.') - self._text = gtk.Label(explanation) + self._text = Gtk.Label(label=explanation) self._text.set_width_chars(100) self._text.set_line_wrap(True) self._text.set_alignment(0, 0) @@ -77,31 +77,31 @@ class ModemConfiguration(SectionView): self._username_entry = EntryWithLabel(_('Username:')) self._username_entry.entry.connect('changed', self.__entry_changed_cb) self._group.add_widget(self._username_entry.label) - self.pack_start(self._username_entry, expand=False) + self.pack_start(self._username_entry, False, True, 0) self._username_entry.show() self._password_entry = EntryWithLabel(_('Password:')) self._password_entry.entry.connect('changed', self.__entry_changed_cb) self._group.add_widget(self._password_entry.label) - self.pack_start(self._password_entry, expand=False) + self.pack_start(self._password_entry, False, True, 0) self._password_entry.show() self._number_entry = EntryWithLabel(_('Number:')) self._number_entry.entry.connect('changed', self.__entry_changed_cb) self._group.add_widget(self._number_entry.label) - self.pack_start(self._number_entry, expand=False) + self.pack_start(self._number_entry, False, True, 0) self._number_entry.show() self._apn_entry = EntryWithLabel(_('Access Point Name (APN):')) self._apn_entry.entry.connect('changed', self.__entry_changed_cb) self._group.add_widget(self._apn_entry.label) - self.pack_start(self._apn_entry, expand=False) + self.pack_start(self._apn_entry, False, True, 0) self._apn_entry.show() self._pin_entry = EntryWithLabel(_('Personal Identity Number (PIN):')) self._pin_entry.entry.connect('changed', self.__entry_changed_cb) self._group.add_widget(self._pin_entry.label) - self.pack_start(self._pin_entry, expand=False) + self.pack_start(self._pin_entry, False, True, 0) self._pin_entry.show() self.setup() @@ -129,8 +129,8 @@ class ModemConfiguration(SectionView): def __entry_changed_cb(self, widget, data=None): if self._timeout_sid: - gobject.source_remove(self._timeout_sid) - self._timeout_sid = gobject.timeout_add(APPLY_TIMEOUT, + GObject.source_remove(self._timeout_sid) + self._timeout_sid = GObject.timeout_add(APPLY_TIMEOUT, self.__timeout_cb) def __timeout_cb(self): diff --git a/extensions/cpsection/network/model.py b/extensions/cpsection/network/model.py index 4ddab35..ae9e64d 100644 --- a/extensions/cpsection/network/model.py +++ b/extensions/cpsection/network/model.py @@ -19,7 +19,7 @@ import logging import dbus from gettext import gettext as _ -import gconf +from gi.repository import GConf from jarabe.model import network @@ -40,7 +40,7 @@ class ReadError(Exception): def get_jabber(): - client = gconf.client_get_default() + client = GConf.Client.get_default() return client.get_string('/desktop/sugar/collaboration/jabber_server') @@ -52,7 +52,7 @@ def set_jabber(server): """Set the jabber server server : e.g. 'olpc.collabora.co.uk' """ - client = gconf.client_get_default() + client = GConf.Client.get_default() client.set_string('/desktop/sugar/collaboration/jabber_server', server) return 0 @@ -106,7 +106,7 @@ def set_radio(state): def clear_registration(): """Clear the registration with the schoolserver """ - client = gconf.client_get_default() + client = GConf.Client.get_default() client.set_string('/desktop/sugar/backup_url', '') return 1 @@ -132,7 +132,7 @@ def have_networks(): def get_publish_information(): - client = gconf.client_get_default() + client = GConf.Client.get_default() publish = client.get_bool('/desktop/sugar/collaboration/publish_gadget') return publish @@ -151,6 +151,6 @@ def set_publish_information(value): except: raise ValueError(_('Error in specified argument use 0/1.')) - client = gconf.client_get_default() + client = GConf.Client.get_default() client.set_bool('/desktop/sugar/collaboration/publish_gadget', value) return 0 diff --git a/extensions/cpsection/network/view.py b/extensions/cpsection/network/view.py index 381dcb6..c1d937e 100644 --- a/extensions/cpsection/network/view.py +++ b/extensions/cpsection/network/view.py @@ -14,8 +14,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -import gtk -import gobject +from gi.repository import Gtk +from gi.repository import GObject from gettext import gettext as _ from sugar.graphics import style @@ -46,133 +46,133 @@ class Network(SectionView): self.set_border_width(style.DEFAULT_SPACING * 2) self.set_spacing(style.DEFAULT_SPACING) - group = gtk.SizeGroup(gtk.SIZE_GROUP_HORIZONTAL) + group = Gtk.SizeGroup(Gtk.SizeGroupMode.HORIZONTAL) - self._radio_alert_box = gtk.HBox(spacing=style.DEFAULT_SPACING) - self._jabber_alert_box = gtk.HBox(spacing=style.DEFAULT_SPACING) + self._radio_alert_box = Gtk.HBox(spacing=style.DEFAULT_SPACING) + self._jabber_alert_box = Gtk.HBox(spacing=style.DEFAULT_SPACING) - workspace = gtk.VBox() + workspace = Gtk.VBox() workspace.show() - separator_wireless = gtk.HSeparator() - workspace.pack_start(separator_wireless, expand=False) + separator_wireless = Gtk.HSeparator() + workspace.pack_start(separator_wireless, False, True, 0) separator_wireless.show() - label_wireless = gtk.Label(_('Wireless')) + label_wireless = Gtk.Label(label=_('Wireless')) label_wireless.set_alignment(0, 0) - workspace.pack_start(label_wireless, expand=False) + workspace.pack_start(label_wireless, False, True, 0) label_wireless.show() - box_wireless = gtk.VBox() + box_wireless = Gtk.VBox() box_wireless.set_border_width(style.DEFAULT_SPACING * 2) box_wireless.set_spacing(style.DEFAULT_SPACING) - radio_info = gtk.Label(_('Turn off the wireless radio to save battery' + radio_info = Gtk.Label(label=_('Turn off the wireless radio to save battery' ' life')) radio_info.set_alignment(0, 0) radio_info.set_line_wrap(True) radio_info.show() - box_wireless.pack_start(radio_info, expand=False) + box_wireless.pack_start(radio_info, False, True, 0) - box_radio = gtk.HBox(spacing=style.DEFAULT_SPACING) - self._button = gtk.CheckButton() + box_radio = Gtk.HBox(spacing=style.DEFAULT_SPACING) + self._button = Gtk.CheckButton() self._button.set_alignment(0, 0) - box_radio.pack_start(self._button, expand=False) + box_radio.pack_start(self._button, False, True, 0) self._button.show() - label_radio = gtk.Label(_('Radio')) + label_radio = Gtk.Label(label=_('Radio')) label_radio.set_alignment(0, 0.5) - box_radio.pack_start(label_radio, expand=False) + box_radio.pack_start(label_radio, False, True, 0) label_radio.show() - box_wireless.pack_start(box_radio, expand=False) + box_wireless.pack_start(box_radio, False, True, 0) box_radio.show() self._radio_alert = InlineAlert() - self._radio_alert_box.pack_start(self._radio_alert, expand=False) - box_radio.pack_end(self._radio_alert_box, expand=False) + self._radio_alert_box.pack_start(self._radio_alert, False, True, 0) + box_radio.pack_end(self._radio_alert_box, False, True, 0) self._radio_alert_box.show() if 'radio' in self.restart_alerts: self._radio_alert.props.msg = self.restart_msg self._radio_alert.show() - history_info = gtk.Label(_('Discard network history if you have' + history_info = Gtk.Label(label=_('Discard network history if you have' ' trouble connecting to the network')) history_info.set_alignment(0, 0) history_info.set_line_wrap(True) history_info.show() - box_wireless.pack_start(history_info, expand=False) + box_wireless.pack_start(history_info, False, True, 0) - box_clear_history = gtk.HBox(spacing=style.DEFAULT_SPACING) - self._clear_history_button = gtk.Button() + box_clear_history = Gtk.HBox(spacing=style.DEFAULT_SPACING) + self._clear_history_button = Gtk.Button() self._clear_history_button.set_label(_('Discard network history')) - box_clear_history.pack_start(self._clear_history_button, expand=False) + box_clear_history.pack_start(self._clear_history_button, False, True, 0) if not self._model.have_networks(): self._clear_history_button.set_sensitive(False) self._clear_history_button.show() - box_wireless.pack_start(box_clear_history, expand=False) + box_wireless.pack_start(box_clear_history, False, True, 0) box_clear_history.show() - workspace.pack_start(box_wireless, expand=False) + workspace.pack_start(box_wireless, False, True, 0) box_wireless.show() - separator_mesh = gtk.HSeparator() + separator_mesh = Gtk.HSeparator() workspace.pack_start(separator_mesh, False) separator_mesh.show() - label_mesh = gtk.Label(_('Collaboration')) + label_mesh = Gtk.Label(label=_('Collaboration')) label_mesh.set_alignment(0, 0) - workspace.pack_start(label_mesh, expand=False) + workspace.pack_start(label_mesh, False, True, 0) label_mesh.show() - box_mesh = gtk.VBox() + box_mesh = Gtk.VBox() box_mesh.set_border_width(style.DEFAULT_SPACING * 2) box_mesh.set_spacing(style.DEFAULT_SPACING) - server_info = gtk.Label(_("The server is the equivalent of what" + server_info = Gtk.Label(_("The server is the equivalent of what" " room you are in; people on the same server" " will be able to see each other, even when" " they aren't on the same network.")) server_info.set_alignment(0, 0) server_info.set_line_wrap(True) - box_mesh.pack_start(server_info, expand=False) + box_mesh.pack_start(server_info, False, True, 0) server_info.show() - box_server = gtk.HBox(spacing=style.DEFAULT_SPACING) - label_server = gtk.Label(_('Server:')) + box_server = Gtk.HBox(spacing=style.DEFAULT_SPACING) + label_server = Gtk.Label(label=_('Server:')) label_server.set_alignment(1, 0.5) - label_server.modify_fg(gtk.STATE_NORMAL, + label_server.modify_fg(Gtk.StateType.NORMAL, style.COLOR_SELECTION_GREY.get_gdk_color()) - box_server.pack_start(label_server, expand=False) + box_server.pack_start(label_server, False, True, 0) group.add_widget(label_server) label_server.show() - self._entry = gtk.Entry() + self._entry = Gtk.Entry() self._entry.set_alignment(0) - self._entry.modify_bg(gtk.STATE_INSENSITIVE, + self._entry.modify_bg(Gtk.StateType.INSENSITIVE, style.COLOR_WHITE.get_gdk_color()) - self._entry.modify_base(gtk.STATE_INSENSITIVE, + self._entry.modify_base(Gtk.StateType.INSENSITIVE, style.COLOR_WHITE.get_gdk_color()) - self._entry.set_size_request(int(gtk.gdk.screen_width() / 3), -1) - box_server.pack_start(self._entry, expand=False) + self._entry.set_size_request(int(Gdk.Screen.width() / 3), -1) + box_server.pack_start(self._entry, False, True, 0) self._entry.show() - box_mesh.pack_start(box_server, expand=False) + box_mesh.pack_start(box_server, False, True, 0) box_server.show() self._jabber_alert = InlineAlert() - label_jabber_error = gtk.Label() + label_jabber_error = Gtk.Label() group.add_widget(label_jabber_error) - self._jabber_alert_box.pack_start(label_jabber_error, expand=False) + self._jabber_alert_box.pack_start(label_jabber_error, False, True, 0) label_jabber_error.show() - self._jabber_alert_box.pack_start(self._jabber_alert, expand=False) - box_mesh.pack_end(self._jabber_alert_box, expand=False) + self._jabber_alert_box.pack_start(self._jabber_alert, False, True, 0) + box_mesh.pack_end(self._jabber_alert_box, False, True, 0) self._jabber_alert_box.show() if 'jabber' in self.restart_alerts: self._jabber_alert.props.msg = self.restart_msg self._jabber_alert.show() - workspace.pack_start(box_mesh, expand=False) + workspace.pack_start(box_mesh, False, True, 0) box_mesh.show() - 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(workspace) scrolled.show() self.add(scrolled) @@ -230,8 +230,8 @@ class Network(SectionView): def __jabber_changed_cb(self, widget, data=None): if self._jabber_sid: - gobject.source_remove(self._jabber_sid) - self._jabber_sid = gobject.timeout_add(_APPLY_TIMEOUT, + GObject.source_remove(self._jabber_sid) + self._jabber_sid = GObject.timeout_add(_APPLY_TIMEOUT, self.__jabber_timeout_cb, widget) diff --git a/extensions/cpsection/power/model.py b/extensions/cpsection/power/model.py index 8b6a1d3..1aa0704 100644 --- a/extensions/cpsection/power/model.py +++ b/extensions/cpsection/power/model.py @@ -19,7 +19,7 @@ import os from gettext import gettext as _ import logging -import gconf +from gi.repository import GConf import dbus OHM_SERVICE_NAME = 'org.freedesktop.ohm' @@ -51,7 +51,7 @@ def get_automatic_pm(): return not os.access(POWERD_INHIBIT_FLAG, os.R_OK) # ohmd - client = gconf.client_get_default() + client = GConf.Client.get_default() return client.get_bool('/desktop/sugar/power/automatic') @@ -89,6 +89,6 @@ def set_automatic_pm(enabled): else: raise ValueError(_('Error in automatic pm argument, use on/off.')) - client = gconf.client_get_default() + client = GConf.Client.get_default() client.set_bool('/desktop/sugar/power/automatic', enabled) return diff --git a/extensions/cpsection/power/view.py b/extensions/cpsection/power/view.py index be0815d..987c9a7 100644 --- a/extensions/cpsection/power/view.py +++ b/extensions/cpsection/power/view.py @@ -14,7 +14,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -import gtk +from gi.repository import Gtk from gettext import gettext as _ from sugar.graphics import style @@ -34,51 +34,51 @@ class Power(SectionView): self.set_border_width(style.DEFAULT_SPACING * 2) self.set_spacing(style.DEFAULT_SPACING) - group = gtk.SizeGroup(gtk.SIZE_GROUP_HORIZONTAL) + group = Gtk.SizeGroup(Gtk.SizeGroupMode.HORIZONTAL) - self._automatic_pm_alert_box = gtk.HBox(spacing=style.DEFAULT_SPACING) + self._automatic_pm_alert_box = Gtk.HBox(spacing=style.DEFAULT_SPACING) - separator_pm = gtk.HSeparator() - self.pack_start(separator_pm, expand=False) + separator_pm = Gtk.HSeparator() + self.pack_start(separator_pm, False, True, 0) separator_pm.show() - label_pm = gtk.Label(_('Power management')) + label_pm = Gtk.Label(label=_('Power management')) label_pm.set_alignment(0, 0) - self.pack_start(label_pm, expand=False) + self.pack_start(label_pm, False, True, 0) label_pm.show() - box_pm = gtk.VBox() + box_pm = Gtk.VBox() box_pm.set_border_width(style.DEFAULT_SPACING * 2) box_pm.set_spacing(style.DEFAULT_SPACING) - box_automatic_pm = gtk.HBox(spacing=style.DEFAULT_SPACING) - label_automatic_pm = gtk.Label( + box_automatic_pm = Gtk.HBox(spacing=style.DEFAULT_SPACING) + label_automatic_pm = Gtk.Label(label= _('Automatic power management (increases battery life)')) label_automatic_pm.set_alignment(0, 0.5) - self._automatic_button = gtk.CheckButton() + self._automatic_button = Gtk.CheckButton() self._automatic_button.set_alignment(0, 0) - box_automatic_pm.pack_start(self._automatic_button, expand=False) - box_automatic_pm.pack_start(label_automatic_pm, expand=False) + box_automatic_pm.pack_start(self._automatic_button, False, True, 0) + box_automatic_pm.pack_start(label_automatic_pm, False, True, 0) self._automatic_button.show() label_automatic_pm.show() group.add_widget(label_automatic_pm) - box_pm.pack_start(box_automatic_pm, expand=False) + box_pm.pack_start(box_automatic_pm, False, True, 0) box_automatic_pm.show() self._automatic_pm_alert = InlineAlert() - label_automatic_pm_error = gtk.Label() + label_automatic_pm_error = Gtk.Label() group.add_widget(label_automatic_pm_error) self._automatic_pm_alert_box.pack_start(label_automatic_pm_error, expand=False) label_automatic_pm_error.show() self._automatic_pm_alert_box.pack_start(self._automatic_pm_alert, expand=False) - box_pm.pack_end(self._automatic_pm_alert_box, expand=False) + box_pm.pack_end(self._automatic_pm_alert_box, False, True, 0) self._automatic_pm_alert_box.show() if 'automatic_pm' in self.restart_alerts: self._automatic_pm_alert.props.msg = self.restart_msg self._automatic_pm_alert.show() - self.pack_start(box_pm, expand=False) + self.pack_start(box_pm, False, True, 0) box_pm.show() self.setup() diff --git a/extensions/cpsection/updater/backends/aslo.py b/extensions/cpsection/updater/backends/aslo.py index 6504e9e..0273003 100644 --- a/extensions/cpsection/updater/backends/aslo.py +++ b/extensions/cpsection/updater/backends/aslo.py @@ -52,7 +52,7 @@ import logging from xml.etree.ElementTree import XML import traceback -import gio +from gi.repository import Gio from sugar.bundle.bundleversion import NormalizedVersion from sugar.bundle.bundleversion import InvalidVersionError @@ -85,7 +85,7 @@ class _UpdateFetcher(object): logging.debug('Fetch %s', url) self._completion_cb = completion_cb - self._file = gio.File(url) + self._file = Gio.File(url) self._stream = None self._xml_data = '' self._bundle = bundle diff --git a/extensions/cpsection/updater/model.py b/extensions/cpsection/updater/model.py index 7ea445f..467af0a 100755 --- a/extensions/cpsection/updater/model.py +++ b/extensions/cpsection/updater/model.py @@ -27,8 +27,8 @@ import tempfile from urlparse import urlparse import traceback -import gobject -import gio +from gi.repository import GObject +from gi.repository import Gio from sugar import env from sugar.datastore import datastore @@ -40,12 +40,12 @@ from jarabe.model import bundleregistry from backends import aslo -class UpdateModel(gobject.GObject): +class UpdateModel(GObject.GObject): __gtype_name__ = 'SugarUpdateModel' __gsignals__ = { - 'progress': (gobject.SIGNAL_RUN_FIRST, - gobject.TYPE_NONE, + 'progress': (GObject.SignalFlags.RUN_FIRST, + None, ([int, str, float, int])), } @@ -54,7 +54,7 @@ class UpdateModel(gobject.GObject): ACTION_DOWNLOADING = 2 def __init__(self): - gobject.GObject.__init__(self) + GObject.GObject.__init__(self) self.updates = None self._bundles_to_check = None @@ -93,7 +93,7 @@ class UpdateModel(gobject.GObject): if self._cancelling: self._cancel_checking() elif self._bundles_to_check: - gobject.idle_add(self._check_next_update) + GObject.idle_add(self._check_next_update) else: total = len(bundleregistry.get_registry()) if bundle is None: @@ -161,7 +161,7 @@ class UpdateModel(gobject.GObject): if self._bundles_to_update: # do it in idle so the UI has a chance to refresh - gobject.idle_add(self._download_next_update) + GObject.idle_add(self._download_next_update) def _install_update(self, bundle_update, local_file_path): @@ -191,7 +191,7 @@ class UpdateModel(gobject.GObject): if self._bundles_to_update: # do it in idle so the UI has a chance to refresh - gobject.idle_add(self._download_next_update) + GObject.idle_add(self._download_next_update) def cancel(self): self._cancelling = True @@ -233,25 +233,25 @@ class BundleUpdate(object): self.size = size -class _Downloader(gobject.GObject): +class _Downloader(GObject.GObject): _CHUNK_SIZE = 10240 # 10K __gsignals__ = { - 'progress': (gobject.SIGNAL_RUN_FIRST, - gobject.TYPE_NONE, + 'progress': (GObject.SignalFlags.RUN_FIRST, + None, ([float])), - 'error': (gobject.SIGNAL_RUN_FIRST, - gobject.TYPE_NONE, + 'error': (GObject.SignalFlags.RUN_FIRST, + None, ([str])), } def __init__(self, bundle_update): - gobject.GObject.__init__(self) + GObject.GObject.__init__(self) self.bundle_update = bundle_update self._input_stream = None self._output_stream = None self._pending_buffers = [] - self._input_file = gio.File(bundle_update.link) + self._input_file = Gio.File(bundle_update.link) self._output_file = None self._downloaded_size = 0 self._cancelling = False @@ -272,11 +272,11 @@ class _Downloader(gobject.GObject): return temp_file_path = self._get_temp_file_path(self.bundle_update.link) - self._output_file = gio.File(temp_file_path) + self._output_file = Gio.File(temp_file_path) self._output_stream = self._output_file.create() self._input_stream.read_async(self._CHUNK_SIZE, self.__read_async_cb, - gobject.PRIORITY_LOW) + GObject.PRIORITY_LOW) def __read_async_cb(self, input_stream, result): if self._cancelling: @@ -295,7 +295,7 @@ class _Downloader(gobject.GObject): self._pending_buffers.append(data) self._input_stream.read_async(self._CHUNK_SIZE, self.__read_async_cb, - gobject.PRIORITY_LOW) + GObject.PRIORITY_LOW) self._write_next_buffer() @@ -320,7 +320,7 @@ class _Downloader(gobject.GObject): # TODO: we pass the buffer as user_data because of # http://bugzilla.gnome.org/show_bug.cgi?id=564102 self._output_stream.write_async(data, self.__write_async_cb, - gobject.PRIORITY_LOW, + GObject.PRIORITY_LOW, user_data=data) def _get_temp_file_path(self, uri): diff --git a/extensions/cpsection/updater/view.py b/extensions/cpsection/updater/view.py index 814658f..a51b9b4 100644 --- a/extensions/cpsection/updater/view.py +++ b/extensions/cpsection/updater/view.py @@ -20,8 +20,8 @@ from gettext import ngettext import locale import logging -import gobject -import gtk +from gi.repository import GObject +from gi.repository import Gtk from sugar.graphics import style from sugar.graphics.icon import Icon, CellRendererIcon @@ -44,25 +44,25 @@ class ActivityUpdater(SectionView): self.set_spacing(style.DEFAULT_SPACING) self.set_border_width(style.DEFAULT_SPACING * 2) - self._top_label = gtk.Label() + self._top_label = Gtk.Label() self._top_label.set_line_wrap(True) - self._top_label.set_justify(gtk.JUSTIFY_LEFT) + self._top_label.set_justify(Gtk.Justification.LEFT) self._top_label.props.xalign = 0 - self.pack_start(self._top_label, expand=False) + self.pack_start(self._top_label, False, True, 0) self._top_label.show() - separator = gtk.HSeparator() - self.pack_start(separator, expand=False) + separator = Gtk.HSeparator() + self.pack_start(separator, False, True, 0) separator.show() - bottom_label = gtk.Label() + bottom_label = Gtk.Label() bottom_label.set_line_wrap(True) - bottom_label.set_justify(gtk.JUSTIFY_LEFT) + bottom_label.set_justify(Gtk.Justification.LEFT) bottom_label.props.xalign = 0 bottom_label.set_markup( _('Software updates correct errors, eliminate security ' \ 'vulnerabilities, and provide new features.')) - self.pack_start(bottom_label, expand=False) + self.pack_start(bottom_label, False, True, 0) bottom_label.show() self._update_box = None @@ -142,7 +142,7 @@ class ActivityUpdater(SectionView): 'You can install %s updates', available_updates) top_message = top_message % available_updates - top_message = gobject.markup_escape_text(top_message) + top_message = GObject.markup_escape_text(top_message) self._top_label.set_markup('<big>%s</big>' % top_message) @@ -173,7 +173,7 @@ class ActivityUpdater(SectionView): top_message = ngettext('%s update was installed', '%s updates were installed', installed_updates) top_message = top_message % installed_updates - top_message = gobject.markup_escape_text(top_message) + top_message = GObject.markup_escape_text(top_message) self._top_label.set_markup('<big>%s</big>' % top_message) self._clear_center() @@ -181,32 +181,32 @@ class ActivityUpdater(SectionView): self._model.cancel() -class ProgressPane(gtk.VBox): +class ProgressPane(Gtk.VBox): """Container which replaces the `ActivityPane` during refresh or install.""" def __init__(self): - gtk.VBox.__init__(self) + GObject.GObject.__init__(self) self.set_spacing(style.DEFAULT_PADDING) self.set_border_width(style.DEFAULT_SPACING * 2) - self._progress = gtk.ProgressBar() - self.pack_start(self._progress) + self._progress = Gtk.ProgressBar() + self.pack_start(self._progress, True, True, 0) self._progress.show() - self._label = gtk.Label() + self._label = Gtk.Label() self._label.set_line_wrap(True) self._label.set_property('xalign', 0.5) - self._label.modify_fg(gtk.STATE_NORMAL, + self._label.modify_fg(Gtk.StateType.NORMAL, style.COLOR_BUTTON_GREY.get_gdk_color()) - self.pack_start(self._label) + self.pack_start(self._label, True, True, 0) self._label.show() - alignment_box = gtk.Alignment(xalign=0.5, yalign=0.5) - self.pack_start(alignment_box) + alignment_box = Gtk.Alignment.new(xalign=0.5, yalign=0.5) + self.pack_start(alignment_box, True, True, 0) alignment_box.show() - self.cancel_button = gtk.Button(stock=gtk.STOCK_CANCEL) + self.cancel_button = Gtk.Button(stock=Gtk.STOCK_CANCEL) alignment_box.add(self.cancel_button) self.cancel_button.show() @@ -217,18 +217,18 @@ class ProgressPane(gtk.VBox): self._progress.props.fraction = fraction -class UpdateBox(gtk.VBox): +class UpdateBox(Gtk.VBox): def __init__(self, model): - gtk.VBox.__init__(self) + GObject.GObject.__init__(self) self._model = model self.set_spacing(style.DEFAULT_PADDING) - scrolled_window = gtk.ScrolledWindow() - scrolled_window.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) - self.pack_start(scrolled_window) + scrolled_window = Gtk.ScrolledWindow() + scrolled_window.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC) + self.pack_start(scrolled_window, True, True, 0) scrolled_window.show() self._update_list = UpdateList(model) @@ -237,25 +237,25 @@ class UpdateBox(gtk.VBox): scrolled_window.add(self._update_list) self._update_list.show() - bottom_box = gtk.HBox() + bottom_box = Gtk.HBox() bottom_box.set_spacing(style.DEFAULT_SPACING) - self.pack_start(bottom_box, expand=False) + self.pack_start(bottom_box, False, True, 0) bottom_box.show() - self._size_label = gtk.Label() + self._size_label = Gtk.Label() self._size_label.props.xalign = 0 - self._size_label.set_justify(gtk.JUSTIFY_LEFT) - bottom_box.pack_start(self._size_label, expand=True) + self._size_label.set_justify(Gtk.Justification.LEFT) + bottom_box.pack_start(self._size_label, True, True, 0) self._size_label.show() - self.refresh_button = gtk.Button(stock=gtk.STOCK_REFRESH) - bottom_box.pack_start(self.refresh_button, expand=False) + self.refresh_button = Gtk.Button(stock=Gtk.STOCK_REFRESH) + bottom_box.pack_start(self.refresh_button, False, True, 0) self.refresh_button.show() - self.install_button = gtk.Button(_('Install selected')) + self.install_button = Gtk.Button(_('Install selected')) self.install_button.props.image = Icon(icon_name='emblem-downloads', - icon_size=gtk.ICON_SIZE_BUTTON) - bottom_box.pack_start(self.install_button, expand=False) + icon_size=Gtk.IconSize.BUTTON) + bottom_box.pack_start(self.install_button, False, True, 0) self.install_button.show() self._update_total_size_label() @@ -291,24 +291,24 @@ class UpdateBox(gtk.VBox): return bundles_to_update -class UpdateList(gtk.TreeView): +class UpdateList(Gtk.TreeView): def __init__(self, model): list_model = UpdateListModel(model) - gtk.TreeView.__init__(self, list_model) + GObject.GObject.__init__(self, list_model) self.set_reorderable(False) self.set_enable_search(False) self.set_headers_visible(False) - toggle_renderer = gtk.CellRendererToggle() + toggle_renderer = Gtk.CellRendererToggle() toggle_renderer.props.activatable = True toggle_renderer.props.xpad = style.DEFAULT_PADDING toggle_renderer.props.indicator_size = style.zoom(26) toggle_renderer.connect('toggled', self.__toggled_cb) - toggle_column = gtk.TreeViewColumn() - toggle_column.pack_start(toggle_renderer) + toggle_column = Gtk.TreeViewColumn() + toggle_column.pack_start(toggle_renderer, True) toggle_column.add_attribute(toggle_renderer, 'active', UpdateListModel.SELECTED) self.append_column(toggle_column) @@ -322,16 +322,16 @@ class UpdateList(gtk.TreeView): icon_renderer.props.stroke_color = style.COLOR_TOOLBAR_GREY.get_svg() icon_renderer.props.fill_color = style.COLOR_TRANSPARENT.get_svg() - icon_column = gtk.TreeViewColumn() - icon_column.pack_start(icon_renderer) + icon_column = Gtk.TreeViewColumn() + icon_column.pack_start(icon_renderer, True) icon_column.add_attribute(icon_renderer, 'file-name', UpdateListModel.ICON_FILE_NAME) self.append_column(icon_column) - text_renderer = gtk.CellRendererText() + text_renderer = Gtk.CellRendererText() - description_column = gtk.TreeViewColumn() - description_column.pack_start(text_renderer) + description_column = Gtk.TreeViewColumn() + description_column.pack_start(text_renderer, True) description_column.add_attribute(text_renderer, 'markup', UpdateListModel.DESCRIPTION) self.append_column(description_column) @@ -344,7 +344,7 @@ class UpdateList(gtk.TreeView): pass -class UpdateListModel(gtk.ListStore): +class UpdateListModel(Gtk.ListStore): BUNDLE_ID = 0 SELECTED = 1 @@ -353,7 +353,7 @@ class UpdateListModel(gtk.ListStore): SIZE = 4 def __init__(self, model): - gtk.ListStore.__init__(self, str, bool, str, str, int) + GObject.GObject.__init__(self, str, bool, str, str, int) for bundle_update in model.updates: row = [None] * 5 diff --git a/extensions/deviceicon/battery.py b/extensions/deviceicon/battery.py index 3354c08..66cb490 100644 --- a/extensions/deviceicon/battery.py +++ b/extensions/deviceicon/battery.py @@ -17,10 +17,10 @@ import logging from gettext import gettext as _ -import gconf +from gi.repository import GConf import glib -import gobject -import gtk +from gi.repository import GObject +from gi.repository import Gtk import dbus from sugar.graphics import style @@ -59,7 +59,7 @@ class DeviceView(TrayIcon): FRAME_POSITION_RELATIVE = 102 def __init__(self, battery): - client = gconf.client_get_default() + client = GConf.Client.get_default() self._color = XoColor(client.get_string('/desktop/sugar/user/color')) TrayIcon.__init__(self, icon_name=_ICON_NAME, xo_color=self._color) @@ -120,16 +120,16 @@ class BatteryPalette(Palette): self._level = 0 self._time = 0 self._status = _STATUS_NOT_PRESENT - self._progress_bar = gtk.ProgressBar() + self._progress_bar = Gtk.ProgressBar() self._progress_bar.set_size_request( style.zoom(style.GRID_CELL_SIZE * 4), -1) self._progress_bar.show() - self._status_label = gtk.Label() + self._status_label = Gtk.Label() self._status_label.show() - vbox = gtk.VBox() - vbox.pack_start(self._progress_bar) - vbox.pack_start(self._status_label) + vbox = Gtk.VBox() + vbox.pack_start(self._progress_bar, True, True, 0) + vbox.pack_start(self._status_label, True, True, 0) vbox.show() self._progress_widget = vbox @@ -172,22 +172,22 @@ class BatteryPalette(Palette): self._status_label.set_text(status_text) -class DeviceModel(gobject.GObject): +class DeviceModel(GObject.GObject): __gproperties__ = { - 'level': (int, None, None, 0, 100, 0, gobject.PARAM_READABLE), - 'time-remaining': (int, None, None, 0, gobject.constants.G_MAXINT32, 0, - gobject.PARAM_READABLE), # unit: seconds - 'charging': (bool, None, None, False, gobject.PARAM_READABLE), - 'discharging': (bool, None, None, False, gobject.PARAM_READABLE), - 'present': (bool, None, None, False, gobject.PARAM_READABLE), + 'level': (int, None, None, 0, 100, 0, GObject.PARAM_READABLE), + 'time-remaining': (int, None, None, 0, GObject.constants.G_MAXINT32, 0, + GObject.PARAM_READABLE), # unit: seconds + 'charging': (bool, None, None, False, GObject.PARAM_READABLE), + 'discharging': (bool, None, None, False, GObject.PARAM_READABLE), + 'present': (bool, None, None, False, GObject.PARAM_READABLE), } __gsignals__ = { - 'updated': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ([])), + 'updated': (GObject.SignalFlags.RUN_FIRST, None, ([])), } def __init__(self, battery): - gobject.GObject.__init__(self) + GObject.GObject.__init__(self) self._battery = battery self._battery_props_iface = dbus.Interface(self._battery, dbus.PROPERTIES_IFACE) diff --git a/extensions/deviceicon/network.py b/extensions/deviceicon/network.py index ff451f4..6c16890 100644 --- a/extensions/deviceicon/network.py +++ b/extensions/deviceicon/network.py @@ -25,10 +25,10 @@ import socket import struct import datetime import time -import gtk +from gi.repository import Gtk import glib -import gobject -import gconf +from gi.repository import GObject +from gi.repository import GConf import dbus from sugar.graphics.icon import get_icon_state @@ -59,7 +59,7 @@ class WirelessPalette(Palette): __gtype_name__ = 'SugarWirelessPalette' __gsignals__ = { - 'deactivate-connection': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, + 'deactivate-connection': (GObject.SignalFlags.RUN_FIRST, None, ([])), } @@ -68,16 +68,16 @@ class WirelessPalette(Palette): self._disconnect_item = None - self._channel_label = gtk.Label() + self._channel_label = Gtk.Label() self._channel_label.props.xalign = 0.0 self._channel_label.show() - self._ip_address_label = gtk.Label() + self._ip_address_label = Gtk.Label() - self._info = gtk.VBox() + self._info = Gtk.VBox() def _padded(child, xalign=0, yalign=0.5): - padder = gtk.Alignment(xalign=xalign, yalign=yalign, + padder = Gtk.Alignment.new(xalign=xalign, yalign=yalign, xscale=1, yscale=0.33) padder.set_padding(style.DEFAULT_SPACING, style.DEFAULT_SPACING, @@ -86,12 +86,12 @@ class WirelessPalette(Palette): padder.add(child) return padder - self._info.pack_start(_padded(self._channel_label)) - self._info.pack_start(_padded(self._ip_address_label)) + self._info.pack_start(_padded(self._channel_label, True, True, 0)) + self._info.pack_start(_padded(self._ip_address_label, True, True, 0)) self._info.show_all() self._disconnect_item = MenuItem(_('Disconnect')) - icon = Icon(icon_size=gtk.ICON_SIZE_MENU, icon_name='media-eject') + icon = Icon(icon_size=Gtk.IconSize.MENU, icon_name='media-eject') self._disconnect_item.set_image(icon) self._disconnect_item.connect('activate', self.__disconnect_activate_cb) @@ -148,16 +148,16 @@ class WiredPalette(Palette): label = glib.markup_escape_text(_('Wired Network')) Palette.__init__(self, primary_text=label) - self._speed_label = gtk.Label() + self._speed_label = Gtk.Label() self._speed_label.props.xalign = 0.0 self._speed_label.show() - self._ip_address_label = gtk.Label() + self._ip_address_label = Gtk.Label() - self._info = gtk.VBox() + self._info = Gtk.VBox() def _padded(child, xalign=0, yalign=0.5): - padder = gtk.Alignment(xalign=xalign, yalign=yalign, + padder = Gtk.Alignment.new(xalign=xalign, yalign=yalign, xscale=1, yscale=0.33) padder.set_padding(style.DEFAULT_SPACING, style.DEFAULT_SPACING, @@ -166,8 +166,8 @@ class WiredPalette(Palette): padder.add(child) return padder - self._info.pack_start(_padded(self._speed_label)) - self._info.pack_start(_padded(self._ip_address_label)) + self._info.pack_start(_padded(self._speed_label, True, True, 0)) + self._info.pack_start(_padded(self._ip_address_label, True, True, 0)) self._info.show_all() self.set_content(self._info) @@ -194,8 +194,8 @@ class GsmPalette(Palette): __gtype_name__ = 'SugarGsmPalette' __gsignals__ = { - 'gsm-connect': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ([])), - 'gsm-disconnect': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ([])), + 'gsm-connect': (GObject.SignalFlags.RUN_FIRST, None, ([])), + 'gsm-disconnect': (GObject.SignalFlags.RUN_FIRST, None, ([])), } def __init__(self): @@ -210,40 +210,40 @@ class GsmPalette(Palette): self.menu.append(self._toggle_state_item) self._toggle_state_item.show() - self.info_box = gtk.VBox() + self.info_box = Gtk.VBox() - self.error_title_label = gtk.Label("") + self.error_title_label = Gtk.Label(label="") self.error_title_label.set_alignment(0, 0.5) self.error_title_label.set_line_wrap(True) - self.info_box.pack_start(self.error_title_label) - self.error_description_label = gtk.Label("") + self.info_box.pack_start(self.error_title_label, True, True, 0) + self.error_description_label = Gtk.Label(label="") self.error_description_label.set_alignment(0, 0.5) self.error_description_label.set_line_wrap(True) - self.info_box.pack_start(self.error_description_label) + self.info_box.pack_start(self.error_description_label, True, True, 0) - self.connection_info_box = gtk.HBox() - icon = Icon(icon_name='data-upload', icon_size=gtk.ICON_SIZE_MENU) - self.connection_info_box.pack_start(icon) + self.connection_info_box = Gtk.HBox() + icon = Icon(icon_name='data-upload', icon_size=Gtk.IconSize.MENU) + self.connection_info_box.pack_start(icon, True, True, 0) icon.show() - self._data_label_up = gtk.Label() + self._data_label_up = Gtk.Label() self._data_label_up.props.xalign = 0.0 label_alignment = self._add_widget_with_padding(self._data_label_up) - self.connection_info_box.pack_start(label_alignment) + self.connection_info_box.pack_start(label_alignment, True, True, 0) self._data_label_up.show() label_alignment.show() - icon = Icon(icon_name='data-download', icon_size=gtk.ICON_SIZE_MENU) - self.connection_info_box.pack_start(icon) + icon = Icon(icon_name='data-download', icon_size=Gtk.IconSize.MENU) + self.connection_info_box.pack_start(icon, True, True, 0) icon.show() - self._data_label_down = gtk.Label() + self._data_label_down = Gtk.Label() self._data_label_down.props.xalign = 0.0 label_alignment = self._add_widget_with_padding(self._data_label_down) - self.connection_info_box.pack_start(label_alignment) + self.connection_info_box.pack_start(label_alignment, True, True, 0) self._data_label_down.show() label_alignment.show() - self.info_box.pack_start(self.connection_info_box) + self.info_box.pack_start(self.connection_info_box, True, True, 0) self.info_box.show() self.set_content(self.info_box) @@ -251,7 +251,7 @@ class GsmPalette(Palette): self.set_state(_GSM_STATE_NOT_READY) def _add_widget_with_padding(self, child, xalign=0, yalign=0.5): - alignment = gtk.Alignment(xalign=xalign, yalign=yalign, + alignment = Gtk.Alignment.new(xalign=xalign, yalign=yalign, xscale=1, yscale=0.33) alignment.set_padding(style.DEFAULT_SPACING, style.DEFAULT_SPACING, @@ -276,7 +276,7 @@ class GsmPalette(Palette): label = glib.markup_escape_text(_('Disconnected')) self.props.secondary_text = label icon = Icon(icon_name='dialog-ok', \ - icon_size=gtk.ICON_SIZE_MENU) + icon_size=Gtk.IconSize.MENU) self._toggle_state_item.set_image(icon) elif self._current_state == _GSM_STATE_CONNECTING: @@ -284,7 +284,7 @@ class GsmPalette(Palette): label = glib.markup_escape_text(_('Connecting...')) self.props.secondary_text = label icon = Icon(icon_name='dialog-cancel', \ - icon_size=gtk.ICON_SIZE_MENU) + icon_size=Gtk.IconSize.MENU) self._toggle_state_item.set_image(icon) elif self._current_state == _GSM_STATE_CONNECTED: @@ -292,7 +292,7 @@ class GsmPalette(Palette): self._toggle_state_item.get_child().set_label(_('Disconnect')) self.update_connection_time() icon = Icon(icon_name='media-eject', \ - icon_size=gtk.ICON_SIZE_MENU) + icon_size=Gtk.IconSize.MENU) self._toggle_state_item.set_image(icon) elif self._current_state == _GSM_STATE_FAILED: @@ -701,7 +701,7 @@ class WiredDeviceView(TrayIcon): FRAME_POSITION_RELATIVE = 301 def __init__(self, speed, address): - client = gconf.client_get_default() + client = GConf.Client.get_default() color = xocolor.XoColor(client.get_string('/desktop/sugar/user/color')) TrayIcon.__init__(self, icon_name=self._ICON_NAME, xo_color=color) @@ -727,7 +727,7 @@ class GsmDeviceView(TrayIcon): self._connection_time_handler = None self._connection_timestamp = 0 - client = gconf.client_get_default() + client = GConf.Client.get_default() color = xocolor.XoColor(client.get_string('/desktop/sugar/user/color')) TrayIcon.__init__(self, icon_name=self._ICON_NAME, xo_color=color) @@ -828,7 +828,7 @@ class GsmDeviceView(TrayIcon): if connection is not None: self._connection_timestamp = time.time() - \ connection.get_settings('connection')['timestamp'] - self._connection_time_handler = gobject.timeout_add_seconds( \ + self._connection_time_handler = GObject.timeout_add_seconds( \ 1, self.__connection_timecount_cb) self._palette.update_connection_time() self._palette.update_stats(0, 0) @@ -839,7 +839,7 @@ class GsmDeviceView(TrayIcon): gsm_state = _GSM_STATE_DISCONNECTED self._connection_timestamp = 0 if self._connection_time_handler is not None: - gobject.source_remove(self._connection_time_handler) + GObject.source_remove(self._connection_time_handler) if self._palette is not None: self._palette.connection_info_box.hide() diff --git a/extensions/deviceicon/speaker.py b/extensions/deviceicon/speaker.py index d8b26be..4e2ed0e 100644 --- a/extensions/deviceicon/speaker.py +++ b/extensions/deviceicon/speaker.py @@ -15,11 +15,11 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA from gettext import gettext as _ -import gconf +from gi.repository import GConf import glib -import gobject -import gtk +from gi.repository import GObject +from gi.repository import Gtk from sugar.graphics import style from sugar.graphics.icon import get_icon_state, Icon @@ -39,7 +39,7 @@ class DeviceView(TrayIcon): FRAME_POSITION_RELATIVE = 103 def __init__(self): - client = gconf.client_get_default() + client = GConf.Client.get_default() self._color = XoColor(client.get_string('/desktop/sugar/user/color')) TrayIcon.__init__(self, icon_name=_ICON_NAME, xo_color=self._color) @@ -98,25 +98,25 @@ class SpeakerPalette(Palette): self._model = model - vbox = gtk.VBox() + vbox = Gtk.VBox() self.set_content(vbox) vbox.show() vol_step = sound.VOLUME_STEP - self._adjustment = gtk.Adjustment(value=self._model.props.level, + self._adjustment = Gtk.Adjustment(value=self._model.props.level, lower=0, upper=100 + vol_step, step_incr=vol_step, page_incr=vol_step, page_size=vol_step) - self._hscale = gtk.HScale(self._adjustment) + self._hscale = Gtk.HScale(self._adjustment) self._hscale.set_digits(0) self._hscale.set_draw_value(False) vbox.add(self._hscale) self._hscale.show() self._mute_item = MenuItem('') - self._mute_icon = Icon(icon_size=gtk.ICON_SIZE_MENU) + self._mute_icon = Icon(icon_size=Gtk.IconSize.MENU) self._mute_item.set_image(self._mute_icon) self.menu.append(self._mute_item) self._mute_item.show() @@ -173,14 +173,14 @@ class SpeakerPalette(Palette): self._update_muted() -class DeviceModel(gobject.GObject): +class DeviceModel(GObject.GObject): __gproperties__ = { - 'level': (int, None, None, 0, 100, 0, gobject.PARAM_READWRITE), - 'muted': (bool, None, None, False, gobject.PARAM_READWRITE), + 'level': (int, None, None, 0, 100, 0, GObject.PARAM_READWRITE), + 'muted': (bool, None, None, False, GObject.PARAM_READWRITE), } def __init__(self): - gobject.GObject.__init__(self) + GObject.GObject.__init__(self) sound.muted_changed.connect(self.__muted_changed_cb) sound.volume_changed.connect(self.__volume_changed_cb) diff --git a/extensions/deviceicon/speech.py b/extensions/deviceicon/speech.py index 6b8f915..019e9fa 100644 --- a/extensions/deviceicon/speech.py +++ b/extensions/deviceicon/speech.py @@ -17,9 +17,9 @@ from gettext import gettext as _ import glib -import gtk -import gconf -import gobject +from gi.repository import Gtk +from gi.repository import GConf +from gi.repository import GObject from sugar.graphics.icon import Icon from sugar.graphics.tray import TrayIcon @@ -40,7 +40,7 @@ class SpeechDeviceView(TrayIcon): FRAME_POSITION_RELATIVE = 150 def __init__(self): - client = gconf.client_get_default() + client = GConf.Client.get_default() self._color = XoColor(client.get_string('/desktop/sugar/user/color')) TrayIcon.__init__(self, icon_name=_ICON_NAME, xo_color=self._color) self.set_palette_invoker(FrameWidgetInvoker(self)) @@ -69,7 +69,7 @@ class SpeechPalette(Palette): self._manager.connect('stop', self._set_menu_state, 'stop') self._manager.connect('pause', self._set_menu_state, 'pause') - vbox = gtk.VBox() + vbox = Gtk.VBox() self.set_content(vbox) self._play_icon = Icon(icon_name='player_play') @@ -88,23 +88,23 @@ class SpeechPalette(Palette): self.menu.append(self._play_pause_menu) self.menu.append(self._stop_menu) - self._adj_pitch = gtk.Adjustment(value=self._manager.get_pitch(), + self._adj_pitch = Gtk.Adjustment(value=self._manager.get_pitch(), lower=self._manager.MIN_PITCH, upper=self._manager.MAX_PITCH) - self._hscale_pitch = gtk.HScale(self._adj_pitch) + self._hscale_pitch = Gtk.HScale(self._adj_pitch) self._hscale_pitch.set_draw_value(False) - vbox.pack_start(gtk.Label(_('Pitch')), padding=style.DEFAULT_PADDING) - vbox.pack_start(self._hscale_pitch) + vbox.pack_start(Gtk.Label(_('Pitch', True, True, 0)), padding=style.DEFAULT_PADDING) + vbox.pack_start(self._hscale_pitch, True, True, 0) - self._adj_rate = gtk.Adjustment(value=self._manager.get_rate(), + self._adj_rate = Gtk.Adjustment(value=self._manager.get_rate(), lower=self._manager.MIN_RATE, upper=self._manager.MAX_RATE) - self._hscale_rate = gtk.HScale(self._adj_rate) + self._hscale_rate = Gtk.HScale(self._adj_rate) self._hscale_rate.set_draw_value(False) - vbox.pack_start(gtk.Label(_('Rate')), padding=style.DEFAULT_PADDING) - vbox.pack_start(self._hscale_rate) + vbox.pack_start(Gtk.Label(_('Rate', True, True, 0)), padding=style.DEFAULT_PADDING) + vbox.pack_start(self._hscale_rate, True, True, 0) vbox.show_all() self._adj_pitch.connect('value_changed', self.__adj_pitch_changed_cb) diff --git a/extensions/deviceicon/touchpad.py b/extensions/deviceicon/touchpad.py index 150e8dc..3e4c23f 100644 --- a/extensions/deviceicon/touchpad.py +++ b/extensions/deviceicon/touchpad.py @@ -18,8 +18,8 @@ from gettext import gettext as _ import os -import gtk -import gconf +from gi.repository import Gtk +from gi.repository import GConf import glib import logging @@ -51,7 +51,7 @@ class DeviceView(TrayIcon): """ Create the icon that represents the touchpad. """ icon_name = STATUS_ICON[_read_touchpad_mode()] - client = gconf.client_get_default() + client = GConf.Client.get_default() color = XoColor(client.get_string('/desktop/sugar/user/color')) TrayIcon.__init__(self, icon_name=icon_name, xo_color=color) @@ -82,11 +82,11 @@ class ResourcePalette(Palette): self._icon = icon - vbox = gtk.VBox() + vbox = Gtk.VBox() self.set_content(vbox) - self._status_text = gtk.Label() - vbox.pack_start(self._status_text, padding=style.DEFAULT_PADDING) + self._status_text = Gtk.Label() + vbox.pack_start(self._status_text, True, True, style.DEFAULT_PADDING) self._status_text.show() vbox.show() diff --git a/extensions/deviceicon/volume.py b/extensions/deviceicon/volume.py index 49e3711..a687481 100644 --- a/extensions/deviceicon/volume.py +++ b/extensions/deviceicon/volume.py @@ -17,10 +17,10 @@ import logging from gettext import gettext as _ -import gobject -import gio -import gtk -import gconf +from gi.repository import GObject +from gi.repository import Gio +from gi.repository import Gtk +from gi.repository import GConf from sugar.graphics.tray import TrayIcon from sugar.graphics.xocolor import XoColor @@ -44,10 +44,10 @@ class DeviceView(TrayIcon): self._mount = mount self._icon_name = None - icon_theme = gtk.icon_theme_get_default() + icon_theme = Gtk.IconTheme.get_default() for icon_name in self._mount.get_icon().props.names: icon_info = icon_theme.lookup_icon(icon_name, - gtk.ICON_SIZE_LARGE_TOOLBAR, 0) + Gtk.IconSize.LARGE_TOOLBAR, 0) if icon_info is not None: self._icon_name = icon_name break @@ -56,7 +56,7 @@ class DeviceView(TrayIcon): self._icon_name = 'drive' # TODO: retrieve the colors from the owner of the device - client = gconf.client_get_default() + client = GConf.Client.get_default() color = XoColor(client.get_string('/desktop/sugar/user/color')) TrayIcon.__init__(self, icon_name=icon_name, xo_color=color) @@ -70,9 +70,9 @@ class DeviceView(TrayIcon): palette.set_group_id('frame') menu_item = MenuItem(_('Show contents')) - client = gconf.client_get_default() + client = GConf.Client.get_default() color = XoColor(client.get_string('/desktop/sugar/user/color')) - icon = Icon(icon_name=self._icon_name, icon_size=gtk.ICON_SIZE_MENU, + icon = Icon(icon_name=self._icon_name, icon_size=Gtk.IconSize.MENU, xo_color=color) menu_item.set_image(icon) icon.show() @@ -94,11 +94,11 @@ class DeviceView(TrayIcon): def setup(tray): - gobject.idle_add(_setup_volumes, tray) + GObject.idle_add(_setup_volumes, tray) def _setup_volumes(tray): - volume_monitor = gio.volume_monitor_get() + volume_monitor = Gio.volume_monitor_get() for volume in volume_monitor.get_volumes(): _mount(volume, tray) @@ -126,7 +126,7 @@ def _mount(volume, tray): #TODO: use volume.should_automount() when it gets into pygtk if volume.get_mount() is None and volume.can_mount(): #TODO: pass None as mount_operation, or better, SugarMountOperation - volume.mount(gtk.MountOperation(tray.get_toplevel()), _mount_cb) + volume.mount(Gtk.MountOperation(tray.get_toplevel()), _mount_cb) def _mount_cb(volume, result): diff --git a/extensions/globalkey/screenshot.py b/extensions/globalkey/screenshot.py index 0afe964..f7c3a84 100644 --- a/extensions/globalkey/screenshot.py +++ b/extensions/globalkey/screenshot.py @@ -19,8 +19,8 @@ import os import tempfile from gettext import gettext as _ -import gtk -import gconf +from gi.repository import Gtk +from gi.repository import GConf import dbus from sugar.datastore import datastore @@ -36,18 +36,18 @@ def handle_key_press(key): fd, file_path = tempfile.mkstemp(dir=tmp_dir) os.close(fd) - window = gtk.gdk.get_default_root_window() + window = Gdk.get_default_root_window() width, height = window.get_size() x_orig, y_orig = window.get_origin() - screenshot = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, has_alpha=False, + screenshot = GdkPixbuf.Pixbuf(GdkPixbuf.Colorspace.RGB, has_alpha=False, bits_per_sample=8, width=width, height=height) screenshot.get_from_drawable(window, window.get_colormap(), x_orig, y_orig, 0, 0, width, height) screenshot.save(file_path, 'png') - client = gconf.client_get_default() + client = GConf.Client.get_default() color = client.get_string('/desktop/sugar/user/color') content_title = None @@ -90,7 +90,7 @@ def handle_key_press(key): def _get_preview_data(screenshot): preview = screenshot.scale_simple(style.zoom(300), style.zoom(225), - gtk.gdk.INTERP_BILINEAR) + GdkPixbuf.InterpType.BILINEAR) preview_data = [] def save_func(buf, data): |