added slideshow-options from the local image-viewer
authorThomas Schmidt <tschmidt@debian.org>
Sat, 17 Oct 2009 13:04:47 +0000 (15:04 +0200)
committerThomas Schmidt <tschmidt@debian.org>
Sat, 17 Oct 2009 13:04:47 +0000 (15:04 +0200)
canola-flickr/flickr/model.py
canola-flickr/flickr/options.py
canola-flickr/plugins.info

index b195d34..45f83d7 100644 (file)
@@ -72,6 +72,12 @@ CanolaError         = mger.get_class("Model/Notify/Error")
 ImageLocalModel     = mger.get_class("Model/Media/Image")
 OptionsModelFolder  = mger.get_class("Model/Options/Folder")
 SystemProps         = mger.get_class("SystemProperties")
+
+BaseSlideshowModeOptionsModel       = mger.get_class("Model/Options/Folder/Image/Fullscreen/Submenu/SlideshowMode")
+BaseSlideshowTimeOptionModelFolder  = mger.get_class("Model/Options/Folder/Image/Fullscreen/Submenu/SlideshowTime")
+BaseSlideshowRandomOptionModel      = mger.get_class("Model/Options/Action/Image/Fullscreen/SlideshowMode/SlideshowRandom")
+BaseSlideshowLoopOptionModel        = mger.get_class("Model/Options/Action/Image/Fullscreen/SlideshowMode/SlideshowLoop")
+
 sysprops            = SystemProps()
 
 locale.setlocale(locale.LC_ALL, "C")
@@ -866,7 +872,7 @@ class OptionsModel(OptionsModelFolder):
 class ViewerOptionsModel(OptionsModel):
     terra_type = "Model/Options/Folder/Player/Flickr/Image"
     title = "Photo options"
-    children_order = ["/Info", "/ExifInfo", "/CommentsList", "/Favorite"]
+    children_order = [ "/SlideshowMode", "/SlideshowTime", "/Info", "/ExifInfo", "/CommentsList", "/Favorite"]
 
 class InfoOptionModel(OptionsModel):
     terra_type = "Model/Options/Folder/Player/Flickr/Image/Info"
@@ -996,6 +1002,20 @@ class CommentsListOptionModel(OptionsModel):
                 end_callback()
         ThreadedFunction(cb_finished, self.prev_page).start()
 
+class SlideshowModeOptionsModel(BaseSlideshowModeOptionsModel):
+    terra_type = "Model/Options/Folder/Player/Flickr/Image/SlideshowMode"
+
+class SlideshowTimeOptionModelFolder(BaseSlideshowTimeOptionModelFolder):
+    terra_type = "Model/Options/Folder/Player/Flickr/Image/SlideshowTime"
+
+class SlideshowLoopOptionModel(BaseSlideshowLoopOptionModel):
+    terra_type = "Model/Options/Action/Player/Flickr/Image/SlideshowMode/" \
+        "SlideshowLoop"
+
+class SlideshowRandomOptionModel(BaseSlideshowRandomOptionModel):
+    terra_type = "Model/Options/Action/Player/Flickr/Image/SlideshowMode/" \
+        "SlideshowRandom"
+
 class UploadOptionModel(OptionsModel):
     terra_type = "Model/Options/Folder/Image/Fullscreen/Upload"
     title = "Upload to flickr"
index 3a300ae..fadd169 100644 (file)
@@ -42,6 +42,10 @@ BaseScrollableText      = manager.get_class("Widget/ScrollableTextBlock")
 ControllerOptionsFolder = manager.get_class("Controller/Options/Folder")
 PanelButtonWidget       = manager.get_class("Widget/PanelButton")
 
+BaseSlideshowModeOptionsCheckedController   = manager.get_class("Controller/Options/Folder/Image/Fullscreen/Submenu/SlideshowMode")
+#BaseSlideshowTimerOptionsCheckedController  = manager.get_class("Controller/Options/Folder/Image/Fullscreen/Submenu/SlideshowTimer")
+BaseSlideshowTimeOptionController           = manager.get_class("Controller/Options/Folder/Image/Fullscreen/Submenu/SlideshowTime")
+
 log = logging.getLogger("plugins.canola-flickr.options")
 
 class ModalMessageController(ModalController):
@@ -435,3 +439,13 @@ class UploadOptionController(UserInfoOptionController):
         #except Exception, e:
         #    self._body.signal_emit("thumb,hide", "")
 
+class SlideshowModeOptionsCheckedController(BaseSlideshowModeOptionsCheckedController):
+    terra_type = "Controller/Options/Folder/Player/Flickr/Image/SlideshowMode"
+
+#class SlideshowTimerOptionsCheckedController(BaseSlideshowTimerOptionsCheckedController):
+#    terra_type = "Controller/Options/Folder/Player/Flickr/Image/Submenu/" \
+#        "SlideshowTimer"
+
+class SlideshowTimeOptionController(BaseSlideshowTimeOptionController):
+    terra_type = "Controller/Options/Folder/Player/Flickr/Image/SlideshowTime"
+
index a6f3d16..da7b0f2 100644 (file)
@@ -8,10 +8,14 @@ filter_map = Icon/Folder/Task/Image/Flickr                      - Icon
              Model/Options/Folder/Player/Flickr/Image/Info      - InfoOptionModel
              Model/Options/Folder/Player/Flickr/Image/ExifInfo  - ExifInfoOptionModel
              Model/Options/Folder/Player/Flickr/Image/CommentsList - CommentsListOptionModel
+             Model/Options/Folder/Player/Flickr/Image/SlideshowMode - SlideshowModeOptionsModel
+             Model/Options/Folder/Player/Flickr/Image/SlideshowTime - SlideshowTimeOptionModelFolder
+             Model/Options/Action/Player/Flickr/Image/SlideshowMode/SlideshowLoop - SlideshowLoopOptionModel
+             Model/Options/Action/Player/Flickr/Image/SlideshowMode/SlideshowRandom - SlideshowRandomOptionModel
              Model/Options/Folder/Player/Flickr/Photoset/Info   - PhotosetInfoOptionModel
              Model/Options/Folder/Player/Flickr/Group/Info      - GroupInfoOptionModel
              Model/Options/Folder/Player/Flickr/User/Info       - UserInfoOptionModel
-             Model/Options/Folder/Player/Flickr/Upload/Status   - UploadStatusOptionModel
+;             Model/Options/Folder/Player/Flickr/Upload/Status   - UploadStatusOptionModel
 ;             Model/Options/Folder/Image/Fullscreen/Upload       - UploadOptionModel
 
 [Flickr UI]
@@ -34,8 +38,10 @@ filter_map = Controller/Options/Folder/Player/Flickr/Image/Favorite - FavoriteOp
              Controller/Options/Folder/Player/Flickr/Image/ExifInfo - ExifInfoOptionController
              Controller/Options/Folder/Player/Flickr/Image/CommentsList - CommentsListOptionController
              Controller/Options/Folder/Player/Flickr/Image/CommentsList/Item - CommentItemController
+             Controller/Options/Folder/Player/Flickr/Image/SlideshowMode - SlideshowModeOptionsCheckedController
+             Controller/Options/Folder/Player/Flickr/Image/SlideshowTime - SlideshowTimeOptionController
              Controller/Options/Folder/Player/Flickr/Photoset/Info  - PhotosetInfoOptionController
              Controller/Options/Folder/Player/Flickr/Group/Info     - GroupInfoOptionController
              Controller/Options/Folder/Player/Flickr/User/Info      - UserInfoOptionController
-             Controller/Options/Folder/Player/Flickr/Upload/Status  - UploadStatusOptionController
+;             Controller/Options/Folder/Player/Flickr/Upload/Status  - UploadStatusOptionController
 ;             Controller/Options/Folder/Image/Fullscreen/Upload      - UploadOptionController