From 78ab9e9233f431ccd9af452a3ef415bb077093d7 Mon Sep 17 00:00:00 2001
From: Jimi <jimi@thedodgefamily.com>
Date: Fri, 18 Nov 2022 22:57:40 -0700
Subject: [PATCH 1/5] Support left, right navigation while viewing photos

---
 components/ItemGrid/ItemGrid.brs      |  7 +++--
 components/photos/PhotoDetails.brs    | 42 ++++++++++++++++++++++++---
 components/photos/PhotoDetails.xml    |  3 +-
 components/photos/PhotoPlayerTask.brs | 17 -----------
 components/photos/PhotoPlayerTask.xml |  8 -----
 5 files changed, 44 insertions(+), 33 deletions(-)
 delete mode 100644 components/photos/PhotoPlayerTask.brs
 delete mode 100644 components/photos/PhotoPlayerTask.xml

diff --git a/components/ItemGrid/ItemGrid.brs b/components/ItemGrid/ItemGrid.brs
index 2ddaaca2..f5bd3b9d 100644
--- a/components/ItemGrid/ItemGrid.brs
+++ b/components/ItemGrid/ItemGrid.brs
@@ -724,9 +724,10 @@ function onKeyEvent(key as string, press as boolean) as boolean
             return true
         else if itemToPlay <> invalid and itemToPlay.type = "Photo"
             ' Spawn photo player task
-            photoPlayer = CreateObject("roSgNode", "PhotoPlayerTask")
-            photoPlayer.itemContent = itemToPlay
-            photoPlayer.control = "RUN"
+            photoPlayer = CreateObject("roSgNode", "PhotoDetails")
+            photoPlayer.items = markupGrid
+            photoPlayer.itemIndex = markupGrid.itemFocused
+            m.global.sceneManager.callfunc("pushScene", photoPlayer)
             return true
         end if
     else if key = "left" and topGrp.isinFocusChain()
diff --git a/components/photos/PhotoDetails.brs b/components/photos/PhotoDetails.brs
index 0903a779..c65d00ac 100644
--- a/components/photos/PhotoDetails.brs
+++ b/components/photos/PhotoDetails.brs
@@ -1,13 +1,17 @@
 sub init()
     m.top.optionsAvailable = false ' Change once Shuffle option is added
     m.top.overhangVisible = false
+    itemContentChanged()
 end sub
 
 sub itemContentChanged()
-    m.LoadLibrariesTask = createObject("roSGNode", "LoadPhotoTask")
-    m.LoadLibrariesTask.itemContent = m.top.itemContent
-    m.LoadLibrariesTask.observeField("results", "onPhotoLoaded")
-    m.LoadLibrariesTask.control = "RUN"
+    if isValidToContinue(m.top.itemIndex)
+        m.LoadLibrariesTask = createObject("roSGNode", "LoadPhotoTask")
+        itemContent = m.top.items.content.getChild(m.top.itemIndex)
+        m.LoadLibrariesTask.itemContent = itemContent
+        m.LoadLibrariesTask.observeField("results", "onPhotoLoaded")
+        m.LoadLibrariesTask.control = "RUN"
+    end if
 end sub
 
 sub onPhotoLoaded()
@@ -19,3 +23,33 @@ sub onPhotoLoaded()
         message_dialog("This image type is not supported.")
     end if
 end sub
+
+function onKeyEvent(key as string, press as boolean) as boolean
+    if not press then return false
+
+    if key = "right"
+        if isValidToContinue(m.top.itemIndex + 1)
+            m.top.itemIndex++
+        end if
+        return true
+    end if
+
+    if key = "left"
+        if isValidToContinue(m.top.itemIndex - 1)
+            m.top.itemIndex--
+        end if
+        return true
+    end if
+
+    return false
+end function
+
+function isValidToContinue(index as integer)
+    if isValid(m.top.items) and isValid(m.top.items.content)
+        if index >= 0 and index < m.top.items.content.getChildCount()
+            return true
+        end if
+    end if
+
+    return false
+end function
diff --git a/components/photos/PhotoDetails.xml b/components/photos/PhotoDetails.xml
index ea7d7f7e..016c963f 100644
--- a/components/photos/PhotoDetails.xml
+++ b/components/photos/PhotoDetails.xml
@@ -6,7 +6,8 @@
     </LayoutGroup>
   </children>
   <interface>
-    <field id="itemContent" type="node" onChange="itemContentChanged" />
+    <field id="items" type="node" />
+    <field id="itemIndex" type="integer" value="-1" onChange="itemContentChanged" />
   </interface>
   <script type="text/brightscript" uri="PhotoDetails.brs" />
   <script type="text/brightscript" uri="pkg:/source/utils/misc.brs" />
diff --git a/components/photos/PhotoPlayerTask.brs b/components/photos/PhotoPlayerTask.brs
deleted file mode 100644
index 337f6da6..00000000
--- a/components/photos/PhotoPlayerTask.brs
+++ /dev/null
@@ -1,17 +0,0 @@
-sub init()
-    m.top.functionName = "loadItems"
-end sub
-
-sub loadItems()
-    item = m.top.itemContent
-
-    group = CreateObject("roSGNode", "PhotoDetails")
-    group.optionsAvailable = false
-    m.global.sceneManager.callFunc("pushScene", group)
-
-    group.itemContent = item
-
-    ' TODO/FIXME:
-    ' Wait some time and move to the next photo...
-
-end sub
diff --git a/components/photos/PhotoPlayerTask.xml b/components/photos/PhotoPlayerTask.xml
deleted file mode 100644
index 0f7ef147..00000000
--- a/components/photos/PhotoPlayerTask.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<component name="PhotoPlayerTask" extends="Task">
-  <interface>
-    <field id="itemContent" type="node" />
-  </interface>
-  <script type="text/brightscript" uri="PhotoPlayerTask.brs" />
-</component>

From 6225b77f7c2811b48ddf8419673e74d0760c1499 Mon Sep 17 00:00:00 2001
From: Jimi <jimi@thedodgefamily.com>
Date: Sat, 19 Nov 2022 07:29:57 -0700
Subject: [PATCH 2/5] Slideshow

---
 components/ItemGrid/ItemGrid.brs   | 21 +++++-------
 components/photos/PhotoDetails.brs | 54 +++++++++++++++++++++++++++++-
 components/photos/PhotoDetails.xml | 10 ++++--
 locale/en_US/translations.ts       | 16 +++++++++
 source/ShowScenes.brs              | 11 ------
 5 files changed, 85 insertions(+), 27 deletions(-)

diff --git a/components/ItemGrid/ItemGrid.brs b/components/ItemGrid/ItemGrid.brs
index f5bd3b9d..1685ca89 100644
--- a/components/ItemGrid/ItemGrid.brs
+++ b/components/ItemGrid/ItemGrid.brs
@@ -320,13 +320,12 @@ end sub
 
 ' Set Photo Album view, sort, and filter options
 sub setPhotoAlbumOptions(options)
-    ' TODO/FIXME: Show shuffle options once implemented
-    ' options.views = [
-    '     { "Title": tr("Don't Shuffle"), "Name": "singlephoto"}
-    '     { "Title": tr("Shuffle"), "Name": "shufflephoto"}
-    ' ]
-    options.views = []
+    options.views = [
+        { "Title": tr("Slideshow Off"), "Name": "singlephoto" }
+        { "Title": tr("Slideshow On"), "Name": "slideshowphoto" }
+    ]
     options.sort = []
+    options.filter = []
 end sub
 
 ' Set Default view, sort, and filter options
@@ -574,14 +573,12 @@ sub optionsClosed()
         end if
     end if
 
-    if m.top.parentItem.Type = "CollectionFolder" or m.top.parentItem.CollectionType = "CollectionFolder"
+    if m.top.parentItem.Type = "CollectionFolder" or m.top.parentItem.Type = "Folder" or m.top.parentItem.CollectionType = "CollectionFolder"
         ' Did the user just request "Shuffle" on a PhotoAlbum?
         if m.options.view = "singlephoto"
-            ' TODO/FIXME: Stop shuffling here
-            print "TODO/FIXME: Stop any shuffling here"
-        else if m.options.view = "shufflephoto"
-            ' TODO/FIXME: Start shuffling here
-            print "TODO/FIXME: Start shuffle here"
+            set_user_setting("photos.slideshow", "false")
+        else if m.options.view = "slideshowphoto"
+            set_user_setting("photos.slideshow", "true")
         end if
     end if
 
diff --git a/components/photos/PhotoDetails.brs b/components/photos/PhotoDetails.brs
index c65d00ac..14e74e62 100644
--- a/components/photos/PhotoDetails.brs
+++ b/components/photos/PhotoDetails.brs
@@ -1,6 +1,12 @@
 sub init()
-    m.top.optionsAvailable = false ' Change once Shuffle option is added
+    m.top.optionsAvailable = true
     m.top.overhangVisible = false
+    m.slideshowTimer = m.top.findNode("slideshowTimer")
+    m.slideshowTimer.observeField("fire", "nextSlide")
+    m.status = m.top.findNode("status")
+    m.textBackground = m.top.findNode("background")
+    m.statusTimer = m.top.findNode("statusTimer")
+    m.statusTimer.observeField("fire", "statusUpdate")
     itemContentChanged()
 end sub
 
@@ -18,17 +24,38 @@ sub onPhotoLoaded()
     if m.LoadLibrariesTask.results <> invalid
         photo = m.top.findNode("photo")
         photo.uri = m.LoadLibrariesTask.results
+
+        ' if the user has requested a slideshow, start the timer
+        if get_user_setting("photos.slideshow") = "true"
+            m.slideshowTimer.control = "start"
+        end if
     else
         'Show user error here (for example if it's not a supported image type)
         message_dialog("This image type is not supported.")
     end if
 end sub
 
+sub nextSlide()
+    m.slideshowTimer.control = "stop"
+    if isValidToContinue(m.top.itemIndex + 1)
+        m.top.itemIndex++
+        m.slideshowTimer.control = "start"
+    end if
+end sub
+
+sub statusUpdate()
+    m.statusTimer.control = "stop"
+    m.textBackground.visible = false
+    m.status.visible = false
+    m.status.text = ""
+end sub
+
 function onKeyEvent(key as string, press as boolean) as boolean
     if not press then return false
 
     if key = "right"
         if isValidToContinue(m.top.itemIndex + 1)
+            m.slideshowTimer.control = "stop"
             m.top.itemIndex++
         end if
         return true
@@ -36,11 +63,36 @@ function onKeyEvent(key as string, press as boolean) as boolean
 
     if key = "left"
         if isValidToContinue(m.top.itemIndex - 1)
+            m.slideshowTimer.control = "stop"
             m.top.itemIndex--
         end if
         return true
     end if
 
+    if key = "play"
+        if m.slideshowTimer.control = "start"
+            ' stop the slideshow if the user hits "pause"
+            m.slideshowTimer.control = "stop"
+            m.status.text = tr("Slideshow Paused")
+            m.status.visible = true
+            m.textBackground.visible = true
+            m.statusTimer.control = "start"
+        else
+            ' start the slideshow if the user hits "play"
+            m.status.text = tr("Slideshow Resumed")
+            m.status.visible = true
+            m.textBackground.visible = true
+            m.statusTimer.control = "start"
+            m.slideshowTimer.control = "start"
+        end if
+        return true
+    end if
+
+    if key = "options"
+        ' Options (shuffle etc) is done on itemGrid
+        return true
+    end if
+
     return false
 end function
 
diff --git a/components/photos/PhotoDetails.xml b/components/photos/PhotoDetails.xml
index 016c963f..a53aa236 100644
--- a/components/photos/PhotoDetails.xml
+++ b/components/photos/PhotoDetails.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <component name="PhotoDetails" extends="JFGroup">
   <children>
-    <LayoutGroup id="toplevel">
-        <Poster id="photo" width="1920" height="1080" loadDisplayMode="scaleToFit"/>
-    </LayoutGroup>
+    <Poster id="photo" width="1920" height="1080" loadDisplayMode="scaleToFit"/>
+    <Rectangle id="background" color="0x880088FF" height="64" width="500" Translation="[150,150]" opacity="1" visible="false">
+      <Label id="status" font="font:MediumSystemFont" height="64" visible="false"/>
+    </Rectangle>
+    <Timer id="slideshowTimer" duration="5" repeat="false" />
+    <Timer id="statusTimer" duration="2" repeat="false" />
   </children>
   <interface>
     <field id="items" type="node" />
@@ -11,4 +14,5 @@
   </interface>
   <script type="text/brightscript" uri="PhotoDetails.brs" />
   <script type="text/brightscript" uri="pkg:/source/utils/misc.brs" />
+  <script type="text/brightscript" uri="pkg:/source/utils/config.brs" />
 </component>
diff --git a/locale/en_US/translations.ts b/locale/en_US/translations.ts
index 53ab194d..f0695789 100644
--- a/locale/en_US/translations.ts
+++ b/locale/en_US/translations.ts
@@ -817,5 +817,21 @@
             <translation>Unable to find any albums or songs belonging to this artist</translation>
             <extracomment>Popup message when we find no audio data for an artist</extracomment>
         </message>
+        <message>
+            <source>Slideshow Off</source>
+            <translation>Slideshow Off</translation>
+        </message>
+        <message>
+            <source>Slideshow On</source>
+            <translation>Slideshow On</translation>
+        </message>
+        <message>
+            <source>Slideshow Paused</source>
+            <translation>Slideshow Paused</translation>
+        </message>                
+        <message>
+            <source>Slideshow Resumed</source>
+            <translation>Slideshow Resumed</translation>
+        </message>         
     </context>
 </TS>
diff --git a/source/ShowScenes.brs b/source/ShowScenes.brs
index f79801e8..653a39e3 100644
--- a/source/ShowScenes.brs
+++ b/source/ShowScenes.brs
@@ -584,17 +584,6 @@ function CreatePersonView(personData as object) as object
     return person
 end function
 
-function CreatePhotoPage(photo)
-    group = CreateObject("roSGNode", "PhotoDetails")
-    group.optionsAvailable = true
-    m.global.sceneManager.callFunc("pushScene", group)
-
-    group.itemContent = photo
-
-    return group
-
-end function
-
 sub UpdateSavedServerList()
     server = get_setting("server")
     username = get_setting("username")

From e54a4cba411c471ea9096aa895903a3e6beaccc3 Mon Sep 17 00:00:00 2001
From: Jimi <jimi@thedodgefamily.com>
Date: Sat, 19 Nov 2022 13:17:35 -0700
Subject: [PATCH 3/5] Add shuffle

---
 components/ItemGrid/ItemGrid.brs   |  7 +++++++
 components/photos/PhotoDetails.brs | 22 +++++++++++++++++-----
 locale/en_US/translations.ts       | 10 +++++++++-
 3 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/components/ItemGrid/ItemGrid.brs b/components/ItemGrid/ItemGrid.brs
index 1685ca89..22fc031b 100644
--- a/components/ItemGrid/ItemGrid.brs
+++ b/components/ItemGrid/ItemGrid.brs
@@ -323,6 +323,8 @@ sub setPhotoAlbumOptions(options)
     options.views = [
         { "Title": tr("Slideshow Off"), "Name": "singlephoto" }
         { "Title": tr("Slideshow On"), "Name": "slideshowphoto" }
+        { "Title": tr("Shuffle Off"), "Name": "singlephoto" }
+        { "Title": tr("Shuffle On"), "Name": "shufflephoto" }
     ]
     options.sort = []
     options.filter = []
@@ -577,8 +579,13 @@ sub optionsClosed()
         ' Did the user just request "Shuffle" on a PhotoAlbum?
         if m.options.view = "singlephoto"
             set_user_setting("photos.slideshow", "false")
+            set_user_setting("photos.shuffle", "false")
         else if m.options.view = "slideshowphoto"
             set_user_setting("photos.slideshow", "true")
+            set_user_setting("photos.shuffle", "false")
+        else if m.options.view = "shufflephoto"
+            set_user_setting("photos.shuffle", "true")
+            set_user_setting("photos.slideshow", "false")
         end if
     end if
 
diff --git a/components/photos/PhotoDetails.brs b/components/photos/PhotoDetails.brs
index 14e74e62..81b474b1 100644
--- a/components/photos/PhotoDetails.brs
+++ b/components/photos/PhotoDetails.brs
@@ -7,6 +7,8 @@ sub init()
     m.textBackground = m.top.findNode("background")
     m.statusTimer = m.top.findNode("statusTimer")
     m.statusTimer.observeField("fire", "statusUpdate")
+    m.slideshow = get_user_setting("photos.slideshow")
+    m.shuffle = get_user_setting("photos.shuffle")
     itemContentChanged()
 end sub
 
@@ -25,8 +27,8 @@ sub onPhotoLoaded()
         photo = m.top.findNode("photo")
         photo.uri = m.LoadLibrariesTask.results
 
-        ' if the user has requested a slideshow, start the timer
-        if get_user_setting("photos.slideshow") = "true"
+        if m.slideshow = "true" or m.shuffle = "true"
+            ' user has requested either a slideshow or a shuffle...
             m.slideshowTimer.control = "start"
         end if
     else
@@ -37,9 +39,18 @@ end sub
 
 sub nextSlide()
     m.slideshowTimer.control = "stop"
-    if isValidToContinue(m.top.itemIndex + 1)
-        m.top.itemIndex++
-        m.slideshowTimer.control = "start"
+
+    if m.slideshow = "true"
+        if isValidToContinue(m.top.itemIndex + 1)
+            m.top.itemIndex++
+            m.slideshowTimer.control = "start"
+        end if
+    else if m.shuffle = "true"
+        index = rnd(m.top.items.content.getChildCount() - 1)
+        if isValidToContinue(index)
+            m.top.itemIndex = index
+            m.slideshowTimer.control = "start"
+        end if
     end if
 end sub
 
@@ -82,6 +93,7 @@ function onKeyEvent(key as string, press as boolean) as boolean
             m.status.text = tr("Slideshow Resumed")
             m.status.visible = true
             m.textBackground.visible = true
+            m.slideshow = "true"
             m.statusTimer.control = "start"
             m.slideshowTimer.control = "start"
         end if
diff --git a/locale/en_US/translations.ts b/locale/en_US/translations.ts
index f0695789..5f015b9a 100644
--- a/locale/en_US/translations.ts
+++ b/locale/en_US/translations.ts
@@ -832,6 +832,14 @@
         <message>
             <source>Slideshow Resumed</source>
             <translation>Slideshow Resumed</translation>
-        </message>         
+        </message>     
+        <message>
+            <source>Shuffle Off</source>
+            <translation>Shuffle Off</translation>
+        </message>
+        <message>
+            <source>Shuffle On</source>
+            <translation>Shuffle On</translation>
+        </message>            
     </context>
 </TS>

From 10bb0115ddecf3277fdeaca75ab5eb44692bbea6 Mon Sep 17 00:00:00 2001
From: 1hitsong <3330318+1hitsong@users.noreply.github.com>
Date: Sat, 19 Nov 2022 15:39:45 -0500
Subject: [PATCH 4/5] Auto stash before merge of "feature/jf-photo-slideshow"
 and "jimdogx/feature/jf-photo-slideshow"

---
 components/photos/PhotoDetails.brs | 18 +++++++++++-------
 components/photos/PhotoDetails.xml | 14 ++++++++++++--
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/components/photos/PhotoDetails.brs b/components/photos/PhotoDetails.brs
index 81b474b1..7de2e8d6 100644
--- a/components/photos/PhotoDetails.brs
+++ b/components/photos/PhotoDetails.brs
@@ -9,6 +9,10 @@ sub init()
     m.statusTimer.observeField("fire", "statusUpdate")
     m.slideshow = get_user_setting("photos.slideshow")
     m.shuffle = get_user_setting("photos.shuffle")
+
+    m.showStatusAnimation = m.top.findNode("showStatusAnimation")
+    m.hideStatusAnimation = m.top.findNode("hideStatusAnimation")
+
     itemContentChanged()
 end sub
 
@@ -56,9 +60,7 @@ end sub
 
 sub statusUpdate()
     m.statusTimer.control = "stop"
-    m.textBackground.visible = false
-    m.status.visible = false
-    m.status.text = ""
+    m.hideStatusAnimation.control = "start"
 end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
@@ -85,14 +87,16 @@ function onKeyEvent(key as string, press as boolean) as boolean
             ' stop the slideshow if the user hits "pause"
             m.slideshowTimer.control = "stop"
             m.status.text = tr("Slideshow Paused")
-            m.status.visible = true
-            m.textBackground.visible = true
+            if m.textBackground.opacity = 0
+                m.showStatusAnimation.control = "start"
+            end if
             m.statusTimer.control = "start"
         else
             ' start the slideshow if the user hits "play"
             m.status.text = tr("Slideshow Resumed")
-            m.status.visible = true
-            m.textBackground.visible = true
+            if m.textBackground.opacity = 0
+                m.showStatusAnimation.control = "start"
+            end if
             m.slideshow = "true"
             m.statusTimer.control = "start"
             m.slideshowTimer.control = "start"
diff --git a/components/photos/PhotoDetails.xml b/components/photos/PhotoDetails.xml
index a53aa236..12867c1d 100644
--- a/components/photos/PhotoDetails.xml
+++ b/components/photos/PhotoDetails.xml
@@ -2,11 +2,21 @@
 <component name="PhotoDetails" extends="JFGroup">
   <children>
     <Poster id="photo" width="1920" height="1080" loadDisplayMode="scaleToFit"/>
-    <Rectangle id="background" color="0x880088FF" height="64" width="500" Translation="[150,150]" opacity="1" visible="false">
-      <Label id="status" font="font:MediumSystemFont" height="64" visible="false"/>
+    <Rectangle id="background" color="0x101010EE" height="120" width="500" Translation="[700, -150]" opacity="0">
+      <Label id="status" font="font:MediumSystemFont" height="100" width="500" horizAlign="center" vertAlign="bottom"/>
     </Rectangle>
     <Timer id="slideshowTimer" duration="5" repeat="false" />
     <Timer id="statusTimer" duration="2" repeat="false" />
+
+    <Animation id="showStatusAnimation" duration="1" repeat="false">
+      <FloatFieldInterpolator key="[0.0, 0.1]" keyValue="[0, 1]" fieldToInterp="background.opacity" />
+      <Vector2DFieldInterpolator key="[0.1, 1]" keyValue="[[700, -150], [700, -5]]" fieldToInterp="background.translation" />
+    </Animation>
+    <Animation id="hideStatusAnimation" duration="1" repeat="false">
+      <Vector2DFieldInterpolator key="[0.0, 0.9]" keyValue="[[700, -5], [700, -150]]" fieldToInterp="background.translation" />
+      <FloatFieldInterpolator key="[0.9, 1]" keyValue="[1, 0]" fieldToInterp="background.opacity" />
+    </Animation>
+
   </children>
   <interface>
     <field id="items" type="node" />

From 4312e9ac7e7ac9690153f10286a455cfde9b2b0c Mon Sep 17 00:00:00 2001
From: Jimi <jimi@thedodgefamily.com>
Date: Fri, 2 Dec 2022 06:26:47 -0700
Subject: [PATCH 5/5] Shuffle is really Random

---
 components/ItemGrid/ItemGrid.brs   | 14 +++++++-------
 components/photos/PhotoDetails.brs | 10 +++++-----
 locale/en_US/translations.ts       |  8 ++++----
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/components/ItemGrid/ItemGrid.brs b/components/ItemGrid/ItemGrid.brs
index 22fc031b..38e9aea0 100644
--- a/components/ItemGrid/ItemGrid.brs
+++ b/components/ItemGrid/ItemGrid.brs
@@ -323,8 +323,8 @@ sub setPhotoAlbumOptions(options)
     options.views = [
         { "Title": tr("Slideshow Off"), "Name": "singlephoto" }
         { "Title": tr("Slideshow On"), "Name": "slideshowphoto" }
-        { "Title": tr("Shuffle Off"), "Name": "singlephoto" }
-        { "Title": tr("Shuffle On"), "Name": "shufflephoto" }
+        { "Title": tr("Random Off"), "Name": "singlephoto" }
+        { "Title": tr("Random On"), "Name": "randomphoto" }
     ]
     options.sort = []
     options.filter = []
@@ -576,15 +576,15 @@ sub optionsClosed()
     end if
 
     if m.top.parentItem.Type = "CollectionFolder" or m.top.parentItem.Type = "Folder" or m.top.parentItem.CollectionType = "CollectionFolder"
-        ' Did the user just request "Shuffle" on a PhotoAlbum?
+        ' Did the user just request "Random" on a PhotoAlbum?
         if m.options.view = "singlephoto"
             set_user_setting("photos.slideshow", "false")
-            set_user_setting("photos.shuffle", "false")
+            set_user_setting("photos.random", "false")
         else if m.options.view = "slideshowphoto"
             set_user_setting("photos.slideshow", "true")
-            set_user_setting("photos.shuffle", "false")
-        else if m.options.view = "shufflephoto"
-            set_user_setting("photos.shuffle", "true")
+            set_user_setting("photos.random", "false")
+        else if m.options.view = "randomphoto"
+            set_user_setting("photos.random", "true")
             set_user_setting("photos.slideshow", "false")
         end if
     end if
diff --git a/components/photos/PhotoDetails.brs b/components/photos/PhotoDetails.brs
index 7de2e8d6..4494022e 100644
--- a/components/photos/PhotoDetails.brs
+++ b/components/photos/PhotoDetails.brs
@@ -8,7 +8,7 @@ sub init()
     m.statusTimer = m.top.findNode("statusTimer")
     m.statusTimer.observeField("fire", "statusUpdate")
     m.slideshow = get_user_setting("photos.slideshow")
-    m.shuffle = get_user_setting("photos.shuffle")
+    m.random = get_user_setting("photos.random")
 
     m.showStatusAnimation = m.top.findNode("showStatusAnimation")
     m.hideStatusAnimation = m.top.findNode("hideStatusAnimation")
@@ -31,8 +31,8 @@ sub onPhotoLoaded()
         photo = m.top.findNode("photo")
         photo.uri = m.LoadLibrariesTask.results
 
-        if m.slideshow = "true" or m.shuffle = "true"
-            ' user has requested either a slideshow or a shuffle...
+        if m.slideshow = "true" or m.random = "true"
+            ' user has requested either a slideshow or random...
             m.slideshowTimer.control = "start"
         end if
     else
@@ -49,7 +49,7 @@ sub nextSlide()
             m.top.itemIndex++
             m.slideshowTimer.control = "start"
         end if
-    else if m.shuffle = "true"
+    else if m.random = "true"
         index = rnd(m.top.items.content.getChildCount() - 1)
         if isValidToContinue(index)
             m.top.itemIndex = index
@@ -105,7 +105,7 @@ function onKeyEvent(key as string, press as boolean) as boolean
     end if
 
     if key = "options"
-        ' Options (shuffle etc) is done on itemGrid
+        ' Options (random etc) is done on itemGrid
         return true
     end if
 
diff --git a/locale/en_US/translations.ts b/locale/en_US/translations.ts
index 2b91d901..42cf8770 100644
--- a/locale/en_US/translations.ts
+++ b/locale/en_US/translations.ts
@@ -838,12 +838,12 @@
             <translation>Slideshow Resumed</translation>
         </message>     
         <message>
-            <source>Shuffle Off</source>
-            <translation>Shuffle Off</translation>
+            <source>Random Off</source>
+            <translation>Random Off</translation>
         </message>
         <message>
-            <source>Shuffle On</source>
-            <translation>Shuffle On</translation>
+            <source>Random On</source>
+            <translation>Random On</translation>
         </message>
         <message>        
             <source>MPEG-4 Support</source>