From 8b70557870fb34d20b88c663e2f35174fd425db0 Mon Sep 17 00:00:00 2001 From: Sranshaft Date: Mon, 1 Apr 2013 22:17:24 +1100 Subject: [PATCH] Added: Animation to setting dialogs --- 720p/DialogAddonSettings.xml | 12 +- 720p/DialogContentSettings.xml | 14 +- 720p/DialogContextMenu.xml | 24 ++- 720p/DialogMediaSource.xml | 14 +- 720p/DialogNetworkSetup.xml | 272 ++++++++++++++++++------------ 720p/DialogPeripheralSettings.xml | 217 +++++++++++++++++++++++- 720p/Includes_Animation.xml | 29 ++++ 720p/LockSettings.xml | 12 +- 720p/ProfileSettings.xml | 12 +- 720p/Settings.xml | 16 +- 720p/SettingsCategory.xml | 25 +-- 720p/SettingsProfile.xml | 12 +- 720p/SettingsSystemInfo.xml | 12 +- 720p/SkinSettings.xml | 120 +++---------- 720p/SmartPlaylistEditor.xml | 16 +- 720p/SmartPlaylistRule.xml | 12 +- 16 files changed, 509 insertions(+), 310 deletions(-) diff --git a/720p/DialogAddonSettings.xml b/720p/DialogAddonSettings.xml index 2b566da..465176f 100644 --- a/720p/DialogAddonSettings.xml +++ b/720p/DialogAddonSettings.xml @@ -12,17 +12,13 @@ Common_Settings_Background + + Common_Settings_Header_Back - 60 - 22 - 420 - 32 + Common_Settings_Header - Settings-Menu-Header - Settings_Header - top @@ -46,6 +42,8 @@ 0 700 480 + + Common_Animation_Settings_Options diff --git a/720p/DialogContentSettings.xml b/720p/DialogContentSettings.xml index e464b29..a05d3e3 100644 --- a/720p/DialogContentSettings.xml +++ b/720p/DialogContentSettings.xml @@ -4,6 +4,8 @@ 3 yes 0xFFFFFFFF + + Common_Animation_Window @@ -12,16 +14,12 @@ + Common_Settings_Header_Back + - 60 - 22 - 420 - 32 + Common_Settings_Header - Settings-Menu-Header - Settings_Header - top @@ -107,6 +105,8 @@ 700 480 + Common_Animation_Settings_Options + 0 diff --git a/720p/DialogContextMenu.xml b/720p/DialogContextMenu.xml index f0e05e6..eb705e2 100644 --- a/720p/DialogContextMenu.xml +++ b/720p/DialogContextMenu.xml @@ -11,6 +11,16 @@ + + + Common_Dimensions + colors/color_white.png + FanartDiffuse + + Common_Animation_Window_Dark + + + 1280 @@ -33,17 +43,13 @@ + Common_ContextMenu_Header_Back + - 32 - 22 - 256 - 32 - - Menu-Header - Label_Normal - top - + Common_ContextMenu_Header + + diff --git a/720p/DialogMediaSource.xml b/720p/DialogMediaSource.xml index 6ccb495..0eeaede 100644 --- a/720p/DialogMediaSource.xml +++ b/720p/DialogMediaSource.xml @@ -13,17 +13,13 @@ + + Common_Settings_Header_Back - 60 - 22 - 420 - 32 + Common_Settings_Header - Settings-Menu-Header - Settings_Header - top @@ -120,6 +116,8 @@ Container(98).HasFocus(1) + Common_Animation_Settings_Options + @@ -369,6 +367,8 @@ 98 vertical Container(98).HasFocus(2) + + Common_Animation_Settings_Options diff --git a/720p/DialogNetworkSetup.xml b/720p/DialogNetworkSetup.xml index 7598527..e265278 100644 --- a/720p/DialogNetworkSetup.xml +++ b/720p/DialogNetworkSetup.xml @@ -4,145 +4,205 @@ yes - - Common_Background_Fade - + + + Common_Settings_Background + - 340 - 160 - - - -20 - -20 - 640 - 456 - other_textures/ContentPanel.png - - + + Common_Settings_Header_Back + - Heading - 10 - 580 - Medium + + Common_Settings_Header - black - center + + + + + + List + 0 + 100 + 420 + auto + 98 + 98 + - + 99 + 0 + vertical + - + + + + + + 60 + 0 + auto + 60 + + Menu-List + Settings_Menu_Normal + center + + + + + + + + + + 0 + 0 + 420 + 60 + colors/color_white.png + Background_Highlight + + + + + + 60 + 0 + auto + 60 + + Menu-List + Settings_Menu_Highlight + center + 0 + + + + + + + + + Locations + + - + + + + + + + + + 500 + 100 + 700 + 480 + + Common_Animation_Settings_Options + + + + Control Area + 0 + 120 + 700 + 540 + 0 + 3 + 9000 + vertical + 81 + + + + Protocol - 10 - 60 - 580 - - 18 - 11 - 10 - 10 + + Common_Settings_SpinButton + - + + Server Address - 10 - 106 - 400 - left - 20 - 10 - 12 - 12 - 16 + Common_Settings_Button + - + + Server Browse - 440 - 106 - 150 - - 10 - 11 - 11 - 16 + + Common_Settings_Button + - + + Remote - 10 - 152 - 580 - 11 - 16 - 16 - 13 + Common_Settings_Button + - + + Port - 10 - 198 - 580 - - 16 - 13 - 13 - 14 + + Common_Settings_Button + - + + Username - 10 - 244 - 580 - left - - 13 - 14 - 14 - 15 + + Common_Settings_Button + - + - password - 10 - 290 - 580 - left - - 14 - 15 - 15 - 18 + + Password + + Common_Settings_Button + + + + + Common_Settings_Divider + + + + Common_Settings_Button_Grouplist + + - Ok - 60 - 358 - 200 - - 15 - 19 - 19 - 10 + + Common_Settings_Control_Button + + 5 + + - Cancel - 340 - 358 - 200 - - 15 - 18 - 18 - 10 + + Common_Settings_Control_Button + + 5 + - + - - + + \ No newline at end of file diff --git a/720p/DialogPeripheralSettings.xml b/720p/DialogPeripheralSettings.xml index 16f8c34..c48fb58 100644 --- a/720p/DialogPeripheralSettings.xml +++ b/720p/DialogPeripheralSettings.xml @@ -1,14 +1,219 @@ + 5 - - 1 - 300 - 80 - - + + Common_Settings_Background + + + + Common_Settings_Header_Back + + + + Common_Settings_Header + + + + + + List + 0 + 100 + 420 + auto + 98 + 98 + - + 99 + 0 + vertical + - + + + + + + 60 + 0 + auto + 60 + + Menu-List + Settings_Menu_Normal + center + + + + + + + + + + 0 + 0 + 420 + 60 + colors/color_white.png + Background_Highlight + + + + + + 60 + 0 + auto + 60 + + Menu-List + Settings_Menu_Highlight + center + 0 + + + + + + + + + Locations + + - + + + + + + + + + + + 500 + 0 + 700 + 480 + + Common_Animation_Settings_Options + + + + 0 + 100 + Common_Settings_Label + + + + + + Control Area + 0 + 100 + 700 + 540 + 0 + 3 + 3 + vertical + 81 + + + + + + + + + Common_Settings_Scrollbar_Vertical + + 1260 + 100 + 540 + + Conditional + + + + + + Default Button + Common_Settings_Button + + + + + + Default Radio Button + Common_Settings_RadioButton + + + + + + Default Spin Control + Common_Settings_SpinButton + + + + + + Default Spin Control + Common_Settings_SliderEx + + + + + + separator image + -2 + - + + + + + Common_Settings_Divider + + + + Common_Settings_Button_Grouplist + + + + + Common_Settings_Control_Button + + 5 + + + + + + + Common_Settings_Control_Button + + 5 + + + + + + + Common_Settings_Control_Button + + 5 + + + + + + + + background image diff --git a/720p/Includes_Animation.xml b/720p/Includes_Animation.xml index 0762b86..1f7215e 100644 --- a/720p/Includes_Animation.xml +++ b/720p/Includes_Animation.xml @@ -148,6 +148,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -239,6 +261,13 @@ + + + WindowOpen + WindowClose + + + diff --git a/720p/LockSettings.xml b/720p/LockSettings.xml index e6c6aab..461753b 100644 --- a/720p/LockSettings.xml +++ b/720p/LockSettings.xml @@ -9,17 +9,13 @@ Common_Settings_Background + + Common_Settings_Header_Back - 60 - 22 - 420 - 32 + Common_Settings_Header - Settings-Menu-Header - Settings_Header - top @@ -105,6 +101,8 @@ 700 480 + Common_Animation_Settings_Options + Control Area diff --git a/720p/ProfileSettings.xml b/720p/ProfileSettings.xml index 8d7ab7d..45b77bf 100644 --- a/720p/ProfileSettings.xml +++ b/720p/ProfileSettings.xml @@ -9,17 +9,13 @@ Common_Settings_Background + + Common_Settings_Header_Back - 60 - 22 - 420 - 32 + Common_Settings_Header - Settings-Menu-Header - Settings_Header - top @@ -105,6 +101,8 @@ 700 480 + Common_Animation_Settings_Options + 0 diff --git a/720p/Settings.xml b/720p/Settings.xml index 46e3dc1..e6c00bb 100644 --- a/720p/Settings.xml +++ b/720p/Settings.xml @@ -4,7 +4,7 @@ 9000 - ActivateWindow(60) + ActivateWindow(60) @@ -17,16 +17,12 @@ + Common_Settings_Header_Back + - 60 - 22 - 420 - 32 + Common_Settings_Header - Settings-Menu-Header - Settings_Header - top @@ -138,7 +134,7 @@ - + diff --git a/720p/SettingsCategory.xml b/720p/SettingsCategory.xml index 6ab4813..52fdeb3 100644 --- a/720p/SettingsCategory.xml +++ b/720p/SettingsCategory.xml @@ -9,16 +9,12 @@ Common_Settings_Background + + Common_Settings_Header_Back - 60 - 22 - 420 - 32 - Settings-Menu-Header - Settings_Header - top + Common_Settings_Header @@ -42,20 +38,9 @@ 0 700 480 - - - - 0 - 22 - 520 - 32 - - Settings-Menu-Header - Settings_Header - top - - + Common_Animation_Settings_Options + Control Area diff --git a/720p/SettingsProfile.xml b/720p/SettingsProfile.xml index 86f682a..a91e2c9 100644 --- a/720p/SettingsProfile.xml +++ b/720p/SettingsProfile.xml @@ -9,17 +9,13 @@ Common_Settings_Background + + Common_Settings_Header_Back - 60 - 22 - 420 - 32 + Common_Settings_Header - Settings-Menu-Header - Settings_Header - top @@ -105,6 +101,8 @@ 700 480 + Common_Animation_Settings_Options + 0 diff --git a/720p/SettingsSystemInfo.xml b/720p/SettingsSystemInfo.xml index 6ccdfaa..1002dcf 100644 --- a/720p/SettingsSystemInfo.xml +++ b/720p/SettingsSystemInfo.xml @@ -8,17 +8,13 @@ Common_Settings_Background + + Common_Settings_Header_Back - 60 - 22 - 420 - 32 + Common_Settings_Header - Settings-Menu-Header - Settings_Header - top @@ -92,6 +88,8 @@ 540 0 true + + Common_Animation_Settings_Options diff --git a/720p/SkinSettings.xml b/720p/SkinSettings.xml index 6f82af1..c57d33d 100644 --- a/720p/SkinSettings.xml +++ b/720p/SkinSettings.xml @@ -12,17 +12,13 @@ + + Common_Settings_Header_Back - 60 - 22 - 420 - 32 + Common_Settings_Header - Settings-Menu-Header - Settings_Header - top @@ -156,6 +152,7 @@ 540 480 + Control Area @@ -172,6 +169,8 @@ 81 Container(98).HasFocus(1) + Common_Animation_Settings_Options + @@ -400,96 +399,9 @@ - - - - Common_Settings_Label - - - - - - - Custom Addon 1 - Common_Settings_Button - - $INFO[System.AddonTitle(Skin.String(HomeAddonButton_1))] - Skin.SetAddon(HomeAddonButton_1,xbmc.addon.video,xbmc.addon.audio,xbmc.addon.executable) - - - - - - Custom Addon 2 - Common_Settings_Button - - $INFO[System.AddonTitle(Skin.String(HomeAddonButton_2))] - Skin.SetAddon(HomeAddonButton_2,xbmc.addon.video,xbmc.addon.audio,xbmc.addon.executable) - - - - - - Custom Addon 3 - Common_Settings_Button - - $INFO[System.AddonTitle(Skin.String(HomeAddonButton_3))] - Skin.SetAddon(HomeAddonButton_3,xbmc.addon.video,xbmc.addon.audio,xbmc.addon.executable) - - - - - - Custom Addon 4 - Common_Settings_Button - - $INFO[System.AddonTitle(Skin.String(HomeAddonButton_4))] - Skin.SetAddon(HomeAddonButton_4,xbmc.addon.video,xbmc.addon.audio,xbmc.addon.executable) - - - - - - Custom Addon 5 - Common_Settings_Button - - $INFO[System.AddonTitle(Skin.String(HomeAddonButton_5))] - Skin.SetAddon(HomeAddonButton_5,xbmc.addon.video,xbmc.addon.audio,xbmc.addon.executable) - - - - - - Custom Addon 6 - Common_Settings_Button - - $INFO[System.AddonTitle(Skin.String(HomeAddonButton_6))] - Skin.SetAddon(HomeAddonButton_6,xbmc.addon.video,xbmc.addon.audio,xbmc.addon.executable) - - - - - - Custom Addon 7 - Common_Settings_Button - - $INFO[System.AddonTitle(Skin.String(HomeAddonButton_7))] - Skin.SetAddon(HomeAddonButton_7,xbmc.addon.video,xbmc.addon.audio,xbmc.addon.executable) - - - - - - Custom Addon 8 - Common_Settings_Button - - $INFO[System.AddonTitle(Skin.String(HomeAddonButton_8))] - Skin.SetAddon(HomeAddonButton_8,xbmc.addon.video,xbmc.addon.audio,xbmc.addon.executable) - - - + Control Area @@ -506,6 +418,8 @@ 82 Container(98).Hasfocus(2) + Common_Animation_Settings_Options + @@ -616,6 +530,8 @@ 83 Container(98).Hasfocus(3) + Common_Animation_Settings_Options + @@ -628,7 +544,7 @@ 700 - 390 + 300 @@ -823,6 +739,8 @@ vertical 84 Container(98).Hasfocus(4) + + Common_Animation_Settings_Options @@ -888,6 +806,8 @@ vertical 85 Container(98).Hasfocus(5) + + Common_Animation_Settings_Options @@ -944,6 +864,8 @@ 86 Container(98).Hasfocus(6) + Common_Animation_Settings_Options + @@ -1011,6 +933,8 @@ 87 Container(98).Hasfocus(7) + Common_Animation_Settings_Options + @@ -1059,6 +983,8 @@ 88 Container(98).Hasfocus(8) + Common_Animation_Settings_Options + @@ -1114,6 +1040,8 @@ vertical 89 Container(98).Hasfocus(9) + + Common_Animation_Settings_Options diff --git a/720p/SmartPlaylistEditor.xml b/720p/SmartPlaylistEditor.xml index f45d77c..dac451c 100644 --- a/720p/SmartPlaylistEditor.xml +++ b/720p/SmartPlaylistEditor.xml @@ -12,17 +12,13 @@ + + Common_Settings_Header_Back - 60 - 22 - 420 - 32 + Common_Settings_Header - Settings-Menu-Header - Settings_Header - top @@ -132,6 +128,8 @@ vertical Container(98).HasFocus(1) + Common_Animation_Settings_Options + @@ -169,6 +167,8 @@ Container(98).Hasfocus(2) + Common_Animation_Settings_Options + @@ -416,6 +416,8 @@ Container(98).Hasfocus(3) + Common_Animation_Settings_Options + diff --git a/720p/SmartPlaylistRule.xml b/720p/SmartPlaylistRule.xml index 5d120d7..e3dc7b7 100644 --- a/720p/SmartPlaylistRule.xml +++ b/720p/SmartPlaylistRule.xml @@ -10,17 +10,13 @@ + + Common_Settings_Header_Back - 60 - 22 - 420 - 32 + Common_Settings_Header - Settings-Menu-Header - Settings_Header - top @@ -105,6 +101,8 @@ 0 700 480 + + Common_Animation_Settings_Options