From fd7e1b3077981fb520ce6b3b4fd5ce407151d071 Mon Sep 17 00:00:00 2001 From: Chris Bevan Date: Fri, 27 Mar 2015 20:31:13 +0000 Subject: [PATCH] roughs --- 1080i/AddonBrowser.xml | 73 +- 1080i/Defaults.xml | 118 +- 1080i/DialogAddonInfo.xml | 32 +- 1080i/DialogAddonSettings.xml | 26 +- 1080i/DialogAlbumInfo.xml | 138 +- 1080i/DialogBusy.xml | 2 +- 1080i/DialogButtonMenu.xml | 30 +- 1080i/DialogContentSettings.xml | 66 +- 1080i/DialogContextMenu.xml | 4 +- 1080i/DialogExtendedProgressBar.xml | 46 +- 1080i/DialogFavourites.xml | 20 +- 1080i/DialogFileStacking.xml | 19 +- 1080i/DialogFullScreenInfo.xml | 6 +- 1080i/DialogKaiToast.xml | 47 +- 1080i/DialogKaraokeSongSelector.xml | 2 +- 1080i/DialogKaraokeSongSelectorLarge.xml | 2 +- 1080i/DialogKeyboard.xml | 256 +- 1080i/DialogMediaFilter.xml | 18 +- 1080i/DialogMediaSource.xml | 30 +- 1080i/DialogMuteBug.xml | 26 +- 1080i/DialogNetworkSetup.xml | 94 +- 1080i/DialogNumeric.xml | 54 +- 1080i/DialogOk.xml | 15 +- 1080i/DialogPVRChannelManager.xml | 46 +- 1080i/DialogPVRChannelsOSD.xml | 208 +- 1080i/DialogPVRGroupManager.xml | 24 +- 1080i/DialogPVRGuideInfo.xml | 21 +- 1080i/DialogPVRGuideOSD.xml | 2 +- 1080i/DialogPVRGuideSearch.xml | 44 +- 1080i/DialogPVRRecordingInfo.xml | 23 +- 1080i/DialogPVRTimerSettings.xml | 24 +- 1080i/DialogPeripheralManager.xml | 212 +- 1080i/DialogPeripheralSettings.xml | 93 +- 1080i/DialogPictureInfo.xml | 25 +- 1080i/DialogProgress.xml | 44 +- 1080i/DialogSeekBar.xml | 78 +- 1080i/DialogSelect.xml | 388 +-- 1080i/DialogSlider.xml | 32 +- 1080i/DialogSongInfo.xml | 304 +- 1080i/DialogSubtitles.xml | 66 +- 1080i/DialogTextViewer.xml | 2 +- 1080i/DialogVideoInfo.xml | 199 +- 1080i/DialogVolumeBar.xml | 13 +- 1080i/DialogYesNo.xml | 116 +- 1080i/FileBrowser.xml | 29 +- 1080i/FileManager.xml | 10 +- 1080i/Font.xml | 120 +- 1080i/Home.xml | 271 +- 1080i/Includes.xml | 210 +- 1080i/Includes_animations.xml | 111 +- 1080i/Includes_grid.xml | 140 +- 1080i/Includes_hubMenu.xml | 106 + 1080i/Includes_hubMenuItems.xml | 365 ++ 1080i/Includes_hubMenuSubItems.xml | 355 ++ 1080i/Includes_menuItems.xml | 390 --- 1080i/Includes_recentItems.xml | 274 ++ 1080i/Includes_sidebarItems.xml | 474 --- 1080i/Includes_variables.xml | 222 +- 1080i/LockSettings.xml | 38 +- 1080i/LoginScreen.xml | 12 +- 1080i/MusicKaraokeLyrics.xml | 2 +- 1080i/MusicOSD.xml | 12 +- 1080i/MusicOverlay.xml | 15 +- 1080i/MusicVisualisation.xml | 8 +- 1080i/MyMusicNav.xml | 126 +- 1080i/MyMusicPlaylist.xml | 94 +- 1080i/MyMusicPlaylistEditor.xml | 26 +- 1080i/MyMusicSongs.xml | 58 +- 1080i/MyPVR.xml | 149 - 1080i/MyPVRChannels.xml | 288 -- 1080i/MyPVRGuide.xml | 378 +-- 1080i/MyPVRRecordings.xml | 386 +-- 1080i/MyPVRSearch.xml | 0 1080i/MyPVRTimers.xml | 238 ++ 1080i/MyPics.xml | 55 +- 1080i/MyPrograms.xml | 10 +- 1080i/MyVideoNav.xml | 707 +--- 1080i/MyVideoPlaylist.xml | 44 +- 1080i/MyWeather.xml | 46 +- 1080i/PlayerControls.xml | 2 +- 1080i/Pointer.xml | 2 +- 1080i/ProfileSettings.xml | 44 +- 1080i/Settings.xml | 135 +- 1080i/SettingsCategory.xml | 103 +- 1080i/SettingsProfile.xml | 10 +- 1080i/SettingsScreenCalibration.xml | 2 +- 1080i/SettingsSystemInfo.xml | 44 +- 1080i/SkinSettings.xml | 329 +- 1080i/SlideShow.xml | 12 +- 1080i/SmartPlaylistEditor.xml | 34 +- 1080i/SmartPlaylistRule.xml | 12 +- 1080i/Startup.xml | 9 +- 1080i/VideoFullScreen.xml | 18 +- 1080i/VideoOSD.xml | 722 ++-- 1080i/VideoOSDBookmarks.xml | 16 +- 1080i/VideoOSDSettings.xml | 28 +- 1080i/VideoOverlay.xml | 4 +- 1080i/View_Addons.xml | 81 + 1080i/View_Episodes.xml | 277 ++ 1080i/View_LiveTVChannels.xml | 241 ++ 1080i/View_Movies.xml | 92 + 1080i/View_Seasons.xml | 94 + 1080i/View_TVShows.xml | 158 + 1080i/ViewsDialogs.xml | 6 +- 1080i/ViewsMusic.xml | 546 ++- 1080i/ViewsPVR.xml | 275 -- 1080i/ViewsPictures.xml | 37 +- 1080i/ViewsVideos.xml | 808 ----- 1080i/VisualisationPresetList.xml | 28 +- 1080i/custom_menuItemTypeSelector.xml | 175 +- 1080i/custom_musicFullscreenDisabler.xml | 7 + 1080i/custom_musicFullscreenEnabler.xml | 7 + 1080i/custom_musicPlayerFullscreen.xml | 935 +++-- 1080i/custom_recentItemTypeSelector.xml | 143 + 1080i/custom_subtitleMenu.xml | 174 +- 1080i/script-RCB-contextmenu.xml | 321 +- 1080i/script-RCB-editromcollection.xml | 3183 +++++++++--------- 1080i/script-RCB-editscraper.xml | 666 ++-- 1080i/script-RCB-gameinfo.xml | 137 +- 1080i/script-RCB-importoptions.xml | 1210 ++++--- 1080i/script-RCB-missinginfo.xml | 1033 +++--- 1080i/script-RCB-removeRC.xml | 680 ++-- 1080i/script-Rom_Collection_Browser-main.xml | 1242 ++++--- 1080i/script-globalsearch-contextmenu.xml | 2 +- 1080i/script-globalsearch-infodialog.xml | 78 +- 1080i/script-globalsearch-main.xml | 130 +- LICENSE.txt | 3 + README.md | 14 +- addon.xml | 30 +- changelog.txt | 76 +- colors/defaults.xml | 23 +- extras/backgrounds/background001.jpg | Bin 658397 -> 1055527 bytes extras/backgrounds/background005.jpg | Bin 0 -> 658397 bytes extras/backgrounds/background006.jpg | Bin 0 -> 81821 bytes icon.png | Bin 8607 -> 7778 bytes language/Czech/strings.po | 28 +- language/English/strings.po | 94 +- language/French/strings.po | 194 +- language/German/strings.po | 30 +- language/Hebrew/strings.po | 616 ++++ language/Italian/strings.po | 626 ++++ language/Norwegian/strings.po | 92 +- language/Polish/strings.po | 30 +- media/UIControls/busy.png | Bin 8895 -> 0 bytes media/UIControls/radio-button-fo.png | Bin 1256 -> 1165 bytes media/UIControls/radio-button-nf.png | Bin 1220 -> 3027 bytes media/backgrounds/vignette.png | Bin 107759 -> 0 bytes media/colors/selected.png | Bin 931 -> 0 bytes media/colors/{offwhite.png => white.png} | Bin 931 -> 931 bytes media/debuggrid1080.png | Bin 11532 -> 11234 bytes 150 files changed, 12842 insertions(+), 12163 deletions(-) create mode 100644 1080i/Includes_hubMenu.xml create mode 100644 1080i/Includes_hubMenuItems.xml create mode 100644 1080i/Includes_hubMenuSubItems.xml delete mode 100644 1080i/Includes_menuItems.xml create mode 100644 1080i/Includes_recentItems.xml delete mode 100644 1080i/Includes_sidebarItems.xml delete mode 100644 1080i/MyPVR.xml delete mode 100644 1080i/MyPVRChannels.xml delete mode 100644 1080i/MyPVRSearch.xml create mode 100644 1080i/View_Addons.xml create mode 100644 1080i/View_Episodes.xml create mode 100644 1080i/View_LiveTVChannels.xml create mode 100644 1080i/View_Movies.xml create mode 100644 1080i/View_Seasons.xml create mode 100644 1080i/View_TVShows.xml delete mode 100644 1080i/ViewsPVR.xml delete mode 100644 1080i/ViewsVideos.xml create mode 100644 1080i/custom_musicFullscreenDisabler.xml create mode 100644 1080i/custom_musicFullscreenEnabler.xml create mode 100644 1080i/custom_recentItemTypeSelector.xml create mode 100644 extras/backgrounds/background005.jpg create mode 100644 extras/backgrounds/background006.jpg create mode 100644 language/Hebrew/strings.po create mode 100644 language/Italian/strings.po delete mode 100644 media/UIControls/busy.png delete mode 100644 media/backgrounds/vignette.png delete mode 100644 media/colors/selected.png rename media/colors/{offwhite.png => white.png} (55%) diff --git a/1080i/AddonBrowser.xml b/1080i/AddonBrowser.xml index ab2bc5f..09f45ae 100644 --- a/1080i/AddonBrowser.xml +++ b/1080i/AddonBrowser.xml @@ -22,7 +22,7 @@ 44 fullscreenWidth 1-row - colors/selected.png + colors/white.png ffffffff stretch @@ -39,21 +39,60 @@ 12 44 16-col - pageTitle - + dialogTitle + black - - - 10-col - 46 - horizontal - - center + + 5-col-gutter + 44 + 20-col + horizontal + center - 54 - 8-col - pageTitle + 57 + 4-col + smallStrong + + black + selected + colors/black.png + 12 + -6 + 9999 + + + center + 57 + 4-col + smallStrong + + black + selected + colors/black.png + 12 + -6 + 9999 + + + center + 57 + 5-col + smallStrong + + black + selected + colors/black.png + 12 + -6 + 9999 + + + center + 57 + 5-col + smallStrong black selected @@ -65,15 +104,15 @@ - 5 - 0 + 6 + 0 -50 viewDialogList - Control.IsVisible(60) - conditional + Control.IsVisible(60) + conditional col-22-begin 126 @@ -89,4 +128,4 @@ - \ No newline at end of file + diff --git a/1080i/Defaults.xml b/1080i/Defaults.xml index cae6d36..00d4eaf 100644 --- a/1080i/Defaults.xml +++ b/1080i/Defaults.xml @@ -9,30 +9,30 @@ center 0 regular - selected + textActive selected selected - disabled - 44000000 + textDisabled + - regular - selected + textActive 0 0 - 1-row + 57 left center regular - selected + textActive 0 selected - selected - disabled + textActive + textDisabled false 2000 @@ -48,16 +48,18 @@ 0 0 - 4-col - 1-row - small - center left - 0 + center + 2-row + 4-col + buttonTitle + textActive black - unselected - disabled - disabled + colors/white.png + colors/offblack.png + 24 + textDisabled + disabled false @@ -74,7 +76,7 @@ itemTitle unselected selected - disabled + textDisabled false ffFFFFFF @@ -82,22 +84,22 @@ 0 0 - - 54 + 2-row left center - 12 + 24 0 - itemTitle + menuButton - selected + textActive black - disabled + textDisabled 64 64 - - - colors/selected.png - - + + + colors/white.png + colors/offblack.png UIControls/radio-button-fo.png UIControls/radio-button-nf.png false @@ -107,19 +109,19 @@ 0 0 - - 54 + 2-row left center - 12 - itemTitle + 24 + menuButton - selected + textActive black - disabled + textDisabled 30 30 - colors/selected.png - - + colors/white.png + colors/offblack.png UIControls/arrow-up-nf.png UIControls/arrow-down-nf.png UIControls/arrow-up-fo.png @@ -130,19 +132,19 @@ 0 0 - - 54 + 2-row left center - 12 - itemTitle + 24 + menuButton - selected + textActive black - disabled + textDisabled 36 36 - colors/selected.png - - + colors/white.png + colors/offblack.png UIControls/arrow-up-nf.png UIControls/arrow-down-nf.png UIControls/arrow-up-fo.png @@ -154,15 +156,15 @@ 0 0 - - 54 - itemTitle - 12 + 2-row + menuButton + 24 0 - selected + textActive black - disabled - - - colors/selected.png + textDisabled + colors/offblack.png + colors/white.png 0 0 - @@ -173,31 +175,31 @@ 12 - - colors/selected.png + colors/white.png - - 12 - colors/inactive.png + colors/inactive.png colors/black.png - colors/selected.png + colors/white.png false vertical - + 8-col - 1-row - itemTitle - selected + 2-row + mediumStrong + textActive 12 - 0 - center - center + 0 + center + center selected - colors/keyselected.png colors/offblack.png false - \ No newline at end of file + diff --git a/1080i/DialogAddonInfo.xml b/1080i/DialogAddonInfo.xml index 625d08c..612c79f 100644 --- a/1080i/DialogAddonInfo.xml +++ b/1080i/DialogAddonInfo.xml @@ -24,12 +24,10 @@ scale - - - isEmpty(ListItem.art(fanart)) - globalBackground - - + + isEmpty(ListItem.art(fanart)) + globalBackground + col-3-begin @@ -41,7 +39,7 @@ 44 fullscreenWidth 1-row - colors/selected.png + colors/white.png ffffffff stretch @@ -58,7 +56,7 @@ 12 44 16-col - pageTitle + dialogTitle black - @@ -78,7 +76,7 @@ 0 3-row 10-col-gutter - dialogTitle + mediumStrong @@ -95,7 +93,7 @@ 10-col-gutter 340 - + @@ -124,16 +122,16 @@ 0 1-col symbol - selected + textActive - 1-col - 2 + -1 6-col menuTitle - selected + textActive - @@ -145,7 +143,7 @@ 6-col 53 stretch - colors/selected.png + colors/white.png 24 @@ -158,7 +156,7 @@ 1-col - 2 + -1 6-col menuTitle black @@ -245,7 +243,7 @@ Rollback button - + Launch addon @@ -256,4 +254,4 @@ - \ No newline at end of file + diff --git a/1080i/DialogAddonSettings.xml b/1080i/DialogAddonSettings.xml index 6899d75..a148827 100644 --- a/1080i/DialogAddonSettings.xml +++ b/1080i/DialogAddonSettings.xml @@ -29,7 +29,7 @@ 44 fullscreenWidth 1-row - colors/selected.png + colors/white.png ffffffff stretch @@ -46,7 +46,7 @@ 12 44 16-col - pageTitle + dialogTitle black - @@ -88,16 +88,16 @@ 0 1-col symbol - selected + textActive - 1-col - 2 + -1 6-col menuTitle - selected + textActive - @@ -109,7 +109,7 @@ 6-col 53 stretch - colors/selected.png + colors/white.png 24 @@ -122,7 +122,7 @@ 1-col - 2 + -1 6-col menuTitle black @@ -160,9 +160,9 @@ top 54 menuTitle - selected + textActive black - colors/selected.png + colors/white.png 12 8 @@ -171,9 +171,9 @@ left 54 itemTitle - selected + textActive black - colors/selected.png + colors/white.png 12 @@ -187,7 +187,7 @@ Default Separator - 1 + 1 1 colors/black.png ffffffff @@ -217,4 +217,4 @@ - \ No newline at end of file + diff --git a/1080i/DialogAlbumInfo.xml b/1080i/DialogAlbumInfo.xml index fcd8bf7..e182ce0 100644 --- a/1080i/DialogAlbumInfo.xml +++ b/1080i/DialogAlbumInfo.xml @@ -18,25 +18,25 @@ - !container.content(albums) + !container.content(albums) 0 0 dimensionsFullscreen stretch $INFO[Listitem.art(fanart)] - kenBurnsey + kenBurnsey - + - container.content(albums) + container.content(albums) col-3-begin 2-row 12-col - 12-col + 12-col stretch $INFO[Listitem.thumb] - windowOpen - windowClose + windowOpen + windowClose @@ -53,10 +53,10 @@ container.content(artists) 1359 row-2-begin - - - - + + + + -12 @@ -67,16 +67,16 @@ ccffffff stretch - + -12 -95 573 198 - colors/selected.png + colors/white.png ffffffff stretch - + -12 838 573 @@ -86,7 +86,7 @@ stretch - + 0 0 8-col-gutter @@ -94,31 +94,30 @@ pageTitle black - true - - + - - - 0 - 42 - 8-col-gutter - left - itemTitleSmall - black - - - - - + + 0 + 42 + 8-col-gutter + left + itemSubTitle + black + + - + + 0 132 textboxExtraLeading 8-col-gutter left - selected + textActive 528 - - - + + - @@ -136,14 +135,14 @@ 55 stretch colors/black.png - cc000000 + cc000000 24 0 1-col symbol - selected + textActive - @@ -152,7 +151,7 @@ 2 184 menuTitle - selected + textActive - @@ -164,7 +163,7 @@ 285 55 stretch - colors/selected.png + colors/white.png 24 @@ -204,10 +203,10 @@ - SendClick(12) - - - - + + @@ -218,10 +217,10 @@ container.content(albums) + !container.content(artists) 1359 row-2-begin - - - - + + + + -12 @@ -232,16 +231,16 @@ ccffffff stretch - + -12 -95 573 198 - colors/selected.png + colors/white.png ffffffff stretch - + -12 838 573 @@ -254,40 +253,41 @@ 0 0 - + 0 0 8-col-gutter left pageTitle black - - true - - + + + + - 0 42 8-col-gutter left - itemTitleSmall + itemSubTitle black - - - + + - 0 - 2-row - small + 132 + textboxExtraLeading 8-col-gutter left - selected + textActive 528 - - - - - + + + - + @@ -305,14 +305,14 @@ 55 stretch colors/black.png - cc000000 + cc000000 24 0 1-col symbol - selected + textActive - @@ -321,7 +321,7 @@ 2 184 menuTitle - selected + textActive - @@ -333,7 +333,7 @@ 285 55 stretch - colors/selected.png + colors/white.png 24 @@ -373,10 +373,10 @@ - SendClick(12) - - - - + + @@ -405,4 +405,4 @@ - \ No newline at end of file + diff --git a/1080i/DialogBusy.xml b/1080i/DialogBusy.xml index dc9e29e..9aa8bfe 100644 --- a/1080i/DialogBusy.xml +++ b/1080i/DialogBusy.xml @@ -11,4 +11,4 @@ loadingIndicator DebugGrid - \ No newline at end of file + diff --git a/1080i/DialogButtonMenu.xml b/1080i/DialogButtonMenu.xml index bb5e37b..1f43a6f 100644 --- a/1080i/DialogButtonMenu.xml +++ b/1080i/DialogButtonMenu.xml @@ -13,7 +13,7 @@ modalDialogInOutVertical -15 - 0 + 0 6-col 6-row 0 @@ -22,20 +22,20 @@ 15 0 6-col - left + left itemTitle unselected - + -1 0 6-col - left + left itemTitle - selected + textActive @@ -46,9 +46,9 @@ - xbmc.powerdown() - + Exit to desktop - Skin.HasSetting(exitFirst) + Skin.HasSetting(exitFirst) - XBMC.Quit() @@ -68,24 +68,24 @@ - - XBMC.Reset() + XBMC.Reboot() - + - System.HasLoginScreen | IntegerGreaterThan(System.ProfileCount,1) - System.Loggedon + System.HasLoginScreen | IntegerGreaterThan(System.ProfileCount,1) + System.Loggedon - System.LogOff - Dialog.Close(all,true) + Dialog.Close(all,true) Exit to desktop - !Skin.HasSetting(exitFirst) + !Skin.HasSetting(exitFirst) - XBMC.Quit() - + System.CanPowerDown + Skin.HasSetting(exitFirst) - @@ -101,4 +101,4 @@ - \ No newline at end of file + diff --git a/1080i/DialogContentSettings.xml b/1080i/DialogContentSettings.xml index 376c245..164bffa 100644 --- a/1080i/DialogContentSettings.xml +++ b/1080i/DialogContentSettings.xml @@ -1,6 +1,6 @@ - 3 + 20 yes @@ -21,7 +21,7 @@ 44 fullscreenWidth 1-row - colors/selected.png + colors/white.png ffffffff stretch @@ -34,12 +34,12 @@ ffffffff stretch - + header label 12 44 16-col - pageTitle + dialogTitle black - @@ -50,22 +50,22 @@ 0 2-row 12-col - 4 + 21 9001 - !control.hasfocus(3) + !control.hasfocus(20) Content type label unfocussed 12 2-row 12-col itemTitle - selected + textActive - - control.hasfocus(3) + control.hasfocus(20) Content type label focussed 12 2-row @@ -76,16 +76,16 @@ - - + 12 199 6-col - itemTitleSmallCondensed - selected + itemSubTitleCondensed + textActive - - + 12 256 12-col @@ -99,8 +99,8 @@ 256 12-col 4-row - 3 - 6 + 20 + 22 9001 @@ -110,9 +110,9 @@ 53 stretch colors/offblack.png - 99FFFFFF + 99FFFFFF - + 1 4 50 @@ -126,16 +126,16 @@ 10-col-gutter itemTitle - selected + textActive - - + ListItem.IsSelected 48r 1 40 symbol - selected + textActive - @@ -147,7 +147,7 @@ 12-col 53 stretch - colors/selected.png + colors/white.png 1 @@ -167,14 +167,14 @@ black - - + ListItem.IsSelected 48r 1 40 symbol black - black + black - @@ -190,12 +190,12 @@ 12-col 54 left - selected + textActive black - colors/selected.png + colors/white.png - 12 - 4 + 21 5 9001 @@ -207,7 +207,7 @@ 12-col 6-row 0 - 6 + 22 9001 vertical @@ -225,7 +225,7 @@ 5-row 0 vertical - 3 + 20 0 @@ -240,16 +240,16 @@ 0 1-col symbol - selected + textActive - 1-col - 2 + -1 3-col menuTitle - selected + textActive - @@ -261,7 +261,7 @@ 4-col 53 stretch - colors/selected.png + colors/white.png 24 @@ -274,7 +274,7 @@ 1-col - 2 + -1 3-col menuTitle black @@ -317,4 +317,4 @@ - \ No newline at end of file + diff --git a/1080i/DialogContextMenu.xml b/1080i/DialogContextMenu.xml index 19cae5e..5d47724 100644 --- a/1080i/DialogContextMenu.xml +++ b/1080i/DialogContextMenu.xml @@ -16,8 +16,8 @@ unselected selected itemTitle - 12 - UIControls/textButtonFO.png + 12 + UIControls/textButtonFO.png DebugGrid diff --git a/1080i/DialogExtendedProgressBar.xml b/1080i/DialogExtendedProgressBar.xml index c424cc2..f908487 100644 --- a/1080i/DialogExtendedProgressBar.xml +++ b/1080i/DialogExtendedProgressBar.xml @@ -1,65 +1,65 @@ + - !Window.IsActive(fullscreenvideo) col-19-begin - 83 + progressPosition1 + progressPosition2 - + 0 -12 8-col 102 - colors/selected.png + colors/white.png eeFFFFFF - + - - heading + + header label 24 -12 smallStrong 468 1-row - - true black + scrollSuppressionActive + scrollSuppressionInactive - - + - + message 24 - 30 - pageTitle + 22 + dialogTitle black 468 1-row - true - - + - - + - - - false - - heading label - + + DebugGrid + + 0 + DialogID + - \ No newline at end of file + diff --git a/1080i/DialogFavourites.xml b/1080i/DialogFavourites.xml index 50df22e..e445713 100644 --- a/1080i/DialogFavourites.xml +++ b/1080i/DialogFavourites.xml @@ -26,8 +26,8 @@ 0 8-col pageTitle - selected - + textActive + !IntegerGreaterThan(Container(450).NumItems,0) @@ -36,7 +36,7 @@ 8-col regular - selected + textActive 0 @@ -51,8 +51,8 @@ 230 scale $INFO[Listitem.icon] - colors/selected.png - 3 + colors/white.png + 3 ffFFFFFF @@ -60,7 +60,7 @@ 233 6-col-gutter itemTitle - selected + textActive @@ -72,8 +72,8 @@ 230 scale $INFO[Listitem.icon] - colors/selected.png - 3 + colors/white.png + 3 ffFFFFFF @@ -82,7 +82,7 @@ 6-col-gutter 1-row stretch - colors/selected.png + colors/white.png 0 ffFFFFFF @@ -105,4 +105,4 @@ - \ No newline at end of file + diff --git a/1080i/DialogFileStacking.xml b/1080i/DialogFileStacking.xml index 32bc18f..7b357c6 100644 --- a/1080i/DialogFileStacking.xml +++ b/1080i/DialogFileStacking.xml @@ -1,7 +1,7 @@ - 450 - yes + 450 + yes 0 @@ -23,7 +23,7 @@ 44 fullscreenWidth 1-row - colors/selected.png + colors/white.png ffffffff stretch @@ -40,13 +40,12 @@ 12 44 12-col - pageTitle + dialogTitle black - - + - - + 0 120 12-col @@ -79,7 +78,7 @@ 0 312 itemTitle - selected + textActive - @@ -115,6 +114,6 @@ - + - \ No newline at end of file + diff --git a/1080i/DialogFullScreenInfo.xml b/1080i/DialogFullScreenInfo.xml index e8e682b..1a3d002 100644 --- a/1080i/DialogFullScreenInfo.xml +++ b/1080i/DialogFullScreenInfo.xml @@ -1,6 +1,6 @@ - action(back) + action(back) activatewindow(videoosd) - - \ No newline at end of file + + diff --git a/1080i/DialogKaiToast.xml b/1080i/DialogKaiToast.xml index 4d826ae..aec74d6 100644 --- a/1080i/DialogKaiToast.xml +++ b/1080i/DialogKaiToast.xml @@ -1,69 +1,72 @@ yes - SetFocus(9000,0) + SetFocus(9000,0) - + col-19-begin - 83 - + progressPosition1 + progressPosition2 + - + 0 - -12 + 0 8-col - 102 - colors/selected.png + 3-row + colors/white.png eeFFFFFF - + heading 24 - -12 - smallStrong + 0 + itemSubTitle 468 1-row + center - true black - - + message 24 - 30 - pageTitle + 1-row + dialogTitle black 468 - 1-row + 2-row + center - true + scrollSuppressionActive + scrollSuppressionInactive - - + - - DebugGrid + + DebugGrid WindowID - + - \ No newline at end of file + diff --git a/1080i/DialogKaraokeSongSelector.xml b/1080i/DialogKaraokeSongSelector.xml index c830b08..d6f39ed 100644 --- a/1080i/DialogKaraokeSongSelector.xml +++ b/1080i/DialogKaraokeSongSelector.xml @@ -3,4 +3,4 @@ - \ No newline at end of file + diff --git a/1080i/DialogKaraokeSongSelectorLarge.xml b/1080i/DialogKaraokeSongSelectorLarge.xml index c830b08..d6f39ed 100644 --- a/1080i/DialogKaraokeSongSelectorLarge.xml +++ b/1080i/DialogKaraokeSongSelectorLarge.xml @@ -3,4 +3,4 @@ - \ No newline at end of file + diff --git a/1080i/DialogKeyboard.xml b/1080i/DialogKeyboard.xml index 3b828d9..04510b5 100644 --- a/1080i/DialogKeyboard.xml +++ b/1080i/DialogKeyboard.xml @@ -2,87 +2,103 @@ 300 yes - - 2 - - !Window.IsVisible(numericinput) - col-3-begin + 0 + row-12-begin Windowopen Windowclose - -240 - -24 + 0 + -36 fullscreenWidth - 15-row + 17-row colors/black.png - ccffffff + ddffffff col-1-begin row-1-begin - header label - 0 + header label + 0 -64 - 17-col-gutter + 24-col 1-row center - itemTitleSmall - selected - + itemTitle + textActive + Edit Text 0 -12 - 17-col + 24-col center - 300 - 309 + 300 + 309 - col-3-begin - 2-row + col-6-begin + 4-row - - Layout button + + Done -72 0 - 4-col + 136 1-col 111 + 500 + 312 + 302 + colors/keyunselected.png + colors/keyaccent.png + selected + textActive + center + buttonTitle + + + Cancel + 70 + 0 + 2-col + 1-col + + 300 100 312 302 colors/keyunselected.png colors/keyaccent.png selected - selected + textActive center buttonTitle + action(close) 222 0 1-col 1-col - 309 + 500 101 312 120 colors/keyselected.png colors/keyaccent.png selected - selected + textActive center @@ -97,7 +113,7 @@ colors/keyselected.png colors/keyaccent.png selected - selected + textActive center @@ -112,7 +128,7 @@ colors/keyselected.png colors/keyaccent.png selected - selected + textActive center @@ -127,7 +143,7 @@ colors/keyselected.png colors/keyaccent.png selected - selected + textActive center @@ -142,7 +158,7 @@ colors/keyselected.png colors/keyaccent.png selected - selected + textActive center @@ -157,7 +173,7 @@ colors/keyselected.png colors/keyaccent.png selected - selected + textActive center @@ -172,7 +188,7 @@ colors/keyselected.png colors/keyaccent.png selected - selected + textActive center @@ -187,7 +203,7 @@ colors/keyselected.png colors/keyaccent.png selected - selected + textActive center @@ -202,7 +218,7 @@ colors/keyselected.png colors/keyaccent.png selected - selected + textActive center @@ -217,10 +233,10 @@ colors/keyselected.png colors/keyaccent.png selected - selected + textActive center - + 1002 0 1-col @@ -232,25 +248,25 @@ colors/keyselected.png colors/keyaccent.png selected - selected + textActive center - + 1080 0 1-col 1-col 110 - 309 + 300 312 131 colors/keyselected.png colors/keyaccent.png selected - selected + textActive center - + 78 @@ -263,20 +279,20 @@ 131 120 - 309 + 300 303 colors/keyunselected.png colors/keyaccent.png - - - - - - - - + - + - + - + - 24 24 12 252 selected - selected + textActive center buttonTitle @@ -293,7 +309,7 @@ colors/keyaccent.png 0 selected - selected + textActive center @@ -309,7 +325,7 @@ colors/keyaccent.png 0 selected - selected + textActive center @@ -325,7 +341,7 @@ colors/keyaccent.png 0 selected - selected + textActive center @@ -341,7 +357,7 @@ colors/keyaccent.png 0 selected - selected + textActive center @@ -357,7 +373,7 @@ colors/keyaccent.png 0 selected - selected + textActive center @@ -373,7 +389,7 @@ colors/keyaccent.png 0 selected - selected + textActive center @@ -389,7 +405,7 @@ colors/keyaccent.png 0 selected - selected + textActive center @@ -405,7 +421,7 @@ colors/keyaccent.png 0 selected - selected + textActive center @@ -421,7 +437,7 @@ colors/keyaccent.png 0 selected - selected + textActive center @@ -437,10 +453,10 @@ colors/keyaccent.png 0 selected - selected + textActive center - + 1002 0 1-col @@ -453,10 +469,10 @@ colors/keyaccent.png 0 selected - selected + textActive center - + 1080 0 1-col @@ -469,7 +485,7 @@ colors/keyaccent.png 0 selected - selected + textActive center @@ -489,17 +505,17 @@ 304 colors/keyunselected.png colors/keyaccent.png - - - - - - - - + - + - + - + - 24 24 12 252 0 selected - selected + textActive center buttonTitle @@ -516,7 +532,7 @@ colors/keyaccent.png 0 selected - selected + textActive center @@ -532,7 +548,7 @@ colors/keyaccent.png 0 selected - selected + textActive center @@ -548,7 +564,7 @@ colors/keyaccent.png 0 selected - selected + textActive center @@ -564,7 +580,7 @@ colors/keyaccent.png 0 selected - selected + textActive center @@ -580,7 +596,7 @@ colors/keyaccent.png 0 selected - selected + textActive center @@ -596,7 +612,7 @@ colors/keyaccent.png 0 selected - selected + textActive center @@ -612,7 +628,7 @@ colors/keyaccent.png 0 selected - selected + textActive center @@ -628,7 +644,7 @@ colors/keyaccent.png 0 selected - selected + textActive center @@ -644,7 +660,7 @@ colors/keyaccent.png 0 selected - selected + textActive center @@ -660,10 +676,10 @@ colors/keyaccent.png 0 selected - selected + textActive center - + 1002 0 1-col @@ -676,10 +692,10 @@ colors/keyaccent.png 0 selected - selected + textActive center - + 1080 0 1-col @@ -692,7 +708,7 @@ colors/keyaccent.png 0 selected - selected + textActive center @@ -709,24 +725,24 @@ 171 307 303 - 300 + 309 colors/keyunselected.png colors/keyaccent.png - - - - - - - - + - + - + - + - 24 24 0 12 252 selected - selected + textActive center buttonTitle - + IP Input button 70 0 @@ -739,9 +755,9 @@ 304 160 303 - 300 + 309 selected - selected + textActive center buttonTitle @@ -758,7 +774,7 @@ colors/keyaccent.png 0 selected - selected + textActive center @@ -774,7 +790,7 @@ colors/keyaccent.png 0 selected - selected + textActive center @@ -790,7 +806,7 @@ colors/keyaccent.png 0 selected - selected + textActive center @@ -806,7 +822,7 @@ colors/keyaccent.png 0 selected - selected + textActive center @@ -822,7 +838,7 @@ colors/keyaccent.png 0 selected - selected + textActive center @@ -838,10 +854,10 @@ colors/keyaccent.png 0 selected - selected + textActive center - + 690 0 1-col @@ -854,10 +870,10 @@ colors/keyaccent.png 0 selected - selected + textActive center - + 768 0 1-col @@ -870,10 +886,10 @@ colors/keyaccent.png 0 selected - selected + textActive center - + 846 0 1-col @@ -886,10 +902,10 @@ colors/keyaccent.png 0 selected - selected + textActive center - + 924 0 1-col @@ -902,10 +918,10 @@ colors/keyaccent.png 0 selected - selected + textActive center - + 1002 0 1-col @@ -918,10 +934,10 @@ colors/keyaccent.png 0 selected - selected + textActive center - + 1080 0 1-col @@ -934,15 +950,15 @@ colors/keyaccent.png 0 selected - selected + textActive center - + 312 - - Done button + + Layout -72 0 4-col @@ -955,7 +971,7 @@ colors/keyunselected.png colors/keyaccent.png selected - selected + textActive center buttonTitle @@ -970,9 +986,9 @@ colors/keyaccent.png 0 selected - selected + textActive center - 300 + 309 305 160 312 @@ -986,18 +1002,18 @@ 1-col 306 - 300 + 309 171 312 colors/keyselected.png colors/keyaccent.png 0 selected - selected + textActive center buttonTitle - + previous button 690 0 @@ -1008,7 +1024,7 @@ colors/keyaccent.png 0 selected - selected + textActive center 32 306 @@ -1026,13 +1042,13 @@ colors/keyaccent.png 0 selected - selected + textActive center 305 8 167 312 - + @@ -1043,4 +1059,4 @@ - \ No newline at end of file + diff --git a/1080i/DialogMediaFilter.xml b/1080i/DialogMediaFilter.xml index 21531e6..492f8e9 100644 --- a/1080i/DialogMediaFilter.xml +++ b/1080i/DialogMediaFilter.xml @@ -14,7 +14,7 @@ 44 fullscreenWidth 1-row - colors/selected.png + colors/white.png ffffffff stretch @@ -31,8 +31,8 @@ 12 44 16-col - pageTitle - + dialogTitle + black - @@ -51,9 +51,9 @@ left 54 itemTitle - selected + textActive black - colors/selected.png + colors/white.png - 12 @@ -91,7 +91,7 @@ 0 1-col symbol - selected + textActive - @@ -100,7 +100,7 @@ 2 3-col-gutter menuTitle - selected + textActive - @@ -112,7 +112,7 @@ 4-col 53 stretch - colors/selected.png + colors/white.png 24 @@ -168,4 +168,4 @@ - \ No newline at end of file + diff --git a/1080i/DialogMediaSource.xml b/1080i/DialogMediaSource.xml index 29cd8b2..89caaa3 100644 --- a/1080i/DialogMediaSource.xml +++ b/1080i/DialogMediaSource.xml @@ -25,7 +25,7 @@ 44 fullscreenWidth 1-row - colors/selected.png + colors/white.png ffffffff stretch @@ -43,8 +43,8 @@ 12 44 16-col - pageTitle - + dialogTitle + black - @@ -57,9 +57,9 @@ 12 0 16-col - itemTitleSmallCondensed + itemSubTitleCondensed - selected + textActive - @@ -98,7 +98,7 @@ 12-col 1-row itemTitle - selected + textActive selected ListItem.Label - @@ -111,7 +111,7 @@ 12-col 53 stretch - colors/selected.png + colors/white.png 0 ffFFFFFF @@ -136,14 +136,14 @@ 12-col-gutter itemTitle - selected + textActive - Name Button 3-col 7-row - 9-col-gutter + 9-col-gutter 10 8000 @@ -176,16 +176,16 @@ 0 1-col symbol - selected + textActive - 1-col - 2 + -1 3-col menuTitle - selected + textActive - @@ -197,7 +197,7 @@ 4-col 53 stretch - colors/selected.png + colors/white.png 24 @@ -210,7 +210,7 @@ 1-col - 2 + -1 3-col menuTitle black @@ -284,4 +284,4 @@ - \ No newline at end of file + diff --git a/1080i/DialogMuteBug.xml b/1080i/DialogMuteBug.xml index de363ac..2e68495 100644 --- a/1080i/DialogMuteBug.xml +++ b/1080i/DialogMuteBug.xml @@ -2,24 +2,27 @@ 901 yes + + + col-19-begin - 83 + row-17-begin - + 0 -12 8-col 102 - colors/selected.png + colors/white.png eeFFFFFF - + @@ -30,17 +33,16 @@ 4-col 1-row - true black - - + 24 - 30 + 28 1-col symbolLarge black @@ -48,20 +50,20 @@ - - + 72 - 34 + 28 4-col - pageTitle + dialogTitle black - - + @@ -74,4 +76,4 @@ - \ No newline at end of file + diff --git a/1080i/DialogNetworkSetup.xml b/1080i/DialogNetworkSetup.xml index b6e6a98..505d31e 100644 --- a/1080i/DialogNetworkSetup.xml +++ b/1080i/DialogNetworkSetup.xml @@ -21,7 +21,7 @@ 44 fullscreenWidth 1-row - colors/selected.png + colors/white.png ffffffff stretch @@ -38,8 +38,8 @@ 12 44 8-col - pageTitle - + dialogTitle + black - @@ -51,88 +51,88 @@ 9011 Protocol - 0 - 0 + 0 + 0 12-col-gutter - 11 - 9011 + 11 + 9011 - + Server Address - 0 - 1-row + 0 + 1-row 12-col-gutter left 54 - 12 - 10 - 9011 + 12 + 10 + 9011 Server Browse 0 - 2-row - + 2-row + 12-col-gutter left 54 itemTitle - selected + textActive black - colors/selected.png + colors/white.png - 12 - 16 - 11 - 9011 + 16 + 11 + 9011 Remote - 0 - 3-row + 0 + 3-row 12-col-gutter left - 54 - 13 - 12 - 9011 + 54 + 13 + 12 + 9011 - + Port - 0 - 4-row + 0 + 4-row 12-col-gutter left 54 - 14 - 16 - 9011 + 14 + 16 + 9011 Username - 0 - 5-row + 0 + 5-row 12-col-gutter left 54 - 15 - 13 - 9011 + 15 + 13 + 9011 password - 0 - 6-row + 0 + 6-row 12-col-gutter left 54 - 14 - 9011 - + 14 + 9011 + @@ -157,16 +157,16 @@ 0 1-col symbol - selected + textActive - 1-col - 2 + -1 3-col menuTitle - selected + textActive - @@ -178,7 +178,7 @@ 4-col 53 stretch - colors/selected.png + colors/white.png 24 @@ -191,7 +191,7 @@ 1-col - 2 + -1 3-col menuTitle black diff --git a/1080i/DialogNumeric.xml b/1080i/DialogNumeric.xml index 2ceae24..01e4133 100644 --- a/1080i/DialogNumeric.xml +++ b/1080i/DialogNumeric.xml @@ -3,7 +3,7 @@ 21 yes - + col-3-begin @@ -14,29 +14,29 @@ fullscreenWidth 10-row colors/black.png - ccffffff + ddffffff col-1-begin row-1-begin - - header label - 0 + + header label + 0 -64 - 24-col-gutter + 24-col-gutter 1-row center - itemTitleSmall - selected - + itemSubTitle + textActive + 8-col -12 8-col 1-row stretch - colors/keyselected.png + colors/offblack.png Edit Text @@ -45,8 +45,8 @@ 8-col 1-row center - selected - itemTitle + textActive + itemTitle @@ -69,7 +69,7 @@ colors/keyselected.png colors/keyaccent.png selected - selected + textActive 2 button @@ -86,7 +86,7 @@ colors/keyselected.png colors/keyaccent.png selected - selected + textActive 3 button @@ -103,7 +103,7 @@ colors/keyselected.png colors/keyaccent.png selected - selected + textActive Backspace button @@ -121,7 +121,7 @@ colors/keyunselected.png colors/keyaccent.png selected - selected + textActive buttonTitle @@ -140,7 +140,7 @@ colors/keyselected.png colors/keyaccent.png selected - selected + textActive 5 button @@ -157,7 +157,7 @@ colors/keyselected.png colors/keyaccent.png selected - selected + textActive 6 button @@ -174,7 +174,7 @@ colors/keyselected.png colors/keyaccent.png selected - selected + textActive Done button @@ -192,7 +192,7 @@ colors/keyunselected.png colors/keyaccent.png selected - selected + textActive buttonTitle @@ -211,7 +211,7 @@ colors/keyselected.png colors/keyaccent.png selected - selected + textActive 8 button @@ -228,7 +228,7 @@ colors/keyselected.png colors/keyaccent.png selected - selected + textActive 9 button @@ -245,7 +245,7 @@ colors/keyselected.png colors/keyaccent.png selected - selected + textActive @@ -263,7 +263,7 @@ colors/keyunselected.png colors/keyaccent.png selected - selected + textActive 0 button @@ -280,7 +280,7 @@ colors/keyselected.png colors/keyaccent.png selected - selected + textActive next button @@ -297,7 +297,7 @@ colors/keyunselected.png colors/keyaccent.png selected - selected + textActive @@ -307,4 +307,4 @@ - \ No newline at end of file + diff --git a/1080i/DialogOk.xml b/1080i/DialogOk.xml index 7b9c850..1519669 100644 --- a/1080i/DialogOk.xml +++ b/1080i/DialogOk.xml @@ -33,8 +33,7 @@ 0 10-col pageTitle - selected - true + textActive 0 @@ -42,7 +41,7 @@ 10-col 128 regular - selected + textActive @@ -68,16 +67,16 @@ 0 1-col symbol - selected + textActive - 1-col - 2 + -1 3-col menuTitle - selected + textActive - @@ -89,7 +88,7 @@ 5-col 53 stretch - colors/selected.png + colors/white.png 24 @@ -102,7 +101,7 @@ 1-col - 2 + -1 3-col menuTitle black diff --git a/1080i/DialogPVRChannelManager.xml b/1080i/DialogPVRChannelManager.xml index d9f7f02..345699b 100644 --- a/1080i/DialogPVRChannelManager.xml +++ b/1080i/DialogPVRChannelManager.xml @@ -33,7 +33,7 @@ 44 fullscreenWidth 1-row - colors/selected.png + colors/white.png ffffffff stretch @@ -42,7 +42,7 @@ 44 1155 1-row - colors/selected.png + colors/white.png colors/black.png 3,0,0,0 ffffffff @@ -53,7 +53,7 @@ 12 44 16-col - pageTitle + dialogTitle black - @@ -63,7 +63,7 @@ 12 44 16-col - pageTitle + dialogTitle black - @@ -99,7 +99,7 @@ 0 6-col itemTitle - selected + textActive - @@ -170,9 +170,9 @@ 54 left itemTitle - selected + textActive black - colors/selected.png + colors/white.png - 12 @@ -230,9 +230,9 @@ 54 left itemTitle - selected + textActive black - colors/selected.png + colors/white.png - 12 @@ -250,9 +250,9 @@ 54 left itemTitle - selected + textActive black - colors/selected.png + colors/white.png - 12 @@ -270,9 +270,9 @@ 54 left itemTitle - selected + textActive black - colors/selected.png + colors/white.png - 12 @@ -289,9 +289,9 @@ 54 left itemTitle - selected + textActive black - colors/selected.png + colors/white.png - 12 @@ -308,9 +308,9 @@ 54 left itemTitle - selected + textActive black - colors/selected.png + colors/white.png - 12 @@ -327,9 +327,9 @@ 54 left itemTitle - selected + textActive black - colors/selected.png + colors/white.png - 12 @@ -362,7 +362,7 @@ 0 1-col symbol - selected + textActive - @@ -371,7 +371,7 @@ 2 6-col menuTitle - selected + textActive - @@ -383,7 +383,7 @@ 6-col 53 stretch - colors/selected.png + colors/white.png 24 @@ -451,4 +451,4 @@ - \ No newline at end of file + diff --git a/1080i/DialogPVRChannelsOSD.xml b/1080i/DialogPVRChannelsOSD.xml index c9ad74f..cbc88d8 100644 --- a/1080i/DialogPVRChannelsOSD.xml +++ b/1080i/DialogPVRChannelsOSD.xml @@ -1,122 +1,122 @@ - 11 - fadeInOut - + 11 + fadeInOut - - 0 + + 0 0 - - + 0 0 - 588 + col-9-begin fullscreenHeight stretch colors/black.png 0 99FFFFFF - - - 24 - 1-row - 7-col - regularStrong - selected - - - + + 6 + 42 + 9-col + 18-row + 60 + 11 + dialog.close(all,true) + 11 + 60 + 300 + + + 20 + 32 + 1-row + 1-row + scale + $INFO[Listitem.thumb] + + + 108 + 12 + 8-col-gutter + itemTitle + textActive + - + + + + 108 + 69 + 8-col-gutter + smallStrong + left + 24 + textActive + - + + + + + + col-1-begin + 0 + 588 + 2-row + stretch + colors/white.png + 0 + ffFFFFFF + + + 20 + 32 + 1-row + 1-row + scale + $INFO[Listitem.thumb] + + + 108 + 12 + 528 + itemTitle + black + black + - + + + + 108 + 69 + 528 + smallStrong + left + 24 + black + black + - + + + - - - 0 - 140 - 8-col - 16-row - PreviousChannelGroup - 60 - 50 - 50 - 60 - 300 - - - 24 - 12 - 7-col - itemTitle - selected - - - - - - 24 - 69 - 7-col - smallStrong - left - 24 - selected - - - - - - - - 0 - 0 - 8-col - 2-row - stretch - colors/selected.png - 0 - ffFFFFFF - - - 24 - 12 - 7-col - itemTitle - black - black - - - - - - 24 - 69 - 7-col - smallStrong - left - 24 - black - black - - - - - - - - - - - Control.IsVisible(60) - conditional - - 588 - 0 - fullscreenHeight - 11 - - - - - + + + Control.IsVisible(60) + conditional + + 672 + 0 + fullscreenHeight + 11 + + + + DebugGrid WindowID - - \ No newline at end of file + + diff --git a/1080i/DialogPVRGroupManager.xml b/1080i/DialogPVRGroupManager.xml index 6338dc2..028e3c9 100644 --- a/1080i/DialogPVRGroupManager.xml +++ b/1080i/DialogPVRGroupManager.xml @@ -21,7 +21,7 @@ 44 fullscreenWidth 1-row - colors/selected.png + colors/white.png ffffffff stretch @@ -38,8 +38,8 @@ 12 44 16-col - pageTitle - + dialogTitle + black - @@ -70,7 +70,7 @@ 3-col-gutter menuTitle - selected + textActive @@ -85,7 +85,7 @@ 24 0 6-col - itemTitleSmall + itemSubTitle accented @@ -111,7 +111,7 @@ 0 5-col itemTitle - selected + textActive selected - @@ -151,7 +151,7 @@ 24 0 6-col - itemTitleSmall + itemSubTitle accented @@ -177,7 +177,7 @@ 0 5-col itemTitle - selected + textActive selected - @@ -230,7 +230,7 @@ 0 1-col symbol - selected + textActive - @@ -239,7 +239,7 @@ 2 6-col menuTitle - selected + textActive - @@ -251,7 +251,7 @@ 6-col 53 stretch - colors/selected.png + colors/white.png 24 @@ -330,4 +330,4 @@ - \ No newline at end of file + diff --git a/1080i/DialogPVRGuideInfo.xml b/1080i/DialogPVRGuideInfo.xml index 43082ae..298f8ca 100644 --- a/1080i/DialogPVRGuideInfo.xml +++ b/1080i/DialogPVRGuideInfo.xml @@ -22,7 +22,7 @@ 0 0 12-col - itemTitleSmall + itemSubTitle @@ -33,16 +33,17 @@ 12-col left mediumStrong - selected + textActive - true + + Channel name 0 118 12-col - itemTitleSmall + itemSubTitle @@ -52,10 +53,10 @@ textboxExtraLeading 12-col left - selected + textActive 340 - + @@ -79,7 +80,7 @@ 0 1-col symbol - selected + textActive - @@ -88,7 +89,7 @@ 2 5-col menuTitle - selected + textActive - @@ -100,7 +101,7 @@ 6-col 53 stretch - colors/selected.png + colors/white.png 24 @@ -154,4 +155,4 @@ - \ No newline at end of file + diff --git a/1080i/DialogPVRGuideOSD.xml b/1080i/DialogPVRGuideOSD.xml index 19ef50c..df3eb98 100644 --- a/1080i/DialogPVRGuideOSD.xml +++ b/1080i/DialogPVRGuideOSD.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/1080i/DialogPVRGuideSearch.xml b/1080i/DialogPVRGuideSearch.xml index 70c5a2f..b7f3c0e 100644 --- a/1080i/DialogPVRGuideSearch.xml +++ b/1080i/DialogPVRGuideSearch.xml @@ -22,7 +22,7 @@ 44 fullscreenWidth 1-row - colors/selected.png + colors/white.png ffffffff stretch @@ -39,7 +39,7 @@ 12 44 16-col - pageTitle + dialogTitle black - @@ -52,7 +52,7 @@ 40 itemTitle - selected + textActive - @@ -74,7 +74,7 @@ 2-row left smallMedium - selected + textActive @@ -109,9 +109,9 @@ 8-col itemTitle - colors/selected.png - - - black + colors/white.png + - + black 16 16 11 @@ -123,9 +123,9 @@ 3-row 8-col - colors/selected.png - - - black + colors/white.png + - + black 17 17 14 @@ -206,9 +206,9 @@ 0 2-row 8-col - colors/selected.png - - - black + colors/white.png + - + black 1-row 14 @@ -220,9 +220,9 @@ Stop time 0 3-row - colors/selected.png - - - black + colors/white.png + - + black 15 15 @@ -297,16 +297,16 @@ 0 1-col symbol - selected + textActive - 1-col - 2 + -1 3-col menuTitle - selected + textActive - @@ -318,7 +318,7 @@ 4-col 53 stretch - colors/selected.png + colors/white.png 24 @@ -331,7 +331,7 @@ 1-col - 2 + -1 3-col menuTitle black @@ -384,4 +384,4 @@ - \ No newline at end of file + diff --git a/1080i/DialogPVRRecordingInfo.xml b/1080i/DialogPVRRecordingInfo.xml index a67595e..f9c193a 100644 --- a/1080i/DialogPVRRecordingInfo.xml +++ b/1080i/DialogPVRRecordingInfo.xml @@ -24,9 +24,9 @@ 0 12-col left - itemTitleSmall - selected - + itemSubTitle + textActive + Episode title @@ -35,8 +35,9 @@ 12-col left mediumStrong - true - selected + + + textActive @@ -46,10 +47,10 @@ textboxExtraLeading 12-col left - selected + textActive 174 - + @@ -73,7 +74,7 @@ 0 1-col symbol - selected + textActive - @@ -82,7 +83,7 @@ 2 6-col menuTitle - selected + textActive - @@ -94,7 +95,7 @@ 6-col 53 stretch - colors/selected.png + colors/white.png 24 @@ -140,4 +141,4 @@ - \ No newline at end of file + diff --git a/1080i/DialogPVRTimerSettings.xml b/1080i/DialogPVRTimerSettings.xml index 50f5a40..62ddaaa 100644 --- a/1080i/DialogPVRTimerSettings.xml +++ b/1080i/DialogPVRTimerSettings.xml @@ -27,7 +27,7 @@ 44 fullscreenWidth 1-row - colors/selected.png + colors/white.png ffffffff stretch @@ -36,18 +36,18 @@ 44 1155 1-row - colors/selected.png + colors/white.png colors/black.png 3,0,0,0 ffffffff stretch - + 12 44 16-col pageTitle - + black - @@ -86,7 +86,7 @@ 0 1-col symbol - selected + textActive - @@ -95,7 +95,7 @@ 2 3-col menuTitle - selected + textActive - @@ -107,7 +107,7 @@ 4-col 53 stretch - colors/selected.png + colors/white.png 24 @@ -151,9 +151,9 @@ left 54 itemTitle - selected + textActive black - colors/selected.png + colors/white.png - 12 @@ -168,6 +168,10 @@ Default Edit + - + colors/white.png + textActive + black @@ -187,4 +191,4 @@ - \ No newline at end of file + diff --git a/1080i/DialogPeripheralManager.xml b/1080i/DialogPeripheralManager.xml index d8c134e..3db507e 100644 --- a/1080i/DialogPeripheralManager.xml +++ b/1080i/DialogPeripheralManager.xml @@ -1,9 +1,8 @@ - 20 - - - + 20 + + globalBackground dimensionsFullscreen @@ -21,7 +20,7 @@ 44 fullscreenWidth 1-row - colors/selected.png + colors/white.png ffffffff stretch @@ -38,119 +37,106 @@ 12 44 8-col - pageTitle + dialogTitle black - - - - - 0 - 120 - 12-col - 14-row - 10 - 10 - 9000 - 200 - - - - + + + 0 + 120 + 12-col + 14-row + 10 + 10 + 9000 + 200 + + 0 2 12-col-gutter 107 stretch colors/black.png - 77ffffff + 77ffffff - - - Name - 12 - 0 - 12-col-gutter - 1-row - - itemTitle - selected - - - - Product ID Vendor ID - 12 - 32 - 12-col-gutter - 1-row - - smallMedium - selected - - - - class - 12 - 60 - 12-col-gutter - 1-row - - smallMedium - selected - - - - - - - + + Name + 12 + 0 + 12-col-gutter + 1-row + + itemTitle + textActive + + + Product ID Vendor ID + 12 + 32 + 12-col-gutter + 1-row + + smallMedium + textActive + + + class + 12 + 60 + 12-col-gutter + 1-row + + smallMedium + textActive + + + + 0 2 12-col-gutter 107 stretch - colors/selected.png + colors/white.png - - - Name - 12 - 0 - 12-col-gutter - 1-row - - itemTitle - black - - - - - - Product ID Vendor ID - 12 - 32 - 12-col-gutter - 1-row - - smallMedium - black - - - - - - class - 12 - 60 - 12-col-gutter - 1-row - - smallMedium - black - - - - - - - + + Name + 12 + 0 + 12-col-gutter + 1-row + + itemTitle + black + - + + + Product ID Vendor ID + 12 + 32 + 12-col-gutter + 1-row + + smallMedium + black + - + + + class + 12 + 60 + 12-col-gutter + 1-row + + smallMedium + black + - + + + + 12-col 120 @@ -173,7 +159,7 @@ 0 1-col symbol - selected + textActive - @@ -182,7 +168,7 @@ 2 4-col menuTitle - selected + textActive - @@ -194,7 +180,7 @@ 4-col 53 stretch - colors/selected.png + colors/white.png 24 @@ -225,21 +211,19 @@ - - - - + + false - OK button - + OK button + - + DebugGrid DialogID - - + + diff --git a/1080i/DialogPeripheralSettings.xml b/1080i/DialogPeripheralSettings.xml index 61c1ef8..d525e8a 100644 --- a/1080i/DialogPeripheralSettings.xml +++ b/1080i/DialogPeripheralSettings.xml @@ -1,10 +1,8 @@ - 5 - - - - + 5 + + globalBackground dimensionsFullscreen @@ -22,7 +20,7 @@ 44 fullscreenWidth 1-row - colors/selected.png + colors/white.png ffffffff stretch @@ -39,14 +37,13 @@ 12 44 8-col - pageTitle + dialogTitle black - - - - 0 + + 0 120 12-col-gutter 11-row @@ -55,33 +52,28 @@ 5 vertical 3 - - - - Default Button + + + Default Button left 54 itemTitle - selected + textActive black - colors/selected.png + colors/white.png - 12 - - - - Default RadioButton - - - - Default SpinControlex - - - - Default Slider - - - + + + Default RadioButton + + + Default SpinControlex + + + Default Slider + + 12-col 120 @@ -104,7 +96,7 @@ 0 1-col symbol - selected + textActive - @@ -113,7 +105,7 @@ 2 4-col menuTitle - selected + textActive - @@ -125,7 +117,7 @@ 4-col 53 stretch - colors/selected.png + colors/white.png 24 @@ -154,7 +146,7 @@ - SendClick(28) - + Cancel Button @@ -170,30 +162,27 @@ - - - + + false - Cancel Button - - - - - OK Button - - - - Defaults Button - - + Cancel Button + + + + OK Button + + + Defaults Button + + - + DebugGrid DialogID - + diff --git a/1080i/DialogPictureInfo.xml b/1080i/DialogPictureInfo.xml index 5117fb5..e3db02d 100644 --- a/1080i/DialogPictureInfo.xml +++ b/1080i/DialogPictureInfo.xml @@ -2,24 +2,29 @@ 5 yes + fadeInOut modalDialog - col-1-begin - row-4-begin + col-4-begin + row-5-begin + + modalDialogInOut 0 - 0 - 16-col-gutter + -12 + 8-col - - keep + keep + colors/white.png + 3 $INFO[listitem.thumb] - 16-col - 0 - 8-col - 10-row + 9-col + -30 + 9-col + 12-row 0 @@ -59,4 +64,4 @@ - \ No newline at end of file + diff --git a/1080i/DialogProgress.xml b/1080i/DialogProgress.xml index d7487a8..c6ca800 100644 --- a/1080i/DialogProgress.xml +++ b/1080i/DialogProgress.xml @@ -2,28 +2,29 @@ 10 - 1 - 0 - 0 - - + 1 + 0 + 0 + + col-19-begin - row-2-begin + progressPosition1 + progressPosition2 - + 0 -12 8-col 102 - colors/selected.png + colors/white.png eeFFFFFF - + @@ -35,27 +36,29 @@ 1-row black - true + scrollSuppressionActive + scrollSuppressionInactive - - + message 24 22 - pageTitle + dialogTitle black 468 1-row - true + + - - + @@ -65,9 +68,16 @@ fake heading label - - Cancel button - + + Cancel button + + + + DebugGrid + + 0 + DialogID + diff --git a/1080i/DialogSeekBar.xml b/1080i/DialogSeekBar.xml index 65e96ac..ec2caf5 100644 --- a/1080i/DialogSeekBar.xml +++ b/1080i/DialogSeekBar.xml @@ -2,19 +2,18 @@ 901 yes - !Window.IsActive(5100) + !Window.IsActive(DialogSubtitles.xml) + !Window.IsVisible(fullscreeninfo) + [VideoPlayer.IsFullscreen + !Window.IsVisible(visualisation)] + [Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding] + !Window.IsActive(5901) + !Window.IsActive(DialogSubtitles.xml) + !Window.IsVisible(fullscreeninfo) + [VideoPlayer.IsFullscreen + !Window.IsVisible(visualisation)] + [Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding] col-1-begin row-9-begin - - + - - + + @@ -27,53 +26,53 @@ 99FFFFFF - Player.Playing | player.seeking + Player.Playing | player.seeking 3-col - -12 + -13 16-col-gutter smallStrong - selected + textActive - - - Player.Paused + !Player.Caching + + Player.Paused + !Player.Caching 3-col - -12 + -13 16-col-gutter smallStrong - selected + textActive - - - buffering - 3-col - -12 - 16-col-gutter + + buffering + 3-col + -13 + 16-col-gutter smallStrong - selected - - [Player.Paused + Player.Caching] + !Player.Seeking - - - System.HasMediaDVD + textActive + + [Player.Paused + Player.Caching] + !Player.Seeking + + + System.HasMediaDVD 21-col - -12 + -13 4-col-gutter smallStrong - right - selected + right + textActive - - !Player.Caching - 308 + !Player.Caching + 5-col -13 12-col smallMedium - selected + textActive - @@ -81,11 +80,12 @@ 3-col 31 18-col - dialogTitle - selected - + largeTitle + textActive + - - true + + Progress Bar @@ -99,16 +99,16 @@ 110 24-col smallStrong - selected + textActive - - - 312 + + 350 110 24-col smallStrong - selected + textActive - @@ -118,7 +118,7 @@ 24-col smallStrong right - selected + textActive - @@ -134,7 +134,7 @@ 24-col center veryLarge - 44ffffff + overlay - diff --git a/1080i/DialogSelect.xml b/1080i/DialogSelect.xml index c172e99..c71e8cd 100644 --- a/1080i/DialogSelect.xml +++ b/1080i/DialogSelect.xml @@ -1,35 +1,17 @@ - + 9000 - - 1 - 0 - 0 - - 2 + control.SetFocus(9999) + + 1 + 0 + 0 + + 2 fadeInOut - - dimensionsFullscreen - colors/black.png - stretch - ffffffff - - - - dimensionsFullscreen - $INFO[container(6).listitem.icon] - 6affffff - keep - 400 - - - dimensionsFullscreen - colors/black.png - stretch - 99ffffff - + globalBackground modalDialogInOutVertical @@ -41,7 +23,7 @@ 44 fullscreenWidth 1-row - colors/selected.png + colors/white.png ffffffff stretch @@ -50,7 +32,7 @@ 44 1155 1-row - colors/selected.png + colors/white.png colors/black.png 3,0,0,0 ffffffff @@ -60,179 +42,179 @@ 12 44 16-col - pageTitle + dialogTitle black - - - - 0 - 120 - 12-col - 11-row - 9999 - - - 0 - 2 - 6-col-gutter - 53 - stretch - UIControls/listitemNF.png - 0 - 99FFFFFF - - - 4 - 4 - 48 - 48 - scale - $INFO[Listitem.icon] - - - 1-col - 0 - 312 - itemTitle - selected - - - - - - ListItem.IsSelected - 18 - 0 - 30 - symbol - selected - - - - - - - - 0 - 2 - 6-col-gutter - 53 - stretch - UIControls/listitemFO.png - 0 - FFFFFFFF - - - 4 - 4 - 48 - 48 - scale - $INFO[Listitem.icon] - - - 1-col - 0 - 312 - itemTitle - black - black - - - - - - ListItem.IsSelected - 18 - 0 - 30 - symbol - selected - - - - - - - - - 0 - 120 - 12-col - 11-row - 9999 - - - 0 - 2 - 6-col-gutter - 53 - stretch - UIControls/listitemNF.png - 0 - 99FFFFFF - - - 4 - 4 - 48 - 48 - scale - $INFO[Listitem.icon] - - - 1-col - 0 - 312 - itemTitle - selected - - - - - - - - 0 - 2 - 6-col-gutter - 53 - stretch - UIControls/listitemFO.png - 0 - FFFFFFFF - - - 4 - 4 - 48 - 48 - scale - $INFO[Listitem.icon] - - - 1-col - 0 - 312 - itemTitle - black - black - - - - - - - - - - 12-col - 5-row - 6-col - 6-col - keep - $INFO[container(6).Listitem.icon] - 200 - + + + 0 + 120 + 12-col + 11-row + 9999 + + + 0 + 2 + 6-col-gutter + 53 + stretch + UIControls/listitemNF.png + 0 + 99FFFFFF + + + 4 + 4 + 48 + 48 + scale + $INFO[Listitem.icon] + + + 1-col + 0 + 312 + itemTitle + textActive + - + + + + ListItem.IsSelected + 11 + -1 + 38 + symbolLarge + textActive + - + + + + + + 0 + 2 + 6-col-gutter + 53 + stretch + UIControls/listitemFO.png + 0 + FFFFFFFF + + + 4 + 4 + 48 + 48 + scale + $INFO[Listitem.icon] + + + 1-col + 0 + 312 + itemTitle + black + black + - + + + + ListItem.IsSelected + 11 + -1 + 38 + symbolLarge + textActive + - + + + + + + + 0 + 120 + 12-col + 11-row + 9999 + + + 0 + 2 + 6-col-gutter + 53 + stretch + UIControls/listitemNF.png + 0 + 99FFFFFF + + + 4 + 4 + 48 + 48 + scale + $INFO[Listitem.icon] + + + 1-col + 0 + 312 + itemTitle + textActive + - + + + + + + 0 + 2 + 6-col-gutter + 53 + stretch + UIControls/listitemFO.png + 0 + FFFFFFFF + + + 4 + 4 + 48 + 48 + scale + $INFO[Listitem.icon] + + + 1-col + 0 + 312 + itemTitle + black + black + - + + + + + + + + 12-col + 5-row + 6-col + 6-col + keep + $INFO[container(6).Listitem.icon] + 200 + - control.isvisible(3) | control.isvisible(5) + control.isvisible(3) | control.isvisible(5) 12-col 120 4-col @@ -246,16 +228,16 @@ 0 1-col symbol - selected + textActive - 1-col - 2 + -1 6-col menuTitle - selected + textActive - @@ -267,7 +249,7 @@ 6-col 53 stretch - colors/selected.png + colors/white.png 24 @@ -280,7 +262,7 @@ 1-col - 2 + -1 6-col menuTitle black @@ -310,7 +292,7 @@ false OK / Manual button - + @@ -322,4 +304,4 @@ - \ No newline at end of file + diff --git a/1080i/DialogSlider.xml b/1080i/DialogSlider.xml index efa0611..402c6d8 100644 --- a/1080i/DialogSlider.xml +++ b/1080i/DialogSlider.xml @@ -5,21 +5,22 @@ col-19-begin - 83 + progressPosition1 + progressPosition2 - + 0 -12 8-col 102 - colors/selected.png + colors/white.png eeFFFFFF - + @@ -30,44 +31,47 @@ 468 1-row - true + scrollSuppressionActive + scrollSuppressionInactive black - - + Control indicator 24 30 - pageTitle + dialogTitle black 468 1-row - true + + - - + message - 96 + 108 30 - pageTitle + dialogTitle black 468 1-row - true + + - - + @@ -83,4 +87,4 @@ - \ No newline at end of file + diff --git a/1080i/DialogSongInfo.xml b/1080i/DialogSongInfo.xml index 879f7d3..69e2da5 100644 --- a/1080i/DialogSongInfo.xml +++ b/1080i/DialogSongInfo.xml @@ -1,122 +1,147 @@ - 9000 - fadeInOut - - modalDialog - + 9000 + fadeInOut + + modalDialog - col-6-begin - row-8-begin - - - modalDialogInOutVertical - - - 0 - 0 - 3-col-gutter - 3-col-gutter - stretch - $INFO[ListItem.Icon] - - - Song Title - 3-col - 0 - 8-col - itemTitle - - selected - true - - - Artist - 3-col - 1-row - 8-col - itemTitle - - selected - true - - - - - - 3-col - 132 - 8-col - 1-row - 3 - 9000 - IncreaseRating - DecreaseRating - horizontal - - - 0 - 2 - 4-col-gutter - largeStrong - selected - - - - - - - - 0 - 2 - 4-col - 53 - stretch - colors/selected.png - - - 36 - 0 - 2-col-gutter - symbolLarge - black - - - - - - 2-col - 2 - 2-col-gutter - largeStrong - black - - - - - - - - Rating - -   - - - SendClick(135,10) - - - - - - - 3-col - 4-row - 16-col - 1-row + col-8-begin + row-8-begin + + modalDialogInOut + + 0 + 0 + 3-col-gutter + 3-col-gutter + stretch + $INFO[ListItem.Icon] + + + Song Title + 3-col + 0 + 6-col + mediumStrong + + textActive + + + + + Artist + 3-col + 1-row + 6-col + itemTitle + + textActive + + + + + + + 3-col + 134 + 213 + 55 + stretch + colors/offblack.png + + + 228 + 132 + 4-col-gutter + largeStrong + textActive + + - + + + 6-col + 132 + 3-col + 1-row + 3 + 9000 + horizontal + + + 0 + 2 + 69 + 69 + stretch + colors/offblack.png + + + 24 + -4 + 1-col + 1-col + symbol + textActive + - + + + + + + 0 + 2 + 69 + 69 + stretch + colors/white.png + + + 24 + -4 + 1-col + 1-col + symbol + black + - + + + + + + Rating down + + - + DecreaseRating + + + Rating up + + - + IncreaseRating + + + Save + + - + SendClick(135,10) + + + + + + + 3-col + 4-row + 16-col + 1-row 3 - 8000 - horizontal - + 8000 + horizontal + 0 2 - 4-col + 3-col 53 stretch colors/black.png @@ -126,7 +151,7 @@ 0 1-col symbol - selected + textActive - @@ -135,19 +160,19 @@ 2 3-col-gutter menuTitle - selected + textActive - - + 0 2 - 4-col + 3-col 53 stretch - colors/selected.png + colors/white.png 24 @@ -169,40 +194,38 @@ - - Album Info button - + + Album Info button + - SendClick(135,12) - - Get Thumb button - + + Get Thumb button + - SendClick(135,13) - - + - - + false - Ok button - - - Cancel button - - - Album Info button - - - Get Thumb button - + Ok button + + + Cancel button + + + Album Info button + + + Get Thumb button + DebugGrid @@ -210,6 +233,5 @@ DialogID - - - \ No newline at end of file + + diff --git a/1080i/DialogSubtitles.xml b/1080i/DialogSubtitles.xml index 3bc85da..1caafcc 100644 --- a/1080i/DialogSubtitles.xml +++ b/1080i/DialogSubtitles.xml @@ -1,7 +1,7 @@ 160 - no + no 1 0 @@ -28,7 +28,7 @@ 44 fullscreenWidth 1-row - colors/selected.png + colors/white.png ffffffff stretch @@ -41,32 +41,32 @@ ffffffff stretch - - + 12 44 - 16-col-gutter + 18-col-gutter 1-row - pageTitle + dialogTitle black - + false - - Service Logo - false - 0 - 3-row - 2-col - 1-row - keep + + 300 + 86 + 12-col + 2-row + itemTitle + accented + true 4-col - 120 + 177 16-col 13-row 150 @@ -80,7 +80,7 @@ 0 12-col-gutter itemTitle - selected + textActive selected - ListItem.Label2 @@ -91,7 +91,7 @@ 0 4-col-gutter smallStrong - selected + textActive selected - @@ -103,7 +103,7 @@ 0 1-col smallStrong - selected + textActive selected - @@ -115,7 +115,7 @@ 0 1-col smallStrong - selected + textActive selected - @@ -128,7 +128,7 @@ 16-col 54 stretch - colors/selected.png + colors/white.png 0 FFFFFFFF @@ -193,21 +193,21 @@ - + 120 - 54 + 54 4-col-gutter left 12 menuTitle - selected + textActive black - colors/selected.png + colors/white.png - 150 - 120 + 150 + 120 - + 0 @@ -215,7 +215,7 @@ 4-col-gutter 11-row 120 - 160 + 160 200 @@ -223,7 +223,7 @@ 0 6-col-gutter menuTitle - selected + textActive selected - ListItem.Label @@ -234,7 +234,7 @@ 0 6-col-gutter menuTitle - selected + textActive selected - ListItem.Label @@ -249,7 +249,7 @@ 6-col 54 stretch - colors/selected.png + colors/white.png 0 ffFFFFFF @@ -260,7 +260,7 @@ 6-col 54 stretch - colors/selected.png + colors/white.png 0 aaFFFFFF @@ -297,4 +297,4 @@ - \ No newline at end of file + diff --git a/1080i/DialogTextViewer.xml b/1080i/DialogTextViewer.xml index 291267e..0f66800 100644 --- a/1080i/DialogTextViewer.xml +++ b/1080i/DialogTextViewer.xml @@ -36,4 +36,4 @@ - \ No newline at end of file + diff --git a/1080i/DialogVideoInfo.xml b/1080i/DialogVideoInfo.xml index 2247ac6..d272111 100644 --- a/1080i/DialogVideoInfo.xml +++ b/1080i/DialogVideoInfo.xml @@ -4,7 +4,7 @@ yes fadeInOut Skin.Reset(showcast) - action(info) + action(info) @@ -34,7 +34,7 @@ $INFO[listitem.art(fanart)] ffffffff stretch - kenBurnsey + kenBurnsey dimensionsFullscreen @@ -46,15 +46,17 @@ !Substring(Container.folderpath,plugin) + !container.content(episodes) - 1263 + 1263 0 - - - - - + + + + + + + + - !skin.string(showcast,true) 84 0 573 @@ -63,17 +65,16 @@ ccffffff stretch - + 84 0 573 198 - colors/selected.png + colors/white.png ffffffff stretch - - !skin.string(showcast,true) + 84 1009 573 @@ -94,58 +95,55 @@ pageTitle black - true - - + - 0 42 8-col-gutter left - itemTitleSmall + itemSubTitle black - - + - - !skin.string(showcast,true) 0 132 textboxExtraLeading 8-col-gutter left - selected + textActive 6-row - - - + + - - - - !skin.string(showcast,true) + + col-1-begin row-11-begin 8-col 6-row - false - + false + 0 0 4-col-gutter - itemTitleSmall + itemSubTitle accented - - + 0 32 4-col-gutter - itemTitleSmall - selected + itemSubTitle + textActive - @@ -159,18 +157,18 @@ - noop - + $INFO[ListItem.director] - noop - + $INFO[ListItem.genre] - noop - + $INFO[ListItem.Rating,,/10] @@ -181,7 +179,6 @@ - !skin.string(showcast,true) 84 row-15-begin 8-col @@ -196,14 +193,14 @@ 55 stretch colors/black.png - cc000000 + cc000000 24 0 1-col symbol - selected + textActive - @@ -212,7 +209,7 @@ 2 184 menuTitle - selected + textActive - @@ -224,7 +221,7 @@ 285 55 stretch - colors/selected.png + colors/white.png 24 @@ -256,10 +253,10 @@ - - Skin.SetString(showcast,true) - control.setfocus(50) - - + Skin.SetString(showcast,true) + control.setfocus(50) + + - @@ -277,21 +274,32 @@ - SendClick(2003,10) - - Get Artwork - - XBMC.RunScript(script.artwork.downloader, mode=gui, mediatype=movie, dbid=$INFO[ListItem.DBID]) - RunScript(script.artwork.downloader,mode=gui, mediatype=tvshow, dbid=$INFO[ListItem.DBID]) - - System.HasAddon(script.artwork.downloader) - + + Get Artwork + + XBMC.RunScript(script.artwork.downloader, mode=gui, mediatype=movie, dbid=$INFO[ListItem.DBID]) + RunScript(script.artwork.downloader,mode=gui, mediatype=tvshow, dbid=$INFO[ListItem.DBID]) + + System.HasAddon(script.artwork.downloader) + + + + !System.HasAddon(script.artwork.downloader) + 372 + 952 + 285 + 55 + stretch + colors/black.png + cc000000 + Substring(Container.folderpath,plugin) | container.content(episodes) - + modalDialogInOut @@ -302,10 +310,10 @@ 12 12-col 486 - scale + scale $INFO[Listitem.thumb] - colors/selected.png - 3 + colors/white.png + 3 @@ -318,11 +326,10 @@ 0 12-col left - itemTitleSmall - selected + itemSubTitle + textActive - - true - + Episode title @@ -331,8 +338,7 @@ 12-col left mediumStrong - true - selected + textActive - @@ -343,11 +349,11 @@ textboxExtraLeading 12-col left - selected + textActive - 228 - + @@ -371,7 +377,7 @@ 0 1-col symbol - selected + textActive - @@ -380,7 +386,7 @@ 2 6-col menuTitle - selected + textActive - @@ -392,7 +398,7 @@ 6-col 53 stretch - colors/selected.png + colors/white.png 24 @@ -434,23 +440,26 @@ skin.string(showcast,true) - 1263 - 0 - - + 1263 + 0 + + + + + 84 0 573 198 - colors/selected.png + colors/white.png ffffffff stretch - + 84 - 999 + 198 573 - 3-row + 16-row colors/black.png ccffffff stretch @@ -459,29 +468,18 @@ col-1-begin row-2-begin - - 0 - 0 - 8-col-gutter - left - pageTitle - black - - true - - - 0 42 8-col-gutter left - itemTitleSmall + itemSubTitle black - - + - - - + + 84 202 8-col @@ -489,15 +487,6 @@ 3 - 114 - 0 - 7-col - 111 - stretch - colors/black.png - cc000000 - - 0 0 111 @@ -512,8 +501,8 @@ 18 5-col-gutter 68 - itemTitleSmall - selected + itemSubTitle + textActive - @@ -525,10 +514,10 @@ 7-col 111 stretch - colors/selected.png - ffFFFFFF + colors/white.png + ffFFFFFF - + 0 0 111 @@ -543,14 +532,14 @@ 18 5-col-gutter 68 - itemTitleSmall + itemSubTitle black - - + false @@ -574,4 +563,4 @@ - \ No newline at end of file + diff --git a/1080i/DialogVolumeBar.xml b/1080i/DialogVolumeBar.xml index c51118c..0ec777c 100644 --- a/1080i/DialogVolumeBar.xml +++ b/1080i/DialogVolumeBar.xml @@ -2,17 +2,21 @@ - yes + + + col-19-begin - row-2-begin + progressPosition1 + progressPosition2 !player.passthrough 0 -12 8-col 102 - colors/selected.png + colors/white.png eeFFFFFF @@ -28,12 +32,11 @@ message 24 30 - pageTitle + dialogTitle black 468 1-row - true - @@ -44,4 +47,4 @@ - \ No newline at end of file + diff --git a/1080i/DialogYesNo.xml b/1080i/DialogYesNo.xml index b62ed4e..ecd4f0c 100644 --- a/1080i/DialogYesNo.xml +++ b/1080i/DialogYesNo.xml @@ -20,8 +20,7 @@ 0 9-col pageTitle - selected - true + textActive 0 @@ -29,91 +28,45 @@ 8-col 128 regular - selected + textActive - + col-9-begin 4-row 8-col 1-row - 3 + 0 + 50 + 50 + 9999 + 9999 horizontal - 2 - - - 0 - 2 - 4-col - 53 - stretch - colors/black.png - - - 24 - 0 - 1-col - symbol - selected - - - - - - 1-col - 2 - 3-col-gutter - menuTitle - selected - - - - - - - - 0 - 2 - 4-col - 53 - stretch - colors/selected.png - - - 24 - 0 - 1-col - symbol - black - - - - - - 1-col - 2 - 3-col-gutter - menuTitle - black - - - - - - - - Yes Button - - - - - SendClick(100,11) - - - No Button - - - - - SendClick(100,10) - - + + + No + + menuTitle + left + 24 + black + textActive + colors/white.png + colors/black.png + + + Yes + + menuTitle + left + 24 + black + textActive + colors/white.png + colors/black.png + @@ -128,13 +81,6 @@ Line 3 - - - No - - - Yes - DebugGrid diff --git a/1080i/FileBrowser.xml b/1080i/FileBrowser.xml index 14f2844..955c951 100644 --- a/1080i/FileBrowser.xml +++ b/1080i/FileBrowser.xml @@ -5,12 +5,7 @@ fadeInOut - - dimensionsFullscreen - colors/black.png - stretch - ffffffff - + globalBackground SubString(ListItem.label,fanart) @@ -20,6 +15,14 @@ stretch 400 + + !SubString(ListItem.label,fanart) + dimensionsFullscreen + $INFO[listitem.FileNameAndPath] + ffffffff + stretch + 400 + SubString(ListItem.label,remote art) @@ -46,7 +49,7 @@ 44 fullscreenWidth 1-row - colors/selected.png + colors/white.png ffffffff stretch @@ -63,7 +66,7 @@ 12 44 16-col - pageTitle + dialogTitle black - @@ -98,7 +101,7 @@ 0 11-col-gutter itemTitle - selected + textActive - @@ -167,7 +170,7 @@ 0 1-col symbol - selected + textActive - @@ -176,7 +179,7 @@ 2 4-col menuTitle - selected + textActive - @@ -188,7 +191,7 @@ 4-col 53 stretch - colors/selected.png + colors/white.png 24 @@ -255,4 +258,4 @@ - \ No newline at end of file + diff --git a/1080i/FileManager.xml b/1080i/FileManager.xml index 7be8702..09f7eab 100644 --- a/1080i/FileManager.xml +++ b/1080i/FileManager.xml @@ -14,7 +14,7 @@ 44 fullscreenWidth 1-row - colors/selected.png + colors/white.png ffffffff stretch @@ -31,7 +31,7 @@ 12 44 16-col - pageTitle + dialogTitle black - @@ -88,7 +88,7 @@ 12-col-gutter 1-row - colors/selected.png + colors/white.png Conditional @@ -169,7 +169,7 @@ 12-col-gutter 1-row - colors/selected.png + colors/white.png Conditional @@ -207,4 +207,4 @@ - \ No newline at end of file + diff --git a/1080i/Font.xml b/1080i/Font.xml index d5aa9a8..db5d4f2 100644 --- a/1080i/Font.xml +++ b/1080i/Font.xml @@ -1,112 +1,186 @@ - + veryLarge roboto/black.ttf - 195 + 60 + 0.8 large roboto/regular.ttf 60 + 1.0 + + + largeBlack + roboto/black.ttf + 60 + 0.8 largeStrong roboto/bold.ttf 60 + 0.8 largeLight roboto/light.ttf 60 + 0.8 medium roboto/regular.ttf 48 + 1.0 mediumStrong roboto/bold.ttf 48 + 0.9 regular roboto/regular.ttf 36 - 1.38 + 0.9 regularStrong roboto/bold.ttf 36 - 1.38 + 0.9 regularSemibold - roboto/medium.ttf + roboto/semibold.ttf 36 - 1.38 + 0.9 regularLight roboto/light.ttf 36 - 1.38 + 1.0 small roboto/regular.ttf 30 - 1.38 + 0.9 smallStrong roboto/bold.ttf + 22 + 1.0 + + + smallMedium + roboto/bold.ttf + 24 + 1.0 + + + + textboxExtraLeading + roboto/regular.ttf + 30 + 1 + + + pageTitle + roboto/condensedBold.ttf + 48 + 1.0 + + + pageSubTitle + roboto/condensedRegular.ttf + 36 + 1.0 + + + dialogTitle + roboto/bold.ttf + 40 + 1.0 + + + largeTitle + + roboto/black.ttf + 60 + 1.0 + + + + + itemTitle + roboto/bold.ttf 30 1.0 - - smallest + + itemSubTitle roboto/bold.ttf 24 - 1.38 + 1.0 + + + + itemSubTitleCondensed + roboto/condensedBold.ttf + 30 + 0.8 + + + menuTitle + roboto/regular.ttf + 30 + 1.0 + + + buttonTitle + roboto/regular.ttf + 30 + 1.0 - - - symbol symbol.ttf 20 - + + + +