diff options
Diffstat (limited to 'src/jarabe/frame')
| -rw-r--r-- | src/jarabe/frame/activitiestray.py | 26 | ||||
| -rw-r--r-- | src/jarabe/frame/clipboard.py | 2 | ||||
| -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 | 2 | ||||
| -rw-r--r-- | src/jarabe/frame/clipboardpanelwindow.py | 6 | ||||
| -rw-r--r-- | src/jarabe/frame/clipboardtray.py | 14 | ||||
| -rw-r--r-- | src/jarabe/frame/frame.py | 4 | ||||
| -rw-r--r-- | src/jarabe/frame/zoomtoolbar.py | 2 |
9 files changed, 31 insertions, 31 deletions
diff --git a/src/jarabe/frame/activitiestray.py b/src/jarabe/frame/activitiestray.py index 0025403..390cf88 100644 --- a/src/jarabe/frame/activitiestray.py +++ b/src/jarabe/frame/activitiestray.py @@ -335,7 +335,7 @@ class ActivitiesTray(HTray): filetransfer.new_file_transfer.connect(self.__new_file_transfer_cb) def __activity_added_cb(self, home_model, home_activity): - logging.debug('__activity_added_cb: %r' % home_activity) + logging.debug('__activity_added_cb: %r', home_activity) if self.get_children(): group = self.get_children()[0] else: @@ -348,7 +348,7 @@ class ActivitiesTray(HTray): button.show() def __activity_removed_cb(self, home_model, home_activity): - logging.debug('__activity_removed_cb: %r' % home_activity) + logging.debug('__activity_removed_cb: %r', home_activity) button = self._buttons[home_activity.get_activity_id()] self.remove_item(button) del self._buttons[home_activity.get_activity_id()] @@ -366,14 +366,14 @@ class ActivitiesTray(HTray): self.window.process_updates(True) def __activity_changed_cb(self, home_model, home_activity): - logging.debug('__activity_changed_cb: %r' % home_activity) + logging.debug('__activity_changed_cb: %r', home_activity) # Only select the new activity, if there is no tabbing activity. if home_model.get_tabbing_activity() is None: self._activate_activity(home_activity) def __tabbing_activity_changed_cb(self, home_model, home_activity): - logging.debug('__tabbing_activity_changed_cb: %r' % home_activity) + logging.debug('__tabbing_activity_changed_cb: %r', home_activity) # If the tabbing_activity is set to None just do nothing. # The active activity will be updated a bit later (and it will # be set to the activity that is currently selected). @@ -424,7 +424,7 @@ class ActivitiesTray(HTray): def __new_file_transfer_cb(self, **kwargs): file_transfer = kwargs['file_transfer'] - logging.debug('__new_file_transfer_cb %r' % file_transfer) + logging.debug('__new_file_transfer_cb %r', file_transfer) if isinstance(file_transfer, filetransfer.IncomingFileTransfer): button = IncomingTransferButton(file_transfer) @@ -463,8 +463,8 @@ class BaseTransferButton(ToolButton): self.props.parent.remove(self) def __notify_state_cb(self, file_transfer, pspec): - logging.debug('_update state: %r %r' % (file_transfer.props.state, - file_transfer.reason_last_change)) + logging.debug('_update state: %r %r', file_transfer.props.state, + file_transfer.reason_last_change) if file_transfer.props.state == filetransfer.FT_STATE_CANCELLED: if file_transfer.reason_last_change == \ filetransfer.FT_REASON_LOCAL_STOPPED: @@ -565,10 +565,10 @@ class IncomingTransferButton(BaseTransferButton): return dbus.Interface(remote_object, DS_DBUS_INTERFACE) def __reply_handler_cb(self): - logging.debug('__reply_handler_cb %r' % self._object_id) + logging.debug('__reply_handler_cb %r', self._object_id) def __error_handler_cb(self, error): - logging.debug('__error_handler_cb %r %s' % (self._object_id, error)) + logging.debug('__error_handler_cb %r %s', self._object_id, error) def __dismiss_clicked_cb(self, palette): self.remove() @@ -654,7 +654,7 @@ class BaseTransferPalette(Palette): return _('%dMB') % (size / 1048576) def update_progress(self): - logging.debug('update_progress: %r' % + logging.debug('update_progress: %r', self.file_transfer.props.transferred_bytes) if self.progress_bar is None: @@ -663,7 +663,7 @@ class BaseTransferPalette(Palette): self.progress_bar.props.fraction = \ self.file_transfer.props.transferred_bytes / \ float(self.file_transfer.file_size) - logging.debug('update_progress: %r' % self.progress_bar.props.fraction) + logging.debug('update_progress: %r', self.progress_bar.props.fraction) transferred = self._format_size( self.file_transfer.props.transferred_bytes) @@ -688,7 +688,7 @@ class IncomingTransferPalette(BaseTransferPalette): self._update() def _update(self): - logging.debug('_update state: %r' % self.file_transfer.props.state) + logging.debug('_update state: %r', self.file_transfer.props.state) if self.file_transfer.props.state == filetransfer.FT_STATE_PENDING: menu_item = MenuItem(_('Accept'), icon_name='dialog-ok') menu_item.connect('activate', self.__accept_activate_cb) @@ -816,7 +816,7 @@ class OutgoingTransferPalette(BaseTransferPalette): def _update(self): new_state = self.file_transfer.props.state - logging.debug('_update state: %r' % new_state) + logging.debug('_update state: %r', new_state) if new_state == filetransfer.FT_STATE_PENDING: menu_item = MenuItem(_('Cancel'), icon_name='dialog-cancel') diff --git a/src/jarabe/frame/clipboard.py b/src/jarabe/frame/clipboard.py index d18dd44..1cefcc1 100644 --- a/src/jarabe/frame/clipboard.py +++ b/src/jarabe/frame/clipboard.py @@ -77,7 +77,7 @@ class Clipboard(gobject.GObject): cb_object = self._objects.pop(object_id) cb_object.destroy() self.emit('object-deleted', object_id) - logging.debug('Deleted object with object_id %r' % 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] diff --git a/src/jarabe/frame/clipboardicon.py b/src/jarabe/frame/clipboardicon.py index ff63ad9..93a177e 100644 --- a/src/jarabe/frame/clipboardicon.py +++ b/src/jarabe/frame/clipboardicon.py @@ -96,7 +96,7 @@ class ClipboardIcon(RadioToolButton): def _clipboard_data_get_cb(self, x_clipboard, selection, info, targets): if not selection.target in [target[0] for target in targets]: logging.warning('ClipboardIcon._clipboard_data_get_cb: asked %s' \ - ' but only have %r.' % (selection.target, targets)) + ' but only have %r.', selection.target, targets) return data = self._cb_object.get_formats()[selection.target].get_data() selection.set(selection.target, 8, data) diff --git a/src/jarabe/frame/clipboardmenu.py b/src/jarabe/frame/clipboardmenu.py index 8a8ba11..e2eba68 100644 --- a/src/jarabe/frame/clipboardmenu.py +++ b/src/jarabe/frame/clipboardmenu.py @@ -74,7 +74,7 @@ class ClipboardMenu(Palette): def _update_open_submenu(self): activities = self._get_activities() - logging.debug('_update_open_submenu: %r' % activities) + logging.debug('_update_open_submenu: %r', activities) child = self._open_item.get_child() if activities is None or len(activities) <= 1: child.set_text(_('Open')) @@ -97,7 +97,7 @@ class ClipboardMenu(Palette): activity_info = registry.get_bundle(service_name) if not activity_info: - logging.warning('Activity %s is unknown.' % service_name) + logging.warning('Activity %s is unknown.', service_name) item = gtk.MenuItem(activity_info.get_name()) item.connect('activate', self._open_submenu_item_activate_cb, diff --git a/src/jarabe/frame/clipboardobject.py b/src/jarabe/frame/clipboardobject.py index 91fa1e6..d6a55db 100644 --- a/src/jarabe/frame/clipboardobject.py +++ b/src/jarabe/frame/clipboardobject.py @@ -110,7 +110,7 @@ class ClipboardObject(object): format_ = mime.get_for_file(uri.path) else: format_ = mime.get_from_file_name(uri.path) - logging.debug('Choosed %r!' % format_) + logging.debug('Chose %r!', format_) return format_ diff --git a/src/jarabe/frame/clipboardpanelwindow.py b/src/jarabe/frame/clipboardpanelwindow.py index 7093199..7d08d32 100644 --- a/src/jarabe/frame/clipboardpanelwindow.py +++ b/src/jarabe/frame/clipboardpanelwindow.py @@ -63,10 +63,10 @@ class ClipboardPanelWindow(FrameWindow): for target in targets: if target not in ('TIMESTAMP', 'TARGETS', 'MULTIPLE', 'SAVE_TARGETS'): - logging.debug('Asking for target %s.' % target) + logging.debug('Asking for target %s.', target) selection = x_clipboard.wait_for_contents(target) if not selection: - logging.warning('no data for selection target %s.' % target) + logging.warning('no data for selection target %s.', target) continue self._add_selection(key, selection) @@ -74,7 +74,7 @@ class ClipboardPanelWindow(FrameWindow): def _add_selection(self, key, selection): if not selection.data: - logging.warning('no data for selection target %s.' % selection.type) + logging.warning('no data for selection target %s.', selection.type) return logging.debug('adding type ' + selection.type + '.') diff --git a/src/jarabe/frame/clipboardtray.py b/src/jarabe/frame/clipboardtray.py index a387328..75c1ecf 100644 --- a/src/jarabe/frame/clipboardtray.py +++ b/src/jarabe/frame/clipboardtray.py @@ -79,7 +79,7 @@ class ClipboardTray(tray.VTray): if not selection.data: return - logging.debug('ClipboardTray: adding type %r' % selection.type) + logging.debug('ClipboardTray: adding type %r', selection.type) cb_service = clipboard.get_instance() if selection.type == 'text/uri-list': @@ -115,13 +115,13 @@ class ClipboardTray(tray.VTray): cb_service = clipboard.get_instance() cb_service.delete_object(icon.get_object_id()) - logging.debug('ClipboardTray: %r was added' % cb_object.get_id()) + logging.debug('ClipboardTray: %r was added', cb_object.get_id()) def _object_deleted_cb(self, cb_service, object_id): icon = self._icons[object_id] self.remove_item(icon) del self._icons[object_id] - logging.debug('ClipboardTray: %r was deleted' % object_id) + logging.debug('ClipboardTray: %r was deleted', object_id) def drag_motion_cb(self, widget, context, x, y, time): logging.debug('ClipboardTray._drag_motion_cb') @@ -180,14 +180,14 @@ class ClipboardTray(tray.VTray): def drag_data_received_cb(self, widget, context, x, y, selection, targetType, time): - logging.debug('ClipboardTray: got data for target %r' - % selection.target) + logging.debug('ClipboardTray: got data for target %r', + selection.target) object_id = self._context_map.get_object_id(context) try: if selection is None: - logging.warn('ClipboardTray: empty selection for target %s' - % selection.target) + logging.warn('ClipboardTray: empty selection for target %s', + selection.target) elif selection.target == 'XdndDirectSave0': if selection.data == 'S': window = context.source_window diff --git a/src/jarabe/frame/frame.py b/src/jarabe/frame/frame.py index 0bb8d92..1e02fc8 100644 --- a/src/jarabe/frame/frame.py +++ b/src/jarabe/frame/frame.py @@ -318,7 +318,7 @@ class Frame(object): def remove_notification(self, icon): if icon not in self._notif_by_icon: - logging.debug('icon %r not in list of notifications.' % icon) + logging.debug('icon %r not in list of notifications.', icon) return window = self._notif_by_icon[icon] @@ -326,7 +326,7 @@ class Frame(object): del self._notif_by_icon[icon] def __notification_received_cb(self, **kwargs): - logging.debug('__notification_received_cb %r' % kwargs) + logging.debug('__notification_received_cb %r', kwargs) icon = NotificationIcon() hints = kwargs['hints'] diff --git a/src/jarabe/frame/zoomtoolbar.py b/src/jarabe/frame/zoomtoolbar.py index 439f6a3..4f44600 100644 --- a/src/jarabe/frame/zoomtoolbar.py +++ b/src/jarabe/frame/zoomtoolbar.py @@ -75,7 +75,7 @@ class ZoomToolbar(gtk.Toolbar): self._set_zoom_level(kwargs['new_level']) def _set_zoom_level(self, new_level): - logging.debug('new zoom level: %r' % new_level) + logging.debug('new zoom level: %r', new_level) if new_level == shell.ShellModel.ZOOM_MESH: self._mesh_button.props.active = True elif new_level == shell.ShellModel.ZOOM_GROUP: |