diff options
| author | Sascha Silbe <sascha@silbe.org> | 2009-08-25 17:48:46 (GMT) |
|---|---|---|
| committer | Sascha Silbe <sascha@silbe.org> | 2009-08-25 17:48:46 (GMT) |
| commit | 22944c030111816850d2c3915a5733bbe2214adf (patch) | |
| tree | 20e5336bf8c421b571baee7e8bd934ba397bca5c /src | |
| parent | 6343b1e7eb28c68d048c3191ead9bddf103b3dca (diff) | |
trim EOL (end-of-line) spaces on source files
Diffstat (limited to 'src')
50 files changed, 310 insertions, 310 deletions
diff --git a/src/jarabe/controlpanel/Makefile.am b/src/jarabe/controlpanel/Makefile.am index fb796d7..1de2961 100644 --- a/src/jarabe/controlpanel/Makefile.am +++ b/src/jarabe/controlpanel/Makefile.am @@ -5,6 +5,6 @@ sugar_PYTHON = \ gui.py \ inlinealert.py \ sectionview.py \ - toolbar.py + toolbar.py diff --git a/src/jarabe/controlpanel/cmd.py b/src/jarabe/controlpanel/cmd.py index 5f2de68..7144b33 100644 --- a/src/jarabe/controlpanel/cmd.py +++ b/src/jarabe/controlpanel/cmd.py @@ -25,14 +25,14 @@ from jarabe import config _RESTART = 1 -_same_option_warning = _("sugar-control-panel: WARNING, found more than" - " one option with the same name: %s module: %r") +_same_option_warning = _("sugar-control-panel: WARNING, found more than" + " one option with the same name: %s module: %r") _no_option_error = _("sugar-control-panel: key=%s not an available option") _general_error = _("sugar-control-panel: %s") def cmd_help(): '''Print the help to the screen''' - # TRANS: Translators, there's a empty line at the end of this string, + # TRANS: Translators, there's a empty line at the end of this string, # which must appear in the translated string (msgstr) as well. print _('Usage: sugar-control-panel [ option ] key [ args ... ] \n\ Control for the sugar environment. \n\ @@ -50,7 +50,7 @@ def note_restart(): print _('To apply your changes you have to restart sugar.\n' + 'Hit ctrl+alt+erase on the keyboard to trigger a restart.') -def load_modules(): +def load_modules(): '''Build a list of pointers to available modules and import them. ''' modules = [] @@ -62,15 +62,15 @@ def load_modules(): if os.path.isdir(os.path.join(path, item)) and \ os.path.exists(os.path.join(path, item, 'model.py')): try: - module = __import__('.'.join(('cpsection', item, 'model')), + module = __import__('.'.join(('cpsection', item, 'model')), globals(), locals(), ['model']) except Exception: logging.error('Exception while loading extension:\n' + \ ''.join(traceback.format_exception(*sys.exc_info()))) else: modules.append(module) - - return modules + + return modules def main(): try: @@ -93,12 +93,12 @@ def main(): if method: found += 1 if found == 1: - print method.__doc__ + print method.__doc__ else: print _(_same_option_warning % (key, module)) - if found == 0: - print _(_no_option_error % key) - if option in ("-l"): + if found == 0: + print _(_no_option_error % key) + if option in ("-l"): for module in modules: methods = dir(module) print '%s:' % module.__name__.split('.')[1] @@ -120,8 +120,8 @@ def main(): print _(_general_error % detail) else: print _(_same_option_warning % (key, module)) - if found == 0: - print _(_no_option_error % key) + if found == 0: + print _(_no_option_error % key) if option in ("-s"): for module in modules: method = getattr(module, 'set_' + key, None) @@ -137,8 +137,8 @@ def main(): note_restart() else: print _(_same_option_warning % (key, module)) - if found == 0: - print _(_no_option_error % key) + if found == 0: + print _(_no_option_error % key) if option in ("-c"): for module in modules: method = getattr(module, 'clear_' + key, None) @@ -154,5 +154,5 @@ def main(): note_restart() else: print _(_same_option_warning % (key, module)) - if found == 0: - print _(_no_option_error % key) + if found == 0: + print _(_no_option_error % key) diff --git a/src/jarabe/controlpanel/gui.py b/src/jarabe/controlpanel/gui.py index 39f9c4a..e25a5af 100644 --- a/src/jarabe/controlpanel/gui.py +++ b/src/jarabe/controlpanel/gui.py @@ -46,7 +46,7 @@ class ControlPanel(gtk.Window): width = gtk.gdk.screen_width() - offset * 2 height = gtk.gdk.screen_height() - offset * 2 self.set_size_request(width, height) - self.set_position(gtk.WIN_POS_CENTER_ALWAYS) + self.set_position(gtk.WIN_POS_CENTER_ALWAYS) self.set_decorated(False) self.set_resizable(False) self.set_modal(True) @@ -59,7 +59,7 @@ class ControlPanel(gtk.Window): self._section_view = None self._section_toolbar = None self._main_toolbar = None - + self._vbox = gtk.VBox() self._hbox = gtk.HBox() self._vbox.pack_start(self._hbox) @@ -67,7 +67,7 @@ class ControlPanel(gtk.Window): self._main_view = gtk.EventBox() self._hbox.pack_start(self._main_view) - self._main_view.modify_bg(gtk.STATE_NORMAL, + self._main_view.modify_bg(gtk.STATE_NORMAL, style.COLOR_BLACK.get_gdk_color()) self._main_view.show() @@ -90,16 +90,16 @@ class ControlPanel(gtk.Window): if self._canvas: self._main_view.remove(self._canvas) if canvas: - self._main_view.add(canvas) + self._main_view.add(canvas) self._canvas = canvas def _set_toolbar(self, toolbar): if self._toolbar: - self._vbox.remove(self._toolbar) + self._vbox.remove(self._toolbar) self._vbox.pack_start(toolbar, False) - self._vbox.reorder_child(toolbar, 0) + self._vbox.reorder_child(toolbar, 0) self._toolbar = toolbar - if not self._separator: + if not self._separator: self._separator = gtk.HSeparator() self._vbox.pack_start(self._separator, False) self._vbox.reorder_child(self._separator, 1) @@ -120,9 +120,9 @@ class ControlPanel(gtk.Window): child.modify_bg(gtk.STATE_NORMAL, style.COLOR_BLACK.get_gdk_color()) self._setup_options() - self._main_toolbar.connect('stop-clicked', + self._main_toolbar.connect('stop-clicked', self.__stop_clicked_cb) - self._main_toolbar.connect('search-changed', + self._main_toolbar.connect('search-changed', self.__search_changed_cb) def _setup_options(self): @@ -144,7 +144,7 @@ class ControlPanel(gtk.Window): title=self._options[option]['title'], xo_color=self._options[option]['color'], pixel_size=style.GRID_CELL_SIZE) - sectionicon.connect('button_press_event', + sectionicon.connect('button_press_event', self.__select_option_cb, option) sectionicon.show() @@ -167,7 +167,7 @@ class ControlPanel(gtk.Window): self._set_toolbar(self._main_toolbar) self._main_toolbar.show() self._set_canvas(self._scrolledwindow) - self._main_view.modify_bg(gtk.STATE_NORMAL, + self._main_view.modify_bg(gtk.STATE_NORMAL, style.COLOR_BLACK.get_gdk_color()) self._table.show() self._scrolledwindow.show() @@ -176,7 +176,7 @@ class ControlPanel(gtk.Window): entry.set_text('') def _update(self, query): - for option in self._options: + for option in self._options: found = False for key in self._options[option]['keywords']: if query.lower() in key.lower(): @@ -188,16 +188,16 @@ class ControlPanel(gtk.Window): def _setup_section(self): self._section_toolbar = SectionToolbar() - self._section_toolbar.connect('cancel-clicked', + self._section_toolbar.connect('cancel-clicked', self.__cancel_clicked_cb) - self._section_toolbar.connect('accept-clicked', + self._section_toolbar.connect('accept-clicked', self.__accept_clicked_cb) def show_section_view(self, option): self._set_toolbar(self._section_toolbar) icon = self._section_toolbar.get_icon() - icon.set_from_icon_name(self._options[option]['icon'], + icon.set_from_icon_name(self._options[option]['icon'], gtk.ICON_SIZE_LARGE_TOOLBAR) icon.props.xo_color = self._options[option]['color'] title = self._section_toolbar.get_title() @@ -206,32 +206,32 @@ class ControlPanel(gtk.Window): self._current_option = option - mod = __import__('.'.join(('cpsection', option, 'view')), - globals(), locals(), ['view']) + mod = __import__('.'.join(('cpsection', option, 'view')), + globals(), locals(), ['view']) view_class = getattr(mod, self._options[option]['view'], None) - mod = __import__('.'.join(('cpsection', option, 'model')), + mod = __import__('.'.join(('cpsection', option, 'model')), globals(), locals(), ['model']) - model = ModelWrapper(mod) + model = ModelWrapper(mod) - self._section_view = view_class(model, + self._section_view = view_class(model, self._options[option]['alerts']) - self._set_canvas(self._section_view) + self._set_canvas(self._section_view) self._section_view.show() - self._section_view.connect('notify::is-valid', + self._section_view.connect('notify::is-valid', self.__valid_section_cb) self._section_view.connect('request-close', self.__close_request_cb) - self._main_view.modify_bg(gtk.STATE_NORMAL, + self._main_view.modify_bg(gtk.STATE_NORMAL, style.COLOR_WHITE.get_gdk_color()) def set_section_view_auto_close(self): '''Automatically close the control panel if there is "nothing to do" ''' self._section_view.auto_close = True - - def _get_options(self): + + def _get_options(self): '''Get the available option information from the extensions ''' options = {} @@ -243,10 +243,10 @@ class ControlPanel(gtk.Window): if os.path.isdir(os.path.join(path, item)) and \ os.path.exists(os.path.join(path, item, '__init__.py')): try: - mod = __import__('.'.join(('cpsection', item)), + mod = __import__('.'.join(('cpsection', item)), globals(), locals(), [item]) view_class = getattr(mod, 'CLASS', None) - if view_class is not None: + if view_class is not None: options[item] = {} options[item]['alerts'] = [] options[item]['view'] = view_class @@ -257,18 +257,18 @@ class ControlPanel(gtk.Window): keywords.append(options[item]['title'].lower()) if item not in keywords: keywords.append(item) - else: + else: _logger.error('There is no CLASS constant specifieds ' \ 'in the view file \'%s\'.' % item) except Exception: logging.error('Exception while loading extension:\n' + \ ''.join(traceback.format_exception(*sys.exc_info()))) - return options + return options def __cancel_clicked_cb(self, widget): self._section_view.undo() - self._options[self._current_option]['alerts'] = [] + self._options[self._current_option]['alerts'] = [] self._section_toolbar.accept_button.set_sensitive(True) self._show_main_view() @@ -277,24 +277,24 @@ class ControlPanel(gtk.Window): self._section_toolbar.accept_button.set_sensitive(False) self._section_toolbar.cancel_button.set_sensitive(False) alert = Alert() - alert.props.title = _('Warning') - alert.props.msg = _('Changes require restart') - + alert.props.title = _('Warning') + alert.props.msg = _('Changes require restart') + icon = Icon(icon_name='dialog-cancel') - alert.add_button(gtk.RESPONSE_CANCEL, _('Cancel changes'), icon) - icon.show() + alert.add_button(gtk.RESPONSE_CANCEL, _('Cancel changes'), icon) + icon.show() if self._current_option != 'aboutme': - icon = Icon(icon_name='dialog-ok') - alert.add_button(gtk.RESPONSE_ACCEPT, _('Later'), icon) + icon = Icon(icon_name='dialog-ok') + alert.add_button(gtk.RESPONSE_ACCEPT, _('Later'), icon) icon.show() - icon = Icon(icon_name='system-restart') - alert.add_button(gtk.RESPONSE_APPLY, _('Restart now'), icon) - icon.show() + icon = Icon(icon_name='system-restart') + alert.add_button(gtk.RESPONSE_APPLY, _('Restart now'), icon) + icon.show() self._vbox.pack_start(alert, False) - self._vbox.reorder_child(alert, 2) + self._vbox.reorder_child(alert, 2) alert.connect('response', self.__response_cb) alert.show() else: @@ -304,15 +304,15 @@ class ControlPanel(gtk.Window): self._vbox.remove(alert) self._section_toolbar.accept_button.set_sensitive(True) self._section_toolbar.cancel_button.set_sensitive(True) - if response_id is gtk.RESPONSE_CANCEL: + if response_id is gtk.RESPONSE_CANCEL: self._section_view.undo() self._section_view.setup() self._options[self._current_option]['alerts'] = [] - elif response_id is gtk.RESPONSE_ACCEPT: + elif response_id is gtk.RESPONSE_ACCEPT: self._options[self._current_option]['alerts'] = \ self._section_view.restart_alerts self._show_main_view() - elif response_id is gtk.RESPONSE_APPLY: + elif response_id is gtk.RESPONSE_APPLY: session_manager = get_session_manager() session_manager.logout() @@ -320,18 +320,18 @@ class ControlPanel(gtk.Window): self.show_section_view(option) def __search_changed_cb(self, maintoolbar, query): - self._update(query) + self._update(query) def __stop_clicked_cb(self, widget): self.destroy() def __close_request_cb(self, widget, event=None): self.destroy() - + def __valid_section_cb(self, section_view, pspec): section_is_valid = section_view.props.is_valid self._section_toolbar.accept_button.set_sensitive(section_is_valid) - + class ModelWrapper(object): def __init__(self, module): self._module = module @@ -342,7 +342,7 @@ class ModelWrapper(object): methods = dir(self._module) for method in methods: if method.startswith('get_') and method[4:] != 'color': - try: + try: self._options[method[4:]] = getattr(self._module, method)() except Exception: self._options[method[4:]] = None @@ -352,7 +352,7 @@ class ModelWrapper(object): def undo(self): for key in self._options.keys(): - method = getattr(self._module, 'set_' + key, None) + method = getattr(self._module, 'set_' + key, None) if method and self._options[key] is not None: try: method(self._options[key]) @@ -373,7 +373,7 @@ class _SectionIcon(gtk.EventBox): gobject.PARAM_READWRITE) } - def __init__(self, **kwargs): + def __init__(self, **kwargs): self._icon_name = None self._pixel_size = style.GRID_CELL_SIZE self._xo_color = None @@ -382,16 +382,16 @@ class _SectionIcon(gtk.EventBox): gobject.GObject.__init__(self, **kwargs) self._vbox = gtk.VBox() - self._icon = Icon(icon_name=self._icon_name, - pixel_size=self._pixel_size, + self._icon = Icon(icon_name=self._icon_name, + pixel_size=self._pixel_size, xo_color=self._xo_color) self._vbox.pack_start(self._icon, expand=False, fill=False) self._label = gtk.Label(self._title) - self._label.modify_fg(gtk.STATE_NORMAL, + self._label.modify_fg(gtk.STATE_NORMAL, style.COLOR_WHITE.get_gdk_color()) self._vbox.pack_start(self._label, expand=False, fill=False) - + self._vbox.set_spacing(style.DEFAULT_SPACING) self.set_visible_window(False) self.set_app_paintable(True) diff --git a/src/jarabe/controlpanel/inlinealert.py b/src/jarabe/controlpanel/inlinealert.py index 619a379..b1880da 100644 --- a/src/jarabe/controlpanel/inlinealert.py +++ b/src/jarabe/controlpanel/inlinealert.py @@ -24,7 +24,7 @@ from sugar.graphics.icon import Icon class InlineAlert(gtk.HBox): """UI interface for Inline alerts - Inline alerts are different from the other alerts beause they are + Inline alerts are different from the other alerts beause they are no dialogs, they only inform about a current event. Properties: @@ -54,21 +54,21 @@ class InlineAlert(gtk.HBox): self._msg_label.set_max_width_chars(50) self._msg_label.set_ellipsize(pango.ELLIPSIZE_MIDDLE) self._msg_label.set_alignment(0, 0.5) - self._msg_label.modify_fg(gtk.STATE_NORMAL, + self._msg_label.modify_fg(gtk.STATE_NORMAL, style.COLOR_SELECTION_GREY.get_gdk_color()) gobject.GObject.__init__(self, **kwargs) self.set_spacing(style.DEFAULT_SPACING) - self.modify_bg(gtk.STATE_NORMAL, + self.modify_bg(gtk.STATE_NORMAL, style.COLOR_WHITE.get_gdk_color()) - + self.pack_start(self._icon, False) self.pack_start(self._msg_label, False) self._msg_label.show() self._icon.show() - - def do_set_property(self, pspec, value): + + def do_set_property(self, pspec, value): if pspec.name == 'msg': if self._msg != value: self._msg = value diff --git a/src/jarabe/controlpanel/sectionview.py b/src/jarabe/controlpanel/sectionview.py index 7b76aa1..4de27a2 100644 --- a/src/jarabe/controlpanel/sectionview.py +++ b/src/jarabe/controlpanel/sectionview.py @@ -30,7 +30,7 @@ class SectionView(gtk.VBox): 'is_valid' : (bool, None, None, True, gobject.PARAM_READWRITE) } - + _APPLY_TIMEOUT = 1000 def __init__(self): diff --git a/src/jarabe/controlpanel/toolbar.py b/src/jarabe/controlpanel/toolbar.py index 6bb8328..320a8eb 100644 --- a/src/jarabe/controlpanel/toolbar.py +++ b/src/jarabe/controlpanel/toolbar.py @@ -66,7 +66,7 @@ class MainToolbar(gtk.Toolbar): def get_entry(self): return self._search_entry - + def _add_separator(self, expand=False): separator = gtk.SeparatorToolItem() separator.props.draw = False @@ -103,12 +103,12 @@ class SectionToolbar(gtk.Toolbar): self._icon = Icon() self._add_widget(self._icon) - + self._add_separator() self._title = gtk.Label() self._add_widget(self._title) - + self._add_separator(True) self.cancel_button = ToolButton('dialog-cancel') diff --git a/src/jarabe/desktop/favoritesview.py b/src/jarabe/desktop/favoritesview.py index e8bc7e7..4d69b40 100644 --- a/src/jarabe/desktop/favoritesview.py +++ b/src/jarabe/desktop/favoritesview.py @@ -112,7 +112,7 @@ class FavoritesView(hippo.Canvas): def __settings_changed_cb(self, **kwargs): favorites_settings = get_settings() - self._set_layout(favorites_settings.layout) + self._set_layout(favorites_settings.layout) def __connect_to_bundle_registry_cb(self): registry = bundleregistry.get_registry() @@ -169,7 +169,7 @@ class FavoritesView(hippo.Canvas): self._add_activity(activity_info) def do_size_allocate(self, allocation): - width = allocation.width + width = allocation.width height = allocation.height min_w_, my_icon_width = self._my_icon.get_width_request() @@ -213,7 +213,7 @@ class FavoritesView(hippo.Canvas): def __motion_notify_event_cb(self, widget, event): if not self._pressed_button: return False - + # if the mouse button is not pressed, no drag should occurr if not event.state & gtk.gdk.BUTTON1_MASK: self._pressed_button = None @@ -239,7 +239,7 @@ class FavoritesView(hippo.Canvas): icon_file_name = self._last_clicked_icon.props.file_name # TODO: we should get the pixbuf from the widget, so it has colors, etc pixbuf = gtk.gdk.pixbuf_new_from_file(icon_file_name) - + self._hot_x = pixbuf.props.width / 2 self._hot_y = pixbuf.props.height / 2 context.set_icon_pixbuf(pixbuf, self._hot_x, self._hot_y) @@ -322,7 +322,7 @@ class FavoritesView(hippo.Canvas): except RegisterError, e: alert.props.title = _('Registration Failed') alert.props.msg = _('%s') % e - else: + else: alert.props.title = _('Registration Successful') alert.props.msg = _('You are now registered ' \ 'with your school server.') @@ -332,8 +332,8 @@ class FavoritesView(hippo.Canvas): alert.add_button(gtk.RESPONSE_OK, _('Ok'), ok_icon) self.add_alert(alert) - alert.connect('response', self.__register_alert_response_cb) - + alert.connect('response', self.__register_alert_response_cb) + def __register_alert_response_cb(self, alert, response_id): self.remove_alert() @@ -500,7 +500,7 @@ class ActivityIcon(CanvasIcon): cr.stroke() def do_get_content_height_request(self, for_width): - height, height = CanvasIcon.do_get_content_height_request(self, + height, height = CanvasIcon.do_get_content_height_request(self, for_width) height += ActivityIcon._BORDER_WIDTH * 2 return height, height @@ -689,7 +689,7 @@ class FavoritesSetting(object): _FAVORITES_KEY = "/desktop/sugar/desktop/favorites_layout" def __init__(self): - client = gconf.client_get_default() + client = gconf.client_get_default() self._layout = client.get_string(self._FAVORITES_KEY) logging.debug('FavoritesSetting layout %r', self._layout) diff --git a/src/jarabe/desktop/grid.py b/src/jarabe/desktop/grid.py index eb7fabc..f3412c9 100644 --- a/src/jarabe/desktop/grid.py +++ b/src/jarabe/desktop/grid.py @@ -99,10 +99,10 @@ class Grid(_sugarext.Grid): if weight > 0: self._detect_collisions(child) - + def _shift_child(self, child, weight): rect = self._child_rects[child] - + new_rects = [] # Get rects right, left, bottom and top @@ -148,7 +148,7 @@ class Grid(_sugarext.Grid): if new_weight < weight: best_rect = new_rect weight = new_weight - + if best_rect: self._child_rects[child] = best_rect weight = self._shift_child(child, weight) diff --git a/src/jarabe/desktop/groupbox.py b/src/jarabe/desktop/groupbox.py index 1c1dd0c..76c2981 100644 --- a/src/jarabe/desktop/groupbox.py +++ b/src/jarabe/desktop/groupbox.py @@ -83,7 +83,7 @@ class GroupBox(hippo.Canvas): icon.destroy() def do_size_allocate(self, allocation): - width = allocation.width + width = allocation.width height = allocation.height min_w_, icon_width = self._owner_icon.get_width_request() diff --git a/src/jarabe/desktop/homebox.py b/src/jarabe/desktop/homebox.py index 604001e..85279ff 100644 --- a/src/jarabe/desktop/homebox.py +++ b/src/jarabe/desktop/homebox.py @@ -53,16 +53,16 @@ class HomeBox(gtk.VBox): self._toolbar.show() self._set_view(_FAVORITES_VIEW) - + def show_software_updates_alert(self): alert = Alert() - updater_icon = Icon(icon_name='module-updater', + updater_icon = Icon(icon_name='module-updater', pixel_size = style.STANDARD_ICON_SIZE) alert.props.icon = updater_icon updater_icon.show() alert.props.title = _('Software Update') - alert.props.msg = _('Update your activities to ensure' - ' compatibility with your new software') + alert.props.msg = _('Update your activities to ensure' + ' compatibility with your new software') cancel_icon = Icon(icon_name='dialog-cancel') alert.add_button(gtk.RESPONSE_CANCEL, _('Cancel'), cancel_icon) @@ -77,7 +77,7 @@ class HomeBox(gtk.VBox): else: self._favorites_view.add_alert(alert) alert.connect('response', self.__software_update_response_cb) - + def __software_update_response_cb(self, alert, response_id): if self._list_view in self.get_children(): self._list_view.remove_alert() @@ -208,7 +208,7 @@ class HomeToolbar(gtk.Toolbar): self.search_entry.set_sensitive(True) self.search_entry.grab_focus() self.emit('view-changed', view) - + def _add_separator(self, expand=False): separator = gtk.SeparatorToolItem() separator.props.draw = False @@ -248,7 +248,7 @@ class HomeToolbar(gtk.Toolbar): class FavoritesButton(RadioToolButton): __gtype_name__ = 'SugarFavoritesButton' - + def __init__(self): RadioToolButton.__init__(self) diff --git a/src/jarabe/desktop/homewindow.py b/src/jarabe/desktop/homewindow.py index 6212970..c3b18de 100644 --- a/src/jarabe/desktop/homewindow.py +++ b/src/jarabe/desktop/homewindow.py @@ -95,28 +95,28 @@ class HomeWindow(gtk.Window): if old_level != ShellModel.ZOOM_ACTIVITY and \ new_level != ShellModel.ZOOM_ACTIVITY: - self.remove(self.get_child()) - self.add(self._transition_box) - self._transition_box.show() - - if new_level == ShellModel.ZOOM_HOME: - end_size = style.XLARGE_ICON_SIZE - elif new_level == ShellModel.ZOOM_GROUP: - end_size = style.LARGE_ICON_SIZE - elif new_level == ShellModel.ZOOM_MESH: - end_size = style.STANDARD_ICON_SIZE - - if old_level == ShellModel.ZOOM_HOME: - start_size = style.XLARGE_ICON_SIZE - elif old_level == ShellModel.ZOOM_GROUP: - start_size = style.LARGE_ICON_SIZE - elif old_level == ShellModel.ZOOM_MESH: - start_size = style.STANDARD_ICON_SIZE - - self._transition_box.start_transition(start_size, end_size) + self.remove(self.get_child()) + self.add(self._transition_box) + self._transition_box.show() + + if new_level == ShellModel.ZOOM_HOME: + end_size = style.XLARGE_ICON_SIZE + elif new_level == ShellModel.ZOOM_GROUP: + end_size = style.LARGE_ICON_SIZE + elif new_level == ShellModel.ZOOM_MESH: + end_size = style.STANDARD_ICON_SIZE + + if old_level == ShellModel.ZOOM_HOME: + start_size = style.XLARGE_ICON_SIZE + elif old_level == ShellModel.ZOOM_GROUP: + start_size = style.LARGE_ICON_SIZE + elif old_level == ShellModel.ZOOM_MESH: + start_size = style.STANDARD_ICON_SIZE + + self._transition_box.start_transition(start_size, end_size) else: self._update_view(new_level) - + def _transition_completed_cb(self, transition_box): self._update_view(shell.get_model().zoom_level) @@ -124,7 +124,7 @@ class HomeWindow(gtk.Window): if level == ShellModel.ZOOM_ACTIVITY: return - current_child = self.get_child() + current_child = self.get_child() self.remove(current_child) if level == ShellModel.ZOOM_HOME: diff --git a/src/jarabe/desktop/keydialog.py b/src/jarabe/desktop/keydialog.py index b9b229b..8b8f0bf 100644 --- a/src/jarabe/desktop/keydialog.py +++ b/src/jarabe/desktop/keydialog.py @@ -74,7 +74,7 @@ class KeyDialog(gtk.Dialog): self._rsn_flags = rsn_flags self._dev_caps = dev_caps - self.set_has_separator(False) + self.set_has_separator(False) label = gtk.Label("A wireless encryption key is required for\n" \ " the wireless network '%s'." % self._ssid) diff --git a/src/jarabe/desktop/meshbox.py b/src/jarabe/desktop/meshbox.py index ba9c103..cde921d 100644 --- a/src/jarabe/desktop/meshbox.py +++ b/src/jarabe/desktop/meshbox.py @@ -129,7 +129,7 @@ class AccessPointView(CanvasPulsingIcon): self._palette_icon = Icon(icon_name=icon_name, icon_size=style.STANDARD_ICON_SIZE, badge_name=self.props.badge_name) - + p = palette.Palette(primary_text=self._name, icon=self._palette_icon) @@ -185,7 +185,7 @@ class AccessPointView(CanvasPulsingIcon): digest = hash(sha_hash.digest()) index = digest % len(xocolor.colors) - self._color = XoColor('%s,%s' % + self._color = XoColor('%s,%s' % (xocolor.colors[index][0], xocolor.colors[index][1])) self._update() @@ -273,7 +273,7 @@ class AccessPointView(CanvasPulsingIcon): self._palette.props.secondary_text = None self.props.pulsing = False - def _update_color(self): + def _update_color(self): if self._greyed_out: self.props.pulsing = False self.props.base_color = XoColor('#D5D5D5,#D5D5D5') @@ -358,7 +358,7 @@ class AccessPointView(CanvasPulsingIcon): def _connect(self): connection = network.find_connection(self._name) if connection is None: - settings = Settings() + settings = Settings() settings.connection.id = 'Auto ' + self._name settings.connection.uuid = unique_id() settings.connection.type = '802-11-wireless' @@ -742,7 +742,7 @@ class MeshBox(gtk.VBox): self._suspended = True self._query = '' self._owner_icon = None - + self._toolbar = MeshToolbar() self._toolbar.connect('query-changed', self._toolbar_query_changed_cb) self.pack_start(self._toolbar, expand=False) @@ -776,7 +776,7 @@ class MeshBox(gtk.VBox): netmgr_observer.listen() def do_size_allocate(self, allocation): - width = allocation.width + width = allocation.width height = allocation.height min_w_, icon_width = self._owner_icon.get_width_request() @@ -791,7 +791,7 @@ class MeshBox(gtk.VBox): self._add_alone_buddy(buddy_model) def _buddy_removed_cb(self, model, buddy_model): - self._remove_buddy(buddy_model) + self._remove_buddy(buddy_model) def _buddy_moved_cb(self, model, buddy_model, activity_model): # Owner doesn't move from the center @@ -803,7 +803,7 @@ class MeshBox(gtk.VBox): self._add_activity(activity_model) def _activity_removed_cb(self, model, activity_model): - self._remove_activity(activity_model) + self._remove_activity(activity_model) def _add_alone_buddy(self, buddy_model): icon = BuddyIcon(buddy_model) diff --git a/src/jarabe/desktop/schoolserver.py b/src/jarabe/desktop/schoolserver.py index 2df2a40..f09469f 100644 --- a/src/jarabe/desktop/schoolserver.py +++ b/src/jarabe/desktop/schoolserver.py @@ -48,8 +48,8 @@ def register_laptop(url=REGISTER_URL): data = server.register(sn, nick, uuid, profile.pubkey) except (Error, socket.error): logging.exception('Registration: cannot connect to server') - raise RegisterError(_('Cannot connect to the server.')) - + raise RegisterError(_('Cannot connect to the server.')) + if data['success'] != 'OK': logging.error('Registration: server could not complete request: %s', data['error']) diff --git a/src/jarabe/desktop/transitionbox.py b/src/jarabe/desktop/transitionbox.py index a554415..af17cfb 100644 --- a/src/jarabe/desktop/transitionbox.py +++ b/src/jarabe/desktop/transitionbox.py @@ -61,12 +61,12 @@ class _Layout(gobject.GObject, hippo.CanvasLayout): class TransitionBox(hippo.Canvas): __gtype_name__ = 'SugarTransitionBox' - + __gsignals__ = { 'completed': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ([])) } - + def __init__(self): gobject.GObject.__init__(self) diff --git a/src/jarabe/frame/activitiestray.py b/src/jarabe/frame/activitiestray.py index 390cf88..dd1a775 100644 --- a/src/jarabe/frame/activitiestray.py +++ b/src/jarabe/frame/activitiestray.py @@ -722,7 +722,7 @@ class IncomingTransferPalette(BaseTransferPalette): for item in self.menu.get_children(): self.menu.remove(item) - + menu_item = MenuItem(_('Cancel'), icon_name='dialog-cancel') menu_item.connect('activate', self.__cancel_activate_cb) self.menu.append(menu_item) @@ -846,7 +846,7 @@ class OutgoingTransferPalette(BaseTransferPalette): for item in self.menu.get_children(): self.menu.remove(item) - + menu_item = MenuItem(_('Cancel'), icon_name='dialog-cancel') menu_item.connect('activate', self.__cancel_activate_cb) self.menu.append(menu_item) diff --git a/src/jarabe/frame/clipboard.py b/src/jarabe/frame/clipboard.py index 1cefcc1..3b9f745 100644 --- a/src/jarabe/frame/clipboard.py +++ b/src/jarabe/frame/clipboard.py @@ -65,7 +65,7 @@ class Clipboard(gobject.GObject): elif on_disk and cb_object.get_percent() == 100: new_uri = self._copy_file(data) cb_object.add_format(Format(format_type, new_uri, on_disk)) - logging.debug('Added format of type ' + format_type + logging.debug('Added format of type ' + format_type + ' with path at ' + new_uri) else: cb_object.add_format(Format(format_type, data, on_disk)) @@ -78,7 +78,7 @@ class Clipboard(gobject.GObject): cb_object.destroy() self.emit('object-deleted', object_id) logging.debug('Deleted object with object_id %r', object_id) - + def set_object_percent(self, object_id, percent): cb_object = self._objects[object_id] if percent < 0 or percent > 100: @@ -118,7 +118,7 @@ class Clipboard(gobject.GObject): logging.debug('Clipboard.get_object') return self._objects[object_id] - def get_object_data(self, object_id, format_type): + def get_object_data(self, object_id, format_type): logging.debug('Clipboard.get_object_data') cb_object = self._objects[object_id] format_ = cb_object.get_formats()[format_type] diff --git a/src/jarabe/frame/clipboardicon.py b/src/jarabe/frame/clipboardicon.py index 93a177e..279db08 100644 --- a/src/jarabe/frame/clipboardicon.py +++ b/src/jarabe/frame/clipboardicon.py @@ -133,7 +133,7 @@ class ClipboardIcon(RadioToolButton): XoColor('%s,%s' % (self._icon.props.stroke_color, self._icon.props.fill_color)) frame = jarabe.frame.get_view() - frame.add_notification(self._notif_icon, + frame.add_notification(self._notif_icon, gtk.CORNER_BOTTOM_LEFT) self._current_percent = cb_object.get_percent() diff --git a/src/jarabe/frame/clipboardmenu.py b/src/jarabe/frame/clipboardmenu.py index e2eba68..9b990bb 100644 --- a/src/jarabe/frame/clipboardmenu.py +++ b/src/jarabe/frame/clipboardmenu.py @@ -62,7 +62,7 @@ class ClipboardMenu(Palette): self._journal_item = MenuItem(_('Keep')) client = gconf.client_get_default() color = XoColor(client.get_string('/desktop/sugar/user/color')) - icon = Icon(icon_name='document-save', icon_size=gtk.ICON_SIZE_MENU, + icon = Icon(icon_name='document-save', icon_size=gtk.ICON_SIZE_MENU, xo_color=color) self._journal_item.set_image(icon) @@ -109,7 +109,7 @@ class ClipboardMenu(Palette): activities = self._get_activities() installable = self._cb_object.is_bundle() percent = self._cb_object.get_percent() - + if percent == 100 and (activities or installable): self._remove_item.props.sensitive = True self._open_item.props.sensitive = True diff --git a/src/jarabe/frame/clipboardobject.py b/src/jarabe/frame/clipboardobject.py index d6a55db..e9403f9 100644 --- a/src/jarabe/frame/clipboardobject.py +++ b/src/jarabe/frame/clipboardobject.py @@ -90,10 +90,10 @@ class ClipboardObject(object): def set_percent(self, percent): self._percent = percent - + def add_format(self, format_): self._formats[format_.get_type()] = format_ - + def get_formats(self): return self._formats diff --git a/src/jarabe/frame/clipboardpanelwindow.py b/src/jarabe/frame/clipboardpanelwindow.py index 7d08d32..ac324f4 100644 --- a/src/jarabe/frame/clipboardpanelwindow.py +++ b/src/jarabe/frame/clipboardpanelwindow.py @@ -58,7 +58,7 @@ class ClipboardPanelWindow(FrameWindow): cb_service = clipboard.get_instance() key = cb_service.add_object(name="") cb_service.set_object_percent(key, percent=0) - + targets = x_clipboard.wait_for_targets() for target in targets: if target not in ('TIMESTAMP', 'TARGETS', @@ -76,9 +76,9 @@ class ClipboardPanelWindow(FrameWindow): if not selection.data: logging.warning('no data for selection target %s.', selection.type) return - + logging.debug('adding type ' + selection.type + '.') - + cb_service = clipboard.get_instance() if selection.type == 'text/uri-list': uris = selection.get_uris() @@ -96,7 +96,7 @@ class ClipboardPanelWindow(FrameWindow): uri, on_disk) else: - cb_service.add_object_format(key, + cb_service.add_object_format(key, selection.type, selection.data, on_disk=False) diff --git a/src/jarabe/frame/clipboardtray.py b/src/jarabe/frame/clipboardtray.py index 75c1ecf..8beb6a8 100644 --- a/src/jarabe/frame/clipboardtray.py +++ b/src/jarabe/frame/clipboardtray.py @@ -19,7 +19,7 @@ import logging import tempfile import gtk - + from sugar import util from sugar.graphics import tray from sugar.graphics import style @@ -31,20 +31,20 @@ class _ContextMap(object): """Maps a drag context to the clipboard object involved in the dragging.""" def __init__(self): self._context_map = {} - + def add_context(self, context, object_id, data_types): """Establishes the mapping. data_types will serve us for reference- counting this mapping. """ self._context_map[context] = [object_id, data_types] - + def get_object_id(self, context): """Retrieves the object_id associated with context. Will release the association when this function was called as many times as the number of data_types that this clipboard object contains. """ [object_id, data_types_left] = self._context_map[context] - + data_types_left = data_types_left - 1 if data_types_left == 0: del self._context_map[context] @@ -55,11 +55,11 @@ class _ContextMap(object): def has_context(self, context): return context in self._context_map - + class ClipboardTray(tray.VTray): - + MAX_ITEMS = gtk.gdk.screen_height() / style.GRID_CELL_SIZE - 2 - + def __init__(self): tray.VTray.__init__(self, align=tray.ALIGN_TO_END) self._icons = {} @@ -88,16 +88,16 @@ class ClipboardTray(tray.VTray): raise NotImplementedError('Multiple uris in text/uri-list' \ ' still not supported.') - cb_service.add_object_format(object_id, + cb_service.add_object_format(object_id, selection.type, uris[0], on_disk=True) else: - cb_service.add_object_format(object_id, + cb_service.add_object_format(object_id, selection.type, selection.data, on_disk=False) - + def _object_added_cb(self, cb_service, cb_object): if self._icons: group = self._icons.values()[0] @@ -150,7 +150,7 @@ class ClipboardTray(tray.VTray): object_id = cb_service.add_object(name="") self._context_map.add_context(context, object_id, len(context.targets)) - + if 'XdndDirectSave0' in context.targets: window = context.source_window prop_type, format_, filename = \ @@ -175,7 +175,7 @@ class ClipboardTray(tray.VTray): widget.drag_get_data(context, target, time) cb_service.set_object_percent(object_id, percent=100) - + return True def drag_data_received_cb(self, widget, context, x, y, selection, diff --git a/src/jarabe/frame/eventarea.py b/src/jarabe/frame/eventarea.py index 5b31b24..166aaf5 100644 --- a/src/jarabe/frame/eventarea.py +++ b/src/jarabe/frame/eventarea.py @@ -43,38 +43,38 @@ class EventArea(gobject.GObject): bottom = gtk.gdk.screen_height() -1 width = gtk.gdk.screen_width() - 2 height = gtk.gdk.screen_height() - 2 - - if self._edge_delay != _MAX_DELAY: - invisible = self._create_invisible(1, 0, width, 1, + + if self._edge_delay != _MAX_DELAY: + invisible = self._create_invisible(1, 0, width, 1, self._edge_delay) self._windows.append(invisible) - invisible = self._create_invisible(1, bottom, width, 1, + invisible = self._create_invisible(1, bottom, width, 1, self._edge_delay) self._windows.append(invisible) - invisible = self._create_invisible(0, 1, 1, height, + invisible = self._create_invisible(0, 1, 1, height, self._edge_delay) self._windows.append(invisible) - invisible = self._create_invisible(right, 1, 1, height, + invisible = self._create_invisible(right, 1, 1, height, self._edge_delay) self._windows.append(invisible) - if self._corner_delay != _MAX_DELAY: - invisible = self._create_invisible(0, 0, 1, 1, + if self._corner_delay != _MAX_DELAY: + invisible = self._create_invisible(0, 0, 1, 1, self._corner_delay) self._windows.append(invisible) - invisible = self._create_invisible(right, 0, 1, 1, + invisible = self._create_invisible(right, 0, 1, 1, self._corner_delay) self._windows.append(invisible) - invisible = self._create_invisible(0, bottom, 1, 1, + invisible = self._create_invisible(0, bottom, 1, 1, self._corner_delay) self._windows.append(invisible) - invisible = self._create_invisible(right, bottom, 1, 1, + invisible = self._create_invisible(right, bottom, 1, 1, self._corner_delay) self._windows.append(invisible) @@ -85,10 +85,10 @@ class EventArea(gobject.GObject): def _create_invisible(self, x, y, width, height, delay): invisible = gtk.Invisible() if delay >= 0: - invisible.connect('enter-notify-event', self._enter_notify_cb, + invisible.connect('enter-notify-event', self._enter_notify_cb, delay) invisible.connect('leave-notify-event', self._leave_notify_cb) - + invisible.drag_dest_set(0, [], 0) invisible.connect('drag_motion', self._drag_motion_cb) invisible.connect('drag_leave', self._drag_leave_cb) @@ -114,30 +114,30 @@ class EventArea(gobject.GObject): def _enter_notify_cb(self, widget, event, delay): if widget in self._sids: gobject.source_remove(self._sids[widget]) - self._sids[widget] = gobject.timeout_add(delay, - self.__delay_cb, + self._sids[widget] = gobject.timeout_add(delay, + self.__delay_cb, widget) - def __delay_cb(self, widget): - del self._sids[widget] + def __delay_cb(self, widget): + del self._sids[widget] self._notify_enter() return False def _leave_notify_cb(self, widget, event): if widget in self._sids: gobject.source_remove(self._sids[widget]) - del self._sids[widget] + del self._sids[widget] self._notify_leave() def _drag_motion_cb(self, widget, drag_context, x, y, timestamp): drag_context.drag_status(0, timestamp) self._notify_enter() return True - + def _drag_leave_cb(self, widget, drag_context, timestamp): self._notify_leave() return True - + def show(self): for window in self._windows: window.show() diff --git a/src/jarabe/frame/frame.py b/src/jarabe/frame/frame.py index 1e02fc8..9956a41 100644 --- a/src/jarabe/frame/frame.py +++ b/src/jarabe/frame/frame.py @@ -276,13 +276,13 @@ class Frame(object): def _drag_motion_cb(self, window, context, x, y, time): self._mouse_listener.mouse_enter() - + def _drag_leave_cb(self, window, drag_context, timestamp): self._mouse_listener.mouse_leave() - + def _enter_corner_cb(self, event_area): self._mouse_listener.mouse_enter() - + def notify_key_press(self): self._key_listener.key_press() diff --git a/src/jarabe/frame/framewindow.py b/src/jarabe/frame/framewindow.py index 87eefb9..92e7df7 100644 --- a/src/jarabe/frame/framewindow.py +++ b/src/jarabe/frame/framewindow.py @@ -79,7 +79,7 @@ class FrameWindow(gtk.Window): box.append(self._bg, hippo.PACK_EXPAND) self._update_size() - + screen = gtk.gdk.screen_get_default() screen.connect('size-changed', self._size_changed_cb) @@ -104,6 +104,6 @@ class FrameWindow(gtk.Window): def _leave_notify_cb(self, window, event): if event.detail != gtk.gdk.NOTIFY_INFERIOR: self.hover = False - + def _size_changed_cb(self, screen): self._update_size() diff --git a/src/jarabe/frame/friendstray.py b/src/jarabe/frame/friendstray.py index c9af585..b5437e5 100644 --- a/src/jarabe/frame/friendstray.py +++ b/src/jarabe/frame/friendstray.py @@ -63,7 +63,7 @@ class FriendsTray(VTray): return model = BuddyModel(buddy=buddy) - + icon = FriendIcon(model) self.add_item(icon) icon.show() @@ -102,11 +102,11 @@ class FriendsTray(VTray): self._activity_ps = activity_ps self.clear() - + # always display ourselves self.add_buddy(self._owner) - if shared_activity is True: + if shared_activity is True: for buddy in activity_ps.get_joined_buddies(): self.add_buddy(buddy) @@ -114,15 +114,15 @@ class FriendsTray(VTray): 'buddy-joined', self.__buddy_joined_cb) self._left_hid = activity_ps.connect( 'buddy-left', self.__buddy_left_cb) - + def _active_activity_changed_cb(self, home_model, home_activity): - if home_activity is None: + if home_activity is None: return activity_id = home_activity.get_activity_id() if activity_id is None: return - + # check if activity is shared activity = None for act in self._pservice.get_activities(): diff --git a/src/jarabe/frame/notification.py b/src/jarabe/frame/notification.py index 61a84e9..83dc27e 100644 --- a/src/jarabe/frame/notification.py +++ b/src/jarabe/frame/notification.py @@ -44,13 +44,13 @@ class NotificationIcon(gtk.EventBox): self._icon.props.pulsing = True self.add(self._icon) self._icon.show() - + gobject.timeout_add_seconds(self._PULSE_TIMEOUT, self.__stop_pulsing_cb) self.set_size_request(style.GRID_CELL_SIZE, style.GRID_CELL_SIZE) def __stop_pulsing_cb(self): - self._icon.props.pulsing = False + self._icon.props.pulsing = False return False def do_set_property(self, pspec, value): @@ -77,7 +77,7 @@ class NotificationIcon(gtk.EventBox): def _get_palette(self): return self._icon.palette - + palette = property(_get_palette, _set_palette) class NotificationWindow(gtk.Window): diff --git a/src/jarabe/frame/zoomtoolbar.py b/src/jarabe/frame/zoomtoolbar.py index 4f44600..c168e97 100644 --- a/src/jarabe/frame/zoomtoolbar.py +++ b/src/jarabe/frame/zoomtoolbar.py @@ -52,7 +52,7 @@ class ZoomToolbar(gtk.Toolbar): else: group = None - button = RadioToolButton(named_icon=icon_name, group=group, + button = RadioToolButton(named_icon=icon_name, group=group, accelerator=accelerator) button.connect('clicked', self.__level_clicked_cb, zoom_level) self.add(button) @@ -62,7 +62,7 @@ class ZoomToolbar(gtk.Toolbar): palette.props.invoker = FrameWidgetInvoker(button) palette.set_group_id('frame') button.set_palette(palette) - + return button def __level_clicked_cb(self, button, level): diff --git a/src/jarabe/journal/expandedentry.py b/src/jarabe/journal/expandedentry.py index 924f872..9697033 100644 --- a/src/jarabe/journal/expandedentry.py +++ b/src/jarabe/journal/expandedentry.py @@ -116,7 +116,7 @@ class ExpandedEntry(hippo.CanvasBox): header.reverse() # First column - + self._preview = self._create_preview() first_column.append(self._preview) @@ -179,7 +179,7 @@ class ExpandedEntry(hippo.CanvasBox): if self._metadata.has_key('preview') and \ len(self._metadata['preview']) > 4: - + if self._metadata['preview'][1:4] == 'PNG': preview_data = self._metadata['preview'] else: @@ -256,7 +256,7 @@ class ExpandedEntry(hippo.CanvasBox): vbox = hippo.CanvasBox() vbox.props.spacing = style.DEFAULT_SPACING - + text = hippo.CanvasText(text=_('Participants:'), font_desc=style.FONT_NORMAL.get_pango_desc()) text.props.color = style.COLOR_BUTTON_GREY.get_int() @@ -305,7 +305,7 @@ class ExpandedEntry(hippo.CanvasBox): def _create_tags(self): vbox = hippo.CanvasBox() vbox.props.spacing = style.DEFAULT_SPACING - + text = hippo.CanvasText(text=_('Tags:'), font_desc=style.FONT_NORMAL.get_pango_desc()) text.props.color = style.COLOR_BUTTON_GREY.get_int() @@ -316,7 +316,7 @@ class ExpandedEntry(hippo.CanvasBox): text.props.xalign = hippo.ALIGNMENT_START vbox.append(text) - + tags = self._metadata.get('tags', '') text_view = CanvasTextView(tags, box_height=style.GRID_CELL_SIZE * 2) vbox.append(text_view, hippo.PACK_EXPAND) @@ -366,9 +366,9 @@ class ExpandedEntry(hippo.CanvasBox): if needs_update: model.write(self._metadata, update_mtime=False) - + self._update_title_sid = None - + def get_keep(self): return int(self._metadata.get('keep', 0)) == 1 diff --git a/src/jarabe/journal/journalactivity.py b/src/jarabe/journal/journalactivity.py index 08a5a0f..a6e85d4 100644 --- a/src/jarabe/journal/journalactivity.py +++ b/src/jarabe/journal/journalactivity.py @@ -18,7 +18,7 @@ import logging from gettext import gettext as _ import sys -import traceback +import traceback import uuid import gtk @@ -131,10 +131,10 @@ class JournalActivity(Window): model.updated.connect(self.__model_updated_cb) model.deleted.connect(self.__model_deleted_cb) - self._dbus_service = JournalActivityDBusService(self) + self._dbus_service = JournalActivityDBusService(self) self.iconify() - + self._critical_space_alert = None self._check_available_space() @@ -310,8 +310,8 @@ class JournalActivity(Window): def _check_available_space(self): ''' Check available space on device - If the available space is below 50MB an alert will be - shown which encourages to delete old journal entries. + If the available space is below 50MB an alert will be + shown which encourages to delete old journal entries. ''' if self._critical_space_alert: @@ -320,11 +320,11 @@ class JournalActivity(Window): free_space = stat[statvfs.F_BSIZE] * stat[statvfs.F_BAVAIL] if free_space < _SPACE_TRESHOLD: self._critical_space_alert = ModalAlert() - self._critical_space_alert.connect('destroy', + self._critical_space_alert.connect('destroy', self.__alert_closed_cb) self._critical_space_alert.show() - - def __alert_closed_cb(self, data): + + def __alert_closed_cb(self, data): self.show_main_view() self.present() self._critical_space_alert = None diff --git a/src/jarabe/journal/journaltoolbox.py b/src/jarabe/journal/journaltoolbox.py index 201bf76..fe05657 100644 --- a/src/jarabe/journal/journaltoolbox.py +++ b/src/jarabe/journal/journaltoolbox.py @@ -1,5 +1,5 @@ # Copyright (C) 2007, One Laptop Per Child -# Copyright (C) 2009, Walter Bender +# Copyright (C) 2009, Walter Bender # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/src/jarabe/journal/keepicon.py b/src/jarabe/journal/keepicon.py index c6dc470..2c692c6 100644 --- a/src/jarabe/journal/keepicon.py +++ b/src/jarabe/journal/keepicon.py @@ -28,7 +28,7 @@ class KeepIcon(CanvasIcon): box_width=style.GRID_CELL_SIZE * 3 / 5, size=style.SMALL_ICON_SIZE) self.connect('motion-notify-event', self.__motion_notify_event_cb) - + self._keep = None self.set_keep(keep) diff --git a/src/jarabe/journal/modalalert.py b/src/jarabe/journal/modalalert.py index a5a86ab..c7c6a0a 100644 --- a/src/jarabe/journal/modalalert.py +++ b/src/jarabe/journal/modalalert.py @@ -22,7 +22,7 @@ from sugar.graphics.icon import Icon from sugar.graphics import style from sugar.graphics.xocolor import XoColor -class ModalAlert(gtk.Window): +class ModalAlert(gtk.Window): __gtype_name__ = 'SugarModalAlert' @@ -34,16 +34,16 @@ class ModalAlert(gtk.Window): width = gtk.gdk.screen_width() - offset * 2 height = gtk.gdk.screen_height() - offset * 2 self.set_size_request(width, height) - self.set_position(gtk.WIN_POS_CENTER_ALWAYS) + self.set_position(gtk.WIN_POS_CENTER_ALWAYS) self.set_decorated(False) self.set_resizable(False) self.set_modal(True) - + self._main_view = gtk.EventBox() - self._vbox = gtk.VBox() + self._vbox = gtk.VBox() self._vbox.set_spacing(style.DEFAULT_SPACING) self._vbox.set_border_width(style.GRID_CELL_SIZE * 2) - self._main_view.modify_bg(gtk.STATE_NORMAL, + self._main_view.modify_bg(gtk.STATE_NORMAL, style.COLOR_BLACK.get_gdk_color()) self._main_view.add(self._vbox) self._vbox.show() @@ -58,17 +58,17 @@ class ModalAlert(gtk.Window): icon.show() self._title = gtk.Label() - self._title.modify_fg(gtk.STATE_NORMAL, + self._title.modify_fg(gtk.STATE_NORMAL, style.COLOR_WHITE.get_gdk_color()) - self._title.set_markup('<b>%s</b>' % _('Your Journal is full')) + self._title.set_markup('<b>%s</b>' % _('Your Journal is full')) self._vbox.pack_start(self._title, False) self._title.show() - self._message = gtk.Label(_('Please delete some old Journal' + self._message = gtk.Label(_('Please delete some old Journal' ' entries to make space for new ones.')) - self._message.modify_fg(gtk.STATE_NORMAL, + self._message.modify_fg(gtk.STATE_NORMAL, style.COLOR_WHITE.get_gdk_color()) - self._vbox.pack_start(self._message, False) + self._vbox.pack_start(self._message, False) self._message.show() alignment = gtk.Alignment(xalign=0.5, yalign=0.5) diff --git a/src/jarabe/journal/model.py b/src/jarabe/journal/model.py index 02ce26a..0176c54 100644 --- a/src/jarabe/journal/model.py +++ b/src/jarabe/journal/model.py @@ -62,7 +62,7 @@ class _Cache(object): for entry in entries: self._array.append(entry) self._dict[entry['uid']] = entry - + def remove_all(self, entries): for uid in [entry['uid'] for entry in entries]: obj = self._dict[uid] @@ -376,7 +376,7 @@ def find(query, page_size): """ if 'order_by' not in query: query['order_by'] = ['-mtime'] - + mount_points = query.pop('mountpoints', ['/']) if mount_points is None or len(mount_points) != 1: raise ValueError('Exactly one mount point must be specified') @@ -514,7 +514,7 @@ def _get_file_name(title, mime_type): if len(file_name) > max_len: name, extension = os.path.splitext(file_name) file_name = name[0:max_len - len(extension)] + extension - + return file_name def _get_unique_file_name(mount_point, file_name): diff --git a/src/jarabe/journal/objectchooser.py b/src/jarabe/journal/objectchooser.py index 31bdba8..49af3e6 100644 --- a/src/jarabe/journal/objectchooser.py +++ b/src/jarabe/journal/objectchooser.py @@ -90,9 +90,9 @@ class ObjectChooser(gtk.Window): self._list_view.show() self._toolbar.set_mount_point('/') - + width = gtk.gdk.screen_width() - style.GRID_CELL_SIZE * 2 - height = gtk.gdk.screen_height() - style.GRID_CELL_SIZE * 2 + height = gtk.gdk.screen_height() - style.GRID_CELL_SIZE * 2 self.set_size_request(width, height) if what_filter: @@ -120,7 +120,7 @@ class ObjectChooser(gtk.Window): def __close_button_clicked_cb(self, button): self.emit('response', gtk.RESPONSE_DELETE_EVENT) - + def get_selected_object_id(self): return self._selected_object_id diff --git a/src/jarabe/journal/palettes.py b/src/jarabe/journal/palettes.py index 49cc676..cd4985a 100644 --- a/src/jarabe/journal/palettes.py +++ b/src/jarabe/journal/palettes.py @@ -59,7 +59,7 @@ class ObjectPalette(Palette): activity_icon.props.xo_color = \ XoColor('%s,%s' % (style.COLOR_BUTTON_GREY.get_svg(), style.COLOR_TRANSPARENT.get_svg())) - + if metadata.has_key('title'): title = gobject.markup_escape_text(metadata['title']) else: @@ -173,7 +173,7 @@ class FriendsMenu(gtk.Menu): friends_model = friends.get_model() for friend in friends_model: if friend.is_present(): - menu_item = MenuItem(text_label=friend.get_nick(), + menu_item = MenuItem(text_label=friend.get_nick(), icon_name='computer-xo', xo_color=friend.get_color()) menu_item.connect('activate', self.__item_activate_cb, @@ -185,12 +185,12 @@ class FriendsMenu(gtk.Menu): menu_item = MenuItem(_('No friends present')) menu_item.set_sensitive(False) self.append(menu_item) - menu_item.show() + menu_item.show() else: menu_item = MenuItem(_('No valid connection found')) menu_item.set_sensitive(False) self.append(menu_item) - menu_item.show() + menu_item.show() def __item_activate_cb(self, menu_item, friend): self.emit('friend-selected', friend) @@ -221,7 +221,7 @@ class StartWithMenu(gtk.Menu): menu_item = MenuItem(resume_label) menu_item.set_sensitive(False) self.append(menu_item) - menu_item.show() + menu_item.show() def __item_activate_cb(self, menu_item, service_name): misc.resume(self._metadata, service_name) diff --git a/src/jarabe/journal/volumestoolbar.py b/src/jarabe/journal/volumestoolbar.py index 6cb3f8d..7216ea3 100644 --- a/src/jarabe/journal/volumestoolbar.py +++ b/src/jarabe/journal/volumestoolbar.py @@ -102,7 +102,7 @@ class VolumesToolbar(gtk.Toolbar): logging.debug('__unmount_cb %r %r', source, result) def _get_button_for_mount(self, mount): - mount_point = mount.get_root().get_path() + mount_point = mount.get_root().get_path() for button in self.get_children(): if button.mount_point == mount_point: return button @@ -157,7 +157,7 @@ class VolumeButton(BaseButton): icon_name = 'drive' self.props.named_icon = icon_name - + # TODO: retrieve the colors from the owner of the device client = gconf.client_get_default() color = XoColor(client.get_string('/desktop/sugar/user/color')) diff --git a/src/jarabe/model/buddy.py b/src/jarabe/model/buddy.py index 1fa9e2c..5978bae 100644 --- a/src/jarabe/model/buddy.py +++ b/src/jarabe/model/buddy.py @@ -62,7 +62,7 @@ class BuddyModel(gobject.GObject): self._buddy = None if not buddy: - self._key = key + self._key = key # connect to the PS's buddy-appeared signal and # wait for the buddy to appear self._ba_handler = self._pservice.connect('buddy-appeared', @@ -162,7 +162,7 @@ class BuddyModel(gobject.GObject): self.emit('current-activity-changed', buddy.props.current_activity) if 'nick' in keys: self._nick = self._buddy.props.nick - self.emit('nick-changed', self.get_nick()) + self.emit('nick-changed', self.get_nick()) if 'tags' in keys: self._tags = self._buddy.props.tags self.emit('tags-changed', self.get_tags()) diff --git a/src/jarabe/model/filetransfer.py b/src/jarabe/model/filetransfer.py index 3c188ff..46b246d 100644 --- a/src/jarabe/model/filetransfer.py +++ b/src/jarabe/model/filetransfer.py @@ -93,7 +93,7 @@ class StreamSplicer(gobject.GObject): output_stream.close() self.emit('finished') else: - self._write_next_buffer() + self._write_next_buffer() def _write_next_buffer(self): if self._pending_buffers and not self._output_stream.has_pending(): @@ -261,7 +261,7 @@ class OutgoingFileTransfer(BaseFileTransfer): CHANNEL_TYPE_FILE_TRANSFER + '.InitialOffset': 0}) self.set_channel(Channel(connection.service_name, object_path)) - + channel_file_transfer = self.channel[CHANNEL_TYPE_FILE_TRANSFER] self._socket_address = channel_file_transfer.ProvideFile( SOCKET_ADDRESS_TYPE_UNIX, SOCKET_ACCESS_CONTROL_LOCALHOST, '', diff --git a/src/jarabe/model/invites.py b/src/jarabe/model/invites.py index 5229e43..c918308 100644 --- a/src/jarabe/model/invites.py +++ b/src/jarabe/model/invites.py @@ -43,7 +43,7 @@ class ActivityInvite(BaseInvite): class PrivateInvite(BaseInvite): """Invitation to a private 1-1 Telepathy channel. - + This includes text chat or streaming media. """ def __init__(self, bundle_id, private_channel): diff --git a/src/jarabe/model/neighborhood.py b/src/jarabe/model/neighborhood.py index 2b223e4..53e5581 100644 --- a/src/jarabe/model/neighborhood.py +++ b/src/jarabe/model/neighborhood.py @@ -46,10 +46,10 @@ class ActivityModel: def get_id(self): return self.activity.props.id - + def get_icon_name(self): return self.bundle.get_icon() - + def get_color(self): return XoColor(self.activity.props.color) @@ -101,7 +101,7 @@ class Neighborhood(gobject.GObject): self.__conn_addded_cb(self._conn_watcher, conn) gconf_client = gconf.client_get_default() - gconf_client.add_dir('/desktop/sugar/collaboration', + gconf_client.add_dir('/desktop/sugar/collaboration', gconf.CLIENT_PRELOAD_NONE) gconf_client.notify_add('/desktop/sugar/collaboration/publish_gadget', self.__publish_gadget_changed_cb) @@ -158,7 +158,7 @@ class Neighborhood(gobject.GObject): lambda: self.__respawnable_view_closed_cb( lambda: self._request_random_activities(conn, nb))) - def __publish_gadget_changed_cb(self, client_, cnxn_id_, entry, + def __publish_gadget_changed_cb(self, client_, cnxn_id_, entry, user_data=None): if entry.value.type == gconf.VALUE_BOOL: publish = entry.value.get_bool() diff --git a/src/jarabe/model/network.py b/src/jarabe/model/network.py index 4dbc309..0a79de4 100644 --- a/src/jarabe/model/network.py +++ b/src/jarabe/model/network.py @@ -264,10 +264,10 @@ class NMSettingsConnection(dbus.service.Object): config.set(identifier, 'type', self._settings.connection.type) config.set(identifier, 'ssid', self._settings.wireless.ssid) config.set(identifier, 'uuid', self._settings.connection.uuid) - config.set(identifier, 'autoconnect', + config.set(identifier, 'autoconnect', self._settings.connection.autoconnect) if self._settings.connection.timestamp is not None: - config.set(identifier, 'timestamp', + config.set(identifier, 'timestamp', self._settings.connection.timestamp) if self._settings.wireless_security is not None: if self._settings.wireless_security.key_mgmt is not None: diff --git a/src/jarabe/model/notifications.py b/src/jarabe/model/notifications.py index a2345f7..10a0237 100644 --- a/src/jarabe/model/notifications.py +++ b/src/jarabe/model/notifications.py @@ -55,7 +55,7 @@ class NotificationService(dbus.service.Object): notification_id = self._notification_counter self.notification_received.send(self, app_name=app_name, - replaces_id=replaces_id, app_icon=app_icon, summary=summary, + replaces_id=replaces_id, app_icon=app_icon, summary=summary, body=body, actions=actions, hints=hints, expire_timeout=expire_timeout) diff --git a/src/jarabe/model/session.py b/src/jarabe/model/session.py index b6e3a59..1c9c6db 100644 --- a/src/jarabe/model/session.py +++ b/src/jarabe/model/session.py @@ -50,10 +50,10 @@ class SessionManager(session.SessionManager): session.SessionManager.shutdown_completed(self) bus = dbus.SystemBus() - proxy = bus.get_object('org.freedesktop.Hal', + proxy = bus.get_object('org.freedesktop.Hal', '/org/freedesktop/Hal/devices/computer') pm = dbus.Interface(proxy, \ - 'org.freedesktop.Hal.Device.SystemPowerManagement') + 'org.freedesktop.Hal.Device.SystemPowerManagement') if env.is_emulator(): self._close_emulator() diff --git a/src/jarabe/model/shell.py b/src/jarabe/model/shell.py index ec315ca..7f86c2f 100644 --- a/src/jarabe/model/shell.py +++ b/src/jarabe/model/shell.py @@ -45,10 +45,10 @@ def get_sugar_window_type(wnck_window): class Activity(gobject.GObject): """Activity which appears in the "Home View" of the Sugar shell - + This class stores the Sugar Shell's metadata regarding a given activity/application in the system. It interacts with - the sugar.activity.* modules extensively in order to + the sugar.activity.* modules extensively in order to accomplish its tasks. """ @@ -61,14 +61,14 @@ class Activity(gobject.GObject): def __init__(self, activity_info, activity_id, window=None): """Initialise the HomeActivity - + activity_info -- sugar.activity.registry.ActivityInfo instance, provides the information required to actually create the new instance. This is, in effect, the "type" of activity being created. activity_id -- unique identifier for this instance of the activity type - window -- Main WnckWindow of the activity + window -- Main WnckWindow of the activity """ gobject.GObject.__init__(self) @@ -104,7 +104,7 @@ class Activity(gobject.GObject): def get_service(self): """Get the activity service - + Note that non-native Sugar applications will not have such a service, so the return value will be None in those cases. @@ -123,7 +123,7 @@ class Activity(gobject.GObject): """Retrieve the activity's icon (file) name""" if self.is_journal(): icon_theme = gtk.icon_theme_get_default() - info = icon_theme.lookup_icon('activity-journal', + info = icon_theme.lookup_icon('activity-journal', gtk.ICON_SIZE_SMALL_TOOLBAR, 0) if not info: return None @@ -134,11 +134,11 @@ class Activity(gobject.GObject): return self._activity_info.get_icon() else: return None - + def get_icon_color(self): """Retrieve the appropriate icon colour for this activity - - Uses activity_id to index into the PresenceService's + + Uses activity_id to index into the PresenceService's set of activity colours, if the PresenceService does not have an entry (implying that this is not a Sugar-shared application) uses the local user's profile colour for the icon. @@ -158,10 +158,10 @@ class Activity(gobject.GObject): else: client = gconf.client_get_default() return XoColor(client.get_string("/desktop/sugar/user/color")) - + def get_activity_id(self): """Retrieve the "activity_id" passed in to our constructor - + This is a "globally likely unique" identifier generated by sugar.util.unique_id """ @@ -176,12 +176,12 @@ class Activity(gobject.GObject): def get_window(self): """Retrieve the X-windows root window of this application - - This was stored by the set_window method, which was - called by HomeModel._add_activity, which was called + + This was stored by the set_window method, which was + called by HomeModel._add_activity, which was called via a callback that looks for all 'window-opened' events. - + HomeModel currently uses a dbus service query on the activity to determine to which HomeActivity the newly launched window belongs. @@ -201,8 +201,8 @@ class Activity(gobject.GObject): def get_launch_time(self): """Return the time at which the activity was first launched - - Format is floating-point time.time() value + + Format is floating-point time.time() value (seconds since the epoch) """ return self._launch_time @@ -267,20 +267,20 @@ class Activity(gobject.GObject): def _set_active_success(self): pass - + def _set_active_error(self, err): logging.error("set_active() failed: %s", err) class ShellModel(gobject.GObject): """Model of the shell (activity management) - + The ShellModel is basically the point of registration for all running activities within Sugar. It traps events that tell the system there is a new activity being created (generated by the activity factories), or removed, as well as those which tell us that the currently focussed activity has changed. - + The HomeModel tracks a set of HomeActivity instances, which are tracking the window to activity mappings the activity factories have set up. @@ -288,7 +288,7 @@ class ShellModel(gobject.GObject): __gsignals__ = { 'activity-added': (gobject.SIGNAL_RUN_FIRST, - gobject.TYPE_NONE, + gobject.TYPE_NONE, ([gobject.TYPE_PYOBJECT])), 'activity-removed': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, @@ -300,13 +300,13 @@ class ShellModel(gobject.GObject): gobject.TYPE_NONE, ([gobject.TYPE_PYOBJECT])), 'launch-started': (gobject.SIGNAL_RUN_FIRST, - gobject.TYPE_NONE, + gobject.TYPE_NONE, ([gobject.TYPE_PYOBJECT])), 'launch-completed': (gobject.SIGNAL_RUN_FIRST, - gobject.TYPE_NONE, + gobject.TYPE_NONE, ([gobject.TYPE_PYOBJECT])), 'launch-failed': (gobject.SIGNAL_RUN_FIRST, - gobject.TYPE_NONE, + gobject.TYPE_NONE, ([gobject.TYPE_PYOBJECT])) } @@ -429,15 +429,15 @@ class ShellModel(gobject.GObject): self._active_activity = home_activity self.emit('active-activity-changed', self._active_activity) - def __iter__(self): + def __iter__(self): return iter(self._activities) - + def __len__(self): return len(self._activities) - + def __getitem__(self, i): return self._activities[i] - + def index(self, obj): return self._activities.index(obj) diff --git a/src/jarabe/view/buddymenu.py b/src/jarabe/view/buddymenu.py index e9e9f8e..4637751 100644 --- a/src/jarabe/view/buddymenu.py +++ b/src/jarabe/view/buddymenu.py @@ -71,13 +71,13 @@ class BuddyMenu(Palette): self._invite_menu = MenuItem('') self._invite_menu.connect('activate', self._invite_friend_cb) self.menu.append(self._invite_menu) - + home_model = shell.get_model() self._active_activity_changed_hid = home_model.connect( 'active-activity-changed', self._cur_activity_changed_cb) activity = home_model.get_active_activity() self._update_invite_menu(activity) - + def _add_my_items(self): item = MenuItem(_('Shutdown'), 'system-shutdown') item.connect('activate', self.__shutdown_activate_cb) @@ -85,7 +85,7 @@ class BuddyMenu(Palette): item.show() client = gconf.client_get_default() - + if client.get_bool('/desktop/sugar/show_logout'): item = MenuItem(_('Logout'), 'system-logout') item.connect('activate', self.__logout_activate_cb) @@ -124,18 +124,18 @@ class BuddyMenu(Palette): if activity is None or activity.is_journal() or \ activity.get_activity_id() == buddy_activity_id: self._invite_menu.hide() - else: + else: title = activity.get_title() label = self._invite_menu.get_children()[0] label.set_text(_('Invite to %s') % title) - + icon = Icon(file=activity.get_icon_path()) icon.props.xo_color = activity.get_icon_color() self._invite_menu.set_image(icon) icon.show() self._invite_menu.show() - + def _cur_activity_changed_cb(self, home_model, activity_model): self._update_invite_menu(activity_model) @@ -146,7 +146,7 @@ class BuddyMenu(Palette): self.set_primary_text(nick) def _make_friend_cb(self, menuitem): - friends.get_model().make_friend(self._buddy) + friends.get_model().make_friend(self._buddy) def _remove_friend_cb(self, menuitem): friends.get_model().remove(self._buddy) diff --git a/src/jarabe/view/pulsingicon.py b/src/jarabe/view/pulsingicon.py index 540431a..43ec358 100644 --- a/src/jarabe/view/pulsingicon.py +++ b/src/jarabe/view/pulsingicon.py @@ -138,7 +138,7 @@ class PulsingIcon(Icon): if self._pulsing: self._pulser.start(restart=True) else: - self._pulser.stop() + self._pulser.stop() def get_pulsing(self): return self._pulsing @@ -176,7 +176,7 @@ class CanvasPulsingIcon(CanvasIcon): self.connect('destroy', self.__destroy_cb) def __destroy_cb(self, box): - self._pulser.stop() + self._pulser.stop() def set_pulse_color(self, pulse_color): self._pulse_color = pulse_color @@ -220,7 +220,7 @@ class CanvasPulsingIcon(CanvasIcon): if self._pulsing: self._pulser.start(restart=True) else: - self._pulser.stop() + self._pulser.stop() def get_pulsing(self): return self._pulsing diff --git a/src/jarabe/view/service.py b/src/jarabe/view/service.py index ef225bf..2b91437 100644 --- a/src/jarabe/view/service.py +++ b/src/jarabe/view/service.py @@ -31,19 +31,19 @@ _DBUS_PATH = "/org/laptop/Shell" class UIService(dbus.service.Object): """Provides d-bus service to script the shell's operations - + Uses a shell_model object to observe events such as changes to: - - * nickname + + * nickname * colour * icon * currently active activity - + and pass the event off to the methods in the dbus signature. - - Key method here at the moment is add_bundle, which is used to + + Key method here at the moment is add_bundle, which is used to do a run-time registration of a bundle using it's application path. - + XXX At the moment the d-bus service methods do not appear to do anything other than add_bundle """ diff --git a/src/jarabe/view/tabbinghandler.py b/src/jarabe/view/tabbinghandler.py index bb95c26..c268684 100644 --- a/src/jarabe/view/tabbinghandler.py +++ b/src/jarabe/view/tabbinghandler.py @@ -36,10 +36,10 @@ class TabbingHandler(object): logging.debug('Grabing the input.') screen = gtk.gdk.screen_get_default() - window = screen.get_root_window() + window = screen.get_root_window() keyboard_grab_result = gtk.gdk.keyboard_grab(window) pointer_grab_result = gtk.gdk.pointer_grab(window) - + self._tabbing = (keyboard_grab_result == gtk.gdk.GRAB_SUCCESS and pointer_grab_result == gtk.gdk.GRAB_SUCCESS) diff --git a/src/jarabe/view/viewsource.py b/src/jarabe/view/viewsource.py index 43f668a..9619ed1 100644 --- a/src/jarabe/view/viewsource.py +++ b/src/jarabe/view/viewsource.py @@ -102,7 +102,7 @@ class ViewSource(gtk.Window): self.set_border_width(style.LINE_WIDTH) width = gtk.gdk.screen_width() - style.GRID_CELL_SIZE * 2 - height = gtk.gdk.screen_height() - style.GRID_CELL_SIZE * 2 + height = gtk.gdk.screen_height() - style.GRID_CELL_SIZE * 2 self.set_size_request(width, height) self._parent_window_xid = window_xid @@ -125,7 +125,7 @@ class ViewSource(gtk.Window): vbox.pack_start(pane) pane.show() - self._selected_file = None + self._selected_file = None file_name = '' activity_bundle = ActivityBundle(bundle_path) @@ -145,7 +145,7 @@ class ViewSource(gtk.Window): pane.add2(self._source_display) self._source_display.show() self._source_display.file_path = self._selected_file - + if document_path is not None: self._select_source(document_path) @@ -197,7 +197,7 @@ class ViewSource(gtk.Window): class DocumentButton(RadioToolButton): __gtype_name__ = 'SugarDocumentButton' - + def __init__(self, file_name, document_path, title): RadioToolButton.__init__(self) @@ -216,7 +216,7 @@ class DocumentButton(RadioToolButton): icon.show() menu_item = MenuItem(_('Keep')) - icon = Icon(icon_name='document-save', icon_size=gtk.ICON_SIZE_MENU, + icon = Icon(icon_name='document-save', icon_size=gtk.ICON_SIZE_MENU, xo_color=XoColor(self._color)) menu_item.set_image(icon) @@ -246,7 +246,7 @@ class DocumentButton(RadioToolButton): def __internal_save_cb(self): logging.debug("Saved Source object to datastore.") self._jobject.destroy() - + def __internal_save_error_cb(self, err): logging.debug('Error saving Source object to datastore: %s', err) self._jobject.destroy() @@ -273,7 +273,7 @@ class Toolbar(gtk.Toolbar): if document_path is not None and os.path.exists(document_path): document_button = DocumentButton(file_name, document_path, title) - document_button.connect('toggled', self.__button_toggled_cb, + document_button.connect('toggled', self.__button_toggled_cb, document_path) self.insert(document_button, -1) document_button.show() @@ -290,7 +290,7 @@ class Toolbar(gtk.Toolbar): if document_path is not None: activity_button.props.group = document_button activity_button.props.tooltip = _('Activity Bundle Source') - activity_button.connect('toggled', self.__button_toggled_cb, + activity_button.connect('toggled', self.__button_toggled_cb, bundle_path) self.insert(activity_button, -1) activity_button.show() @@ -303,7 +303,7 @@ class Toolbar(gtk.Toolbar): self._add_widget(label) self._add_separator(True) - + stop = ToolButton(icon_name='dialog-cancel') stop.set_tooltip(_('Close')) stop.connect('clicked', self.__stop_clicked_cb) @@ -390,7 +390,7 @@ class FileViewer(gtk.ScrolledWindow): if os.path.isdir(full_path): new_iter = model.append(parent, [f, full_path]) self._add_dir_to_model(full_path, new_iter) - else: + else: current_iter = model.append(parent, [f, full_path]) if f == self._initial_filename: selection = self._tree_view.get_selection() @@ -413,7 +413,7 @@ class SourceDisplay(gtk.ScrolledWindow): self.props.hscrollbar_policy = gtk.POLICY_AUTOMATIC self.props.vscrollbar_policy = gtk.POLICY_AUTOMATIC - self._buffer = gtksourceview2.Buffer() + self._buffer = gtksourceview2.Buffer() self._buffer.set_highlight_syntax(True) self._source_view = gtksourceview2.View(self._buffer) |