diff --git a/docs/api/components_ItemGrid_ItemGrid.bs.html b/docs/api/components_ItemGrid_ItemGrid.bs.html index cbe4f7221..e6abc9e18 100644 --- a/docs/api/components_ItemGrid_ItemGrid.bs.html +++ b/docs/api/components_ItemGrid_ItemGrid.bs.html @@ -66,9 +66,6 @@ 'set inital counts for overhang before content is loaded. m.loadItemsTask.totalRecordCount = 0 - m.spinner = m.top.findNode("spinner") - m.spinner.visible = true - m.Alpha = m.top.findNode("AlphaMenu") m.AlphaSelected = m.top.findNode("AlphaSelected") @@ -94,7 +91,7 @@ 'Load initial set of Data sub loadInitialItems() m.loadItemsTask.control = "stop" - m.spinner.visible = true + startLoadingSpinner() if m.top.parentItem.json.Type = "CollectionFolder" 'or m.top.parentItem.json.Type = "Folder" m.top.HomeLibraryItem = m.top.parentItem.Id @@ -240,7 +237,7 @@ end if m.loadItemsTask.observeField("content", "ItemDataLoaded") - m.spinner.visible = true + startLoadingSpinner(false) m.loadItemsTask.control = "RUN" SetUpOptions() end sub @@ -452,6 +449,7 @@ ' 'Handle loaded data, and add to Grid sub ItemDataLoaded(msg) + stopLoadingSpinner() m.top.alphaActive = false itemData = msg.GetData() m.loadItemsTask.unobserveField("content") @@ -477,7 +475,7 @@ m.genreList.setFocus(true) m.loading = false - m.spinner.visible = false + stopLoadingSpinner() return end if @@ -500,7 +498,7 @@ m.itemGrid.setFocus(true) m.genreList.setFocus(false) - m.spinner.visible = false + stopLoadingSpinner() end sub ' @@ -573,7 +571,7 @@ ' 'Load next set of items sub loadMoreData() - m.spinner.visible = true + startLoadingSpinner(false) if m.Loading = true then return m.Loading = true m.loadItemsTask.startIndex = m.loadedItems @@ -596,7 +594,7 @@ m.loadItemsTask.searchTerm = "" m.VoiceBox.text = "" m.loadItemsTask.nameStartsWith = m.alpha.itemAlphaSelected - m.spinner.visible = true + startLoadingSpinner(false) loadInitialItems() end if end sub @@ -611,7 +609,7 @@ m.loadItemsTask.NameStartsWith = " " m.loadItemsTask.searchTerm = m.voiceBox.text m.loadItemsTask.recursive = true - m.spinner.visible = true + startLoadingSpinner(false) loadInitialItems() end if end sub @@ -847,7 +845,6 @@ end if if key = "replay" - m.spinner.visible = true m.loadItemsTask.searchTerm = "" m.loadItemsTask.nameStartsWith = "" m.voiceBox.text = "" diff --git a/docs/api/components_ItemGrid_MovieLibraryView.bs.html b/docs/api/components_ItemGrid_MovieLibraryView.bs.html index d4b1431d2..3b2b481d7 100644 --- a/docs/api/components_ItemGrid_MovieLibraryView.bs.html +++ b/docs/api/components_ItemGrid_MovieLibraryView.bs.html @@ -19,7 +19,6 @@ m.selectedMovieOfficialRating = m.top.findNode("selectedMovieOfficialRating") m.movieLogo = m.top.findNode("movieLogo") m.swapAnimation = m.top.findNode("backroundSwapAnimation") - m.spinner = m.top.findNode("spinner") m.Alpha = m.top.findNode("AlphaMenu") m.AlphaSelected = m.top.findNode("AlphaSelected") m.micButton = m.top.findNode("micButton") @@ -85,8 +84,6 @@ 'set inital counts for overhang before content is loaded. m.loadItemsTask.totalRecordCount = 0 - m.spinner.visible = true - 'Get reset folder setting m.resetGrid = m.global.session.user.settings["itemgrid.reset"] @@ -119,7 +116,7 @@ 'Load initial set of Data sub loadInitialItems() m.loadItemsTask.control = "stop" - m.spinner.visible = true + startLoadingSpinner(false) if m.top.parentItem.json.Type = "CollectionFolder" m.top.HomeLibraryItem = m.top.parentItem.Id @@ -221,7 +218,6 @@ end if m.loadItemsTask.observeField("content", "ItemDataLoaded") - m.spinner.visible = true m.loadItemsTask.control = "RUN" m.getFiltersTask.observeField("filters", "FilterDataLoaded") @@ -438,7 +434,7 @@ m.genreList.setFocus(true) m.loading = false - m.spinner.visible = false + stopLoadingSpinner() ' Return focus to options menu if it was opened while library was loading if m.options.visible m.options.setFocus(true) @@ -488,7 +484,7 @@ m.emptyText.visible = true end if - m.spinner.visible = false + stopLoadingSpinner() ' Return focus to options menu if it was opened while library was loading if m.options.visible m.options.setFocus(true) @@ -693,7 +689,7 @@ ' 'Load next set of items sub loadMoreData() - m.spinner.visible = true + startLoadingSpinner(false) if m.Loading = true then return m.Loading = true m.loadItemsTask.startIndex = m.loadedItems @@ -738,7 +734,6 @@ m.loadItemsTask.searchTerm = "" m.VoiceBox.text = "" m.loadItemsTask.nameStartsWith = m.alpha.itemAlphaSelected - m.spinner.visible = true loadInitialItems() end if end sub @@ -753,7 +748,6 @@ m.loadItemsTask.NameStartsWith = " " m.loadItemsTask.searchTerm = m.voiceBox.text m.loadItemsTask.recursive = true - m.spinner.visible = true loadInitialItems() end if end sub @@ -926,7 +920,6 @@ end if if key = "replay" - m.spinner.visible = true m.loadItemsTask.searchTerm = "" m.loadItemsTask.nameStartsWith = "" m.voiceBox.text = "" diff --git a/docs/api/components_ItemGrid_MusicLibraryView.bs.html b/docs/api/components_ItemGrid_MusicLibraryView.bs.html index 19807283c..a6e2b2b2b 100644 --- a/docs/api/components_ItemGrid_MusicLibraryView.bs.html +++ b/docs/api/components_ItemGrid_MusicLibraryView.bs.html @@ -19,7 +19,6 @@ m.selectedArtistGenres = m.top.findNode("selectedArtistGenres") m.artistLogo = m.top.findNode("artistLogo") m.swapAnimation = m.top.findNode("backroundSwapAnimation") - m.spinner = m.top.findNode("spinner") m.Alpha = m.top.findNode("AlphaMenu") m.AlphaSelected = m.top.findNode("AlphaSelected") m.micButton = m.top.findNode("micButton") @@ -79,8 +78,6 @@ 'set inital counts for overhang before content is loaded. m.loadItemsTask.totalRecordCount = 0 - m.spinner.visible = true - 'Get reset folder setting m.resetGrid = m.global.session.user.settings["itemgrid.reset"] @@ -113,7 +110,7 @@ 'Load initial set of Data sub loadInitialItems() m.loadItemsTask.control = "stop" - m.spinner.visible = true + startLoadingSpinner() if LCase(m.top.parentItem.json.Type) = "collectionfolder" m.top.HomeLibraryItem = m.top.parentItem.Id @@ -206,7 +203,6 @@ end if m.loadItemsTask.observeField("content", "ItemDataLoaded") - m.spinner.visible = true m.loadItemsTask.control = "RUN" SetUpOptions() end sub @@ -328,6 +324,7 @@ ' 'Handle loaded data, and add to Grid sub ItemDataLoaded(msg) + stopLoadingSpinner() m.top.alphaActive = false itemData = msg.GetData() m.loadItemsTask.unobserveField("content") @@ -353,7 +350,6 @@ m.loadedRows = m.loadedItems / m.genreList.numColumns m.loading = false - m.spinner.visible = false return end if @@ -376,8 +372,6 @@ m.emptyText.text = tr("NO_ITEMS").Replace("%1", m.top.parentItem.Type) m.emptyText.visible = true end if - - m.spinner.visible = false end sub ' @@ -558,7 +552,7 @@ ' 'Load next set of items sub loadMoreData() - m.spinner.visible = true + startLoadingSpinner(false) if m.Loading = true then return m.Loading = true m.loadItemsTask.startIndex = m.loadedItems @@ -614,7 +608,6 @@ m.loadItemsTask.searchTerm = "" m.VoiceBox.text = "" m.loadItemsTask.nameStartsWith = m.alpha.itemAlphaSelected - m.spinner.visible = true loadInitialItems() end if end sub @@ -629,7 +622,6 @@ m.loadItemsTask.NameStartsWith = " " m.loadItemsTask.searchTerm = m.voiceBox.text m.loadItemsTask.recursive = true - m.spinner.visible = true loadInitialItems() end if end sub @@ -789,7 +781,6 @@ end if if key = "replay" - m.spinner.visible = true m.loadItemsTask.searchTerm = "" m.loadItemsTask.nameStartsWith = "" m.voiceBox.text = "" diff --git a/docs/api/components_JFScene.bs.html b/docs/api/components_JFScene.bs.html index dbbe2fae9..f2c70bda5 100644 --- a/docs/api/components_JFScene.bs.html +++ b/docs/api/components_JFScene.bs.html @@ -5,6 +5,27 @@ sub init() m.top.backgroundColor = "#262626" '"#101010" m.top.backgroundURI = "" + m.spinner = m.top.findNode("spinner") +end sub + +' Triggered when the isLoading boolean component field is changed +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 diff --git a/docs/api/components_Spinner.bs.html b/docs/api/components_Spinner.bs.html index b08431a3d..468d57cdd 100644 --- a/docs/api/components_Spinner.bs.html +++ b/docs/api/components_Spinner.bs.html @@ -4,6 +4,6 @@ m.top.poster.uri = "pkg:/images/spinner.png" m.top.control = "start" m.top.clockwise = true - m.top.spinInterval = 3 + m.top.spinInterval = 1 end sub