diff options
author | Tomeu Vizoso <tomeu@sugarlabs.org> | 2009-02-05 11:44:53 (GMT) |
---|---|---|
committer | Tomeu Vizoso <tomeu@sugarlabs.org> | 2009-02-05 11:50:55 (GMT) |
commit | 2e93deee997585429cd8ad3a129148fe8b1c58bb (patch) | |
tree | e958f41fd49d7465eeca76e7a9ea425ad44e1656 | |
parent | 6ef9226838fc96294710324013fa5ed0d74dfc80 (diff) |
Remove hacks needed because of #258
-rw-r--r-- | ImageViewerActivity.py | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/ImageViewerActivity.py b/ImageViewerActivity.py index 73d2ab9..b72d617 100644 --- a/ImageViewerActivity.py +++ b/ImageViewerActivity.py @@ -36,7 +36,6 @@ class ImageViewerActivity(activity.Activity): activity.Activity.__init__(self, handle) self.zoom = None - self._tempfile = None self._close_requested = False self._want_document = True @@ -94,38 +93,15 @@ class ImageViewerActivity(activity.Activity): 'tmp%i' % time.time()) os.link(file_path, tempfile) - self._tempfile = tempfile - self.view.set_file_location(self._tempfile) + self.view.set_file_location(tempfile) self.zoom = int(self.metadata.get('zoom', '0')) if self.zoom > 0: self.view.set_zoom(self.zoom) def write_file(self, file_path): - if self._tempfile is None: - # Stolen from Read to avoid Keep error - raise NotImplementedError - - try: - self.metadata['zoom'] = str(self.zoom) - except Exception, e: - logging.error('write_file(): %s', e) - - os.link(self._tempfile, file_path) - - if self._close_requested: - os.unlink(self._tempfile) - self._tempfile = None - - def can_close(self): - """ - Prepare to cleanup on closing. - Called from self.close() - """ - self._close_requested = True - return True - + self.metadata['zoom'] = str(self.zoom) def __view_toolbar_go_fullscreen_cb(self, view_toolbar): self._old_zoom = self.view.get_property('zoom') #XXX: Hack |