diff --git a/1080i/DialogConfirm.xml b/1080i/DialogConfirm.xml index 35f3b33..1c7b989 100644 --- a/1080i/DialogConfirm.xml +++ b/1080i/DialogConfirm.xml @@ -17,7 +17,7 @@ 8-col-gutter 2-row true - menuTitle + dialogTitle textActive diff --git a/1080i/DialogSelect.xml b/1080i/DialogSelect.xml index e7a5132..8f4529c 100644 --- a/1080i/DialogSelect.xml +++ b/1080i/DialogSelect.xml @@ -150,13 +150,12 @@ - 0 73 12-col - 18-row + 19-row 9999 diff --git a/1080i/Home.xml b/1080i/Home.xml index 4b9eac0..9c22119 100644 --- a/1080i/Home.xml +++ b/1080i/Home.xml @@ -2,7 +2,7 @@ 9000 fadeInOut - RunScript(script.skinshortcuts,type=buildxml&mainmenuID=9001&group=mainmenu|videosubmenu|musicsubmenu|picturessubmenu) + RunScript(script.skinshortcuts,type=buildxml&mainmenuID=9001&group=mainmenu|videosubmenu|musicsubmenu|picturessubmenu|gamesubmenu) PlayerControl(stop) AlarmClock(hidemenu,setfocus(9999),00:20,true) diff --git a/1080i/Includes_hubMenu.xml b/1080i/Includes_hubMenu.xml index d8dc4c0..0cd0faa 100644 --- a/1080i/Includes_hubMenu.xml +++ b/1080i/Includes_hubMenu.xml @@ -105,7 +105,7 @@ - skinshortcuts-group-picturessubmenu + skinshortcuts-group-gamesubmenu skinshortcuts-group-picturessubmenu skinshortcuts-group-musicsubmenu skinshortcuts-group-videosubmenu diff --git a/1080i/Includes_hubOptionsItems.xml b/1080i/Includes_hubOptionsItems.xml index 3f23b77..4a49f16 100644 --- a/1080i/Includes_hubOptionsItems.xml +++ b/1080i/Includes_hubOptionsItems.xml @@ -147,7 +147,6 @@ dialog.close(1104) UpdateLibrary(music) - Shuffle @@ -158,7 +157,6 @@ PlayerControl(randomOn) PlayerControl(randomOff) - @@ -216,4 +214,27 @@ sendclick(addonbrowser,9) + + + + !String.IsEmpty(Container.SortMethod) + Sort by + colors/white.png + textActive + 6-col + + sendclick(games,3) + + + !String.IsEmpty(Container.SortMethod) + Sort direction + colors/white.png + colors/white.png + textActive + + 31110 + 6-col + sendclick(games,4) + + \ No newline at end of file diff --git a/1080i/SkinSettings.xml b/1080i/SkinSettings.xml index d7b7cce..8cce2a4 100644 --- a/1080i/SkinSettings.xml +++ b/1080i/SkinSettings.xml @@ -1,7 +1,7 @@ 8000 - RunScript(script.skinshortcuts,type=buildxml&mainmenuID=9001&group=mainmenu|videosubmenu|musicsubmenu|picturessubmenu) + RunScript(script.skinshortcuts,type=buildxml&mainmenuID=9001&group=mainmenu|videosubmenu|musicsubmenu|picturessubmenu|gamesubmenu) globalBackground @@ -95,15 +95,12 @@ - - - @@ -220,7 +217,14 @@ RunScript(script.skinshortcuts,type=manage&group=picturessubmenu) - + + Container(8000).Hasfocus(2) + Edit games menu + 14-col + + RunScript(script.skinshortcuts,type=manage&group=gamesubmenu) + + Container(8000).Hasfocus(1) Extended Fanart 14-col diff --git a/1080i/VideoOSD.xml b/1080i/VideoOSD.xml index 4f6475f..5173564 100644 --- a/1080i/VideoOSD.xml +++ b/1080i/VideoOSD.xml @@ -1,383 +1,184 @@ 8001 - Control.SetFocus(8001,3) + Control.SetFocus(8001) - - col-1-begin - row-1-begin - 12-col - pageTitle - - textActive - - - col-1-begin - 96 - 12-col - pageSubTitle - - textActive - - - 1176 - 0 - - - - - - - + + col-1-begin + row-21-begin + - + - - - 0 + + + + + + + + + + -96 0 - 12-col - fullscreenHeight + fullscreenWidth + 2-row + colors/black.png + aa111111 + stretch + + + -96 + 2-row + fullscreenWidth + 143 + colors/black.png + aa111111 + stretch + + + -96 + 6-row + fullscreenWidth + 2-row colors/black.png cc111111 stretch - - -6 + + 0 0 - 6 - fullscreenHeight - colors/white.png - highlight - stretch - - - 36 - row-1-begin - - 0 - 0 - vertical - 24 - - 8-col - left - 1-row - center - itemTitle - textActive - - - - 8-col - left - 3-row - center - largeTitle - highlight - true - - - - - - Progress Bar - 150 - 212 - 312 - 12 - colors/white.png - colors/white.png - Player.Progress - - - 0 - 5-row - 8-col - 2-row - pageSubTitle - center - textActive - - false - - - col-1-begin - 5-row - 8-col - 2-row - pageSubTitle - right - center - textActive - - false - - - - 0 - 8-row - textbox - 624 - left - textActive - 348 - - false - - 61 - - - 60r - 9-row - 7-row - 8001 - - - - - 36 - row-20-begin - 10-col + left + 19-col 2-row - 0 - Control.SetFocus(8002,0) - Control.SetFocus(61) - horizontal - - - 0 - 0 - 1-col - 2-row - stretch - colors/black.png - overlay - - - 0 - 0 - 1-col - 2-row - center - center - symbolLarge - textActive - - - - - - 0 - 0 - 1-col - 2-row - stretch - colors/white.png - highlight - - - 0 - 0 - 1-col - 2-row - center - center - symbolLarge - textActive - - - - - - - Previous - - - PlayerControl(previous) - - - Rewind - - - PlayerControl(rewind) - - - Stop - - - PlayerControl(stop) - - - Player.Playing | player.forwarding | player.rewinding - Play/Pause - - - PlayerControl(play) - - - Player.Paused - Pause - - - PlayerControl(play) - - - Fast forward - - - PlayerControl(forward) - - - Next Chapter - - - PlayerControl(next) - - - System.GetBool(pvrmanager.enabled) + PVR.CanRecordPlayingChannel - - - PVR.ToggleRecordPlayingChannel - - + dialogTitle + textActive + - - - 24 - row-23-begin - 9-col - 12-row - 0 - 8001 - - - 0 - 0 - 1-col - 2-row - center - center - symbolLarge - textActive - - - - 1-col-indent - 0 - 224 - 2-row - center - itemSubTitle - textActive - - - - - - 0 - 0 - 1-col - 2-row - stretch - colors/white.png - highlight - - - 1-col - 0 - 252 - 2-row - stretch - colors/white.png - eeffffff - - - 0 - 0 - 1-col - 2-row - center - center - symbolLarge - textActive - - - - - 1-col-indent - 0 - 224 - 2-row - center - itemSubTitle - black - - - - - - VideoPlayer.HasMenu - - - - PlayerControl(ShowVideoMenu) - - - Download subtitles - - - - ActivateWindow(SubtitleSearch) - - - Enable Subtitles - VideoPlayer.HasSubtitles + !VideoPlayer.SubtitlesEnabled - - - - ShowSubtitles - - - Disable Subtitles - VideoPlayer.HasSubtitles + VideoPlayer.SubtitlesEnabled - - - - ShowSubtitles - - - Adjust subtitle offset - VideoPlayer.HasSubtitles + VideoPlayer.SubtitlesEnabled - - - - SubtitleDelay - - - Video Settings - - - - ActivateWindow(osdvideosettings) - - - Audio Settings - - - - ActivateWindow(osdaudiosettings) - - - Bookmarks - - - - ActivateWindow(videobookmarks) - - + + 24-col + -3 + 8-col + 2-row + itemTitle + right + center + textActive + + false + + + 0 + 2-row + textbox + 1706 + left + textActive + 120 + + false + + + + 0 + 6-row + horizontal + 12 + 8001 + + VideoPlayer.HasMenu + DVD Menu + colors/white.png + textActive + itemSubtitle + auto + + PlayerControl(ShowVideoMenu) + + + PVR.CanRecordPlayingChannel + Record + colors/white.png + textActive + itemSubtitle + auto + + PVR.ToggleRecordPlayingChannel + + + Download subtitles + colors/white.png + textActive + auto + itemSubtitle + + ActivateWindow(SubtitleSearch) + + + Enable Subtitles + VideoPlayer.HasSubtitles + !VideoPlayer.SubtitlesEnabled + colors/white.png + textActive + itemSubtitle + auto + + ShowSubtitles + + + Disable Subtitles + VideoPlayer.HasSubtitles + VideoPlayer.SubtitlesEnabled + colors/white.png + textActive + itemSubtitle + auto + + ShowSubtitles + + + Adjust subtitle offset + VideoPlayer.HasSubtitles + VideoPlayer.SubtitlesEnabled + colors/white.png + textActive + itemSubtitle + auto + + SubtitleDelay + + + Video Settings + colors/white.png + textActive + itemSubtitle + auto + + ActivateWindow(osdvideosettings) + + + Audio Settings + colors/white.png + textActive + itemSubtitle + auto + + ActivateWindow(osdaudiosettings) + + + Bookmarks + colors/white.png + textActive + itemSubtitle + auto + + ActivateWindow(videobookmarks) + + + + + + + pageHeader DebugGrid diff --git a/1080i/custom_contextMenu.xml b/1080i/custom_contextMenu.xml index 79229a1..01421da 100644 --- a/1080i/custom_contextMenu.xml +++ b/1080i/custom_contextMenu.xml @@ -30,6 +30,7 @@ musicSideMenu picturesSideMenu addonsSideMenu + gameSideMenu diff --git a/1080i/custom_musicPlayerFullscreen.xml b/1080i/custom_musicPlayerFullscreen.xml index a75d964..744feda 100644 --- a/1080i/custom_musicPlayerFullscreen.xml +++ b/1080i/custom_musicPlayerFullscreen.xml @@ -42,13 +42,15 @@ - col-1-begin row-23-begin + + + 0 diff --git a/1080i/custom_musicPlayerOptions.xml b/1080i/custom_musicPlayerOptions.xml index 403e3f9..d2ef33e 100644 --- a/1080i/custom_musicPlayerOptions.xml +++ b/1080i/custom_musicPlayerOptions.xml @@ -18,24 +18,6 @@ modalDialogInOut col-10-begin row-7-begin - - 0 - 0 - 6-col - 69 - stretch - colors/white.png - highlight - - - 0 - 2-row - 6-col - 16-row - stretch - colors/black.png - overlay - 0 @@ -54,7 +36,7 @@ 2-row center center - symbolLarge + symbol textActive @@ -75,8 +57,8 @@ 2-row center center - symbolLarge - highlight + symbol + black diff --git a/1080i/script-skinshortcuts.xml b/1080i/script-skinshortcuts.xml index 036cae4..298d1cc 100644 --- a/1080i/script-skinshortcuts.xml +++ b/1080i/script-skinshortcuts.xml @@ -1,7 +1,7 @@ 211 - RunScript(script.skinshortcuts,type=buildxml&mainmenuID=9001&group=mainmenu|videosubmenu|musicsubmenu|picturessubmenu) + RunScript(script.skinshortcuts,type=buildxml&mainmenuID=9001&group=mainmenu|videosubmenu|musicsubmenu|picturessubmenu|gamesubmenu) control.setfocus(9000) @@ -58,49 +58,42 @@ Add a new shortcut 211 5-col-gutter - Delete shortcut 211 5-col-gutter - Move shortcut up 211 5-col-gutter - Move shortcut down 211 5-col-gutter - Change shortcut label 211 5-col-gutter - Change shortcut action 211 5-col-gutter - Reset shortcuts 211 5-col-gutter - diff --git a/changelog.txt b/changelog.txt index d4a0028..b911fd2 100644 --- a/changelog.txt +++ b/changelog.txt @@ -20,11 +20,15 @@ - [COMPLETE] Player.recording checked - [COMPLETE] PVR.time/duration/progress checked - [COMPLETE] Games settings +- [COMPLETE] New shortcuts menu for games [complete up to DialogPVRGroupManager.xml section] -- new window: MyGames.xml -- new menu needs building for games section +- check controls for new window: MyGames.xml + +- Screenshots etc need updating + +- global search needs updating - new dialog: GameOSD.xml diff --git a/extras/backgrounds/videos.jpg b/extras/backgrounds/videos.jpg deleted file mode 100644 index f5839c3..0000000 Binary files a/extras/backgrounds/videos.jpg and /dev/null differ diff --git a/extras/homeBackgrounds/alex-jodoin-246078.jpg b/extras/homeBackgrounds/alex-jodoin-246078.jpg new file mode 100644 index 0000000..44355c7 Binary files /dev/null and b/extras/homeBackgrounds/alex-jodoin-246078.jpg differ diff --git a/extras/homeBackgrounds/andre-benz-248744.jpg b/extras/homeBackgrounds/andre-benz-248744.jpg new file mode 100644 index 0000000..cfac031 Binary files /dev/null and b/extras/homeBackgrounds/andre-benz-248744.jpg differ diff --git a/extras/homeBackgrounds/annie-spratt-51434.jpg b/extras/homeBackgrounds/annie-spratt-51434.jpg new file mode 100644 index 0000000..cc68d1f Binary files /dev/null and b/extras/homeBackgrounds/annie-spratt-51434.jpg differ diff --git a/extras/homeBackgrounds/buzz-andersen-145254.jpg b/extras/homeBackgrounds/buzz-andersen-145254.jpg new file mode 100644 index 0000000..da22030 Binary files /dev/null and b/extras/homeBackgrounds/buzz-andersen-145254.jpg differ diff --git a/extras/homeBackgrounds/caleb-george-67724.jpg b/extras/homeBackgrounds/caleb-george-67724.jpg new file mode 100644 index 0000000..407ce22 Binary files /dev/null and b/extras/homeBackgrounds/caleb-george-67724.jpg differ diff --git a/extras/homeBackgrounds/denys-nevozhai-351730.jpg b/extras/homeBackgrounds/denys-nevozhai-351730.jpg new file mode 100644 index 0000000..3915426 Binary files /dev/null and b/extras/homeBackgrounds/denys-nevozhai-351730.jpg differ diff --git a/extras/homeBackgrounds/ian-dooley-407846.jpg b/extras/homeBackgrounds/ian-dooley-407846.jpg new file mode 100644 index 0000000..14a3299 Binary files /dev/null and b/extras/homeBackgrounds/ian-dooley-407846.jpg differ diff --git a/extras/homeBackgrounds/jakub-sejkora-42069.jpg b/extras/homeBackgrounds/jakub-sejkora-42069.jpg new file mode 100644 index 0000000..af7655a Binary files /dev/null and b/extras/homeBackgrounds/jakub-sejkora-42069.jpg differ diff --git a/extras/homeBackgrounds/josh-matus-35477.jpg b/extras/homeBackgrounds/josh-matus-35477.jpg new file mode 100644 index 0000000..730286b Binary files /dev/null and b/extras/homeBackgrounds/josh-matus-35477.jpg differ diff --git a/extras/homeBackgrounds/kelly-sikkema-108975.jpg b/extras/homeBackgrounds/kelly-sikkema-108975.jpg deleted file mode 100644 index 145978f..0000000 Binary files a/extras/homeBackgrounds/kelly-sikkema-108975.jpg and /dev/null differ diff --git a/extras/homeBackgrounds/lily-lvnatikk-267356.jpg b/extras/homeBackgrounds/lily-lvnatikk-267356.jpg new file mode 100644 index 0000000..8df6575 Binary files /dev/null and b/extras/homeBackgrounds/lily-lvnatikk-267356.jpg differ diff --git a/extras/homeBackgrounds/spacex-81773.jpg b/extras/homeBackgrounds/spacex-81773.jpg new file mode 100644 index 0000000..ec986f8 Binary files /dev/null and b/extras/homeBackgrounds/spacex-81773.jpg differ diff --git a/language/English/strings.po b/language/English/strings.po index bfaa6f3..0aab29a 100644 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -956,3 +956,11 @@ msgstr "" msgctxt "#31232" msgid "Games" msgstr "" + +msgctxt "#31233" +msgid "Edit game section menu" +msgstr "" + +msgctxt "#31234" +msgid "Game Addons" +msgstr "" diff --git a/shortcuts/gamesubmenu.DATA.xml b/shortcuts/gamesubmenu.DATA.xml new file mode 100644 index 0000000..821e23f --- /dev/null +++ b/shortcuts/gamesubmenu.DATA.xml @@ -0,0 +1,17 @@ + + + + + 32020 + DefaultAddonPicture.png + + ActivateWindow(Games,files) + + + + 32020 + DefaultAddonPicture.png + + ActivateWindow(Games,Addons,return) + + \ No newline at end of file