sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

Browse Source
This commit is contained in:
Marco Pesenti Gritti 2007-06-14 17:25:44 +02:00
commit 0bb8704683
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
services/clipboard/typeregistry.py
View File

@ -597,7 +597,7 @@ class UriListFileType(FileType):
uris = self._formats['text/uri-list'].get_data().split('\n') uris = self._formats['text/uri-list'].get_data().split('\n')
if len(uris) == 1: if len(uris) == 1:
uri = urlparse.urlparse(uris[0]) uri = urlparse.urlparse(uris[0])
ext = posixpath.splitext(uri.path)[1] ext = posixpath.splitext(uri[2])[1]
logging.debug(ext) logging.debug(ext)
# FIXME: Bad hack, the type registry should treat text/uri-list as a special case. # FIXME: Bad hack, the type registry should treat text/uri-list as a special case.
if ext in ['.jpg', '.jpeg', '.gif', '.png', '.svg']: if ext in ['.jpg', '.jpeg', '.gif', '.png', '.svg']:

13
shell/view/frame/clipboardbox.py
View File

@ -62,9 +62,12 @@ class ClipboardBox(hippo.CanvasBox):
return self._owns_clipboard return self._owns_clipboard
def _get_icon_at_coords(self, x, y): def _get_icon_at_coords(self, x, y):
box_x, box_y = self.get_context().get_position(self)
x -= box_x
y -= box_y
for object_id, icon in self._icons.iteritems(): for object_id, icon in self._icons.iteritems():
[icon_x, icon_y] = self.get_position(icon) icon_x, icon_y = self.get_position(icon)
[icon_width, icon_height] = icon.get_allocation() icon_width, icon_height = icon.get_allocation()
if (x >= icon_x ) and (x <= icon_x + icon_width) and \ if (x >= icon_x ) and (x <= icon_x + icon_width) and \
(y >= icon_y ) and (y <= icon_y + icon_height): (y >= icon_y ) and (y <= icon_y + icon_height):
@ -88,11 +91,11 @@ class ClipboardBox(hippo.CanvasBox):
# Copy the file, as it will be deleted when the dnd operation finishes. # Copy the file, as it will be deleted when the dnd operation finishes.
new_file_path = os.path.join(path, 'cb' + file_name) new_file_path = os.path.join(path, 'cb' + file_name)
shutil.copyfile(uri.path, new_file_path) shutil.copyfile(uri[2], new_file_path)
cb_service.add_object_format(object_id, cb_service.add_object_format(object_id,
selection.type, selection.type,
uri.scheme + "://" + new_file_path, uri[0] + "://" + new_file_path,
on_disk=True) on_disk=True)
else: else:
cb_service.add_object_format(object_id, cb_service.add_object_format(object_id,
@ -184,7 +187,7 @@ class ClipboardBox(hippo.CanvasBox):
return True return True
def drag_data_received_cb(self, widget, context, x, y, selection, targetType, time): def drag_data_received_cb(self, widget, context, x, y, selection, targetType, time):
logging.debug('ClipboardBox: got data for target ' + selection.target) logging.debug('ClipboardBox: got data for target %r' % selection.target)
try: try:
if selection: if selection:
object_id = self._context_map.get_object_id(context) object_id = self._context_map.get_object_id(context)