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/jarabe/frame | |
parent | 6343b1e7eb28c68d048c3191ead9bddf103b3dca (diff) |
trim EOL (end-of-line) spaces on source files
Diffstat (limited to 'src/jarabe/frame')
-rw-r--r-- | src/jarabe/frame/activitiestray.py | 4 | ||||
-rw-r--r-- | src/jarabe/frame/clipboard.py | 6 | ||||
-rw-r--r-- | src/jarabe/frame/clipboardicon.py | 2 | ||||
-rw-r--r-- | src/jarabe/frame/clipboardmenu.py | 4 | ||||
-rw-r--r-- | src/jarabe/frame/clipboardobject.py | 4 | ||||
-rw-r--r-- | src/jarabe/frame/clipboardpanelwindow.py | 8 | ||||
-rw-r--r-- | src/jarabe/frame/clipboardtray.py | 24 | ||||
-rw-r--r-- | src/jarabe/frame/eventarea.py | 40 | ||||
-rw-r--r-- | src/jarabe/frame/frame.py | 6 | ||||
-rw-r--r-- | src/jarabe/frame/framewindow.py | 4 | ||||
-rw-r--r-- | src/jarabe/frame/friendstray.py | 12 | ||||
-rw-r--r-- | src/jarabe/frame/notification.py | 6 | ||||
-rw-r--r-- | src/jarabe/frame/zoomtoolbar.py | 4 |
13 files changed, 62 insertions, 62 deletions
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): |