dont use progress dialog to block key input

Author: sevenrats

components/Buttons/JFButtons.bs

@@ -102,6 +102,7 @@ end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
 
+    if m.top.getScene().disableRemote then return false
     if not press then return false
 
     if key = "left"

components/Buttons/SlideOutButton.bs

@@ -88,6 +88,8 @@ sub onPaddingChanged()
 end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
     if not press then return false
 
     if key = "OK" and m.top.hasFocus()

components/ItemGrid/Alpha.bs

@@ -10,6 +10,7 @@ end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
 
+    if m.top.getScene().disableRemote then return false
     if not press then return false
 
     if key = "OK"

components/ItemGrid/ItemGrid.bs

@@ -757,6 +757,9 @@ function getItemFocused()
 end function
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
+
     if not press then return false
 
     if m.itemGrid.opacity = 1

components/ItemGrid/ItemGridOptions.bs

@@ -247,6 +247,9 @@ sub saveFavoriteItemSelected(msg)
 end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
+
     if key = "down" or (key = "OK" and m.buttons.hasFocus())
         m.buttons.setFocus(false)
         m.menus[m.selectedItem].setFocus(true)

components/ItemGrid/MovieLibraryView.bs

@@ -834,6 +834,9 @@ sub onChannelSelected(msg)
 end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
+
     if not press then return false
 
     if key = "left" and m.voiceBox.isinFocusChain()

components/ItemGrid/MusicLibraryView.bs

@@ -699,6 +699,8 @@ sub onChannelSelected(msg)
 end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
     if not press then return false
 
     if key = "left" and m.voiceBox.isinFocusChain()

components/JFScene.bs

@@ -11,22 +11,9 @@ sub isLoadingChanged()
     m.spinner.visible = m.top.isLoading
 end sub
 
-' Triggered when the disableRemote boolean component field is changed
-sub disableRemoteChanged()
-    if m.top.disableRemote
-        dialog = createObject("roSGNode", "ProgressDialog")
-        dialog.id = "invisibiledialog"
-        dialog.visible = false
-        dialog.opacity = 0
-        m.top.dialog = dialog
-    else
-        if isValid(m.top.dialog)
-            m.top.dialog.close = true
-        end if
-    end if
-end sub
-
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.disableRemote then return false
     if not press then return false
 
     if key = "back"

components/JFScene.xml

@@ -6,7 +6,7 @@
     <Spinner id="spinner" translation="[897, 477]" visible="false" />
   </children>
   <interface>
-    <field id="disableRemote" type="boolean" value="false" onchange="disableRemoteChanged" />
+    <field id="disableRemote" type="boolean" value="false" />
     <field id="isLoading" type="boolean" value="false" onchange="isLoadingChanged" />
     <field id="exit" type="boolean" alwaysNotify="true" />
   </interface>

components/RadioDialog.bs

@@ -117,6 +117,8 @@ sub onContentDataChanged()
 end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
     if key = "right"
         ' By default RIGHT from the option list selects the OK button
         ' Instead, keep the user on the option list

components/config/LoginScene.bs

@@ -5,6 +5,9 @@ end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
     ' Returns true if user navigates to a new focusable element
+
+    if m.top.getScene().disableRemote then return false
+
     if not press then return false
 
     list = m.top.findNode("configOptions")

components/config/SetServerScreen.bs

@@ -17,6 +17,9 @@ sub init()
 end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
+
     m.log.debug("SetServerScreen onKeyEvent", key, press)
 
     if not press then return true

components/home/HomeRows.bs

@@ -557,6 +557,9 @@ sub itemSelected()
 end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
+
     if press
         if key = "play"
             print "play was pressed from homerow"

components/keyboards/IntegerKeyboard.bs

@@ -3,6 +3,9 @@ sub init()
 end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
+
     if key = "back"
         m.top.escape = key
         return true

components/liveTv/ProgramDetails.bs

@@ -316,6 +316,8 @@ sub onAnimationComplete()
 end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
     if not press then return false
 
     if key = "OK" and m.viewChannelButton.hasFocus()

components/liveTv/schedule.bs

@@ -285,6 +285,8 @@ sub onRecordOperationDone()
 end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
     if not press then return false
 
     detailsGrp = m.top.findNode("detailsPane")

components/login/UserRow.bs

@@ -47,6 +47,8 @@ sub setUser()
 end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
     if not press then return false
 
     return false

components/login/UserSelect.bs

@@ -25,6 +25,8 @@ sub redraw()
 end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
     if not press then return false
 
     if key = "back"

components/movies/MovieDetails.bs

@@ -347,6 +347,8 @@ end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
 
+    if m.top.getScene().disableRemote then return false
+
     ' Due to the way the button pressed event works, need to catch the release for the button as the press is being sent
     ' directly to the main loop.  Will get this sorted in the layout update for Movie Details
     if key = "OK" and m.top.findNode("options-button").isInFocusChain()

components/movies/MovieOptions.bs

@@ -96,6 +96,8 @@ end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
 
+    if m.top.getScene().disableRemote then return false
+
     if key = "down" or (key = "OK" and m.top.findNode("buttons").hasFocus())
         m.top.findNode("buttons").setFocus(false)
         m.menus[m.selectedItem].setFocus(true)

components/music/AlbumGrid.bs

@@ -37,6 +37,8 @@ function getData()
 end function
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
     if not press then return false
 
     if key = "up"

components/music/AlbumView.bs

@@ -95,6 +95,9 @@ sub setOnScreenTextValues(json)
 end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
+
     if not press then return false
 
     if key = "options"

components/music/ArtistView.bs

@@ -252,6 +252,8 @@ end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
 
+    if m.top.getScene().disableRemote then return false
+
     if m.buttonGrp.isInFocusChain()
         if key = "OK"
             if press

components/music/AudioPlayerView.bs

@@ -543,6 +543,8 @@ end sub
 ' Process key press events
 function onKeyEvent(key as string, press as boolean) as boolean
 
+    if m.top.getScene().disableRemote then return false
+
     ' Key bindings for remote control buttons
     if press
         ' If user presses key to turn off screensaver, don't do anything else with it

components/music/PlaylistView.bs

@@ -94,6 +94,8 @@ sub setOnScreenTextValues(json)
 end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
     if not press then return false
 
     if key = "options"

components/options/OptionsSlider.bs

@@ -24,6 +24,8 @@ sub setFields()
 end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
     if not press then return false
 
     if key = "options" or key = "back"

components/photos/PhotoDetails.bs

@@ -110,6 +110,8 @@ sub isRandomChanged()
 end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
     if not press then return false
 
     if key = "right"

components/quickConnect/QuickConnectDialog.bs

@@ -59,6 +59,9 @@ sub onButtonSelected()
 end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
+
     if not press then return false
 
     ' Note that "OK" does not get sent here, hence onButtonSelected() above.

components/search/SearchResults.bs

@@ -53,6 +53,8 @@ end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
 
+    if m.top.getScene().disableRemote then return false
+
     m.searchAlphabox = m.top.findNode("search_Key")
     if m.searchAlphabox.textEditBox.hasFocus()
         m.searchAlphabox.textEditBox.translation = "[0, -150]"

components/settings/settings.bs

@@ -231,6 +231,8 @@ function isFormInFocus() as boolean
 end function
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
     if not press then return false
 
     if (key = "back" or key = "left") and m.settingsMenu.focusedChild <> invalid and m.userLocation.Count() > 1

components/tvshows/TVEpisodeRow.bs

@@ -56,6 +56,8 @@ function setData()
 end function
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
     if not press then return false
 
     return false

components/tvshows/TVEpisodeRowWithOptions.bs

@@ -81,6 +81,8 @@ sub videoOptionsClosed()
 end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
     if not press then return false
 
     if key = "options" and isValid(m.rows.focusedChild) and isValid(m.rows.focusedChild.rowItemFocused)

components/tvshows/TVEpisodes.bs

@@ -68,6 +68,9 @@ end function
 
 ' Handle navigation input from the remote and act on it
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
+
     if key = "left" and m.tvEpisodeRow.hasFocus()
         m.shuffle.setFocus(true)
         return true

components/tvshows/TVListOptions.bs

@@ -98,6 +98,8 @@ end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
 
+    if m.top.getScene().disableRemote then return false
+
     if key = "down" or (key = "OK" and m.top.findNode("buttons").hasFocus())
         m.top.findNode("buttons").setFocus(false)
         m.menus[m.selectedItem].setFocus(true)

components/tvshows/TVShowDetails.bs

@@ -183,6 +183,9 @@ sub onShuffleEpisodeDataLoaded()
 end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
+
     if key = "OK" or key = "play"
         if m.Shuffle.hasFocus()
             m.getShuffleEpisodesTask.showID = m.top.itemContent.id

components/video/OSD.bs

@@ -139,6 +139,8 @@ sub onButtonSelected()
 end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
     if not press then return false
 
     if key = "OK"

components/video/VideoPlayerView.bs

@@ -581,6 +581,8 @@ end function
 
 function onKeyEvent(key as string, press as boolean) as boolean
 
+    if m.top.getScene().disableRemote then return false
+
     ' Keypress handler while user is inside the chapter menu
     if m.chapterMenu.hasFocus()
         if not press then return false