diff options
Diffstat (limited to 'src/jarabe/view')
| -rw-r--r-- | src/jarabe/view/buddymenu.py | 14 | ||||
| -rw-r--r-- | src/jarabe/view/pulsingicon.py | 6 | ||||
| -rw-r--r-- | src/jarabe/view/service.py | 14 | ||||
| -rw-r--r-- | src/jarabe/view/tabbinghandler.py | 4 | ||||
| -rw-r--r-- | src/jarabe/view/viewsource.py | 22 |
5 files changed, 30 insertions, 30 deletions
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) |