removed image_preloaded()-method, now using the version from canola-core again (is...
authorThomas Schmidt <tschmidt@debian.org>
Fri, 23 Oct 2009 22:06:06 +0000 (00:06 +0200)
committerThomas Schmidt <tschmidt@debian.org>
Fri, 23 Oct 2009 22:06:06 +0000 (00:06 +0200)
canola-flickr/flickr/ui.py

index 911573f..fe9c8cf 100644 (file)
@@ -359,38 +359,3 @@ class ImageViewerController(BaseImageViewerController):
         res = BaseImageViewerController.load_next(self, loop=loop, end_callback=end_callback)
         self.reload_favorite_option_model()
         return res
-
-    def image_preloaded(self):
-        slideshow_active = self.is_slideshow_active()
-        self.stop_full_throbber()
-        self.view.show_image(slideshow_active)
-        try:
-            if self.slideshow_random:
-                if self.slideshow_loop:
-                    prev_idx = (self.slideshow_random_idx - 1) % len(self.slideshow_random_list)
-                    next_idx = (self.slideshow_random_idx + 1) % len(self.slideshow_random_list)
-
-                    prev = self.slideshow_random_list[prev_idx][1]
-                    next = self.slideshow_random_list[next_idx][1]
-                else:
-                    prev = self.slideshow_random_list[self.slideshow_random_idx - 1][1]
-                    next = self.slideshow_random_list[self.slideshow_random_idx + 1][1]
-            else:
-                prev = self.model.prev_get(circular=self.slideshow_loop)
-                next = self.model.next_get(circular=self.slideshow_loop)
-        except IndexError, ie:
-            if slideshow_active:
-                log.debug("Reached end of list. (self.slideshow_loop: %s)" % self.slideshow_loop)
-                return
-            else:
-                log.debug("Reached end of list.")
-                return
-
-        self.view.image_prev_next_preload(prev, next)
-
-        if slideshow_active:
-            self._slideshow_timer = \
-                ecore.timer_add(self.slideshow_time, self.load_next,
-                                self.slideshow_loop, self.image_preloaded)
-
-