Merge pull request #488 from topfs2/disk_usage
authorArne Morten Kvarving <spiff@xbmc.org>
Tue, 11 Oct 2011 14:35:20 +0000 (07:35 -0700)
committerArne Morten Kvarving <spiff@xbmc.org>
Tue, 11 Oct 2011 14:35:20 +0000 (07:35 -0700)
Disk usage

144 files changed:
.gitignore
.gitmodules [new file with mode: 0644]
Makefile.in
README.ios
XBMC-ATV2.xcodeproj/project.pbxproj
XBMC-IOS.xcodeproj/project.pbxproj
addons/skin.touched [new submodule]
addons/skin.touched/4x3Hirez/AddonBrowser.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogAddonInfo.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogAddonSettings.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogAlbumInfo.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogBusy.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogButtonMenu.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogContentSettings.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogContextMenu.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogFavourites.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogFileStacking.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogGamepad.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogKaiToast.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogKaraokeSongSelector.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogKaraokeSongSelectorLarge.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogKeyboard.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogMediaSource.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogMusicScan.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogMuteBug.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogNetworkSetup.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogNumeric.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogOK.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogPictureInfo.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogProgress.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogSeekBar.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogSelect.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogSongInfo.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogTextViewer.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogVideoInfo.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogVideoScan.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogVolumeBar.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogYesNo.xml [deleted file]
addons/skin.touched/4x3Hirez/FileBrowser.xml [deleted file]
addons/skin.touched/4x3Hirez/FileManager.xml [deleted file]
addons/skin.touched/4x3Hirez/Font.xml [deleted file]
addons/skin.touched/4x3Hirez/Home.xml [deleted file]
addons/skin.touched/4x3Hirez/IncludesCodecFlagging.xml [deleted file]
addons/skin.touched/4x3Hirez/IncludesKeypad.xml [deleted file]
addons/skin.touched/4x3Hirez/IncludesPlayerControls.xml [deleted file]
addons/skin.touched/4x3Hirez/LockSettings.xml [deleted file]
addons/skin.touched/4x3Hirez/LoginScreen.xml [deleted file]
addons/skin.touched/4x3Hirez/MusicKaraokeLyrics.xml [deleted file]
addons/skin.touched/4x3Hirez/MusicOSD.xml [deleted file]
addons/skin.touched/4x3Hirez/MusicOverlay.xml [deleted file]
addons/skin.touched/4x3Hirez/MusicVisualisation.xml [deleted file]
addons/skin.touched/4x3Hirez/MyMusicNav.xml [deleted file]
addons/skin.touched/4x3Hirez/MyMusicPlaylist.xml [deleted file]
addons/skin.touched/4x3Hirez/MyMusicPlaylistEditor.xml [deleted file]
addons/skin.touched/4x3Hirez/MyMusicSongs.xml [deleted file]
addons/skin.touched/4x3Hirez/MyPics.xml [deleted file]
addons/skin.touched/4x3Hirez/MyPrograms.xml [deleted file]
addons/skin.touched/4x3Hirez/MyVideoNav.xml [deleted file]
addons/skin.touched/4x3Hirez/MyVideoPlaylist.xml [deleted file]
addons/skin.touched/4x3Hirez/MyWeather.xml [deleted file]
addons/skin.touched/4x3Hirez/PlayerControls.xml [deleted file]
addons/skin.touched/4x3Hirez/Pointer.xml [deleted file]
addons/skin.touched/4x3Hirez/ProfileSettings.xml [deleted file]
addons/skin.touched/4x3Hirez/Settings.xml [deleted file]
addons/skin.touched/4x3Hirez/SettingsCategory.xml [deleted file]
addons/skin.touched/4x3Hirez/SettingsProfile.xml [deleted file]
addons/skin.touched/4x3Hirez/SettingsScreenCalibration.xml [deleted file]
addons/skin.touched/4x3Hirez/SettingsSystemInfo.xml [deleted file]
addons/skin.touched/4x3Hirez/SlideShow.xml [deleted file]
addons/skin.touched/4x3Hirez/SmartPlaylistEditor.xml [deleted file]
addons/skin.touched/4x3Hirez/SmartPlaylistRule.xml [deleted file]
addons/skin.touched/4x3Hirez/Startup.xml [deleted file]
addons/skin.touched/4x3Hirez/VideoFullScreen.xml [deleted file]
addons/skin.touched/4x3Hirez/VideoOSD.xml [deleted file]
addons/skin.touched/4x3Hirez/VideoOSDBookmarks.xml [deleted file]
addons/skin.touched/4x3Hirez/VideoOSDSettings.xml [deleted file]
addons/skin.touched/4x3Hirez/VideoOverlay.xml [deleted file]
addons/skin.touched/4x3Hirez/ViewsAddonBrowser.xml [deleted file]
addons/skin.touched/4x3Hirez/ViewsCommon.xml [deleted file]
addons/skin.touched/4x3Hirez/ViewsMetaData.xml [deleted file]
addons/skin.touched/4x3Hirez/VisualisationPresetList.xml [deleted file]
addons/skin.touched/4x3Hirez/custom_skinsettings_1113.xml [deleted file]
addons/skin.touched/4x3Hirez/custom_volume_1112.xml [deleted file]
addons/skin.touched/4x3Hirez/defaults.xml [deleted file]
addons/skin.touched/4x3Hirez/includes.xml [deleted file]
addons/skin.touched/4x3Hirez/script-XBMC-Subtitles-main.xml [deleted file]
addons/skin.touched/addon.xml [deleted file]
addons/skin.touched/background/background.png [deleted file]
addons/skin.touched/background/movies.png [deleted file]
addons/skin.touched/background/music.png [deleted file]
addons/skin.touched/background/pictures.png [deleted file]
addons/skin.touched/background/programs.png [deleted file]
addons/skin.touched/background/tvshows.png [deleted file]
addons/skin.touched/background/videos.png [deleted file]
addons/skin.touched/colors/defaults.xml [deleted file]
addons/skin.touched/fonts/DejaVuSans-Bold-Caps.ttf [deleted file]
addons/skin.touched/fonts/DejaVuSans-Bold.ttf [deleted file]
addons/skin.touched/icon.png [deleted file]
addons/skin.touched/language/Chinese (Simple)/strings.xml [deleted file]
addons/skin.touched/language/Dutch/strings.xml [deleted file]
addons/skin.touched/language/English/strings.xml [deleted file]
addons/skin.touched/language/Finnish/strings.xml [deleted file]
addons/skin.touched/language/Korean/strings.xml [deleted file]
addons/skin.touched/language/Slovenian/strings.xml [deleted file]
addons/skin.touched/media/Textures.xbt [deleted file]
configure.in
lib/DllLibbluray.h [new file with mode: 0644]
lib/addons/script.module.pil/Imaging-1.1.7-access.patch [new file with mode: 0644]
lib/addons/script.module.pil/Makefile.in
lib/libcec/Makefile.in [new file with mode: 0644]
project/BuildDependencies/scripts/libcec_d.bat
project/BuildDependencies/scripts/libcec_d.txt
project/BuildDependencies/scripts/libplist_d.bat
project/BuildDependencies/scripts/libplist_d.txt
tools/darwin/depends/libcec/Makefile [new file with mode: 0644]
xbmc/GUIInfoManager.cpp
xbmc/GUIInfoManager.h
xbmc/URL.cpp
xbmc/Util.cpp
xbmc/addons/Repository.cpp
xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamBluray.cpp
xbmc/cores/dvdplayer/DVDPlayer.cpp
xbmc/cores/dvdplayer/DVDPlayer.h
xbmc/dialogs/GUIDialogMediaSource.cpp
xbmc/filesystem/AFPDirectory.cpp
xbmc/interfaces/json-rpc/FileOperations.cpp
xbmc/interfaces/json-rpc/JSONRPC.cpp
xbmc/interfaces/json-rpc/JSONServiceDescription.cpp
xbmc/interfaces/json-rpc/JSONServiceDescription.h
xbmc/peripherals/Peripherals.cpp
xbmc/peripherals/bus/Makefile.in
xbmc/peripherals/bus/PeripheralBus.cpp
xbmc/peripherals/bus/win32/PeripheralBusUSB.cpp
xbmc/peripherals/devices/Makefile.in
xbmc/peripherals/devices/Peripheral.h
xbmc/peripherals/devices/PeripheralCecAdapter.cpp
xbmc/peripherals/devices/PeripheralCecAdapter.h
xbmc/settings/GUISettings.cpp
xbmc/settings/GUIWindowSettingsCategory.cpp
xbmc/settings/Settings.h
xbmc/system.h
xbmc/utils/URIUtils.cpp
xbmc/utils/URIUtils.h
xbmc/windows/GUIWindowSystemInfo.cpp

index ff43a34..d7c757e 100644 (file)
@@ -175,6 +175,11 @@ lib/cmyth/Makefile
 /lib/cpluff/libcpluff/win32/Debug
 /lib/cpluff/libcpluff/win32/Release
 
+# /lib/libcec
+/lib/libcec/Makefile
+/lib/libcec/include
+/lib/libcec/libcec
+
 # /lib/enca
 /lib/enca/libenca_win32/Debug
 /lib/enca/libenca_win32/Release
@@ -230,20 +235,6 @@ lib/cmyth/Makefile
 /lib/libass/m4/ltversion.m4
 /lib/libass/m4/lt~obsolete.m4
 
-# /lib/libcec
-/lib/libcec/Makefile
-/lib/libcec/Makefile.in
-/lib/libcec/aclocal.m4
-/lib/libcec/config.guess
-/lib/libcec/config.sub
-/lib/libcec/configure
-/lib/libcec/depcomp
-/lib/libcec/install-sh
-/lib/libcec/ltmain.sh
-/lib/libcec/missing
-/lib/libcec/src/lib/Makefile.in
-/lib/libcec/src/testclient/Makefile.in
-
 # /lib/libiconv
 /lib/libiconv/libiconv_win32/Debug
 /lib/libiconv/libiconv_win32/Release
@@ -372,6 +363,8 @@ lib/cmyth/Makefile
 /system/libsamplerate-0.dll
 /system/libnfs.dll
 /system/dnssd.dll
+/system/libcec.dll
+/system/pthreadVC2.dll
 
 # /system/cdrip
 /system/cdrip/lame_enc.dll
diff --git a/.gitmodules b/.gitmodules
new file mode 100644 (file)
index 0000000..a92044b
--- /dev/null
@@ -0,0 +1,4 @@
+[submodule "touched"]
+       path = addons/skin.touched
+       url = git://github.com/xbmc/skin.touched.git
+       ignore = all
index bff37e6..9cc393a 100644 (file)
@@ -160,9 +160,12 @@ ifneq (@DISABLE_GOOM@,1)
 endif
 
 CONFLUENCE_MEDIA=addons/skin.confluence/media
+SKIN_DIRS=$(CONFLUENCE_MEDIA)
 
-SKIN_DIRS=\
-       $(CONFLUENCE_MEDIA)
+ifeq (@USE_SKIN_TOUCHED@,1)
+TOUCHED_MEDIA=addons/skin.touched/media
+SKIN_DIRS+=$(TOUCHED_MEDIA)
+endif
 
 DIRS= $(BIN_DIRS) $(EC_DIRS) $(XBMCTEX_DIRS) $(DVDPCODECS_DIRS) $(PAPCODECS_DIRS) \
        $(LIB_DIRS) $(SS_DIRS) $(VIS_DIRS) $(SKIN_DIRS)
@@ -205,6 +208,9 @@ configure: configure.in
 ifeq (@USE_TEXTUREPACKER@,1)
 skins: tools/TexturePacker/TexturePacker force
         $(MAKE) -C $(CONFLUENCE_MEDIA)
+ifeq (@USE_SKIN_TOUCHED@,1)
+        $(MAKE) -C $(TOUCHED_MEDIA)
+endif
 else
 skins:
 endif
@@ -364,6 +370,8 @@ lib/libapetag/.libs/libapetag.a: force
        $(MAKE) -C lib/libapetag
 lib/cpluff/libcpluff/.libs/libcpluff.a: force
        $(MAKE) -C lib/cpluff/libcpluff
+lib/libcec/libcec.a: force
+       $(MAKE) -C lib/libcec libcec.a
 system/libcpluff-@ARCH@.so: lib/cpluff/libcpluff/.libs/libcpluff.a
 ifeq ($(findstring osx,@ARCH@), osx)
   ifeq (@ARCH@, arm-osx)
@@ -541,6 +549,10 @@ DYNOBJSXBMC= \
 
 LIBS += @PYTHON_LDFLAGS@
 
+ifneq (@USE_EXTERNAL_LIBCEC@,1)
+  DYNOBJSXBMC += lib/libcec/libcec.a
+endif
+
 xbmc.bin: $(OBJSXBMC) $(DYNOBJSXBMC)
 ifeq ($(findstring osx,@ARCH@), osx)
        $(CXX) $(LDFLAGS) -o xbmc.bin -Wl,-all_load,-ObjC $(DYNOBJSXBMC) $(OBJSXBMC) $(LIBS) -rdynamic
index da92c5f..aac3a73 100644 (file)
@@ -37,6 +37,8 @@ character itself should NOT be typed as part of the command.
 
  $ cd $HOME
  $ git clone git://github.com/xbmc/xbmc.git xbmc
+ $ cd xbmc
+ $ git submodule update --init addons/skin.touched
 
 -----------------------------------------------------------------------------
 3.0 Install Xcode
index dbc5210..94ef7c9 100644 (file)
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/bash;
-                       shellScript = "#!/bin/bash\n\necho \"copy root files\"\n\nif [ \"$ACTION\" = build ] ; then\n\n# for external testing\nTARGET_NAME=$PRODUCT_NAME.$WRAPPER_EXTENSION\n#SRCROOT=/Users/Shared/xbmc_svn/XBMC\n#TARGET_BUILD_DIR=/Users/Shared/xbmc_svn/XBMC/build/Debug\n\n# rsync command with exclusions for items we don't want in the app package\nSYNC=\"rsync -aq --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *x86-osx.* --exclude *.zlib --exclude *.a --exclude *.pyd --exclude *x86-osx.so --exclude *powerpc-osx.so\"\n\n# rsync command for excluding pngs and jpgs as well. Note that if the skin itself is not compiled\n# using XBMCTex then excluding the pngs and jpgs will most likely make the skin unusable \n#SYNCSKIN=\"rsync -aq --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll  --exclude *.DLL --exclude *linux.* --exclude *.png --exclude *.jpg --exclude *.bat\"\nSYNCSKIN=\"rsync -aq --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll  --exclude *.DLL --exclude *linux.*  --exclude *.bat\"\n\n# rsync command for including everything but the skins\nADDONSYNC=\"rsync -aq --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude skin.confluence --exclude skin.touched --exclude screensaver.rsxs* --exclude visualization.*\"\n\n# binary name is XBMC but we build XBMC.bin so to get a clean binary each time\nmv $TARGET_BUILD_DIR/$TARGET_NAME/XBMC.bin $TARGET_BUILD_DIR/$TARGET_NAME/XBMC\n\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/language\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/sounds\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/system\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/userdata\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/tools/osx\"\n\n${SYNC} \"$SRCROOT/LICENSE.GPL\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/\"\n${SYNC} \"$SRCROOT/xbmc/osx/Credits.html\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/\"\n#${SYNC} \"$SRCROOT/tools/osx\"\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/tools\"\n${ADDONSYNC} \"$SRCROOT/addons\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/addons/visualization.glspectrum\"   \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\n${SYNC} \"$SRCROOT/addons/visualization.waveform\"    \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\n${SYNC} \"$SRCROOT/language\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/media\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNCSKIN} \"$SRCROOT/addons/skin.confluence\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/backgrounds\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/icon.png\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/sounds\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/system\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/userdata\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n\n# copy extra packages if applicable\nif [ -d \"$SRCROOT/extras/system\" ]; then\n\t${SYNC} \"$SRCROOT/extras/system/\" \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\nfi\n\n# copy extra user packages if applicable\nif [ -d \"$SRCROOT/extras/user\" ]; then\n\tmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Resources/XBMC/extras/user\"\n\t${SYNC} \"$SRCROOT/extras/user/\" \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/extras/user\"\nfi\n\nfi";
+                       shellScript = "#!/bin/bash\n\necho \"copy root files\"\n\nif [ \"$ACTION\" = build ] ; then\n\n# for external testing\nTARGET_NAME=$PRODUCT_NAME.$WRAPPER_EXTENSION\n#SRCROOT=/Users/Shared/xbmc_svn/XBMC\n#TARGET_BUILD_DIR=/Users/Shared/xbmc_svn/XBMC/build/Debug\n\n# rsync command with exclusions for items we don't want in the app package\nSYNC=\"rsync -aq --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *x86-osx.* --exclude *.zlib --exclude *.a --exclude *.pyd --exclude *x86-osx.so --exclude *powerpc-osx.so\"\n\n# rsync command for excluding pngs and jpgs as well. Note that if the skin itself is not compiled\n# using XBMCTex then excluding the pngs and jpgs will most likely make the skin unusable \n#SYNCSKIN=\"rsync -aq --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll  --exclude *.DLL --exclude *linux.* --exclude *.png --exclude *.jpg --exclude *.bat\"\nSYNCSKIN=\"rsync -aq --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll  --exclude *.DLL --exclude *linux.*  --exclude *.bat\"\n\n# rsync command for including everything but the skins\nADDONSYNC=\"rsync -aq --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude skin.confluence --exclude skin.touched --exclude screensaver.rsxs* --exclude visualization.*\"\n\n# binary name is XBMC but we build XBMC.bin so to get a clean binary each time\nmv $TARGET_BUILD_DIR/$TARGET_NAME/XBMC.bin $TARGET_BUILD_DIR/$TARGET_NAME/XBMC\n\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/language\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/sounds\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/system\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/userdata\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/tools/osx\"\n\n${SYNC} \"$SRCROOT/LICENSE.GPL\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/\"\n${SYNC} \"$SRCROOT/xbmc/osx/Credits.html\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/\"\n${ADDONSYNC} \"$SRCROOT/addons\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/addons/visualization.glspectrum\"   \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\n${SYNC} \"$SRCROOT/addons/visualization.waveform\"    \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\n${SYNC} \"$SRCROOT/language\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/media\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNCSKIN} \"$SRCROOT/addons/skin.confluence\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/backgrounds\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/icon.png\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/sounds\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/system\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/userdata\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n\nfi";
                        showEnvVarsInLog = 0;
                };
                F589B48D128A697C00D8079E /* copy frameworks */ = {
index d84ea77..687ff97 100644 (file)
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/bash;
-                       shellScript = "#!/bin/bash\n\necho \"copy root files\"\n\nif [ \"$ACTION\" = build ] ; then\n\n# for external testing\nTARGET_NAME=$PRODUCT_NAME.$WRAPPER_EXTENSION\n#SRCROOT=/Users/Shared/xbmc_svn/XBMC\n#TARGET_BUILD_DIR=/Users/Shared/xbmc_svn/XBMC/build/Debug\n\n# rsync command with exclusions for items we don't want in the app package\nSYNC=\"rsync -aq --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *x86-osx.so --exclude *.zlib --exclude *.a\"\n\n# rsync command for excluding pngs and jpgs as well. Note that if the skin itself is not compiled\n# using XBMCTex then excluding the pngs and jpgs will most likely make the skin unusable \n#SYNCSKIN=\"rsync -aq --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll  --exclude *.DLL --exclude *linux.* --exclude *.png --exclude *.jpg --exclude *.bat\"\nSYNCSKIN=\"rsync -aq --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll  --exclude *.DLL --exclude *linux.*  --exclude *.bat\"\n\n# rsync command for including everything but the skins\nADDONSYNC=\"rsync -aq --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude skin.confluence --exclude skin.touched --exclude screensaver.rsxs* --exclude visualization.*\"\n\n# binary name is XBMC but we build XBMC.bin so to get a clean binary each time\nmv $TARGET_BUILD_DIR/$TARGET_NAME/XBMC.bin $TARGET_BUILD_DIR/$TARGET_NAME/XBMC\n\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/language\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/sounds\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/system\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/userdata\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/tools/osx\"\n\n${SYNC} \"$SRCROOT/LICENSE.GPL\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/\"\n${SYNC} \"$SRCROOT/xbmc/osx/Credits.html\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/\"\n${ADDONSYNC} \"$SRCROOT/addons\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/addons/visualization.glspectrum\"  \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\n${SYNC} \"$SRCROOT/addons/visualization.waveform\"    \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\n${SYNC} \"$SRCROOT/language\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/media\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNCSKIN} \"$SRCROOT/addons/skin.touched\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\n${SYNC} \"$SRCROOT/addons/skin.touched/backgrounds\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons/skin.touched\"\n${SYNC} \"$SRCROOT/addons/skin.touched/icon.png\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons/skin.touched\"\n${SYNCSKIN} \"$SRCROOT/addons/skin.confluence\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/backgrounds\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/icon.png\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/sounds\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/system\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/userdata\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n\n# copy extra packages if applicable\nif [ -d \"$SRCROOT/extras/system\" ]; then\n\t${SYNC} \"$SRCROOT/extras/system/\" \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\nfi\n\n# copy extra user packages if applicable\nif [ -d \"$SRCROOT/extras/user\" ]; then\n\tmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Resources/XBMC/extras/user\"\n\t${SYNC} \"$SRCROOT/extras/user/\" \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/extras/user\"\nfi\n\nfi";
+                       shellScript = "#!/bin/bash\n\necho \"copy root files\"\n\nif [ \"$ACTION\" = build ] ; then\n\n# for external testing\nTARGET_NAME=$PRODUCT_NAME.$WRAPPER_EXTENSION\n#SRCROOT=/Users/Shared/xbmc_svn/XBMC\n#TARGET_BUILD_DIR=/Users/Shared/xbmc_svn/XBMC/build/Debug\n\n# rsync command with exclusions for items we don't want in the app package\nSYNC=\"rsync -aq --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *x86-osx.so --exclude *.zlib --exclude *.a\"\n\n# rsync command for excluding pngs and jpgs as well. Note that if the skin itself is not compiled\n# using XBMCTex then excluding the pngs and jpgs will most likely make the skin unusable \n#SYNCSKIN=\"rsync -aq --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll  --exclude *.DLL --exclude *linux.* --exclude *.png --exclude *.jpg --exclude *.bat\"\nSYNCSKIN=\"rsync -aq --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll  --exclude *.DLL --exclude *linux.*  --exclude *.bat\"\n\n# rsync command for including everything but the skins\nADDONSYNC=\"rsync -aq --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude skin.confluence --exclude skin.touched --exclude screensaver.rsxs* --exclude visualization.*\"\n\n# binary name is XBMC but we build XBMC.bin so to get a clean binary each time\nmv $TARGET_BUILD_DIR/$TARGET_NAME/XBMC.bin $TARGET_BUILD_DIR/$TARGET_NAME/XBMC\n\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/language\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/sounds\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/system\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/userdata\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/tools/osx\"\n\n${SYNC} \"$SRCROOT/LICENSE.GPL\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/\"\n${SYNC} \"$SRCROOT/xbmc/osx/Credits.html\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/\"\n${ADDONSYNC} \"$SRCROOT/addons\"\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/addons/visualization.glspectrum\"  \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\n${SYNC} \"$SRCROOT/addons/visualization.waveform\"    \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\n${SYNC} \"$SRCROOT/language\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/media\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\nif [ -f \"$SRCROOT/addons/skin.touched/addon.xml\" ]; then\n${SYNCSKIN} \"$SRCROOT/addons/skin.touched\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\n${SYNC} \"$SRCROOT/addons/skin.touched/background\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons/skin.touched\"\n${SYNC} \"$SRCROOT/addons/skin.touched/icon.png\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons/skin.touched\"\nfi\n${SYNCSKIN} \"$SRCROOT/addons/skin.confluence\" \t\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/backgrounds\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/icon.png\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/sounds\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/system\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/userdata\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n\nfi";
                        showEnvVarsInLog = 0;
                };
                F589B48D128A697C00D8079E /* copy frameworks */ = {
diff --git a/addons/skin.touched b/addons/skin.touched
new file mode 160000 (submodule)
index 0000000..1d03746
--- /dev/null
@@ -0,0 +1 @@
+Subproject commit 1d03746646111f97e28b807a290bd762c7db547c
diff --git a/addons/skin.touched/4x3Hirez/AddonBrowser.xml b/addons/skin.touched/4x3Hirez/AddonBrowser.xml
deleted file mode 100644 (file)
index 04d2db6..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-<window id="40">
-       <defaultcontrol always="true">50</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <views>50,500</views>
-       <onunload>Skin.Reset(MediaSubMenuVisible)</onunload>
-       <controls>
-               <include>CommonBackground</include>
-               <include>FileCountCommons</include>
-               <include>HomeButtonCommons</include>
-               <include>CommonNowPlaying</include>
-               <include>OptionsButtonCommons</include>
-               <control type="label">
-                       <description>Window label</description>
-                       <include>MediaWindowTitleCommons</include>
-                       <label>$LOCALIZE[24001]</label>
-               </control>
-               <control type="group">
-                       <include>Window_OpenClose_Animation_Zoom</include>
-                       <include>CommonRootViewAddons</include> <!-- view id = 50 -->
-                       <include>ThumbnailView</include> <!-- view id = 500 -->
-                       <include>ScrollArrowsCommons</include>
-               </control>
-               <include>MediaSubMenu</include>
-               <control type="group">
-                       <visible>Skin.HasSetting(MediaSubMenuVisible)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <control type="button">
-                               <description>Hidden button to close the sort when its focused</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>ScreenWidth</width>
-                               <height>ScreenHeight</height>
-                               <texturenofocus>-</texturenofocus>
-                               <texturefocus>-</texturefocus>
-                               <onclick>Skin.Reset(MediaSubMenuVisible)</onclick>
-                       </control>
-                       <control type="group">
-                               <posx>340r</posx>
-                               <posy>130</posy>
-                               <control type="image">
-                                       <description>Shadow Background</description>
-                                       <posx>-30</posx>
-                                       <posy>-30</posy>
-                                       <width>380</width>
-                                       <height>500</height>
-                                       <texture border="30">ShadowBorder.png</texture>
-                               </control>
-                               <control type="button">
-                                       <description>Panel Background image</description>
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>320</width>
-                                       <height>440</height>
-                                       <texturefocus border="5">SubBack.png</texturefocus>
-                                       <texturenofocus border="5">SubBack.png</texturenofocus>
-                                       <onclick>-</onclick>
-                               </control>
-                               <control type="image">
-                                       <description>Panel Forground image</description>
-                                       <posx>10</posx>
-                                       <posy>10</posy>
-                                       <width>300</width>
-                                       <height>420</height>
-                                       <texture border="5">SubBack2.png</texture>
-                               </control>
-                               <control type="image">
-                                       <description>Panel Arrow image</description>
-                                       <posx>270</posx>
-                                       <posy>-34</posy>
-                                       <width>40</width>
-                                       <height>40</height>
-                                       <texture>arrow-big-up.png</texture>
-                               </control>
-                               <control type="grouplist">
-                                       <posx>11</posx>
-                                       <posy>10</posy>
-                                       <width>298</width>
-                                       <height>420</height>
-                                       <onleft>9000</onleft>
-                                       <onright>50</onright>
-                                       <onup>9000</onup>
-                                       <ondown>9000</ondown>
-                                       <itemgap>0</itemgap>
-                                       <control type="button" id="3">
-                                               <description>Sort by button</description>
-                                               <include>ButtonCommonValues2</include>
-                                               <label>103</label>
-                                       </control>
-                                       <control type="togglebutton" id="4">
-                                               <description>Sort asc</description>
-                                               <include>ButtonCommonValues2</include>
-                                               <alttexturefocus>button-focus2.png</alttexturefocus>
-                                               <alttexturenofocus>button-nofocus.png</alttexturenofocus>
-                                               <label>31051</label>
-                                               <altlabel>31050</altlabel>
-                                               <usealttexture>Container.SortDirection(Ascending)</usealttexture>
-                                       </control>
-                                       <control type="radiobutton" id ="5">
-                                               <description>Enable auto-updates</description>
-                                               <include>ButtonCommonValues2</include>
-                                               <label>24063</label>
-                                       </control>
-                                       <control type="radiobutton" id ="6">
-                                               <description>No notifications</description>
-                                               <include>ButtonCommonValues2</include>
-                                               <label>25000</label>
-                                       </control>
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>100</posy>
-                                               <width>298</width>
-                                               <height>10</height>
-                                               <texture>shelf_shadow.png</texture>
-                                       </control>
-                               </control>
-                       </control>
-               </control>
-               <include>ScrollOffsetLabel</include>
-               <include>BehindDialogFadeOut</include>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/DialogAddonInfo.xml b/addons/skin.touched/4x3Hirez/DialogAddonInfo.xml
deleted file mode 100644 (file)
index c8543e5..0000000
+++ /dev/null
@@ -1,338 +0,0 @@
-<window id="146">
-       <defaultcontrol always="true"></defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <include>Window_OpenClose_Animation_Zoom</include>
-       <coordinates>
-               <system>1</system>
-               <posx>140</posx>
-               <posy>30</posy>
-       </coordinates>
-       <controls>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>1000</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="label">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>910</width>
-                       <label>$LOCALIZE[24003]</label>
-               </control>
-               <control type="group">
-                       <posx>930</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>1000</width>
-                       <height>840</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-
-               <control type="group">
-                       <posy>70</posy>
-                       <posx>20</posx>
-                       <control type="label">
-                               <description>Addon Title value</description>
-                               <posx>20</posx>
-                               <posy>0</posy>
-                               <width>960</width>
-                               <height>30</height>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <font>font28_title</font>
-                               <label>$INFO[ListItem.Property(Addon.Name)]</label>
-                               <textcolor>black</textcolor>
-                               <scroll>true</scroll>
-                       </control>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>40</posy>
-                               <width>260</width>
-                               <height>300</height>
-                               <aspectratio>keep</aspectratio>
-                               <bordertexture border="8">ThumbShadow.png</bordertexture>
-                               <bordersize>8</bordersize>
-                               <texture background="true">$INFO[ListItem.Icon]</texture>
-                       </control>
-                       <control type="label">
-                               <posx>280</posx>
-                               <posy>50</posy>
-                               <width>680</width>
-                               <height>30</height>
-                               <font>font13_title</font>
-                               <textcolor>black</textcolor>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <label>$LOCALIZE[21821]$INFO[Container(601).CurrentPage, ( $LOCALIZE[31024] ]$INFO[Container(601).NumPages,/, )]</label>
-                       </control>
-                       <control type="textbox" id="601">
-                               <description>Description Value for Albums</description>
-                               <posx>280</posx>
-                               <posy>80</posy>
-                               <width>680</width>
-                               <height>300</height>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <pagecontrol>-</pagecontrol>
-                               <label>$INFO[ListItem.Property(Addon.Description)]</label>
-                       </control>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>390</posy>
-                               <width>960</width>
-                               <height>5</height>
-                               <texture>separator.png</texture>
-                       </control>
-                       <control type="group">
-                               <posx>0</posx>
-                               <posy>420</posy>
-                               <control type="label">
-                                       <description>Type txt</description>
-                                       <posx>200</posx>
-                                       <posy>0</posy>
-                                       <width>200</width>
-                                       <height>25</height>
-                                       <label>$LOCALIZE[146]</label>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <font>font13_title</font>
-                                       <textcolor>black</textcolor>
-                               </control>
-                               <control type="label">
-                                       <description>Type Value</description>
-                                       <posx>210</posx>
-                                       <posy>0</posy>
-                                       <width>770</width>
-                                       <height>25</height>
-                                       <label fallback="416">$INFO[ListItem.Property(Addon.Type)]</label>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <scroll>true</scroll>
-                               </control>
-                               <control type="label">
-                                       <description>Author txt</description>
-                                       <posx>200</posx>
-                                       <posy>30</posy>
-                                       <width>200</width>
-                                       <height>25</height>
-                                       <label>$LOCALIZE[21863]:</label>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <font>font13_title</font>
-                                       <textcolor>black</textcolor>
-                               </control>
-                               <control type="label">
-                                       <description>Author Value</description>
-                                       <posx>210</posx>
-                                       <posy>30</posy>
-                                       <width>770</width>
-                                       <height>25</height>
-                                       <label fallback="416">$INFO[ListItem.Property(Addon.Creator)]</label>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <scroll>true</scroll>
-                               </control>
-                               <control type="label">
-                                       <description>Version txt</description>
-                                       <posx>200</posx>
-                                       <posy>60</posy>
-                                       <width>200</width>
-                                       <height>25</height>
-                                       <label>$LOCALIZE[24051]</label>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <font>font13_title</font>
-                                       <textcolor>black</textcolor>
-                               </control>
-                               <control type="label">
-                                       <description>Version Value</description>
-                                       <posx>210</posx>
-                                       <posy>60</posy>
-                                       <width>770</width>
-                                       <height>25</height>
-                                       <label fallback="416">$INFO[ListItem.Property(Addon.Version)]</label>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <scroll>true</scroll>
-                               </control>
-                               <control type="label">
-                                       <description>Rating txt</description>
-                                       <posx>200</posx>
-                                       <posy>90</posy>
-                                       <width>200</width>
-                                       <height>25</height>
-                                       <label>$LOCALIZE[563]:</label>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <font>font13_title</font>
-                                       <textcolor>black</textcolor>
-                               </control>
-                               <control type="image">
-                                       <description>Rating value</description>
-                                       <posx>208</posx>
-                                       <posy>88</posy>
-                                       <width>170</width>
-                                       <height>34</height>
-                                       <aspectratio align="left">keep</aspectratio>
-                                       <texture>$INFO[ListItem.Property(Addon.StarRating),dark/left_rating/]</texture>
-                               </control>
-                               <control type="label">
-                                       <description>Summary txt</description>
-                                       <posx>200</posx>
-                                       <posy>120</posy>
-                                       <width>200</width>
-                                       <height>25</height>
-                                       <label>$LOCALIZE[20037]:</label>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <font>font13_title</font>
-                                       <textcolor>black</textcolor>
-                               </control>
-                               <control type="fadelabel">
-                                       <description>Summary Value</description>
-                                       <posx>210</posx>
-                                       <posy>120</posy>
-                                       <width>770</width>
-                                       <height>25</height>
-                                       <label fallback="416">$INFO[ListItem.Property(Addon.Summary)]</label>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <scrollout>false</scrollout>
-                                       <pauseatend>2000</pauseatend>
-                               </control>
-                               <control type="label">
-                                       <description>Disclaimer txt</description>
-                                       <posx>200</posx>
-                                       <posy>150</posy>
-                                       <width>200</width>
-                                       <height>25</height>
-                                       <label>$LOCALIZE[24052]:</label>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <font>font13_title</font>
-                                       <textcolor>black</textcolor>
-                               </control>
-                               <control type="textbox">
-                                       <description>Disclaimer</description>
-                                       <posx>210</posx>
-                                       <posy>146</posy>
-                                       <width>770</width>
-                                       <height>60</height>
-                                       <font>font13</font>
-                                       <align>-</align>
-                                       <textcolor>black</textcolor>
-                                       <label fallback="231">$INFO[ListItem.Property(Addon.Disclaimer)]</label>
-                                       <autoscroll time="2000" delay="3000" repeat="5000">true</autoscroll>
-                               </control>
-                       </control>
-               </control>
-
-               <control type="grouplist" id="9000">
-                       <posx>20</posx>
-                       <posy>830</posy>
-                       <width>960</width>
-                       <height>50</height>
-                       <itemgap>5</itemgap>
-                       <align>center</align>
-                       <orientation>horizontal</orientation>
-                       <onleft>9000</onleft>
-                       <onright>9000</onright>
-                       <onup>50</onup>
-                       <ondown>49</ondown>
-                       <control type="button" id ="6">
-                               <description>Enable Addon button</description>
-                               <width>185</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>24022</label>
-                       </control>
-                       <control type="button" id="7">
-                               <description>Disable Addon button</description>
-                               <width>185</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>24021</label>
-                       </control>
-                       <control type="button" id="9">
-                               <description>Addon Settings</description>
-                               <width>185</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>24020</label>
-                       </control>
-                       <control type="button" id="8">
-                               <description>Update Addon button</description>
-                               <width>185</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>24069</label>
-                       </control>
-                       <control type="button" id="10">
-                               <description>Changelog button</description>
-                               <width>185</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>24036</label>
-                       </control>
-               </control>
-
-               <control type="group">
-                       <include>VisibleFadeEffect</include>
-                       <control type="group">
-                               <visible>!IsEmpty(ListItem.Property(Addon.broken))</visible>
-                               <posx>40</posx>
-                               <posy>720</posy>
-                               <control type="image">
-                                       <description>background image</description>
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>920</width>
-                                       <height>100</height>
-                                       <texture border="20">OverlayDialogBackground.png</texture>
-                               </control>
-                               <control type="image">
-                                       <description>Icon image</description>
-                                       <posx>18</posx>
-                                       <posy>18</posy>
-                                       <width>64</width>
-                                       <height>64</height>
-                                       <texture>DefaultIconError.png</texture>
-                               </control>
-                               <control type="label">
-                                       <description>header label</description>
-                                       <posx>100</posx>
-                                       <posy>15</posy>
-                                       <width>800</width>
-                                       <height>25</height>
-                                       <font>font13_title</font>
-                                       <label>24096</label>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>selected</textcolor>
-                               </control>
-                               <control type="textbox">
-                                       <description>Reason label</description>
-                                       <posx>100</posx>
-                                       <posy>35</posy>
-                                       <width>800</width>
-                                       <height>50</height>
-                                       <font>font13</font>
-                                       <label>$INFO[ListItem.Property(Addon.broken)]</label>
-                                       <align>left</align>
-                                       <textcolor>white</textcolor>
-                               </control>
-                       </control>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/DialogAddonSettings.xml b/addons/skin.touched/4x3Hirez/DialogAddonSettings.xml
deleted file mode 100644 (file)
index cdd5657..0000000
+++ /dev/null
@@ -1,200 +0,0 @@
-<window id="10140">
-       <defaultcontrol></defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <include>Window_OpenClose_Animation_Zoom</include>
-       <coordinates>
-               <system>1</system>
-               <posx>140</posx>
-               <posy>30</posy>
-       </coordinates>
-       <controls>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>1000</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="label" id="20">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>910</width>
-                       <label>-</label>
-               </control>
-               <control type="group">
-                       <posx>930</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>1000</width>
-                       <height>840</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-
-               <control type="group">
-                       <posx>20</posx>
-                       <posy>75</posy>
-                       <control type="button">
-                               <description>left Arrow</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>40</width>
-                               <height>40</height>
-                               <texturefocus>arrow-big-left.png</texturefocus>
-                               <texturenofocus>arrow-big-left.png</texturenofocus>
-                               <onclick>Control.Move(9,-1)</onclick>
-                               <include>VisibleFadeEffect</include>
-                               <visible>Container(9).HasPrevious</visible>
-                       </control>
-                       <control type="button" id="11001">
-                               <description>right Arrow</description>
-                               <posx>920</posx>
-                               <posy>0</posy>
-                               <width>40</width>
-                               <height>40</height>
-                               <texturefocus>arrow-big-right.png</texturefocus>
-                               <texturenofocus>arrow-big-right.png</texturenofocus>
-                               <onclick>Control.Move(9,1)</onclick>
-                               <include>VisibleFadeEffect</include>
-                               <visible>Container(9).HasNext</visible>
-                       </control>
-               </control>
-               <control type="grouplist" id="9">
-                       <description>button area</description>
-                       <posx>60</posx>
-                       <posy>70</posy>
-                       <width>880</width>
-                       <height>50</height>
-                       <itemgap>5</itemgap>
-                       <align>center</align>
-                       <orientation>horizontal</orientation>
-                       <onleft>9</onleft>
-                       <onright>9</onright>
-                       <onup>2</onup>
-                       <ondown>2</ondown>
-               </control>
-               <control type="grouplist" id="2">
-                       <description>control area</description>
-                       <posx>40</posx>
-                       <posy>140</posy>
-                       <width>920</width>
-                       <height>670</height>
-                       <itemgap>-1</itemgap>
-                       <pagecontrol>30</pagecontrol>
-                       <onup>9</onup>
-                       <ondown>9001</ondown>
-                       <onleft>2</onleft>
-                       <onright>30</onright>
-               </control>
-               <control type="scrollbar" id="30">
-                       <posx>975</posx>
-                       <posy>120</posy>
-                       <width>20</width>
-                       <height>670</height>
-                       <texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
-                       <texturesliderbar border="2,16,2,16">ScrollBarV_bar.png</texturesliderbar>
-                       <texturesliderbarfocus border="2,16,2,16">ScrollBarV_bar_focus.png</texturesliderbarfocus>
-                       <textureslidernib>ScrollBarNib.png</textureslidernib>
-                       <textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
-                       <onleft>2</onleft>
-                       <onright>9</onright>
-                       <showonepage>false</showonepage>
-                       <orientation>vertical</orientation>
-               </control>
-               <control type="grouplist" id="9001">
-                       <posx>20</posx>
-                       <posy>830</posy>
-                       <width>960</width>
-                       <height>50</height>
-                       <itemgap>5</itemgap>
-                       <align>center</align>
-                       <orientation>horizontal</orientation>
-                       <onleft>9001</onleft>
-                       <onright>9001</onright>
-                       <onup>2</onup>
-                       <ondown>9</ondown>
-                       <control type="button" id="10">
-                               <description>OK Button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>186</label>
-                       </control>
-                       <control type="button" id="11">
-                               <description>Cancel Button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>222</label>
-                       </control>
-                       <control type="button" id="12">
-                               <description>Defaults Button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>409</label>
-                       </control>
-               </control>
-
-               <control type="button" id="13">
-                       <description>Default Category Button</description>
-                       <width>200</width>
-                       <include>ButtonInfoDialogsCommonValues</include>
-               </control>
-               <control type="button" id="3">
-                       <description>Default Button</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <height>55</height>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-                       <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-               </control>
-               <control type="radiobutton" id="4">
-                       <description>Default RadioButton</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <height>55</height>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-                       <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-               </control>
-               <control type="spincontrolex" id="5">
-                       <description>Default SpinControlex</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <height>55</height>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-                       <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-                       <aligny>center</aligny>
-                       <reverse>yes</reverse>
-               </control>
-               <control type="image" id="6">
-                       <description>separator image</description>
-                       <height>5</height>
-                       <texture>separator.png</texture>
-               </control>
-               <control type="label" id="7">
-                       <height>50</height>
-                       <font>font13_title</font>
-                       <label>-</label>
-                       <textcolor>black</textcolor>
-                       <align>center</align>
-                       <aligny>center</aligny>
-               </control>
-               <control type="sliderex" id="8">
-                       <description>Default Slider</description>
-                       <height>55</height>
-                       <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/DialogAlbumInfo.xml b/addons/skin.touched/4x3Hirez/DialogAlbumInfo.xml
deleted file mode 100644 (file)
index e3086cc..0000000
+++ /dev/null
@@ -1,550 +0,0 @@
-<window id="2001">
-       <defaultcontrol always="true">5</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <include>Window_OpenClose_Animation_Zoom</include>
-       <coordinates>
-               <system>1</system>
-               <posx>140</posx>
-               <posy>30</posy>
-       </coordinates>
-       <controls>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>1000</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="label">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>910</width>
-                       <label>$INFO[Listitem.Album]</label>
-                       <visible>container.content(Albums)</visible>
-               </control>
-               <control type="label">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>910</width>
-                       <label>$INFO[Listitem.Artist]</label>
-                       <visible>container.content(Artists)</visible>
-               </control>
-               <control type="group">
-                       <posx>930</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>1000</width>
-                       <height>840</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-
-               <control type="group">
-                       <visible>Container.Content(Albums) + !Control.IsVisible(50)</visible>
-                       <posy>70</posy>
-                       <posx>20</posx>
-                       <include>VisibleFadeEffect</include>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>260</width>
-                               <height>360</height>
-                               <aspectratio>keep</aspectratio>
-                               <bordertexture border="8">ThumbShadow.png</bordertexture>
-                               <bordersize>8</bordersize>
-                               <texture background="true">$INFO[ListItem.Icon]</texture>
-                       </control>
-                       <control type="label">
-                               <posx>280</posx>
-                               <posy>0</posy>
-                               <width>680</width>
-                               <height>30</height>
-                               <font>font13_title</font>
-                               <textcolor>black</textcolor>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <label>$LOCALIZE[21821]$INFO[Container(601).CurrentPage, ( $LOCALIZE[31024] ]$INFO[Container(601).NumPages,/, )]</label>
-                       </control>
-                       <control type="textbox" id="601">
-                               <description>Description Value for Albums</description>
-                               <posx>280</posx>
-                               <posy>30</posy>
-                               <width>680</width>
-                               <height>330</height>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <pagecontrol>-</pagecontrol>
-                               <label>$INFO[ListItem.Property(Album_Description)]</label>
-                       </control>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>390</posy>
-                               <width>960</width>
-                               <height>5</height>
-                               <texture>separator.png</texture>
-                       </control>
-                       <control type="list" id="49">
-                               <posx>0</posx>
-                               <posy>400</posy>
-                               <width>960</width>
-                               <height>330</height>
-                               <onleft>49</onleft>
-                               <onright>49</onright>
-                               <onup>9000</onup>
-                               <ondown>61</ondown>
-                               <pagecontrol>-</pagecontrol>
-                               <scrolltime>200</scrolltime>
-                               <itemlayout height="30">
-                                       <control type="label">
-                                               <posx>200</posx>
-                                               <posy>0</posy>
-                                               <width>160</width>
-                                               <height>30</height>
-                                               <font>font13_title</font>
-                                               <align>right</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <info>ListItem.Label</info>
-                                       </control>
-                                       <control type="label">
-                                               <posx>210</posx>
-                                               <posy>0</posy>
-                                               <width>750</width>
-                                               <height>30</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>white</selectedcolor>
-                                               <info>ListItem.Label2</info>
-                                       </control>
-                               </itemlayout>
-                               <focusedlayout height="30">
-                                       <control type="label">
-                                               <posx>200</posx>
-                                               <posy>0</posy>
-                                               <width>160</width>
-                                               <height>30</height>
-                                               <font>font13_title</font>
-                                               <align>right</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <info>ListItem.Label</info>
-                                       </control>
-                                       <control type="label">
-                                               <posx>210</posx>
-                                               <posy>0</posy>
-                                               <width>750</width>
-                                               <height>30</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>white</selectedcolor>
-                                               <info>ListItem.Label2</info>
-                                       </control>
-                               </focusedlayout>
-                               <content>
-                                       <item>
-                                               <label>$LOCALIZE[557]:</label>
-                                               <label2>$INFO[ListItem.Artist]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Artist)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[515]:</label>
-                                               <label2>$INFO[ListItem.Genre]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Genre)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[563]:</label>
-                                               <label2>$INFO[ListItem.Rating]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Rating)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[175]:</label>
-                                               <label2>$INFO[ListItem.Property(Album_Mood)]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Property(Album_Mood))</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[176]:</label>
-                                               <label2>$INFO[ListItem.Property(Album_Style)]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Property(Album_Style))</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[21895]:</label>
-                                               <label2>$INFO[ListItem.Property(Album_Theme)]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Property(Album_Theme))</visible>
-                                       </item>
-                                       <item>
-                                               <label>146</label>
-                                               <label2>$INFO[ListItem.Property(Album_Type)]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Property(Album_Type))</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[21899]:</label>
-                                               <label2>$INFO[ListItem.Property(Album_Label)]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Property(Album_Label))</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[562]:</label>
-                                               <label2>$INFO[ListItem.Year]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Year)</visible>
-                                       </item>
-                               </content>
-                       </control>
-               </control>
-
-               <control type="group">
-                       <visible>Container.Content(Artists) + !Control.IsVisible(50)</visible>
-                       <posy>70</posy>
-                       <posx>20</posx>
-                       <include>VisibleFadeEffect</include>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>260</width>
-                               <height>360</height>
-                               <aspectratio>keep</aspectratio>
-                               <bordertexture border="8">ThumbShadow.png</bordertexture>
-                               <bordersize>8</bordersize>
-                               <texture background="true">$INFO[ListItem.Icon]</texture>
-                       </control>
-                       <control type="label">
-                               <posx>280</posx>
-                               <posy>0</posy>
-                               <width>680</width>
-                               <height>30</height>
-                               <font>font13_title</font>
-                               <textcolor>black</textcolor>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <label>$LOCALIZE[21821]$INFO[Container(600).CurrentPage, ( $LOCALIZE[31024] ]$INFO[Container(600).NumPages,/, )]</label>
-                       </control>
-                       <control type="textbox" id="600">
-                               <description>Description Value for Albums</description>
-                               <posx>280</posx>
-                               <posy>30</posy>
-                               <width>680</width>
-                               <height>330</height>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <pagecontrol>-</pagecontrol>
-                               <label>$INFO[ListItem.Property(Artist_Description)]</label>
-                       </control>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>390</posy>
-                               <width>960</width>
-                               <height>5</height>
-                               <texture>separator.png</texture>
-                       </control>
-                       <control type="list" id="49">
-                               <posx>0</posx>
-                               <posy>400</posy>
-                               <width>960</width>
-                               <height>330</height>
-                               <onleft>49</onleft>
-                               <onright>49</onright>
-                               <onup>9000</onup>
-                               <ondown>61</ondown>
-                               <pagecontrol>-</pagecontrol>
-                               <scrolltime>200</scrolltime>
-                               <itemlayout height="30">
-                                       <control type="label">
-                                               <posx>200</posx>
-                                               <posy>0</posy>
-                                               <width>160</width>
-                                               <height>30</height>
-                                               <font>font13_title</font>
-                                               <align>right</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <info>ListItem.Label</info>
-                                       </control>
-                                       <control type="label">
-                                               <posx>210</posx>
-                                               <posy>0</posy>
-                                               <width>750</width>
-                                               <height>30</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>white</selectedcolor>
-                                               <info>ListItem.Label2</info>
-                                       </control>
-                               </itemlayout>
-                               <focusedlayout height="30">
-                                       <control type="label">
-                                               <posx>200</posx>
-                                               <posy>0</posy>
-                                               <width>160</width>
-                                               <height>30</height>
-                                               <font>font13_title</font>
-                                               <align>right</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <info>ListItem.Label</info>
-                                       </control>
-                                       <control type="label">
-                                               <posx>210</posx>
-                                               <posy>0</posy>
-                                               <width>750</width>
-                                               <height>30</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>white</selectedcolor>
-                                               <info>ListItem.Label2</info>
-                                       </control>
-                               </focusedlayout>
-                               <content>
-                                       <item>
-                                               <label>$LOCALIZE[21893]:</label>
-                                               <label2>$INFO[ListItem.Property(Artist_Born)]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Property(Artist_Born))</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[21894]:</label>
-                                               <label2>$INFO[ListItem.Property(Artist_Formed)]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Property(Artist_Formed))</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[515]:</label>
-                                               <label2>$INFO[ListItem.Genre]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Genre)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[175]:</label>
-                                               <label2>$INFO[ListItem.Property(Artist_Mood)]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Property(Artist_Mood))</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[176]:</label>
-                                               <label2>$INFO[ListItem.Property(Artist_Style)]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Property(Artist_Style))</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[21892]:</label>
-                                               <label2>$INFO[ListItem.Property(Artist_Instrument)]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Property(Artist_Instrument))</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[21897]:</label>
-                                               <label2>$INFO[ListItem.Property(Artist_Died)]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Property(Artist_Died))</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[21896]:</label>
-                                               <label2>$INFO[ListItem.Property(Artist_Disbanded)]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Property(Artist_Disbanded))</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[21898]:</label>
-                                               <label2>$INFO[ListItem.Property(Artist_YearsActive)]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Property(Artist_YearsActive))</visible>
-                                       </item>
-                               </content>
-                       </control>
-               </control>
-
-               <control type="panel" id="50">
-                       <posx>0</posx>
-                       <posy>85</posy>
-                       <width>1000</width>
-                       <height>680</height>
-                       <onup>50</onup>
-                       <onleft>50</onleft>
-                       <onright>50</onright>
-                       <ondown>50</ondown>
-                       <pagecontrol>-</pagecontrol>
-                       <scrolltime>200</scrolltime>
-                       <include>VisibleFadeEffect</include>
-                       <itemlayout condition="Container.Content(Albums)" height="60" width="1000">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>-2</posy>
-                                       <width>1000</width>
-                                       <height>5</height>
-                                       <texture>separator.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>30</posx>
-                                       <posy>0</posy>
-                                       <width>940</width>
-                                       <height>60</height>
-                                       <font>font13</font>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>black</textcolor>
-                                       <label>([B]$INFO[ListItem.TrackNumber][/B]) - $INFO[ListItem.Label]</label>
-                               </control>
-                               <control type="label">
-                                       <posx>970</posx>
-                                       <posy>0</posy>
-                                       <width>500</width>
-                                       <height>60</height>
-                                       <font>font13</font>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>black</textcolor>
-                                       <label>$INFO[ListItem.Duration]</label>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout condition="Container.Content(Albums)" height="60" width="700">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>-2</posy>
-                                       <width>1000</width>
-                                       <height>5</height>
-                                       <texture>separator.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>30</posx>
-                                       <posy>0</posy>
-                                       <width>940</width>
-                                       <height>60</height>
-                                       <font>font13</font>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>black</textcolor>
-                                       <label>([B]$INFO[ListItem.TrackNumber][/B]) - $INFO[ListItem.Label]</label>
-                               </control>
-                               <control type="label">
-                                       <posx>970</posx>
-                                       <posy>0</posy>
-                                       <width>500</width>
-                                       <height>60</height>
-                                       <font>font13</font>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>black</textcolor>
-                                       <label>$INFO[ListItem.Duration]</label>
-                               </control>
-                       </focusedlayout>
-                       <itemlayout condition="Container.Content(Artists)" height="260" width="250">
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>0</posy>
-                                       <width>230</width>
-                                       <height>230</height>
-                                       <texture>$INFO[ListItem.Icon]</texture>
-                                       <bordertexture border="8">ThumbShadow.png</bordertexture>
-                                       <bordersize>8</bordersize>
-                               </control>
-                               <control type="label">
-                                       <posx>125</posx>
-                                       <posy>230</posy>
-                                       <width>230</width>
-                                       <height>30</height>
-                                       <font>font12</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>black</textcolor>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout condition="Container.Content(Artists)" height="260" width="250">
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>0</posy>
-                                       <width>230</width>
-                                       <height>230</height>
-                                       <texture>$INFO[ListItem.Icon]</texture>
-                                       <bordertexture border="8">ThumbShadow.png</bordertexture>
-                                       <bordersize>8</bordersize>
-                               </control>
-                               <control type="label">
-                                       <posx>125</posx>
-                                       <posy>230</posy>
-                                       <width>230</width>
-                                       <height>30</height>
-                                       <font>font12</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>black</textcolor>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                       </focusedlayout>
-               </control>
-               <control type="label">
-                       <posx>980</posx>
-                       <posy>790</posy>
-                       <width>800</width>
-                       <height>30</height>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-                       <scroll>true</scroll>
-                       <align>right</align>
-                       <aligny>center</aligny>
-                       <label>$INFO[Container(50).CurrentPage, ( $LOCALIZE[31024] ]$INFO[Container(50).NumPages,/, )]</label>
-                       <visible>Control.IsVisible(50)</visible>
-               </control>
-
-               <control type="grouplist" id="9000">
-                       <posx>20</posx>
-                       <posy>830</posy>
-                       <width>960</width>
-                       <height>50</height>
-                       <itemgap>10</itemgap>
-                       <align>center</align>
-                       <orientation>horizontal</orientation>
-                       <onleft>9000</onleft>
-                       <onright>9000</onright>
-                       <onup>50</onup>
-                       <ondown>49</ondown>
-                       <control type="button" id="5">
-                               <description>Cast/Review</description>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>206</label>
-                       </control>
-                       <control type="button" id="6">
-                               <description>Refresh</description>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>184</label>
-                       </control>
-                       <control type="button" id="10">
-                               <description>Get Thumb</description>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>13405</label>
-                       </control>
-                       <control type="button" id="12">
-                               <description>Get Fanart</description>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>20413</label>
-                       </control>
-               </control>
-
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/DialogBusy.xml b/addons/skin.touched/4x3Hirez/DialogBusy.xml
deleted file mode 100644 (file)
index 5543873..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-<window id="136">
-       <animation effect="fade" time="100">WindowOpen</animation>
-       <animation effect="fade" time="200">WindowClose</animation>
-       <coordinates>
-               <system>1</system>
-               <posx>0</posx>
-               <posy>0</posy>
-       </coordinates>
-       <controls>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>ScreenWidth</width>
-                       <height>ScreenHeight</height>
-                       <colordiffuse>BBFFFFFF</colordiffuse>
-                       <texture>black-back.png</texture>
-               </control>
-               <control type="group">
-                       <posx>490</posx>
-                       <posy>420</posy>
-                       <control type="image">
-                               <description>background image</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>300</width>
-                               <height>100</height>
-                               <texture border="20">OverlayDialogBackground.png</texture>
-                       </control>
-                       <control type="image">
-                               <description>Busy animation</description>
-                               <posx>20</posx>
-                               <posy>25</posy>
-                               <width>50</width>
-                               <height>50</height>
-                               <texture>busy.png</texture>
-                               <aspectratio>keep</aspectratio>
-                               <animation effect="rotate" start="0" end="360" center="auto" time="1200" loop="true" condition="true">conditional</animation>
-                       </control>
-                       <control type="label">
-                               <description>Busy label</description>
-                               <posx>90</posx>
-                               <posy>34</posy>
-                               <width>180</width>
-                               <height>32</height>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <label>$LOCALIZE[31009]</label>
-                               <font>font16</font>
-                       </control>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/DialogButtonMenu.xml b/addons/skin.touched/4x3Hirez/DialogButtonMenu.xml
deleted file mode 100644 (file)
index 939f55e..0000000
+++ /dev/null
@@ -1,266 +0,0 @@
-<window type="buttonMenu" id="111">
-       <defaultcontrol always="true">13</defaultcontrol>
-       <include>dialogeffect</include>
-       <coordinates>
-               <system>1</system>
-               <posx>0</posx>
-               <posy>0</posy>
-       </coordinates>
-       <controls>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>1280</width>
-                       <height>720</height>
-                       <texture>black-back.png</texture>
-               </control>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>1280</width>
-                       <height>720</height>
-                       <texture>black-back.png</texture>
-                       <colordiffuse>99FFFFFF</colordiffuse>
-               </control>
-               <control type="group">
-                       <posx>305</posx>
-                       <posy>245</posy>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>670</width>
-                               <height>210</height>
-                               <texture border="20">OverlayDialogBackground.png</texture>
-                               <visible>!System.HasAlarm(shutdowntimer)</visible>
-                       </control>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>670</width>
-                               <height>235</height>
-                               <texture border="20">OverlayDialogBackground.png</texture>
-                               <visible>System.HasAlarm(shutdowntimer)</visible>
-                       </control>
-                       <control type="image">
-                               <posx>10</posx>
-                               <posy>5</posy>
-                               <width>650</width>
-                               <height>60</height>
-                               <aspectratio>stretch</aspectratio>
-                               <texture>GlassTitleBar.png</texture>
-                       </control>
-                       <control type="button">
-                               <description>Close Window button</description>
-                               <posx>570</posx>
-                               <posy>5</posy>
-                               <width>64</width>
-                               <height>32</height>
-                               <label>-</label>
-                               <font>-</font>
-                               <onclick>PreviousMenu</onclick>
-                               <texturefocus>DialogCloseButton-focus.png</texturefocus>
-                               <texturenofocus>DialogCloseButton.png</texturenofocus>
-                               <onleft>13</onleft>
-                               <onright>13</onright>
-                               <onup>13</onup>
-                               <ondown>13</ondown>
-                               <visible>system.getbool(input.enablemouse)</visible>
-                       </control>
-                       <control type="label" id="3100">
-                               <description>Label control</description>
-                               <posx>10</posx>
-                               <posy>15</posy>
-                               <width>650</width>
-                               <height>35</height>
-                               <label>-</label>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <font>font24_title</font>
-                               <textcolor>white</textcolor>
-                               <shadowcolor>black</shadowcolor>
-                       </control>
-                       <control type="image">
-                               <posx>10</posx>
-                               <posy>60</posy>
-                               <width>650</width>
-                               <height>100</height>
-                               <aspectratio>stretch</aspectratio>
-                               <texture>GlassTitleBar.png</texture>
-                               <colordiffuse>99FFFFFF</colordiffuse>
-                       </control>
-                       <control type="grouplist">
-                               <posx>15</posx>
-                               <posy>85</posy>
-                               <width>640</width>
-                               <itemgap>20</itemgap>
-                               <align>center</align>
-                               <orientation>Horizontal</orientation>
-                               <control type="togglebutton" id="9">
-                                       <description>Master mode button</description>
-                                       <width>90</width>
-                                       <height>90</height>
-                                       <label>20046</label>
-                                       <altlabel>20045</altlabel>
-                                       <texturefocus>ButtonMenuMasterFO.png</texturefocus>
-                                       <texturenofocus>ButtonMenuMasterNF.png</texturenofocus>
-                                       <usealttexture>!System.IsMaster</usealttexture>
-                                       <alttexturefocus>ButtonMenuNoMasterFO.png</alttexturefocus>
-                                       <alttexturenofocus>ButtonMenuNoMasterNF.png</alttexturenofocus>
-                                       <onclick>xbmc.mastermode</onclick>
-                                       <pulseonselect>no</pulseonselect>
-                                       <font>-</font>
-                                       <visible>System.HasLocks</visible>
-                               </control>
-                               <control type="button" id="10">
-                                       <description>LogOff Profile</description>
-                                       <width>90</width>
-                                       <height>90</height>
-                                       <texturefocus>ButtonMenuLogOffFO.png</texturefocus>
-                                       <texturenofocus>ButtonMenuLogOffNF.png</texturenofocus>
-                                       <onclick>dialog.close(all,true)</onclick>
-                                       <onclick>System.LogOff</onclick>
-                                       <pulseonselect>no</pulseonselect>
-                                       <font>-</font>
-                                       <label>$LOCALIZE[20126] $INFO[system.profilename]</label>
-                                       <visible>System.HasLoginScreen | IntegerGreaterThan(System.ProfileCount,1)</visible>
-                                       <visible>System.Loggedon</visible>
-                               </control>
-                               <control type="button" id="11">
-                                       <description>Exit xbmc</description>
-                                       <width>90</width>
-                                       <height>90</height>
-                                       <texturefocus>ButtonMenuExitFO.png</texturefocus>
-                                       <texturenofocus>ButtonMenuExitNF.png</texturenofocus>
-                                       <onclick>XBMC.Quit()</onclick>
-                                       <pulseonselect>no</pulseonselect>
-                                       <font>-</font>
-                                       <label>$LOCALIZE[13012]</label>
-                               </control>
-                               <control type="group" id="13">
-                                       <width>90</width>
-                                       <defaultcontrol always="true">15</defaultcontrol>
-                                       <control type="button" id="17">
-                                               <description>Cancel Shutdown Timer button</description>
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>90</width>
-                                               <height>90</height>
-                                               <texturefocus>-</texturefocus>
-                                               <texturenofocus>-</texturenofocus>
-                                               <onclick>XBMC.CancelAlarm(shutdowntimer)</onclick>
-                                               <pulseonselect>no</pulseonselect>
-                                               <font>-</font>
-                                               <label>20151</label>
-                                               <onleft>11</onleft>
-                                               <onright>12</onright>
-                                               <onup>15</onup>
-                                               <ondown>16</ondown>
-                                               <visible>System.HasAlarm(shutdowntimer)</visible>
-                                       </control>
-                                       <control type="button" id="16">
-                                               <description>Custom Shutdown Timer button</description>
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>90</width>
-                                               <height>90</height>
-                                               <texturefocus>-</texturefocus>
-                                               <texturenofocus>-</texturenofocus>
-                                               <onclick>XBMC.AlarmClock(shutdowntimer,XBMC.Powerdown())</onclick>
-                                               <pulseonselect>no</pulseonselect>
-                                               <font>-</font>
-                                               <label>20150</label>
-                                               <onleft>11</onleft>
-                                               <onright>12</onright>
-                                               <onup>17</onup>
-                                               <ondown>15</ondown>
-                                       </control>
-                                       <control type="button" id="15">
-                                               <description>Shutdown button</description>
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>90</width>
-                                               <height>90</height>
-                                               <texturefocus>-</texturefocus>
-                                               <texturenofocus>ButtonMenuShutdownNF.png</texturenofocus>
-                                               <onclick>XBMC.Powerdown()</onclick>
-                                               <pulseonselect>no</pulseonselect>
-                                               <font>-</font>
-                                               <label>13016</label>
-                                               <onleft>11</onleft>
-                                               <onright>12</onright>
-                                               <onup>16</onup>
-                                               <ondown>17</ondown>
-                                       </control>
-                                       <control type="image">
-                                               <description>Shutdown focus image</description>
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>90</width>
-                                               <height>90</height>
-                                               <texture>ButtonMenuShutdownFO.png</texture>
-                                               <visible>Control.HasFocus(15) | Control.HasFocus(16) | Control.HasFocus(17)</visible>
-                                       </control>
-                               </control>
-                               <control type="button" id="12">
-                                       <description>Suspend xbmc</description>
-                                       <width>90</width>
-                                       <height>90</height>
-                                       <texturefocus>ButtonMenuSleepFO.png</texturefocus>
-                                       <texturenofocus>ButtonMenuSleepNF.png</texturenofocus>
-                                       <onclick>XBMC.Suspend()</onclick>
-                                       <pulseonselect>no</pulseonselect>
-                                       <font>-</font>
-                                       <label>$LOCALIZE[13011]</label>
-                               </control>
-                               <control type="button" id="14">
-                                       <description>Reboot button</description>
-                                       <width>90</width>
-                                       <height>90</height>
-                                       <texturefocus>ButtonMenuRestartFO.png</texturefocus>
-                                       <texturenofocus>ButtonMenuRestartNF.png</texturenofocus>
-                                       <onclick>XBMC.Reset()</onclick>
-                                       <pulseonselect>no</pulseonselect>
-                                       <font>-</font>
-                                       <label>13013</label>
-                               </control>
-                       </control>
-                       <control type="group">
-                               <posx>270</posx>
-                               <posy>70</posy>
-                               <visible>ControlGroup(13).HasFocus</visible>
-                               <include>VisibleFadeEffect</include>
-                               <animation effect="slide" start="0,0" end="55,0" time="0" condition="System.HasLocks">Conditional</animation>
-                               <animation effect="slide" start="0,0" end="55,0" time="0" condition="[System.HasLoginScreen | IntegerGreaterThan(System.ProfileCount,1)] + System.LoggedOn">Conditional</animation>
-                               <control type="image">
-                                       <description>Shutdown Arrow Up image</description>
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>20</width>
-                                       <height>15</height>
-                                       <texture>ArrowUp.png</texture>
-                               </control>
-                               <control type="image">
-                                       <description>Shutdown Arrow Down image</description>
-                                       <posx>0</posx>
-                                       <posy>107</posy>
-                                       <width>20</width>
-                                       <height>15</height>
-                                       <texture>ArrowDown.png</texture>
-                               </control>
-                       </control>
-                       <control type="label">
-                               <posx>10</posx>
-                               <posy>190</posy>
-                               <width>650</width>
-                               <height>35</height>
-                               <font>font12</font>
-                               <textcolor>white</textcolor>
-                               <shadowcolor>black</shadowcolor>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <label>$LOCALIZE[31329] [B]$INFO[System.Alarmpos][/B]</label>
-                               <visible>System.HasAlarm(shutdowntimer)</visible>
-                       </control>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/DialogContentSettings.xml b/addons/skin.touched/4x3Hirez/DialogContentSettings.xml
deleted file mode 100644 (file)
index 6c2806e..0000000
+++ /dev/null
@@ -1,311 +0,0 @@
-<window id="132">
-       <defaultcontrol always="true">3</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <include>Window_OpenClose_Animation_Zoom</include>
-       <coordinates>
-               <system>1</system>
-               <posx>140</posx>
-               <posy>30</posy>
-       </coordinates>
-       <controls>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>1000</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="label" id="1">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>910</width>
-                       <label>$LOCALIZE[20333]</label>
-               </control>
-               <control type="group">
-                       <posx>930</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>1000</width>
-                       <height>840</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-
-               <control type="group">
-                       <posx>20</posx>
-                       <control type="label">
-                               <description>Content Picker Header</description>
-                               <posx>0</posx>
-                               <posy>70</posy>
-                               <width>460</width>
-                               <height>40</height>
-                               <font>font13_title</font>
-                               <label>$LOCALIZE[20344]</label>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <textcolor>black</textcolor>
-                       </control>
-                       <control type="spincontrolex" id="3">
-                               <description>Content Picker</description>
-                               <posx>0</posx>
-                               <posy>120</posy>
-                               <width>460</width>
-                               <height>50</height>
-                               <texturefocus border="5">ListNF.png</texturefocus>
-                               <texturenofocus border="5">ListNF.png</texturenofocus>
-                               <font>-</font>
-                               <label>-</label>
-                               <reverse>yes</reverse>
-                               <onup>28</onup>
-                               <ondown>5</ondown>
-                               <onleft>60</onleft>
-                               <onright>4</onright>
-                       </control>
-                       <control type="label">
-                               <description>Content Picker label</description>
-                               <posx>10</posx>
-                               <posy>120</posy>
-                               <width>280</width>
-                               <height>50</height>
-                               <font>font13</font>
-                               <label>$INFO[Control.GetLabel(3)]</label>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <textcolor>white</textcolor>
-                       </control>
-                       <control type="label">
-                               <description>Used Scraper Header</description>
-                               <posx>0</posx>
-                               <posy>180</posy>
-                               <width>460</width>
-                               <height>20</height>
-                               <font>font13</font>
-                               <label>$LOCALIZE[31312]</label>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <textcolor>black</textcolor>
-                               <shadowcolor>black</shadowcolor>
-                       </control>
-                       <control type="image">
-                               <description>Used Scraper Image</description>
-                               <posx>0</posx>
-                               <posy>210</posy>
-                               <width>460</width>
-                               <height>190</height>
-                               <aspectratio>keep</aspectratio>
-                               <texture>$INFO[ListItem.Icon]</texture>
-                               <bordertexture border="8">ThumbShadow.png</bordertexture>
-                               <bordersize>8</bordersize>
-                       </control>
-                       <control type="label">
-                               <description>Used Scaper Label</description>
-                               <posx>0</posx>
-                               <posy>400</posy>
-                               <width>460</width>
-                               <height>30</height>
-                               <font>font13</font>
-                               <label>[B]$INFO[ListItem.Label][/B]</label>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <textcolor>black</textcolor>
-                       </control>
-               </control>
-               <control type="group">
-                       <posx>520</posx>
-                       <control type="label">
-                               <description>Scraper List Header</description>
-                               <posx>0</posx>
-                               <posy>70</posy>
-                               <width>460</width>
-                               <height>40</height>
-                               <font>font13_title</font>
-                               <label>$LOCALIZE[31313]</label>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <textcolor>black</textcolor>
-                       </control>
-                       <control type="list" id="4">
-                               <posx>0</posx>
-                               <posy>120</posy>
-                               <width>460</width>
-                               <height>310</height>
-                               <onup>4</onup>
-                               <onleft>3</onleft>
-                               <onright>60</onright>
-                               <ondown>4</ondown>
-                               <pagecontrol>60</pagecontrol>
-                               <scrolltime>200</scrolltime>
-                               <itemlayout height="50" width="460">
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>460</width>
-                                               <height>51</height>
-                                               <texture>MenuItemNF.png</texture>
-                                       </control>
-                                       <control type="image">
-                                               <posx>5</posx>
-                                               <posy>5</posy>
-                                               <width>40</width>
-                                               <height>40</height>
-                                               <texture>$INFO[Listitem.Icon]</texture>
-                                       </control>
-                                       <control type="label" width="460">
-                                               <posx>60</posx>
-                                               <posy>0</posy>
-                                               <width>410</width>
-                                               <height>50</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <info>ListItem.Label</info>
-                                       </control>
-                               </itemlayout>
-                               <focusedlayout height="50">
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>460</width>
-                                               <height>51</height>
-                                               <texture>MenuItemNF.png</texture>
-                                       </control>
-                                       <control type="image">
-                                               <posx>5</posx>
-                                               <posy>5</posy>
-                                               <width>40</width>
-                                               <height>40</height>
-                                               <texture>$INFO[Listitem.Icon]</texture>
-                                       </control>
-                                       <control type="label" width="460">
-                                               <posx>60</posx>
-                                               <posy>0</posy>
-                                               <width>410</width>
-                                               <height>50</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <info>ListItem.Label</info>
-                                       </control>
-                               </focusedlayout>
-                       </control>
-               </control>
-               <control type="image">
-                       <posx>20</posx>
-                       <posy>460</posy>
-                       <width>960</width>
-                       <height>5</height>
-                       <texture>separator.png</texture>
-               </control>
-               <control type="label">
-                       <description>Scanning Options Header</description>
-                       <posx>20</posx>
-                       <posy>490</posy>
-                       <width>960</width>
-                       <height>30</height>
-                       <font>font13_title</font>
-                       <label>$LOCALIZE[31314]</label>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <textcolor>black</textcolor>
-               </control>
-               <control type="grouplist" id="5">
-                       <description>control area</description>
-                       <posx>20</posx>
-                       <posy>540</posy>
-                       <width>960</width>
-                       <height>250</height>
-                       <itemgap>-1</itemgap>
-                       <onup>3</onup>
-                       <ondown>28</ondown>
-                       <onleft>5</onleft>
-                       <onright>5</onright>
-               </control>
-               <control type="grouplist" id="9000">
-                       <posx>20</posx>
-                       <posy>830</posy>
-                       <width>960</width>
-                       <height>50</height>
-                       <itemgap>5</itemgap>
-                       <align>center</align>
-                       <orientation>horizontal</orientation>
-                       <onleft>9000</onleft>
-                       <onright>9000</onright>
-                       <onup>50</onup>
-                       <ondown>49</ondown>
-                       <control type="button" id="28">
-                               <description>OK Button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>186</label>
-                       </control>
-                       <control type="button" id="29">
-                               <description>Cancel Button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>222</label>
-                       </control>
-                       <control type="button" id="6">
-                               <description>Settings Button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>5</label>
-                       </control>
-               </control>
-
-               <control type="button" id="7">
-                       <description>Default Button</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <height>50</height>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-                       <texturefocus border="5">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="5">MenuItemNF.png</texturenofocus>
-               </control>
-               <control type="radiobutton" id="8">
-                       <description>Default RadioButton</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <height>50</height>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-                       <texturefocus border="5">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="5">MenuItemNF.png</texturenofocus>
-               </control>
-
-               <control type="group">
-                       <control type="image">
-                               <posx>370</posx>
-                               <posy>60</posy>
-                               <width>5</width>
-                               <height>280</height>
-                               <aspectratio>stretch</aspectratio>
-                               <texture>separator_vertical.png</texture>
-                       </control>
-                       <control type="scrollbar" id="60">
-                               <posx>745</posx>
-                               <posy>100</posy>
-                               <width>25</width>
-                               <height>240</height>
-                               <texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
-                               <texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
-                               <texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
-                               <textureslidernib>ScrollBarNib.png</textureslidernib>
-                               <textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
-                               <onleft>4</onleft>
-                               <onright>3</onright>
-                               <showonepage>false</showonepage>
-                               <orientation>vertical</orientation>
-                       </control>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/DialogContextMenu.xml b/addons/skin.touched/4x3Hirez/DialogContextMenu.xml
deleted file mode 100644 (file)
index 4e21f02..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-<window id="106">
-       <defaultcontrol>1000</defaultcontrol>
-       <include>dialogeffect</include>
-       <coordinates>
-               <system>1</system>
-               <posx>0</posx>
-               <posy>0</posy>
-       </coordinates>
-       <controls>
-               <control type="image" id="999">
-                       <description>background image</description>
-                       <posx>0</posx>
-                       <posy>-20</posy>
-                       <width>400</width>
-                       <height>760</height>
-                       <texture border="5">SubBack.png</texture>
-               </control>
-               <control type="label">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>-20</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>300</width>
-                       <label>$LOCALIZE[31007]</label>
-               </control>
-               <control type="group">
-                       <posx>330</posx>
-                       <posy>-20</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               <control type="grouplist" id="996">
-                       <description>grouplist for context buttons</description>
-                       <posx>10</posx>
-                       <posy>40</posy>
-                       <width>400</width>
-                       <height max="690">auto</height>
-                       <itemgap>0</itemgap>
-               </control>
-               <control type="button" id="1000">
-                       <description>button template</description>
-                       <posx>0</posx>
-                       <posy>-</posy>
-                       <width>380</width>
-                       <height>60</height>
-                       <font>font13</font>
-                       <align>center</align>
-                       <textcolor>black</textcolor>
-                       <texturefocus>button-focus2.png</texturefocus>
-                       <texturenofocus>button-nofocus.png</texturenofocus>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/DialogFavourites.xml b/addons/skin.touched/4x3Hirez/DialogFavourites.xml
deleted file mode 100644 (file)
index 7fac8a2..0000000
+++ /dev/null
@@ -1,126 +0,0 @@
-<window type="dialog" id="134">
-       <defaultcontrol always="true">450</defaultcontrol>
-       <include>Window_OpenClose_Animation_Zoom</include>
-       <coordinates>
-               <system>1</system>
-               <posx>290</posx>
-               <posy>80</posy>
-       </coordinates>
-       <controls>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>700</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>700</width>
-                       <height>740</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-               <control type="label">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>600</width>
-                       <label>$LOCALIZE[1036]</label>
-               </control>
-               <control type="group">
-                       <posx>630</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               <control type="list" id="450">
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>700</width>
-                       <height>680</height>
-                       <onup>450</onup>
-                       <onleft>450</onleft>
-                       <onright>450</onright>
-                       <ondown>450</ondown>
-                       <pagecontrol>-</pagecontrol>
-                       <scrolltime>200</scrolltime>
-                       <itemlayout height="80">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>-2</posy>
-                                       <width>700</width>
-                                       <height>5</height>
-                                       <texture>separator.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>20</posx>
-                                       <posy>0</posy>
-                                       <width>530</width>
-                                       <height>80</height>
-                                       <font>font13</font>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                               <control type="image">
-                                       <posx>560</posx>
-                                       <posy>4</posy>
-                                       <width>120</width>
-                                       <height>72</height>
-                                       <aspectratio align="right">keep</aspectratio>
-                                       <fadetime>IconCrossfadeTime</fadetime>
-                                       <texture>$INFO[ListItem.Icon]</texture>
-                                       <bordertexture border="5">ThumbBorderGrey.png</bordertexture>
-                                       <bordersize>2</bordersize>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout height="80">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>-2</posy>
-                                       <width>700</width>
-                                       <height>5</height>
-                                       <texture>separator.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>20</posx>
-                                       <posy>0</posy>
-                                       <width>530</width>
-                                       <height>80</height>
-                                       <font>font13</font>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                               <control type="image">
-                                       <posx>560</posx>
-                                       <posy>4</posy>
-                                       <width>120</width>
-                                       <height>72</height>
-                                       <aspectratio align="right">keep</aspectratio>
-                                       <fadetime>IconCrossfadeTime</fadetime>
-                                       <texture>$INFO[ListItem.Icon]</texture>
-                                       <bordertexture border="5">ThumbBorderGrey.png</bordertexture>
-                                       <bordersize>2</bordersize>
-                               </control>
-                       </focusedlayout>
-               </control>
-               <control type="label">
-                       <description>Page label</description>
-                       <posx>680</posx>
-                       <posy>760</posy>
-                       <width>660</width>
-                       <height>30</height>
-                       <align>right</align>
-                       <aligny>center</aligny>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-                       <label>($INFO[Container(450).NumItems]) $LOCALIZE[31025] - $LOCALIZE[31024] ($INFO[Container(450).CurrentPage]/$INFO[Container(450).NumPages])</label>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/DialogFileStacking.xml b/addons/skin.touched/4x3Hirez/DialogFileStacking.xml
deleted file mode 100644 (file)
index bfb1ca7..0000000
+++ /dev/null
@@ -1,117 +0,0 @@
-<window id="2008">
-       <defaultcontrol>450</defaultcontrol>
-       <include>dialogeffect</include>
-       <coordinates>
-               <system>1</system>
-               <posx>315</posx>
-               <posy>260</posy>
-       </coordinates>
-       <controls>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>650</width>
-                       <height>200</height>
-                       <texture border="20">OverlayDialogBackground.png</texture>
-               </control>
-               <control type="button">
-                       <description>Close Window button</description>
-                       <posx>560</posx>
-                       <posy>5</posy>
-                       <width>64</width>
-                       <height>32</height>
-                       <label>-</label>
-                       <font>-</font>
-                       <onclick>PreviousMenu</onclick>
-                       <texturefocus>DialogCloseButton-focus.png</texturefocus>
-                       <texturenofocus>DialogCloseButton.png</texturenofocus>
-                       <onleft>13</onleft>
-                       <onright>13</onright>
-                       <onup>13</onup>
-                       <ondown>13</ondown>
-                       <visible>system.getbool(input.enablemouse)</visible>
-               </control>
-               <control type="label">
-                       <description>heading label</description>
-                       <posx>40</posx>
-                       <posy>18</posy>
-                       <width>570</width>
-                       <height>30</height>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <font>font13</font>
-                       <label>$INFO[ListItem.Label]</label>
-                       <textcolor>white</textcolor>
-               </control>
-               <control type="label">
-                       <posx>40</posx>
-                       <posy>60</posy>
-                       <width>570</width>
-                       <height>30</height>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <font>font12</font>
-                       <label>31060</label>
-                       <textcolor>grey2</textcolor>
-               </control>
-               <control type="image">
-                       <posx>50</posx>
-                       <posy>110</posy>
-                       <width>20</width>
-                       <height>25</height>
-                       <texture>scroll-left-focus.png</texture>
-                       <visible>Container(450).HasPrevious</visible>
-               </control>
-               <control type="image">
-                       <posx>575</posx>
-                       <posy>110</posy>
-                       <width>20</width>
-                       <height>25</height>
-                       <texture>scroll-right-focus.png</texture>
-                       <visible>Container(450).HasNext</visible>
-               </control>
-               <control type="list" id="450">
-                       <posx>85</posx>
-                       <posy>105</posy>
-                       <width>480</width>
-                       <height>100</height>
-                       <onleft>450</onleft>
-                       <onright>450</onright>
-                       <onup>450</onup>
-                       <ondown>450</ondown>
-                       <orientation>horizontal</orientation>
-                       <focusposition>2</focusposition>
-                       <viewtype label="535">list</viewtype>
-                       <scrolltime>200</scrolltime>
-                       <itemlayout width="40">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>38</width>
-                                       <height>32</height>
-                                       <aspectratio>stretch</aspectratio>
-                                       <texture>StackNF.png</texture>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout width="40">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>38</width>
-                                       <height>32</height>
-                                       <aspectratio>stretch</aspectratio>
-                                       <texture>StackFO.png</texture>
-                               </control>
-                       </focusedlayout>
-               </control>
-               <control type="label">
-                       <posx>40</posx>
-                       <posy>155</posy>
-                       <width>570</width>
-                       <height>22</height>
-                       <font>font13_title</font>
-                       <align>center</align>
-                       <info>Container(450).ListItem.Label</info>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/DialogGamepad.xml b/addons/skin.touched/4x3Hirez/DialogGamepad.xml
deleted file mode 100644 (file)
index 5a24bfe..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-<window id="110">
-       <defaultcontrol>-</defaultcontrol>
-       <coordinates>
-               <system>1</system>
-               <posx>290</posx>
-               <posy>300</posy>
-       </coordinates>
-       <include>dialogeffect</include>
-       <controls>
-               <control type="image">
-                       <description>Shadow Background for dialogs without BehindDialogFadeOut include</description>
-                       <posx>-30</posx>
-                       <posy>-30</posy>
-                       <width>760</width>
-                       <height>370</height>
-                       <texture border="30">DialogShadow.png</texture>
-               </control>
-               <control type="image">
-                       <description>Header Background</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>700</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="group">
-                       <posx>630</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               <control type="label" id="1">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>600</width>
-                       <label>$LOCALIZE[13406]</label>
-               </control>
-               <control type="image">
-                       <description>Background</description>
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>700</width>
-                       <height>250</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-               <control type="label" id="2">
-                       <description>dialog line 1</description>
-                       <posx>20</posx>
-                       <posy>80</posy>
-                       <width>660</width>
-                       <height>30</height>
-                       <align>left</align>
-                       <aligny>center</aligny>
-                       <label>-</label>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-               </control>
-               <control type="label" id="3">
-                       <description>dialog line 2</description>
-                       <posx>20</posx>
-                       <posy>110</posy>
-                       <width>660</width>
-                       <height>30</height>
-                       <align>left</align>
-                       <aligny>center</aligny>
-                       <label>-</label>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-               </control>
-               <control type="label" id="4">
-                       <description>dialog line 3</description>
-                       <posx>20</posx>
-                       <posy>200</posy>
-                       <width>660</width>
-                       <height>30</height>
-                       <align>left</align>
-                       <aligny>center</aligny>
-                       <label>-</label>
-                       <font>font30_title</font>
-                       <textcolor>black</textcolor>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/DialogKaiToast.xml b/addons/skin.touched/4x3Hirez/DialogKaiToast.xml
deleted file mode 100644 (file)
index 27c8f66..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-<window id="107">
-       <include>Window_OpenClose_Animation</include>
-       <controls>
-               <control type="group">
-                       <posx>526r</posx>
-                       <posy>110r</posy>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>490</width>
-                               <height>80</height>
-                               <texture border="8">IconBack.png</texture>
-                       </control>
-                       <control type="image" id="400">
-                               <description>Icon</description>
-                               <posx>10</posx>
-                               <posy>10</posy>
-                               <width>70</width>
-                               <height>60</height>
-                               <aspectratio>keep</aspectratio>
-                               <texture>DefaultFile.png</texture>
-                       </control>
-                       <control type="fadelabel" id="401">
-                               <description>Line 1 Label</description>
-                               <posx>100</posx>
-                               <posy>10</posy>
-                               <width>370</width>
-                               <height>20</height>
-                               <font>font12_title</font>
-                               <textcolor>black</textcolor>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <scrollout>false</scrollout>
-                               <pauseatend>2000</pauseatend>
-                       </control>
-                       <control type="textbox" id="402">
-                               <description>Line 2 Label</description>
-                               <posx>100</posx>
-                               <posy>25</posy>
-                               <width>370</width>
-                               <height>40</height>
-                               <font>font12</font>
-                               <textcolor>black</textcolor>
-                               <align>left</align>
-                       </control>
-                       <control type="image" id="403">
-                               <description>avatar</description>
-                               <posx>10</posx>
-                               <posy>10</posy>
-                               <width>70</width>
-                               <height>60</height>
-                               <aspectratio>keep</aspectratio>
-                               <visible>false</visible>
-                               <texture>DefaultIconInfo.png</texture>
-                       </control>
-                       <control type="image" id="404">
-                               <description>avatar</description>
-                               <posx>10</posx>
-                               <posy>10</posy>
-                               <width>70</width>
-                               <height>60</height>
-                               <aspectratio>keep</aspectratio>
-                               <visible>false</visible>
-                               <texture>DefaultIconWarning.png</texture>
-                       </control>
-                       <control type="image" id="405">
-                               <description>avatar</description>
-                               <posx>10</posx>
-                               <posy>10</posy>
-                               <width>70</width>
-                               <height>60</height>
-                               <aspectratio>keep</aspectratio>
-                               <visible>false</visible>
-                               <texture>DefaultIconError.png</texture>
-                       </control>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/DialogKaraokeSongSelector.xml b/addons/skin.touched/4x3Hirez/DialogKaraokeSongSelector.xml
deleted file mode 100644 (file)
index 0523d9d..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-<window type="dialog" id="143">
-       <include>dialogeffect</include>
-       <coordinates>
-               <system>1</system>
-               <posx>442</posx>
-               <posy>220</posy>
-       </coordinates>
-       <include>dialogeffect</include>
-       <controls>
-               <control type="image">
-                       <description>Header Background</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>395</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="group">
-                       <posx>325</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               <control type="label" id="1">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>290</width>
-                       <label>$LOCALIZE[31321]</label>
-               </control>
-               <control type="image">
-                       <description>Background</description>
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>395</width>
-                       <height>140</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-               <control type="label" id="401">
-                       <description>Song Number Label</description>
-                       <posx>20</posx>
-                       <posy>80</posy>
-                       <width>355</width>
-                       <height>30</height>
-                       <font>font28_title</font>
-                       <textcolor>black</textcolor>
-                       <align>center</align>
-                       <aligny>center</aligny>
-               </control>
-               <control type="label" id="402">
-                       <description>Song Name Label</description>
-                       <posx>20</posx>
-                       <posy>150</posy>
-                       <width>355</width>
-                       <height>20</height>
-                       <font>font24</font>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <textcolor>black</textcolor>
-                       <scroll>true</scroll>
-               </control>
-               <control type="group">
-                       <posx>0</posx>
-                       <posy>205</posy>
-                       <include>KeypadButtons</include>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/DialogKaraokeSongSelectorLarge.xml b/addons/skin.touched/4x3Hirez/DialogKaraokeSongSelectorLarge.xml
deleted file mode 100644 (file)
index 4159f50..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-<window type="dialog" id="144">
-       <include>dialogeffect</include>
-       <coordinates>
-               <system>1</system>
-               <posx>442</posx>
-               <posy>220</posy>
-       </coordinates>
-       <include>dialogeffect</include>
-       <controls>
-               <control type="image">
-                       <description>Header Background</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>395</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="group">
-                       <posx>325</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               <control type="label" id="1">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>290</width>
-                       <label>$LOCALIZE[31321]</label>
-               </control>
-               <control type="image">
-                       <description>Background</description>
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>395</width>
-                       <height>140</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-               <control type="label" id="401">
-                       <description>Song Number Label</description>
-                       <posx>20</posx>
-                       <posy>80</posy>
-                       <width>355</width>
-                       <height>30</height>
-                       <font>font28_title</font>
-                       <textcolor>black</textcolor>
-                       <align>center</align>
-                       <aligny>center</aligny>
-               </control>
-               <control type="label" id="402">
-                       <description>Song Name Label</description>
-                       <posx>20</posx>
-                       <posy>150</posy>
-                       <width>355</width>
-                       <height>20</height>
-                       <font>font24</font>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <textcolor>black</textcolor>
-                       <scroll>true</scroll>
-               </control>
-               <control type="group">
-                       <posx>0</posx>
-                       <posy>205</posy>
-                       <include>KeypadButtons</include>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/DialogKeyboard.xml b/addons/skin.touched/4x3Hirez/DialogKeyboard.xml
deleted file mode 100644 (file)
index 20ff506..0000000
+++ /dev/null
@@ -1,752 +0,0 @@
-<window id="103">
-       <defaultcontrol always="true">65</defaultcontrol>
-       <coordinates>
-               <system>1</system>
-               <posx>0</posx>
-               <posy>0</posy>
-       </coordinates>
-       <controls>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>ScreenWidth</width>
-                       <height>ScreenHeight</height>
-                       <texture>black-back.png</texture>
-                       <animation effect="fade" time="400">WindowOpen</animation>
-                       <animation effect="fade" time="200">WindowClose</animation>
-               </control>
-               <control type="button">
-                       <description>Hidden button to close the keyboard when its focused</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>ScreenWidth</width>
-                       <height>ScreenHeight</height>
-                       <texturenofocus>-</texturenofocus>
-                       <texturefocus>-</texturefocus>
-                       <onclick>PreviousMenu</onclick>
-               </control>
-               <control type="group">
-                       <animation effect="slide" start="0,500" end="0,0" time="400" easing="out" tween="quadratic" >WindowOpen</animation>
-                       <animation effect="slide" start="0,0" end="0,500" time="400" easing="in" tween="quadratic" >WindowClose</animation>
-                       <animation effect="slide" start="0,0" end="0,500" time="400" easing="in" tween="quadratic" condition="Window.IsVisible(numericinput)">Conditional</animation>
-                       <posx>15</posx>
-                       <posy>500r</posy>
-                       <control type="button">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>ScreenWidth</width>
-                               <height>500</height>
-                               <texturenofocus>-</texturenofocus>
-                               <texturefocus>-</texturefocus>
-                               <onclick>-</onclick>
-                       </control>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>1250</width>
-                               <height>60</height>
-                               <aspectratio>stretch</aspectratio>
-                               <texture border="20">KeyboardEditArea.png</texture>
-                       </control>      
-                       <control type="label" id="310">
-                               <description>Edit Text</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>1250</width>
-                               <height>60</height>
-                               <font>font16</font>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                       </control>
-                       <control type="label" id="311">
-                               <description>dialog Heading</description>
-                               <posx>0</posx>
-                               <posy>-30</posy>
-                               <width>1250</width>
-                               <height>20</height>
-                               <font>font13_title</font>
-                               <textcolor>white</textcolor>
-                               <shadowcolor>black</shadowcolor>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                       </control>
-                       <control type="group">
-                               <posx>0</posx>
-                               <posy>70</posy>
-<!-- First Row -->
-                               <control type="image">
-                                       <description>Blank image</description>
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>65</width>
-                                       <height>80</height>
-                                       <texture border="5">KeyboardKeyDark.png</texture>
-                               </control>
-                               <control type="button" id="49">
-                                       <description>'1' button</description>
-                                       <posx>70</posx>
-                                       <posy>0</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="50">
-                                       <description>'2' button</description>
-                                       <posx>170</posx>
-                                       <posy>0</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="51">
-                                       <description>'3' button</description>
-                                       <posx>270</posx>
-                                       <posy>0</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="52">
-                                       <description>'4' button</description>
-                                       <posx>370</posx>
-                                       <posy>0</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="53">
-                                       <description>'5' button</description>
-                                       <posx>470</posx>
-                                       <posy>0</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="54">
-                                       <description>'6' button</description>
-                                       <posx>570</posx>
-                                       <posy>0</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="55">
-                                       <description>'7' button</description>
-                                       <posx>670</posx>
-                                       <posy>0</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="56">
-                                       <description>'8' button</description>
-                                       <posx>770</posx>
-                                       <posy>0</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="57">
-                                       <description>'9' button</description>
-                                       <posx>870</posx>
-                                       <posy>0</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="48">
-                                       <description>'0' button</description>
-                                       <posx>970</posx>
-                                       <posy>0</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="togglebutton" id="304">
-                                       <description>Symbols button</description>
-                                       <posx>1070</posx>
-                                       <posy>0</posy>
-                                       <width>180</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKeyDark.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <alttexturenofocus border="5">KeyboardKeyDark.png</alttexturenofocus>
-                                       <alttexturefocus border="5">KeyboardKeyFocus.png</alttexturefocus>
-                                       <textcolor>white</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <label>@#$%</label>
-                                       <altlabel>[COLOR=blue]@#$%[/COLOR]</altlabel>
-                               </control>
-<!-- Second Row -->
-                               <control type="button" id="307">
-                                       <description>IP Input button</description>
-                                       <posx>0</posx>
-                                       <posy>85</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKeyDark.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>white</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <label>31003</label>
-                               </control>
-                               <control type="button" id="81">
-                                       <description>'Q' button</description>
-                                       <posx>100</posx>
-                                       <posy>85</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="87">
-                                       <description>'W' button</description>
-                                       <posx>200</posx>
-                                       <posy>85</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="69">
-                                       <description>'E' button</description>
-                                       <posx>300</posx>
-                                       <posy>85</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="82">
-                                       <description>'R' button</description>
-                                       <posx>400</posx>
-                                       <posy>85</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="84">
-                                       <description>'T' button</description>
-                                       <posx>500</posx>
-                                       <posy>85</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="89">
-                                       <description>'Y' button</description>
-                                       <posx>600</posx>
-                                       <posy>85</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="85">
-                                       <description>'U' button</description>
-                                       <posx>700</posx>
-                                       <posy>85</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="73">
-                                       <description>'I' button</description>
-                                       <posx>800</posx>
-                                       <posy>85</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="79">
-                                       <description>'O' button</description>
-                                       <posx>900</posx>
-                                       <posy>85</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="80">
-                                       <description>'P' button</description>
-                                       <posx>1000</posx>
-                                       <posy>85</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="8">
-                                       <description>'BACKSPACE' button</description>
-                                       <posx>1100</posx>
-                                       <posy>85</posy>
-                                       <width>150</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKeyDark.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>white</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <label>-</label>
-                               </control>
-                               <control type="image">
-                                       <description>BackSpace Icon image</description>
-                                       <posx>1150</posx>
-                                       <posy>100</posy>
-                                       <width>50</width>
-                                       <height>50</height>
-                                       <texture>icon_backspace.png</texture>
-                               </control>
-<!-- Third Row -->
-                               <control type="togglebutton" id="303">
-                                       <description>CAPS LOCK button</description>
-                                       <posx>0</posx>
-                                       <posy>170</posy>
-                                       <width>125</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKeyDark.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <alttexturenofocus border="5">KeyboardKeyDark.png</alttexturenofocus>
-                                       <alttexturefocus border="5">KeyboardKeyFocus.png</alttexturefocus>
-                                       <textcolor>white</textcolor>
-                                       <font>font13</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <label>31004</label>
-                                       <altlabel>[COLOR=blue]$LOCALIZE[31004][/COLOR]</altlabel>
-                               </control>
-                               <control type="button" id="65">
-                                       <description>'A' button</description>
-                                       <posx>130</posx>
-                                       <posy>170</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="83">
-                                       <description>'S' button</description>
-                                       <posx>230</posx>
-                                       <posy>170</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="68">
-                                       <description>'D' button</description>
-                                       <posx>330</posx>
-                                       <posy>170</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="70">
-                                       <description>'F' button</description>
-                                       <posx>430</posx>
-                                       <posy>170</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="71">
-                                       <description>'G' button</description>
-                                       <posx>530</posx>
-                                       <posy>170</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="72">
-                                       <description>'H' button</description>
-                                       <posx>630</posx>
-                                       <posy>170</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="74">
-                                       <description>'J' button</description>
-                                       <posx>730</posx>
-                                       <posy>170</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="75">
-                                       <description>'K' button</description>
-                                       <posx>830</posx>
-                                       <posy>170</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="76">
-                                       <description>'L' button</description>
-                                       <posx>930</posx>
-                                       <posy>170</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="300">
-                                       <description>DONE button</description>
-                                       <posx>1030</posx>
-                                       <posy>170</posy>
-                                       <width>220</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKeyDark.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>white</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <label>-</label>
-                               </control>
-                               <control type="image">
-                                       <description>Enter\done Icon image</description>
-                                       <posx>1110</posx>
-                                       <posy>185</posy>
-                                       <width>50</width>
-                                       <height>50</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture>icon_enter.png</texture>
-                               </control>
-<!-- Forth Row -->
-                               <control type="button" id="302">
-                                       <description>SHIFT button</description>
-                                       <posx>0</posx>
-                                       <posy>255</posy>
-                                       <width>150</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKeyDark.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>white</textcolor>
-                                       <font>font16</font>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>-</label>
-                               </control>
-                               <control type="image">
-                                       <description>Enter\done Icon image</description>
-                                       <posx>50</posx>
-                                       <posy>270</posy>
-                                       <width>50</width>
-                                       <height>50</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture>icon_shift.png</texture>
-                               </control>
-                               <control type="button" id="90">
-                                       <description>'Z' button</description>
-                                       <posx>160</posx>
-                                       <posy>255</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="88">
-                                       <description>'X' button</description>
-                                       <posx>260</posx>
-                                       <posy>255</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="67">
-                                       <description>'C' button</description>
-                                       <posx>360</posx>
-                                       <posy>255</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="86">
-                                       <description>'V' button</description>
-                                       <posx>460</posx>
-                                       <posy>255</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="66">
-                                       <description>'B' button</description>
-                                       <posx>560</posx>
-                                       <posy>255</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="78">
-                                       <description>'N' button</description>
-                                       <posx>660</posx>
-                                       <posy>255</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="77">
-                                       <description>'M' button</description>
-                                       <posx>760</posx>
-                                       <posy>255</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="305">
-                                       <description>previous button</description>
-                                       <posx>860</posx>
-                                       <posy>255</posy>
-                                       <width>193</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKeyDark.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>white</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <label>-</label>
-                               </control>
-                               <control type="image">
-                                       <description>Previous Icon image</description>
-                                       <posx>930</posx>
-                                       <posy>275</posy>
-                                       <width>50</width>
-                                       <height>40</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture flipx="true">icon_arrowkey.png</texture>
-                               </control>
-                               <control type="button" id="306">
-                                       <description>next button</description>
-                                       <posx>1058</posx>
-                                       <posy>255</posy>
-                                       <width>191</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKeyDark.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>white</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <label></label>
-                               </control>
-                               <control type="image">
-                                       <description>Next Icon image</description>
-                                       <posx>1135</posx>
-                                       <posy>275</posy>
-                                       <width>50</width>
-                                       <height>40</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture>icon_arrowkey.png</texture>
-                               </control>
-<!-- Fifth Row -->
-                               <control type="image">
-                                       <description>Blank image</description>
-                                       <posx>0</posx>
-                                       <posy>340</posy>
-                                       <width>185</width>
-                                       <height>80</height>
-                                       <texture border="5">KeyboardKeyDark.png</texture>
-                               </control>
-                               <control type="button" id="32">
-                                       <description>SPACE button</description>
-                                       <posx>190</posx>
-                                       <posy>340</posy>
-                                       <width>695</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <label>20182</label>
-                               </control>
-                               <control type="image">
-                                       <description>Blank image</description>
-                                       <posx>890</posx>
-                                       <posy>340</posy>
-                                       <width>360</width>
-                                       <height>80</height>
-                                       <texture border="5">KeyboardKeyDark.png</texture>
-                               </control>
-                       </control>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/DialogMediaSource.xml b/addons/skin.touched/4x3Hirez/DialogMediaSource.xml
deleted file mode 100644 (file)
index 29df945..0000000
+++ /dev/null
@@ -1,223 +0,0 @@
-<window id="129">
-       <defaultcontrol>10</defaultcontrol>
-       <include>Window_OpenClose_Animation_Zoom</include>
-       <coordinates>
-               <system>1</system>
-               <posx>140</posx>
-               <posy>130</posy>
-       </coordinates>
-       <controls>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>1000</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="label" id="2">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>910</width>
-                       <label>$LOCALIZE[13406]</label>
-               </control>
-               <control type="group">
-                       <posx>930</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>1000</width>
-                       <height>600</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-               <control type="label">
-                       <description>path label</description>
-                       <posx>20</posx>
-                       <posy>80</posy>
-                       <width>960</width>
-                       <height>30</height>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <font>font13_title</font>
-                       <label>1021</label>
-                       <textcolor>black</textcolor>
-               </control>
-               <control type="list" id="10">
-                       <posx>20</posx>
-                       <posy>140</posy>
-                       <width>740</width>
-                       <height>650</height>
-                       <onup>9001</onup>
-                       <onleft>9000</onleft>
-                       <onright>60</onright>
-                       <ondown>12</ondown>
-                       <pagecontrol>60</pagecontrol>
-                       <scrolltime>200</scrolltime>
-                       <itemlayout height="50">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>740</width>
-                                       <height>51</height>
-                                       <texture border="5">MenuItemNF.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>10</posx>
-                                       <posy>0</posy>
-                                       <width>720</width>
-                                       <height>50</height>
-                                       <font>font13</font>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout height="50">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>740</width>
-                                       <height>51</height>
-                                       <texture border="5">MenuItemNF.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>10</posx>
-                                       <posy>0</posy>
-                                       <width>720</width>
-                                       <height>50</height>
-                                       <font>font13</font>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <label>[COLOR=blue] > [/COLOR] $INFO[ListItem.Label]</label>
-                               </control>
-                       </focusedlayout>
-               </control>
-               <control type="group" id="9000">
-                       <posx>780</posx>
-                       <posy>140</posy>
-                       <control type="button" id="11">
-                               <description>Browse Button</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>200</width>
-                               <height>50</height>
-                               <label>1024</label>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <font>font12_title</font>
-                               <texturefocus border="5">IconBack-focus.png</texturefocus>
-                               <texturenofocus border="5">ListNF.png</texturenofocus>
-                               <pulseonselect>false</pulseonselect>
-                               <onup>18</onup>
-                               <onleft>60</onleft>
-                               <onright>10</onright>
-                               <ondown>13</ondown>
-                       </control>
-                       <control type="button" id="13">
-                               <description>Add Path Button</description>
-                               <posx>0</posx>
-                               <posy>55</posy>
-                               <width>200</width>
-                               <height>50</height>
-                               <label>15019</label>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <font>font12_title</font>
-                               <texturefocus border="5">IconBack-focus.png</texturefocus>
-                               <texturenofocus border="5">ListNF.png</texturenofocus>
-                               <pulseonselect>false</pulseonselect>
-                               <onup>11</onup>
-                               <onleft>60</onleft>
-                               <onright>10</onright>
-                               <ondown>14</ondown>
-                       </control>
-                       <control type="button" id="14">
-                               <description>Remove Path Button</description>
-                               <posx>0</posx>
-                               <posy>110</posy>
-                               <width>200</width>
-                               <height>50</height>
-                               <label>1210</label>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <font>font12_title</font>
-                               <texturefocus border="5">IconBack-focus.png</texturefocus>
-                               <texturenofocus border="5">ListNF.png</texturenofocus>
-                               <pulseonselect>false</pulseonselect>
-                               <onup>13</onup>
-                               <onleft>60</onleft>
-                               <onright>10</onright>
-                               <ondown>12</ondown>
-                       </control>
-               </control>
-               <control type="label">
-                       <description>Name label</description>
-                       <posx>20</posx>
-                       <posy>450</posy>
-                       <width>960</width>
-                       <height>30</height>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <font>font13_title</font>
-                       <label>1022</label>
-                       <textcolor>black</textcolor>
-               </control>
-               <control type="button" id="12">
-                       <description>Name Button</description>
-                       <posx>20</posx>
-                       <posy>490</posy>
-                       <width>960</width>
-                       <height>50</height>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <label>-</label>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-                       <texturefocus border="5">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="5">MenuItemNF.png</texturenofocus>
-                       <onup>10</onup>
-                       <onleft>12</onleft>
-                       <onright>19</onright>
-                       <ondown>9001</ondown>
-               </control>
-               <control type="grouplist" id="9001">
-                       <posx>20</posx>
-                       <posy>590</posy>
-                       <width>960</width>
-                       <height>50</height>
-                       <itemgap>5</itemgap>
-                       <align>center</align>
-                       <orientation>horizontal</orientation>
-                       <onleft>9001</onleft>
-                       <onright>9001</onright>
-                       <onup>50</onup>
-                       <ondown>49</ondown>
-                       <control type="button" id="18">
-                               <description>Ok Button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>186</label>
-                       </control>
-                       <control type="button" id="19">
-                               <description>Cancel Button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>222</label>
-                       </control>
-                       <control type="button" id="20">
-                               <description>Set Content Button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>20333</label>
-                       </control>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/DialogMusicScan.xml b/addons/skin.touched/4x3Hirez/DialogMusicScan.xml
deleted file mode 100644 (file)
index 04ad9dd..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-<window id="112">
-       <defaultcontrol></defaultcontrol>
-       <include>dialogeffect</include>
-       <controls>
-               <control type="group">
-                       <posx>420r</posx>
-                       <posy>25</posy>
-                       <visible>!Window.IsVisible(FullscreenVideo) + !Window.IsVisible(Visualisation)</visible>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>350</width>
-                               <height>67</height>
-                               <texture border="8">IconBack.png</texture>
-                       </control>
-                       <control type="fadelabel" id="401">
-                               <posx>10</posx>
-                               <posy>5</posy>
-                               <width>330</width>
-                               <height>15</height>
-                               <scrollout>false</scrollout>
-                               <pauseatend>3000</pauseatend>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <font>font10_title</font>
-                               <textcolor>black</textcolor>
-                       </control>
-                       <control type="fadelabel" id="402">
-                               <posx>10</posx>
-                               <posy>24</posy>
-                               <width>330</width>
-                               <height>20</height>
-                               <scrollout>false</scrollout>
-                               <pauseatend>3000</pauseatend>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <font>font12</font>
-                               <textcolor>black</textcolor>
-                               <haspath>true</haspath>
-                       </control>
-                       <control type="progress" id="403">
-                               <description>progress control</description>
-                               <posx>5</posx>
-                               <posy>47</posy>
-                               <width>340</width>
-                               <height>15</height>
-                       </control>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/DialogMuteBug.xml b/addons/skin.touched/4x3Hirez/DialogMuteBug.xml
deleted file mode 100644 (file)
index 0325d88..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-<window id="113">
-       <defaultcontrol>-</defaultcontrol>
-       <include>dialogeffect</include>
-       <coordinates>
-               <system>0</system>
-               <posx>0</posx>
-               <posy>0</posy>
-       </coordinates>
-       <controls>
-               <control type="group">
-                       <posx>80r</posx>
-                       <posy>0</posy>
-                       <animation effect="slide" end="100,0" time="200" tween="quadratic" easing="out">WindowClose</animation>
-                       <animation effect="slide" start="100,0" time="200" tween="quadratic" easing="out">WindowOpen</animation>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>80</width>
-                               <height>35</height>
-                               <texture flipx="true" border="32,0,0,0">header.png</texture>
-                       </control>
-                       <control type="image">
-                               <posx>35</posx>
-                               <posy>0</posy>
-                               <width>30</width>
-                               <height>30</height>
-                               <aspectratio>keep</aspectratio>
-                               <texture>icon-mute.png</texture>
-                       </control>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/DialogNetworkSetup.xml b/addons/skin.touched/4x3Hirez/DialogNetworkSetup.xml
deleted file mode 100644 (file)
index 59dc469..0000000
+++ /dev/null
@@ -1,194 +0,0 @@
-<window id="128">
-       <defaultcontrol>10</defaultcontrol>
-       <include>Window_OpenClose_Animation_Zoom</include>
-       <coordinates>
-               <system>1</system>
-               <posx>240</posx>
-               <posy>220</posy>
-       </coordinates>
-       <controls>
-               <control type="image">
-                       <description>Shadow Background for dialogs without BehindDialogFadeOut include</description>
-                       <posx>-30</posx>
-                       <posy>-30</posy>
-                       <width>860</width>
-                       <height>580</height>
-                       <texture border="30">DialogShadow.png</texture>
-               </control>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>800</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="label" id="2">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>710</width>
-                       <label>$LOCALIZE[1007]</label>
-               </control>
-               <control type="group">
-                       <posx>730</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>800</width>
-                       <height>460</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-
-               <control type="spincontrolex" id="10">
-                       <description>Protocol SpinControl</description>
-                       <posx>20</posx>
-                       <posy>80</posy>
-                       <height>51</height>
-                       <width>760</width>
-                       <texturefocus border="5">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="5">MenuItemNF.png</texturenofocus>
-                       <textcolor>black</textcolor>
-                       <disabledcolor>grey3</disabledcolor>
-                       <textoffsetx>12</textoffsetx>
-                       <aligny>center</aligny>
-                       <reverse>yes</reverse>
-                       <font>font132</font>
-                       <label>1008</label>
-                       <onup>18</onup>
-                       <ondown>11</ondown>
-                       <onleft>10</onleft>
-                       <onright>10</onright>
-               </control>
-               <control type="button" id="11">
-                       <description>Server Address Button</description>
-                       <posx>20</posx>
-                       <posy>140</posy>
-                       <width>570</width>
-                       <height>51</height>
-                       <textoffsetx>12</textoffsetx>
-                       <textcolor>black</textcolor>
-                       <aligny>center</aligny>
-                       <texturefocus border="5">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="5">MenuItemNF.png</texturenofocus>
-                       <font>font13</font>
-                       <label>-</label>
-                       <onup>10</onup>
-                       <onleft>12</onleft>
-                       <onright>12</onright>
-                       <ondown>16</ondown>
-               </control>
-               <control type="button" id="12">
-                       <description>Server Browse Button</description>
-                       <posx>610</posx>
-                       <posy>140</posy>
-                       <width>170</width>
-                       <include>ButtonInfoDialogsCommonValues</include>
-                       <label>1024</label>
-                       <onup>10</onup>
-                       <onleft>11</onleft>
-                       <onright>11</onright>
-                       <ondown>16</ondown>
-               </control>
-               <control type="button" id="16">
-                       <description>Remote path Button</description>
-                       <posx>20</posx>
-                       <posy>200</posy>
-                       <width>760</width>
-                       <height>51</height>
-                       <textoffsetx>12</textoffsetx>
-                       <textcolor>black</textcolor>
-                       <aligny>center</aligny>
-                       <texturefocus border="5">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="5">MenuItemNF.png</texturenofocus>
-                       <font>font13</font>
-                       <label>-</label>
-                       <onup>11</onup>
-                       <onleft>16</onleft>
-                       <onright>16</onright>
-                       <ondown>13</ondown>
-               </control>
-               <control type="button" id="13">
-                       <description>Port Button</description>
-                       <posx>20</posx>
-                       <posy>250</posy>
-                       <width>760</width>
-                       <height>51</height>
-                       <textoffsetx>12</textoffsetx>
-                       <textcolor>black</textcolor>
-                       <aligny>center</aligny>
-                       <texturefocus border="5">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="5">MenuItemNF.png</texturenofocus>
-                       <font>font13</font>
-                       <label>1013</label>
-                       <onup>16</onup>
-                       <onleft>13</onleft>
-                       <onright>13</onright>
-                       <ondown>14</ondown>
-               </control>
-               <control type="button" id="14">
-                       <description>Username Button</description>
-                       <posx>20</posx>
-                       <posy>300</posy>
-                       <width>760</width>
-                       <height>51</height>
-                       <textcolor>black</textcolor>
-                       <textoffsetx>12</textoffsetx>
-                       <aligny>center</aligny>
-                       <texturefocus border="5">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="5">MenuItemNF.png</texturenofocus>
-                       <font>font13</font>
-                       <label>1014</label>
-                       <onup>13</onup>
-                       <onleft>14</onleft>
-                       <onright>14</onright>
-                       <ondown>15</ondown>
-               </control>
-               <control type="button" id="15">
-                       <description>Password Button</description>
-                       <posx>20</posx>
-                       <posy>350</posy>
-                       <width>760</width>
-                       <height>51</height>
-                       <textoffsetx>12</textoffsetx>
-                       <textcolor>black</textcolor>
-                       <aligny>center</aligny>
-                       <texturefocus border="5">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="5">MenuItemNF.png</texturenofocus>
-                       <font>font13</font>
-                       <label>15052</label>
-                       <onup>14</onup>
-                       <onleft>15</onleft>
-                       <onright>15</onright>
-                       <ondown>18</ondown>
-               </control>
-               <control type="grouplist" id="9001">
-                       <posx>20</posx>
-                       <posy>450</posy>
-                       <width>760</width>
-                       <height>50</height>
-                       <itemgap>5</itemgap>
-                       <align>center</align>
-                       <orientation>horizontal</orientation>
-                       <onleft>9001</onleft>
-                       <onright>9001</onright>
-                       <onup>50</onup>
-                       <ondown>49</ondown>
-                       <control type="button" id="18">
-                               <description>Ok Button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>186</label>
-                       </control>
-                       <control type="button" id="19">
-                               <description>Cancel Button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>222</label>
-                       </control>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/DialogNumeric.xml b/addons/skin.touched/4x3Hirez/DialogNumeric.xml
deleted file mode 100644 (file)
index 2035a0c..0000000
+++ /dev/null
@@ -1,354 +0,0 @@
-<window id="109">
-       <defaultcontrol always="true">21</defaultcontrol>
-       <coordinates>
-               <system>2</system>
-               <posx>0</posx>
-               <posy>0</posy>
-       </coordinates>
-       <controls>
-               <control type="button">
-                       <description>Hidden button to close the keyboard when its focused</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>ScreenWidth</width>
-                       <height>ScreenHeight</height>
-                       <texturenofocus>-</texturenofocus>
-                       <texturefocus>-</texturefocus>
-                       <onclick>PreviousMenu</onclick>
-               </control>
-               <control type="group">
-                       <posx>480</posx>
-                       <posy>170</posy>
-                       <animation effect="slide" start="0,-820" end="0,0" time="500" easing="out" tween="quadratic" >WindowOpen</animation>
-                       <animation effect="slide" start="0,0" end="0,-820" time="500" easing="in" tween="quadratic" >WindowClose</animation>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>70</posy>
-                               <width>395</width>
-                               <height>50</height>
-                               <aspectratio>stretch</aspectratio>
-                               <texture border="20">KeyboardEditArea.png</texture>
-                       </control>
-                       <control type="label" id="4">
-                               <description>Edit Text</description>
-                               <posx>20</posx>
-                               <posy>70</posy>
-                               <width>355</width>
-                               <height>50</height>
-                               <font>font16</font>
-                               <textcolor>selected</textcolor>
-                               <disabledcolor>grey2</disabledcolor>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                       </control>
-                       <control type="label" id="1">
-                               <description>dialog Heading</description>
-                               <posx>0</posx>
-                               <posy>20</posy>
-                               <width>395</width>
-                               <height>40</height>
-                               <font>font13_title</font>
-                               <textcolor>white</textcolor>
-                               <shadowcolor>black</shadowcolor>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <wrapmultiline>true</wrapmultiline>
-                       </control>
-                       <control type="group">
-                               <posx>0</posx>
-                               <posy>130</posy>
-                               <control type="button" id="11">
-                                       <description>1 button</description>
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <texturenofocus border="8">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                                       <label>12311</label>
-                                       <textcolor>black</textcolor>
-                                       <onleft>23</onleft>
-                                       <onright>12</onright>
-                                       <onup>20</onup>
-                                       <ondown>14</ondown>
-                               </control>
-                               <control type="button" id="12">
-                                       <description>2 button</description>
-                                       <posx>100</posx>
-                                       <posy>0</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <texturenofocus border="8">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                                       <label>12312</label>
-                                       <textcolor>black</textcolor>
-                                       <onleft>11</onleft>
-                                       <onright>13</onright>
-                                       <onup>10</onup>
-                                       <ondown>15</ondown>
-                               </control>
-                               <control type="button" id="13">
-                                       <description>3 button</description>
-                                       <posx>200</posx>
-                                       <posy>0</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <texturenofocus border="8">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                                       <label>12313</label>
-                                       <textcolor>black</textcolor>
-                                       <onleft>12</onleft>
-                                       <onright>23</onright>
-                                       <onup>22</onup>
-                                       <ondown>16</ondown>
-                               </control>
-                               <control type="button" id="23">
-                                       <description>Backspace button</description>
-                                       <posx>300</posx>
-                                       <posy>0</posy>
-                                       <width>95</width>
-                                       <height>165</height>
-                                       <font>font12</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <texturenofocus border="8">KeyboardKeyDark.png</texturenofocus>
-                                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                                       <textwidth>120</textwidth>
-                                       <label>-</label>
-                                       <textcolor>white</textcolor>
-                                       <angle>270</angle>
-                                       <onleft>13</onleft>
-                                       <onright>11</onright>
-                                       <onup>21</onup>
-                                       <ondown>21</ondown>
-                               </control>
-                               <control type="image">
-                                       <description>BackSpace Icon image</description>
-                                       <posx>320</posx>
-                                       <posy>60</posy>
-                                       <width>50</width>
-                                       <height>50</height>
-                                       <texture>icon_backspace.png</texture>
-                               </control>
-                               <control type="button" id="14">
-                                       <description>4 button</description>
-                                       <posx>0</posx>
-                                       <posy>85</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <texturenofocus border="8">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                                       <label>12314</label>
-                                       <textcolor>black</textcolor>
-                                       <onleft>23</onleft>
-                                       <onright>15</onright>
-                                       <onup>11</onup>
-                                       <ondown>17</ondown>
-                               </control>
-                               <control type="button" id="15">
-                                       <description>5 button</description>
-                                       <posx>100</posx>
-                                       <posy>85</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <texturenofocus border="8">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                                       <label>12315</label>
-                                       <textcolor>black</textcolor>
-                                       <onleft>14</onleft>
-                                       <onright>16</onright>
-                                       <onup>12</onup>
-                                       <ondown>18</ondown>
-                               </control>
-                               <control type="button" id="16">
-                                       <description>6 button</description>
-                                       <posx>200</posx>
-                                       <posy>85</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <texturenofocus border="8">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                                       <label>12316</label>
-                                       <textcolor>black</textcolor>
-                                       <onleft>15</onleft>
-                                       <onright>23</onright>
-                                       <onup>13</onup>
-                                       <ondown>19</ondown>
-                               </control>
-                               <control type="button" id="17">
-                                       <description>7 button</description>
-                                       <posx>0</posx>
-                                       <posy>170</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <texturenofocus border="8">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                                       <label>12317</label>
-                                       <textcolor>black</textcolor>
-                                       <onleft>21</onleft>
-                                       <onright>18</onright>
-                                       <onup>14</onup>
-                                       <ondown>20</ondown>
-                               </control>
-                               <control type="button" id="18">
-                                       <description>8 button</description>
-                                       <posx>100</posx>
-                                       <posy>170</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <texturenofocus border="8">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                                       <label>12318</label>
-                                       <textcolor>black</textcolor>
-                                       <onleft>17</onleft>
-                                       <onright>19</onright>
-                                       <onup>15</onup>
-                                       <ondown>10</ondown>
-                               </control>
-                               <control type="button" id="19">
-                                       <description>9 button</description>
-                                       <posx>200</posx>
-                                       <posy>170</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <texturenofocus border="8">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                                       <label>12319</label>
-                                       <textcolor>black</textcolor>
-                                       <onleft>18</onleft>
-                                       <onright>21</onright>
-                                       <onup>16</onup>
-                                       <ondown>22</ondown>
-                               </control>
-                               <control type="button" id="21">
-                                       <description>Done button</description>
-                                       <posx>300</posx>
-                                       <posy>170</posy>
-                                       <width>95</width>
-                                       <height>165</height>
-                                       <font>font12</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <texturenofocus border="8">KeyboardKeyDark.png</texturenofocus>
-                                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                                       <textwidth>120</textwidth>
-                                       <label>-</label>
-                                       <textcolor>white</textcolor>
-                                       <angle>270</angle>
-                                       <onleft>19</onleft>
-                                       <onright>17</onright>
-                                       <onup>23</onup>
-                                       <ondown>23</ondown>
-                               </control>
-                               <control type="image">
-                                       <description>Enter\done Icon image</description>
-                                       <posx>320</posx>
-                                       <posy>230</posy>
-                                       <width>50</width>
-                                       <height>50</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture>icon_enter.png</texture>
-                               </control>
-                               <control type="button" id="20">
-                                       <description>prev button</description>
-                                       <posx>0</posx>
-                                       <posy>255</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <font>font30</font>
-                                       <label>-</label>
-                                       <textcolor>white</textcolor>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <texturenofocus border="8">KeyboardKeyDark.png</texturenofocus>
-                                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                                       <onleft>21</onleft>
-                                       <onright>10</onright>
-                                       <onup>17</onup>
-                                       <ondown>11</ondown>
-                               </control>
-                               <control type="image">
-                                       <description>Previous Icon image</description>
-                                       <posx>22</posx>
-                                       <posy>275</posy>
-                                       <width>50</width>
-                                       <height>40</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture flipx="true">icon_arrowkey.png</texture>
-                               </control>
-                               <control type="button" id="10">
-                                       <description>0 button</description>
-                                       <posx>100</posx>
-                                       <posy>255</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <texturenofocus border="8">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                                       <label>12310</label>
-                                       <textcolor>black</textcolor>
-                                       <onleft>20</onleft>
-                                       <onright>22</onright>
-                                       <onup>18</onup>
-                                       <ondown>12</ondown>
-                               </control>
-                               <control type="button" id="22">
-                                       <description>next button</description>
-                                       <posx>200</posx>
-                                       <posy>255</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <font>font30</font>
-                                       <label>-</label>
-                                       <textcolor>white</textcolor>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <texturenofocus border="8">KeyboardKeyDark.png</texturenofocus>
-                                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                                       <onleft>10</onleft>
-                                       <onright>21</onright>
-                                       <onup>19</onup>
-                                       <ondown>13</ondown>
-                               </control>
-                               <control type="image">
-                                       <description>Next Icon image</description>
-                                       <posx>222</posx>
-                                       <posy>275</posy>
-                                       <width>50</width>
-                                       <height>40</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture>icon_arrowkey.png</texture>
-                               </control>
-                       </control>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/DialogOK.xml b/addons/skin.touched/4x3Hirez/DialogOK.xml
deleted file mode 100644 (file)
index 133d69a..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-<window id="2002">
-       <defaultcontrol always="true">10</defaultcontrol>
-       <coordinates>
-               <system>1</system>
-               <posx>290</posx>
-               <posy>300</posy>
-       </coordinates>
-       <include>dialogeffect</include>
-       <controls>
-               <control type="image">
-                       <description>Shadow Background for dialogs without BehindDialogFadeOut include</description>
-                       <posx>-30</posx>
-                       <posy>-30</posy>
-                       <width>760</width>
-                       <height>370</height>
-                       <texture border="30">DialogShadow.png</texture>
-               </control>
-               <control type="image">
-                       <description>Header Background</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>700</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="group">
-                       <posx>630</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               <control type="label" id="1">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>600</width>
-                       <label>$LOCALIZE[13406]</label>
-               </control>
-               <control type="image">
-                       <description>Background</description>
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>700</width>
-                       <height>250</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-               <control type="label" id="2">
-                       <description>dialog line 1</description>
-                       <posx>20</posx>
-                       <posy>80</posy>
-                       <width>660</width>
-                       <height>30</height>
-                       <align>left</align>
-                       <aligny>center</aligny>
-                       <label>-</label>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-               </control>
-               <control type="label" id="3">
-                       <description>dialog line 2</description>
-                       <posx>20</posx>
-                       <posy>110</posy>
-                       <width>660</width>
-                       <height>30</height>
-                       <align>left</align>
-                       <aligny>center</aligny>
-                       <label>-</label>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-               </control>
-               <control type="label" id="4">
-                       <description>dialog line 3</description>
-                       <posx>20</posx>
-                       <posy>140</posy>
-                       <width>660</width>
-                       <height>30</height>
-                       <align>left</align>
-                       <aligny>center</aligny>
-                       <label>-</label>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-               </control>
-               <control type="grouplist" id="9000">
-                       <posx>20</posx>
-                       <posy>250</posy>
-                       <width>660</width>
-                       <height>50</height>
-                       <itemgap>10</itemgap>
-                       <align>center</align>
-                       <orientation>horizontal</orientation>
-                       <onleft>9000</onleft>
-                       <onright>9000</onright>
-                       <onup>9000</onup>
-                       <ondown>9000</ondown>
-                       <control type="button" id="10">
-                               <description>OK button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>186</label>
-                       </control>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/DialogPictureInfo.xml b/addons/skin.touched/4x3Hirez/DialogPictureInfo.xml
deleted file mode 100644 (file)
index 0362bd0..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-<window id="139">
-       <defaultcontrol always="true">5</defaultcontrol>
-       <include>Window_OpenClose_Animation_Zoom</include>
-       <coordinates>
-               <system>1</system>
-               <posx>140</posx>
-               <posy>30</posy>
-       </coordinates>
-       <controls>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>1000</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="label">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>910</width>
-                       <label>$LOCALIZE[13406]</label>
-               </control>
-               <control type="group">
-                       <posx>930</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>1000</width>
-                       <height>840</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-               <control type="list" id="5">
-                       <posx>20</posx>
-                       <posy>80</posy>
-                       <width>960</width>
-                       <height>800</height>
-                       <onleft>5</onleft>
-                       <onright>5</onright>
-                       <onup>5</onup>
-                       <ondown>5</ondown>
-                       <pagecontrol>60</pagecontrol>
-                       <scrolltime>200</scrolltime>
-                       <itemlayout height="40">
-                               <control type="label">
-                                       <posx>250</posx>
-                                       <posy>0</posy>
-                                       <width>250</width>
-                                       <height>40</height>
-                                       <font>font13_title</font>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <info>ListItem.Label</info>
-                               </control>
-                               <control type="label">
-                                       <posx>260</posx>
-                                       <posy>0</posy>
-                                       <width>670</width>
-                                       <height>40</height>
-                                       <font>font13</font>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>white</selectedcolor>
-                                       <info>ListItem.Label2</info>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout height="40">
-                               <control type="label">
-                                       <posx>250</posx>
-                                       <posy>0</posy>
-                                       <width>250</width>
-                                       <height>40</height>
-                                       <font>font13_title</font>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <info>ListItem.Label</info>
-                               </control>
-                               <control type="label">
-                                       <posx>260</posx>
-                                       <posy>0</posy>
-                                       <width>670</width>
-                                       <height>40</height>
-                                       <font>font13</font>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>white</selectedcolor>
-                                       <info>ListItem.Label2</info>
-                               </control>
-                       </focusedlayout>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/DialogProgress.xml b/addons/skin.touched/4x3Hirez/DialogProgress.xml
deleted file mode 100644 (file)
index ea3372e..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-<window id="101">
-       <defaultcontrol always="true">10</defaultcontrol>
-       <coordinates>
-               <system>1</system>
-               <posx>290</posx>
-               <posy>300</posy>
-       </coordinates>
-       <include>dialogeffect</include>
-       <controls>
-               <control type="image">
-                       <description>Shadow Background for dialogs without BehindDialogFadeOut include</description>
-                       <posx>-30</posx>
-                       <posy>-30</posy>
-                       <width>760</width>
-                       <height>370</height>
-                       <texture border="30">DialogShadow.png</texture>
-               </control>
-               <control type="image">
-                       <description>Header Background</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>700</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="group">
-                       <posx>630</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               <control type="label" id="1">
-                       <description>heading label</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>0</width>
-                       <height>0</height>
-                       <font>-</font>
-                       <visible>false</visible>
-               </control>
-               <control type="label">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>600</width>
-                       <label>$INFO[Control.GetLabel(1)] $INFO[System.Progressbar,- ,%]</label>
-               </control>
-               <control type="image">
-                       <description>Background</description>
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>700</width>
-                       <height>250</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-               <control type="label" id="2">
-                       <description>dialog line 1</description>
-                       <posx>20</posx>
-                       <posy>80</posy>
-                       <width>660</width>
-                       <height>30</height>
-                       <align>left</align>
-                       <aligny>center</aligny>
-                       <label>-</label>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-               </control>
-               <control type="label" id="3">
-                       <description>dialog line 2</description>
-                       <posx>20</posx>
-                       <posy>110</posy>
-                       <width>660</width>
-                       <height>30</height>
-                       <align>left</align>
-                       <aligny>center</aligny>
-                       <label>-</label>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-               </control>
-               <control type="label" id="4">
-                       <description>dialog line 3</description>
-                       <posx>20</posx>
-                       <posy>140</posy>
-                       <width>660</width>
-                       <height>30</height>
-                       <align>left</align>
-                       <aligny>center</aligny>
-                       <label>-</label>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-               </control>
-               <control type="progress">
-                       <description>Progressbar</description>
-                       <posx>20</posx>
-                       <posy>190</posy>
-                       <width>660</width>
-                       <height>32</height>
-                       <info>System.Progressbar</info>
-               </control>
-               <control type="grouplist" id="9000">
-                       <posx>20</posx>
-                       <posy>250</posy>
-                       <width>660</width>
-                       <height>50</height>
-                       <itemgap>10</itemgap>
-                       <align>center</align>
-                       <orientation>horizontal</orientation>
-                       <onleft>9000</onleft>
-                       <onright>9000</onright>
-                       <onup>9000</onup>
-                       <ondown>9000</ondown>
-                       <control type="button" id="10">
-                               <description>OK button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>222</label>
-                       </control>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/DialogSeekBar.xml b/addons/skin.touched/4x3Hirez/DialogSeekBar.xml
deleted file mode 100644 (file)
index 4ec2dd7..0000000
+++ /dev/null
@@ -1,179 +0,0 @@
-<window id="115">
-       <defaultcontrol>1</defaultcontrol>
-       <visible>[Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding] + [Window.IsVisible(FullscreenVideo) | Window.IsVisible(Visualisation)] + ![Window.IsVisible(VideoOSD) | Window.IsVisible(MusicOSD) | Window.IsVisible(PlayerControls)]</visible>
-       <animation effect="fade" start="0" end="100" time="200">WindowOpen</animation>
-       <animation effect="fade" start="100" end="0" time="200">WindowClose</animation>
-       <controls>
-               <control type="group">
-                       <posx>580r</posx>
-                       <posy>0</posy>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>-5</posy>
-                               <width>315</width>
-                               <height>69</height>
-                               <texture border="8">DialogHeader.png</texture>
-                       </control>
-                       <control type="label">
-                               <description>Playing Label</description>
-                               <posx>15</posx>
-                               <posy>2</posy>
-                               <width>370</width>
-                               <height>18</height>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <font>font10_title</font>
-                               <textcolor>blue</textcolor>
-                               <label>$LOCALIZE[31042]</label>
-                               <visible>Player.Playing + !Player.Seeking + !Player.DisplayAfterSeek</visible>
-                       </control>
-                       <control type="label">
-                               <description>Paused Label</description>
-                               <posx>15</posx>
-                               <posy>2</posy>
-                               <width>370</width>
-                               <height>18</height>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <font>font10_title</font>
-                               <textcolor>blue</textcolor>
-                               <label>31043</label>
-                               <visible>[Player.Paused + !Player.Caching] + !Player.Seeking + !Player.DisplayAfterSeek</visible>
-                       </control>
-                       <control type="label">
-                               <description>Cache Label</description>
-                               <posx>15</posx>
-                               <posy>2</posy>
-                               <width>370</width>
-                               <height>18</height>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <font>font10_title</font>
-                               <textcolor>blue</textcolor>
-                               <label>$LOCALIZE[15107] $INFO[Player.CacheLevel]%</label>
-                               <visible>[Player.Paused + Player.Caching] + !Player.Seeking</visible>
-                       </control>
-                       <control type="label">
-                               <description>Seeking Label</description>
-                               <posx>15</posx>
-                               <posy>2</posy>
-                               <width>370</width>
-                               <height>18</height>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <font>font10_title</font>
-                               <textcolor>blue</textcolor>
-                               <label>[UPPERCASE]$LOCALIZE[773][/UPPERCASE]</label>
-                               <visible>Player.Seeking</visible>
-                       </control>
-                       <control type="label">
-                               <description>Final Seek amount Label</description>
-                               <posx>15</posx>
-                               <posy>2</posy>
-                               <width>370</width>
-                               <height>18</height>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <font>font10_title</font>
-                               <textcolor>blue</textcolor>
-                               <label>[UPPERCASE]$LOCALIZE[773][/UPPERCASE][COLOR=grey] $INFO[Player.SeekOffset][/COLOR]</label>
-                               <visible>Player.DisplayAfterSeek + ![player.forwarding | player.rewinding]</visible>
-                       </control>
-                       <control type="label">
-                               <description>FF Label</description>
-                               <posx>15</posx>
-                               <posy>2</posy>
-                               <width>370</width>
-                               <height>18</height>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <font>font10_title</font>
-                               <textcolor>blue</textcolor>
-                               <label>31044</label>
-                               <visible>Player.Forwarding</visible>
-                       </control>
-                       <control type="label">
-                               <description>RW Label</description>
-                               <posx>15</posx>
-                               <posy>2</posy>
-                               <width>370</width>
-                               <height>18</height>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <font>font10_title</font>
-                               <textcolor>blue</textcolor>
-                               <label>31045</label>
-                               <visible>Player.Rewinding</visible>
-                       </control>
-                       <control type="label">
-                               <description>Elapsed Time Label</description>
-                               <posx>15</posx>
-                               <posy>20</posy>
-                               <width>150</width>
-                               <height>15</height>
-                               <font>font12</font>
-                               <textcolor>white</textcolor>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <label>$INFO[Player.Time]</label>
-                               <visible>!Player.Seeking</visible>
-                       </control>
-                       <control type="label">
-                               <description>Seek Time Label</description>
-                               <posx>15</posx>
-                               <posy>20</posy>
-                               <width>150</width>
-                               <height>15</height>
-                               <font>font13_title</font>
-                               <textcolor>white</textcolor>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <label>$INFO[Player.SeekTime]</label>
-                               <visible>Player.Seeking</visible>
-                       </control>
-                       <control type="label">
-                               <description>Total Time Label</description>
-                               <posx>300</posx>
-                               <posy>20</posy>
-                               <width>150</width>
-                               <height>15</height>
-                               <font>font12</font>
-                               <textcolor>white</textcolor>
-                               <align>right</align>
-                               <aligny>center</aligny>
-                               <label>$INFO[Player.Duration]</label>
-                       </control>
-                       <control type="progress">
-                               <description>ProgressbarCache</description>
-                               <posx>7</posx>
-                               <posy>40</posy>
-                               <width>300</width>
-                               <height>15</height>
-                               <info>Player.ProgressCache</info>
-                               <midtexture border="16,0,16,0">OSDProgressMidLight.png</midtexture>
-                               <visible>true</visible>
-                       </control>
-                       <control type="progress" id="23">
-                               <description>Progressbar</description>
-                               <posx>7</posx>
-                               <posy>40</posy>
-                               <width>300</width>
-                               <height>15</height>
-                               <info>Player.Progress</info>
-                               <texturebg border="16,0,16,0">OSDProgressBack2.png</texturebg>
-                               <visible>true</visible>
-                       </control>
-                       <control type="slider" id="401">
-                               <description>Seek Slider</description>
-                               <posx>7</posx>
-                               <posy>40</posy>
-                               <width>300</width>
-                               <height>15</height>
-                               <texturesliderbar>seekslider.png</texturesliderbar>
-                               <textureslidernib>osd_slider_nib.png</textureslidernib>
-                               <textureslidernibfocus>osd_slider_nib.png</textureslidernibfocus>
-                               <visible>Player.Seeking</visible>
-                       </control>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/DialogSelect.xml b/addons/skin.touched/4x3Hirez/DialogSelect.xml
deleted file mode 100644 (file)
index ee5f25f..0000000
+++ /dev/null
@@ -1,237 +0,0 @@
-<window type="dialog" id="2000">
-       <defaultcontrol always="true">3</defaultcontrol>
-       <coordinates>
-               <system>1</system>
-               <posx>335</posx>
-               <posy>35</posy>
-       </coordinates>
-       <include>Window_OpenClose_Animation_Zoom</include>
-       <coordinates>
-               <system>1</system>
-               <posx>290</posx>
-               <posy>80</posy>
-       </coordinates>
-       <controls>
-               <control type="image">
-                       <description>Shadow Background for dialogs without BehindDialogFadeOut include</description>
-                       <posx>-30</posx>
-                       <posy>-30</posy>
-                       <width>760</width>
-                       <height>860</height>
-                       <texture border="30">DialogShadow.png</texture>
-               </control>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>700</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>700</width>
-                       <height>740</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-               <control type="label" id="1">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>600</width>
-                       <label>$LOCALIZE[13406]</label>
-               </control>
-               <control type="group">
-                       <posx>630</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               <control type="list" id="3">
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>700</width>
-                       <height>650</height>
-                       <onup>3</onup>
-                       <ondown>3</ondown>
-                       <onleft>5</onleft>
-                       <onright>61</onright>
-                       <pagecontrol>-</pagecontrol>
-                       <scrolltime>200</scrolltime>
-                       <itemlayout height="60" width="700">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>-2</posy>
-                                       <width>700</width>
-                                       <height>5</height>
-                                       <texture>separator.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>20</posx>
-                                       <posy>0</posy>
-                                       <width>660</width>
-                                       <height>60</height>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout height="60" width="550">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>-2</posy>
-                                       <width>700</width>
-                                       <height>5</height>
-                                       <texture>separator.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>20</posx>
-                                       <posy>0</posy>
-                                       <width>660</width>
-                                       <height>60</height>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                       </focusedlayout>
-               </control>
-               <control type="list" id="6">
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>700</width>
-                       <height>650</height>
-                       <onup>6</onup>
-                       <ondown>6</ondown>
-                       <onleft>5</onleft>
-                       <onright>61</onright>
-                       <pagecontrol>-</pagecontrol>
-                       <scrolltime>200</scrolltime>
-                       <itemlayout height="100" width="700">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>-2</posy>
-                                       <width>700</width>
-                                       <height>5</height>
-                                       <texture>separator.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>20</posx>
-                                       <posy>5</posy>
-                                       <width>550</width>
-                                       <height>30</height>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>[B]$INFO[ListItem.Label][/B]</label>
-                               </control>
-                               <control type="textbox">
-                                       <posx>30</posx>
-                                       <posy>35</posy>
-                                       <width>540</width>
-                                       <height>60</height>
-                                       <font>font12</font>
-                                       <textcolor>black</textcolor>
-                                       <align>left</align>
-                                       <label>$INFO[ListItem.Property(Addon.Summary)]</label>
-                               </control>
-                               <control type="image">
-                                       <posx>580</posx>
-                                       <posy>5</posy>
-                                       <width>100</width>
-                                       <height>90</height>
-                                       <texture>$INFO[Listitem.Icon]</texture>
-                                       <bordertexture>ThumbBorderGrey.png</bordertexture>
-                                       <bordersize>2</bordersize>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout height="100" width="700">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>-2</posy>
-                                       <width>700</width>
-                                       <height>5</height>
-                                       <texture>separator.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>20</posx>
-                                       <posy>5</posy>
-                                       <width>550</width>
-                                       <height>30</height>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>[B]$INFO[ListItem.Label][/B]</label>
-                               </control>
-                               <control type="textbox">
-                                       <posx>30</posx>
-                                       <posy>35</posy>
-                                       <width>540</width>
-                                       <height>60</height>
-                                       <font>font12</font>
-                                       <textcolor>black</textcolor>
-                                       <align>left</align>
-                                       <label>$INFO[ListItem.Property(Addon.Summary)]</label>
-                               </control>
-                               <control type="image">
-                                       <posx>580</posx>
-                                       <posy>5</posy>
-                                       <width>100</width>
-                                       <height>90</height>
-                                       <texture>$INFO[Listitem.Icon]</texture>
-                                       <bordertexture>ThumbBorderGrey.png</bordertexture>
-                                       <bordersize>2</bordersize>
-                               </control>
-                       </focusedlayout>
-               </control>
-               <control type="label">
-                       <description>number of files/pages in list text label</description>
-                       <posx>680</posx>
-                       <posy>750</posy>
-                       <width>300</width>
-                       <height>30</height>
-                       <font>font13</font>
-                       <align>right</align>
-                       <aligny>center</aligny>
-                       <scroll>true</scroll>
-                       <textcolor>black</textcolor>
-                       <label>($INFO[Container(3).NumItems]) $LOCALIZE[31025] - $LOCALIZE[31024] ($INFO[Container(3).CurrentPage]/$INFO[Container(3).NumPages])</label>
-                       <visible>Control.IsVisible(3)</visible>
-               </control>
-               <control type="label">
-                       <description>number of files/pages in list text label</description>
-                       <posx>680</posx>
-                       <posy>750</posy>
-                       <width>300</width>
-                       <height>30</height>
-                       <font>font13</font>
-                       <align>right</align>
-                       <aligny>center</aligny>
-                       <scroll>true</scroll>
-                       <textcolor>black</textcolor>
-                       <label>($INFO[Container(6).NumItems]) $LOCALIZE[31025] - $LOCALIZE[31024] ($INFO[Container(6).CurrentPage]/$INFO[Container(6).NumPages])</label>
-                       <visible>Control.IsVisible(6)</visible>
-               </control>
-               <control type="button" id="5">
-                       <description>Manual button</description>
-                       <posx>20</posx>
-                       <posy>740</posy>
-                       <width>200</width>
-                       <include>ButtonInfoDialogsCommonValues</include>
-                       <label>186</label>
-                       <onleft>61</onleft>
-                       <onright>3</onright>
-                       <onup>3</onup>
-                       <ondown>3</ondown>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/DialogSongInfo.xml b/addons/skin.touched/4x3Hirez/DialogSongInfo.xml
deleted file mode 100644 (file)
index ec9a515..0000000
+++ /dev/null
@@ -1,303 +0,0 @@
-<window id="135">
-       <defaultcontrol always="true">10</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <include>Window_OpenClose_Animation_Zoom</include>
-       <coordinates>
-               <system>1</system>
-               <posx>140</posx>
-               <posy>190</posy>
-       </coordinates>
-       <controls>
-               <control type="group">
-                       <include>VisibleFadeEffect</include>
-                       <visible>!Window.IsVisible(MusicInformation)</visible>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>1000</width>
-                               <height>60</height>
-                               <texture border="5">DialogHeader.png</texture>
-                       </control>
-                       <control type="label">
-                               <description>header label</description>
-                               <posx>20</posx>
-                               <posy>0</posy>
-                               <include>WindowTitleCommons</include>
-                               <width>910</width>
-                               <label>658</label>
-                       </control>
-                       <control type="group">
-                               <posx>930</posx>
-                               <posy>0</posy>
-                               <include>DialogCloseButtonCommons</include>
-                       </control>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>60</posy>
-                               <width>1000</width>
-                               <height>460</height>
-                               <texture border="5">DialogBack.png</texture>
-                       </control>
-                       <control type="label">
-                               <description>Song Title value</description>
-                               <posx>40</posx>
-                               <posy>80</posy>
-                               <width>960</width>
-                               <height>30</height>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <font>font13_title</font>
-                               <label>[B]$INFO[ListItem.Title][/B]</label>
-                               <textcolor>black</textcolor>
-                               <scroll>true</scroll>
-                       </control>
-                       <control type="image">
-                               <posx>20</posx>
-                               <posy>140</posy>
-                               <width>250</width>
-                               <height>250</height>
-                               <aspectratio aligny="bottom">keep</aspectratio>
-                               <texture>$INFO[ListItem.Icon]</texture>
-                               <bordertexture border="8">ThumbShadow.png</bordertexture>
-                               <bordersize>8</bordersize>
-                       </control>
-                       <control type="group">
-                               <posx>280</posx>
-                               <posy>140</posy>
-                               <control type="label">
-                                       <description>Artist Title</description>
-                                       <posx>150</posx>
-                                       <posy>0</posy>
-                                       <width>150</width>
-                                       <height>25</height>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <font>font13_title</font>
-                                       <textcolor>black</textcolor>
-                                       <label>$LOCALIZE[557]:</label>
-                               </control>
-                               <control type="fadelabel">
-                                       <description>Artist Value</description>
-                                       <posx>160</posx>
-                                       <posy>0</posy>
-                                       <width>520</width>
-                                       <height>25</height>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <label fallback="161">$INFO[ListItem.Artist]</label>
-                               </control>
-                               <control type="label">
-                                       <description>Album Title</description>
-                                       <posx>150</posx>
-                                       <posy>30</posy>
-                                       <width>130</width>
-                                       <height>25</height>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <font>font13_title</font>
-                                       <textcolor>black</textcolor>
-                                       <label>$LOCALIZE[558]:</label>
-                               </control>
-                               <control type="fadelabel">
-                                       <description>Album Value</description>
-                                       <posx>160</posx>
-                                       <posy>30</posy>
-                                       <width>520</width>
-                                       <height>25</height>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <label fallback="161">$INFO[ListItem.Album]$INFO[listitem.discnumber, - $LOCALIZE[427] ]</label>
-                               </control>
-                               <control type="label">
-                                       <description>Genre Title</description>
-                                       <posx>150</posx>
-                                       <posy>60</posy>
-                                       <width>130</width>
-                                       <height>25</height>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <font>font13_title</font>
-                                       <textcolor>black</textcolor>
-                                       <label>$LOCALIZE[515]:</label>
-                               </control>
-                               <control type="fadelabel">
-                                       <description>Genre Value</description>
-                                       <posx>160</posx>
-                                       <posy>60</posy>
-                                       <width>520</width>
-                                       <height>25</height>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <label fallback="161">$INFO[ListItem.Genre]</label>
-                               </control>
-                               <control type="label">
-                                       <description>Year Title</description>
-                                       <posx>150</posx>
-                                       <posy>90</posy>
-                                       <width>130</width>
-                                       <height>25</height>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <font>font13_title</font>
-                                       <textcolor>black</textcolor>
-                                       <label>$LOCALIZE[562]:</label>
-                               </control>
-                               <control type="fadelabel">
-                                       <description>Year Value</description>
-                                       <posx>160</posx>
-                                       <posy>90</posy>
-                                       <width>520</width>
-                                       <height>25</height>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <label fallback="161">$INFO[ListItem.Year]</label>
-                               </control>
-                               <control type="label">
-                                       <description>Track Number Title</description>
-                                       <posx>150</posx>
-                                       <posy>120</posy>
-                                       <width>130</width>
-                                       <height>25</height>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <font>font13_title</font>
-                                       <textcolor>black</textcolor>
-                                       <label>$LOCALIZE[554]:</label>
-                               </control>
-                               <control type="fadelabel">
-                                       <description>Track Number Value</description>
-                                       <posx>160</posx>
-                                       <posy>120</posy>
-                                       <width>520</width>
-                                       <height>25</height>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <label fallback="161">$INFO[ListItem.TrackNumber]</label>
-                               </control>
-                               <control type="label">
-                                       <description>Rating Title</description>
-                                       <posx>150</posx>
-                                       <posy>150</posy>
-                                       <width>130</width>
-                                       <height>25</height>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <font>font13_title</font>
-                                       <textcolor>black</textcolor>
-                                       <label>$LOCALIZE[563]:</label>
-                               </control>
-                               <control type="group">
-                                       <posx>160</posx>
-                                       <posy>140</posy>
-                                       <control type="image">
-                                               <description>Rating value</description>
-                                               <posx>0</posx>
-                                               <posy>2</posy>
-                                               <width>200</width>
-                                               <height>40</height>
-                                               <aspectratio align="left">keep</aspectratio>
-                                               <texture fallback="dark/left_rating/rating0.png">$INFO[ListItem.StarRating,dark/left_rating/]</texture>
-                                       </control>
-                                       <control type="button" id="14">
-                                               <description>Decrease Rating</description>
-                                               <posx>170</posx>
-                                               <posy>0</posy>
-                                               <width>45</width>
-                                               <height>45</height>
-                                               <onclick>DecreaseRating</onclick>
-                                               <texturenofocus>Select_Down.png</texturenofocus>
-                                               <texturefocus>Select_Down.png</texturefocus>
-                                               <onleft>9000</onleft>
-                                               <onright>15</onright>
-                                               <ondown>14</ondown>
-                                               <onup>14</onup>
-                                       </control>
-                                       <control type="button" id="15">
-                                               <description>Increase Rating</description>
-                                               <posx>215</posx>
-                                               <posy>0</posy>
-                                               <width>45</width>
-                                               <height>45</height>
-                                               <onclick>IncreaseRating</onclick>
-                                               <texturenofocus>Select_Up.png</texturenofocus>
-                                               <texturefocus>Select_Up.png</texturefocus>
-                                               <onleft>14</onleft>
-                                               <onright>15</onright>
-                                               <ondown>15</ondown>
-                                               <onup>15</onup>
-                                       </control>
-                               </control>
-                               <control type="label">
-                                       <description>Comment Title</description>
-                                       <posx>150</posx>
-                                       <posy>200</posy>
-                                       <width>130</width>
-                                       <height>25</height>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <font>font13_title</font>
-                                       <textcolor>black</textcolor>
-                                       <label>$LOCALIZE[569]:</label>
-                               </control>
-                               <control type="textbox">
-                                       <description>Comment value</description>
-                                       <posx>165</posx>
-                                       <posy>195</posy>
-                                       <width>520</width>
-                                       <height>100</height>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <pagecontrol>-</pagecontrol>
-                                       <label fallback="161">$INFO[ListItem.Comment]</label>
-                               </control>
-                       </control>
-                       <control type="grouplist" id="9000">
-                               <posx>20</posx>
-                               <posy>450</posy>
-                               <width>960</width>
-                               <height>50</height>
-                               <itemgap>10</itemgap>
-                               <align>center</align>
-                               <orientation>horizontal</orientation>
-                               <onleft>9000</onleft>
-                               <onright>9000</onright>
-                               <onup>50</onup>
-                               <ondown>49</ondown>
-                               <control type="button" id ="10">
-                                       <description>Ok button</description>
-                                       <width>200</width>
-                                       <label>186</label>
-                                       <include>ButtonInfoDialogsCommonValues</include>
-                               </control>
-                               <control type="button" id="11">
-                                       <description>Cancel button</description>
-                                       <width>200</width>
-                                       <label>222</label>
-                                       <include>ButtonInfoDialogsCommonValues</include>
-                               </control>
-                               <control type="button" id="12">
-                                       <description>Album Info button</description>
-                                       <width>200</width>
-                                       <label>10523</label>
-                                       <include>ButtonInfoDialogsCommonValues</include>
-                               </control>
-                               <control type="button" id ="13">
-                                       <description>Get Thumb button</description>
-                                       <width>200</width>
-                                       <label>13405</label>
-                                       <include>ButtonInfoDialogsCommonValues</include>
-                               </control>
-                       </control>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/DialogTextViewer.xml b/addons/skin.touched/4x3Hirez/DialogTextViewer.xml
deleted file mode 100644 (file)
index 9eb7fb3..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-<window id="147">
-       <defaultcontrol>61</defaultcontrol>
-       <include>Window_OpenClose_Animation_Zoom</include>
-       <coordinates>
-               <system>1</system>
-               <posx>140</posx>
-               <posy>30</posy>
-       </coordinates>
-       <controls>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>1000</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="label" id="1">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>910</width>
-                       <label></label>
-               </control>
-               <control type="group">
-                       <posx>930</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               </control>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>1000</width>
-                       <height>840</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-               <control type="textbox" id="5">
-                       <description>textarea</description>
-                       <posx>20</posx>
-                       <posy>70</posy>
-                       <width>940</width>
-                       <height>820</height>
-                       <label>-</label>
-                       <font>font13</font>
-                       <align>justify</align>
-                       <textcolor>black</textcolor>
-                       <pagecontrol>61</pagecontrol>
-               </control>
-               <control type="scrollbar" id="61">
-                       <posx>970</posx>
-                       <posy>70</posy>
-                       <width>20</width>
-                       <height>820</height>
-                       <texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
-                       <texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
-                       <texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
-                       <textureslidernib>ScrollBarNib.png</textureslidernib>
-                       <textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
-                       <onleft>61</onleft>
-                       <onright>61</onright>
-                       <ondown>61</ondown>
-                       <onup>61</onup>
-                       <showonepage>true</showonepage>
-                       <orientation>vertical</orientation>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/DialogVideoInfo.xml b/addons/skin.touched/4x3Hirez/DialogVideoInfo.xml
deleted file mode 100644 (file)
index 85b0795..0000000
+++ /dev/null
@@ -1,910 +0,0 @@
-<window id="2003">
-       <defaultcontrol always="true">49</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <include>Window_OpenClose_Animation_Zoom</include>
-       <coordinates>
-               <system>1</system>
-               <posx>140</posx>
-               <posy>30</posy>
-       </coordinates>
-       <controls>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>1000</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="label">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>910</width>
-                       <label>$INFO[Listitem.Title]</label>
-               </control>
-               <control type="group">
-                       <posx>930</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>1000</width>
-                       <height>840</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-
-               <control type="group">
-                       <visible>[!container.content(tvshows) + !container.content(episodes) + !container.content(musicvideos)] + !Control.IsVisible(50)</visible>
-                       <posy>70</posy>
-                       <posx>20</posx>
-                       <include>VisibleFadeEffect</include>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>240</width>
-                               <height>330</height>
-                               <aspectratio>keep</aspectratio>
-                               <bordertexture border="8">ThumbShadow.png</bordertexture>
-                               <bordersize>8</bordersize>
-                               <texture background="true">$INFO[ListItem.Icon]</texture>
-                       </control>
-                       <control type="label">
-                               <posx>260</posx>
-                               <posy>0</posy>
-                               <width>700</width>
-                               <height>30</height>
-                               <font>font13_title</font>
-                               <textcolor>black</textcolor>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <label>$LOCALIZE[207]$INFO[Container(600).CurrentPage, ( $LOCALIZE[31024] ]$INFO[Container(600).NumPages,/, )]</label>
-                       </control>
-                       <control type="textbox" id="600">
-                               <description>Description Value for Movies</description>
-                               <posx>260</posx>
-                               <posy>30</posy>
-                               <width>700</width>
-                               <height>290</height>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <pagecontrol>-</pagecontrol>
-                               <label>$INFO[ListItem.Plot]</label>
-                       </control>
-                       <control type="grouplist">
-                               <description>Media Codec Flagging Images</description>
-                               <posx>0</posx>
-                               <posy>340</posy>
-                               <width>960</width>
-                               <height>45</height>
-                               <align>center</align>
-                               <itemgap>5</itemgap>
-                               <orientation>horizontal</orientation>
-                               <include>VisibleFadeEffect</include>
-                               <visible>Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)</visible>
-                               <include>VideoCodecFlaggingConditions</include>
-                               <include>AudioCodecFlaggingConditions</include>
-                               <include>AudioChannelsFlaggingConditions</include>
-                               <include>AspectCodecFlaggingConditions</include>
-                               <include>VideoTypeHackFlaggingConditions</include>
-                       </control>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>390</posy>
-                               <width>960</width>
-                               <height>5</height>
-                               <texture>separator.png</texture>
-                       </control>
-                       <control type="list" id="49">
-                               <posx>0</posx>
-                               <posy>400</posy>
-                               <width>960</width>
-                               <height>330</height>
-                               <onleft>49</onleft>
-                               <onright>49</onright>
-                               <onup>9000</onup>
-                               <ondown>61</ondown>
-                               <pagecontrol>-</pagecontrol>
-                               <scrolltime>200</scrolltime>
-                               <itemlayout height="30">
-                                       <control type="label">
-                                               <posx>200</posx>
-                                               <posy>0</posy>
-                                               <width>160</width>
-                                               <height>30</height>
-                                               <font>font13_title</font>
-                                               <align>right</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <info>ListItem.Label</info>
-                                       </control>
-                                       <control type="label">
-                                               <posx>210</posx>
-                                               <posy>0</posy>
-                                               <width>750</width>
-                                               <height>30</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>white</selectedcolor>
-                                               <info>ListItem.Label2</info>
-                                       </control>
-                               </itemlayout>
-                               <focusedlayout height="30">
-                                       <control type="label">
-                                               <posx>200</posx>
-                                               <posy>0</posy>
-                                               <width>160</width>
-                                               <height>30</height>
-                                               <font>font13_title</font>
-                                               <align>right</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <info>ListItem.Label</info>
-                                       </control>
-                                       <control type="label">
-                                               <posx>210</posx>
-                                               <posy>0</posy>
-                                               <width>750</width>
-                                               <height>30</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>white</selectedcolor>
-                                               <info>ListItem.Label2</info>
-                                       </control>
-                               </focusedlayout>
-                               <content>
-                                       <item>
-                                               <label>$LOCALIZE[20376]:</label>
-                                               <label2>$INFO[ListItem.OriginalTitle]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.OriginalTitle) + !stringcompare(ListItem.OriginalTitle,Listitem.Title)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[20339]:</label>
-                                               <label2>$INFO[ListItem.Director]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Director)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[20417]:</label>
-                                               <label2>$INFO[ListItem.Writer]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Writer)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[572]:</label>
-                                               <label2>$INFO[ListItem.Studio]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Studio)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[515]:</label>
-                                               <label2>$INFO[ListItem.Genre]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Genre)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[562]:</label>
-                                               <label2>$INFO[ListItem.Year]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Year)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[2050]:</label>
-                                               <label2>$INFO[ListItem.Duration] $LOCALIZE[12391]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Duration)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[563]:</label>
-                                               <label2>$INFO[ListItem.RatingAndVotes]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.RatingAndVotes)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[202]:</label>
-                                               <label2>$INFO[ListItem.TagLine]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.TagLine)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[203]:</label>
-                                               <label2>$INFO[ListItem.PlotOutline]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.PlotOutline)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[20074]:</label>
-                                               <label2>$INFO[ListItem.mpaa]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.mpaa)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[15311]</label>
-                                               <label2>$INFO[ListItem.FilenameAndPath]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.FilenameAndPath)</visible>
-                                       </item>
-                               </content>
-                       </control>
-               </control>
-
-               <control type="group">
-                       <visible>Container.Content(TVShows) + !Control.IsVisible(50)</visible>
-                       <posy>70</posy>
-                       <posx>20</posx>
-                       <include>VisibleFadeEffect</include>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>960</width>
-                               <height>140</height>
-                               <aspectratio>keep</aspectratio>
-                               <bordertexture border="8">ThumbShadow.png</bordertexture>
-                               <bordersize>8</bordersize>
-                               <texture background="true">$INFO[ListItem.Icon]</texture>
-                       </control>
-                       <control type="label">
-                               <posx>10</posx>
-                               <posy>150</posy>
-                               <width>940</width>
-                               <height>30</height>
-                               <font>font13_title</font>
-                               <textcolor>black</textcolor>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <label>$LOCALIZE[207]$INFO[Container(601).CurrentPage, ( $LOCALIZE[31024] ]$INFO[Container(601).NumPages,/, )]</label>
-                       </control>
-                       <control type="textbox" id="601">
-                               <description>Description Value for TV SHows</description>
-                               <posx>10</posx>
-                               <posy>180</posy>
-                               <width>940</width>
-                               <height>240</height>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <pagecontrol>-</pagecontrol>
-                               <label>$INFO[ListItem.Plot]</label>
-                       </control>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>450</posy>
-                               <width>960</width>
-                               <height>5</height>
-                               <texture>separator.png</texture>
-                       </control>
-                       <control type="list" id="49">
-                               <posx>0</posx>
-                               <posy>460</posy>
-                               <width>960</width>
-                               <height>270</height>
-                               <onleft>49</onleft>
-                               <onright>49</onright>
-                               <onup>9000</onup>
-                               <ondown>61</ondown>
-                               <pagecontrol>-</pagecontrol>
-                               <scrolltime>200</scrolltime>
-                               <itemlayout height="30">
-                                       <control type="label">
-                                               <posx>200</posx>
-                                               <posy>0</posy>
-                                               <width>160</width>
-                                               <height>30</height>
-                                               <font>font13_title</font>
-                                               <align>right</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <info>ListItem.Label</info>
-                                       </control>
-                                       <control type="label">
-                                               <posx>210</posx>
-                                               <posy>0</posy>
-                                               <width>750</width>
-                                               <height>30</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>white</selectedcolor>
-                                               <info>ListItem.Label2</info>
-                                       </control>
-                               </itemlayout>
-                               <focusedlayout height="30">
-                                       <control type="label">
-                                               <posx>200</posx>
-                                               <posy>0</posy>
-                                               <width>160</width>
-                                               <height>30</height>
-                                               <font>font13_title</font>
-                                               <align>right</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <info>ListItem.Label</info>
-                                       </control>
-                                       <control type="label">
-                                               <posx>210</posx>
-                                               <posy>0</posy>
-                                               <width>750</width>
-                                               <height>30</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>white</selectedcolor>
-                                               <info>ListItem.Label2</info>
-                                       </control>
-                               </focusedlayout>
-                               <content>
-                                       <item>
-                                               <label>$LOCALIZE[20360]:</label>
-                                               <label2>$INFO[listitem.episode] ($INFO[ListItem.Property(WatchedEpisodes),, $LOCALIZE[16102]] - $INFO[ListItem.Property(UnWatchedEpisodes), , $LOCALIZE[16101]])</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Episode)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[31322]:</label>
-                                               <label2>$INFO[ListItem.Premiered]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Premiered)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[515]:</label>
-                                               <label2>$INFO[ListItem.Genre]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Genre)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[562]:</label>
-                                               <label2>$INFO[ListItem.Year]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Year)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[563]:</label>
-                                               <label2>$INFO[ListItem.Rating]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Rating)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[15311]</label>
-                                               <label2>$INFO[ListItem.FilenameAndPath]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.FilenameAndPath)</visible>
-                                       </item>
-                               </content>
-                       </control>
-               </control>
-
-               <control type="group">
-                       <visible>Container.Content(Episodes) + !Control.IsVisible(50)</visible>
-                       <posy>70</posy>
-                       <posx>20</posx>
-                       <include>VisibleFadeEffect</include>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>450</width>
-                               <height>330</height>
-                               <aspectratio>scale</aspectratio>
-                               <bordertexture border="8">ThumbShadow.png</bordertexture>
-                               <bordersize>8</bordersize>
-                               <texture background="true">$INFO[ListItem.Icon]</texture>
-                       </control>
-                       <control type="label">
-                               <posx>460</posx>
-                               <posy>0</posy>
-                               <width>500</width>
-                               <height>30</height>
-                               <font>font13_title</font>
-                               <textcolor>black</textcolor>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <label>$LOCALIZE[207]$INFO[Container(602).CurrentPage, ( $LOCALIZE[31024] ]$INFO[Container(602).NumPages,/, )]</label>
-                       </control>
-                       <control type="textbox" id="602">
-                               <description>Description Value for Episode</description>
-                               <posx>460</posx>
-                               <posy>30</posy>
-                               <width>500</width>
-                               <height>290</height>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <pagecontrol>-</pagecontrol>
-                               <label>$INFO[ListItem.Plot]</label>
-                       </control>
-                       <control type="grouplist">
-                               <description>Media Codec Flagging Images</description>
-                               <posx>0</posx>
-                               <posy>340</posy>
-                               <width>960</width>
-                               <height>45</height>
-                               <align>center</align>
-                               <itemgap>5</itemgap>
-                               <orientation>horizontal</orientation>
-                               <include>VisibleFadeEffect</include>
-                               <visible>Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)</visible>
-                               <include>VideoCodecFlaggingConditions</include>
-                               <include>AudioCodecFlaggingConditions</include>
-                               <include>AudioChannelsFlaggingConditions</include>
-                               <include>AspectCodecFlaggingConditions</include>
-                               <include>VideoTypeHackFlaggingConditions</include>
-                       </control>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>390</posy>
-                               <width>960</width>
-                               <height>5</height>
-                               <texture>separator.png</texture>
-                       </control>
-                       <control type="list" id="49">
-                               <posx>0</posx>
-                               <posy>400</posy>
-                               <width>960</width>
-                               <height>330</height>
-                               <onleft>49</onleft>
-                               <onright>49</onright>
-                               <onup>9000</onup>
-                               <ondown>61</ondown>
-                               <pagecontrol>-</pagecontrol>
-                               <scrolltime>200</scrolltime>
-                               <itemlayout height="30">
-                                       <control type="label">
-                                               <posx>200</posx>
-                                               <posy>0</posy>
-                                               <width>160</width>
-                                               <height>30</height>
-                                               <font>font13_title</font>
-                                               <align>right</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <info>ListItem.Label</info>
-                                       </control>
-                                       <control type="label">
-                                               <posx>210</posx>
-                                               <posy>0</posy>
-                                               <width>750</width>
-                                               <height>30</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>white</selectedcolor>
-                                               <info>ListItem.Label2</info>
-                                       </control>
-                               </itemlayout>
-                               <focusedlayout height="30">
-                                       <control type="label">
-                                               <posx>200</posx>
-                                               <posy>0</posy>
-                                               <width>160</width>
-                                               <height>30</height>
-                                               <font>font13_title</font>
-                                               <align>right</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <info>ListItem.Label</info>
-                                       </control>
-                                       <control type="label">
-                                               <posx>210</posx>
-                                               <posy>0</posy>
-                                               <width>750</width>
-                                               <height>30</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>white</selectedcolor>
-                                               <info>ListItem.Label2</info>
-                                       </control>
-                               </focusedlayout>
-                               <content>
-                                       <item>
-                                               <label>$LOCALIZE[20364]:</label>
-                                               <label2>$INFO[ListItem.TVShowTitle]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.TVShowTitle)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[20373]:</label>
-                                               <label2>$INFO[ListItem.Season]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Season)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[20359]:</label>
-                                               <label2>$INFO[ListItem.Episode]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Episode)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[31322]:</label>
-                                               <label2>$INFO[ListItem.Premiered]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Premiered)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[515]:</label>
-                                               <label2>$INFO[ListItem.Genre]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Genre)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[20339]:</label>
-                                               <label2>$INFO[ListItem.Director]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Director)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[20417]:</label>
-                                               <label2>$INFO[ListItem.Writer]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Writer)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[562]:</label>
-                                               <label2>$INFO[ListItem.Year]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Year)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[2050]:</label>
-                                               <label2>$INFO[ListItem.Duration] $LOCALIZE[12391]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Duration)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[563]:</label>
-                                               <label2>$INFO[ListItem.Rating]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Rating)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[15311]</label>
-                                               <label2>$INFO[ListItem.FilenameAndPath]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.FilenameAndPath)</visible>
-                                       </item>
-                               </content>
-                       </control>
-               </control>
-
-               <control type="group">
-                       <visible>Container.Content(MusicVideos) + !Control.IsVisible(50)</visible>
-                       <posy>70</posy>
-                       <posx>20</posx>
-                       <include>VisibleFadeEffect</include>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>450</width>
-                               <height>330</height>
-                               <aspectratio>scale</aspectratio>
-                               <bordertexture border="8">ThumbShadow.png</bordertexture>
-                               <bordersize>8</bordersize>
-                               <texture background="true">$INFO[ListItem.Icon]</texture>
-                       </control>
-                       <control type="label">
-                               <posx>460</posx>
-                               <posy>0</posy>
-                               <width>500</width>
-                               <height>30</height>
-                               <font>font13_title</font>
-                               <textcolor>black</textcolor>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <label>$LOCALIZE[207]$INFO[Container(603).CurrentPage, ( $LOCALIZE[31024] ]$INFO[Container(603).NumPages,/, )]</label>
-                       </control>
-                       <control type="textbox" id="603">
-                               <description>Description Value for Episode</description>
-                               <posx>460</posx>
-                               <posy>30</posy>
-                               <width>500</width>
-                               <height>290</height>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <pagecontrol>-</pagecontrol>
-                               <label>$INFO[ListItem.Plot]</label>
-                       </control>
-                       <control type="grouplist">
-                               <description>Media Codec Flagging Images</description>
-                               <posx>0</posx>
-                               <posy>340</posy>
-                               <width>960</width>
-                               <height>45</height>
-                               <align>center</align>
-                               <itemgap>5</itemgap>
-                               <orientation>horizontal</orientation>
-                               <include>VisibleFadeEffect</include>
-                               <visible>Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)</visible>
-                               <include>VideoCodecFlaggingConditions</include>
-                               <include>AudioCodecFlaggingConditions</include>
-                               <include>AudioChannelsFlaggingConditions</include>
-                               <include>AspectCodecFlaggingConditions</include>
-                               <include>VideoTypeHackFlaggingConditions</include>
-                       </control>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>390</posy>
-                               <width>960</width>
-                               <height>5</height>
-                               <texture>separator.png</texture>
-                       </control>
-                       <control type="list" id="49">
-                               <posx>0</posx>
-                               <posy>400</posy>
-                               <width>960</width>
-                               <height>330</height>
-                               <onleft>49</onleft>
-                               <onright>49</onright>
-                               <onup>9000</onup>
-                               <ondown>61</ondown>
-                               <pagecontrol>-</pagecontrol>
-                               <scrolltime>200</scrolltime>
-                               <itemlayout height="30">
-                                       <control type="label">
-                                               <posx>200</posx>
-                                               <posy>0</posy>
-                                               <width>160</width>
-                                               <height>30</height>
-                                               <font>font13_title</font>
-                                               <align>right</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <info>ListItem.Label</info>
-                                       </control>
-                                       <control type="label">
-                                               <posx>210</posx>
-                                               <posy>0</posy>
-                                               <width>750</width>
-                                               <height>30</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>white</selectedcolor>
-                                               <info>ListItem.Label2</info>
-                                       </control>
-                               </itemlayout>
-                               <focusedlayout height="30">
-                                       <control type="label">
-                                               <posx>200</posx>
-                                               <posy>0</posy>
-                                               <width>160</width>
-                                               <height>30</height>
-                                               <font>font13_title</font>
-                                               <align>right</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <info>ListItem.Label</info>
-                                       </control>
-                                       <control type="label">
-                                               <posx>210</posx>
-                                               <posy>0</posy>
-                                               <width>750</width>
-                                               <height>30</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>white</selectedcolor>
-                                               <info>ListItem.Label2</info>
-                                       </control>
-                               </focusedlayout>
-                               <content>
-                                       <item>
-                                               <label>$LOCALIZE[557]:</label>
-                                               <label2>$INFO[ListItem.Artist]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Artist)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[558]:</label>
-                                               <label2>$INFO[ListItem.Album]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Album)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[515]:</label>
-                                               <label2>$INFO[ListItem.Genre]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Genre)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[572]:</label>
-                                               <label2>$INFO[ListItem.Studio]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Studio)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[20417]:</label>
-                                               <label2>$INFO[ListItem.Writer]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Writer)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[20339]:</label>
-                                               <label2>$INFO[ListItem.Director]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Director)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[562]:</label>
-                                               <label2>$INFO[ListItem.Year]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Year)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[2050]:</label>
-                                               <label2>$INFO[ListItem.Duration] $LOCALIZE[12391]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Duration)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[15311]</label>
-                                               <label2>$INFO[ListItem.FilenameAndPath]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.FilenameAndPath)</visible>
-                                       </item>
-                               </content>
-                       </control>
-               </control>
-
-               <control type="panel" id="50">
-                       <posx>0</posx>
-                       <posy>65</posy>
-                       <width>1000</width>
-                       <height>702</height>
-                       <onup>50</onup>
-                       <onleft>50</onleft>
-                       <onright>50</onright>
-                       <ondown>50</ondown>
-                       <pagecontrol>-</pagecontrol>
-                       <scrolltime>200</scrolltime>
-                       <include>VisibleFadeEffect</include>
-                       <itemlayout height="100" width="500">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>-2</posy>
-                                       <width>500</width>
-                                       <height>5</height>
-                                       <texture>separator.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>4</posy>
-                                       <width>100</width>
-                                       <height>92</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <fadetime>IconCrossfadeTime</fadetime>
-                                       <texture>$INFO[ListItem.Icon]</texture>
-                                       <bordertexture border="5">ThumbBorderGrey.png</bordertexture>
-                                       <bordersize>2</bordersize>
-                               </control>
-                               <control type="textbox">
-                                       <posx>120</posx>
-                                       <posy>10</posy>
-                                       <width>360</width>
-                                       <height>80</height>
-                                       <font>font13</font>
-                                       <align>left</align>
-                                       <textcolor>black</textcolor>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout height="100" width="500">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>-2</posy>
-                                       <width>700</width>
-                                       <height>5</height>
-                                       <texture>separator.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>4</posy>
-                                       <width>100</width>
-                                       <height>92</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <fadetime>IconCrossfadeTime</fadetime>
-                                       <texture>$INFO[ListItem.Icon]</texture>
-                                       <bordertexture border="5">ThumbBorderGrey.png</bordertexture>
-                                       <bordersize>2</bordersize>
-                               </control>
-                               <control type="textbox">
-                                       <posx>120</posx>
-                                       <posy>10</posy>
-                                       <width>360</width>
-                                       <height>80</height>
-                                       <font>font13</font>
-                                       <align>left</align>
-                                       <textcolor>black</textcolor>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                       </focusedlayout>
-               </control>
-               <control type="label">
-                       <posx>980</posx>
-                       <posy>790</posy>
-                       <width>800</width>
-                       <height>30</height>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-                       <scroll>true</scroll>
-                       <align>right</align>
-                       <aligny>center</aligny>
-                       <label>$INFO[Container(50).CurrentPage, ( $LOCALIZE[31024] ]$INFO[Container(50).NumPages,/, )]</label>
-                       <visible>Control.IsVisible(50)</visible>
-               </control>
-
-               <control type="grouplist" id="9000">
-                       <posx>20</posx>
-                       <posy>830</posy>
-                       <width>960</width>
-                       <height>50</height>
-                       <itemgap>2</itemgap>
-                       <align>center</align>
-                       <orientation>horizontal</orientation>
-                       <onleft>9000</onleft>
-                       <onright>9000</onright>
-                       <onup>50</onup>
-                       <ondown>49</ondown>
-                       <control type="togglebutton" id="8">
-                               <description>Play/browse to Show</description>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>208</label>
-                               <alttexturefocus border="5">IconBack-focus.png</alttexturefocus>
-                               <alttexturenofocus border="5">ListNF.png</alttexturenofocus>
-                               <altlabel>1024</altlabel>
-                               <usealttexture>Container.Content(TVShows)</usealttexture>
-                       </control>
-                       <control type="button" id="5">
-                               <description>Cast/Review</description>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>206</label>
-                       </control>
-                       <control type="button" id="6">
-                               <description>Refresh</description>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>184</label>
-                       </control>
-                       <control type="button" id="10">
-                               <description>Get Thumb</description>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>13405</label>
-                       </control>
-                       <control type="button" id="12">
-                               <description>Get Fanart</description>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>20413</label>
-                       </control>
-                       <control type="button" id="11">
-                               <description>Play Trailer</description>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>20410</label>
-                               <visible>!IsEmpty(ListItem.Trailer) + !Skin.HasSetting(WindowedTrailer)</visible>
-                       </control>
-                       <control type="button" id="15">
-                               <description>Play Trailer Windowed</description>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>20410</label>
-                               <onclick>PlayMedia($INFO[ListItem.Trailer],1)</onclick>
-                               <visible>!IsEmpty(ListItem.Trailer) + Skin.HasSetting(WindowedTrailer)</visible>
-                       </control>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/DialogVideoScan.xml b/addons/skin.touched/4x3Hirez/DialogVideoScan.xml
deleted file mode 100644 (file)
index d5e2e3e..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-<window id="133">
-       <defaultcontrol></defaultcontrol>
-       <include>dialogeffect</include>
-       <controls>
-               <control type="group">
-                       <posx>420r</posx>
-                       <posy>25</posy>
-                       <visible>!Window.IsVisible(FullscreenVideo) + !Window.IsVisible(Visualisation)</visible>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>350</width>
-                               <height>67</height>
-                               <texture border="8">IconBack.png</texture>
-                       </control>
-                       <control type="fadelabel" id="401">
-                               <posx>10</posx>
-                               <posy>5</posy>
-                               <width>330</width>
-                               <height>15</height>
-                               <scrollout>false</scrollout>
-                               <pauseatend>3000</pauseatend>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <font>font10_title</font>
-                               <textcolor>black</textcolor>
-                       </control>
-                       <control type="fadelabel" id="405">
-                               <posx>10</posx>
-                               <posy>24</posy>
-                               <width>330</width>
-                               <height>20</height>
-                               <scrollout>false</scrollout>
-                               <pauseatend>3000</pauseatend>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <font>font12</font>
-                               <textcolor>black</textcolor>
-                               <haspath>true</haspath>
-                       </control>
-                       <control type="progress" id="404">
-                               <description>progress control</description>
-                               <posx>5</posx>
-                               <posy>47</posy>
-                               <width>340</width>
-                               <height>15</height>
-                       </control>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/DialogVolumeBar.xml b/addons/skin.touched/4x3Hirez/DialogVolumeBar.xml
deleted file mode 100644 (file)
index 266eb87..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<window id="104">
-       <defaultcontrol>1</defaultcontrol>
-               <animation effect="slide" start="0,-40" end="0,0" time="100">WindowOpen</animation>
-               <animation effect="slide" start="0,0" end="0,-40" delay="400" time="100">WindowClose</animation>
-       <controls>
-               <control type="group">
-                       <posx>820</posx>
-                       <posy>0</posy>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>-10</posy>
-                               <width>300</width>
-                               <height>50</height>
-                               <texture flipy="true" border="2">SubBack.png</texture>
-                       </control>
-                       <control type="group">
-                               <visible>!player.passthrough</visible>
-                               <control type="progress" id="1">
-                                       <description>progress control</description>
-                                       <posx>50</posx>
-                                       <posy>8</posy>
-                                       <width>230</width>
-                                       <height>18</height>
-                                       <info>Player.Volume</info>
-                               </control>
-                       </control>
-                       <control type="group">
-                               <visible>player.passthrough</visible>
-                               <control type="label">
-                                       <description>Passthrough Label</description>
-                                       <posx>50</posx>
-                                       <posy>6</posy>
-                                       <width>230</width>
-                                       <height>20</height>
-                                       <label>$LOCALIZE[29802]</label>
-                                       <font>font10_title</font>
-                                       <textcolor>white</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                               </control>
-                       </control>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/DialogYesNo.xml b/addons/skin.touched/4x3Hirez/DialogYesNo.xml
deleted file mode 100644 (file)
index ebf9036..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-<window id="100">
-       <defaultcontrol always="true">10</defaultcontrol>
-       <coordinates>
-               <system>1</system>
-               <posx>290</posx>
-               <posy>300</posy>
-       </coordinates>
-       <include>dialogeffect</include>
-       <controls>
-               <control type="image">
-                       <description>Shadow Background for dialogs without BehindDialogFadeOut include</description>
-                       <posx>-30</posx>
-                       <posy>-30</posy>
-                       <width>760</width>
-                       <height>370</height>
-                       <texture border="30">DialogShadow.png</texture>
-               </control>
-               <control type="image">
-                       <description>Header Background</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>700</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="group">
-                       <posx>630</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               <control type="label" id="1">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>600</width>
-                       <label>$LOCALIZE[13406]</label>
-               </control>
-               <control type="image">
-                       <description>Background</description>
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>700</width>
-                       <height>250</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-               <control type="label" id="2">
-                       <description>dialog line 1</description>
-                       <posx>20</posx>
-                       <posy>80</posy>
-                       <width>660</width>
-                       <height>30</height>
-                       <align>left</align>
-                       <aligny>center</aligny>
-                       <label>-</label>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-               </control>
-               <control type="label" id="3">
-                       <description>dialog line 2</description>
-                       <posx>20</posx>
-                       <posy>110</posy>
-                       <width>660</width>
-                       <height>30</height>
-                       <align>left</align>
-                       <aligny>center</aligny>
-                       <label>-</label>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-               </control>
-               <control type="label" id="4">
-                       <description>dialog line 3</description>
-                       <posx>20</posx>
-                       <posy>140</posy>
-                       <width>660</width>
-                       <height>30</height>
-                       <align>left</align>
-                       <aligny>center</aligny>
-                       <label>-</label>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-               </control>
-               <control type="grouplist" id="9000">
-                       <posx>20</posx>
-                       <posy>250</posy>
-                       <width>660</width>
-                       <height>50</height>
-                       <itemgap>10</itemgap>
-                       <align>center</align>
-                       <orientation>horizontal</orientation>
-                       <onleft>9000</onleft>
-                       <onright>9000</onright>
-                       <onup>9000</onup>
-                       <ondown>9000</ondown>
-                       <control type="button" id="11">
-                               <description>Yes button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>107</label>
-                       </control>
-                       <control type="button" id="10">
-                               <description>No button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>106</label>
-                       </control>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/FileBrowser.xml b/addons/skin.touched/4x3Hirez/FileBrowser.xml
deleted file mode 100644 (file)
index b05a4a5..0000000
+++ /dev/null
@@ -1,242 +0,0 @@
-<window id="126">
-       <defaultcontrol always="true">450</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <include>Window_OpenClose_Animation_Zoom</include>
-       <coordinates>
-               <system>1</system>
-               <posx>140</posx>
-               <posy>30</posy>
-       </coordinates>
-       <controls>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>1000</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="label" id="411">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>910</width>
-                       <label>$LOCALIZE[1023]</label>
-               </control>
-               <control type="group">
-                       <posx>930</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>1000</width>
-                       <height>840</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-
-               <control type="label" id="412">
-                       <description>path label</description>
-                       <posx>20</posx>
-                       <posy>80</posy>
-                       <width>960</width>
-                       <height>30</height>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <font>font13_title</font>
-                       <haspath>true</haspath>
-                       <textcolor>black</textcolor>
-               </control>
-               <control type="list" id="450">
-                       <posx>20</posx>
-                       <posy>120</posy>
-                       <width>960</width>
-                       <height>650</height>
-                       <onleft>9000</onleft>
-                       <onright>60</onright>
-                       <onup>450</onup>
-                       <ondown>450</ondown>
-                       <pagecontrol>60</pagecontrol>
-                       <scrolltime>200</scrolltime>
-                       <itemlayout height="50" width="960">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>960</width>
-                                       <height>51</height>
-                                       <texture border="5">MenuItemNF.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>2</posy>
-                                       <width>47</width>
-                                       <height>47</height>
-                                       <texture background="true">$INFO[ListItem.Icon]</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>70</posx>
-                                       <posy>0</posy>
-                                       <width>780</width>
-                                       <height>50</height>
-                                       <font>font13</font>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout height="50" width="960">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>960</width>
-                                       <height>51</height>
-                                       <texture border="5">MenuItemNF.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>2</posy>
-                                       <width>47</width>
-                                       <height>47</height>
-                                       <texture background="true">$INFO[ListItem.Icon]</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>70</posx>
-                                       <posy>0</posy>
-                                       <width>780</width>
-                                       <height>50</height>
-                                       <font>font13</font>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                       </focusedlayout>
-               </control>
-               <control type="label">
-                       <description>Page label</description>
-                       <posx>980</posx>
-                       <posy>780</posy>
-                       <width>660</width>
-                       <height>30</height>
-                       <align>right</align>
-                       <aligny>center</aligny>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-                       <label>($INFO[Container(450).NumItems]) $LOCALIZE[31025] - $LOCALIZE[31024] ($INFO[Container(450).CurrentPage]/$INFO[Container(450).NumPages])</label>
-                       <visible>!Control.IsVisible(451)</visible>
-               </control>
-               <control type="panel" id="451">
-                       <posx>20</posx>
-                       <posy>120</posy>
-                       <width>960</width>
-                       <height>650</height>
-                       <onleft>9000</onleft>
-                       <onright>60</onright>
-                       <onup>451</onup>
-                       <ondown>451</ondown>
-                       <pagecontrol>60</pagecontrol>
-                       <scrolltime>200</scrolltime>
-                       <itemlayout height="250" width="320">
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>0</posy>
-                                       <width>300</width>
-                                       <height>220</height>
-                                       <texture background="true">$INFO[ListItem.Icon]</texture>
-                                       <bordertexture border="8">ThumbShadow.png</bordertexture>
-                                       <bordersize>8</bordersize>
-                               </control>
-                               <control type="label">
-                                       <posx>160</posx>
-                                       <posy>220</posy>
-                                       <width>300</width>
-                                       <height>20</height>
-                                       <font>font12</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <info>ListItem.Label</info>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout height="250" width="320">
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>0</posy>
-                                       <width>300</width>
-                                       <height>220</height>
-                                       <texture background="true">$INFO[ListItem.Icon]</texture>
-                                       <bordertexture border="8">ThumbShadow.png</bordertexture>
-                                       <bordersize>8</bordersize>
-                               </control>
-                               <control type="label">
-                                       <posx>160</posx>
-                                       <posy>220</posy>
-                                       <width>300</width>
-                                       <height>20</height>
-                                       <font>font12</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <info>ListItem.Label</info>
-                               </control>
-                       </focusedlayout>
-               </control>
-               <control type="label">
-                       <description>Page label</description>
-                       <posx>980</posx>
-                       <posy>780</posy>
-                       <width>660</width>
-                       <height>30</height>
-                       <align>right</align>
-                       <aligny>center</aligny>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-                       <label>($INFO[Container(451).NumItems]) $LOCALIZE[31025] - $LOCALIZE[31024] ($INFO[Container(451).CurrentPage]/$INFO[Container(451).NumPages])</label>
-                       <visible>Control.IsVisible(451)</visible>
-               </control>
-               <control type="grouplist" id="9000">
-                       <posx>20</posx>
-                       <posy>830</posy>
-                       <width>960</width>
-                       <height>50</height>
-                       <itemgap>5</itemgap>
-                       <align>center</align>
-                       <orientation>horizontal</orientation>
-                       <onleft>9000</onleft>
-                       <onright>9000</onright>
-                       <onup>50</onup>
-                       <ondown>49</ondown>
-                       <control type="button" id="413">
-                               <description>OK button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>186</label>
-                       </control>
-                       <control type="button" id="414">
-                               <description>Cancel button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>222</label>
-                       </control>
-                       <control type="button" id="415">
-                               <description>Create folder button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>119</label>
-                       </control>
-                       <control type="radiobutton" id="416">
-                               <description>Flip Image button</description>
-                               <width>270</width>
-                               <align>left</align>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>749</label>
-                       </control>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/FileManager.xml b/addons/skin.touched/4x3Hirez/FileManager.xml
deleted file mode 100644 (file)
index 13f8618..0000000
+++ /dev/null
@@ -1,348 +0,0 @@
-<window id="3">
-       <defaultcontrol>20</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <controls>
-               <include>CommonSettingsBackground</include>
-               <control type="group">
-                       <animation effect="slide" start="-620,0" end="0,0" time="400" tween="quadratic" easing="out">WindowOpen</animation>
-                       <animation effect="slide" start="0,0" end="-620,0" time="400" tween="quadratic" easing="out">WindowClose</animation>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>620</width>
-                               <height>720</height>
-                               <texture border="0,0,15,0">MediaBladeSub.png</texture>
-                       </control>
-                       <control type="image">
-                               <posx>480</posx>
-                               <posy>10</posy>
-                               <width>90</width>
-                               <height>90</height>
-                               <aspectratio>keep</aspectratio>
-                               <info>Container(20).ListItem.Icon</info>
-                       </control>
-                       <control type="label">
-                               <description>header label</description>
-                               <posx>35</posx>
-                               <posy>50</posy>
-                               <width>570</width>
-                               <height>30</height>
-                               <font>font30_title</font>
-                               <label>A</label>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <textcolor>blue</textcolor>
-                               <shadowcolor>black</shadowcolor>
-                       </control>
-                       <control type="label" id="101">
-                               <description>current directory text label</description>
-                               <posx>35</posx>
-                               <posy>100</posy>
-                               <width>570</width>
-                               <height>30</height>
-                               <font>font13_title</font>
-                               <textcolor>white</textcolor>
-                               <shadowcolor>black</shadowcolor>
-                               <scroll>true</scroll>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                       </control>
-                       <control type="label">
-                               <description>number of files/pages in left list text label</description>
-                               <posx>35</posx>
-                               <posy>670</posy>
-                               <width>570</width>
-                               <font>font12</font>
-                               <align>left</align>
-                               <scroll>true</scroll>
-                               <textcolor>grey</textcolor>
-                               <shadowcolor>black</shadowcolor>
-                               <label>([COLOR=blue]$INFO[Container(20).NumItems][/COLOR]) $LOCALIZE[31025] - $LOCALIZE[31024] ([COLOR=blue]$INFO[Container(20).CurrentPage]/$INFO[Container(20).NumPages][/COLOR])</label>
-                       </control>
-                       <control type="scrollbar" id="30">
-                               <posx>25</posx>
-                               <posy>140</posy>
-                               <width>25</width>
-                               <height>490</height>
-                               <texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
-                               <texturesliderbar border="2,16,2,16">ScrollBarV_bar.png</texturesliderbar>
-                               <texturesliderbarfocus border="2,16,2,16">ScrollBarV_bar_focus.png</texturesliderbarfocus>
-                               <textureslidernib>-</textureslidernib>
-                               <textureslidernibfocus>-</textureslidernibfocus>
-                               <onleft>31</onleft>
-                               <onright>20</onright>
-                               <ondown>20</ondown>
-                               <onup>20</onup>
-                               <showonepage>false</showonepage>
-                               <orientation>vertical</orientation>
-                       </control>
-                       <control type="list" id="20">
-                               <posx>60</posx>
-                               <posy>140</posy>
-                               <width>540</width>
-                               <height>491</height>
-                               <onleft>30</onleft>
-                               <onright>21</onright>
-                               <onup>20</onup>
-                               <ondown>20</ondown>
-                               <pagecontrol>30</pagecontrol>
-                               <scrolltime>200</scrolltime>
-                               <itemlayout height="35">
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>540</width>
-                                               <height>36</height>
-                                               <texture border="0,2,0,2">MenuItemNF.png</texture>
-                                       </control>
-                                       <control type="label">
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>500</width>
-                                               <height>36</height>
-                                               <font>font13</font>
-                                               <aligny>center</aligny>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <textcolor>grey2</textcolor>
-                                               <align>left</align>
-                                               <info>ListItem.Label</info>
-                                       </control>
-                                       <control type="label">
-                                               <posx>530</posx>
-                                               <posy>5</posy>
-                                               <width>200</width>
-                                               <height>24</height>
-                                               <font>font12</font>
-                                               <aligny>center</aligny>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <textcolor>grey</textcolor>
-                                               <align>right</align>
-                                               <info>ListItem.Label2</info>
-                                       </control>
-                               </itemlayout>
-                               <focusedlayout height="35">
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>540</width>
-                                               <height>36</height>
-                                               <visible>!Control.HasFocus(20)</visible>
-                                               <texture border="0,2,0,2">MenuItemNF.png</texture>
-                                       </control>
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>540</width>
-                                               <height>36</height>
-                                               <visible>Control.HasFocus(20)</visible>
-                                               <texture border="0,2,0,2">MenuItemFO.png</texture>
-                                       </control>
-                                       <control type="label">
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>500</width>
-                                               <height>36</height>
-                                               <font>font13</font>
-                                               <aligny>center</aligny>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <textcolor>white</textcolor>
-                                               <align>left</align>
-                                               <info>ListItem.Label</info>
-                                       </control>
-                                       <control type="label">
-                                               <posx>530</posx>
-                                               <posy>5</posy>
-                                               <width>200</width>
-                                               <height>24</height>
-                                               <font>font12</font>
-                                               <aligny>center</aligny>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <textcolor>grey</textcolor>
-                                               <align>right</align>
-                                               <info>ListItem.Label2</info>
-                                       </control>
-                               </focusedlayout>
-                       </control>
-               </control>
-               <control type="group">
-                       <animation effect="slide" start="620,0" end="0,0" time="400" tween="quadratic" easing="out">WindowOpen</animation>
-                       <animation effect="slide" start="0,0" end="620,0" time="400" tween="quadratic" easing="out">WindowClose</animation>
-                       <control type="image">
-                               <posx>620r</posx>
-                               <posy>0</posy>
-                               <width>620</width>
-                               <height>720</height>
-                               <texture border="15,0,0,0" flipx="true">MediaBladeSub.png</texture>
-                       </control>
-                       <control type="image">
-                               <posx>570r</posx>
-                               <posy>10</posy>
-                               <width>90</width>
-                               <height>90</height>
-                               <aspectratio>keep</aspectratio>
-                               <info>Container(21).ListItem.Icon</info>
-                       </control>
-                       <control type="label">
-                               <description>header label</description>
-                               <posx>35r</posx>
-                               <posy>50</posy>
-                               <width>570</width>
-                               <height>30</height>
-                               <font>font30_title</font>
-                               <label>B</label>
-                               <align>right</align>
-                               <aligny>center</aligny>
-                               <textcolor>blue</textcolor>
-                               <shadowcolor>black</shadowcolor>
-                       </control>
-                       <control type="label" id="102">
-                               <description>current directory text label right</description>
-                               <posx>35r</posx>
-                               <posy>100</posy>
-                               <width>570</width>
-                               <height>30</height>
-                               <font>font13_title</font>
-                               <textcolor>white</textcolor>
-                               <scroll>true</scroll>
-                               <align>right</align>
-                               <aligny>center</aligny>
-                       </control>
-                       <control type="label">
-                               <description>number of files/pages in left list text label</description>
-                               <posx>35r</posx>
-                               <posy>670</posy>
-                               <width>570</width>
-                               <font>font12</font>
-                               <align>right</align>
-                               <scroll>true</scroll>
-                               <textcolor>grey</textcolor>
-                               <shadowcolor>black</shadowcolor>
-                               <label>([COLOR=blue]$INFO[Container(21).NumItems][/COLOR]) $LOCALIZE[31025] - $LOCALIZE[31024] ([COLOR=blue]$INFO[Container(21).CurrentPage]/$INFO[Container(21).NumPages][/COLOR])</label>
-                       </control>
-                       <control type="scrollbar" id="31">
-                               <posx>50r</posx>
-                               <posy>140</posy>
-                               <width>25</width>
-                               <height>490</height>
-                               <texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
-                               <texturesliderbar border="2,16,2,16">ScrollBarV_bar.png</texturesliderbar>
-                               <texturesliderbarfocus border="2,16,2,16">ScrollBarV_bar_focus.png</texturesliderbarfocus>
-                               <textureslidernib>-</textureslidernib>
-                               <textureslidernibfocus>-</textureslidernibfocus>
-                               <onleft>21</onleft>
-                               <onright>30</onright>
-                               <ondown>21</ondown>
-                               <onup>21</onup>
-                               <showonepage>false</showonepage>
-                               <orientation>vertical</orientation>
-                       </control>
-                       <control type="list" id="21">
-                               <posx>590r</posx>
-                               <posy>140</posy>
-                               <width>540</width>
-                               <height>491</height>
-                               <onleft>20</onleft>
-                               <onright>31</onright>
-                               <onup>21</onup>
-                               <ondown>21</ondown>
-                               <pagecontrol>31</pagecontrol>
-                               <scrolltime>200</scrolltime>
-                               <itemlayout height="35">
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>540</width>
-                                               <height>36</height>
-                                               <texture border="0,2,0,2">MenuItemNF.png</texture>
-                                       </control>
-                                       <control type="label">
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>500</width>
-                                               <height>36</height>
-                                               <font>font13</font>
-                                               <aligny>center</aligny>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <textcolor>grey2</textcolor>
-                                               <align>left</align>
-                                               <info>ListItem.Label</info>
-                                       </control>
-                                       <control type="label">
-                                               <posx>530</posx>
-                                               <posy>5</posy>
-                                               <width>200</width>
-                                               <height>24</height>
-                                               <font>font12</font>
-                                               <aligny>center</aligny>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <textcolor>grey</textcolor>
-                                               <align>right</align>
-                                               <info>ListItem.Label2</info>
-                                       </control>
-                               </itemlayout>
-                               <focusedlayout height="35">
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>540</width>
-                                               <height>36</height>
-                                               <visible>!Control.HasFocus(21)</visible>
-                                               <texture border="0,2,0,2">MenuItemNF.png</texture>
-                                       </control>
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>540</width>
-                                               <height>36</height>
-                                               <visible>Control.HasFocus(21)</visible>
-                                               <texture border="0,2,0,2">MenuItemFO.png</texture>
-                                       </control>
-                                       <control type="label">
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>500</width>
-                                               <height>36</height>
-                                               <font>font13</font>
-                                               <aligny>center</aligny>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <textcolor>white</textcolor>
-                                               <align>left</align>
-                                               <info>ListItem.Label</info>
-                                       </control>
-                                       <control type="label">
-                                               <posx>530</posx>
-                                               <posy>5</posy>
-                                               <width>200</width>
-                                               <height>24</height>
-                                               <font>font12</font>
-                                               <aligny>center</aligny>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <textcolor>grey</textcolor>
-                                               <align>right</align>
-                                               <info>ListItem.Label2</info>
-                                       </control>
-                               </focusedlayout>
-                       </control>
-               </control>
-               <control type="group">
-                       <posx>60</posx>
-                       <posy>0</posy>
-                       <animation effect="slide" end="-310,0" time="400" tween="quadratic" easing="out">WindowClose</animation>
-                       <animation effect="slide" start="-310,0" time="400" tween="quadratic" easing="out">WindowOpen</animation>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>250</width>
-                               <height>35</height>
-                               <texture border="0,0,32,0">header.png</texture>
-                       </control>
-                       <control type="label">
-                               <include>WindowTitleCommons</include>
-                               <posx>220</posx>
-                               <label>$LOCALIZE[7]</label>
-                       </control>
-               </control>
-               <include>WindowTitleHomeButton</include>
-               <include>Clock</include>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/Font.xml b/addons/skin.touched/4x3Hirez/Font.xml
deleted file mode 100644 (file)
index 9c477b0..0000000
+++ /dev/null
@@ -1,182 +0,0 @@
-<fonts>
-       <fontset id="Default" idloc="31390" unicode="true"> 
-       <!-- Normal Fonts -->
-               <font>
-                       <name>font10</name>
-                       <filename>Arial.ttf</filename>
-                       <size>12</size>
-               </font>
-               <font>
-                       <name>font11</name>
-                       <filename>Arial.ttf</filename>
-                       <size>14</size>
-               </font>
-               <font>
-                       <name>font12</name>
-                       <filename>Arial.ttf</filename>
-                       <size>16</size>
-               </font>
-               <font>
-                       <name>font13</name>
-                       <filename>Arial.ttf</filename>
-                       <size>20</size>
-               </font>
-               <font>
-                       <name>font16</name>
-                       <filename>Arial.ttf</filename>
-                       <size>25</size>
-               </font>
-               <font>
-                       <name>font30</name>
-                       <filename>Arial.ttf</filename>
-                       <size>30</size>
-               </font>
-               <font>
-                       <name>font55</name>
-                       <filename>Arial.ttf</filename>
-                       <size>55</size>
-               </font>
-       <!-- Title Fonts -->
-               <font>
-                       <name>font8_title</name>
-                       <filename>DejaVuSans-Bold.ttf</filename>
-                       <size>11</size>
-               </font>
-               <font>
-                       <name>font10_title</name>
-                       <filename>DejaVuSans-Bold.ttf</filename>
-                       <size>14</size>
-               </font>
-               <font>
-                       <name>font12_title</name>
-                       <filename>DejaVuSans-Bold.ttf</filename>
-                       <size>18</size>
-               </font>
-               <font>
-                       <name>font13_title</name>
-                       <filename>DejaVuSans-Bold.ttf</filename>
-                       <size>20</size>
-               </font>
-               <font>
-                       <name>font13caps_title</name>
-                       <filename>DejaVuSans-Bold-Caps.ttf</filename>
-                       <size>20</size>
-               </font>
-               <font>
-                       <name>font24_title</name>
-                       <filename>DejaVuSans-Bold.ttf</filename>
-                       <size>24</size>
-               </font>
-               <font>
-                       <name>font28_title</name>
-                       <filename>DejaVuSans-Bold.ttf</filename>
-                       <size>28</size>
-               </font>
-               <font>
-                       <name>font30_title</name>
-                       <filename>DejaVuSans-Bold.ttf</filename>
-                       <size>30</size>
-               </font>
-
-               <font>
-                       <name>WeatherTemp</name>
-                       <filename>DejaVuSans-Bold.ttf</filename>
-                       <size>80</size>
-               </font>
-       </fontset>
-
-       <fontset id="Arial" idloc="31391" unicode="true"> 
-       <!-- Normal Fonts -->
-               <font>
-                       <name>font10</name>
-                       <filename>Arial.ttf</filename>
-                       <size>12</size>
-               </font>
-               <font>
-                       <name>font11</name>
-                       <filename>Arial.ttf</filename>
-                       <size>14</size>
-               </font>
-               <font>
-                       <name>font12</name>
-                       <filename>Arial.ttf</filename>
-                       <size>16</size>
-               </font>
-               <font>
-                       <name>font13</name>
-                       <filename>Arial.ttf</filename>
-                       <size>20</size>
-               </font>
-               <font>
-                       <name>font16</name>
-                       <filename>Arial.ttf</filename>
-                       <size>25</size>
-               </font>
-               <font>
-                       <name>font30</name>
-                       <filename>Arial.ttf</filename>
-                       <size>30</size>
-               </font>
-               <font>
-                       <name>font55</name>
-                       <filename>Arial.ttf</filename>
-                       <size>55</size>
-               </font>
-       <!-- Title Fonts -->
-               <font>
-                       <name>font8_title</name>
-                       <filename>Arial.ttf</filename>
-                       <size>11</size>
-                       <style>bold</style>
-               </font>
-               <font>
-                       <name>font10_title</name>
-                       <filename>Arial.ttf</filename>
-                       <size>14</size>
-                       <style>bold</style>
-               </font>
-               <font>
-                       <name>font12_title</name>
-                       <filename>Arial.ttf</filename>
-                       <size>18</size>
-                       <style>bold</style>
-               </font>
-               <font>
-                       <name>font13_title</name>
-                       <filename>Arial.ttf</filename>
-                       <size>20</size>
-                       <style>bold</style>
-               </font>
-               <font>
-                       <name>font13caps_title</name>
-                       <filename>Arial.ttf</filename>
-                       <size>20</size>
-                       <style>bold</style>
-               </font>
-               <font>
-                       <name>font24_title</name>
-                       <filename>Arial.ttf</filename>
-                       <size>24</size>
-                       <style>bold</style>
-               </font>
-               <font>
-                       <name>font28_title</name>
-                       <filename>Arial.ttf</filename>
-                       <size>28</size>
-                       <style>bold</style>
-               </font>
-               <font>
-                       <name>font30_title</name>
-                       <filename>Arial.ttf</filename>
-                       <size>30</size>
-                       <style>bold</style>
-               </font>
-
-               <font>
-                       <name>WeatherTemp</name>
-                       <filename>Arial.ttf</filename>
-                       <size>80</size>
-                       <style>bold</style>
-               </font>
-       </fontset>
-</fonts>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/Home.xml b/addons/skin.touched/4x3Hirez/Home.xml
deleted file mode 100644 (file)
index e8ef634..0000000
+++ /dev/null
@@ -1,406 +0,0 @@
-<window id="0">
-       <defaultcontrol always="true">9000</defaultcontrol>
-       <allowoverlay>no</allowoverlay> 
-       <controls>
-               <include>CommonBackground</include>
-               <control type="image">
-                       <description>XBMC Logo</description>
-                       <posx>20</posx>
-                       <posy>36</posy>
-                       <width>360</width>
-                       <height>48</height>
-                       <aspectratio align="left">keep</aspectratio>
-                       <texture>xbmc-logo.png</texture>
-                       <visible>!Player.HasMedia</visible>
-                       <include>VisibleFadeEffect</include>
-                       <include>Window_OpenClose_Animation</include>
-               </control>
-               <include>CommonNowPlaying</include>
-               <control type="group">
-                       <!-- weather Info -->
-                       <include>Window_OpenClose_Animation</include>
-                       <visible>Weather.IsFetched + ![Window.IsVisible(VideoScan) | Window.IsVisible(MusicScan)] + !Skin.HasSetting(HideHomeButtonWeather)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <posx>720r</posx>
-                       <posy>23</posy>
-                       <control type="button">
-                               <description>Goto Weather button</description>
-                               <posx>610</posx>
-                               <posy>0</posy>
-                               <width>160</width>
-                               <height>80</height>
-                               <texturenofocus>-</texturenofocus>
-                               <texturefocus>-</texturefocus>
-                               <onclick>ActivateWindow(Weather)</onclick>
-                       </control>
-                       <control type="image">
-                               <description>Weather image</description>
-                               <posx>632</posx>
-                               <posy>0</posy>
-                               <width>74</width>
-                               <height>74</height>
-                               <aspectratio>keep</aspectratio>
-                               <texture>$INFO[Weather.Conditions]</texture>
-                       </control>
-                       <control type="label">
-                               <description>location label</description>
-                               <posx>620</posx>
-                               <posy>12</posy>
-                               <height>25</height>
-                               <width>410</width>
-                               <label>[B]$INFO[Weather.Location][/B]</label>
-                               <align>right</align>
-                               <aligny>center</aligny>
-                               <font>font13</font>
-                               <shadowcolor>black</shadowcolor>
-                       </control>
-                       <control type="grouplist">
-                               <posx>0</posx>
-                               <posy>35</posy>
-                               <width>620</width>
-                               <height>35</height>
-                               <orientation>horizontal</orientation>
-                               <align>right</align>
-                               <itemgap>0</itemgap>
-                               <control type="label">
-                                       <description>Weather label</description>
-                                       <height>30</height>
-                                       <width max="400">auto</width>
-                                       <label>$INFO[Window(Weather).Property(Current.Condition)]  </label>
-                                       <font>font12</font>
-                                       <aligny>center</aligny>
-                                       <textcolor>grey</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                               </control>
-                               <control type="label">
-                                       <description>Temp Label</description>
-                                       <height>30</height>
-                                       <width max="400">auto</width>
-                                       <label>[B]$INFO[Window(Weather).Property(Current.Temperature)][/B]</label>
-                                       <aligny>center</aligny>
-                                       <font>font24_title</font>
-                                       <shadowcolor>black</shadowcolor>
-                               </control>
-                               <control type="label">
-                                       <description>Temp Units Label</description>
-                                       <posy>2</posy>
-                                       <height>20</height>
-                                       <width max="200">auto</width>
-                                       <label>$INFO[System.TemperatureUnits]</label>
-                                       <font>font12</font>
-                                       <aligny>center</aligny>
-                                       <shadowcolor>black</shadowcolor>
-                                       <visible>!IsEmpty(Window(Weather).Property(Current.Temperature))</visible>
-                               </control>
-                       </control>
-               </control>
-               <control type="group">
-                       <include>Window_OpenClose_Animation_Zoom</include>
-                       <control type="group">
-                               <posx>0</posx>
-                               <posy>130</posy>
-                               <control type="button">
-                                       <description>left Arrow</description>
-                                       <posx>30</posx>
-                                       <posy>320</posy>
-                                       <width>40</width>
-                                       <height>60</height>
-                                       <texturefocus>arrow-big-left.png</texturefocus>
-                                       <texturenofocus>arrow-big-left.png</texturenofocus>
-                                       <onclick>Control.Move(9000,-1)</onclick>
-                                       <visible>Container(9000).HasPrevious</visible>
-                                       <include>VisibleFadeEffect</include>
-                               </control>
-                               <control type="button">
-                                       <description>right Arrow</description>
-                                       <posx>70r</posx>
-                                       <posy>320</posy>
-                                       <width>40</width>
-                                       <height>60</height>
-                                       <texturefocus>arrow-big-right.png</texturefocus>
-                                       <texturenofocus>arrow-big-right.png</texturenofocus>
-                                       <onclick>Control.Move(9000,1)</onclick>
-                                       <visible>Container(9000).HasNext</visible>
-                                       <include>VisibleFadeEffect</include>
-                               </control>
-                               <control type="panel" id="9000">
-                                       <posx>80</posx>
-                                       <posy>0</posy>
-                                       <width>1120</width>
-                                       <height>720</height>
-                                       <onleft>20</onleft>
-                                       <onright>22</onright>
-                                       <onup>9000</onup>
-                                       <ondown>9000</ondown>
-                                       <pagecontrol>-</pagecontrol>
-                                       <scrolltime>200</scrolltime>
-                                       <orientation>horizontal</orientation>
-                                       <preloaditems>2</preloaditems>
-                                       <itemlayout height="340" width="560">
-                                               <control type="image">
-                                                       <posx>0</posx>
-                                                       <posy>0</posy>
-                                                       <width>560</width>
-                                                       <height>360</height>
-                                                       <texture border="5">SubBack.png</texture>
-                                                       <bordertexture border="30">ShadowBorder.png</bordertexture>
-                                                       <bordersize>25</bordersize>
-                                               </control>
-                                               <control type="image">
-                                                       <posx>30</posx>
-                                                       <posy>30</posy>
-                                                       <width>500</width>
-                                                       <height>250</height>
-                                                       <aspectratio>scale</aspectratio>
-                                                       <texture>$INFO[ListItem.Icon,special://skin/background/]</texture>
-                                               </control>
-                                               <control type="image">
-                                                       <posx>30</posx>
-                                                       <posy>30</posy>
-                                                       <width>300</width>
-                                                       <height>300</height>
-                                                       <texture>GlassOverlay.png</texture>
-                                               </control>
-                                               <control type="label">
-                                                       <posx>40</posx>
-                                                       <posy>290</posy>
-                                                       <width>480</width>
-                                                       <height>30</height>
-                                                       <font>font13caps_title</font>
-                                                       <textcolor>white</textcolor>
-                                                       <shadowcolor>black</shadowcolor>
-                                                       <align>left</align>
-                                                       <aligny>center</aligny>
-                                                       <label>[B]$INFO[ListItem.Label][/B]</label>
-                                               </control>
-                                       </itemlayout>
-                                       <focusedlayout height="340" width="560">
-                                               <control type="image">
-                                                       <posx>0</posx>
-                                                       <posy>0</posy>
-                                                       <width>560</width>
-                                                       <height>360</height>
-                                                       <texture border="5">SubBack.png</texture>
-                                                       <bordertexture border="30">ShadowBorder.png</bordertexture>
-                                                       <bordersize>25</bordersize>
-                                               </control>
-                                               <control type="image">
-                                                       <posx>30</posx>
-                                                       <posy>30</posy>
-                                                       <width>500</width>
-                                                       <height>250</height>
-                                                       <aspectratio>scale</aspectratio>
-                                                       <texture>$INFO[ListItem.Icon,special://skin/background/]</texture>
-                                               </control>
-                                               <control type="image">
-                                                       <posx>30</posx>
-                                                       <posy>30</posy>
-                                                       <width>300</width>
-                                                       <height>300</height>
-                                                       <texture>GlassOverlay.png</texture>
-                                               </control>
-                                               <control type="label">
-                                                       <posx>40</posx>
-                                                       <posy>290</posy>
-                                                       <width>480</width>
-                                                       <height>30</height>
-                                                       <font>font13caps_title</font>
-                                                       <textcolor>white</textcolor>
-                                                       <shadowcolor>black</shadowcolor>
-                                                       <align>left</align>
-                                                       <aligny>center</aligny>
-                                                       <label>[B]$INFO[ListItem.Label][/B]</label>
-                                               </control>
-                                       </focusedlayout>
-                                       <content>
-                                               <item>
-                                                       <label>3</label>
-                                                       <onclick condition="!Skin.HasSetting(HomeVideosGoesToRoot)">ActivateWindow(Videos)</onclick>
-                                                       <onclick condition="Skin.HasSetting(HomeVideosGoesToRoot)">ActivateWindow(Videos,root)</onclick>
-                                                       <icon>videos.png</icon>
-                                                       <thumb>-</thumb>
-                                                       <visible>!Skin.HasSetting(HideHomeButtonVideo)</visible>
-                                               </item>
-                                               <item>
-                                                       <label>20342</label>
-                                                       <onclick>ActivateWindow(Videos,MovieTitles,Return)</onclick>
-                                                       <icon>movies.png</icon>
-                                                       <thumb>-</thumb>
-                                                       <visible>Library.HasContent(Movies)</visible>
-                                                       <visible>!Skin.HasSetting(HideHomeButtonMovies)</visible>
-                                               </item>
-                                               <item>
-                                                       <label>20343</label>
-                                                       <onclick>ActivateWindow(Videos,TVShowTitles,Return)</onclick>
-                                                       <icon>tvshows.png</icon>
-                                                       <thumb>-</thumb>
-                                                       <visible>Library.HasContent(TVShows)</visible>
-                                                       <visible>!Skin.HasSetting(HideHomeButtonTVShows)</visible>
-                                               </item>
-                                               <item>
-                                                       <label>2</label>
-                                                       <onclick>ActivateWindow(Music)</onclick>
-                                                       <icon>music.png</icon>
-                                                       <thumb>-</thumb>
-                                                       <visible>!Skin.HasSetting(HideHomeButtonMusic)</visible>
-                                               </item>
-                                               <item>
-                                                       <label>1</label>
-                                                       <onclick>ActivateWindow(Pictures)</onclick>
-                                                       <icon>pictures.png</icon>
-                                                       <thumb>-</thumb>
-                                                       <visible>!Skin.HasSetting(HideHomeButtonPictures)</visible>
-                                               </item>
-                                               <item>
-                                                       <label>0</label>
-                                                       <onclick>ActivateWindow(Programs,Addons,return)</onclick>
-                                                       <icon>programs.png</icon>
-                                                       <thumb>-</thumb>
-                                                       <visible>!Skin.HasSetting(HideHomeButtonPrograms)</visible>
-                                               </item>
-                                       </content>
-                               </control>
-                       </control>
-               </control>
-               <control type="panel" id="9002">
-                       <visible>!Window.IsActive(PlayerControls)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <include>SubMenuCommonLayout</include>
-                       <content>
-                               <item>
-                                       <label>13012</label>
-                                       <onclick>XBMC.Quit</onclick>
-                                       <icon>icon_shutdown.png</icon>
-                               </item>
-                               <item>
-                                       <label>20126</label>
-                                       <onclick>System.LogOff</onclick>
-                                       <icon>icon_logoff.png</icon>
-                                       <visible>System.HasLoginScreen | IntegerGreaterThan(System.ProfileCount,1)</visible>
-                               </item>
-                               <item>
-                                       <label>5</label>
-                                       <onclick>ActivateWindow(Settings)</onclick>
-                                       <icon>icon_settings.png</icon>
-                               </item>
-                               <item>
-                                       <label>13376</label>
-                                       <onclick>ActivateWindow(1112)</onclick>
-                                       <icon>icon_volume.png</icon>
-                                       <visible>false</visible>
-                               </item>
-                               <item>
-                                       <label>Reload Skin</label>
-                                       <onclick>ReloadSkin</onclick>
-                                       <icon>icon_refresh.png</icon>
-                                       <visible>false</visible>
-                               </item>
-                       </content>
-               </control>
-               <control type="panel" id="9003">
-                       <visible>!Window.IsActive(PlayerControls)</visible>
-                       <include>Window_OpenClose_Animation</include>
-                       <animation effect="slide" start="0,0" end="112,0" time="0" condition="StringCompare(Container(9003).NumItems,3)">conditional</animation>
-                       <animation effect="slide" start="0,0" end="224,0" time="0" condition="StringCompare(Container(9003).NumItems,2)">conditional</animation>
-                       <animation effect="slide" start="0,0" end="336,0" time="0" condition="StringCompare(Container(9003).NumItems,1)">conditional</animation>
-                       <posx>570r</posx>
-                       <posy>105r</posy>
-                       <width>448</width>
-                       <height>120</height>
-                       <onleft>9002</onleft>
-                       <onright>9002</onright>
-                       <onup>9001</onup>
-                       <ondown>20</ondown>
-                       <pagecontrol>-</pagecontrol>
-                       <scrolltime>300</scrolltime>
-                       <orientation>Horizontal</orientation>
-                       <itemlayout height="200" width="112">
-                               <control type="image">
-                                       <posx>16</posx>
-                                       <posy>0</posy>
-                                       <width>80</width>
-                                       <height>80</height>
-                                       <texture diffuse="shortcut_diffuse.png">$INFO[ListItem.Icon]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>16</posx>
-                                       <posy>0</posy>
-                                       <width>80</width>
-                                       <height>80</height>
-                                       <texture>shortcut_border.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>56</posx>
-                                       <posy>82</posy>
-                                       <width>100</width>
-                                       <height>20</height>
-                                       <font>font11</font>
-                                       <textcolor>white</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout height="200" width="112">
-                               <control type="image">
-                                       <posx>16</posx>
-                                       <posy>0</posy>
-                                       <width>80</width>
-                                       <height>80</height>
-                                       <texture diffuse="shortcut_diffuse.png">$INFO[ListItem.Icon]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>16</posx>
-                                       <posy>0</posy>
-                                       <width>80</width>
-                                       <height>80</height>
-                                       <texture>shortcut_border.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>56</posx>
-                                       <posy>82</posy>
-                                       <width>100</width>
-                                       <height>20</height>
-                                       <font>font11</font>
-                                       <textcolor>white</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                       </focusedlayout>
-                       <content>
-                               <item>
-                                       <label>$INFO[system.addontitle(Skin.String(HomeAddonButton1))]</label>
-                                       <onclick>RunAddon($INFO[Skin.String(HomeAddonButton1)])</onclick>
-                                       <icon>$INFO[system.addonicon(Skin.String(HomeAddonButton1))]</icon>
-                                       <thumb>-</thumb>
-                                       <visible>!IsEmpty(Skin.String(HomeAddonButton1))</visible>
-                               </item>
-                               <item>
-                                       <label>$INFO[system.addontitle(Skin.String(HomeAddonButton2))]</label>
-                                       <onclick>RunAddon($INFO[Skin.String(HomeAddonButton2)])</onclick>
-                                       <icon>$INFO[system.addonicon(Skin.String(HomeAddonButton2))]</icon>
-                                       <thumb>-</thumb>
-                                       <visible>!IsEmpty(Skin.String(HomeAddonButton2))</visible>
-                               </item>
-                               <item>
-                                       <label>$INFO[system.addontitle(Skin.String(HomeAddonButton3))]</label>
-                                       <onclick>RunAddon($INFO[Skin.String(HomeAddonButton3)])</onclick>
-                                       <icon>$INFO[system.addonicon(Skin.String(HomeAddonButton3))]</icon>
-                                       <thumb>-</thumb>
-                                       <visible>!IsEmpty(Skin.String(HomeAddonButton3))</visible>
-                               </item>
-                               <item>
-                                       <label>$INFO[system.addontitle(Skin.String(HomeAddonButton4))]</label>
-                                       <onclick>RunAddon($INFO[Skin.String(HomeAddonButton4)])</onclick>
-                                       <icon>$INFO[system.addonicon(Skin.String(HomeAddonButton4))]</icon>
-                                       <thumb>-</thumb>
-                                       <visible>!IsEmpty(Skin.String(HomeAddonButton4))</visible>
-                               </item>
-                       </content>
-               </control>
-               <include>BehindDialogFadeOut</include>
-       </controls>     
-</window>
diff --git a/addons/skin.touched/4x3Hirez/IncludesCodecFlagging.xml b/addons/skin.touched/4x3Hirez/IncludesCodecFlagging.xml
deleted file mode 100644 (file)
index 49b3cdc..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-<includes>
-       <include name="VideoCodecFlaggingConditions">
-               <control type="image">
-                       <description>Video rez Image</description>
-                       <width>70</width>
-                       <height>45</height>
-                       <aspectratio align="right">keep</aspectratio>
-                       <texture>$INFO[ListItem.VideoResolution,flagging/video/,.png]</texture>
-               </control>
-               <control type="image">
-                       <description>Common Codec Image</description>
-                       <width>100</width>
-                       <height>45</height>
-                       <aspectratio align="left">keep</aspectratio>
-                       <texture>$INFO[ListItem.VideoCodec,flagging/video/,.png]</texture>
-                       <!-- Don't show if its one of the 500 divx codecs -->
-                       <visible>![substring(ListItem.VideoCodec,div,left) | stringcompare(ListItem.VideoCodec,dx50)]</visible>
-               </control>
-               <control type="image">
-                       <description>Divx Codec Image</description>
-                       <width>100</width>
-                       <height>45</height>
-                       <aspectratio align="left">keep</aspectratio>
-                       <texture>flagging/video/divx.png</texture>
-                       <visible>[substring(ListItem.VideoCodec,div,left) | stringcompare(ListItem.VideoCodec,dx50)]</visible>
-               </control>
-       </include>
-       <include name="VideoTypeHackFlaggingConditions">
-               <control type="image">
-                       <description>Bluray Image</description>
-                       <width>100</width>
-                       <height>45</height>
-                       <aspectratio align="left">keep</aspectratio>
-                       <texture>flagging/video/bluray.png</texture>
-                       <visible>[substring(ListItem.FilenameAndPath,bluray) | substring(ListItem.FilenameAndPath,bdrip)] + !Skin.HasSetting(HideFilenameFlagging)</visible>
-               </control>
-               <control type="image">
-                       <description>HDDVD Image</description>
-                       <width>100</width>
-                       <height>45</height>
-                       <aspectratio align="left">keep</aspectratio>
-                       <texture>flagging/video/hddvd.png</texture>
-                       <visible>substring(ListItem.FilenameAndPath,hddvd) + !Skin.HasSetting(HideFilenameFlagging)</visible>
-               </control>
-               <control type="image">
-                       <description>DVD Image</description>
-                       <width>100</width>
-                       <height>45</height>
-                       <aspectratio align="left">keep</aspectratio>
-                       <texture>flagging/video/dvd.png</texture>
-                       <visible>[substring(ListItem.FilenameAndPath,dvd) + ![substring(ListItem.FilenameAndPath,hddvd) | substring(ListItem.FilenameAndPath,bluray) | substring(ListItem.FilenameAndPath,bdrip)]] + !Skin.HasSetting(HideFilenameFlagging)</visible>
-               </control>
-               <control type="image">
-                       <description>TV Types Image</description>
-                       <width>100</width>
-                       <height>45</height>
-                       <aspectratio align="left">keep</aspectratio>
-                       <texture>flagging/video/TV.png</texture>
-                       <visible>[substring(ListItem.FilenameAndPath,pdtv) | substring(ListItem.FilenameAndPath,hdtv) | substring(ListItem.FilenameAndPath,dsr)] + !Skin.HasSetting(HideFilenameFlagging)</visible>
-               </control>
-               <control type="image">
-                       <description>VHS Image</description>
-                       <width>100</width>
-                       <height>45</height>
-                       <aspectratio align="left">keep</aspectratio>
-                       <texture>flagging/video/vhs.png</texture>
-                       <visible>substring(ListItem.FilenameAndPath,vhs) + !Skin.HasSetting(HideFilenameFlagging)</visible>
-               </control>
-       </include>
-       <include name="AudioCodecFlaggingConditions">
-               <control type="image">
-                       <description>Audio Codec Image</description>
-                       <width>100</width>
-                       <height>45</height>
-                       <aspectratio align="right">keep</aspectratio>
-                       <texture>$INFO[ListItem.AudioCodec,flagging/audio/,.png]</texture>
-               </control>
-       </include>
-       <include name="AudioChannelsFlaggingConditions">
-               <control type="image">
-                       <description>Audio Codec Image</description>
-                       <width>70</width>
-                       <height>45</height>
-                       <aspectratio align="left">keep</aspectratio>
-                       <texture>$INFO[ListItem.AudioChannels,flagging/audio/,.png]</texture>
-               </control>
-       </include>
-       <include name="AspectCodecFlaggingConditions">
-               <control type="image">
-                       <description>Aspectratio Image</description>
-                       <width>70</width>
-                       <height>45</height>
-                       <aspectratio align="right">keep</aspectratio>
-                       <texture>$INFO[ListItem.VideoAspect,flagging/aspectratio/,.png]</texture>
-               </control>
-       </include>
-</includes>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/IncludesKeypad.xml b/addons/skin.touched/4x3Hirez/IncludesKeypad.xml
deleted file mode 100644 (file)
index 3160317..0000000
+++ /dev/null
@@ -1,224 +0,0 @@
-<includes>
-       <include name="KeypadButtons">
-               <control type="button">
-                       <description>1 button</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>95</width>
-                       <height>80</height>
-                       <font>font16</font>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <texturenofocus border="8">KeyboardKey.png</texturenofocus>
-                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                       <label>12311</label>
-                       <textcolor>black</textcolor>
-                       <onleft>23</onleft>
-                       <onright>12</onright>
-                       <onup>20</onup>
-                       <ondown>14</ondown>
-                       <onclick>Number1</onclick>
-               </control>
-               <control type="button">
-                       <description>2 button</description>
-                       <posx>100</posx>
-                       <posy>0</posy>
-                       <width>95</width>
-                       <height>80</height>
-                       <font>font16</font>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <texturenofocus border="8">KeyboardKey.png</texturenofocus>
-                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                       <label>12312</label>
-                       <textcolor>black</textcolor>
-                       <onleft>11</onleft>
-                       <onright>13</onright>
-                       <onup>10</onup>
-                       <ondown>15</ondown>
-                       <onclick>Number2</onclick>
-               </control>
-               <control type="button">
-                       <description>3 button</description>
-                       <posx>200</posx>
-                       <posy>0</posy>
-                       <width>95</width>
-                       <height>80</height>
-                       <font>font16</font>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <texturenofocus border="8">KeyboardKey.png</texturenofocus>
-                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                       <label>12313</label>
-                       <textcolor>black</textcolor>
-                       <onleft>12</onleft>
-                       <onright>23</onright>
-                       <onup>22</onup>
-                       <ondown>16</ondown>
-                       <onclick>Number3</onclick>
-               </control>
-               <control type="button">
-                       <description>0 button</description>
-                       <posx>300</posx>
-                       <posy>0</posy>
-                       <width>95</width>
-                       <height>80</height>
-                       <font>font16</font>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <texturenofocus border="8">KeyboardKey.png</texturenofocus>
-                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                       <label>12310</label>
-                       <textcolor>black</textcolor>
-                       <onleft>20</onleft>
-                       <onright>22</onright>
-                       <onup>18</onup>
-                       <ondown>12</ondown>
-                       <onclick>Number0</onclick>
-               </control>
-               <control type="button">
-                       <description>4 button</description>
-                       <posx>0</posx>
-                       <posy>85</posy>
-                       <width>95</width>
-                       <height>80</height>
-                       <font>font16</font>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <texturenofocus border="8">KeyboardKey.png</texturenofocus>
-                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                       <label>12314</label>
-                       <textcolor>black</textcolor>
-                       <onleft>23</onleft>
-                       <onright>15</onright>
-                       <onup>11</onup>
-                       <ondown>17</ondown>
-                       <onclick>Number4</onclick>
-               </control>
-               <control type="button">
-                       <description>5 button</description>
-                       <posx>100</posx>
-                       <posy>85</posy>
-                       <width>95</width>
-                       <height>80</height>
-                       <font>font16</font>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <texturenofocus border="8">KeyboardKey.png</texturenofocus>
-                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                       <label>12315</label>
-                       <textcolor>black</textcolor>
-                       <onleft>14</onleft>
-                       <onright>16</onright>
-                       <onup>12</onup>
-                       <ondown>18</ondown>
-                       <onclick>Number5</onclick>
-               </control>
-               <control type="button">
-                       <description>6 button</description>
-                       <posx>200</posx>
-                       <posy>85</posy>
-                       <width>95</width>
-                       <height>80</height>
-                       <font>font16</font>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <texturenofocus border="8">KeyboardKey.png</texturenofocus>
-                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                       <label>12316</label>
-                       <textcolor>black</textcolor>
-                       <onleft>15</onleft>
-                       <onright>23</onright>
-                       <onup>13</onup>
-                       <ondown>19</ondown>
-                       <onclick>Number6</onclick>
-               </control>
-               <control type="button">
-                       <description>7 button</description>
-                       <posx>0</posx>
-                       <posy>170</posy>
-                       <width>95</width>
-                       <height>80</height>
-                       <font>font16</font>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <texturenofocus border="8">KeyboardKey.png</texturenofocus>
-                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                       <label>12317</label>
-                       <textcolor>black</textcolor>
-                       <onleft>21</onleft>
-                       <onright>18</onright>
-                       <onup>14</onup>
-                       <ondown>20</ondown>
-                       <onclick>Number7</onclick>
-               </control>
-               <control type="button">
-                       <description>8 button</description>
-                       <posx>100</posx>
-                       <posy>170</posy>
-                       <width>95</width>
-                       <height>80</height>
-                       <font>font16</font>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <texturenofocus border="8">KeyboardKey.png</texturenofocus>
-                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                       <label>12318</label>
-                       <textcolor>black</textcolor>
-                       <onleft>17</onleft>
-                       <onright>19</onright>
-                       <onup>15</onup>
-                       <ondown>10</ondown>
-                       <onclick>Number8</onclick>
-               </control>
-               <control type="button">
-                       <description>9 button</description>
-                       <posx>200</posx>
-                       <posy>170</posy>
-                       <width>95</width>
-                       <height>80</height>
-                       <font>font16</font>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <texturenofocus border="8">KeyboardKey.png</texturenofocus>
-                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                       <label>12319</label>
-                       <textcolor>black</textcolor>
-                       <onleft>18</onleft>
-                       <onright>21</onright>
-                       <onup>16</onup>
-                       <ondown>22</ondown>
-                       <onclick>Number9</onclick>
-               </control>
-               <control type="button">
-                       <description>Done button</description>
-                       <posx>300</posx>
-                       <posy>85</posy>
-                       <width>95</width>
-                       <height>165</height>
-                       <font>font12</font>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <texturenofocus border="8">KeyboardKeyDark.png</texturenofocus>
-                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                       <textwidth>120</textwidth>
-                       <label>-</label>
-                       <textcolor>white</textcolor>
-                       <angle>270</angle>
-                       <onleft>19</onleft>
-                       <onright>17</onright>
-                       <onup>23</onup>
-                       <ondown>23</ondown>
-                       <onclick>Select</onclick>
-               </control>
-               <control type="image">
-                       <description>Enter\done Icon image</description>
-                       <posx>320</posx>
-                       <posy>135</posy>
-                       <width>50</width>
-                       <height>50</height>
-                       <aspectratio>keep</aspectratio>
-                       <texture>icon_enter.png</texture>
-               </control>
-       </include>
-</includes>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/IncludesPlayerControls.xml b/addons/skin.touched/4x3Hirez/IncludesPlayerControls.xml
deleted file mode 100644 (file)
index 8647569..0000000
+++ /dev/null
@@ -1,1027 +0,0 @@
-<includes>
-       <include name="PlayerControlCommons">
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>ScreenWidth</width>
-                       <height>ScreenHeight</height>
-                       <colordiffuse>BBFFFFFF</colordiffuse>
-                       <texture>black-back.png</texture>
-                       <visible>!Window.IsVisible(Visualisation) + !Window.IsVisible(FullScreenVideo)</visible>
-               </control>
-               <include>CommonHeader</include>
-               <control type="group">
-                       <posx>0</posx>
-                       <posy>84</posy>
-                       <visible>Skin.HasSetting(PlayerControlsShowAudioInfo) + Player.HasAudio</visible>
-                       <animation effect="slide" start="0,-200" end="0,0" time="300" easing="out" tween="quadratic" >Visible</animation>
-                       <animation effect="slide" start="0,0" end="0,-200" time="300" easing="in" tween="quadratic" >Hidden</animation>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>ScreenWidth</width>
-                               <height>200</height>
-                               <texture border="5">dialogback.png</texture>
-                       </control>
-                       <control type="group">
-                               <control type="image">
-                                       <description>cover image</description>
-                                       <posx>20</posx>
-                                       <posy>10</posy>
-                                       <width>180</width>
-                                       <height>180</height>
-                                       <info>MusicPlayer.Cover</info>
-                                       <aspectratio>keep</aspectratio>
-                                       <bordertexture>ThumbBorderGrey.png</bordertexture>
-                                       <bordersize>2</bordersize>
-                               </control>
-                               <control type="label">
-                                       <description>Artist label</description>
-                                       <posx>220</posx>
-                                       <posy>25</posy>
-                                       <width>1020</width>
-                                       <height>25</height>
-                                       <align>left</align>
-                                       <font>font13</font>
-                                       <label>$INFO[MusicPlayer.Artist]</label>
-                                       <textcolor>black</textcolor>
-                               </control>
-                               <control type="label">
-                                       <posx>230</posx>
-                                       <posy>60</posy>
-                                       <width>1030</width>
-                                       <height>30</height>
-                                       <font>font30_title</font>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[MusicPlayer.Title]</label>
-                                       <textcolor>black</textcolor>
-                                       <scroll>true</scroll>
-                               </control>
-                               <control type="label">
-                                       <description>Album label</description>
-                                       <posx>220</posx>
-                                       <posy>95</posy>
-                                       <width>1020</width>
-                                       <height>25</height>
-                                       <align>left</align>
-                                       <font>font13</font>
-                                       <label>$INFO[MusicPlayer.Album]</label>
-                                       <textcolor>black</textcolor>
-                               </control>
-                               <control type="group">
-                                       <posx>220</posx>
-                                       <posy>140</posy>
-                                       <width>600</width>
-                                       <height>45</height>
-                                       <control type="image">
-                                               <description>Audio Codec Image</description>
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>100</width>
-                                               <height>45</height>
-                                               <aspectratio align="left">keep</aspectratio>
-                                               <texture>$INFO[MusicPlayer.Codec,flagging/audio/,.png]</texture>
-                                       </control>
-                                       <control type="group">
-                                               <description>Rating</description>
-                                               <posx>105</posx>
-                                               <posy>0</posy>
-                                               <width>160</width>
-                                               <height>45</height>
-                                               <control type="image">
-                                                       <description>rating back</description>
-                                                       <posx>0</posx>
-                                                       <posy>0</posy>
-                                                       <width>160</width>
-                                                       <height>45</height>
-                                                       <aspectratio align="left">stretch</aspectratio>
-                                                       <texture border="5">flagging/blank.png</texture>
-                                               </control>
-                                               <control type="image">
-                                                       <description>Rating</description>
-                                                       <posx>10</posx>
-                                                       <posy>0</posy>
-                                                       <width>140</width>
-                                                       <height>45</height>
-                                                       <aspectratio align="center">keep</aspectratio>
-                                                       <texture fallback="LeftRating/rating0.png">$INFO[Player.StarRating,light/left_rating/]</texture>
-                                               </control>
-                                       </control>
-                               </control>
-                               <control type="label">
-                                       <description>Normal Header label</description>
-                                       <posx>1260</posx>
-                                       <posy>5</posy>
-                                       <width>300</width>
-                                       <height>25</height>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <label>$LOCALIZE[589]</label>
-                                       <visible>MusicPartyMode.Enabled</visible>
-                               </control>
-                               <control type="label">
-                                       <description>Partymode Header label</description>
-                                       <posx>1260</posx>
-                                       <posy>5</posy>
-                                       <width>300</width>
-                                       <height>25</height>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <label>$INFO[musicplayer.Playlistposition,$LOCALIZE[554]: ]$INFO[musicplayer.Playlistlength, / ]</label>
-                                       <visible>!MusicPartyMode.Enabled</visible>
-                               </control>
-                               <control type="label">
-                                       <posx>1260</posx>
-                                       <posy>160</posy>
-                                       <width>800</width>
-                                       <height>25</height>
-                                       <label>$LOCALIZE[209]: $INFO[MusicPlayer.offset(1).Artist,, - ]$INFO[MusicPlayer.offset(1).Title]</label>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <scroll>true</scroll>
-                                       <visible>MusicPlayer.HasNext</visible>
-                               </control>
-                       </control>
-               </control>
-               <control type="group">
-                       <posx>0</posx>
-                       <posy>84</posy>
-                       <visible>Skin.HasSetting(PlayerControlsShowVideoInfo) + Player.HasVideo</visible>
-                       <animation effect="slide" start="0,-200" end="0,0" time="300" easing="out" tween="quadratic" >Visible</animation>
-                       <animation effect="slide" start="0,0" end="0,-200" time="300" easing="in" tween="quadratic" >Hidden</animation>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>ScreenWidth</width>
-                               <height>200</height>
-                               <texture border="5">dialogback.png</texture>
-                       </control>
-                       <control type="group">
-                               <control type="group">
-                                       <visible>!VideoPlayer.Content(Movies) + !VideoPlayer.Content(Episodes)</visible>
-                                       <control type="image">
-                                               <description>cover image</description>
-                                               <posx>20</posx>
-                                               <posy>10</posy>
-                                               <width>250</width>
-                                               <height>180</height>
-                                               <info>VideoPlayer.Cover</info>
-                                               <aspectratio align="right">keep</aspectratio>
-                                               <bordertexture>ThumbBorderGrey.png</bordertexture>
-                                               <bordersize>2</bordersize>
-                                       </control>
-                                       <control type="label">
-                                               <description>studio label</description>
-                                               <posx>290</posx>
-                                               <posy>25</posy>
-                                               <width>950</width>
-                                               <height>25</height>
-                                               <align>left</align>
-                                               <font>font13</font>
-                                               <label>$INFO[VideoPlayer.Studio]</label>
-                                               <textcolor>black</textcolor>
-                                       </control>
-                                       <control type="label">
-                                               <posx>300</posx>
-                                               <posy>60</posy>
-                                               <width>940</width>
-                                               <height>30</height>
-                                               <font>font30_title</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <label>$INFO[VideoPlayer.Title]</label>
-                                               <textcolor>black</textcolor>
-                                               <scroll>true</scroll>
-                                       </control>
-                                       <control type="label">
-                                               <description>Genre label</description>
-                                               <posx>290</posx>
-                                               <posy>95</posy>
-                                               <width>950</width>
-                                               <height>25</height>
-                                               <align>left</align>
-                                               <font>font13</font>
-                                               <label>$INFO[VideoPlayer.Genre]</label>
-                                               <textcolor>black</textcolor>
-                                       </control>
-                                       <control type="group">
-                                               <posx>290</posx>
-                                               <posy>140</posy>
-                                               <width>600</width>
-                                               <height>45</height>
-                                               <control type="image">
-                                                       <description>Video Codec Image</description>
-                                                       <posx>0</posx>
-                                                       <posy>0</posy>
-                                                       <width>100</width>
-                                                       <height>45</height>
-                                                       <aspectratio align="left">keep</aspectratio>
-                                                       <texture>$INFO[VideoPlayer.VideoCodec,flagging/video/,.png]</texture>
-                                               </control>
-                                               <control type="image">
-                                                       <description>Resolution Image</description>
-                                                       <posx>100</posx>
-                                                       <posy>0</posy>
-                                                       <width>75</width>
-                                                       <height>45</height>
-                                                       <aspectratio align="left">keep</aspectratio>
-                                                       <texture>$INFO[VideoPlayer.VideoResolution,flagging/video/,.png]</texture>
-                                               </control>
-                                               <control type="image">
-                                                       <description>Audio Codec Image</description>
-                                                       <posx>175</posx>
-                                                       <posy>0</posy>
-                                                       <width>100</width>
-                                                       <height>45</height>
-                                                       <aspectratio align="left">keep</aspectratio>
-                                                       <texture>$INFO[VideoPlayer.AudioCodec,flagging/audio/,.png]</texture>
-                                               </control>
-                                               <control type="image">
-                                                       <description>Audio Codec Image</description>
-                                                       <posx>275</posx>
-                                                       <posy>0</posy>
-                                                       <width>75</width>
-                                                       <height>45</height>
-                                                       <aspectratio align="left">keep</aspectratio>
-                                                       <texture>$INFO[VideoPlayer.AudioChannels,flagging/audio/,.png]</texture>
-                                               </control>
-                                       </control>
-                               </control>
-                               <control type="group">
-                                       <visible>VideoPlayer.Content(Movies)</visible>
-                                       <control type="image">
-                                               <description>cover image</description>
-                                               <posx>20</posx>
-                                               <posy>10</posy>
-                                               <width>150</width>
-                                               <height>180</height>
-                                               <info>VideoPlayer.Cover</info>
-                                               <aspectratio>keep</aspectratio>
-                                               <bordertexture>ThumbBorderGrey.png</bordertexture>
-                                               <bordersize>2</bordersize>
-                                       </control>
-                                       <control type="label">
-                                               <description>Studio label</description>
-                                               <posx>190</posx>
-                                               <posy>25</posy>
-                                               <width>1050</width>
-                                               <height>25</height>
-                                               <align>left</align>
-                                               <font>font13</font>
-                                               <label>$INFO[VideoPlayer.Studio]</label>
-                                               <textcolor>black</textcolor>
-                                       </control>
-                                       <control type="label">
-                                               <posx>200</posx>
-                                               <posy>60</posy>
-                                               <width>1040</width>
-                                               <height>30</height>
-                                               <font>font30_title</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <label>$INFO[VideoPlayer.Title]</label>
-                                               <textcolor>black</textcolor>
-                                               <scroll>true</scroll>
-                                       </control>
-                                       <control type="label">
-                                               <description>Genre label</description>
-                                               <posx>190</posx>
-                                               <posy>95</posy>
-                                               <width>1050</width>
-                                               <height>25</height>
-                                               <align>left</align>
-                                               <font>font13</font>
-                                               <label>$INFO[VideoPlayer.Genre]</label>
-                                               <textcolor>black</textcolor>
-                                       </control>
-                                       <control type="group">
-                                               <posx>190</posx>
-                                               <posy>140</posy>
-                                               <width>600</width>
-                                               <height>45</height>
-                                               <control type="image">
-                                                       <description>Video Codec Image</description>
-                                                       <posx>0</posx>
-                                                       <posy>0</posy>
-                                                       <width>100</width>
-                                                       <height>45</height>
-                                                       <aspectratio align="left">keep</aspectratio>
-                                                       <texture>$INFO[VideoPlayer.VideoCodec,flagging/video/,.png]</texture>
-                                               </control>
-                                               <control type="image">
-                                                       <description>Resolution Image</description>
-                                                       <posx>100</posx>
-                                                       <posy>0</posy>
-                                                       <width>75</width>
-                                                       <height>45</height>
-                                                       <aspectratio align="left">keep</aspectratio>
-                                                       <texture>$INFO[VideoPlayer.VideoResolution,flagging/video/,.png]</texture>
-                                               </control>
-                                               <control type="image">
-                                                       <description>Audio Codec Image</description>
-                                                       <posx>175</posx>
-                                                       <posy>0</posy>
-                                                       <width>100</width>
-                                                       <height>45</height>
-                                                       <aspectratio align="left">keep</aspectratio>
-                                                       <texture>$INFO[VideoPlayer.AudioCodec,flagging/audio/,.png]</texture>
-                                               </control>
-                                               <control type="image">
-                                                       <description>Audio Codec Image</description>
-                                                       <posx>275</posx>
-                                                       <posy>0</posy>
-                                                       <width>75</width>
-                                                       <height>45</height>
-                                                       <aspectratio align="left">keep</aspectratio>
-                                                       <texture>$INFO[VideoPlayer.AudioChannels,flagging/audio/,.png]</texture>
-                                               </control>
-                                       </control>
-                               </control>
-                               <control type="group">
-                                       <visible>VideoPlayer.Content(Episodes)</visible>
-                                       <control type="image">
-                                               <description>cover image</description>
-                                               <posx>20</posx>
-                                               <posy>10</posy>
-                                               <width>250</width>
-                                               <height>180</height>
-                                               <info>VideoPlayer.Cover</info>
-                                               <aspectratio>scale</aspectratio>
-                                               <bordertexture>ThumbBorderGrey.png</bordertexture>
-                                               <bordersize>2</bordersize>
-                                       </control>
-                                       <control type="label">
-                                               <description>Show label</description>
-                                               <posx>290</posx>
-                                               <posy>25</posy>
-                                               <width>950</width>
-                                               <height>25</height>
-                                               <align>left</align>
-                                               <font>font13</font>
-                                               <label>$INFO[VideoPlayer.TVShowTitle]</label>
-                                               <textcolor>black</textcolor>
-                                       </control>
-                                       <control type="label">
-                                               <posx>300</posx>
-                                               <posy>60</posy>
-                                               <width>940</width>
-                                               <height>30</height>
-                                               <font>font30_title</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <label>$INFO[VideoPlayer.Title]</label>
-                                               <textcolor>black</textcolor>
-                                               <scroll>true</scroll>
-                                       </control>
-                                       <control type="label">
-                                               <description>Episode label</description>
-                                               <posx>290</posx>
-                                               <posy>95</posy>
-                                               <width>950</width>
-                                               <height>25</height>
-                                               <align>left</align>
-                                               <font>font13</font>
-                                               <label>$INFO[VideoPlayer.Season,$LOCALIZE[20373]: ] &#32;&#32;&#32; $INFO[VideoPlayer.Episode,$LOCALIZE[20359]: ]</label>
-                                               <textcolor>black</textcolor>
-                                       </control>
-                                       <control type="group">
-                                               <posx>290</posx>
-                                               <posy>140</posy>
-                                               <width>600</width>
-                                               <height>45</height>
-                                               <control type="image">
-                                                       <description>Video Codec Image</description>
-                                                       <posx>0</posx>
-                                                       <posy>0</posy>
-                                                       <width>100</width>
-                                                       <height>45</height>
-                                                       <aspectratio align="left">keep</aspectratio>
-                                                       <texture>$INFO[VideoPlayer.VideoCodec,flagging/video/,.png]</texture>
-                                               </control>
-                                               <control type="image">
-                                                       <description>Resolution Image</description>
-                                                       <posx>100</posx>
-                                                       <posy>0</posy>
-                                                       <width>75</width>
-                                                       <height>45</height>
-                                                       <aspectratio align="left">keep</aspectratio>
-                                                       <texture>$INFO[VideoPlayer.VideoResolution,flagging/video/,.png]</texture>
-                                               </control>
-                                               <control type="image">
-                                                       <description>Audio Codec Image</description>
-                                                       <posx>175</posx>
-                                                       <posy>0</posy>
-                                                       <width>100</width>
-                                                       <height>45</height>
-                                                       <aspectratio align="left">keep</aspectratio>
-                                                       <texture>$INFO[VideoPlayer.AudioCodec,flagging/audio/,.png]</texture>
-                                               </control>
-                                               <control type="image">
-                                                       <description>Audio Codec Image</description>
-                                                       <posx>275</posx>
-                                                       <posy>0</posy>
-                                                       <width>75</width>
-                                                       <height>45</height>
-                                                       <aspectratio align="left">keep</aspectratio>
-                                                       <texture>$INFO[VideoPlayer.AudioChannels,flagging/audio/,.png]</texture>
-                                               </control>
-                                       </control>
-                               </control>
-                               <control type="label">
-                                       <description>Chapter label</description>
-                                       <posx>1260</posx>
-                                       <posy>5</posy>
-                                       <width>1200</width>
-                                       <height>25</height>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <label>$INFO[Player.Chapter,$LOCALIZE[21396]: ]$INFO[Player.ChapterCount, / ]$INFO[Player.ChapterName,[COLOR=grey3] (,)[/COLOR]]</label>
-                                       <visible>Player.ChapterCount</visible>
-                               </control>
-                               <control type="label">
-                                       <posx>1260</posx>
-                                       <posy>160</posy>
-                                       <width>800</width>
-                                       <height>25</height>
-                                       <label>$LOCALIZE[31049] $INFO[Player.FinishTime]</label>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <scroll>true</scroll>
-                               </control>
-                       </control>
-               </control>
-               <include>CommonHeader</include>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>20</posy>
-                       <width>1280</width>
-                       <height>64</height>
-                       <texture>header.png</texture>
-               </control>
-               <control type="grouplist">
-                       <description>Top Left bar</description>
-                       <posx>0</posx>
-                       <posy>20</posy>
-                       <width>200</width>
-                       <height>64</height>
-                       <align>left</align>
-                       <itemgap>5</itemgap>
-                       <orientation>horizontal</orientation>
-                       <control type="button">
-                               <description>Playlist Button</description>
-                               <width>64</width>
-                               <height>64</height>
-                               <texturenofocus>icon_playlistmusic.png</texturenofocus>
-                               <texturefocus>icon_playlistmusic.png</texturefocus>
-                               <onclick>PreviousMenu</onclick>
-                               <onclick>ActivateWindow(MusicPlaylist)</onclick>
-                               <visible>Player.HasAudio</visible>
-                       </control>
-                       <control type="button">
-                               <description>Playlist Button</description>
-                               <width>64</width>
-                               <height>64</height>
-                               <texturenofocus>icon_playlistvideo.png</texturenofocus>
-                               <texturefocus>icon_playlistvideo.png</texturefocus>
-                               <onclick>PreviousMenu</onclick>
-                               <onclick>ActivateWindow(VideoPlaylist)</onclick>
-                               <visible>Player.HasVideo</visible>
-                       </control>
-                       <control type="image">
-                               <width>2</width>
-                               <height>62</height>
-                               <texture>header-divide.png</texture>
-                       </control>
-               </control>
-               <control type="grouplist">
-                       <description>Top Right bar</description>
-                       <posx>1080r</posx>
-                       <posy>25</posy>
-                       <width>1000</width>
-                       <height>64</height>
-                       <align>right</align>
-                       <itemgap>5</itemgap>
-                       <orientation>horizontal</orientation>
-                       <control type="radiobutton">
-                               <description>Show Info Button</description>
-                               <width>270</width>
-                               <height>50</height>
-                               <label>$LOCALIZE[544]</label>
-                               <font>font13</font>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <selected>Skin.HasSetting(PlayerControlsShowAudioInfo)</selected>
-                               <texturenofocus border="5">floor_button.png</texturenofocus>
-                               <texturefocus border="5">floor_buttonFO.png</texturefocus>
-                               <onclick>Skin.ToggleSetting(PlayerControlsShowAudioInfo)</onclick>
-                               <visible>Player.HasAudio</visible>
-                       </control>
-                       <control type="radiobutton">
-                               <description>Show Info Button</description>
-                               <width>270</width>
-                               <height>50</height>
-                               <label>$LOCALIZE[544]</label>
-                               <font>font13</font>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <selected>Skin.HasSetting(PlayerControlsShowVideoInfo)</selected>
-                               <texturenofocus border="5">floor_button.png</texturenofocus>
-                               <texturefocus border="5">floor_buttonFO.png</texturefocus>
-                               <onclick>Skin.ToggleSetting(PlayerControlsShowVideoInfo)</onclick>
-                               <visible>Player.HasVideo</visible>
-                       </control>
-                       <control type="button">
-                               <description>Submenu Button</description>
-                               <width>200</width>
-                               <height>50</height>
-                               <label>$LOCALIZE[33063]</label>
-                               <font>font13</font>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <texturenofocus border="5">floor_button.png</texturenofocus>
-                               <texturefocus border="5">floor_buttonFO.png</texturefocus>
-                               <onclick>Skin.ToggleSetting(PlayerControlsSubMenuVisible)</onclick>
-                               <visible>!Window.IsVisible(Karaoke)</visible>
-                       </control>
-                       <control type="radiobutton">
-                               <description>Fullscreen Button</description>
-                               <posy>5</posy>
-                               <width>230</width>
-                               <height>50</height>
-                               <radiowidth>36</radiowidth>
-                               <radioheight>36</radioheight>
-                               <font>font13</font>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <texturenofocus border="5">floor_button.png</texturenofocus>
-                               <texturefocus border="5">floor_buttonFO.png</texturefocus>
-                               <label>31008</label>
-                               <onclick>fullscreen</onclick>
-                               <textureradiofocus>GoFullscreen2.png</textureradiofocus>
-                               <textureradionofocus>GoFullscreen2.png</textureradionofocus>
-                               <visible>!Window.IsVisible(Visualisation) + !Window.IsVisible(FullScreenVideo) + !Window.IsVisible(Karaoke)</visible>
-                       </control>
-                       <control type="radiobutton">
-                               <description>Fullscreen Button</description>
-                               <posy>5</posy>
-                               <width>230</width>
-                               <height>50</height>
-                               <radiowidth>36</radiowidth>
-                               <radioheight>36</radioheight>
-                               <font>font13</font>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <texturenofocus border="5">floor_button.png</texturenofocus>
-                               <texturefocus border="5">floor_buttonFO.png</texturefocus>
-                               <label>31008</label>
-                               <onclick>Dialog.Close(VideoOSD,true)</onclick>
-                               <onclick>Dialog.Close(MusicOSD,true)</onclick>
-                               <onclick>fullscreen</onclick>
-                               <textureradiofocus flipx="true" flipy="true">GoFullscreen2.png</textureradiofocus>
-                               <textureradionofocus flipx="true" flipy="true">GoFullscreen2.png</textureradionofocus>
-                               <visible>Window.IsVisible(Visualisation) | Window.IsVisible(FullScreenVideo) + !Window.IsVisible(Karaoke)</visible>
-                       </control>
-               </control>
-               <control type="group">
-                       <posx>65r</posx>
-                       <posy>20</posy>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>2</width>
-                               <height>62</height>
-                               <texture>header-divide.png</texture>
-                       </control>
-                       <control type="button">
-                               <description>Close Button</description>
-                               <posx>5</posx>
-                               <posy>0</posy>
-                               <width>60</width>
-                               <height>60</height>
-                               <font>-</font>
-                               <onclick>previousmenu</onclick>
-                               <texturefocus>icon_close.png</texturefocus>
-                               <texturenofocus>icon_close.png</texturenofocus>
-                       </control>
-               </control>
-
-               <control type="group">
-                       <posx>0</posx>
-                       <posy>70r</posy>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>1280</width>
-                               <height>71</height>
-                               <texture>floor.png</texture>
-                       </control>
-                       <control type="label">
-                               <posx>180</posx>
-                               <posy>16</posy>
-                               <width>180</width>
-                               <height>32</height>
-                               <font>font13</font>
-                               <align>right</align>
-                               <aligny>center</aligny>
-                               <label>$INFO[Player.Time(hh:mm:ss)]</label>
-                       </control>
-                       <control type="label">
-                               <posx>1100</posx>
-                               <posy>16</posy>
-                               <width>180</width>
-                               <height>32</height>
-                               <font>font13</font>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <label>$INFO[Player.Duration(hh:mm:ss)]</label>
-                       </control>
-                       <control type="progress">
-                               <description>ProgressbarCache</description>
-                               <posx>200</posx>
-                               <posy>16</posy>
-                               <width>880</width>
-                               <height>32</height>
-                               <info>Player.ProgressCache</info>
-                               <midtexture border="16,0,16,0">OSDProgressMidLight.png</midtexture>
-                       </control>
-                       <control type="progress">
-                               <description>Progressbar</description>
-                               <posx>200</posx>
-                               <posy>16</posy>
-                               <width>880</width>
-                               <height>32</height>
-                               <info>Player.Progress</info>
-                               <texturebg border="16,0,16,0">OSDProgressBack2.png</texturebg>
-                       </control>
-                       <control type="slider" id="87">
-                               <description>Seek Slider</description>
-                               <posx>200</posx>
-                               <posy>16</posy>
-                               <width>880</width>
-                               <height>32</height>
-                               <action>seek</action>
-                               <texturesliderbar border="16,0,16,0">OSDProgressBack2.png</texturesliderbar>
-                               <textureslidernib>-</textureslidernib>
-                               <textureslidernibfocus>-</textureslidernibfocus>
-                       </control>
-
-               </control>
-               <control type="group">
-                       <posx>370</posx>
-                       <posy>200r</posy>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>560</width>
-                               <height>80</height>
-                               <texture border="3">PlayerControls-Background.png</texture>
-                       </control>
-                       <control type="button" id="400">
-                               <posx>15</posx>
-                               <posy>0</posy>
-                               <width>85</width>
-                               <height>80</height>
-                               <label>-</label>
-                               <texturefocus>PlayerControls-PrevFO.png</texturefocus>
-                               <texturenofocus>PlayerControls-PrevNF.png</texturenofocus>
-                               <onleft>407</onleft>
-                               <onright>401</onright>
-                               <onup>400</onup>
-                               <ondown>400</ondown>
-                               <onclick>XBMC.PlayerControl(Previous)</onclick>
-                       </control>
-                       <control type="button" id="401">
-                               <posx>100</posx>
-                               <posy>0</posy>
-                               <width>85</width>
-                               <height>80</height>
-                               <label>-</label>
-                               <texturefocus>PlayerControls-RewindFO.png</texturefocus>
-                               <texturenofocus>PlayerControls-RewindNF.png</texturenofocus>
-                               <onleft>400</onleft>
-                               <onright>402</onright>
-                               <onup>401</onup>
-                               <ondown>401</ondown>
-                               <onclick>XBMC.PlayerControl(Rewind)</onclick>
-                       </control>
-                       <control type="button" id="402">
-                               <posx>190</posx>
-                               <posy>0</posy>
-                               <width>85</width>
-                               <height>80</height>
-                               <label>-</label>
-                               <texturefocus>PlayerControls-StopFO.png</texturefocus>
-                               <texturenofocus>PlayerControls-StopNF.png</texturenofocus>
-                               <onleft>401</onleft>
-                               <onright>403</onright>
-                               <onup>402</onup>
-                               <ondown>402</ondown>
-                               <onclick>XBMC.PlayerControl(Stop)</onclick>
-                       </control>
-                       <control type="togglebutton" id="403">
-                               <posx>280</posx>
-                               <posy>0</posy>
-                               <width>85</width>
-                               <height>80</height>
-                               <label>-</label>
-                               <texturefocus>PlayerControls-PauseFO.png</texturefocus>
-                               <texturenofocus>PlayerControls-PauseNF.png</texturenofocus>
-                               <usealttexture>Player.Paused | Player.Forwarding | Player.Rewinding</usealttexture>
-                               <alttexturefocus>PlayerControls-PlayFO.png</alttexturefocus>
-                               <alttexturenofocus>PlayerControls-PlayNF.png</alttexturenofocus>
-                               <onleft>402</onleft>
-                               <onright>404</onright>
-                               <onup>403</onup>
-                               <ondown>403</ondown>
-                               <onclick>XBMC.PlayerControl(Play)</onclick>
-                       </control>
-                       <control type="button" id="404">
-                               <posx>370</posx>
-                               <posy>0</posy>
-                               <width>85</width>
-                               <height>80</height>
-                               <label>-</label>
-                               <texturefocus>PlayerControls-ForwardFO.png</texturefocus>
-                               <texturenofocus>PlayerControls-ForwardNF.png</texturenofocus>
-                               <onleft>403</onleft>
-                               <onright>405</onright>
-                               <onup>404</onup>
-                               <ondown>404</ondown>
-                               <onclick>XBMC.PlayerControl(Forward)</onclick>
-                       </control>
-                       <control type="button" id="405">
-                               <posx>460</posx>
-                               <posy>0</posy>
-                               <width>85</width>
-                               <height>80</height>
-                               <label>-</label>
-                               <texturefocus>PlayerControls-NextFO.png</texturefocus>
-                               <texturenofocus>PlayerControls-NextNF.png</texturenofocus>
-                               <onleft>404</onleft>
-                               <onright>406</onright>
-                               <onup>405</onup>
-                               <ondown>405</ondown>
-                               <onclick>XBMC.PlayerControl(Next)</onclick>
-                       </control>
-               </control>
-               <control type="group">
-                       <visible>Window.IsVisible(FullscreenVideo)</visible>
-                       <posx>80r</posx>
-                       <posy>385</posy>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>90</width>
-                               <height>170</height>
-                               <colordiffuse>EEFFFFFF</colordiffuse>
-                               <texture border="3">PlayerControls-Background.png</texture>
-                       </control>
-                       <control type="label">
-                               <description>header label</description>
-                               <posx>0</posx>
-                               <posy>10</posy>
-                               <height>20</height>
-                               <width>80</width>
-                               <label>287</label>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <font>font8_title</font>
-                               <shadowcolor>black</shadowcolor>
-                       </control>
-                       <control type="label">
-                               <description>Video Has no Subtitles label</description>
-                               <posx>0</posx>
-                               <posy>40</posy>
-                               <height>20</height>
-                               <width>80</width>
-                               <label>31011</label>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <font>font10_title</font>
-                               <textcolor>grey2</textcolor>
-                               <shadowcolor>black</shadowcolor>
-                               <visible>!VideoPlayer.HasSubtitles</visible>
-                       </control>
-                       <control type="togglebutton">
-                               <description>Download with Subtitles script</description>
-                               <posx>10</posx>
-                               <posy>38</posy>
-                               <width>60</width>
-                               <height>35</height>
-                               <hitrect x="5" y="5" w="75" h="80" />
-                               <label>31356</label>
-                               <font>-</font>
-                               <texturefocus>radiobutton-nofocus.png</texturefocus>
-                               <texturenofocus>radiobutton-nofocus.png</texturenofocus>
-                               <alttexturefocus>radiobutton-focus.png</alttexturefocus>
-                               <alttexturenofocus>radiobutton-focus.png</alttexturenofocus>
-                               <onleft>605</onleft>
-                               <onright>702</onright>
-                               <onup>1000</onup>
-                               <ondown>1000</ondown>
-                               <onclick>Dialog.Close(VideoOSD,true)</onclick>
-                               <onclick>ShowSubtitles</onclick>
-                               <usealttexture>VideoPlayer.SubtitlesEnabled</usealttexture>
-                               <visible>VideoPlayer.HasSubtitles</visible>
-                       </control>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>88</posy>
-                               <width>80</width>
-                               <height>2</height>
-                               <texture>header-divide.png</texture>
-                       </control>
-                       <control type="togglebutton">
-                               <posx>10</posx>
-                               <posy>100</posy>
-                               <width>65</width>
-                               <height>60</height>
-                               <label>31356</label>
-                               <hitrect x="5" y="100" w="75" h="70" />
-                               <font>-</font>
-                               <texturefocus flipy="true">icon_shift.png</texturefocus>
-                               <texturenofocus flipy="true">icon_shift.png</texturenofocus>
-                               <alttexturefocus flipy="true">icon_shift.png</alttexturefocus>
-                               <alttexturenofocus flipy="true">icon_shift.png</alttexturenofocus>
-                               <onleft>605</onleft>
-                               <onright>702</onright>
-                               <onup>1000</onup>
-                               <ondown>1000</ondown>
-                               <onclick>Close</onclick>
-                               <onclick>XBMC.RunScript($INFO[Skin.String(SubtitleScript_Path)])</onclick>
-                               <altclick>Skin.SetAddon(SubtitleScript_Path,xbmc.python.subtitles)</altclick>
-                               <altclick>Close</altclick>
-                               <altclick>XBMC.RunScript($INFO[Skin.String(SubtitleScript_Path)])</altclick>
-                               <usealttexture>IsEmpty(Skin.String(SubtitleScript_Path))</usealttexture>
-                       </control>
-               </control>
-
-               <control type="group">
-                       <visible>Skin.HasSetting(PlayerControlsSubMenuVisible)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <control type="button">
-                               <description>Hidden button to close the sort when its focused</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>ScreenWidth</width>
-                               <height>ScreenHeight</height>
-                               <texturenofocus>-</texturenofocus>
-                               <texturefocus>-</texturefocus>
-                               <onclick>Skin.Reset(PlayerControlsSubMenuVisible)</onclick>
-                       </control>
-                       <control type="group">
-                               <posx>570r</posx>
-                               <posy>113</posy>
-                               <control type="image">
-                                       <description>Shadow Background</description>
-                                       <posx>-30</posx>
-                                       <posy>-30</posy>
-                                       <width>380</width>
-                                       <height>440</height>
-                                       <texture border="30">ShadowBorder.png</texture>
-                               </control>
-                               <control type="button">
-                                       <description>Panel Background image</description>
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>320</width>
-                                       <height>380</height>
-                                       <texturefocus border="5">SubBack.png</texturefocus>
-                                       <texturenofocus border="5">SubBack.png</texturenofocus>
-                                       <onclick>-</onclick>
-                               </control>
-                               <control type="image">
-                                       <description>Panel Forground image</description>
-                                       <posx>10</posx>
-                                       <posy>10</posy>
-                                       <width>300</width>
-                                       <height>354</height>
-                                       <texture border="5">SubBack2.png</texture>
-                               </control>
-                               <control type="image">
-                                       <description>Panel Arrow image</description>
-                                       <posx>140</posx>
-                                       <posy>-34</posy>
-                                       <width>40</width>
-                                       <height>40</height>
-                                       <texture>arrow-big-up.png</texture>
-                               </control>
-                               <control type="grouplist">
-                                       <posx>11</posx>
-                                       <posy>10</posy>
-                                       <width>300</width>
-                                       <height>354</height>
-                                       <onleft>9000</onleft>
-                                       <onright>50</onright>
-                                       <onup>9000</onup>
-                                       <ondown>9000</ondown>
-                                       <itemgap>-1</itemgap>
-                                       <control type="radiobutton">
-                                               <description>Random Toggle</description>
-                                               <textwidth>170</textwidth>
-                                               <include>ButtonCommonValues2</include>
-                                               <label>$LOCALIZE[191]</label>
-                                               <onclick>XBMC.PlayerControl(Random)</onclick>
-                                               <selected>Playlist.IsRandom</selected>
-                                       </control>
-                                       <control type="button">
-                                               <description>Repeat</description>
-                                               <include>ButtonCommonValues2</include>
-                                               <label>$LOCALIZE[486]$INFO[Playlist.Repeat,: ]</label>
-                                               <onclick>XBMC.PlayerControl(Repeat)</onclick>
-                                       </control>
-                                       <!-- Buttons for Fullscreen Video -->
-                                       <control type="button">
-                                               <include>ButtonCommonValues2</include>
-                                               <label>13395</label>
-                                               <onclick>Dialog.Close(VideoOSD,true)</onclick>
-                                               <onclick>Skin.Reset(PlayerControlsSubMenuVisible)</onclick>
-                                               <onclick>XBMC.ActivateWindow(123)</onclick>
-                                               <visible>Window.IsVisible(FullScreenVideo)</visible>
-                                       </control>
-                                       <control type="button">
-                                               <include>ButtonCommonValues2</include>
-                                               <label>31002</label>
-                                               <onclick>Dialog.Close(VideoOSD,true)</onclick>
-                                               <onclick>Skin.Reset(PlayerControlsSubMenuVisible)</onclick>
-                                               <onclick>XBMC.ActivateWindow(124)</onclick>
-                                               <visible>Window.IsVisible(FullScreenVideo)</visible>
-                                       </control>
-                                       <control type="button">
-                                               <include>ButtonCommonValues2</include>
-                                               <label>298</label>
-                                               <onclick>Dialog.Close(VideoOSD,true)</onclick>
-                                               <onclick>Skin.Reset(PlayerControlsSubMenuVisible)</onclick>
-                                               <onclick>XBMC.ActivateWindow(125)</onclick>
-                                               <visible>Window.IsVisible(FullScreenVideo)</visible>
-                                       </control>
-                                       <control type="togglebutton">
-                                               <include>ButtonCommonValues2</include>
-                                               <label>31018</label>
-                                               <onclick>-</onclick>
-                                               <onclick>Close</onclick>
-                                               <onclick>XBMC.RunScript($INFO[Skin.String(SubtitleScript_Path)])</onclick>
-                                               <altclick>Skin.SetAddon(SubtitleScript_Path,xbmc.python.subtitles)</altclick>
-                                               <altclick>Close</altclick>
-                                               <altclick>XBMC.RunScript($INFO[Skin.String(SubtitleScript_Path)])</altclick>
-                                               <alttexturefocus border="5">button-focus2.png</alttexturefocus>
-                                               <alttexturenofocus>-</alttexturenofocus>
-                                               <usealttexture>IsEmpty(Skin.String(SubtitleScript_Path))</usealttexture>
-                                               <visible>false</visible>
-                                               <visible>Window.IsVisible(FullScreenVideo)</visible>
-                                       </control>
-                                       <control type="button">
-                                               <include>ButtonCommonValues2</include>
-                                               <label>31355</label>
-                                               <onclick>PlayerControl(ShowVideoMenu)</onclick>
-                                               <visible>VideoPlayer.HasMenu</visible>
-                                               <visible>Window.IsVisible(FullScreenVideo)</visible>
-                                       </control>
-                                       <!-- Buttons for Fullscreen Audio -->
-                                       <control type="button">
-                                               <include>ButtonCommonValues2</include>
-                                               <label>250</label>
-                                               <onclick>Dialog.Close(MusicOSD,true)</onclick>
-                                               <onclick>Skin.Reset(PlayerControlsSubMenuVisible)</onclick>
-                                               <onclick>Addon.Default.Set(xbmc.player.musicviz)</onclick>
-                                               <visible>Window.IsVisible(Visualisation)</visible>
-                                       </control>
-                                       <control type="button">
-                                               <include>ButtonCommonValues2</include>
-                                               <label>31005</label>
-                                               <onclick>Dialog.Close(MusicOSD,true)</onclick>
-                                               <onclick>Skin.Reset(PlayerControlsSubMenuVisible)</onclick>
-                                               <onclick>Addon.Default.OpenSettings(xbmc.player.musicviz)</onclick>
-                                               <visible>Window.IsVisible(Visualisation)</visible>
-                                       </control>
-                                       <control type="button">
-                                               <include>ButtonCommonValues2</include>
-                                               <label>31006</label>
-                                               <onclick>Dialog.Close(MusicOSD,true)</onclick>
-                                               <onclick>Skin.Reset(PlayerControlsSubMenuVisible)</onclick>
-                                               <onclick>XBMC.ActivateWindow(122)</onclick>
-                                               <visible>Window.IsVisible(Visualisation)</visible>
-                                       </control>
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>100</posy>
-                                               <width>298</width>
-                                               <height>10</height>
-                                               <texture>shelf_shadow.png</texture>
-                                       </control>
-                               </control>
-                       </control>
-               </control>
-       </include>
-</includes>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/LockSettings.xml b/addons/skin.touched/4x3Hirez/LockSettings.xml
deleted file mode 100644 (file)
index 81460c0..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-<window id="131">
-       <defaultcontrol>5</defaultcontrol>
-       <include>Window_OpenClose_Animation_Zoom</include>
-       <coordinates>
-               <system>1</system>
-               <posx>140</posx>
-               <posy>30</posy>
-       </coordinates>
-       <controls>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>1000</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="label">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>910</width>
-                       <label>$LOCALIZE[20043]</label>
-               </control>
-               <control type="group">
-                       <posx>930</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>1000</width>
-                       <height>840</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-               <control type="grouplist" id="5">
-                       <description>control area</description>
-                       <posx>20</posx>
-                       <posy>80</posy>
-                       <width>960</width>
-                       <height>720</height>
-                       <itemgap>-1</itemgap>
-                       <pagecontrol>60</pagecontrol>
-                       <onleft>28</onleft>
-                       <onright>60</onright>
-                       <onup>28</onup>
-                       <ondown>28</ondown>
-               </control>
-               <control type="button" id="7">
-                       <description>Default Button</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <height>55</height>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-                       <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-               </control>
-               <control type="radiobutton" id="8">
-                       <description>Default RadioButton</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <height>55</height>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-                       <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-               </control>
-               <control type="spincontrolex" id="9">
-                       <description>Default SpinControlex</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <height>55</height>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-                       <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-                       <aligny>center</aligny>
-                       <reverse>yes</reverse>
-               </control>
-               <control type="image" id="11">
-                       <description>separator image</description>
-                       <height>5</height>
-                       <texture>separator.png</texture>
-               </control>
-               <control type="grouplist" id="9000">
-                       <posx>20</posx>
-                       <posy>830</posy>
-                       <width>960</width>
-                       <height>50</height>
-                       <itemgap>10</itemgap>
-                       <align>center</align>
-                       <orientation>horizontal</orientation>
-                       <onleft>9000</onleft>
-                       <onright>9000</onright>
-                       <onup>9000</onup>
-                       <ondown>9000</ondown>
-                       <control type="button" id="28">
-                               <description>OK button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>186</label>
-                       </control>
-                       <control type="button" id="29">
-                               <description>Cancel button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>222</label>
-                       </control>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/LoginScreen.xml b/addons/skin.touched/4x3Hirez/LoginScreen.xml
deleted file mode 100644 (file)
index 7e14c18..0000000
+++ /dev/null
@@ -1,134 +0,0 @@
-<window id="29">
-       <defaultcontrol></defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <controls>
-               <include>CommonBackground</include>
-               <include>CommonNowPlaying</include>
-               <control type="label">
-                       <description>Window label</description>
-                       <include>MediaWindowTitleCommons</include>
-                       <label>$LOCALIZE[20096]</label>
-               </control>
-               <control type="group">
-                       <include>Window_OpenClose_Animation_Zoom</include>
-                       <control type="label">
-                               <posx>295</posx>
-                               <posy>140</posy>
-                               <width>690</width>
-                               <height>40</height>
-                               <font>font13_title</font>
-                               <textcolor>grey2</textcolor>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <label>$LOCALIZE[31421]</label>
-                       </control>
-                       <control type="panel" id="52">
-                               <posx>295</posx>
-                               <posy>210</posy>
-                               <width>690</width>
-                               <height>401</height>
-                               <onleft>20</onleft>
-                               <onright>20</onright>
-                               <onup>52</onup>
-                               <ondown>52</ondown>
-                               <viewtype label="535">list</viewtype>
-                               <pagecontrol>60</pagecontrol>
-                               <scrolltime>200</scrolltime>
-                               <itemlayout height="115" width="690">
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>690</width>
-                                               <height>110</height>
-                                               <texture border="5">SubBack.png</texture>
-                                       </control>
-                                       <control type="image">
-                                               <posx>10</posx>
-                                               <posy>10</posy>
-                                               <width>80</width>
-                                               <height>90</height>
-                                               <texture>$INFO[ListItem.Icon]</texture>
-                                       </control>
-                                       <control type="label">
-                                               <posx>110</posx>
-                                               <posy>10</posy>
-                                               <width>580</width>
-                                               <height>40</height>
-                                               <font>font24_title</font>
-                                               <textcolor>grey2</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <label>$INFO[ListItem.Label]</label>
-                                       </control>
-                                       <control type="label">
-                                               <posx>110</posx>
-                                               <posy>50</posy>
-                                               <width>580</width>
-                                               <height>40</height>
-                                               <font>font13</font>
-                                               <textcolor>grey2</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <label>$INFO[ListItem.Label2]</label>
-                                       </control>
-                               </itemlayout>
-                               <focusedlayout height="115" width="580">
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>690</width>
-                                               <height>110</height>
-                                               <texture border="5">SubBack2.png</texture>
-                                               <include>VisibleFadeEffect</include>
-                                       </control>
-                                       <control type="image">
-                                               <posx>10</posx>
-                                               <posy>10</posy>
-                                               <width>90</width>
-                                               <height>80</height>
-                                               <texture>$INFO[ListItem.Icon]</texture>
-                                       </control>
-                                       <control type="label">
-                                               <posx>110</posx>
-                                               <posy>10</posy>
-                                               <width>580</width>
-                                               <height>40</height>
-                                               <font>font24_title</font>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <label>$INFO[ListItem.Label]</label>
-                                       </control>
-                                       <control type="label">
-                                               <posx>110</posx>
-                                               <posy>50</posy>
-                                               <width>580</width>
-                                               <height>40</height>
-                                               <font>font13</font>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <label>$INFO[ListItem.Label2]</label>
-                                       </control>
-                               </focusedlayout>
-                       </control>
-               </control>
-               <control type="panel" id="9002">
-                       <visible>!Window.IsActive(PlayerControls)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <include>SubMenuCommonLayout</include>
-                       <content>
-                               <item>
-                                       <label>13012</label>
-                                       <onclick>XBMC.Quit</onclick>
-                                       <icon>icon_shutdown.png</icon>
-                               </item>
-                       </content>
-               </control>
-               <include>BehindDialogFadeOut</include>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/MusicKaraokeLyrics.xml b/addons/skin.touched/4x3Hirez/MusicKaraokeLyrics.xml
deleted file mode 100644 (file)
index 892fde0..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-<window id="2009">
-       <onunload>Dialog.Close(MusicOSD)</onunload>
-       <controls>
-               <control type="karvisualisation" id="1">
-                       <description>visualisation</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>ScreenWidth</width>
-                       <height>ScreenHeight</height>
-                       <visibility>false</visibility>
-               </control>
-               <control type="image" id="2">
-                       <description>fullscreen image</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>ScreenWidth</width>
-                       <height>ScreenHeight</height>
-                       <visibility>false</visibility>
-               </control>
-               <control type="group">
-                       <posx>70r</posx>
-                       <posy>405</posy>
-                       <include>Window_OpenClose_Animation</include>
-                       <include>VisibleFadeEffect</include>
-                       <visible>!Window.IsVisible(MusicOSD)</visible>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>80</width>
-                               <height>150</height>
-                               <texture border="5">SubBack.png</texture>
-                       </control>
-                       <control type="button">
-                               <posx>10</posx>
-                               <posy>10</posy>
-                               <width>55</width>
-                               <height>55</height>
-                               <label>-</label>
-                               <texturefocus>icon_player2.png</texturefocus>
-                               <texturenofocus>icon_player2.png</texturenofocus>
-                               <onclick>ActivateWindow(MusicOSD)</onclick>
-                       </control>
-                       <control type="button">
-                               <posx>10</posx>
-                               <posy>85</posy>
-                               <width>55</width>
-                               <height>55</height>
-                               <label>-</label>
-                               <texturefocus>icon_keypad.png</texturefocus>
-                               <texturenofocus>icon_keypad.png</texturenofocus>
-                               <onclick>Number0</onclick>
-                       </control>
-               </control>
-               <control type="group">
-                       <visible>MusicPlayer.Offset(number).Exists + !IntegerGreaterThan(Player.TimeRemaining,20)</visible>
-                       <animation effect="slide" start="0,-64" end="0,0" time="100">Visible</animation>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>ScreenWidth</width>
-                               <height>64</height>
-                               <texture>header.png</texture>
-                       </control>
-                       <control type="label" id="402">
-                               <description>Next Song Name</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>ScreenWidth</width>
-                               <height>60</height>
-                               <font>font16</font>
-                               <textcolor>white</textcolor>
-                               <label>$LOCALIZE[209] : $INFO[MusicPlayer.offset(1).Title]</label>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                       </control>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/MusicOSD.xml b/addons/skin.touched/4x3Hirez/MusicOSD.xml
deleted file mode 100644 (file)
index 7acfa2f..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<window type="dialog" id="120">
-       <defaultcontrol></defaultcontrol>
-       <include>dialogeffect</include>
-       <onunload>Skin.Reset(PlayerControlsSubMenuVisible)</onunload>
-       <coordinates>
-               <system>1</system>
-               <posx>0</posx>
-               <posy>0</posy>
-       </coordinates>
-       <controls>
-               <include>PlayerControlCommons</include>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/MusicOverlay.xml b/addons/skin.touched/4x3Hirez/MusicOverlay.xml
deleted file mode 100644 (file)
index 510e6e3..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<window id="2903">
-       <defaultcontrol>-</defaultcontrol>
-       <controls>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/MusicVisualisation.xml b/addons/skin.touched/4x3Hirez/MusicVisualisation.xml
deleted file mode 100644 (file)
index 71f0342..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-<window id="2006">
-       <defaultcontrol>-</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <controls>
-               <control type="visualisation">
-                       <description>visualisation</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>ScreenWidth</width>
-                       <height>ScreenHeight</height>
-               </control>
-               <!-- codec & viz infos -->
-               <control type="group" id="0">
-                       <posx>0</posx>
-                       <posy>50</posy>
-                       <visible>Player.ShowCodec + ![Window.IsVisible(script-XBMC_Lyrics-main.xml) | Window.IsVisible(VisualisationSettings) | Window.IsVisible(VisualisationPresetList)]</visible>
-                       <animation effect="fade" time="200">VisibleChange</animation>
-                       <control type="image">
-                               <description>media info background image</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>1280</width>
-                               <height>105</height>
-                               <colordiffuse>AAFFFFFF</colordiffuse>
-                               <texture>black-back.png</texture>
-                       </control>
-                       <control type="label">
-                               <description>row 1 label</description>
-                               <posx>50</posx>
-                               <posy>10</posy>
-                               <label>-</label>
-                               <align>left</align>
-                               <label>$INFO[musicplayer.Codec,$LOCALIZE[21446]: ,]$INFO[musicplayer.Bitrate, · $LOCALIZE[623]: ,kbps]$INFO[musicplayer.bitspersample, · $LOCALIZE[612]: ,bit]$INFO[musicplayer.Samplerate, · $LOCALIZE[613]: ,kHz]$INFO[musicplayer.Channels, · $LOCALIZE[21444]: ]</label>
-                               <font>font12</font>
-                       </control>
-                       <control type="label">
-                               <description>row 2 label</description>
-                               <posx>50</posx>
-                               <posy>40</posy>
-                               <label>-</label>
-                               <align>left</align>
-                               <label>$INFO[Visualisation.Name] [I][COLOR=orange]($LOCALIZE[20166])[/COLOR][/I] · fps: $INFO[System.FPS]</label>
-                               <font>font12</font>
-                               <visible>Visualisation.Locked</visible>
-                       </control>
-                       <control type="label">
-                               <description>Unlocked row 2 label</description>
-                               <posx>50</posx>
-                               <posy>40</posy>
-                               <label>-</label>
-                               <align>left</align>
-                               <label>$INFO[Visualisation.Name] · fps: $INFO[System.FPS]</label>
-                               <font>font12</font>
-                               <visible>!Visualisation.Locked</visible>
-                       </control>
-                       <control type="label">
-                               <description>row 3 label</description>
-                               <posx>50</posx>
-                               <posy>70</posy>
-                               <label>-</label>
-                               <align>left</align>
-                               <label>$LOCALIZE[13388]: $INFO[Visualisation.Preset]</label>
-                               <font>font12</font>
-                       </control>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/MyMusicNav.xml b/addons/skin.touched/4x3Hirez/MyMusicNav.xml
deleted file mode 100644 (file)
index def22a8..0000000
+++ /dev/null
@@ -1,130 +0,0 @@
-<window id="502">
-       <defaultcontrol always="true">50</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <views>50,500</views>
-       <onunload>Skin.Reset(MediaSubMenuVisible)</onunload>
-       <controls>
-               <include>CommonBackground</include>
-               <include>FileCountCommons</include>
-               <include>HomeButtonCommons</include>
-               <include>CommonNowPlaying</include>
-               <include>OptionsButtonCommons</include>
-               <control type="label">
-                       <description>Window label</description>
-                       <include>MediaWindowTitleCommons</include>
-                       <label>$LOCALIZE[10516]</label>
-               </control>
-               <control type="group">
-                       <include>Window_OpenClose_Animation_Zoom</include>
-                       <include>CommonRootView</include> <!-- view id = 50 -->
-                       <include>ThumbnailView</include> <!-- view id = 500 -->
-                       <include>ScrollArrowsCommons</include>
-               </control>
-               <include>MediaSubMenu</include>
-               <control type="group">
-                       <visible>Skin.HasSetting(MediaSubMenuVisible)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <control type="button">
-                               <description>Hidden button to close the sort when its focused</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>ScreenWidth</width>
-                               <height>ScreenHeight</height>
-                               <texturenofocus>-</texturenofocus>
-                               <texturefocus>-</texturefocus>
-                               <onclick>Skin.Reset(MediaSubMenuVisible)</onclick>
-                       </control>
-                       <control type="group">
-                               <posx>340r</posx>
-                               <posy>130</posy>
-                               <control type="image">
-                                       <description>Shadow Background</description>
-                                       <posx>-30</posx>
-                                       <posy>-30</posy>
-                                       <width>380</width>
-                                       <height>500</height>
-                                       <texture border="30">ShadowBorder.png</texture>
-                               </control>
-                               <control type="button">
-                                       <description>Panel Background image</description>
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>320</width>
-                                       <height>440</height>
-                                       <texturefocus border="5">SubBack.png</texturefocus>
-                                       <texturenofocus border="5">SubBack.png</texturenofocus>
-                                       <onclick>-</onclick>
-                               </control>
-                               <control type="image">
-                                       <description>Panel Forground image</description>
-                                       <posx>10</posx>
-                                       <posy>10</posy>
-                                       <width>300</width>
-                                       <height>420</height>
-                                       <texture border="5">SubBack2.png</texture>
-                               </control>
-                               <control type="image">
-                                       <description>Panel Arrow image</description>
-                                       <posx>270</posx>
-                                       <posy>-34</posy>
-                                       <width>40</width>
-                                       <height>40</height>
-                                       <texture>arrow-big-up.png</texture>
-                               </control>
-                               <control type="grouplist">
-                                       <posx>11</posx>
-                                       <posy>10</posy>
-                                       <width>298</width>
-                                       <height>420</height>
-                                       <onleft>9000</onleft>
-                                       <onright>50</onright>
-                                       <onup>9000</onup>
-                                       <ondown>9000</ondown>
-                                       <itemgap>0</itemgap>
-                                       <control type="button" id="3">
-                                               <description>Sort by button</description>
-                                               <include>ButtonCommonValues2</include>
-                                               <label>103</label>
-                                       </control>
-                                       <control type="togglebutton" id="4">
-                                               <description>Sort asc</description>
-                                               <include>ButtonCommonValues2</include>
-                                               <alttexturefocus>button-focus2.png</alttexturefocus>
-                                               <alttexturenofocus>button-nofocus.png</alttexturenofocus>
-                                               <label>31051</label>
-                                               <altlabel>31050</altlabel>
-                                               <usealttexture>Container.SortDirection(Ascending)</usealttexture>
-                                       </control>
-                                       <control type="radiobutton" id="99">
-                                               <description>Library button</description>
-                                               <label>$LOCALIZE[29800]</label>
-                                               <onclick>Skin.Reset(MediaSubMenuVisible)</onclick>
-                                               <onclick>ReplaceWindow(MusicFiles)</onclick>
-                                               <selected>Window.IsVisible(MusicLibrary)</selected>
-                                               <include>ButtonCommonValues2</include>
-                                       </control>
-                                       <control type="button" id="8">
-                                               <description>Search</description>
-                                               <include>ButtonCommonValues2</include>
-                                               <label>137</label>
-                                       </control>
-                                       <control type="radiobutton" id="16">
-                                               <description>PartyMode</description>
-                                               <label>589</label>
-                                               <include>ButtonCommonValues2</include>
-                                               <onclick>Skin.Reset(MediaSubMenuVisible)</onclick>
-                                       </control>
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>100</posy>
-                                               <width>298</width>
-                                               <height>10</height>
-                                               <texture>shelf_shadow.png</texture>
-                                       </control>
-                               </control>
-                       </control>
-               </control>
-               <include>ScrollOffsetLabel</include>
-               <include>BehindDialogFadeOut</include>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/MyMusicPlaylist.xml b/addons/skin.touched/4x3Hirez/MyMusicPlaylist.xml
deleted file mode 100644 (file)
index fb93f72..0000000
+++ /dev/null
@@ -1,129 +0,0 @@
-<window id="500">
-       <defaultcontrol always="true">50</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <views>50,500</views>
-       <onunload>Skin.Reset(MediaSubMenuVisible)</onunload>
-       <controls>
-               <include>CommonBackground</include>
-               <include>FileCountCommons</include>
-               <include>HomeButtonCommons</include>
-               <include>CommonNowPlaying</include>
-               <include>OptionsButtonCommons</include>
-               <control type="label">
-                       <description>Window label</description>
-                       <include>MediaWindowTitleCommons</include>
-                       <label>$LOCALIZE[10517]</label>
-               </control>
-               <control type="group">
-                       <include>Window_OpenClose_Animation_Zoom</include>
-                       <include>CommonRootView</include> <!-- view id = 50 -->
-                       <include>ThumbnailView</include> <!-- view id = 500 -->
-               </control>
-               <control type="panel" id="9002">
-                       <visible>!Window.IsActive(PlayerControls)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <include>SubMenuCommonLayout</include>
-                       <content>
-                               <item>
-                                       <label>31200</label>
-                                       <onclick>ParentDir</onclick>
-                                       <icon>icon_back.png</icon>
-                               </item>
-                       </content>
-               </control>
-               <control type="group">
-                       <visible>Skin.HasSetting(MediaSubMenuVisible)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <control type="button">
-                               <description>Hidden button to close the sort when its focused</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>ScreenWidth</width>
-                               <height>ScreenHeight</height>
-                               <texturenofocus>-</texturenofocus>
-                               <texturefocus>-</texturefocus>
-                               <onclick>Skin.Reset(MediaSubMenuVisible)</onclick>
-                       </control>
-                       <control type="group">
-                               <posx>340r</posx>
-                               <posy>130</posy>
-                               <control type="image">
-                                       <description>Shadow Background</description>
-                                       <posx>-30</posx>
-                                       <posy>-30</posy>
-                                       <width>380</width>
-                                       <height>500</height>
-                                       <texture border="30">ShadowBorder.png</texture>
-                               </control>
-                               <control type="button">
-                                       <description>Panel Background image</description>
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>320</width>
-                                       <height>440</height>
-                                       <texturefocus border="5">SubBack.png</texturefocus>
-                                       <texturenofocus border="5">SubBack.png</texturenofocus>
-                                       <onclick>-</onclick>
-                               </control>
-                               <control type="image">
-                                       <description>Panel Forground image</description>
-                                       <posx>10</posx>
-                                       <posy>10</posy>
-                                       <width>300</width>
-                                       <height>420</height>
-                                       <texture border="5">SubBack2.png</texture>
-                               </control>
-                               <control type="image">
-                                       <description>Panel Arrow image</description>
-                                       <posx>270</posx>
-                                       <posy>-34</posy>
-                                       <width>40</width>
-                                       <height>40</height>
-                                       <texture>arrow-big-up.png</texture>
-                               </control>
-                               <control type="grouplist">
-                                       <posx>11</posx>
-                                       <posy>10</posy>
-                                       <width>298</width>
-                                       <height>420</height>
-                                       <onleft>9000</onleft>
-                                       <onright>50</onright>
-                                       <onup>9000</onup>
-                                       <ondown>9000</ondown>
-                                       <itemgap>0</itemgap>
-                                       <control type="radiobutton" id="20">
-                                               <description>Shuffle button</description>
-                                               <include>ButtonCommonValues2</include>
-                                               <label>191</label>
-                                       </control>
-                                       <control type="button" id="26">
-                                               <description>Repeat button</description>
-                                               <textwidth>235</textwidth>
-                                               <include>ButtonCommonValues2</include>
-                                               <label>-</label>
-                                       </control>
-                                       <control type="button" id="21">
-                                               <description>Save button</description>
-                                               <label>190</label>
-                                               <textwidth>235</textwidth>
-                                               <include>ButtonCommonValues2</include>
-                                       </control>
-                                       <control type="button" id="22">
-                                               <description>Clear button</description>
-                                               <label>192</label>
-                                               <textwidth>235</textwidth>
-                                               <include>ButtonCommonValues2</include>
-                                       </control>
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>100</posy>
-                                               <width>298</width>
-                                               <height>10</height>
-                                               <texture>shelf_shadow.png</texture>
-                                       </control>
-                               </control>
-                       </control>
-               </control>
-               <include>BehindDialogFadeOut</include>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/MyMusicPlaylistEditor.xml b/addons/skin.touched/4x3Hirez/MyMusicPlaylistEditor.xml
deleted file mode 100644 (file)
index 1cf29b0..0000000
+++ /dev/null
@@ -1,395 +0,0 @@
-<window id="503">
-       <defaultcontrol allways="true">6</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <onunload>Skin.Reset(MediaSubMenuVisible)</onunload>
-       <controls>
-               <include>CommonBackground</include>
-               <include>HomeButtonCommons</include>
-               <include>CommonNowPlaying</include>
-               <include>OptionsButtonCommons</include>
-               <control type="label">
-                       <description>Window label</description>
-                       <include>MediaWindowTitleCommons</include>
-                       <label>$LOCALIZE[10503]</label>
-               </control>
-               <control type="group">
-                       <posx>40</posx>
-                       <posy>130</posy>
-                       <include>Window_OpenClose_Animation_Zoom</include>
-                       <control type="label">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>590</width>
-                               <height>30</height>
-                               <font>font13_title</font>
-                               <textcolor>white</textcolor>
-                               <scroll>true</scroll>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <label>31058</label>
-                       </control>
-                       <control type="label">
-                               <description>number of files/pages in left list text label</description>
-                               <posx>0</posx>
-                               <posy>710</posy>
-                               <width>590</width>
-                               <font>font13</font>
-                               <align>left</align>
-                               <scroll>true</scroll>
-                               <textcolor>grey2</textcolor>
-                               <shadowcolor>black</shadowcolor>
-                               <label>($INFO[Container(50).NumItems]) $LOCALIZE[31025] - $LOCALIZE[31024] ($INFO[Container(50).CurrentPage]/$INFO[Container(50).NumPages])</label>
-                       </control>
-                       <control type="panel" id="50">
-                               <posx>0</posx>
-                               <posy>40</posy>
-                               <width>590</width>
-                               <height>660</height>
-                               <onleft>100</onleft>
-                               <onright>100</onright>
-                               <onup>50</onup>
-                               <ondown>50</ondown>
-                               <viewtype label="">list</viewtype>
-                               <pagecontrol>30</pagecontrol>
-                               <scrolltime>200</scrolltime>
-                               <itemlayout height="60" width="590">
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>590</width>
-                                               <height>60</height>
-                                               <texture border="5">ListNF.png</texture>
-                                       </control>
-                                       <control type="image">
-                                               <posx>10</posx>
-                                               <posy>5</posy>
-                                               <width>50</width>
-                                               <height>50</height>
-                                               <texture background="true">$INFO[ListItem.Icon]</texture>
-                                       </control>
-                                       <control type="label">
-                                               <posx>75</posx>
-                                               <posy>0</posy>
-                                               <width>410</width>
-                                               <height>60</height>
-                                               <font>font13</font>
-                                               <textcolor>white</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <label>$INFO[ListItem.Label]</label>
-                                       </control>
-                                       <control type="label">
-                                               <posx>580</posx>
-                                               <posy>2</posy>
-                                               <width>400</width>
-                                               <height>30</height>
-                                               <font>font13</font>
-                                               <textcolor>grey2</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <align>right</align>
-                                               <aligny>center</aligny>
-                                               <label>$INFO[ListItem.Label2]</label>
-                                       </control>
-                                       <control type="image">
-                                               <description>Rating value</description>
-                                               <posx>480</posx>
-                                               <posy>30</posy>
-                                               <width>100</width>
-                                               <height>25</height>
-                                               <aspectratio align="left">keep</aspectratio>
-                                               <texture fallback="light/left_rating/rating0.png">$INFO[ListItem.StarRating,light/left_rating/]</texture>
-                                       </control>
-                               </itemlayout>
-                               <focusedlayout height="60" width="590">
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>590</width>
-                                               <height>60</height>
-                                               <texture border="5">ListFO.png</texture>
-                                               <include>VisibleFadeEffect</include>
-                                       </control>
-                                       <control type="image">
-                                               <posx>10</posx>
-                                               <posy>5</posy>
-                                               <width>50</width>
-                                               <height>50</height>
-                                               <texture background="true">$INFO[ListItem.Icon]</texture>
-                                       </control>
-                                       <control type="label">
-                                               <posx>75</posx>
-                                               <posy>0</posy>
-                                               <width>410</width>
-                                               <height>60</height>
-                                               <font>font13</font>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <label>$INFO[ListItem.Label]</label>
-                                       </control>
-                                       <control type="label">
-                                               <posx>580</posx>
-                                               <posy>2</posy>
-                                               <width>400</width>
-                                               <height>30</height>
-                                               <font>font13</font>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <align>right</align>
-                                               <aligny>center</aligny>
-                                               <label>$INFO[ListItem.Label2]</label>
-                                       </control>
-                                       <control type="image">
-                                               <description>Rating value</description>
-                                               <posx>480</posx>
-                                               <posy>30</posy>
-                                               <width>100</width>
-                                               <height>25</height>
-                                               <aspectratio align="left">keep</aspectratio>
-                                               <texture fallback="dark/left_rating/rating0.png">$INFO[ListItem.StarRating,dark/left_rating/]</texture>
-                                       </control>
-                               </focusedlayout>
-                       </control>
-               </control>
-               <control type="group">
-                       <include>Window_OpenClose_Animation_Zoom</include>
-                       <posx>650</posx>
-                       <posy>130</posy>
-                       <control type="label">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>590</width>
-                               <height>30</height>
-                               <font>font13_title</font>
-                               <textcolor>white</textcolor>
-                               <scroll>true</scroll>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <label>31059</label>
-                       </control>
-                       <control type="label">
-                               <description>Page Count Label</description>
-                               <posx>590</posx>
-                               <posy>710</posy>
-                               <width>590</width>
-                               <font>font13</font>
-                               <align>right</align>
-                               <scroll>true</scroll>
-                               <textcolor>grey2</textcolor>
-                               <shadowcolor>black</shadowcolor>
-                               <label>($INFO[Container(100).NumItems]) $LOCALIZE[31025] - $LOCALIZE[31024] ($INFO[Container(100).CurrentPage]/$INFO[Container(100).NumPages])</label>
-                       </control>
-                       <control type="panel" id="100">
-                               <posx>0</posx>
-                               <posy>40</posy>
-                               <width>590</width>
-                               <height>660</height>
-                               <onleft>50</onleft>
-                               <onright>50</onright>
-                               <onup>100</onup>
-                               <ondown>100</ondown>
-                               <viewtype label="">list</viewtype>
-                               <pagecontrol>30</pagecontrol>
-                               <scrolltime>200</scrolltime>
-                               <itemlayout height="60" width="590">
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>590</width>
-                                               <height>60</height>
-                                               <texture border="5">ListNF.png</texture>
-                                       </control>
-                                       <control type="image">
-                                               <posx>10</posx>
-                                               <posy>5</posy>
-                                               <width>50</width>
-                                               <height>50</height>
-                                               <texture background="true">$INFO[ListItem.Icon]</texture>
-                                       </control>
-                                       <control type="label">
-                                               <posx>75</posx>
-                                               <posy>0</posy>
-                                               <width>410</width>
-                                               <height>60</height>
-                                               <font>font13</font>
-                                               <textcolor>white</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <label>$INFO[ListItem.Label]</label>
-                                       </control>
-                                       <control type="label">
-                                               <posx>580</posx>
-                                               <posy>2</posy>
-                                               <width>400</width>
-                                               <height>30</height>
-                                               <font>font13</font>
-                                               <textcolor>grey2</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <align>right</align>
-                                               <aligny>center</aligny>
-                                               <label>$INFO[ListItem.Label2]</label>
-                                       </control>
-                                       <control type="image">
-                                               <description>Rating value</description>
-                                               <posx>480</posx>
-                                               <posy>30</posy>
-                                               <width>100</width>
-                                               <height>25</height>
-                                               <aspectratio align="left">keep</aspectratio>
-                                               <texture fallback="light/left_rating/rating0.png">$INFO[ListItem.StarRating,light/left_rating/]</texture>
-                                       </control>
-                               </itemlayout>
-                               <focusedlayout height="60" width="590">
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>590</width>
-                                               <height>60</height>
-                                               <texture border="5">ListFO.png</texture>
-                                               <include>VisibleFadeEffect</include>
-                                       </control>
-                                       <control type="image">
-                                               <posx>10</posx>
-                                               <posy>5</posy>
-                                               <width>50</width>
-                                               <height>50</height>
-                                               <texture background="true">$INFO[ListItem.Icon]</texture>
-                                       </control>
-                                       <control type="label">
-                                               <posx>75</posx>
-                                               <posy>0</posy>
-                                               <width>410</width>
-                                               <height>60</height>
-                                               <font>font13</font>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <label>$INFO[ListItem.Label]</label>
-                                       </control>
-                                       <control type="label">
-                                               <posx>580</posx>
-                                               <posy>2</posy>
-                                               <width>400</width>
-                                               <height>30</height>
-                                               <font>font13</font>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <align>right</align>
-                                               <aligny>center</aligny>
-                                               <label>$INFO[ListItem.Label2]</label>
-                                       </control>
-                                       <control type="image">
-                                               <description>Rating value</description>
-                                               <posx>480</posx>
-                                               <posy>30</posy>
-                                               <width>100</width>
-                                               <height>25</height>
-                                               <aspectratio align="left">keep</aspectratio>
-                                               <texture fallback="dark/left_rating/rating0.png">$INFO[ListItem.StarRating,dark/left_rating/]</texture>
-                                       </control>
-                               </focusedlayout>
-                       </control>
-               </control>
-               <control type="panel" id="9002">
-                       <visible>!Window.IsActive(PlayerControls)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <include>SubMenuCommonLayout</include>
-                       <content>
-                               <item>
-                                       <label>31200</label>
-                                       <onclick>ParentDir</onclick>
-                                       <icon>icon_back.png</icon>
-                               </item>
-                       </content>
-               </control>
-               <control type="group">
-                       <visible>Skin.HasSetting(MediaSubMenuVisible)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <control type="button">
-                               <description>Hidden button to close the sort when its focused</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>ScreenWidth</width>
-                               <height>ScreenHeight</height>
-                               <texturenofocus>-</texturenofocus>
-                               <texturefocus>-</texturefocus>
-                               <onclick>Skin.Reset(MediaSubMenuVisible)</onclick>
-                       </control>
-                       <control type="group">
-                               <posx>340r</posx>
-                               <posy>130</posy>
-                               <control type="image">
-                                       <description>Shadow Background</description>
-                                       <posx>-30</posx>
-                                       <posy>-30</posy>
-                                       <width>380</width>
-                                       <height>500</height>
-                                       <texture border="30">ShadowBorder.png</texture>
-                               </control>
-                               <control type="button">
-                                       <description>Panel Background image</description>
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>320</width>
-                                       <height>440</height>
-                                       <texturefocus border="5">SubBack.png</texturefocus>
-                                       <texturenofocus border="5">SubBack.png</texturenofocus>
-                                       <onclick>-</onclick>
-                               </control>
-                               <control type="image">
-                                       <description>Panel Forground image</description>
-                                       <posx>10</posx>
-                                       <posy>10</posy>
-                                       <width>300</width>
-                                       <height>420</height>
-                                       <texture border="5">SubBack2.png</texture>
-                               </control>
-                               <control type="image">
-                                       <description>Panel Arrow image</description>
-                                       <posx>270</posx>
-                                       <posy>-34</posy>
-                                       <width>40</width>
-                                       <height>40</height>
-                                       <texture>arrow-big-up.png</texture>
-                               </control>
-                               <control type="grouplist">
-                                       <posx>11</posx>
-                                       <posy>10</posy>
-                                       <width>298</width>
-                                       <height>420</height>
-                                       <onleft>9000</onleft>
-                                       <onright>50</onright>
-                                       <onup>9000</onup>
-                                       <ondown>9000</ondown>
-                                       <itemgap>0</itemgap>
-                                       <control type="button" id="6">
-                                               <label>31055</label>
-                                               <include>ButtonCommonValues2</include>
-                                       </control>
-                                       <control type="button" id="7">
-                                               <description>Save Button</description>
-                                               <label>31056</label>
-                                               <include>ButtonCommonValues2</include>
-                                               <onleft>50</onleft>
-                                       </control>
-                                       <control type="button" id="8">
-                                               <description>Clear button</description>
-                                               <label>31057</label>
-                                               <include>ButtonCommonValues2</include>
-                                       </control>
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>100</posy>
-                                               <width>298</width>
-                                               <height>10</height>
-                                               <texture>shelf_shadow.png</texture>
-                                       </control>
-                               </control>
-                       </control>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/MyMusicSongs.xml b/addons/skin.touched/4x3Hirez/MyMusicSongs.xml
deleted file mode 100644 (file)
index 8ee3a06..0000000
+++ /dev/null
@@ -1,119 +0,0 @@
-<window id="501">
-       <defaultcontrol always="true">50</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <views>50,500</views>
-       <onunload>Skin.Reset(MediaSubMenuVisible)</onunload>
-       <controls>
-               <include>CommonBackground</include>
-               <include>FileCountCommons</include>
-               <include>HomeButtonCommons</include>
-               <include>CommonNowPlaying</include>
-               <include>OptionsButtonCommons</include>
-               <control type="label">
-                       <description>Window label</description>
-                       <include>MediaWindowTitleCommons</include>
-                       <label>$LOCALIZE[31012]</label>
-               </control>
-               <control type="group">
-                       <include>Window_OpenClose_Animation_Zoom</include>
-                       <include>CommonRootView</include> <!-- view id = 50 -->
-                       <include>ThumbnailView</include> <!-- view id = 500 -->
-                       <include>ScrollArrowsCommons</include>
-               </control>
-               <include>MediaSubMenu</include>
-               <control type="group">
-                       <visible>Skin.HasSetting(MediaSubMenuVisible)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <control type="button">
-                               <description>Hidden button to close the sort when its focused</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>ScreenWidth</width>
-                               <height>ScreenHeight</height>
-                               <texturenofocus>-</texturenofocus>
-                               <texturefocus>-</texturefocus>
-                               <onclick>Skin.Reset(MediaSubMenuVisible)</onclick>
-                       </control>
-                       <control type="group">
-                               <posx>340r</posx>
-                               <posy>130</posy>
-                               <control type="image">
-                                       <description>Shadow Background</description>
-                                       <posx>-30</posx>
-                                       <posy>-30</posy>
-                                       <width>380</width>
-                                       <height>500</height>
-                                       <texture border="30">ShadowBorder.png</texture>
-                               </control>
-                               <control type="button">
-                                       <description>Panel Background image</description>
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>320</width>
-                                       <height>440</height>
-                                       <texturefocus border="5">SubBack.png</texturefocus>
-                                       <texturenofocus border="5">SubBack.png</texturenofocus>
-                                       <onclick>-</onclick>
-                               </control>
-                               <control type="image">
-                                       <description>Panel Forground image</description>
-                                       <posx>10</posx>
-                                       <posy>10</posy>
-                                       <width>300</width>
-                                       <height>420</height>
-                                       <texture border="5">SubBack2.png</texture>
-                               </control>
-                               <control type="image">
-                                       <description>Panel Arrow image</description>
-                                       <posx>270</posx>
-                                       <posy>-34</posy>
-                                       <width>40</width>
-                                       <height>40</height>
-                                       <texture>arrow-big-up.png</texture>
-                               </control>
-                               <control type="grouplist">
-                                       <posx>11</posx>
-                                       <posy>10</posy>
-                                       <width>298</width>
-                                       <height>420</height>
-                                       <onleft>9000</onleft>
-                                       <onright>50</onright>
-                                       <onup>9000</onup>
-                                       <ondown>9000</ondown>
-                                       <itemgap>0</itemgap>
-                                       <control type="button" id="3">
-                                               <description>Sort by button</description>
-                                               <include>ButtonCommonValues2</include>
-                                               <label>103</label>
-                                       </control>
-                                       <control type="togglebutton" id="4">
-                                               <description>Sort asc</description>
-                                               <include>ButtonCommonValues2</include>
-                                               <alttexturefocus>button-focus2.png</alttexturefocus>
-                                               <alttexturenofocus>button-nofocus.png</alttexturenofocus>
-                                               <label>31051</label>
-                                               <altlabel>31050</altlabel>
-                                               <usealttexture>Container.SortDirection(Ascending)</usealttexture>
-                                       </control>
-                                       <control type="radiobutton" id="99">
-                                               <description>Library button</description>
-                                               <label>$LOCALIZE[29800]</label>
-                                               <onclick>Skin.Reset(MediaSubMenuVisible)</onclick>
-                                               <onclick>ReplaceWindow(MusicLibrary)</onclick>
-                                               <selected>Window.IsVisible(MusicLibrary)</selected>
-                                               <include>ButtonCommonValues2</include>
-                                       </control>
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>100</posy>
-                                               <width>298</width>
-                                               <height>10</height>
-                                               <texture>shelf_shadow.png</texture>
-                                       </control>
-                               </control>
-                       </control>
-               </control>
-               <include>ScrollOffsetLabel</include>
-               <include>BehindDialogFadeOut</include>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/MyPics.xml b/addons/skin.touched/4x3Hirez/MyPics.xml
deleted file mode 100644 (file)
index 2a97fd9..0000000
+++ /dev/null
@@ -1,130 +0,0 @@
-<window id="2">
-       <defaultcontrol always="true">50</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <views>50,500</views>
-       <onunload>Skin.Reset(MediaSubMenuVisible)</onunload>
-       <controls>
-               <include>CommonBackground</include>
-               <include>FileCountCommons</include>
-               <include>HomeButtonCommons</include>
-               <include>CommonNowPlaying</include>
-               <include>OptionsButtonCommons</include>
-               <control type="label">
-                       <description>Window label</description>
-                       <include>MediaWindowTitleCommons</include>
-                       <label>$LOCALIZE[1]</label>
-               </control>
-               <control type="group">
-                       <include>Window_OpenClose_Animation_Zoom</include>
-                       <include>CommonRootView</include> <!-- view id = 50 -->
-                       <include>ThumbnailView</include> <!-- view id = 500 -->
-                       <include>ScrollArrowsCommons</include>
-               </control>
-               <include>MediaSubMenu</include>
-               <control type="group">
-                       <visible>Skin.HasSetting(MediaSubMenuVisible)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <control type="button">
-                               <description>Hidden button to close the sort when its focused</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>ScreenWidth</width>
-                               <height>ScreenHeight</height>
-                               <texturenofocus>-</texturenofocus>
-                               <texturefocus>-</texturefocus>
-                               <onclick>Skin.Reset(MediaSubMenuVisible)</onclick>
-                       </control>
-                       <control type="group">
-                               <posx>340r</posx>
-                               <posy>130</posy>
-                               <control type="image">
-                                       <description>Shadow Background</description>
-                                       <posx>-30</posx>
-                                       <posy>-30</posy>
-                                       <width>380</width>
-                                       <height>500</height>
-                                       <texture border="30">ShadowBorder.png</texture>
-                               </control>
-                               <control type="button">
-                                       <description>Panel Background image</description>
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>320</width>
-                                       <height>440</height>
-                                       <texturefocus border="5">SubBack.png</texturefocus>
-                                       <texturenofocus border="5">SubBack.png</texturenofocus>
-                                       <onclick>-</onclick>
-                               </control>
-                               <control type="image">
-                                       <description>Panel Forground image</description>
-                                       <posx>10</posx>
-                                       <posy>10</posy>
-                                       <width>300</width>
-                                       <height>420</height>
-                                       <texture border="5">SubBack2.png</texture>
-                               </control>
-                               <control type="image">
-                                       <description>Panel Arrow image</description>
-                                       <posx>270</posx>
-                                       <posy>-34</posy>
-                                       <width>40</width>
-                                       <height>40</height>
-                                       <texture>arrow-big-up.png</texture>
-                               </control>
-                               <control type="grouplist">
-                                       <posx>11</posx>
-                                       <posy>10</posy>
-                                       <width>298</width>
-                                       <height>420</height>
-                                       <onleft>9000</onleft>
-                                       <onright>50</onright>
-                                       <onup>9000</onup>
-                                       <ondown>9000</ondown>
-                                       <itemgap>0</itemgap>
-                                       <control type="button" id="3">
-                                               <description>Sort by button</description>
-                                               <include>ButtonCommonValues2</include>
-                                               <label>103</label>
-                                       </control>
-                                       <control type="togglebutton" id="4">
-                                               <description>Sort asc</description>
-                                               <include>ButtonCommonValues2</include>
-                                               <alttexturefocus>button-focus2.png</alttexturefocus>
-                                               <alttexturenofocus>button-nofocus.png</alttexturenofocus>
-                                               <label>31051</label>
-                                               <altlabel>31050</altlabel>
-                                               <usealttexture>Container.SortDirection(Ascending)</usealttexture>
-                                       </control>
-                                       <control type="button" id="6">
-                                               <description>Slideshow</description>
-                                               <textwidth>235</textwidth>
-                                               <include>ButtonCommonValues2</include>
-                                               <label>108</label>
-                                               <onclick>Skin.Reset(MediaSubMenuVisible)</onclick>
-                                       </control>
-                                       <control type="button" id="7">
-                                               <description>Recersive Slideshow</description>
-                                               <textwidth>235</textwidth>
-                                               <include>ButtonCommonValues2</include>
-                                               <label>361</label>
-                                               <onclick>Skin.Reset(MediaSubMenuVisible)</onclick>
-                                       </control>
-                                       <control type="radiobutton" id="9">
-                                               <description>Randomize Toggle</description>
-                                               <include>ButtonCommonValues2</include>
-                                               <label>13319</label>
-                                       </control>
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>100</posy>
-                                               <width>298</width>
-                                               <height>10</height>
-                                               <texture>shelf_shadow.png</texture>
-                                       </control>
-                               </control>
-                       </control>
-               </control>
-               <include>ScrollOffsetLabel</include>
-               <include>BehindDialogFadeOut</include>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/MyPrograms.xml b/addons/skin.touched/4x3Hirez/MyPrograms.xml
deleted file mode 100644 (file)
index c8a87cb..0000000
+++ /dev/null
@@ -1,111 +0,0 @@
-<window id="1">
-       <defaultcontrol always="true">50</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <views>50,500</views>
-       <onunload>Skin.Reset(MediaSubMenuVisible)</onunload>
-       <controls>
-               <include>CommonBackground</include>
-               <include>FileCountCommons</include>
-               <include>HomeButtonCommons</include>
-               <include>CommonNowPlaying</include>
-               <include>OptionsButtonCommons</include>
-               <control type="label">
-                       <description>Window label</description>
-                       <include>MediaWindowTitleCommons</include>
-                       <label>$LOCALIZE[0]</label>
-               </control>
-               <control type="group">
-                       <include>Window_OpenClose_Animation_Zoom</include>
-                       <include>CommonRootView</include> <!-- view id = 50 -->
-                       <include>ThumbnailView</include> <!-- view id = 500 -->
-                       <include>ScrollArrowsCommons</include>
-               </control>
-               <include>MediaSubMenu</include>
-               <control type="group">
-                       <visible>Skin.HasSetting(MediaSubMenuVisible)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <control type="button">
-                               <description>Hidden button to close the sort when its focused</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>ScreenWidth</width>
-                               <height>ScreenHeight</height>
-                               <texturenofocus>-</texturenofocus>
-                               <texturefocus>-</texturefocus>
-                               <onclick>Skin.Reset(MediaSubMenuVisible)</onclick>
-                       </control>
-                       <control type="group">
-                               <posx>340r</posx>
-                               <posy>130</posy>
-                               <control type="image">
-                                       <description>Shadow Background</description>
-                                       <posx>-30</posx>
-                                       <posy>-30</posy>
-                                       <width>380</width>
-                                       <height>500</height>
-                                       <texture border="30">ShadowBorder.png</texture>
-                               </control>
-                               <control type="button">
-                                       <description>Panel Background image</description>
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>320</width>
-                                       <height>440</height>
-                                       <texturefocus border="5">SubBack.png</texturefocus>
-                                       <texturenofocus border="5">SubBack.png</texturenofocus>
-                                       <onclick>-</onclick>
-                               </control>
-                               <control type="image">
-                                       <description>Panel Forground image</description>
-                                       <posx>10</posx>
-                                       <posy>10</posy>
-                                       <width>300</width>
-                                       <height>420</height>
-                                       <texture border="5">SubBack2.png</texture>
-                               </control>
-                               <control type="image">
-                                       <description>Panel Arrow image</description>
-                                       <posx>270</posx>
-                                       <posy>-34</posy>
-                                       <width>40</width>
-                                       <height>40</height>
-                                       <texture>arrow-big-up.png</texture>
-                               </control>
-                               <control type="grouplist">
-                                       <posx>11</posx>
-                                       <posy>10</posy>
-                                       <width>298</width>
-                                       <height>420</height>
-                                       <onleft>9000</onleft>
-                                       <onright>50</onright>
-                                       <onup>9000</onup>
-                                       <ondown>9000</ondown>
-                                       <itemgap>0</itemgap>
-                                       <control type="button" id="3">
-                                               <description>Sort by button</description>
-                                               <include>ButtonCommonValues2</include>
-                                               <label>103</label>
-                                       </control>
-                                       <control type="togglebutton" id="4">
-                                               <description>Sort asc</description>
-                                               <include>ButtonCommonValues2</include>
-                                               <alttexturefocus>button-focus2.png</alttexturefocus>
-                                               <alttexturenofocus>button-nofocus.png</alttexturenofocus>
-                                               <label>31051</label>
-                                               <altlabel>31050</altlabel>
-                                               <usealttexture>Container.SortDirection(Ascending)</usealttexture>
-                                       </control>
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>100</posy>
-                                               <width>298</width>
-                                               <height>10</height>
-                                               <texture>shelf_shadow.png</texture>
-                                       </control>
-                               </control>
-                       </control>
-               </control>
-               <include>ScrollOffsetLabel</include>
-               <include>BehindDialogFadeOut</include>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/MyVideoNav.xml b/addons/skin.touched/4x3Hirez/MyVideoNav.xml
deleted file mode 100644 (file)
index 05f86f3..0000000
+++ /dev/null
@@ -1,153 +0,0 @@
-<window id="25">
-       <defaultcontrol always="true">50</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <views>50,550,500,502,552</views>
-       <onunload>Skin.Reset(MediaSubMenuVisible)</onunload>
-       <controls>
-               <include>CommonBackground</include>
-               <include>FileCountCommons</include>
-               <include>HomeButtonCommons</include>
-               <include>CommonNowPlaying</include>
-               <include>OptionsButtonCommons</include>
-               <control type="label">
-                       <description>Window label</description>
-                       <include>MediaWindowTitleCommons</include>
-                       <label>$LOCALIZE[3]</label>
-               </control>
-               <control type="group">
-                       <include>Window_OpenClose_Animation_Zoom</include>
-                       <include>CommonRootViewVideo</include> <!-- view id = 50 -->
-                       <include>ThumbnailView</include> <!-- view id = 500 -->
-                       <include>WideIconView</include> <!-- view id = 502 -->
-                       <include>RootViewMetaDataVideo</include> <!-- view id = 550 -->
-                       <include>WideIconMetaDataView</include> <!-- view id = 552 -->
-                       <include>ScrollArrowsCommons</include>
-               </control>
-               <include>MediaSubMenu</include>
-               <control type="group">
-                       <visible>Skin.HasSetting(MediaSubMenuVisible)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <control type="button">
-                               <description>Hidden button to close the sort when its focused</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>ScreenWidth</width>
-                               <height>ScreenHeight</height>
-                               <texturenofocus>-</texturenofocus>
-                               <texturefocus>-</texturefocus>
-                               <onclick>Skin.Reset(MediaSubMenuVisible)</onclick>
-                       </control>
-                       <control type="group">
-                               <posx>340r</posx>
-                               <posy>130</posy>
-                               <control type="image">
-                                       <description>Shadow Background</description>
-                                       <posx>-30</posx>
-                                       <posy>-30</posy>
-                                       <width>380</width>
-                                       <height>500</height>
-                                       <texture border="30">ShadowBorder.png</texture>
-                               </control>
-                               <control type="button">
-                                       <description>Panel Background image</description>
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>320</width>
-                                       <height>440</height>
-                                       <texturefocus border="5">SubBack.png</texturefocus>
-                                       <texturenofocus border="5">SubBack.png</texturenofocus>
-                                       <onclick>-</onclick>
-                               </control>
-                               <control type="image">
-                                       <description>Panel Forground image</description>
-                                       <posx>10</posx>
-                                       <posy>10</posy>
-                                       <width>300</width>
-                                       <height>420</height>
-                                       <texture border="5">SubBack2.png</texture>
-                               </control>
-                               <control type="image">
-                                       <description>Panel Arrow image</description>
-                                       <posx>270</posx>
-                                       <posy>-34</posy>
-                                       <width>40</width>
-                                       <height>40</height>
-                                       <texture>arrow-big-up.png</texture>
-                               </control>
-                               <control type="grouplist">
-                                       <posx>11</posx>
-                                       <posy>10</posy>
-                                       <width>298</width>
-                                       <height>420</height>
-                                       <onleft>9000</onleft>
-                                       <onright>50</onright>
-                                       <onup>9000</onup>
-                                       <ondown>9000</ondown>
-                                       <itemgap>0</itemgap>
-                                       <control type="button" id="3">
-                                               <description>Sort by button</description>
-                                               <include>ButtonCommonValues2</include>
-                                               <label>103</label>
-                                       </control>
-                                       <control type="togglebutton" id="4">
-                                               <description>Sort asc</description>
-                                               <include>ButtonCommonValues2</include>
-                                               <alttexturefocus>button-focus2.png</alttexturefocus>
-                                               <alttexturenofocus>button-nofocus.png</alttexturenofocus>
-                                               <label>31051</label>
-                                               <altlabel>31050</altlabel>
-                                               <usealttexture>Container.SortDirection(Ascending)</usealttexture>
-                                       </control>
-                                       <control type="radiobutton" id="14">
-                                               <description>Watched Toggle</description>
-                                               <textwidth>170</textwidth>
-                                               <include>ButtonCommonValues2</include>
-                                               <label>20367</label>
-                                       </control>
-                                       <control type="button" id="8">
-                                               <description>Search</description>
-                                               <include>ButtonCommonValues2</include>
-                                               <label>137</label>
-                                               <visible>false</visible>
-                                       </control>
-                                       <control type="radiobutton" id="7">
-                                               <description>Stack Toggle</description>
-                                               <textwidth>170</textwidth>
-                                               <include>ButtonCommonValues2</include>
-                                               <label>346</label>
-                                       </control>
-                                       <control type="radiobutton" id="17">
-                                               <description>Flatten</description>
-                                               <textwidth>170</textwidth>
-                                               <include>ButtonCommonValues2</include>
-                                               <label>20411</label>
-                                       </control>
-                                       <control type="radiobutton" id="16">
-                                               <description>PartyMode</description>
-                                               <label>589</label>
-                                               <include>ButtonCommonValues2</include>
-                                               <visible>Library.HasContent(MusicVideos)</visible>
-                                       </control>
-                                       <control type="radiobutton" id="11">
-                                               <description>Unlock Shares</description>
-                                               <textwidth>170</textwidth>
-                                               <include>ButtonCommonValues2</include>
-                                               <label>20336</label>
-                                               <onclick>xbmc.mastermode</onclick>
-                                               <selected>system.ismaster</selected>
-                                               <visible>false</visible>
-                                       </control>
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>100</posy>
-                                               <width>298</width>
-                                               <height>10</height>
-                                               <texture>shelf_shadow.png</texture>
-                                       </control>
-                               </control>
-                       </control>
-               </control>
-               <include>ScrollOffsetLabel</include>
-               <include>BehindDialogFadeOut</include>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/MyVideoPlaylist.xml b/addons/skin.touched/4x3Hirez/MyVideoPlaylist.xml
deleted file mode 100644 (file)
index 8008bd6..0000000
+++ /dev/null
@@ -1,129 +0,0 @@
-<window id="500">
-       <defaultcontrol always="true">50</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <views>50,500</views>
-       <onunload>Skin.Reset(MediaSubMenuVisible)</onunload>
-       <controls>
-               <include>CommonBackground</include>
-               <include>FileCountCommons</include>
-               <include>HomeButtonCommons</include>
-               <include>CommonNowPlaying</include>
-               <include>OptionsButtonCommons</include>
-               <control type="label">
-                       <description>Window label</description>
-                       <include>MediaWindowTitleCommons</include>
-                       <label>$LOCALIZE[10522]</label>
-               </control>
-               <control type="group">
-                       <include>Window_OpenClose_Animation_Zoom</include>
-                       <include>CommonRootView</include> <!-- view id = 50 -->
-                       <include>ThumbnailView</include> <!-- view id = 500 -->
-               </control>
-               <control type="panel" id="9002">
-                       <visible>!Window.IsActive(PlayerControls)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <include>SubMenuCommonLayout</include>
-                       <content>
-                               <item>
-                                       <label>31200</label>
-                                       <onclick>ParentDir</onclick>
-                                       <icon>icon_back.png</icon>
-                               </item>
-                       </content>
-               </control>
-               <control type="group">
-                       <visible>Skin.HasSetting(MediaSubMenuVisible)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <control type="button">
-                               <description>Hidden button to close the sort when its focused</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>ScreenWidth</width>
-                               <height>ScreenHeight</height>
-                               <texturenofocus>-</texturenofocus>
-                               <texturefocus>-</texturefocus>
-                               <onclick>Skin.Reset(MediaSubMenuVisible)</onclick>
-                       </control>
-                       <control type="group">
-                               <posx>340r</posx>
-                               <posy>130</posy>
-                               <control type="image">
-                                       <description>Shadow Background</description>
-                                       <posx>-30</posx>
-                                       <posy>-30</posy>
-                                       <width>380</width>
-                                       <height>500</height>
-                                       <texture border="30">ShadowBorder.png</texture>
-                               </control>
-                               <control type="button">
-                                       <description>Panel Background image</description>
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>320</width>
-                                       <height>440</height>
-                                       <texturefocus border="5">SubBack.png</texturefocus>
-                                       <texturenofocus border="5">SubBack.png</texturenofocus>
-                                       <onclick>-</onclick>
-                               </control>
-                               <control type="image">
-                                       <description>Panel Forground image</description>
-                                       <posx>10</posx>
-                                       <posy>10</posy>
-                                       <width>300</width>
-                                       <height>420</height>
-                                       <texture border="5">SubBack2.png</texture>
-                               </control>
-                               <control type="image">
-                                       <description>Panel Arrow image</description>
-                                       <posx>270</posx>
-                                       <posy>-34</posy>
-                                       <width>40</width>
-                                       <height>40</height>
-                                       <texture>arrow-big-up.png</texture>
-                               </control>
-                               <control type="grouplist">
-                                       <posx>11</posx>
-                                       <posy>10</posy>
-                                       <width>298</width>
-                                       <height>420</height>
-                                       <onleft>9000</onleft>
-                                       <onright>50</onright>
-                                       <onup>9000</onup>
-                                       <ondown>9000</ondown>
-                                       <itemgap>0</itemgap>
-                                       <control type="radiobutton" id="20">
-                                               <description>Shuffle button</description>
-                                               <include>ButtonCommonValues2</include>
-                                               <label>191</label>
-                                       </control>
-                                       <control type="button" id="26">
-                                               <description>Repeat button</description>
-                                               <textwidth>235</textwidth>
-                                               <include>ButtonCommonValues2</include>
-                                               <label>-</label>
-                                       </control>
-                                       <control type="button" id="21">
-                                               <description>Save button</description>
-                                               <label>190</label>
-                                               <textwidth>235</textwidth>
-                                               <include>ButtonCommonValues2</include>
-                                       </control>
-                                       <control type="button" id="22">
-                                               <description>Clear button</description>
-                                               <label>192</label>
-                                               <textwidth>235</textwidth>
-                                               <include>ButtonCommonValues2</include>
-                                       </control>
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>100</posy>
-                                               <width>298</width>
-                                               <height>10</height>
-                                               <texture>shelf_shadow.png</texture>
-                                       </control>
-                               </control>
-                       </control>
-               </control>
-               <include>BehindDialogFadeOut</include>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/MyWeather.xml b/addons/skin.touched/4x3Hirez/MyWeather.xml
deleted file mode 100644 (file)
index dfba728..0000000
+++ /dev/null
@@ -1,723 +0,0 @@
-<window id="2600">
-       <defaultcontrol always="true">50</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <controls>
-               <include>CommonBackground</include>
-               <include>HomeButtonCommons</include>
-               <include>CommonNowPlaying</include>
-               <include>OptionsButtonCommons</include>
-               <control type="label">
-                       <description>Window label</description>
-                       <include>MediaWindowTitleCommons</include>
-                       <label>$LOCALIZE[8]</label>
-               </control>
-               <control type="button">
-                       <description>Options Button</description>
-                       <posx>64r</posx>
-                       <posy>25</posy>
-                       <width>64</width>
-                       <height>64</height>
-                       <texturenofocus>icon_system.png</texturenofocus>
-                       <texturefocus>icon_system.png</texturefocus>
-                       <onclick>ActivateWindow(MyWeatherSettings)</onclick>
-               </control>
-               <control type="group">
-                       <include>Window_OpenClose_Animation_Zoom</include>
-                       <control type="image">
-                               <description>Shadow Background</description>
-                               <posx>50</posx>
-                               <posy>140</posy>
-                               <width>1180</width>
-                               <height>680</height>
-                               <texture border="30">ShadowBorder.png</texture>
-                               <include>Window_OpenClose_Animation_Zoom</include>
-                       </control>
-                       <control type="group">
-                               <posx>80</posx>
-                               <posy>170</posy>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>500</width>
-                                       <height>620</height>
-                                       <texture border="5">SubBack.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>20</posx>
-                                       <posy>0</posy>
-                                       <width>460</width>
-                                       <height>90</height>
-                                       <aspectratio>stretch</aspectratio>
-                                       <texture>GlassTitleBar.png</texture>
-                               </control>
-                               <control type="label">
-                                       <description>header label</description>
-                                       <posx>20</posx>
-                                       <posy>10</posy>
-                                       <width>460</width>
-                                       <height>30</height>
-                                       <font>font13_title</font>
-                                       <label>31300</label>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>white</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                               </control>
-                               <control type="label">
-                                       <description>weather location label</description>
-                                       <posx>20</posx>
-                                       <posy>60</posy>
-                                       <width>460</width>
-                                       <height>30</height>
-                                       <font>font13_title</font>
-                                       <textcolor>white</textcolor>
-                                       <scroll>false</scroll>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[Weather.Location]</label>
-                               </control>
-                               <control type="label">
-                                       <description>update label</description>
-                                       <posx>20</posx>
-                                       <posy>80</posy>
-                                       <width>460</width>
-                                       <height>35</height>
-                                       <font>font12</font>
-                                       <label>$LOCALIZE[31301] - $INFO[Window.Property(Updated)]</label>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>grey2</textcolor>
-                               </control>
-                               <control type="label">
-                                       <description>current temp Value</description>
-                                       <posx>195</posx>
-                                       <posy>175</posy>
-                                       <width>180</width>
-                                       <height>40</height>
-                                       <font>WeatherTemp</font>
-                                       <align>right</align>
-                                       <aligny>top</aligny>
-                                       <label>$INFO[Window.Property(Current.Temperature)]</label>
-                                       <textcolor>white</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                               </control>
-                               <control type="label">
-                                       <description>current temp Value Units</description>
-                                       <posx>190</posx>
-                                       <posy>185</posy>
-                                       <width>100</width>
-                                       <height>40</height>
-                                       <font>font16caps</font>
-                                       <align>left</align>
-                                       <aligny>top</aligny>
-                                       <label>$INFO[System.TemperatureUnits]</label>
-                                       <textcolor>white</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                               </control>
-                               <control type="image">
-                                       <description>current weather icon</description>
-                                       <posx>230</posx>
-                                       <posy>135</posy>
-                                       <width>230</width>
-                                       <height>230</height>
-                                       <info>Window.Property(Current.ConditionIcon)</info>
-                                       <aspectratio>keep</aspectratio>
-                               </control>
-                               <control type="label">
-                                       <description>current condition label</description>
-                                       <posx>20</posx>
-                                       <posy>340</posy>
-                                       <width>460</width>
-                                       <height>30</height>
-                                       <info>Window.Property(Current.Condition)</info>
-                                       <wrapmultiline>true</wrapmultiline>
-                                       <font>font13</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>white</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                               </control>
-                               <control type="image">
-                                       <posx>20</posx>
-                                       <posy>390</posy>
-                                       <width>460</width>
-                                       <height>4</height>
-                                       <texture>separator.png</texture>
-                               </control>
-                               <control type="label">
-                                       <description>current feels like label</description>
-                                       <posx>170</posx>
-                                       <posy>400</posy>
-                                       <width>170</width>
-                                       <height>35</height>
-                                       <font>font13</font>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <label>$LOCALIZE[402] :</label>
-                                       <textcolor>grey2</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                               </control>
-                               <control type="label">
-                                       <description>current dew label</description>
-                                       <posx>170</posx>
-                                       <posy>430</posy>
-                                       <width>170</width>
-                                       <height>35</height>
-                                       <font>font13</font>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <label>$LOCALIZE[405] :</label>
-                                       <textcolor>grey2</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                               </control>
-                               <control type="label">
-                                       <description>current humidity label</description>
-                                       <posx>170</posx>
-                                       <posy>460</posy>
-                                       <width>170</width>
-                                       <height>35</height>
-                                       <font>font13</font>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <label>$LOCALIZE[406] :</label>
-                                       <textcolor>grey2</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                               </control>
-                               <control type="label">
-                                       <description>current UV Index label</description>
-                                       <posx>170</posx>
-                                       <posy>490</posy>
-                                       <width>170</width>
-                                       <height>35</height>
-                                       <font>font13</font>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <label>$LOCALIZE[403] :</label>
-                                       <textcolor>grey2</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                               </control>
-                               <control type="label">
-                                       <description>current Wind label</description>
-                                       <posx>170</posx>
-                                       <posy>520</posy>
-                                       <width>170</width>
-                                       <height>35</height>
-                                       <font>font13</font>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <label>$LOCALIZE[404] :</label>
-                                       <textcolor>grey2</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                               </control>
-                               <control type="label">
-                                       <description>current feels like Value</description>
-                                       <posx>185</posx>
-                                       <posy>400</posy>
-                                       <width>300</width>
-                                       <height>35</height>
-                                       <font>font13</font>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[Window.Property(Current.FeelsLike)]$INFO[System.TemperatureUnits]</label>
-                                       <textcolor>white</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                               </control>
-                               <control type="label">
-                                       <description>current dew Value</description>
-                                       <posx>185</posx>
-                                       <posy>430</posy>
-                                       <width>300</width>
-                                       <height>35</height>
-                                       <font>font13</font>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[Window.Property(Current.DewPoint)]$INFO[System.TemperatureUnits]</label>
-                                       <textcolor>white</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                               </control>
-                               <control type="label">
-                                       <description>current humidity Value</description>
-                                       <posx>185</posx>
-                                       <posy>460</posy>
-                                       <width>300</width>
-                                       <height>35</height>
-                                       <font>font13</font>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <info>Window.Property(Current.Humidity)</info>
-                                       <textcolor>white</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                               </control>
-                               <control type="label">
-                                       <description>current UV Index Value</description>
-                                       <posx>185</posx>
-                                       <posy>490</posy>
-                                       <width>300</width>
-                                       <height>35</height>
-                                       <font>font13</font>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <info>Window.Property(Current.UVIndex)</info>
-                                       <textcolor>white</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                               </control>
-                               <control type="label">
-                                       <description>current Wind Value</description>
-                                       <posx>185</posx>
-                                       <posy>520</posy>
-                                       <width>300</width>
-                                       <height>35</height>
-                                       <font>font13</font>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <info>Window.Property(Current.Wind)</info>
-                                       <textcolor>white</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                               </control>
-                       </control>
-                       <control type="group">
-                               <posx>580</posx>
-                               <posy>170</posy>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>620</width>
-                                       <height>620</height>
-                                       <texture border="5">SubBack.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>20</posx>
-                                       <posy>0</posy>
-                                       <width>580</width>
-                                       <height>90</height>
-                                       <aspectratio>stretch</aspectratio>
-                                       <texture>GlassTitleBar.png</texture>
-                               </control>
-                               <control type="label">
-                                       <description>header label</description>
-                                       <posx>20</posx>
-                                       <posy>10</posy>
-                                       <width>580</width>
-                                       <height>30</height>
-                                       <font>font13_title</font>
-                                       <label>10508</label>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>white</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                               </control>
-                               <control type="group">
-                                       <description>day 0</description>
-                                       <posx>20</posx>
-                                       <posy>60</posy>
-                                       <control type="label">
-                                               <description>Day label</description>
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>460</width>
-                                               <height>35</height>
-                                               <font>font13_title</font>
-                                               <info>Window.Property(Day0.Title)</info>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>white</textcolor>
-                                               <shadowcolor>black</shadowcolor>
-                                       </control>
-                                       <control type="image">
-                                               <description>day icon</description>
-                                               <posx>450</posx>
-                                               <posy>0</posy>
-                                               <height>120</height>
-                                               <width>120</width>
-                                               <info>Window.Property(Day0.OutlookIcon)</info>
-                                               <aspectratio align="right">keep</aspectratio>
-                                       </control>
-                                       <control type="label">
-                                               <description>high label</description>
-                                               <posx>40</posx>
-                                               <posy>50</posy>
-                                               <height>20</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <label>$LOCALIZE[419] :</label>
-                                               <textcolor>grey2</textcolor>
-                                               <shadowcolor>black</shadowcolor>
-                                               <visible>Weather.IsFetched</visible>
-                                       </control>
-                                       <control type="label">
-                                               <description>high value</description>
-                                               <posx>110</posx>
-                                               <posy>50</posy>
-                                               <height>20</height>
-                                               <label>$INFO[Window.Property(Day0.HighTemp)]$INFO[System.TemperatureUnits]</label>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>white</textcolor>
-                                               <shadowcolor>black</shadowcolor>
-                                               <visible>!IsEmpty(Window.Property(Day0.HighTemp))</visible>
-                                       </control>
-                                       <control type="label">
-                                               <description>low label</description>
-                                               <posx>220</posx>
-                                               <posy>50</posy>
-                                               <height>20</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <label>$LOCALIZE[418] :</label>
-                                               <textcolor>grey2</textcolor>
-                                               <shadowcolor>black</shadowcolor>
-                                               <visible>Weather.IsFetched</visible>
-                                       </control>
-                                       <control type="label">
-                                               <description>low value</description>
-                                               <posx>290</posx>
-                                               <posy>50</posy>
-                                               <height>20</height>
-                                               <label>$INFO[Window.Property(Day0.LowTemp)]$INFO[System.TemperatureUnits]</label>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>white</textcolor>
-                                               <shadowcolor>black</shadowcolor>
-                                               <visible>!IsEmpty(Window.Property(Day0.LowTemp))</visible>
-                                       </control>
-                                       <control type="label">
-                                               <description>conditions label</description>
-                                               <posx>40</posx>
-                                               <posy>80</posy>
-                                               <width>320</width>
-                                               <height>20</height>
-                                               <info>Window.Property(Day0.Outlook)</info>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>white</textcolor>
-                                               <shadowcolor>black</shadowcolor>
-                                       </control>
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>120</posy>
-                                               <width>620</width>
-                                               <height>4</height>
-                                               <texture>separator.png</texture>
-                                       </control>
-                               </control>
-                               <control type="group">
-                                       <description>day 1</description>
-                                       <posx>20</posx>
-                                       <posy>190</posy>
-                                       <control type="label">
-                                               <description>Day label</description>
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>460</width>
-                                               <height>35</height>
-                                               <font>font13_title</font>
-                                               <info>Window.Property(Day1.Title)</info>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>white</textcolor>
-                                               <shadowcolor>black</shadowcolor>
-                                       </control>
-                                       <control type="image">
-                                               <description>day icon</description>
-                                               <posx>450</posx>
-                                               <posy>0</posy>
-                                               <height>120</height>
-                                               <width>120</width>
-                                               <info>Window.Property(Day1.OutlookIcon)</info>
-                                               <aspectratio align="right">keep</aspectratio>
-                                       </control>
-                                       <control type="label">
-                                               <description>high label</description>
-                                               <posx>40</posx>
-                                               <posy>50</posy>
-                                               <height>20</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <label>$LOCALIZE[419] :</label>
-                                               <textcolor>grey2</textcolor>
-                                               <shadowcolor>black</shadowcolor>
-                                               <visible>Weather.IsFetched</visible>
-                                       </control>
-                                       <control type="label">
-                                               <description>high value</description>
-                                               <posx>110</posx>
-                                               <posy>50</posy>
-                                               <height>20</height>
-                                               <label>$INFO[Window.Property(Day1.HighTemp)]$INFO[System.TemperatureUnits]</label>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>white</textcolor>
-                                               <shadowcolor>black</shadowcolor>
-                                               <visible>!IsEmpty(Window.Property(Day1.HighTemp))</visible>
-                                       </control>
-                                       <control type="label">
-                                               <description>low label</description>
-                                               <posx>220</posx>
-                                               <posy>50</posy>
-                                               <height>20</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <label>$LOCALIZE[418] :</label>
-                                               <textcolor>grey2</textcolor>
-                                               <shadowcolor>black</shadowcolor>
-                                               <visible>Weather.IsFetched</visible>
-                                       </control>
-                                       <control type="label">
-                                               <description>low value</description>
-                                               <posx>290</posx>
-                                               <posy>50</posy>
-                                               <height>20</height>
-                                               <label>$INFO[Window.Property(Day1.LowTemp)]$INFO[System.TemperatureUnits]</label>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>white</textcolor>
-                                               <shadowcolor>black</shadowcolor>
-                                               <visible>!IsEmpty(Window.Property(Day1.LowTemp))</visible>
-                                       </control>
-                                       <control type="label">
-                                               <description>conditions label</description>
-                                               <posx>40</posx>
-                                               <posy>80</posy>
-                                               <width>320</width>
-                                               <height>20</height>
-                                               <info>Window.Property(Day1.Outlook)</info>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>white</textcolor>
-                                               <shadowcolor>black</shadowcolor>
-                                       </control>
-                                       <control type="image">
-                                               <posx>20</posx>
-                                               <posy>120</posy>
-                                               <width>620</width>
-                                               <height>4</height>
-                                               <texture>separator.png</texture>
-                                       </control>
-                               </control>
-                               <control type="group">
-                                       <description>day 2</description>
-                                       <posx>20</posx>
-                                       <posy>320</posy>
-                                       <control type="label">
-                                               <description>Day label</description>
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>460</width>
-                                               <height>35</height>
-                                               <font>font13_title</font>
-                                               <info>Window.Property(Day2.Title)</info>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>white</textcolor>
-                                               <shadowcolor>black</shadowcolor>
-                                       </control>
-                                       <control type="image">
-                                               <description>day icon</description>
-                                               <posx>450</posx>
-                                               <posy>0</posy>
-                                               <height>120</height>
-                                               <width>120</width>
-                                               <info>Window.Property(Day2.OutlookIcon)</info>
-                                               <aspectratio align="right">keep</aspectratio>
-                                       </control>
-                                       <control type="label">
-                                               <description>high label</description>
-                                               <posx>40</posx>
-                                               <posy>50</posy>
-                                               <height>20</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <label>$LOCALIZE[419] :</label>
-                                               <textcolor>grey2</textcolor>
-                                               <shadowcolor>black</shadowcolor>
-                                               <visible>Weather.IsFetched</visible>
-                                       </control>
-                                       <control type="label">
-                                               <description>high value</description>
-                                               <posx>110</posx>
-                                               <posy>50</posy>
-                                               <height>20</height>
-                                               <label>$INFO[Window.Property(Day2.HighTemp)]$INFO[System.TemperatureUnits]</label>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>white</textcolor>
-                                               <shadowcolor>black</shadowcolor>
-                                               <visible>!IsEmpty(Window.Property(Day2.HighTemp))</visible>
-                                       </control>
-                                       <control type="label">
-                                               <description>low label</description>
-                                               <posx>220</posx>
-                                               <posy>50</posy>
-                                               <height>20</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <label>$LOCALIZE[418] :</label>
-                                               <textcolor>grey2</textcolor>
-                                               <shadowcolor>black</shadowcolor>
-                                               <visible>Weather.IsFetched</visible>
-                                       </control>
-                                       <control type="label">
-                                               <description>low value</description>
-                                               <posx>290</posx>
-                                               <posy>50</posy>
-                                               <height>20</height>
-                                               <label>$INFO[Window.Property(Day2.LowTemp)]$INFO[System.TemperatureUnits]</label>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>white</textcolor>
-                                               <shadowcolor>black</shadowcolor>
-                                               <visible>!IsEmpty(Window.Property(Day2.LowTemp))</visible>
-                                       </control>
-                                       <control type="label">
-                                               <description>conditions label</description>
-                                               <posx>40</posx>
-                                               <posy>80</posy>
-                                               <width>320</width>
-                                               <height>20</height>
-                                               <info>Window.Property(Day2.Outlook)</info>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <shadowcolor>black</shadowcolor>
-                                               <textcolor>white</textcolor>
-                                       </control>
-                                       <control type="image">
-                                               <posx>20</posx>
-                                               <posy>120</posy>
-                                               <width>620</width>
-                                               <height>4</height>
-                                               <texture>separator.png</texture>
-                                       </control>
-                               </control>
-                               <control type="group">
-                                       <description>day 3</description>
-                                       <posx>20</posx>
-                                       <posy>450</posy>
-                                       <control type="label">
-                                               <description>Day label</description>
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>460</width>
-                                               <height>35</height>
-                                               <font>font13_title</font>
-                                               <info>Window.Property(Day3.Title)</info>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>white</textcolor>
-                                               <shadowcolor>black</shadowcolor>
-                                       </control>
-                                       <control type="image">
-                                               <description>day icon</description>
-                                               <posx>450</posx>
-                                               <posy>0</posy>
-                                               <height>120</height>
-                                               <width>120</width>
-                                               <info>Window.Property(Day3.OutlookIcon)</info>
-                                               <aspectratio align="right">keep</aspectratio>
-                                       </control>
-                                       <control type="label">
-                                               <description>high label</description>
-                                               <posx>40</posx>
-                                               <posy>50</posy>
-                                               <height>20</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <label>$LOCALIZE[419] :</label>
-                                               <textcolor>grey2</textcolor>
-                                               <shadowcolor>black</shadowcolor>
-                                               <visible>Weather.IsFetched</visible>
-                                       </control>
-                                       <control type="label">
-                                               <description>high value</description>
-                                               <posx>110</posx>
-                                               <posy>50</posy>
-                                               <height>20</height>
-                                               <label>$INFO[Window.Property(Day3.HighTemp)]$INFO[System.TemperatureUnits]</label>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>white</textcolor>
-                                               <shadowcolor>black</shadowcolor>
-                                               <visible>!IsEmpty(Window.Property(Day3.HighTemp))</visible>
-                                       </control>
-                                       <control type="label">
-                                               <description>low label</description>
-                                               <posx>220</posx>
-                                               <posy>50</posy>
-                                               <height>20</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <label>$LOCALIZE[418] :</label>
-                                               <textcolor>grey2</textcolor>
-                                               <shadowcolor>black</shadowcolor>
-                                               <visible>Weather.IsFetched</visible>
-                                       </control>
-                                       <control type="label">
-                                               <description>low value</description>
-                                               <posx>290</posx>
-                                               <posy>50</posy>
-                                               <height>20</height>
-                                               <label>$INFO[Window.Property(Day3.LowTemp)]$INFO[System.TemperatureUnits]</label>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>white</textcolor>
-                                               <shadowcolor>black</shadowcolor>
-                                               <visible>!IsEmpty(Window.Property(Day3.LowTemp))</visible>
-                                       </control>
-                                       <control type="label">
-                                               <description>conditions label</description>
-                                               <posx>40</posx>
-                                               <posy>80</posy>
-                                               <width>320</width>
-                                               <height>20</height>
-                                               <info>Window.Property(Day3.Outlook)</info>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>white</textcolor>
-                                               <shadowcolor>black</shadowcolor>
-                                       </control>
-                               </control>
-                       </control>
-               </control>
-               <control type="panel" id="9002">
-                       <visible>!Window.IsActive(PlayerControls)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <include>SubMenuCommonLayout</include>
-                       <content>
-                               <item>
-                                       <label>31200</label>
-                                       <onclick>ParentDir</onclick>
-                                       <icon>icon_back.png</icon>
-                               </item>
-                               <item>
-                                       <label>184</label>
-                                       <onclick>Weather.Refresh</onclick>
-                                       <icon>icon_refresh.png</icon>
-                               </item>
-                               <item>
-                                       <label>31201</label>
-                                       <onclick>Weather.LocationNext</onclick>
-                                       <icon>icon_city.png</icon>
-                               </item>
-                       </content>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/PlayerControls.xml b/addons/skin.touched/4x3Hirez/PlayerControls.xml
deleted file mode 100644 (file)
index 4285f17..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-<window type="dialog" id="114">
-       <defaultcontrol></defaultcontrol>
-       <include>dialogeffect</include>
-       <visible>Player.HasMedia + Window.IsActive(PlayerControls) + !Window.IsActive(FullscreenVideo) + !Window.IsActive(Visualisation)</visible>
-       <onunload>Skin.Reset(PlayerControlsSubMenuVisible)</onunload>
-       <coordinates>
-               <system>1</system>
-               <posx>0</posx>
-               <posy>0</posy>
-       </coordinates>
-       <controls>
-               <include>PlayerControlCommons</include>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/Pointer.xml b/addons/skin.touched/4x3Hirez/Pointer.xml
deleted file mode 100644 (file)
index 54bf371..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-<window id="105">
-       <defaultcontrol>1</defaultcontrol>
-       <coordinates>
-               <system>1</system>
-               <posx>0</posx>
-               <posy>0</posy>
-       </coordinates>
-       <controls>
-               <control type="image" id="1">
-                       <description>Pointer Image</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>32</width>
-                       <height>32</height>
-                       <texture>pointer-focus.png</texture>
-               </control>
-               <control type="image" id="2">
-                       <description>Pointer Focus Image</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>32</width>
-                       <height>32</height>
-                       <texture>pointer-focus.png</texture>
-               </control>
-               <control type="image" id="3">
-                       <description>Pointer Drag Image</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>32</width>
-                       <height>32</height>
-                       <texture>pointer-focus.png</texture>
-               </control>
-               <control type="image" id="4">
-                       <description>Pointer Click Image</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>32</width>
-                       <height>32</height>
-                       <texture>pointer-focus.png</texture>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/ProfileSettings.xml b/addons/skin.touched/4x3Hirez/ProfileSettings.xml
deleted file mode 100644 (file)
index 7b5435e..0000000
+++ /dev/null
@@ -1,165 +0,0 @@
-<window id="130">
-       <defaultcontrol>1</defaultcontrol>
-       <include>Window_OpenClose_Animation_Zoom</include>
-       <coordinates>
-               <system>1</system>
-               <posx>140</posx>
-               <posy>30</posy>
-       </coordinates>
-       <controls>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>1000</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="label" id="1">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>910</width>
-                       <label>$INFO[Window.Property(heading)]</label>
-               </control>
-               <control type="group">
-                       <posx>930</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>1000</width>
-                       <height>840</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-               <control type="image" id="2">
-                       <description>profile image</description>
-                       <posx>20</posx>
-                       <posy>80</posy>
-                       <width>250</width>
-                       <height>250</height>
-                       <align>left</align>
-                       <aspectratio>keep</aspectratio>
-                       <texture>unknown-user.png</texture>
-               </control>
-               <control type="label">
-                       <description>profile name label</description>
-                       <posx>300</posx>
-                       <posy>80</posy>
-                       <width>680</width>
-                       <height>25</height>
-                       <align>left</align>
-                       <font>font13_title</font>
-                       <textcolor>black</textcolor>
-                       <label>$LOCALIZE[20093]</label>
-               </control>
-               <control type="label" id="1000">
-                       <description>profile name Value</description>
-                       <posx>300</posx>
-                       <posy>110</posy>
-                       <width>680</width>
-                       <height>25</height>
-                       <align>left</align>
-                       <font>font16</font>
-                       <textcolor>black</textcolor>
-               </control>
-               <control type="label">
-                       <description>profile directory label</description>
-                       <posx>300</posx>
-                       <posy>180</posy>
-                       <width>680</width>
-                       <height>25</height>
-                       <align>left</align>
-                       <font>font13_title</font>
-                       <textcolor>black</textcolor>
-                       <label>$LOCALIZE[20070]</label>
-               </control>
-               <control type="label" id="1001">
-                       <description>profile directory Value</description>
-                       <posx>300</posx>
-                       <posy>210</posy>
-                       <width>680</width>
-                       <height>25</height>
-                       <align>left</align>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-               </control>
-               <control type="grouplist" id="5">
-                       <description>control area</description>
-                       <posx>20</posx>
-                       <posy>350</posy>
-                       <width>960</width>
-                       <height>500</height>
-                       <itemgap>-1</itemgap>
-                       <pagecontrol>60</pagecontrol>
-                       <onleft>28</onleft>
-                       <onright>60</onright>
-                       <onup>28</onup>
-                       <ondown>28</ondown>
-               </control>
-               <control type="button" id="7">
-                       <description>Default Button</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <height>55</height>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-                       <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-               </control>
-               <control type="radiobutton" id="8">
-                       <description>Default RadioButton</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <height>55</height>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-                       <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-               </control>
-               <control type="spincontrolex" id="9">
-                       <description>Default SpinControlex</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <height>55</height>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-                       <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-                       <aligny>center</aligny>
-                       <reverse>yes</reverse>
-               </control>
-               <control type="image" id="11">
-                       <description>separator image</description>
-                       <height>5</height>
-                       <texture>separator.png</texture>
-               </control>
-               <control type="grouplist" id="9000">
-                       <posx>20</posx>
-                       <posy>830</posy>
-                       <width>960</width>
-                       <height>50</height>
-                       <itemgap>10</itemgap>
-                       <align>center</align>
-                       <orientation>horizontal</orientation>
-                       <onleft>9000</onleft>
-                       <onright>9000</onright>
-                       <onup>9000</onup>
-                       <ondown>9000</ondown>
-                       <control type="button" id="28">
-                               <description>OK button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>186</label>
-                       </control>
-                       <control type="button" id="29">
-                               <description>Cancel button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>222</label>
-                       </control>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/Settings.xml b/addons/skin.touched/4x3Hirez/Settings.xml
deleted file mode 100644 (file)
index fd9675d..0000000
+++ /dev/null
@@ -1,208 +0,0 @@
-<window id="4">
-       <defaultcontrol always="true">9000</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <controls>
-               <include>CommonBackground</include>
-               <include>HomeButtonCommons</include>
-               <include>CommonNowPlaying</include>
-               <control type="label">
-                       <description>Window label</description>
-                       <include>MediaWindowTitleCommons</include>
-                       <label>$LOCALIZE[5]</label>
-               </control>
-               <control type="panel" id="9002">
-                       <visible>!Window.IsActive(PlayerControls)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <include>SubMenuCommonLayout</include>
-                       <content>
-                               <item>
-                                       <label>31200</label>
-                                       <onclick>PreviousMenu</onclick>
-                                       <icon>icon_back.png</icon>
-                               </item>
-                               <item>
-                                       <label>13200</label>
-                                       <onclick>ActivateWindow(Profiles)</onclick>
-                                       <icon>icon_profile.png</icon>
-                               </item>
-                               <item>
-                                       <label>20077</label>
-                                       <onclick>ActivateWindow(1113)</onclick>
-                                       <icon>icon_skin.png</icon>
-                               </item>
-                               <item>
-                                       <label>130</label>
-                                       <onclick>ActivateWindow(SystemInfo)</onclick>
-                                       <icon>icon_systeminfo.png</icon>
-                               </item>
-                       </content>
-               </control>
-               <control type="panel" id="9000">
-                       <include>Window_OpenClose_Animation_Zoom</include>
-                       <posx>30</posx>
-                       <posy>110</posy>
-                       <width>1220</width>
-                       <height>740</height>
-                       <onleft>9000</onleft>
-                       <onright>9001</onright>
-                       <onup>9000</onup>
-                       <ondown>9000</ondown>
-                       <pagecontrol>-</pagecontrol>
-                       <scrolltime>300</scrolltime>
-                       <itemlayout height="180" width="600">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>620</width>
-                                       <height>200</height>
-                                       <texture border="5">SubBack.png</texture>
-                                       <bordertexture border="30">ShadowBorder.png</bordertexture>
-                                       <bordersize>20</bordersize>
-                               </control>
-                               <control type="image">
-                                       <posx>430</posx>
-                                       <posy>25</posy>
-                                       <width>150</width>
-                                       <height>145</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture>$INFO[ListItem.Icon]</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>40</posx>
-                                       <posy>40</posy>
-                                       <width>360</width>
-                                       <height>20</height>
-                                       <font>font24_title</font>
-                                       <textcolor>white</textcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                               <control type="textbox">
-                                       <posx>40</posx>
-                                       <posy>70</posy>
-                                       <width>390</width>
-                                       <height>100</height>
-                                       <font>font12</font>
-                                       <textcolor>grey2</textcolor>
-                                       <align>left</align>
-                                       <label>$INFO[ListItem.Label2]</label>
-                               </control>
-                               <control type="image">
-                                       <posx>20</posx>
-                                       <posy>20</posy>
-                                       <width>200</width>
-                                       <height>160</height>
-                                       <texture>GlassOverlay.png</texture>
-                                       <colordiffuse>55FFFFFF</colordiffuse>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout height="180" width="600">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>620</width>
-                                       <height>200</height>
-                                       <texture border="5">SubBack.png</texture>
-                                       <bordertexture border="30">ShadowBorder.png</bordertexture>
-                                       <bordersize>20</bordersize>
-                               </control>
-                               <control type="image">
-                                       <posx>430</posx>
-                                       <posy>25</posy>
-                                       <width>150</width>
-                                       <height>145</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture>$INFO[ListItem.Icon]</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>40</posx>
-                                       <posy>40</posy>
-                                       <width>360</width>
-                                       <height>20</height>
-                                       <font>font24_title</font>
-                                       <textcolor>white</textcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                               <control type="textbox">
-                                       <posx>40</posx>
-                                       <posy>70</posy>
-                                       <width>390</width>
-                                       <height>100</height>
-                                       <font>font12</font>
-                                       <textcolor>grey2</textcolor>
-                                       <align>left</align>
-                                       <label>$INFO[ListItem.Label2]</label>
-                               </control>
-                               <control type="image">
-                                       <posx>20</posx>
-                                       <posy>20</posy>
-                                       <width>200</width>
-                                       <height>160</height>
-                                       <texture>GlassOverlay.png</texture>
-                                       <colordiffuse>55FFFFFF</colordiffuse>
-                               </control>
-                       </focusedlayout>
-                       <content>
-                               <item id="1">
-                                       <label>480</label>
-                                       <label2>31400</label2>
-                                       <onclick>ActivateWindow(AppearanceSettings)</onclick>
-                                       <icon>icon_big_appearence.png</icon>
-                               </item>
-                               <item id="2">
-                                       <label>157</label>
-                                       <label2>31401</label2>
-                                       <onclick>ActivateWindow(VideosSettings)</onclick>
-                                       <icon>icon_big_video.png</icon>
-                               </item>
-                               <item id="3">
-                                       <label>2</label>
-                                       <label2>31402</label2>
-                                       <onclick>ActivateWindow(MusicSettings)</onclick>
-                                       <icon>icon_big_music.png</icon>
-                               </item>
-                               <item id="4">
-                                       <label>1</label>
-                                       <label2>31403</label2>
-                                       <onclick>ActivateWindow(PicturesSettings)</onclick>
-                                       <icon>icon_big_pictures.png</icon>
-                               </item>
-                               <item id="5">
-                                       <label>8</label>
-                                       <label2>31404</label2>
-                                       <onclick>ActivateWindow(WeatherSettings)</onclick>
-                                       <icon>icon_big_weather.png</icon>
-                               </item>
-                               <item id="6">
-                                       <label>24001</label>
-                                       <label2>31408</label2>
-                                       <onclick>ActivateWindow(AddonBrowser)</onclick>
-                                       <icon>icon_big_addons.png</icon>
-                               </item>
-                               <item id="7">
-                                       <label>705</label>
-                                       <label2>31405</label2>
-                                       <onclick>ActivateWindow(NetworkSettings)</onclick>
-                                       <icon>icon_big_network.png</icon>
-                               </item>
-                               <item id="8">
-                                       <label>13000</label>
-                                       <label2>31406</label2>
-                                       <onclick>ActivateWindow(SystemSettings)</onclick>
-                                       <icon>icon_big_system.png</icon>
-                               </item>
-                               <item id="9">
-                                       <label>166</label>
-                                       <label2>31407</label2>
-                                       <onclick>ActivateWindow(1111)</onclick>
-                                       <icon>icon_big_skin.png</icon>
-                                       <visible>false</visible>
-                               </item>
-                       </content>
-               </control>
-               <include>BehindDialogFadeOut</include>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/SettingsCategory.xml b/addons/skin.touched/4x3Hirez/SettingsCategory.xml
deleted file mode 100644 (file)
index 054a0ec..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-<window id="12">
-       <defaultcontrol>3</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <controls>
-               <include>CommonBackground</include>
-               <include>HomeButtonCommons</include>
-               <include>CommonNowPlaying</include>
-               <control type="label">
-                       <description>Window label</description>
-                       <include>MediaWindowTitleCommons</include>
-                       <label>$LOCALIZE[5]$INFO[Control.GetLabel(2), - ]</label>
-               </control>
-               <control type="panel" id="9002">
-                       <visible>!Window.IsActive(PlayerControls)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <include>SubMenuCommonLayout</include>
-                       <content>
-                               <item>
-                                       <label>31200</label>
-                                       <onclick>PreviousMenu</onclick>
-                                       <icon>icon_back.png</icon>
-                               </item>
-                       </content>
-               </control>
-               <control type="group">
-                       <include>Window_OpenClose_Animation_Zoom</include>
-                       <posx>50</posx>
-                       <posy>140</posy>
-                       <control type="grouplist" id="3">
-                               <description>button area</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>280</width>
-                               <height>720</height>
-                               <itemgap>-1</itemgap>
-                               <onleft>5</onleft>
-                               <onright>5</onright>
-                               <onup>3</onup>
-                               <ondown>3</ondown>
-                       </control>
-                       <control type="grouplist" id="5">
-                               <description>control area</description>
-                               <posx>300</posx>
-                               <posy>0</posy>
-                               <width>880</width>
-                               <height>720</height>
-                               <itemgap>0</itemgap>
-                               <pagecontrol>60</pagecontrol>
-                               <onleft>3</onleft>
-                               <onright>3</onright>
-                               <onup>5</onup>
-                               <ondown>5</ondown>
-                       </control>
-               </control>
-               <include>BehindDialogFadeOut</include>
-
-               <control type="button" id="10">
-                       <description>Default Category Button</description>
-                       <height>70</height>
-                       <textoffsetx>20</textoffsetx>
-                       <align>right</align>
-                       <aligny>center</aligny>
-                       <font>font24_title</font>
-                       <textcolor>white</textcolor>
-                       <focusedcolor>selected</focusedcolor>
-                       <texturefocus border="5">button-nofocus2.png</texturefocus>
-                       <texturenofocus border="5">button-nofocus2.png</texturenofocus>
-                       <pulseonselect>false</pulseonselect>
-               </control>
-               <control type="button" id="7">
-                       <description>Default Button</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <height>60</height>
-                       <font>font13</font>
-                       <textcolor>white</textcolor>
-                       <focusedcolor>black</focusedcolor>
-                       <texturefocus border="5">ListFO.png</texturefocus>
-                       <texturenofocus border="5">ListNF.png</texturenofocus>
-               </control>
-               <control type="radiobutton" id="8">
-                       <description>Default RadioButton</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <height>60</height>
-                       <font>font13</font>
-                       <textcolor>white</textcolor>
-                       <focusedcolor>black</focusedcolor>
-                       <texturefocus border="5">ListFO.png</texturefocus>
-                       <texturenofocus border="5">ListNF.png</texturenofocus>
-               </control>
-               <control type="spincontrolex" id="9">
-                       <description>Default SpinControlex</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <height>60</height>
-                       <font>font13</font>
-                       <textcolor>white</textcolor>
-                       <focusedcolor>black</focusedcolor>
-                       <texturefocus border="5">ListFO.png</texturefocus>
-                       <texturenofocus border="5">ListNF.png</texturenofocus>
-                       <aligny>center</aligny>
-                       <reverse>yes</reverse>
-               </control>
-               <control type="image" id="11">
-                       <description>separator image</description>
-                       <height>5</height>
-                       <texture>separator.png</texture>
-               </control>
-               <control type="label" id="2">
-                       <description>Fake Label so we can pass it on</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>0</width>
-                       <height>0</height>
-                       <font>-</font>
-                       <visible>false</visible>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/SettingsProfile.xml b/addons/skin.touched/4x3Hirez/SettingsProfile.xml
deleted file mode 100644 (file)
index 8c70caf..0000000
+++ /dev/null
@@ -1,234 +0,0 @@
-<window id="34">
-       <defaultcontrol always="true">2</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <controls>
-               <include>CommonBackground</include>
-               <include>HomeButtonCommons</include>
-               <include>CommonNowPlaying</include>
-               <control type="label">
-                       <description>Window label</description>
-                       <include>MediaWindowTitleCommons</include>
-                       <label>$LOCALIZE[10034]</label>
-               </control>
-               <control type="panel" id="9002">
-                       <visible>!Window.IsActive(PlayerControls)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <include>SubMenuCommonLayout</include>
-                       <content>
-                               <item>
-                                       <label>31200</label>
-                                       <onclick>PreviousMenu</onclick>
-                                       <icon>icon_back.png</icon>
-                               </item>
-                       </content>
-               </control>
-
-               <control type="group">
-                       <posx>40</posx>
-                       <posy>140</posy>
-                       <include>Window_OpenClose_Animation_Zoom</include>
-                       <control type="radiobutton" id ="4">
-                               <description>Enable Login screen</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>350</width>
-                               <height>60</height>
-                               <align>left</align>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>20096</label>
-                               <onleft>2</onleft>
-                               <onright>2</onright>
-                               <onup>4</onup>
-                               <ondown>4</ondown>
-                               <enable>!Window.IsVisible(ProfileSettings)</enable>
-                       </control>
-                       <control type="group">
-                               <posx>0</posx>
-                               <posy>80</posy>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>350</width>
-                                       <height>500</height>
-                                       <texture border="5">SubBack.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>10</posx>
-                                       <posy>20</posy>
-                                       <width>330</width>
-                                       <height>20</height>
-                                       <font>font12_title</font>
-                                       <textcolor>white</textcolor>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <label>$LOCALIZE[31010]</label>
-                               </control>
-                               <control type="image">
-                                       <posx>20</posx>
-                                       <posy>60</posy>
-                                       <width>310</width>
-                                       <height>250</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture fallback="unknown-user.png">$INFO[System.ProfileThumb]</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>10</posx>
-                                       <posy>330</posy>
-                                       <width>330</width>
-                                       <height>20</height>
-                                       <font>font13_title</font>
-                                       <textcolor>blue</textcolor>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[System.ProfileName]</label>
-                               </control>
-                       </control>
-                       <control type="label">
-                               <posx>370</posx>
-                               <posy>0</posy>
-                               <width>830</width>
-                               <height>60</height>
-                               <font>font13_title</font>
-                               <textcolor>white</textcolor>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <label>$LOCALIZE[31319]</label>
-                       </control>
-                       <control type="panel" id="2">
-                               <posx>370</posx>
-                               <posy>80</posy>
-                               <width>830</width>
-                               <height>560</height>
-                               <onleft>4</onleft>
-                               <onright>60</onright>
-                               <onup>53</onup>
-                               <ondown>53</ondown>
-                               <viewtype label="21371">list</viewtype>
-                               <pagecontrol>60</pagecontrol>
-                               <scrolltime>200</scrolltime>
-                               <itemlayout height="280" width="207">
-                                       <control type="image">
-                                               <posx>1</posx>
-                                               <posy>0</posy>
-                                               <width>207</width>
-                                               <height>280</height>
-                                               <texture border="5">SubBack.png</texture>
-                                       </control>
-                                       <control type="image">
-                                               <posx>10</posx>
-                                               <posy>10</posy>
-                                               <width>187</width>
-                                               <height>190</height>
-                                               <texture fallback="unknown-user.png">$INFO[Listitem.Icon]</texture>
-                                       </control>
-                                       <control type="label">
-                                               <posx>103</posx>
-                                               <posy>200</posy>
-                                               <width>197</width>
-                                               <height>25</height>
-                                               <font>font13</font>
-                                               <textcolor>white</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <align>center</align>
-                                               <aligny>center</aligny>
-                                               <label>$INFO[ListItem.Label]</label>
-                                       </control>
-                                       <control type="label">
-                                               <posx>103</posx>
-                                               <posy>230</posy>
-                                               <width>197</width>
-                                               <height>20</height>
-                                               <font>font10_title</font>
-                                               <textcolor>grey2</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <align>center</align>
-                                               <aligny>center</aligny>
-                                               <label>$LOCALIZE[31320]</label>
-                                               <visible>!IsEmpty(ListItem.Label2)</visible>
-                                       </control>
-                                       <control type="label">
-                                               <posx>103</posx>
-                                               <posy>250</posy>
-                                               <width>197</width>
-                                               <height>20</height>
-                                               <font>font10</font>
-                                               <textcolor>grey2</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <align>center</align>
-                                               <aligny>center</aligny>
-                                               <label>$INFO[ListItem.Label2]</label>
-                                       </control>
-                               </itemlayout>
-                               <focusedlayout height="280" width="207">
-                                       <control type="image">
-                                               <posx>1</posx>
-                                               <posy>0</posy>
-                                               <width>207</width>
-                                               <height>280</height>
-                                               <texture border="5">SubBack2.png</texture>
-                                       </control>
-                                       <control type="image">
-                                               <posx>10</posx>
-                                               <posy>10</posy>
-                                               <width>187</width>
-                                               <height>190</height>
-                                               <texture fallback="unknown-user.png">$INFO[Listitem.Icon]</texture>
-                                       </control>
-                                       <control type="label">
-                                               <posx>103</posx>
-                                               <posy>200</posy>
-                                               <width>197</width>
-                                               <height>25</height>
-                                               <font>font13</font>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <align>center</align>
-                                               <aligny>center</aligny>
-                                               <label>$INFO[ListItem.Label]</label>
-                                       </control>
-                                       <control type="label">
-                                               <posx>103</posx>
-                                               <posy>230</posy>
-                                               <width>197</width>
-                                               <height>20</height>
-                                               <font>font10_title</font>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <align>center</align>
-                                               <aligny>center</aligny>
-                                               <label>$LOCALIZE[31320]</label>
-                                               <visible>!IsEmpty(ListItem.Label2)</visible>
-                                       </control>
-                                       <control type="label">
-                                               <posx>103</posx>
-                                               <posy>250</posy>
-                                               <width>197</width>
-                                               <height>20</height>
-                                               <font>font10</font>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <align>center</align>
-                                               <aligny>center</aligny>
-                                               <label>$INFO[ListItem.Label2]</label>
-                                       </control>
-                               </focusedlayout>
-                       </control>
-                       <control type="scrollbar" id="60">
-                               <posx>1060</posx>
-                               <posy>60</posy>
-                               <width>25</width>
-                               <height>530</height>
-                               <texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
-                               <texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
-                               <texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
-                               <textureslidernib>ScrollBarNib.png</textureslidernib>
-                               <textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
-                               <onleft>2</onleft>
-                               <onright>4</onright>
-                               <showonepage>false</showonepage>
-                               <orientation>vertical</orientation>
-                       </control>
-               </control>
-               <include>BehindDialogFadeOut</include>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/SettingsScreenCalibration.xml b/addons/skin.touched/4x3Hirez/SettingsScreenCalibration.xml
deleted file mode 100644 (file)
index 9b79adf..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-<window id="11">
-       <defaultcontrol>8</defaultcontrol>
-       <controls>
-               <control type="videowindow" id="20">
-                       <description>videowindow</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>1280</width>
-                       <height>720</height>
-                       <visible>Player.HasVideo</visible>
-               </control>
-               <control type="group">
-                       <visible>!Player.HasVideo</visible>
-                       <include>CommonSettingsBackground</include>
-               </control>
-               <control type="image">
-                       <description>Overlay</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>1280</width>
-                       <height>720</height>
-                       <texture>black-back.png</texture>
-                       <include>dialogeffect</include>
-               </control>
-               <control type="button">
-                       <description>Close Window button</description>
-                       <posx>100r</posx>
-                       <posy>0</posy>
-                       <width>64</width>
-                       <height>32</height>
-                       <label>-</label>
-                       <font>-</font>
-                       <onclick>PreviousMenu</onclick>
-                       <texturefocus>DialogCloseButton-focus.png</texturefocus>
-                       <texturenofocus>DialogCloseButton.png</texturenofocus>
-                       <onleft>1</onleft>
-                       <onright>1</onright>
-                       <onup>1</onup>
-                       <ondown>1</ondown>
-                       <visible>system.getbool(input.enablemouse)</visible>
-               </control>
-               <control type="mover" id="8">
-                       <description>top left mover</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>128</width>
-                       <height>128</height>
-                       <texturefocus>CalibrateTopLeft.png</texturefocus>
-                       <texturenofocus>-</texturenofocus>
-               </control>
-               <control type="mover" id="9">
-                       <description>right bottom mover</description>
-                       <posx>700</posx>
-                       <posy>500</posy>
-                       <width>128</width>
-                       <height>128</height>
-                       <texturefocus>CalibrateBottomRight.png</texturefocus>
-                       <texturenofocus>-</texturenofocus>
-               </control>
-               <control type="mover" id="10">
-                       <description>subtitle position mover</description>
-                       <posx>200</posx>
-                       <posy>500</posy>
-                       <width>512</width>
-                       <height>128</height>
-                       <texturefocus>CalibrateSubtitles.png</texturefocus>
-                       <texturenofocus>-</texturenofocus>
-               </control>
-               <control type="resize" id="11">
-                       <description>pixel aspect ratio box</description>
-                       <posx>0</posx>
-                       <posy>232</posy>
-                       <width>256</width>
-                       <height>256</height>
-                       <texturefocus>CalibratePixelRatio.png</texturefocus>
-                       <texturenofocus>-</texturenofocus>
-               </control>
-               <control type="group">
-                       <posx>20</posx>
-                       <posy>80</posy>
-                       <control type="label" id="2">
-                               <description>coordinates label</description>
-                               <posx>0</posx>
-                               <posy>10</posy>
-                               <width>1240</width>
-                               <label>-</label>
-                               <align>center</align>
-                               <font>font13caps</font>
-                       </control>
-                       <control type="label" id="3">
-                               <description>help information</description>
-                               <posx>0</posx>
-                               <posy>40</posy>
-                               <width>1240</width>
-                               <label>-</label>
-                               <align>center</align>
-                               <font>font13caps</font>
-                       </control>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/SettingsSystemInfo.xml b/addons/skin.touched/4x3Hirez/SettingsSystemInfo.xml
deleted file mode 100644 (file)
index 031221b..0000000
+++ /dev/null
@@ -1,369 +0,0 @@
-<window id="7">
-       <defaultcontrol always="true">95</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <controls>
-               <include>CommonBackground</include>
-               <include>HomeButtonCommons</include>
-               <include>CommonNowPlaying</include>
-               <control type="label">
-                       <description>Window label</description>
-                       <include>MediaWindowTitleCommons</include>
-                       <label>$LOCALIZE[130]</label>
-               </control>
-               <control type="panel">
-                       <visible>!Window.IsActive(PlayerControls)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <include>SubMenuCommonLayout</include>
-                       <content>
-                               <item>
-                                       <label>31200</label>
-                                       <onclick>PreviousMenu</onclick>
-                                       <icon>icon_back.png</icon>
-                               </item>
-                       </content>
-               </control>
-               <control type="label" id="40">
-                       <description>Hiddenlabel to pass to above</description>
-                       <visible>false</visible>
-               </control>
-               <control type="group">
-                       <posx>50</posx>
-                       <posy>140</posy>
-                       <include>Window_OpenClose_Animation_Zoom</include>
-                       <control type="grouplist" id="9000">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>260</width>
-                               <height>481</height>
-                               <itemgap>-1</itemgap>
-                               <onup>9000</onup>
-                               <ondown>9000</ondown>
-                               <control type="button" id="95">
-                                       <description>Button Summary Values</description>
-                                       <height>70</height>
-                                       <width>280</width>
-                                       <textoffsetx>20</textoffsetx>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <font>font24_title</font>
-                                       <textcolor>white</textcolor>
-                                       <focusedcolor>selected</focusedcolor>
-                                       <texturefocus border="5">button-nofocus2.png</texturefocus>
-                                       <texturenofocus border="5">button-nofocus2.png</texturenofocus>
-                                       <pulseonselect>false</pulseonselect>
-                                       <label>20037</label>
-                               </control>
-                               <control type="button" id="94">
-                                       <height>70</height>
-                                       <width>280</width>
-                                       <textoffsetx>20</textoffsetx>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <font>font24_title</font>
-                                       <textcolor>white</textcolor>
-                                       <focusedcolor>selected</focusedcolor>
-                                       <texturefocus border="5">button-nofocus2.png</texturefocus>
-                                       <texturenofocus border="5">button-nofocus2.png</texturenofocus>
-                                       <pulseonselect>false</pulseonselect>
-                                       <label>13277</label>
-                               </control>
-                               <control type="button" id="96">
-                                       <description>Button Network</description>
-                                       <height>70</height>
-                                       <width>280</width>
-                                       <textoffsetx>20</textoffsetx>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <font>font24_title</font>
-                                       <textcolor>white</textcolor>
-                                       <focusedcolor>selected</focusedcolor>
-                                       <texturefocus border="5">button-nofocus2.png</texturefocus>
-                                       <texturenofocus border="5">button-nofocus2.png</texturenofocus>
-                                       <pulseonselect>false</pulseonselect>
-                                       <label>13279</label>
-                               </control>
-                               <control type="button" id="97">
-                                       <description>Button Video</description>
-                                       <height>70</height>
-                                       <width>280</width>
-                                       <textoffsetx>20</textoffsetx>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <font>font24_title</font>
-                                       <textcolor>white</textcolor>
-                                       <focusedcolor>selected</focusedcolor>
-                                       <texturefocus border="5">button-nofocus2.png</texturefocus>
-                                       <texturenofocus border="5">button-nofocus2.png</texturenofocus>
-                                       <pulseonselect>false</pulseonselect>
-                                       <label>13280</label>
-                               </control>
-                               <control type="button" id="98">
-                                       <description>Button Hardware</description>
-                                       <height>70</height>
-                                       <width>280</width>
-                                       <textoffsetx>20</textoffsetx>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <font>font24_title</font>
-                                       <textcolor>white</textcolor>
-                                       <focusedcolor>selected</focusedcolor>
-                                       <texturefocus border="5">button-nofocus2.png</texturefocus>
-                                       <texturenofocus border="5">button-nofocus2.png</texturenofocus>
-                                       <pulseonselect>false</pulseonselect>
-                                       <label>13281</label>
-                               </control>
-                       </control>
-                       <control type="group">
-                               <posx>300</posx>
-                               <posy>0</posy>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>880</width>
-                                       <height>60</height>
-                                       <texture border="5">ListNF.png</texture>
-                                       <visible>!IsEmpty(Control.GetLabel(2))</visible>
-                               </control>
-                               <control type="label" id="2">
-                                       <description>Label 2</description>
-                                       <posx>10</posx>
-                                       <posy>0</posy>
-                                       <width>860</width>
-                                       <height>60</height>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>-</label>
-                                       <font>font13</font>
-                               </control>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>60</posy>
-                                       <width>880</width>
-                                       <height>60</height>
-                                       <texture border="5">ListNF.png</texture>
-                                       <visible>!IsEmpty(Control.GetLabel(3))</visible>
-                               </control>
-                               <control type="label" id="3">
-                                       <description>Label 3</description>
-                                       <posx>10</posx>
-                                       <posy>60</posy>
-                                       <width>860</width>
-                                       <height>60</height>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>-</label>
-                                       <font>font13</font>
-                               </control>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>120</posy>
-                                       <width>880</width>
-                                       <height>60</height>
-                                       <texture border="5">ListNF.png</texture>
-                                       <visible>!IsEmpty(Control.GetLabel(4))</visible>
-                               </control>
-                               <control type="label" id="4">
-                                       <description>Label 4</description>
-                                       <posx>10</posx>
-                                       <posy>120</posy>
-                                       <width>860</width>
-                                       <height>60</height>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>-</label>
-                                       <font>font13</font>
-                               </control>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>180</posy>
-                                       <width>880</width>
-                                       <height>60</height>
-                                       <texture border="5">ListNF.png</texture>
-                                       <visible>!IsEmpty(Control.GetLabel(5))</visible>
-                               </control>
-                               <control type="label" id="5">
-                                       <description>Label 5</description>
-                                       <posx>10</posx>
-                                       <posy>180</posy>
-                                       <width>860</width>
-                                       <height>60</height>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>-</label>
-                                       <font>font13</font>
-                               </control>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>240</posy>
-                                       <width>880</width>
-                                       <height>60</height>
-                                       <texture border="5">ListNF.png</texture>
-                                       <visible>!IsEmpty(Control.GetLabel(6))</visible>
-                               </control>
-                               <control type="label" id="6">
-                                       <description>Label 6</description>
-                                       <posx>10</posx>
-                                       <posy>240</posy>
-                                       <width>860</width>
-                                       <height>60</height>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>-</label>
-                                       <font>font13</font>
-                               </control>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>300</posy>
-                                       <width>880</width>
-                                       <height>60</height>
-                                       <texture border="5">ListNF.png</texture>
-                                       <visible>!IsEmpty(Control.GetLabel(7))</visible>
-                               </control>
-                               <control type="label" id="7">
-                                       <description>Label 7</description>
-                                       <posx>10</posx>
-                                       <posy>300</posy>
-                                       <width>860</width>
-                                       <height>60</height>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>-</label>
-                                       <font>font13</font>
-                               </control>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>360</posy>
-                                       <width>880</width>
-                                       <height>60</height>
-                                       <texture border="5">ListNF.png</texture>
-                                       <visible>!IsEmpty(Control.GetLabel(8))</visible>
-                               </control>
-                               <control type="label" id="8">
-                                       <description>Label 8</description>
-                                       <posx>10</posx>
-                                       <posy>360</posy>
-                                       <width>860</width>
-                                       <height>60</height>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>-</label>
-                                       <font>font13</font>
-                               </control>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>420</posy>
-                                       <width>880</width>
-                                       <height>60</height>
-                                       <texture border="5">ListNF.png</texture>
-                                       <visible>!IsEmpty(Control.GetLabel(9))</visible>
-                               </control>
-                               <control type="label" id="9">
-                                       <description>Label 9</description>
-                                       <posx>10</posx>
-                                       <posy>420</posy>
-                                       <width>860</width>
-                                       <height>60</height>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>-</label>
-                                       <font>font13</font>
-                               </control>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>480</posy>
-                                       <width>880</width>
-                                       <height>60</height>
-                                       <texture border="5">ListNF.png</texture>
-                                       <visible>!IsEmpty(Control.GetLabel(10))</visible>
-                               </control>
-                               <control type="label" id="10">
-                                       <description>Label 10</description>
-                                       <posx>10</posx>
-                                       <posy>480</posy>
-                                       <width>860</width>
-                                       <height>60</height>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>-</label>
-                                       <font>font13</font>
-                               </control>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>540</posy>
-                                       <width>880</width>
-                                       <height>60</height>
-                                       <texture border="5">ListNF.png</texture>
-                                       <visible>!IsEmpty(Control.GetLabel(11))</visible>
-                               </control>
-                               <control type="label" id="11">
-                                       <description>Label 11</description>
-                                       <posx>10</posx>
-                                       <posy>540</posy>
-                                       <width>860</width>
-                                       <height>60</height>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>-</label>
-                                       <font>font13</font>
-                               </control>
-                       </control>
-                       <control type="group">
-                               <posx>60</posx>
-                               <posy>220r</posy>
-                               <control type="label" id="52">
-                                       <description>XBMC BUILD Version</description>
-                                       <posx>1130</posx>
-                                       <posy>0</posy>
-                                       <width>730</width>
-                                       <label>144</label>
-                                       <align>right</align>
-                                       <textcolor>white</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                                       <font>font13_title</font>
-                               </control>
-                               <control type="label">
-                                       <description>CPU Text</description>
-                                       <posx>800</posx>
-                                       <posy>40</posy>
-                                       <width>800</width>
-                                       <height>25</height>
-                                       <label>$LOCALIZE[13271] $INFO[System.CPUUsage]</label>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>white</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                                       <font>font12_title</font>
-                               </control>
-                               <control type="progress">
-                                       <description>CPU BAR</description>
-                                       <posx>810</posx>
-                                       <posy>40</posy>
-                                       <width>320</width>
-                                       <height>25</height>
-                                       <info>System.CPUUsage</info>
-                               </control>
-                               <control type="label">
-                                       <description>Memory Text</description>
-                                       <posx>800</posx>
-                                       <posy>70</posy>
-                                       <width>800</width>
-                                       <height>25</height>
-                                       <label>$LOCALIZE[31309] $INFO[system.memory(used.percent)]</label>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>white</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                                       <font>font12_title</font>
-                               </control>
-                               <control type="progress">
-                                       <description>Memory BAR</description>
-                                       <posx>810</posx>
-                                       <posy>70</posy>
-                                       <width>320</width>
-                                       <height>25</height>
-                                       <info>system.memory(used)</info>
-                               </control>
-                       </control>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/SlideShow.xml b/addons/skin.touched/4x3Hirez/SlideShow.xml
deleted file mode 100644 (file)
index 778d873..0000000
+++ /dev/null
@@ -1,221 +0,0 @@
-<window id="2007">
-       <defaultcontrol>2</defaultcontrol>
-       <onunload>Skin.Reset(SlideShowShowOSD)</onunload>
-       <controls>
-               <control type="button">
-                       <description>Hidden button to close the keyboard when its focused</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>ScreenWidth</width>
-                       <height>ScreenHeight</height>
-                       <texturenofocus>-</texturenofocus>
-                       <texturefocus>-</texturefocus>
-                       <onclick>Skin.SetBool(SlideShowShowOSD)</onclick>
-               </control>
-               <control type="group">
-                       <visible>Skin.HasSetting(SlideShowShowOSD) + !Window.IsVisible(PictureInfo)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <include>CommonHeader</include>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>20</posy>
-                               <width>1280</width>
-                               <height>64</height>
-                               <texture>header.png</texture>
-                       </control>
-                       <control type="grouplist">
-                               <description>Top Left bar</description>
-                               <posx>0</posx>
-                               <posy>20</posy>
-                               <width>200</width>
-                               <height>64</height>
-                               <align>left</align>
-                               <itemgap>5</itemgap>
-                               <orientation>horizontal</orientation>
-                               <visible>Player.HasAudio</visible>
-                               <control type="button">
-                                       <description>Playlist Button</description>
-                                       <width>64</width>
-                                       <height>64</height>
-                                       <texturenofocus>icon_playlistmusic.png</texturenofocus>
-                                       <texturefocus>icon_playlistmusic.png</texturefocus>
-                                       <onclick>PreviousMenu</onclick>
-                                       <onclick>ActivateWindow(MusicPlaylist)</onclick>
-                               </control>
-                               <control type="image">
-                                       <width>2</width>
-                                       <height>62</height>
-                                       <texture>header-divide.png</texture>
-                               </control>
-                       </control>
-                       <control type="grouplist">
-                               <description>Top Right bar</description>
-                               <posx>1080r</posx>
-                               <posy>25</posy>
-                               <width>1000</width>
-                               <height>64</height>
-                               <align>right</align>
-                               <itemgap>5</itemgap>
-                               <orientation>horizontal</orientation>
-                               <control type="radiobutton">
-                                       <description>Show Audio Info Button</description>
-                                       <width>270</width>
-                                       <height>50</height>
-                                       <label>$LOCALIZE[544]</label>
-                                       <font>font13</font>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <selected>Skin.HasSetting(SlideShowShowAudioInfo)</selected>
-                                       <texturenofocus border="5">floor_button.png</texturenofocus>
-                                       <texturefocus border="5">floor_buttonFO.png</texturefocus>
-                                       <onclick>Skin.ToggleSetting(SlideShowShowAudioInfo)</onclick>
-                                       <visible>Player.HasAudio</visible>
-                               </control>
-                               <control type="button">
-                                       <description>Image Info Button</description>
-                                       <width>200</width>
-                                       <height>50</height>
-                                       <label>$LOCALIZE[31357]</label>
-                                       <font>font13</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <texturenofocus border="5">floor_button.png</texturenofocus>
-                                       <texturefocus border="5">floor_buttonFO.png</texturefocus>
-                                       <onclick>ActivateWindow(PictureInfo)</onclick>
-                               </control>
-                               <control type="radiobutton">
-                                       <description>Fullscreen Button</description>
-                                       <posy>5</posy>
-                                       <width>230</width>
-                                       <height>50</height>
-                                       <radiowidth>36</radiowidth>
-                                       <radioheight>36</radioheight>
-                                       <font>font13</font>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <texturenofocus border="5">floor_button.png</texturenofocus>
-                                       <texturefocus border="5">floor_buttonFO.png</texturefocus>
-                                       <label>31008</label>
-                                       <onclick>back</onclick>
-                                       <textureradiofocus flipx="true" flipy="true">GoFullscreen2.png</textureradiofocus>
-                                       <textureradionofocus flipx="true" flipy="true">GoFullscreen2.png</textureradionofocus>
-                               </control>
-                       </control>
-                       <control type="group">
-                               <posx>65r</posx>
-                               <posy>20</posy>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>2</width>
-                                       <height>62</height>
-                                       <texture>header-divide.png</texture>
-                               </control>
-                               <control type="button">
-                                       <description>Close Button</description>
-                                       <posx>5</posx>
-                                       <posy>0</posy>
-                                       <width>60</width>
-                                       <height>60</height>
-                                       <font>-</font>
-                                       <onclick>Skin.Reset(SlideShowShowOSD)</onclick>
-                                       <texturefocus>icon_close.png</texturefocus>
-                                       <texturenofocus>icon_close.png</texturenofocus>
-                               </control>
-                       </control>
-                       <control type="group">
-                               <posx>-10</posx>
-                               <posy>440</posy>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>90</width>
-                                       <height>90</height>
-                                       <colordiffuse>EEFFFFFF</colordiffuse>
-                                       <texture border="3">PlayerControls-Background.png</texture>
-                               </control>
-                               <control type="button">
-                                       <description>Previous Image</description>
-                                       <posx>20</posx>
-                                       <posy>10</posy>
-                                       <width>55</width>
-                                       <height>70</height>
-                                       <hitrect x="15" y="5" w="80" h="80" />
-                                       <label>-</label>
-                                       <font>-</font>
-                                       <texturefocus flipx="true">icon_arrowkey.png</texturefocus>
-                                       <texturenofocus flipx="true">icon_arrowkey.png</texturenofocus>
-                                       <onclick>left</onclick>
-                               </control>
-                       </control>
-                       <control type="group">
-                               <posx>80r</posx>
-                               <posy>440</posy>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>90</width>
-                                       <height>90</height>
-                                       <colordiffuse>EEFFFFFF</colordiffuse>
-                                       <texture border="3">PlayerControls-Background.png</texture>
-                               </control>
-                               <control type="button">
-                                       <description>Next Image</description>
-                                       <posx>15</posx>
-                                       <posy>10</posy>
-                                       <width>55</width>
-                                       <height>70</height>
-                                       <hitrect x="5" y="5" w="80" h="80" />
-                                       <label>-</label>
-                                       <font>-</font>
-                                       <texturefocus>icon_arrowkey.png</texturefocus>
-                                       <texturenofocus>icon_arrowkey.png</texturenofocus>
-                                       <onclick>right</onclick>
-                               </control>
-                       </control>
-               </control>
-               <!-- media infos -->
-               <control type="group">
-                       <posx>20</posx>
-                       <posy>160r</posy>
-                       <visible>Skin.HasSetting(SlideShowShowAudioInfo) + Player.HasMedia</visible>
-                       <include>VisibleFadeEffect</include>
-                       <control type="image">
-                               <description>cover image</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>150</width>
-                               <height>150</height>
-                               <info>MusicPlayer.Cover</info>
-                               <aspectratio>keep</aspectratio>
-                               <bordertexture border="8">ThumbShadow.png</bordertexture>
-                               <bordersize>8</bordersize>
-                       </control>
-                       <control type="label">
-                               <posx>160</posx>
-                               <posy>70</posy>
-                               <width>1000</width>
-                               <height>30</height>
-                               <font>font30_title</font>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <label>$INFO[MusicPlayer.Title]</label>
-                               <textcolor>white</textcolor>
-                               <shadowcolor>black</shadowcolor>
-                               <scroll>true</scroll>
-                       </control>
-                       <control type="label">
-                               <description>Album label</description>
-                               <posx>160</posx>
-                               <posy>105</posy>
-                               <width>1000</width>
-                               <height>25</height>
-                               <align>left</align>
-                               <font>font13</font>
-                               <label>$INFO[MusicPlayer.Album]</label>
-                               <textcolor>white</textcolor>
-                               <shadowcolor>black</shadowcolor>
-                       </control>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/SmartPlaylistEditor.xml b/addons/skin.touched/4x3Hirez/SmartPlaylistEditor.xml
deleted file mode 100644 (file)
index 43fd5aa..0000000
+++ /dev/null
@@ -1,314 +0,0 @@
-<window id="136">
-       <defaultcontrol always="true">22</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <include>Window_OpenClose_Animation_Zoom</include>
-       <coordinates>
-               <system>1</system>
-               <posx>140</posx>
-               <posy>30</posy>
-       </coordinates>
-       <controls>
-               <control type="group">
-                       <visible>!Window.IsVisible(smartplaylistrule)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>1000</width>
-                               <height>60</height>
-                               <texture border="5">DialogHeader.png</texture>
-                       </control>
-                       <control type="label" id="2">
-                               <description>header label</description>
-                               <posx>20</posx>
-                               <posy>0</posy>
-                               <include>WindowTitleCommons</include>
-                               <width>910</width>
-                               <label>$LOCALIZE[21432]</label>
-                       </control>
-                       <control type="group">
-                               <posx>930</posx>
-                               <posy>0</posy>
-                               <include>DialogCloseButtonCommons</include>
-                       </control>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>60</posy>
-                               <width>1000</width>
-                               <height>840</height>
-                               <texture border="5">DialogBack.png</texture>
-                       </control>
-                       <control type="spincontrolex" id="22">
-                               <description>Set Playlist type</description>
-                               <posx>20</posx>
-                               <posy>80</posy>
-                               <width>960</width>
-                               <height>50</height>
-                               <label>467</label>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <texturefocus>MenuItemNF.png</texturefocus>
-                               <texturenofocus>MenuItemNF.png</texturenofocus>
-                               <onright>22</onright>
-                               <onleft>22</onleft>
-                               <onup>9001</onup>
-                               <ondown>12</ondown>
-                       </control>
-                       <control type="label">
-                               <description>Name Label</description>
-                               <posx>20</posx>
-                               <posy>140</posy>
-                               <width>960</width>
-                               <height>20</height>
-                               <label>21433</label>
-                               <font>font13_title</font>
-                               <textcolor>black</textcolor>
-                               <align>center</align>
-                       </control>
-                       <control type="edit" id="12">
-                               <description>Name Button</description>
-                               <posx>20</posx>
-                               <posy>180</posy>
-                               <width>960</width>
-                               <height>50</height>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <align>center</align>
-                               <texturefocus>MenuItemNF.png</texturefocus>
-                               <texturenofocus>MenuItemNF.png</texturenofocus>
-                               <label>-</label>
-                               <onup>22</onup>
-                               <onleft>12</onleft>
-                               <onright>12</onright>
-                               <ondown>10</ondown>
-                       </control>
-                       <control type="label">
-                               <description>rules label</description>
-                               <posx>20</posx>
-                               <posy>240</posy>
-                               <width>960</width>
-                               <height>20</height>
-                               <label>21434</label>
-                               <font>font13_title</font>
-                               <textcolor>black</textcolor>
-                               <align>center</align>
-                       </control>
-                       <control type="list" id="10">
-                               <posx>20</posx>
-                               <posy>280</posy>
-                               <width>740</width>
-                               <height>250</height>
-                               <onup>9001</onup>
-                               <onleft>9000</onleft>
-                               <onright>60</onright>
-                               <ondown>12</ondown>
-                               <pagecontrol>60</pagecontrol>
-                               <scrolltime>200</scrolltime>
-                               <itemlayout height="50">
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>740</width>
-                                               <height>51</height>
-                                               <texture border="5">MenuItemNF.png</texture>
-                                       </control>
-                                       <control type="label">
-                                               <posx>10</posx>
-                                               <posy>0</posy>
-                                               <width>720</width>
-                                               <height>50</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <label>$INFO[ListItem.Label]</label>
-                                       </control>
-                               </itemlayout>
-                               <focusedlayout height="50">
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>740</width>
-                                               <height>51</height>
-                                               <texture border="5">MenuItemNF.png</texture>
-                                       </control>
-                                       <control type="label">
-                                               <posx>10</posx>
-                                               <posy>0</posy>
-                                               <width>720</width>
-                                               <height>50</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <label>[COLOR=blue] > [/COLOR] $INFO[ListItem.Label]</label>
-                                       </control>
-                               </focusedlayout>
-                       </control>
-                       <control type="group" id="9000">
-                               <posx>780</posx>
-                               <posy>280</posy>
-                               <control type="button" id="13">
-                                       <description>Add Rule Button</description>
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>200</width>
-                                       <height>50</height>
-                                       <label>15019</label>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <font>font12_title</font>
-                                       <texturefocus border="5">IconBack-focus.png</texturefocus>
-                                       <texturenofocus border="5">ListNF.png</texturenofocus>
-                                       <pulseonselect>false</pulseonselect>
-                                       <onup>18</onup>
-                                       <onleft>60</onleft>
-                                       <onright>10</onright>
-                                       <ondown>13</ondown>
-                               </control>
-                               <control type="button" id="14">
-                                       <description>Remove Rule Button</description>
-                                       <posx>0</posx>
-                                       <posy>55</posy>
-                                       <width>200</width>
-                                       <height>50</height>
-                                       <label>1210</label>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <font>font12_title</font>
-                                       <texturefocus border="5">IconBack-focus.png</texturefocus>
-                                       <texturenofocus border="5">ListNF.png</texturenofocus>
-                                       <pulseonselect>false</pulseonselect>
-                                       <onup>11</onup>
-                                       <onleft>60</onleft>
-                                       <onright>10</onright>
-                                       <ondown>14</ondown>
-                               </control>
-                               <control type="button" id="15">
-                                       <description>Edit Rule Button</description>
-                                       <posx>0</posx>
-                                       <posy>110</posy>
-                                       <width>200</width>
-                                       <height>50</height>
-                                       <label>21435</label>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <font>font12_title</font>
-                                       <texturefocus border="5">IconBack-focus.png</texturefocus>
-                                       <texturenofocus border="5">ListNF.png</texturenofocus>
-                                       <pulseonselect>false</pulseonselect>
-                                       <onup>13</onup>
-                                       <onleft>60</onleft>
-                                       <onright>10</onright>
-                                       <ondown>12</ondown>
-                               </control>
-                       </control>
-
-                       <control type="label">
-                               <description>Options Label</description>
-                               <posx>20</posx>
-                               <posy>550</posy>
-                               <width>960</width>
-                               <height>20</height>
-                               <label>31325</label>
-                               <font>font13_title</font>
-                               <textcolor>black</textcolor>
-                               <align>center</align>
-                       </control>
-                       <control type="spincontrolex" id="16">
-                               <posx>20</posx>
-                               <posy>590</posy>
-                               <width>960</width>
-                               <height>50</height>
-                               <label>21424</label>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <texturefocus>MenuItemNF.png</texturefocus>
-                               <texturenofocus>MenuItemNF.png</texturenofocus>
-                               <onright>16</onright>
-                               <onleft>16</onleft>
-                               <onup>10</onup>
-                               <ondown>17</ondown>
-                       </control>
-
-                       <control type="spincontrolex" id="17">
-                               <posx>20</posx>
-                               <posy>645</posy>
-                               <width>960</width>
-                               <height>50</height>
-                               <label>21427</label>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <texturefocus>MenuItemNF.png</texturefocus>
-                               <texturenofocus>MenuItemNF.png</texturenofocus>
-                               <onright>17</onright>
-                               <onleft>17</onleft>
-                               <onup>16</onup>
-                               <ondown>18</ondown>
-                       </control>
-
-                       <control type="spincontrolex" id="18">
-                               <posx>20</posx>
-                               <posy>700</posy>
-                               <width>750</width>
-                               <height>50</height>
-                               <label>21429</label>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <texturefocus>MenuItemNF.png</texturefocus>
-                               <texturenofocus>MenuItemNF.png</texturenofocus>
-                               <onright>19</onright>
-                               <onleft>19</onleft>
-                               <onup>17</onup>
-                               <ondown>9001</ondown>
-                       </control>
-
-                       <control type="togglebutton" id="19">
-                               <posx>780</posx>
-                               <posy>700</posy>
-                               <width>200</width>
-                               <height>50</height>
-                               <font>font12_title</font>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <texturefocus border="5">IconBack-focus.png</texturefocus>
-                               <texturenofocus border="5">ListNF.png</texturenofocus>
-                               <alttexturefocus border="5">IconBack-focus.png</alttexturefocus>
-                               <alttexturenofocus border="5">ListNF.png</alttexturenofocus>
-                               <label>21431</label>
-                               <altlabel>21430</altlabel>
-                               <onright>18</onright>
-                               <onleft>18</onleft>
-                               <onup>17</onup>
-                               <ondown>9001</ondown>
-                       </control>
-                       <control type="grouplist" id="9002">
-                               <posx>20</posx>
-                               <posy>830</posy>
-                               <width>960</width>
-                               <height>50</height>
-                               <itemgap>20</itemgap>
-                               <align>center</align>
-                               <orientation>horizontal</orientation>
-                               <onleft>9000</onleft>
-                               <onright>9000</onright>
-                               <onup>50</onup>
-                               <ondown>49</ondown>
-                               <control type="button" id="20">
-                                       <description>OK Button</description>
-                                       <width>200</width>
-                                       <include>ButtonInfoDialogsCommonValues</include>
-                                       <label>186</label>
-                               </control>
-                               <control type="button" id="21">
-                                       <description>Cancel Button</description>
-                                       <width>200</width>
-                                       <include>ButtonInfoDialogsCommonValues</include>
-                                       <label>222</label>
-                               </control>
-                       </control>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/SmartPlaylistRule.xml b/addons/skin.touched/4x3Hirez/SmartPlaylistRule.xml
deleted file mode 100644 (file)
index f1de6f1..0000000
+++ /dev/null
@@ -1,165 +0,0 @@
-<window id="137">
-       <defaultcontrol always="true">9001</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <include>Window_OpenClose_Animation_Zoom</include>
-       <coordinates>
-               <system>1</system>
-               <posx>140</posx>
-               <posy>260</posy>
-       </coordinates>
-       <controls>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>1000</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="label">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>910</width>
-                       <label>$LOCALIZE[21421]</label>
-               </control>
-               <control type="group">
-                       <posx>930</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>1000</width>
-                       <height>300</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-               <control type="label">
-                       <description>Rule match label</description>
-                       <posx>20</posx>
-                       <posy>70</posy>
-                       <width>960</width>
-                       <height>20</height>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <font>font13_title</font>
-                       <textcolor>black</textcolor>
-                       <label>21422</label>
-               </control>
-               <control type="group" id="9001">
-                       <control type="spincontrolex" id="15">
-                               <description>Rule Field</description>
-                               <posx>20</posx>
-                               <posy>110</posy>
-                               <width>450</width>
-                               <height>50</height>
-                               <font>-</font>
-                               <textcolor>black</textcolor>
-                               <texturefocus border="5">MenuItemNF.png</texturefocus>
-                               <texturenofocus border="5">MenuItemNF.png</texturenofocus>
-                               <onright>16</onright>
-                               <onleft>16</onleft>
-                               <onup>9000</onup>
-                               <ondown>17</ondown>
-                       </control>
-                       <control type="label">
-                               <description>Rule Field label</description>
-                               <posx>25</posx>
-                               <posy>110</posy>
-                               <width>300</width>
-                               <height>50</height>
-                               <font>font13</font>
-                               <label>$INFO[Control.GetLabel(15)]</label>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <textcolor>black</textcolor>
-                       </control>
-                       <control type="spincontrolex" id="16">
-                               <description>Rule operator</description>
-                               <posx>510</posx>
-                               <posy>110</posy>
-                               <width>450</width>
-                               <height>50</height>
-                               <font>-</font>
-                               <texturefocus border="5">MenuItemNF.png</texturefocus>
-                               <texturenofocus border="5">MenuItemNF.png</texturenofocus>
-                               <onright>15</onright>
-                               <onleft>15</onleft>
-                               <onup>9000</onup>
-                               <ondown>17</ondown>
-                       </control>
-                       <control type="label">
-                               <description>Rule Field label</description>
-                               <posx>515</posx>
-                               <posy>110</posy>
-                               <width>300</width>
-                               <height>50</height>
-                               <font>font13</font>
-                               <label>$INFO[Control.GetLabel(16)]</label>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <textcolor>black</textcolor>
-                       </control>
-               </control>
-               <control type="button" id="17">
-                       <description>Value Button</description>
-                       <posx>20</posx>
-                       <posy>170</posy>
-                       <width>740</width>
-                       <height>50</height>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-                       <aligny>center</aligny>
-                       <texturefocus border="5">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="5">MenuItemNF.png</texturenofocus>
-                       <label>-</label>
-                       <onup>9001</onup>
-                       <onleft>20</onleft>
-                       <onright>20</onright>
-                       <ondown>9000</ondown>
-               </control>
-               <control type="button" id="20">
-                       <description>Browse Button</description>
-                       <posx>760</posx>
-                       <posy>170</posy>
-                       <width>200</width>
-                       <height>50</height>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <texturefocus border="5">IconBack-focus.png</texturefocus>
-                       <texturenofocus border="5">ListNF.png</texturenofocus>
-                       <label>1024</label>
-                       <font>font12_title</font>
-                       <onup>9001</onup>
-                       <onleft>17</onleft>
-                       <onright>17</onright>
-                       <ondown>9000</ondown>
-               </control>
-               <control type="grouplist" id="9002">
-                       <posx>20</posx>
-                       <posy>290</posy>
-                       <width>960</width>
-                       <height>50</height>
-                       <itemgap>20</itemgap>
-                       <align>center</align>
-                       <orientation>horizontal</orientation>
-                       <onleft>9000</onleft>
-                       <onright>9000</onright>
-                       <onup>50</onup>
-                       <ondown>49</ondown>
-                       <control type="button" id="18">
-                               <description>OK Button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>186</label>
-                       </control>
-                       <control type="button" id="19">
-                               <description>Cancel Button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>222</label>
-                       </control>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/Startup.xml b/addons/skin.touched/4x3Hirez/Startup.xml
deleted file mode 100644 (file)
index 817031e..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-<window>
-       <defaultcontrol always="true">10</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <controls>
-               <include>CommonBackground</include>
-               <include>CommonNowPlaying</include>
-               <control type="button" id="10">
-                       <description>trigger</description>
-                       <onfocus>ReplaceWindow(Home)</onfocus>
-                       <texturenofocus>-</texturenofocus>
-                       <texturefocus>-</texturefocus>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/VideoFullScreen.xml b/addons/skin.touched/4x3Hirez/VideoFullScreen.xml
deleted file mode 100644 (file)
index ead0fba..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-<window id="2005">
- <defaultcontrol>-</defaultcontrol>
-       <controls>
-               <!-- codec info -->
-               <control type="group" id="0">
-                       <posx>0</posx>
-                       <posy>20</posy>
-                       <animation effect="fade" time="200">VisibleChange</animation>
-                       <control type="image">
-                               <description>media info background image</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>1280</width>
-                               <height>140</height>
-                               <colordiffuse>AAFFFFFF</colordiffuse>
-                               <texture>black-back.png</texture>
-                       </control>
-                       <control type="label" id="10">
-                               <description>row 1 label</description>
-                               <posx>50</posx>
-                               <posy>10</posy>
-                               <width>1180</width>
-                               <height>30</height>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <font>font12</font>
-                               <label>-</label>
-                       </control>
-                       <control type="label" id="11">
-                               <description>row 2 label</description>
-                               <posx>50</posx>
-                               <posy>40</posy>
-                               <width>1180</width>
-                               <height>30</height>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <font>font12</font>
-                               <label>-</label>
-                       </control>
-                       <control type="label" id="12">
-                               <description>row 3 label</description>
-                               <posx>50</posx>
-                               <posy>85</posy>
-                               <width>1180</width>
-                               <height>30</height>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <font>font12</font>
-                               <label>-</label>
-                       </control>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/VideoOSD.xml b/addons/skin.touched/4x3Hirez/VideoOSD.xml
deleted file mode 100644 (file)
index 40dda23..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<window type="dialog" id="2901">
-       <defaultcontrol></defaultcontrol>
-       <include>dialogeffect</include>
-       <onunload>Skin.Reset(PlayerControlsSubMenuVisible)</onunload>
-       <coordinates>
-               <system>1</system>
-               <posx>0</posx>
-               <posy>0</posy>
-       </coordinates>
-       <controls>
-               <include>PlayerControlCommons</include>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/VideoOSDBookmarks.xml b/addons/skin.touched/4x3Hirez/VideoOSDBookmarks.xml
deleted file mode 100644 (file)
index be1a0ab..0000000
+++ /dev/null
@@ -1,151 +0,0 @@
-<window id="125">
-       <include>Window_OpenClose_Animation_Zoom</include>
-       <coordinates>
-               <system>1</system>
-               <posx>240</posx>
-               <posy>80</posy>
-       </coordinates>
-       <controls>
-               <control type="image">
-                       <description>Shadow Background for dialogs without BehindDialogFadeOut include</description>
-                       <posx>-30</posx>
-                       <posy>-30</posy>
-                       <width>860</width>
-                       <height>860</height>
-                       <texture border="30">DialogShadow.png</texture>
-               </control>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>800</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>800</width>
-                       <height>740</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-               <control type="label">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>700</width>
-                       <label>$LOCALIZE[298]</label>
-               </control>
-               <control type="group">
-                       <posx>730</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               <control type="panel" id="11">
-                       <posx>20</posx>
-                       <posy>65</posy>
-                       <width>760</width>
-                       <height>620</height>
-                       <onleft>2</onleft>
-                       <onright>3</onright>
-                       <ondown>2</ondown>
-                       <onup>2</onup>
-                       <scrolltime>200</scrolltime>
-                       <viewtype label="536">icon</viewtype>
-                       <pagecontrol>-</pagecontrol>
-                       <itemlayout height="250" width="380">
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>0</posy>
-                                       <width>360</width>
-                                       <height>220</height>
-                                       <aspectratio>scale</aspectratio>
-                                       <texture>$INFO[ListItem.Icon]</texture>
-                                       <bordertexture border="8">ThumbShadow.png</bordertexture>
-                                       <bordersize>8</bordersize>
-                               </control>
-                               <control type="label">
-                                       <posx>190</posx>
-                                       <posy>220</posy>
-                                       <width>260</width>
-                                       <height>20</height>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <info>ListItem.Label</info>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout height="250" width="380">
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>0</posy>
-                                       <width>360</width>
-                                       <height>220</height>
-                                       <aspectratio>scale</aspectratio>
-                                       <texture>$INFO[ListItem.Icon]</texture>
-                                       <bordertexture border="8">ThumbShadow.png</bordertexture>
-                                       <bordersize>8</bordersize>
-                               </control>
-                               <control type="label">
-                                       <posx>190</posx>
-                                       <posy>220</posy>
-                                       <width>260</width>
-                                       <height>20</height>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <info>ListItem.Label</info>
-                               </control>
-                       </focusedlayout>
-               </control>
-               <control type="label">
-                       <description>Page Count Label</description>
-                       <posx>780</posx>
-                       <posy>700</posy>
-                       <width>500</width>
-                       <height>20</height>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-                       <scroll>false</scroll>
-                       <align>right</align>
-                       <aligny>center</aligny>
-                       <label>$INFO[Container(11).NumItems,(,) $LOCALIZE[31025]]$INFO[Container(11).CurrentPage, - $LOCALIZE[31024] (]$INFO[Container(11).NumPages,/,)]</label>
-               </control>
-               <control type="grouplist" id="9000">
-                       <posx>20</posx>
-                       <posy>740</posy>
-                       <width>760</width>
-                       <height>50</height>
-                       <itemgap>5</itemgap>
-                       <align>center</align>
-                       <orientation>horizontal</orientation>
-                       <onleft>9000</onleft>
-                       <onright>9000</onright>
-                       <onup>11</onup>
-                       <ondown>11</ondown>
-                       <control type="button" id="2">
-                               <description>Create Bookmark button</description>
-                               <label>294</label>
-                               <width>250</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                       </control>
-                       <control type="button" id="3">
-                               <description>Clear Bookmark button</description>
-                               <label>296</label>
-                               <width>250</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                       </control>
-                       <control type="button" id="4">
-                               <description>Clear Bookmark button</description>
-                               <label>20406</label>
-                               <width>250</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <visible>videoplayer.content(episodes)</visible>
-                       </control>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/VideoOSDSettings.xml b/addons/skin.touched/4x3Hirez/VideoOSDSettings.xml
deleted file mode 100644 (file)
index e04ee0f..0000000
+++ /dev/null
@@ -1,123 +0,0 @@
-<window id="123">
-       <defaultcontrol>5</defaultcontrol>
-       <include>Window_OpenClose_Animation_Zoom</include>
-       <coordinates>
-               <system>1</system>
-               <posx>240</posx>
-               <posy>80</posy>
-       </coordinates>
-       <controls>
-               <control type="image">
-                       <description>Shadow Background for dialogs without BehindDialogFadeOut include</description>
-                       <posx>-30</posx>
-                       <posy>-30</posy>
-                       <width>860</width>
-                       <height>860</height>
-                       <texture border="30">DialogShadow.png</texture>
-               </control>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>800</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>800</width>
-                       <height>740</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-               <control type="label">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>700</width>
-                       <label>$LOCALIZE[3] - $LOCALIZE[5]</label>
-                       <visible>Window.IsVisible(123)</visible>
-               </control>
-               <control type="label">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>700</width>
-                       <label>$LOCALIZE[292] - $LOCALIZE[5]</label>
-                       <visible>Window.IsVisible(124)</visible>
-               </control>
-               <control type="group">
-                       <posx>730</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               <control type="label" id="3">
-                       <description>No Settings Label</description>
-                       <posx>20</posx>
-                       <posy>180</posy>
-                       <width>760</width>
-                       <align>center</align>
-                       <label>13390</label>
-                       <font>font13_title</font>
-               </control>
-               <control type="grouplist" id="5">
-                       <description>control area</description>
-                       <posx>20</posx>
-                       <posy>60</posy>
-                       <width>760</width>
-                       <height>650</height>
-                       <itemgap>-1</itemgap>
-                       <pagecontrol>-</pagecontrol>
-                       <onleft>5</onleft>
-                       <onright>5</onright>
-                       <onup>5</onup>
-                       <ondown>5</ondown>
-               </control>
-               <control type="sliderex" id="10">
-                       <description>Default Slider</description>
-                       <height>55</height>
-                       <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-               </control>
-               <control type="button" id="7">
-                       <description>Default Button</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <height>55</height>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-                       <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-               </control>
-               <control type="radiobutton" id="8">
-                       <description>Default RadioButton</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <height>55</height>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-                       <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-               </control>
-               <control type="spincontrolex" id="9">
-                       <description>Default SpinControlex</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <height>55</height>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-                       <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-                       <aligny>center</aligny>
-                       <reverse>yes</reverse>
-               </control>
-               <control type="image" id="11">
-                       <description>separator image</description>
-                       <height>5</height>
-                       <texture>separator.png</texture>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/VideoOverlay.xml b/addons/skin.touched/4x3Hirez/VideoOverlay.xml
deleted file mode 100644 (file)
index 28b36e8..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<window id="2904">
-       <defaultcontrol>-</defaultcontrol>
-       <controls>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/ViewsAddonBrowser.xml b/addons/skin.touched/4x3Hirez/ViewsAddonBrowser.xml
deleted file mode 100644 (file)
index a3243d9..0000000
+++ /dev/null
@@ -1,162 +0,0 @@
-<includes>
-       <include name="CommonRootViewAddons">
-               <control type="panel" id="50">
-                       <posx>50</posx>
-                       <posy>120</posy>
-                       <width>1180</width>
-                       <height>720</height>
-                       <onleft>2</onleft>
-                       <onright>60</onright>
-                       <onup>50</onup>
-                       <ondown>50</ondown>
-                       <viewtype label="535">list</viewtype>
-                       <pagecontrol>60</pagecontrol>
-                       <scrolltime>200</scrolltime>
-                       <itemlayout height="60" width="1180">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>1180</width>
-                                       <height>60</height>
-                                       <texture border="5">ListNF.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>5</posy>
-                                       <width>50</width>
-                                       <height>50</height>
-                                       <texture background="true">$INFO[ListItem.Icon]</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>75</posx>
-                                       <posy>0</posy>
-                                       <width>1000</width>
-                                       <height>60</height>
-                                       <font>font16</font>
-                                       <textcolor>grey2</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                               <control type="label">
-                                       <posx>1130</posx>
-                                       <posy>2</posy>
-                                       <width>400</width>
-                                       <height>30</height>
-                                       <font>font13</font>
-                                       <textcolor>grey2</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Property(Addon.Status),, - ]$INFO[ListItem.Property(Addon.Version)]</label>
-                                       <visible>!stringcompare(ListItem.Property(Addon.Status),$LOCALIZE[305])</visible>
-                               </control>
-                               <control type="label">
-                                       <posx>1130</posx>
-                                       <posy>2</posy>
-                                       <width>400</width>
-                                       <height>30</height>
-                                       <font>font13</font>
-                                       <textcolor>grey2</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Property(Addon.Version)]</label>
-                                       <visible>stringcompare(ListItem.Property(Addon.Status),$LOCALIZE[305])</visible>
-                               </control>
-                               <control type="image">
-                                       <description>Rating value</description>
-                                       <posx>1030</posx>
-                                       <posy>30</posy>
-                                       <width>100</width>
-                                       <height>25</height>
-                                       <aspectratio align="left">keep</aspectratio>
-                                       <texture fallback="light/left_rating/rating0.png">$INFO[ListItem.Property(Addon.StarRating),light/left_rating/]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>1140</posx>
-                                       <posy>15</posy>
-                                       <width>30</width>
-                                       <height>30</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture>light/OverlayWatched.png</texture>
-                                       <visible>stringcompare(ListItem.Label2,$LOCALIZE[305])</visible>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout height="60" width="1180">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>1180</width>
-                                       <height>60</height>
-                                       <texture border="5">ListFO.png</texture>
-                                       <include>VisibleFadeEffect</include>
-                               </control>
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>5</posy>
-                                       <width>50</width>
-                                       <height>50</height>
-                                       <texture background="true">$INFO[ListItem.Icon]</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>75</posx>
-                                       <posy>0</posy>
-                                       <width>1000</width>
-                                       <height>60</height>
-                                       <font>font16</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                               <control type="label">
-                                       <posx>1130</posx>
-                                       <posy>2</posy>
-                                       <width>400</width>
-                                       <height>30</height>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Property(Addon.Status),, - ]$INFO[ListItem.Property(Addon.Version)]</label>
-                                       <visible>!stringcompare(ListItem.Property(Addon.Status),$LOCALIZE[305])</visible>
-                               </control>
-                               <control type="label">
-                                       <posx>1130</posx>
-                                       <posy>2</posy>
-                                       <width>400</width>
-                                       <height>30</height>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Property(Addon.Version)]</label>
-                                       <visible>stringcompare(ListItem.Property(Addon.Status),$LOCALIZE[305])</visible>
-                               </control>
-                               <control type="image">
-                                       <description>Rating value</description>
-                                       <posx>1030</posx>
-                                       <posy>30</posy>
-                                       <width>100</width>
-                                       <height>25</height>
-                                       <aspectratio align="left">keep</aspectratio>
-                                       <texture fallback="dark/left_rating/rating0.png">$INFO[ListItem.Property(Addon.StarRating),light/left_rating/]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>1140</posx>
-                                       <posy>15</posy>
-                                       <width>30</width>
-                                       <height>30</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture>dark/OverlayWatched.png</texture>
-                                       <visible>stringcompare(ListItem.Label2,$LOCALIZE[305])</visible>
-                               </control>
-                       </focusedlayout>
-               </control>
-       </include>
-</includes>
diff --git a/addons/skin.touched/4x3Hirez/ViewsCommon.xml b/addons/skin.touched/4x3Hirez/ViewsCommon.xml
deleted file mode 100644 (file)
index 6b2c044..0000000
+++ /dev/null
@@ -1,931 +0,0 @@
-<includes>
-       <include name="CommonRootView">
-               <control type="panel" id="50">
-                       <posx>50</posx>
-                       <posy>120</posy>
-                       <width>1180</width>
-                       <height>720</height>
-                       <onleft>2</onleft>
-                       <onright>60</onright>
-                       <onup>50</onup>
-                       <ondown>50</ondown>
-                       <viewtype label="535">list</viewtype>
-                       <pagecontrol>60</pagecontrol>
-                       <scrolltime>200</scrolltime>
-                       <itemlayout height="60" width="1180">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>1180</width>
-                                       <height>60</height>
-                                       <texture border="5">ListNF.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>5</posy>
-                                       <width>50</width>
-                                       <height>50</height>
-                                       <texture background="true">$INFO[ListItem.Icon]</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>75</posx>
-                                       <posy>0</posy>
-                                       <width>1000</width>
-                                       <height>60</height>
-                                       <font>font16</font>
-                                       <textcolor>grey2</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                               <control type="label">
-                                       <posx>1160</posx>
-                                       <posy>2</posy>
-                                       <width>400</width>
-                                       <height>30</height>
-                                       <font>font13</font>
-                                       <textcolor>grey2</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label2]</label>
-                               </control>
-                               <control type="image">
-                                       <description>Rating value</description>
-                                       <posx>1065</posx>
-                                       <posy>30</posy>
-                                       <width>100</width>
-                                       <height>25</height>
-                                       <aspectratio align="left">keep</aspectratio>
-                                       <texture fallback="light/left_rating/rating0.png">$INFO[ListItem.StarRating,light/left_rating/]</texture>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout height="60" width="1180">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>1180</width>
-                                       <height>60</height>
-                                       <texture border="5">ListFO.png</texture>
-                                       <include>VisibleFadeEffect</include>
-                               </control>
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>5</posy>
-                                       <width>50</width>
-                                       <height>50</height>
-                                       <texture background="true">$INFO[ListItem.Icon]</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>75</posx>
-                                       <posy>0</posy>
-                                       <width>1000</width>
-                                       <height>60</height>
-                                       <font>font16</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                               <control type="label">
-                                       <posx>1160</posx>
-                                       <posy>2</posy>
-                                       <width>400</width>
-                                       <height>30</height>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label2]</label>
-                               </control>
-                               <control type="image">
-                                       <description>Rating value</description>
-                                       <posx>1065</posx>
-                                       <posy>30</posy>
-                                       <width>100</width>
-                                       <height>25</height>
-                                       <aspectratio align="left">keep</aspectratio>
-                                       <texture fallback="dark/left_rating/rating0.png">$INFO[ListItem.StarRating,dark/left_rating/]</texture>
-                               </control>
-                       </focusedlayout>
-               </control>
-       </include>
-       <include name="CommonRootViewVideo">
-               <control type="panel" id="50">
-                       <posx>50</posx>
-                       <posy>120</posy>
-                       <width>1180</width>
-                       <height>720</height>
-                       <onleft>2</onleft>
-                       <onright>60</onright>
-                       <onup>50</onup>
-                       <ondown>50</ondown>
-                       <viewtype label="535">list</viewtype>
-                       <pagecontrol>60</pagecontrol>
-                       <scrolltime>200</scrolltime>
-                       <itemlayout height="60" width="1180">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>1180</width>
-                                       <height>60</height>
-                                       <texture border="5">ListNF.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>5</posy>
-                                       <width>50</width>
-                                       <height>50</height>
-                                       <texture background="true">$INFO[ListItem.Icon]</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>75</posx>
-                                       <posy>0</posy>
-                                       <width>1000</width>
-                                       <height>60</height>
-                                       <font>font16</font>
-                                       <textcolor>grey2</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                               <control type="label">
-                                       <posx>1130</posx>
-                                       <posy>2</posy>
-                                       <width>400</width>
-                                       <height>30</height>
-                                       <font>font13</font>
-                                       <textcolor>grey2</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label2]</label>
-                                       <visible>![Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible>
-                               </control>
-                               <control type="image">
-                                       <description>Rating value</description>
-                                       <posx>1030</posx>
-                                       <posy>30</posy>
-                                       <width>100</width>
-                                       <height>25</height>
-                                       <aspectratio align="left">keep</aspectratio>
-                                       <texture fallback="light/left_rating/rating0.png">$INFO[ListItem.StarRating,light/left_rating/]</texture>
-                                       <visible>![Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible>
-                               </control>
-                               <control type="label">
-                                       <posx>1070</posx>
-                                       <posy>2</posy>
-                                       <width>400</width>
-                                       <height>30</height>
-                                       <font>font13</font>
-                                       <textcolor>grey2</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label2]</label>
-                                       <visible>[Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible>
-                               </control>
-                               <control type="image">
-                                       <description>Rating value</description>
-                                       <posx>970</posx>
-                                       <posy>30</posy>
-                                       <width>100</width>
-                                       <height>25</height>
-                                       <aspectratio align="left">keep</aspectratio>
-                                       <texture fallback="light/left_rating/rating0.png">$INFO[ListItem.StarRating,light/left_rating/]</texture>
-                                       <visible>[Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible>
-                               </control>
-                               <control type="image">
-                                       <posx>1080</posx>
-                                       <posy>10</posy>
-                                       <width>60</width>
-                                       <height>40</height>
-                                       <texture>$INFO[ListItem.VideoResolution,light/,.png]</texture>
-                                       <visible>[Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible>
-                               </control>
-                               <control type="image">
-                                       <posx>1142</posx>
-                                       <posy>17</posy>
-                                       <width>25</width>
-                                       <height>25</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture>OverlayWatching.png</texture>
-                                       <visible>ListItem.IsResumable</visible>
-                               </control>
-                               <control type="image">
-                                       <posx>1140</posx>
-                                       <posy>15</posy>
-                                       <width>30</width>
-                                       <height>30</height>
-                                       <texture>$INFO[ListItem.Overlay,light/]</texture>
-                                       <visible>!ListItem.IsResumable</visible>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout height="60" width="1180">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>1180</width>
-                                       <height>60</height>
-                                       <texture border="5">ListFO.png</texture>
-                                       <include>VisibleFadeEffect</include>
-                               </control>
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>5</posy>
-                                       <width>50</width>
-                                       <height>50</height>
-                                       <texture background="true">$INFO[ListItem.Icon]</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>75</posx>
-                                       <posy>0</posy>
-                                       <width>1000</width>
-                                       <height>60</height>
-                                       <font>font16</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                               <control type="label">
-                                       <posx>1130</posx>
-                                       <posy>2</posy>
-                                       <width>400</width>
-                                       <height>30</height>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label2]</label>
-                                       <visible>![Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible>
-                               </control>
-                               <control type="image">
-                                       <description>Rating value</description>
-                                       <posx>1030</posx>
-                                       <posy>30</posy>
-                                       <width>100</width>
-                                       <height>25</height>
-                                       <aspectratio align="left">keep</aspectratio>
-                                       <texture fallback="dark/left_rating/rating0.png">$INFO[ListItem.StarRating,dark/left_rating/]</texture>
-                                       <visible>![Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible>
-                               </control>
-                               <control type="label">
-                                       <posx>1070</posx>
-                                       <posy>2</posy>
-                                       <width>400</width>
-                                       <height>30</height>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label2]</label>
-                                       <visible>[Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible>
-                               </control>
-                               <control type="image">
-                                       <description>Rating value</description>
-                                       <posx>970</posx>
-                                       <posy>30</posy>
-                                       <width>100</width>
-                                       <height>25</height>
-                                       <aspectratio align="left">keep</aspectratio>
-                                       <texture fallback="dark/left_rating/rating0.png">$INFO[ListItem.StarRating,dark/left_rating/]</texture>
-                                       <visible>[Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible>
-                               </control>
-                               <control type="image">
-                                       <posx>1080</posx>
-                                       <posy>10</posy>
-                                       <width>60</width>
-                                       <height>40</height>
-                                       <texture>$INFO[ListItem.VideoResolution,dark/,.png]</texture>
-                                       <visible>[Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible>
-                               </control>
-                               <control type="image">
-                                       <posx>1142</posx>
-                                       <posy>17</posy>
-                                       <width>25</width>
-                                       <height>25</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture>OverlayWatching.png</texture>
-                                       <visible>ListItem.IsResumable</visible>
-                               </control>
-                               <control type="image">
-                                       <posx>1140</posx>
-                                       <posy>15</posy>
-                                       <width>30</width>
-                                       <height>30</height>
-                                       <texture>$INFO[ListItem.Overlay,dark/]</texture>
-                                       <visible>!ListItem.IsResumable</visible>
-                               </control>
-                       </focusedlayout>
-               </control>
-       </include>
-       <include name="ThumbnailView">
-               <control type="panel" id="500">
-                       <posx>50</posx>
-                       <posy>120</posy>
-                       <width>1180</width>
-                       <height>720</height>
-                       <onleft>2</onleft>
-                       <onright>60</onright>
-                       <onup>500</onup>
-                       <ondown>500</ondown>
-                       <viewtype label="21371">wide</viewtype>
-                       <pagecontrol>60</pagecontrol>
-                       <scrolltime>200</scrolltime>
-                       <preloaditems>2</preloaditems>
-                       <itemlayout condition="!Container.Content(Movies) + !Container.Content(Seasons) + !Container.Content(Episodes)" height="240" width="236">
-                               <control type="image">
-                                       <posx>5</posx>
-                                       <posy>5</posy>
-                                       <width>226</width>
-                                       <height>230</height>
-                                       <texture border="5">SubBack.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>10</posy>
-                                       <width>216</width>
-                                       <height>185</height>
-                                       <texture background="true">$INFO[Listitem.Icon]</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>119</posx>
-                                       <posy>200</posy>
-                                       <width>210</width>
-                                       <height>25</height>
-                                       <font>font12</font>
-                                       <textcolor>grey2</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <info>ListItem.Label</info>
-                               </control>
-                               <control type="image">
-                                       <posx>184</posx>
-                                       <posy>11</posy>
-                                       <width>40</width>
-                                       <height>30</height>
-                                       <texture>$INFO[ListItem.VideoResolution,light/,.png]</texture>
-                                       <visible>Container.Content(MusicVideos)</visible>
-                               </control>
-                               <control type="image">
-                                       <posx>195</posx>
-                                       <posy>170</posy>
-                                       <width>30</width>
-                                       <height>30</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture>$INFO[ListItem.Overlay]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>5</posx>
-                                       <posy>5</posy>
-                                       <width>226</width>
-                                       <height>230</height>
-                                       <texture>GlassOverlay.png</texture>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout condition="!Container.Content(Movies) + !Container.Content(Seasons) + !Container.Content(Episodes)" height="240" width="236">
-                               <control type="image">
-                                       <posx>5</posx>
-                                       <posy>5</posy>
-                                       <width>226</width>
-                                       <height>230</height>
-                                       <texture border="5">SubBack2.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>10</posy>
-                                       <width>216</width>
-                                       <height>185</height>
-                                       <texture background="true">$INFO[Listitem.Icon]</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>119</posx>
-                                       <posy>200</posy>
-                                       <width>210</width>
-                                       <height>25</height>
-                                       <font>font12</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <info>ListItem.Label</info>
-                               </control>
-                               <control type="image">
-                                       <posx>184</posx>
-                                       <posy>11</posy>
-                                       <width>40</width>
-                                       <height>30</height>
-                                       <texture>$INFO[ListItem.VideoResolution,light/,.png]</texture>
-                                       <visible>Container.Content(MusicVideos)</visible>
-                               </control>
-                               <control type="image">
-                                       <posx>195</posx>
-                                       <posy>170</posy>
-                                       <width>30</width>
-                                       <height>30</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture>$INFO[ListItem.Overlay]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>5</posx>
-                                       <posy>5</posy>
-                                       <width>226</width>
-                                       <height>230</height>
-                                       <texture>GlassOverlay.png</texture>
-                               </control>
-                       </focusedlayout>
-                       <itemlayout condition="Container.Content(Movies) | Container.Content(Seasons)" height="360" width="236">
-                               <control type="image">
-                                       <posx>5</posx>
-                                       <posy>5</posy>
-                                       <width>226</width>
-                                       <height>350</height>
-                                       <texture border="5">SubBack.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>15</posx>
-                                       <posy>15</posy>
-                                       <width>206</width>
-                                       <height>300</height>
-                                       <texture background="true">$INFO[Listitem.Icon]</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>119</posx>
-                                       <posy>320</posy>
-                                       <width>210</width>
-                                       <height>25</height>
-                                       <font>font12</font>
-                                       <textcolor>grey2</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <info>ListItem.Label</info>
-                               </control>
-                               <control type="image">
-                                       <posx>184</posx>
-                                       <posy>11</posy>
-                                       <width>40</width>
-                                       <height>30</height>
-                                       <texture>$INFO[ListItem.VideoResolution,light/,.png]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>195</posx>
-                                       <posy>280</posy>
-                                       <width>30</width>
-                                       <height>30</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture>$INFO[ListItem.Overlay]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>5</posx>
-                                       <posy>5</posy>
-                                       <width>245</width>
-                                       <height>350</height>
-                                       <texture>GlassOverlay.png</texture>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout condition="Container.Content(Movies) | Container.Content(Seasons)" height="360" width="236">
-                               <control type="image">
-                                       <posx>5</posx>
-                                       <posy>5</posy>
-                                       <width>226</width>
-                                       <height>350</height>
-                                       <texture border="5">SubBack2.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>15</posx>
-                                       <posy>15</posy>
-                                       <width>206</width>
-                                       <height>300</height>
-                                       <texture background="true">$INFO[Listitem.Icon]</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>119</posx>
-                                       <posy>320</posy>
-                                       <width>210</width>
-                                       <height>25</height>
-                                       <font>font12</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <info>ListItem.Label</info>
-                               </control>
-                               <control type="image">
-                                       <posx>184</posx>
-                                       <posy>11</posy>
-                                       <width>40</width>
-                                       <height>30</height>
-                                       <texture>$INFO[ListItem.VideoResolution,light/,.png]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>195</posx>
-                                       <posy>280</posy>
-                                       <width>30</width>
-                                       <height>30</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture>$INFO[ListItem.Overlay]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>5</posx>
-                                       <posy>5</posy>
-                                       <width>245</width>
-                                       <height>350</height>
-                                       <texture>GlassOverlay.png</texture>
-                               </control>
-                       </focusedlayout>
-                       <itemlayout condition="Container.Content(Episodes)" height="240" width="295">
-                               <control type="image">
-                                       <posx>5</posx>
-                                       <posy>5</posy>
-                                       <width>285</width>
-                                       <height>230</height>
-                                       <texture border="5">SubBack.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>10</posy>
-                                       <width>275</width>
-                                       <height>185</height>
-                                       <aspectratio>scale</aspectratio>
-                                       <texture background="true">$INFO[Listitem.Icon]</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>148</posx>
-                                       <posy>200</posy>
-                                       <width>275</width>
-                                       <height>25</height>
-                                       <font>font12</font>
-                                       <textcolor>grey2</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <info>ListItem.Label</info>
-                               </control>
-                               <control type="image">
-                                       <posx>245</posx>
-                                       <posy>10</posy>
-                                       <width>40</width>
-                                       <height>30</height>
-                                       <texture>$INFO[ListItem.VideoResolution,light/,.png]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>250</posx>
-                                       <posy>170</posy>
-                                       <width>30</width>
-                                       <height>30</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture>$INFO[ListItem.Overlay]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>5</posx>
-                                       <posy>5</posy>
-                                       <width>226</width>
-                                       <height>230</height>
-                                       <texture>GlassOverlay.png</texture>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout condition="Container.Content(Episodes)" height="240" width="295">
-                               <control type="image">
-                                       <posx>5</posx>
-                                       <posy>5</posy>
-                                       <width>285</width>
-                                       <height>230</height>
-                                       <texture border="5">SubBack2.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>10</posy>
-                                       <width>275</width>
-                                       <height>185</height>
-                                       <aspectratio>scale</aspectratio>
-                                       <texture background="true">$INFO[Listitem.Icon]</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>148</posx>
-                                       <posy>200</posy>
-                                       <width>275</width>
-                                       <height>25</height>
-                                       <font>font12</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <info>ListItem.Label</info>
-                               </control>
-                               <control type="image">
-                                       <posx>245</posx>
-                                       <posy>10</posy>
-                                       <width>40</width>
-                                       <height>30</height>
-                                       <texture>$INFO[ListItem.VideoResolution,light/,.png]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>250</posx>
-                                       <posy>170</posy>
-                                       <width>30</width>
-                                       <height>30</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture>$INFO[ListItem.Overlay]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>5</posx>
-                                       <posy>5</posy>
-                                       <width>226</width>
-                                       <height>230</height>
-                                       <texture>GlassOverlay.png</texture>
-                               </control>
-                       </focusedlayout>
-               </control>
-       </include>
-       <include name="WideIconView">
-               <control type="panel" id="502">
-                       <visible>!Container.Content(Movies) + !Container.Content(Episodes) + !Container.Content(Seasons) + !Container.Content(MusicVideos)</visible>
-                       <posx>40</posx>
-                       <posy>145</posy>
-                       <width>1200</width>
-                       <height>640</height>
-                       <onleft>502</onleft>
-                       <onright>502</onright>
-                       <onup>502</onup>
-                       <ondown>502</ondown>
-                       <pagecontrol>60</pagecontrol>
-                       <scrolltime>300</scrolltime>
-                       <preloaditems>2</preloaditems>
-                       <viewtype label="539">wide</viewtype>
-                       <itemlayout height="160" width="600">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>5</posy>
-                                       <width>590</width>
-                                       <height>155</height>
-                                       <texture border="5">SubBack.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>15</posy>
-                                       <width>570</width>
-                                       <height>110</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture background="true">$INFO[ListItem.Icon]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>5</posy>
-                                       <width>200</width>
-                                       <height>155</height>
-                                       <texture>GlassOverlay.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>10</posx>
-                                       <posy>130</posy>
-                                       <width>380</width>
-                                       <height>20</height>
-                                       <font>font13</font>
-                                       <textcolor>grey2</textcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                               <control type="label">
-                                       <posx>580</posx>
-                                       <posy>130</posy>
-                                       <width>380</width>
-                                       <height>20</height>
-                                       <font>font12</font>
-                                       <textcolor>grey2</textcolor>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label2]</label>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout height="160" width="600">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>5</posy>
-                                       <width>590</width>
-                                       <height>155</height>
-                                       <texture border="5">SubBack2.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>15</posy>
-                                       <width>570</width>
-                                       <height>110</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture background="true">$INFO[ListItem.Icon]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>5</posy>
-                                       <width>200</width>
-                                       <height>155</height>
-                                       <texture>GlassOverlay.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>10</posx>
-                                       <posy>130</posy>
-                                       <width>380</width>
-                                       <height>20</height>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                               <control type="label">
-                                       <posx>580</posx>
-                                       <posy>130</posy>
-                                       <width>380</width>
-                                       <height>20</height>
-                                       <font>font12</font>
-                                       <textcolor>black</textcolor>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label2]</label>
-                               </control>
-                       </focusedlayout>
-               </control>
-       </include>
-       <include name="DVDPostersView">
-               <control type="fixedlist" id="501">
-                       <visible>!Container.Content(LiveTV)</visible>
-                       <posx>40</posx>
-                       <posy>260</posy>
-                       <width>1200</width>
-                       <height>390</height>
-                       <onleft>57</onleft>
-                       <onright>57</onright>
-                       <onup>2</onup>
-                       <ondown>60</ondown>
-                       <viewtype label="31028">bigwrap</viewtype>
-                       <pagecontrol>60</pagecontrol>
-                       <scrolltime>200</scrolltime>
-                       <focusposition>2</focusposition>
-                       <orientation>horizontal</orientation>
-                       <preloaditems>4</preloaditems>
-                       <itemlayout height="350" width="240">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>240</width>
-                                       <height>350</height>
-                                       <aspectratio>stretch</aspectratio>
-                                       <texture border="5">SubBack.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>10</posy>
-                                       <width>220</width>
-                                       <height>330</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture background="true">$INFO[ListItem.Icon]</texture>
-                                       <bordertexture>ThumbBorderGrey.png</bordertexture>
-                                       <bordersize>2</bordersize>
-                               </control>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>240</width>
-                                       <height>350</height>
-                                       <texture>GlassOverlay.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>192</posx>
-                                       <posy>6</posy>
-                                       <width>40</width>
-                                       <height>30</height>
-                                       <texture>$INFO[ListItem.VideoResolution,light/,.png]</texture>
-                                       <visible>[Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout height="310" width="240">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>240</width>
-                                       <height>350</height>
-                                       <aspectratio>stretch</aspectratio>
-                                       <texture border="5">SubBack.png</texture>
-                                       <animation reversible="false" effect="zoom" center="auto" start="100" end="120" time="200">focus</animation>
-                                       <animation reversible="false" effect="zoom" center="auto" end="100" start="120" time="200">unfocus</animation>
-                               </control>
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>10</posy>
-                                       <width>220</width>
-                                       <height>330</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture background="true">$INFO[ListItem.Icon]</texture>
-                                       <bordertexture>ThumbBorderGrey.png</bordertexture>
-                                       <bordersize>2</bordersize>
-                                       <animation reversible="false" effect="zoom" center="auto" start="100" end="120" time="200">focus</animation>
-                                       <animation reversible="false" effect="zoom" center="auto" end="100" start="120" time="200">unfocus</animation>
-                               </control>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>240</width>
-                                       <height>350</height>
-                                       <texture>GlassOverlay.png</texture>
-                                       <animation reversible="false" effect="zoom" center="auto" start="100" end="120" time="200">focus</animation>
-                                       <animation reversible="false" effect="zoom" center="auto" end="100" start="120" time="200">unfocus</animation>
-                               </control>
-                               <control type="image">
-                                       <posx>192</posx>
-                                       <posy>6</posy>
-                                       <width>40</width>
-                                       <height>30</height>
-                                       <texture>$INFO[ListItem.VideoResolution,light/,.png]</texture>
-                                       <visible>[Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible>
-                                       <animation reversible="false" effect="slide" start="0,0" end="20,-30" time="200">focus</animation>
-                                       <animation reversible="false" effect="slide" end="0,0" start="20,-30" time="200">unfocus</animation>
-                               </control>
-                               <control type="image">
-                                       <posx>185</posx>
-                                       <posy>310</posy>
-                                       <width>35</width>
-                                       <height>35</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture>$INFO[ListItem.Overlay]</texture>
-                                       <animation type="focus">
-                                               <effect type="fade" start="0" end="100" time="200" />
-                                               <effect type="slide" start="0,0" end="40,40" time="200" />
-                                       </animation>
-                                       <animation type="unfocus">
-                                               <effect type="fade" start="100" end="0" time="200" />
-                                               <effect type="slide" end="0,0" start="40,40" time="200" />
-                                       </animation>
-                               </control>
-                       </focusedlayout>
-               </control>
-               <control type="group">
-                       <visible>Control.IsVisible(501)</visible>
-                       <posx>0</posx>
-                       <posy>410</posy>
-                       <control type="button">
-                               <description>left Arrow</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>40</width>
-                               <height>60</height>
-                               <texturefocus>arrow-big-left.png</texturefocus>
-                               <texturenofocus>arrow-big-left.png</texturenofocus>
-                               <onclick>FirstPage</onclick>
-                               <visible>Container.HasPrevious</visible>
-                               <include>VisibleFadeEffect</include>
-                       </control>
-                       <control type="button">
-                               <description>right Arrow</description>
-                               <posx>40r</posx>
-                               <posy>0</posy>
-                               <width>40</width>
-                               <height>60</height>
-                               <texturefocus>arrow-big-right.png</texturefocus>
-                               <texturenofocus>arrow-big-right.png</texturenofocus>
-                               <onclick>LastPage</onclick>
-                               <visible>Container.HasNext</visible>
-                               <include>VisibleFadeEffect</include>
-                       </control>
-               </control>
-               <control type="label">
-                       <visible>Control.IsVisible(501)</visible>
-                       <posx>30</posx>
-                       <posy>160</posy>
-                       <width>1220</width>
-                       <height>30</height>
-                       <font>font28_title</font>
-                       <textcolor>white</textcolor>
-                       <scroll>true</scroll>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <label>$INFO[ListItem.Label]</label>
-               </control>
-               <control type="grouplist">
-                       <description>Media Codec Flagging Images</description>
-                       <visible>Control.IsVisible(501)</visible>
-                       <posx>0</posx>
-                       <posy>680</posy>
-                       <width>1280</width>
-                       <height>45</height>
-                       <align>center</align>
-                       <itemgap>2</itemgap>
-                       <orientation>horizontal</orientation>
-                       <include>VisibleFadeEffect</include>
-                       <include>VideoCodecFlaggingConditions</include>
-                       <include>AudioCodecFlaggingConditions</include>
-                       <include>AudioChannelsFlaggingConditions</include>
-                       <include>AspectCodecFlaggingConditions</include>
-                       <include>VideoTypeHackFlaggingConditions</include>
-               </control>
-       </include>
-</includes>
diff --git a/addons/skin.touched/4x3Hirez/ViewsMetaData.xml b/addons/skin.touched/4x3Hirez/ViewsMetaData.xml
deleted file mode 100644 (file)
index f81dc7c..0000000
+++ /dev/null
@@ -1,557 +0,0 @@
-<includes>
-       <include name="RootViewMetaDataVideo">
-               <control type="panel" id="550">
-                       <visible>Container.Content(Movies) | Container.Content(Episodes)</visible>
-                       <posx>50</posx>
-                       <posy>120</posy>
-                       <width>1180</width>
-                       <height>720</height>
-                       <onleft>2</onleft>
-                       <onright>60</onright>
-                       <onup>550</onup>
-                       <ondown>550</ondown>
-                       <viewtype label="31030">list</viewtype>
-                       <pagecontrol>60</pagecontrol>
-                       <scrolltime>200</scrolltime>
-                       <itemlayout condition="Container.Content(Movies)" height="180" width="1180">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>5</posy>
-                                       <width>1180</width>
-                                       <height>170</height>
-                                       <texture border="5">SubBack.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>5</posx>
-                                       <posy>10</posy>
-                                       <width>110</width>
-                                       <height>160</height>
-                                       <texture background="true">$INFO[ListItem.Icon]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>5</posy>
-                                       <width>210</width>
-                                       <height>170</height>
-                                       <texture>GlassOverlay.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>130</posx>
-                                       <posy>15</posy>
-                                       <width>940</width>
-                                       <height>25</height>
-                                       <font>font13_title</font>
-                                       <textcolor>white</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                               <control type="label">
-                                       <posx>130</posx>
-                                       <posy>45</posy>
-                                       <width>940</width>
-                                       <height>20</height>
-                                       <font>font13</font>
-                                       <textcolor>white</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Genre]</label>
-                               </control>
-                               <control type="label">
-                                       <posx>1070</posx>
-                                       <posy>7</posy>
-                                       <width>400</width>
-                                       <height>30</height>
-                                       <font>font13</font>
-                                       <textcolor>grey2</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label2]</label>
-                               </control>
-                               <control type="image">
-                                       <description>Rating value</description>
-                                       <posx>970</posx>
-                                       <posy>35</posy>
-                                       <width>100</width>
-                                       <height>25</height>
-                                       <aspectratio align="left">keep</aspectratio>
-                                       <texture fallback="light/left_rating/rating0.png">$INFO[ListItem.StarRating,light/left_rating/]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>1080</posx>
-                                       <posy>15</posy>
-                                       <width>60</width>
-                                       <height>40</height>
-                                       <texture>$INFO[ListItem.VideoResolution,light/,.png]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>1142</posx>
-                                       <posy>22</posy>
-                                       <width>25</width>
-                                       <height>25</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture>OverlayWatching.png</texture>
-                                       <visible>ListItem.IsResumable</visible>
-                               </control>
-                               <control type="image">
-                                       <posx>1140</posx>
-                                       <posy>20</posy>
-                                       <width>30</width>
-                                       <height>30</height>
-                                       <texture>$INFO[ListItem.Overlay,light/]</texture>
-                                       <visible>!ListItem.IsResumable</visible>
-                               </control>
-                               <control type="textbox">
-                                       <posx>130</posx>
-                                       <posy>65</posy>
-                                       <width>1030</width>
-                                       <height>95</height>
-                                       <font>font12</font>
-                                       <align>justify</align>
-                                       <textcolor>grey2</textcolor>
-                                       <label>$INFO[ListItem.Plot]</label>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout condition="Container.Content(Movies)" height="180" width="1180">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>5</posy>
-                                       <width>1180</width>
-                                       <height>170</height>
-                                       <texture border="5">SubBack2.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>5</posx>
-                                       <posy>10</posy>
-                                       <width>110</width>
-                                       <height>160</height>
-                                       <texture background="true">$INFO[ListItem.Icon]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>5</posy>
-                                       <width>210</width>
-                                       <height>170</height>
-                                       <texture>GlassOverlay.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>130</posx>
-                                       <posy>15</posy>
-                                       <width>940</width>
-                                       <height>25</height>
-                                       <font>font13_title</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                               <control type="label">
-                                       <posx>130</posx>
-                                       <posy>45</posy>
-                                       <width>940</width>
-                                       <height>20</height>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Genre]</label>
-                               </control>
-                               <control type="label">
-                                       <posx>1070</posx>
-                                       <posy>7</posy>
-                                       <width>400</width>
-                                       <height>30</height>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label2]</label>
-                               </control>
-                               <control type="image">
-                                       <description>Rating value</description>
-                                       <posx>970</posx>
-                                       <posy>35</posy>
-                                       <width>100</width>
-                                       <height>25</height>
-                                       <aspectratio align="left">keep</aspectratio>
-                                       <texture fallback="dark/left_rating/rating0.png">$INFO[ListItem.StarRating,dark/left_rating/]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>1080</posx>
-                                       <posy>15</posy>
-                                       <width>60</width>
-                                       <height>40</height>
-                                       <texture>$INFO[ListItem.VideoResolution,dark/,.png]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>1142</posx>
-                                       <posy>22</posy>
-                                       <width>25</width>
-                                       <height>25</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture>OverlayWatching.png</texture>
-                                       <visible>ListItem.IsResumable</visible>
-                               </control>
-                               <control type="image">
-                                       <posx>1140</posx>
-                                       <posy>20</posy>
-                                       <width>30</width>
-                                       <height>30</height>
-                                       <texture>$INFO[ListItem.Overlay,dark/]</texture>
-                                       <visible>ListItem.IsResumable</visible>
-                               </control>
-                               <control type="textbox">
-                                       <posx>130</posx>
-                                       <posy>65</posy>
-                                       <width>1030</width>
-                                       <height>95</height>
-                                       <font>font12</font>
-                                       <align>justify</align>
-                                       <textcolor>black</textcolor>
-                                       <label>$INFO[ListItem.Plot]</label>
-                               </control>
-                       </focusedlayout>
-                       <itemlayout condition="Container.Content(Episodes)" height="180" width="1180">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>5</posy>
-                                       <width>1180</width>
-                                       <height>170</height>
-                                       <texture border="5">SubBack.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>5</posx>
-                                       <posy>10</posy>
-                                       <width>230</width>
-                                       <height>160</height>
-                                       <aspectratio>scale</aspectratio>
-                                       <texture background="true">$INFO[ListItem.Icon]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>5</posy>
-                                       <width>200</width>
-                                       <height>170</height>
-                                       <texture>GlassOverlay.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>250</posx>
-                                       <posy>15</posy>
-                                       <width>820</width>
-                                       <height>25</height>
-                                       <font>font13_title</font>
-                                       <textcolor>white</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                               <control type="label">
-                                       <posx>250</posx>
-                                       <posy>45</posy>
-                                       <width>820</width>
-                                       <height>20</height>
-                                       <font>font13</font>
-                                       <textcolor>white</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Premiered,$LOCALIZE[20416] : ]</label>
-                               </control>
-                               <control type="label">
-                                       <posx>1070</posx>
-                                       <posy>7</posy>
-                                       <width>400</width>
-                                       <height>30</height>
-                                       <font>font13</font>
-                                       <textcolor>grey2</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label2]</label>
-                               </control>
-                               <control type="image">
-                                       <description>Rating value</description>
-                                       <posx>970</posx>
-                                       <posy>35</posy>
-                                       <width>100</width>
-                                       <height>25</height>
-                                       <aspectratio align="left">keep</aspectratio>
-                                       <texture fallback="light/left_rating/rating0.png">$INFO[ListItem.StarRating,light/left_rating/]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>1080</posx>
-                                       <posy>15</posy>
-                                       <width>60</width>
-                                       <height>40</height>
-                                       <texture>$INFO[ListItem.VideoResolution,light/,.png]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>1142</posx>
-                                       <posy>22</posy>
-                                       <width>25</width>
-                                       <height>25</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture>OverlayWatching.png</texture>
-                                       <visible>ListItem.IsResumable</visible>
-                               </control>
-                               <control type="image">
-                                       <posx>1140</posx>
-                                       <posy>20</posy>
-                                       <width>30</width>
-                                       <height>30</height>
-                                       <texture>$INFO[ListItem.Overlay,light/]</texture>
-                                       <visible>ListItem.IsResumable</visible>
-                               </control>
-                               <control type="textbox">
-                                       <posx>250</posx>
-                                       <posy>70</posy>
-                                       <width>910</width>
-                                       <height>83</height>
-                                       <font>font12</font>
-                                       <align>justify</align>
-                                       <textcolor>grey2</textcolor>
-                                       <label>$INFO[ListItem.Plot]</label>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout condition="Container.Content(Episodes)" height="165" width="1180">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>5</posy>
-                                       <width>1180</width>
-                                       <height>170</height>
-                                       <texture border="5">SubBack2.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>5</posx>
-                                       <posy>10</posy>
-                                       <width>230</width>
-                                       <height>160</height>
-                                       <aspectratio>scale</aspectratio>
-                                       <texture background="true">$INFO[ListItem.Icon]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>5</posy>
-                                       <width>200</width>
-                                       <height>170</height>
-                                       <texture>GlassOverlay.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>250</posx>
-                                       <posy>15</posy>
-                                       <width>820</width>
-                                       <height>25</height>
-                                       <font>font13_title</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                               <control type="label">
-                                       <posx>250</posx>
-                                       <posy>45</posy>
-                                       <width>820</width>
-                                       <height>20</height>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Premiered,$LOCALIZE[20416] : ]</label>
-                               </control>
-                               <control type="label">
-                                       <posx>1070</posx>
-                                       <posy>7</posy>
-                                       <width>400</width>
-                                       <height>30</height>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label2]</label>
-                               </control>
-                               <control type="image">
-                                       <description>Rating value</description>
-                                       <posx>970</posx>
-                                       <posy>35</posy>
-                                       <width>100</width>
-                                       <height>25</height>
-                                       <aspectratio align="left">keep</aspectratio>
-                                       <texture fallback="dark/left_rating/rating0.png">$INFO[ListItem.StarRating,dark/left_rating/]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>1080</posx>
-                                       <posy>15</posy>
-                                       <width>60</width>
-                                       <height>40</height>
-                                       <texture>$INFO[ListItem.VideoResolution,dark/,.png]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>1142</posx>
-                                       <posy>22</posy>
-                                       <width>25</width>
-                                       <height>25</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture>OverlayWatching.png</texture>
-                                       <visible>ListItem.IsResumable</visible>
-                               </control>
-                               <control type="image">
-                                       <posx>1140</posx>
-                                       <posy>20</posy>
-                                       <width>30</width>
-                                       <height>30</height>
-                                       <texture>$INFO[ListItem.Overlay,dark/]</texture>
-                                       <visible>!ListItem.IsResumable</visible>
-                               </control>
-                               <control type="textbox">
-                                       <posx>250</posx>
-                                       <posy>70</posy>
-                                       <width>910</width>
-                                       <height>83</height>
-                                       <font>font12</font>
-                                       <align>justify</align>
-                                       <textcolor>black</textcolor>
-                                       <label>$INFO[ListItem.Plot]</label>
-                               </control>
-                       </focusedlayout>
-               </control>
-       </include>
-       <include name="WideIconMetaDataView">
-               <control type="panel" id="552">
-                       <visible>Container.Content(TVShows)</visible>
-                       <posx>40</posx>
-                       <posy>120</posy>
-                       <width>1200</width>
-                       <height>720</height>
-                       <onleft>502</onleft>
-                       <onright>502</onright>
-                       <onup>552</onup>
-                       <ondown>552</ondown>
-                       <pagecontrol>60</pagecontrol>
-                       <scrolltime>300</scrolltime>
-                       <preloaditems>2</preloaditems>
-                       <viewtype label="31031">list</viewtype>
-                       <itemlayout height="144" width="1200">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>5</posy>
-                                       <width>1200</width>
-                                       <height>134</height>
-                                       <texture border="5">SubBack.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>15</posy>
-                                       <width>610</width>
-                                       <height>114</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture background="true">$INFO[ListItem.Icon]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>5</posy>
-                                       <width>200</width>
-                                       <height>134</height>
-                                       <texture>GlassOverlay.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>630</posx>
-                                       <posy>15</posy>
-                                       <width>510</width>
-                                       <height>20</height>
-                                       <font>font13_title</font>
-                                       <textcolor>white</textcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                               <control type="label">
-                                       <posx>1180</posx>
-                                       <posy>15</posy>
-                                       <width>280</width>
-                                       <height>20</height>
-                                       <font>font12</font>
-                                       <textcolor>white</textcolor>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label2]</label>
-                               </control>
-                               <control type="textbox">
-                                       <posx>630</posx>
-                                       <posy>35</posy>
-                                       <width>550</width>
-                                       <height>80</height>
-                                       <font>font12</font>
-                                       <align>justify</align>
-                                       <textcolor>grey2</textcolor>
-                                       <label>$INFO[ListItem.Plot]</label>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout height="144" width="1200">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>5</posy>
-                                       <width>1200</width>
-                                       <height>134</height>
-                                       <texture border="5">SubBack2.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>15</posy>
-                                       <width>610</width>
-                                       <height>114</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture background="true">$INFO[ListItem.Icon]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>5</posy>
-                                       <width>200</width>
-                                       <height>134</height>
-                                       <texture>GlassOverlay.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>630</posx>
-                                       <posy>15</posy>
-                                       <width>510</width>
-                                       <height>20</height>
-                                       <font>font13_title</font>
-                                       <textcolor>black</textcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                               <control type="label">
-                                       <posx>1180</posx>
-                                       <posy>15</posy>
-                                       <width>280</width>
-                                       <height>20</height>
-                                       <font>font12</font>
-                                       <textcolor>black</textcolor>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label2]</label>
-                               </control>
-                               <control type="textbox">
-                                       <posx>630</posx>
-                                       <posy>35</posy>
-                                       <width>550</width>
-                                       <height>80</height>
-                                       <font>font12</font>
-                                       <align>justify</align>
-                                       <textcolor>black</textcolor>
-                                       <label>$INFO[ListItem.Plot]</label>
-                               </control>
-                       </focusedlayout>
-               </control>
-       </include>
-</includes>
diff --git a/addons/skin.touched/4x3Hirez/VisualisationPresetList.xml b/addons/skin.touched/4x3Hirez/VisualisationPresetList.xml
deleted file mode 100644 (file)
index 9d522da..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-<window id="122">
-       <defaultcontrol>2</defaultcontrol>
-       <include>Window_OpenClose_Animation_Zoom</include>
-       <coordinates>
-               <system>1</system>
-               <posx>140</posx>
-               <posy>30</posy>
-       </coordinates>
-       <controls>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>1000</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="label">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>910</width>
-                       <label>$LOCALIZE[31048]</label>
-               </control>
-               <control type="group">
-                       <posx>930</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>1000</width>
-                       <height>840</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-               <control type="label" id="4">
-                       <description>No Settings Label</description>
-                       <posx>20</posx>
-                       <posy>250</posy>
-                       <width>960</width>
-                       <align>center</align>
-                       <label>13389</label>
-                       <font>font13_title</font>
-                       <textcolor>black</textcolor>
-               </control>
-               <control type="list" id="2">
-                       <posx>20</posx>
-                       <posy>80</posy>
-                       <width>960</width>
-                       <height>750</height>
-                       <onleft>2</onleft>
-                       <onright>2</onright>
-                       <onup>2</onup>
-                       <ondown>2</ondown>
-                       <pagecontrol>-</pagecontrol>
-                       <scrolltime>200</scrolltime>
-                       <itemlayout height="60">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>-2</posy>
-                                       <width>960</width>
-                                       <height>5</height>
-                                       <texture>separator.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>960</width>
-                                       <height>50</height>
-                                       <font>font13</font>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>blue</selectedcolor>
-                                       <info>ListItem.Label</info>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout height="60">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>-2</posy>
-                                       <width>960</width>
-                                       <height>5</height>
-                                       <texture>separator.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>960</width>
-                                       <height>50</height>
-                                       <font>font13</font>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>blue</selectedcolor>
-                                       <info>ListItem.Label</info>
-                               </control>
-                       </focusedlayout>
-               </control>
-               <control type="label">
-                       <description>number of files/pages in list text label</description>
-                       <posx>980</posx>
-                       <posy>850</posy>
-                       <width>300</width>
-                       <height>30</height>
-                       <font>font13</font>
-                       <align>right</align>
-                       <aligny>center</aligny>
-                       <scroll>true</scroll>
-                       <textcolor>black</textcolor>
-                       <label>($INFO[Container(2).NumItems]) $LOCALIZE[31025] - $LOCALIZE[31024] ($INFO[Container(2).CurrentPage]/$INFO[Container(2).NumPages])</label>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/custom_skinsettings_1113.xml b/addons/skin.touched/4x3Hirez/custom_skinsettings_1113.xml
deleted file mode 100644 (file)
index 9ad3403..0000000
+++ /dev/null
@@ -1,333 +0,0 @@
-<window type="dialog" id="1113">
-       <defaultcontrol>91</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <include>Window_OpenClose_Animation_Zoom</include>
-       <coordinates>
-               <system>1</system>
-               <posx>140</posx>
-               <posy>30</posy>
-       </coordinates>
-       <controls>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>1000</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="label">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>910</width>
-                       <label>20077</label>
-               </control>
-               <control type="group">
-                       <posx>930</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>1000</width>
-                       <height>840</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-
-               <control type="group">
-                       <posx>20</posx>
-                       <posy>75</posy>
-                       <control type="button">
-                               <description>left Arrow</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>40</width>
-                               <height>40</height>
-                               <texturefocus>arrow-big-left.png</texturefocus>
-                               <texturenofocus>arrow-big-left.png</texturenofocus>
-                               <onclick>Control.Move(9,-1)</onclick>
-                               <include>VisibleFadeEffect</include>
-                               <visible>Container(9).HasPrevious</visible>
-                       </control>
-                       <control type="button" id="11001">
-                               <description>right Arrow</description>
-                               <posx>920</posx>
-                               <posy>0</posy>
-                               <width>40</width>
-                               <height>40</height>
-                               <texturefocus>arrow-big-right.png</texturefocus>
-                               <texturenofocus>arrow-big-right.png</texturenofocus>
-                               <onclick>Control.Move(9,1)</onclick>
-                               <include>VisibleFadeEffect</include>
-                               <visible>Container(9).HasNext</visible>
-                       </control>
-               </control>
-               <control type="grouplist" id="9">
-                       <description>button area</description>
-                       <posx>60</posx>
-                       <posy>70</posy>
-                       <width>880</width>
-                       <height>50</height>
-                       <itemgap>5</itemgap>
-                       <align>center</align>
-                       <orientation>horizontal</orientation>
-                       <onleft>9</onleft>
-                       <onright>9</onright>
-                       <onup>2</onup>
-                       <ondown>2</ondown>
-                       <control type="button" id="91">
-                               <description>Home Button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>10000</label>
-                               <onfocus>Skin.SetString(SkinSettings,1)</onfocus>
-                       </control>
-                       <control type="button" id="92">
-                               <description>Addon Button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>24001</label>
-                               <onfocus>Skin.SetString(SkinSettings,2)</onfocus>
-                       </control>
-               </control>
-               <control type="grouplist" id="100">
-                       <description>control area</description>
-                       <posx>40</posx>
-                       <posy>140</posy>
-                       <width>920</width>
-                       <height>670</height>
-                       <itemgap>-1</itemgap>
-                       <pagecontrol>30</pagecontrol>
-                       <onup>9</onup>
-                       <ondown>9001</ondown>
-                       <onleft>2</onleft>
-                       <onright>30</onright>
-                       <visible>Skin.String(SkinSettings,1)</visible>
-                       <control type="label" id="101">
-                               <height>50</height>
-                               <width>920</width>
-                               <font>font13_title</font>
-                               <label>31500</label>
-                               <textcolor>black</textcolor>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                       </control>
-                       <control type="radiobutton" id="102">
-                               <description>Hide Videos</description>
-                               <height>55</height>
-                               <width>920</width>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                               <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-                               <label>$LOCALIZE[3]</label>
-                               <onclick>Skin.ToggleSetting(HideHomeButtonVideo)</onclick>
-                               <selected>!Skin.HasSetting(HideHomeButtonVideo)</selected>
-                       </control>
-                       <control type="radiobutton" id="103">
-                               <description>Hide Movies</description>
-                               <height>55</height>
-                               <width>920</width>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                               <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-                               <label>$LOCALIZE[20342]</label>
-                               <onclick>Skin.ToggleSetting(HideHomeButtonMovies)</onclick>
-                               <selected>!Skin.HasSetting(HideHomeButtonMovies)</selected>
-                               <enable>Library.HasContent(Movies)</enable>
-                       </control>
-                       <control type="radiobutton" id="104">
-                               <description>Hide TVShows</description>
-                               <height>55</height>
-                               <width>920</width>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                               <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-                               <label>$LOCALIZE[20343]</label>
-                               <onclick>Skin.ToggleSetting(HideHomeButtonTVShows)</onclick>
-                               <selected>!Skin.HasSetting(HideHomeButtonTVShows)</selected>
-                               <enable>Library.HasContent(TVShows)</enable>
-               </control>
-                       <control type="radiobutton" id="105">
-                               <description>Hide Music</description>
-                               <height>55</height>
-                               <width>920</width>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                               <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-                               <label>$LOCALIZE[2]</label>
-                               <onclick>Skin.ToggleSetting(HideHomeButtonMusic)</onclick>
-                               <selected>!Skin.HasSetting(HideHomeButtonMusic)</selected>
-                       </control>
-                       <control type="radiobutton" id="106">
-                               <description>Hide Pictures</description>
-                               <height>55</height>
-                               <width>920</width>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                               <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-                               <label>$LOCALIZE[1]</label>
-                               <onclick>Skin.ToggleSetting(HideHomeButtonPictures)</onclick>
-                               <selected>!Skin.HasSetting(HideHomeButtonPictures)</selected>
-                       </control>
-                       <control type="radiobutton" id="107">
-                               <description>Hide Programs</description>
-                               <height>55</height>
-                               <width>920</width>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                               <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-                               <label>$LOCALIZE[0]</label>
-                               <onclick>Skin.ToggleSetting(HideHomeButtonPrograms)</onclick>
-                               <selected>!Skin.HasSetting(HideHomeButtonPrograms)</selected>
-                       </control>
-                       <control type="label" id="110">
-                               <height>50</height>
-                               <width>920</width>
-                               <font>font13_title</font>
-                               <label>31502</label>
-                               <textcolor>black</textcolor>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                       </control>
-                       <control type="radiobutton" id="111">
-                               <description>Show Weather info and button</description>
-                               <height>55</height>
-                               <width>920</width>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                               <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-                               <label>$LOCALIZE[31550]</label>
-                               <onclick>Skin.ToggleSetting(HideHomeButtonWeather)</onclick>
-                               <selected>!Skin.HasSetting(HideHomeButtonWeather)</selected>
-                       </control>
-                       <control type="radiobutton" id="112">
-                               <description>Videos Goes to root button</description>
-                               <height>55</height>
-                               <width>920</width>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                               <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-                               <label>$LOCALIZE[31553]</label>
-                               <onclick>Skin.ToggleSetting(HomeVideosGoesToRoot)</onclick>
-                               <selected>Skin.HasSetting(HomeVideosGoesToRoot)</selected>
-                       </control>
-               </control>
-               <control type="grouplist" id="200">
-                       <description>control area</description>
-                       <posx>40</posx>
-                       <posy>140</posy>
-                       <width>920</width>
-                       <height>670</height>
-                       <itemgap>-1</itemgap>
-                       <pagecontrol>30</pagecontrol>
-                       <onup>9</onup>
-                       <ondown>9001</ondown>
-                       <onleft>2</onleft>
-                       <onright>30</onright>
-                       <visible>Skin.String(SkinSettings,2)</visible>
-                       <control type="label" id="201">
-                               <height>50</height>
-                               <width>920</width>
-                               <font>font13_title</font>
-                               <label>31501</label>
-                               <textcolor>black</textcolor>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                       </control>
-                       <control type="button" id="202">
-                               <description>Home Addon Button</description>
-                               <height>55</height>
-                               <width>920</width>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                               <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-                               <label>$LOCALIZE[31551] 1</label>
-                               <label2>$INFO[system.addontitle(Skin.String(HomeAddonButton1))]</label2>
-                               <onclick>Skin.SetAddon(HomeAddonButton1,xbmc.addon.video)</onclick>
-                       </control>
-                       <control type="button" id="203">
-                               <description>Home Addon Button</description>
-                               <height>55</height>
-                               <width>920</width>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                               <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-                               <label>$LOCALIZE[31551] 2</label>
-                               <label2>$INFO[system.addontitle(Skin.String(HomeAddonButton2))]</label2>
-                               <onclick>Skin.SetAddon(HomeAddonButton2,xbmc.addon.video)</onclick>
-                       </control>
-                       <control type="button" id="204">
-                               <description>Home Addon Button</description>
-                               <height>55</height>
-                               <width>920</width>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                               <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-                               <label>$LOCALIZE[31551] 3</label>
-                               <label2>$INFO[system.addontitle(Skin.String(HomeAddonButton3))]</label2>
-                               <onclick>Skin.SetAddon(HomeAddonButton3,xbmc.addon.video)</onclick>
-                       </control>
-                       <control type="button" id="205">
-                               <description>Home Addon Button</description>
-                               <height>55</height>
-                               <width>920</width>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                               <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-                               <label>$LOCALIZE[31551] 4</label>
-                               <label2>$INFO[system.addontitle(Skin.String(HomeAddonButton4))]</label2>
-                               <onclick>Skin.SetAddon(HomeAddonButton4,xbmc.addon.video)</onclick>
-                       </control>
-                       <control type="label" id="220">
-                               <height>50</height>
-                               <width>920</width>
-                               <font>font13_title</font>
-                               <label>31503</label>
-                               <textcolor>black</textcolor>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                       </control>
-                       <control type="button" id="221">
-                               <description>Subtitle Script Button</description>
-                               <height>55</height>
-                               <width>920</width>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                               <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-                               <label>$LOCALIZE[31552]</label>
-                               <label2>$INFO[system.addontitle(Skin.String(SubtitleScript_Path))]</label2>
-                               <onclick>Skin.SetAddon(SubtitleScript_Path,xbmc.python.subtitles)</onclick>
-                       </control>
-               </control>
-               <control type="scrollbar" id="30">
-                       <posx>975</posx>
-                       <posy>120</posy>
-                       <width>20</width>
-                       <height>670</height>
-                       <texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
-                       <texturesliderbar border="2,16,2,16">ScrollBarV_bar.png</texturesliderbar>
-                       <texturesliderbarfocus border="2,16,2,16">ScrollBarV_bar_focus.png</texturesliderbarfocus>
-                       <textureslidernib>ScrollBarNib.png</textureslidernib>
-                       <textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
-                       <onleft>2</onleft>
-                       <onright>9</onright>
-                       <showonepage>false</showonepage>
-                       <orientation>vertical</orientation>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/custom_volume_1112.xml b/addons/skin.touched/4x3Hirez/custom_volume_1112.xml
deleted file mode 100644 (file)
index 40ed021..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-<window id="1112" type="dialog">
-       <defaultcontrol always="true">9000</defaultcontrol>
-       <include>Window_OpenClose_Animation</include>
-       <controls>
-               <control type="button">
-                       <description>Hidden button to close the sort when its focused</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>ScreenWidth</width>
-                       <height>ScreenHeight</height>
-                       <texturenofocus>-</texturenofocus>
-                       <texturefocus>-</texturefocus>
-                       <onclick>PreviousMenu</onclick>
-               </control>
-               <control type="group">
-                       <posx>205</posx>
-                       <posy>235r</posy>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>450</width>
-                               <height>80</height>
-                               <texture border="5">SubBack.png</texture>
-                       </control>
-                       <control type="image">
-                               <description>Panel Arrow image</description>
-                               <posx>100</posx>
-                               <posy>74</posy>
-                               <width>40</width>
-                               <height>40</height>
-                               <texture>arrow-big-down.png</texture>
-                       </control>
-                       <control type="progress">
-                               <description>Volume</description>
-                               <posx>20</posx>
-                               <posy>30</posy>
-                               <width>300</width>
-                               <height>20</height>
-                               <info>Player.Volume</info>
-                       </control>
-                       <control type="slider" id="1">
-                               <description>Volume Slider</description>
-                               <posx>20</posx>
-                               <posy>30</posy>
-                               <width>300</width>
-                               <height>15</height>
-                               <info>Player.Volume</info>
-                               <action>Volume</action>
-                               <texturesliderbar>seekslider.png</texturesliderbar>
-                               <textureslidernib>osd_slider_nibNF.png</textureslidernib>
-                               <textureslidernibfocus>osd_slider_nib.png</textureslidernibfocus>
-                       </control>
-                       <control type="label">
-                               <description>Volume Label</description>
-                               <posx>330</posx>
-                               <posy>30</posy>
-                               <width>100</width>
-                               <height>20</height>
-                               <label>$INFO[Player.Volume]</label>
-                               <font>font13</font>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                       </control>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/defaults.xml b/addons/skin.touched/4x3Hirez/defaults.xml
deleted file mode 100644 (file)
index d23b1de..0000000
+++ /dev/null
@@ -1,195 +0,0 @@
-<includes>
-       <default type="image">
-               <posx>0</posx>
-               <posy>0</posy>
-               <texture>-</texture>
-               <colorkey>0</colorkey>
-       </default>
-       <default type="label">
-               <posx>80</posx>
-               <posy>60</posy>
-               <label>-</label>
-               <font>font13</font>
-               <textcolor>white</textcolor>
-       </default>
-       <default type="fadelabel">
-               <posx>80</posx>
-               <posy>60</posy>
-               <font>font13</font>
-               <textcolor>white</textcolor>
-       </default>
-       <default type="button">
-               <posx>300</posx>
-               <posy>200</posy>
-               <width>300</width>
-               <height>42</height>
-               <texturefocus>button-focus.png</texturefocus>
-               <texturenofocus>button-nofocus.png</texturenofocus>
-               <font>font13</font>
-               <textcolor>white</textcolor>
-               <disabledcolor>grey3</disabledcolor>
-               <textoffsetx>10</textoffsetx>
-               <aligny>center</aligny>
-               <pulseonselect>no</pulseonselect>
-       </default>
-       <default type="togglebutton">
-               <posx>140</posx>
-               <posy>167</posy>
-               <width>20</width>
-               <height>20</height>
-               <texturefocus>scroll-up-focus.png</texturefocus>
-               <texturenofocus>scroll-up.png</texturenofocus>
-               <alttexturefocus>scroll-down-focus.png</alttexturefocus>
-               <alttexturenofocus>scroll-down.png</alttexturenofocus>
-               <textcolor>white</textcolor>
-               <label>-</label>
-               <font>font13</font>
-               <disabledcolor>grey3</disabledcolor>
-               <pulseonselect>no</pulseonselect>
-       </default>
-       <default type="textbox">
-               <posx>220</posx>
-               <posy>220</posy>
-               <width>410</width>
-               <height>215</height>
-               <align>left</align>
-               <textcolor>white</textcolor>
-               <font>font13</font>
-       </default>
-       <default type="progress">
-               <posx>100</posx>
-               <posy>325</posy>
-               <texturebg border="16,0,16,0">OSDProgressBack.png</texturebg>
-               <lefttexture>-</lefttexture>
-               <midtexture border="16,0,16,0">OSDProgressMid.png</midtexture>
-               <righttexture>-</righttexture>
-               <overlaytexture>-</overlaytexture>
-               <reveal>true</reveal>
-       </default>
-       <default type="spincontrol">
-               <posx>330</posx>
-               <posy>126</posy>
-               <spinwidth>45</spinwidth>
-               <spinheight>45</spinheight>
-               <textureup>Select_Up.png</textureup>
-               <texturedown>Select_Down.png</texturedown>
-               <textureupfocus>Select_Up.png</textureupfocus>
-               <texturedownfocus>Select_Down.png</texturedownfocus>
-               <align>right</align>
-               <width>33</width>
-               <height>22</height>
-               <font>font13</font>
-               <reverse>yes</reverse>
-               <textcolor>white</textcolor>
-               <disabledcolor>grey3</disabledcolor>
-               <subtype>text</subtype>
-               <textoffsetx>-5</textoffsetx>
-               <textoffsety>0</textoffsety>
-               <aligny>-</aligny>
-               <pulseonselect>no</pulseonselect>
-       </default>
-       <default type="spincontrolex">
-               <posx>530</posx>
-               <posy>160</posy>
-               <width>300</width>
-               <height>42</height>
-               <spinwidth>45</spinwidth>
-               <spinheight>45</spinheight>
-               <texturefocus>button-focus.png</texturefocus>
-               <texturenofocus>-</texturenofocus>
-               <textureup>Select_Up.png</textureup>
-               <texturedown>Select_Down.png</texturedown>
-               <textureupfocus>Select_Up.png</textureupfocus>
-               <texturedownfocus>Select_Down.png</texturedownfocus>
-               <font>font13</font>
-               <textcolor>white</textcolor>
-               <disabledcolor>grey3</disabledcolor>
-               <textoffsetx>10</textoffsetx>
-               <aligny>center</aligny>
-               <reverse>yes</reverse>
-               <pulseonselect>no</pulseonselect>
-       </default>
-       <default type="radiobutton">
-               <posx>300</posx>
-               <posy>200</posy>
-               <width>300</width>
-               <height>42</height>
-               <radiowidth>90</radiowidth>
-               <radioheight>45</radioheight>
-               <textureradiofocus>radiobutton-focus.png</textureradiofocus>
-               <textureradionofocus>radiobutton-nofocus.png</textureradionofocus>
-               <texturefocus>button-focus.png</texturefocus>
-               <texturenofocus>button-nofocus.png</texturenofocus>
-               <label>215</label>
-               <font>font13</font>
-               <textcolor>white</textcolor>
-               <disabledcolor>grey3</disabledcolor>
-               <textoffsetx>10</textoffsetx>
-               <aligny>center</aligny>
-               <pulseonselect>no</pulseonselect>
-       </default>
-       <default type="selectbutton">
-               <posx>490</posx>
-               <posy>335</posy>
-               <width>300</width>
-               <height>50</height>
-               <label>-</label>
-               <font>font12</font>
-               <texturefocus>-</texturefocus>
-               <texturenofocus>-</texturenofocus>
-               <texturebg>button-focus.png</texturebg>
-               <textureleft>scroll-left.png</textureleft>
-               <textureleftfocus>scroll-left-focus.png</textureleftfocus>
-               <textureright>scroll-right.png</textureright>
-               <texturerightfocus>scroll-right-focus.png</texturerightfocus>
-               <font>font13</font>
-               <textcolor>white</textcolor>
-               <disabledcolor>grey3</disabledcolor>
-               <aligny>center</aligny>
-       </default>
-       <default type="slider">
-               <controloffsetx>75</controloffsetx>
-               <controloffsety>0</controloffsety>
-       </default>
-       <default type="sliderex">
-               <height>35</height>
-               <textoffsetx>10</textoffsetx>
-               <aligny>center</aligny>
-               <texturefocus border="5">button-focus.png</texturefocus>
-               <texturenofocus border="5">button-nofocus.png</texturenofocus>
-               <sliderwidth>250</sliderwidth>
-               <sliderheight>20</sliderheight>
-               <texturesliderbar>osd_slider_bg.png</texturesliderbar>
-               <textureslidernib>osd_slider_nibNF.png</textureslidernib>
-               <textureslidernibfocus>osd_slider_nib.png</textureslidernibfocus>
-               <font>font12</font>
-               <textcolor>white</textcolor>
-               <disabledcolor>grey3</disabledcolor>
-       </default>
-       <default type="mover">
-               <posx>60</posx>
-               <posy>192</posy>
-               <texturefocus>button-focus.png</texturefocus>
-               <texturenofocus>button-nofocus.png</texturenofocus>
-       </default>
-       <default type="resize">
-               <posx>60</posx>
-               <posy>192</posy>
-               <texturefocus>button-focus.png</texturefocus>
-               <texturenofocus>button-nofocus.png</texturenofocus>
-       </default>
-       <default type="edit">
-               <posx>300</posx>
-               <posy>200</posy>
-               <width>300</width>
-               <height>42</height>
-               <texturefocus>button-focus.png</texturefocus>
-               <texturenofocus>button-nofocus.png</texturenofocus>
-               <font>font13</font>
-               <textcolor>white</textcolor>
-               <disabledcolor>grey3</disabledcolor>
-               <textoffsetx>10</textoffsetx>
-               <aligny>center</aligny>
-               <pulseonselect>no</pulseonselect>
-       </default>
-</includes>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/includes.xml b/addons/skin.touched/4x3Hirez/includes.xml
deleted file mode 100644 (file)
index 2b10b05..0000000
+++ /dev/null
@@ -1,628 +0,0 @@
-<includes>
-       <include file="defaults.xml" />
-       <include file="ViewsCommon.xml" />
-       <include file="ViewsMetaData.xml" />
-       <include file="ViewsAddonBrowser.xml" />
-       <include file="IncludesCodecFlagging.xml" />
-       <include file="IncludesPlayerControls.xml" />
-       <include file="IncludesKeypad.xml" />
-
-       <constant name="ScreenWidth">1280</constant>
-       <constant name="ScreenHeight">960</constant>
-       <constant name="FanartCrossfadeTime">500</constant>
-       <constant name="IconCrossfadeTime">400</constant>
-
-       <include name="CommonBackground">
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <aspectratio>scale</aspectratio>
-                       <width>ScreenWidth</width>
-                       <height>ScreenHeight</height>
-                       <texture>special://skin/background/background.png</texture>
-               </control>
-               <include>CommonHeader</include>
-               <control type="group">
-                       <visible>!Window.IsActive(PlayerControls)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>100</posy>
-                               <width>ScreenWidth</width>
-                               <height>10</height>
-                               <texture>shelf_shadow.png</texture>
-                       </control>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>20</posy>
-                               <width>ScreenWidth</width>
-                               <height>80</height>
-                               <texture border="0,0,0,2">header.png</texture>
-                       </control>
-                       <control type="button">
-                               <description>Previous Button</description>
-                               <posx>550</posx>
-                               <posy>30</posy>
-                               <width>45</width>
-                               <height>45</height>
-                               <label>-</label>
-                               <texturenofocus>PlayerControls2-PreviousNF.png</texturenofocus>
-                               <texturefocus>PlayerControls2-PreviousFO.png</texturefocus>
-                               <onclick>XBMC.PlayerControl(Previous)</onclick>
-                       </control>
-                       <control type="togglebutton">
-                               <description>Play Button</description>
-                               <posx>612</posx>
-                               <posy>23</posy>
-                               <width>56</width>
-                               <height>56</height>
-                               <label>-</label>
-                               <texturefocus>PlayerControls2-PlayFO.png</texturefocus>
-                               <texturenofocus>PlayerControls2-PlayNF.png</texturenofocus>
-                               <usealttexture>Player.Paused | Player.Forwarding | Player.Rewinding</usealttexture>
-                               <alttexturefocus>PlayerControls2-PauseFO.png</alttexturefocus>
-                               <alttexturenofocus>PlayerControls2-PauseNF.png</alttexturenofocus>
-                               <onclick>XBMC.PlayerControl(Play)</onclick>
-                       </control>
-                       <control type="button">
-                               <description>Next Button</description>
-                               <posx>680</posx>
-                               <posy>30</posy>
-                               <width>45</width>
-                               <height>45</height>
-                               <label>-</label>
-                               <texturenofocus>PlayerControls2-NextNF.png</texturenofocus>
-                               <texturefocus>PlayerControls2-NextFO.png</texturefocus>
-                               <onclick>XBMC.PlayerControl(Next)</onclick>
-                       </control>
-                       <control type="progress">
-                               <description>Progressbar</description>
-                               <posx>450</posx>
-                               <posy>83</posy>
-                               <width>380</width>
-                               <height>15</height>
-                               <info>Player.Progress</info>
-                       </control>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>64r</posy>
-                               <width>ScreenWidth</width>
-                               <height>64</height>
-                               <texture>floor.png</texture>
-                       </control>
-                       <control type="group">
-                               <posx>122r</posx>
-                               <posy>105r</posy>
-                               <visible>!Window.IsVisible(LoginScreen) + !Window.IsActive(InfoDialog)</visible>
-                               <include>VisibleFadeEffect</include>
-                               <control type="image">
-                                       <posx>16</posx>
-                                       <posy>80</posy>
-                                       <width>80</width>
-                                       <height>40</height>
-                                       <texture border="5">IconBack_reflect.png</texture>
-                               </control>
-                               <control type="button">
-                                       <description>Favourties Button</description>
-                                       <posx>16</posx>
-                                       <posy>0</posy>
-                                       <width>80</width>
-                                       <height>80</height>
-                                       <label>-</label>
-                                       <font>-</font>
-                                       <texturenofocus border="5">IconBack.png</texturenofocus>
-                                       <texturefocus border="5">IconBack-focus.png</texturefocus>
-                                       <onclick>ActivateWindow(Favourites)</onclick>
-                               </control>
-                               <control type="image">
-                                       <posx>28</posx>
-                                       <posy>12</posy>
-                                       <width>56</width>
-                                       <height>56</height>
-                                       <texture>icon_favourites.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>6</posx>
-                                       <posy>82</posy>
-                                       <width>100</width>
-                                       <height>20</height>
-                                       <font>font11</font>
-                                       <textcolor>white</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <label>$LOCALIZE[1036]</label>
-                               </control>
-                       </control>
-               </control>
-       </include>
-       <include name="CommonHeader">
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>ScreenWidth</width>
-                       <height>20</height>
-                       <texture>black.png</texture>
-               </control>
-               <control type="label">
-                       <description>XBMC label</description>
-                       <posx>5</posx>
-                       <posy>0</posy>
-                       <width>200</width>
-                       <height>18</height>
-                       <align>left</align>
-                       <aligny>center</aligny>
-                       <font>font10_title</font>
-                       <textcolor>white</textcolor>
-                       <label>XBMC</label>
-               </control>
-               <control type="label">
-                       <description>time label</description>
-                       <posx>200</posx>
-                       <posy>0</posy>
-                       <width>880</width>
-                       <height>18</height>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <font>font10_title</font>
-                       <textcolor>white</textcolor>
-                       <label>$INFO[System.Time]</label>
-               </control>
-               <control type="progress">
-                       <description>Battery Percent</description>
-                       <posx>35r</posx>
-                       <posy>2</posy>
-                       <width>30</width>
-                       <height>15</height>
-                       <texturebg>BatteryBack.png</texturebg>
-                       <midtexture>BatteryFront.png</midtexture>
-                       <info>System.BatteryLevel</info>
-               </control>
-               <control type="label">
-                       <posx>45r</posx>
-                       <posy>0</posy>
-                       <width>200</width>
-                       <height>18</height>
-                       <font>font10_title</font>
-                       <textcolor>white</textcolor>
-                       <align>right</align>
-                       <aligny>center</aligny>
-                       <label>$INFO[System.BatteryLevel]</label>
-               </control>
-       </include>
-       <include name="BehindDialogFadeOut">
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>ScreenWidth</width>
-                       <height>ScreenHeight</height>
-                       <texture>black-back.png</texture>
-                       <animation effect="fade" time="400">Visible</animation>
-                       <animation effect="fade" time="200">Hidden</animation>
-                       <visible>Window.IsActive(ContextMenu) | Window.IsActive(MovieInformation) | Window.IsActive(MusicInformation) | Window.IsActive(SongInformation) | Window.IsActive(FileBrowser) | Window.IsActive(TextViewer) | Window.IsActive(AddonSettings) | Window.IsActive(ContentSettings) | Window.IsActive(SelectDialog) | Window.IsActive(FileStackingDialog) | Window.IsActive(MediaSource) | Window.IsActive(PictureInfo) | [Window.IsActive(NumericInput) + !Window.IsVisible(VirtualKeyboard)] | Window.IsActive(ProfileSettings) | Window.IsActive(LockSettings) | Window.IsActive(SmartPlaylistEditor) | Window.IsActive(SmartPlaylistRule) | Window.IsActive(script-RSS_Editor-rssEditor.xml) | Window.IsActive(script-RSS_Editor-setEditor.xml) | Window.IsActive(AddonInformation) | Window.IsActive(Favourites) | Window.IsActive(PictureInfo) | Window.IsActive(KaraokeLargeSelector) | Window.IsActive(custom_skinsettings_1113.xml)</visible>
-               </control>
-       </include>
-       <include name="MediaWindowTitleCommons">
-               <posx>300</posx>
-               <posy>64r</posy>
-               <width>680</width>
-               <height>64</height>
-               <align>center</align>
-               <aligny>center</aligny>
-               <font>font13_title</font>
-               <textcolor>white</textcolor>
-               <shadowcolor>black</shadowcolor>
-       </include>
-       <include name="WindowTitleCommons">
-               <height>60</height>
-               <align>left</align>
-               <aligny>center</aligny>
-               <font>font16</font>
-               <textcolor>white</textcolor>
-               <shadowcolor>black</shadowcolor>
-       </include>
-       <include name="FileCountCommons">
-               <control type="group">
-                       <posx>0</posx>
-                       <posy>35</posy>
-                       <include>Window_OpenClose_Animation</include>
-                       <control type="image">
-                               <posx>120r</posx>
-                               <posy>0</posy>
-                               <width>45</width>
-                               <height>45</height>
-                               <aspectratio>keep</aspectratio>
-                               <texture>filecount.png</texture>
-                       </control>
-                       <control type="label">
-                               <description>Page Count Label 1</description>
-                               <posx>130r</posx>
-                               <posy>2</posy>
-                               <width>500</width>
-                               <height>20</height>
-                               <font>font12</font>
-                               <textcolor>grey2</textcolor>
-                               <scroll>false</scroll>
-                               <align>right</align>
-                               <aligny>center</aligny>
-                               <label>$INFO[Window.Property(filter),$LOCALIZE[587] , - ]$INFO[Container.NumItems,, $LOCALIZE[31025]]</label>
-                       </control>
-                       <control type="label">
-                               <description>Page Count Label 2</description>
-                               <posx>130r</posx>
-                               <posy>22</posy>
-                               <width>500</width>
-                               <height>20</height>
-                               <font>font12</font>
-                               <textcolor>grey2</textcolor>
-                               <scroll>false</scroll>
-                               <align>right</align>
-                               <aligny>center</aligny>
-                               <label>$INFO[Container.CurrentPage,$LOCALIZE[31024] ]$INFO[Container.NumPages, of ,]</label>
-                       </control>
-               </control>
-       </include>
-       <include name="ScrollArrowsCommons">
-               <control type="scrollbar" id="60">
-                       <posx>25r</posx>
-                       <posy>120</posy>
-                       <width>17</width>
-                       <height>720</height>
-                       <texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
-                       <texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
-                       <texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
-                       <textureslidernib>ScrollBarNib.png</textureslidernib>
-                       <textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
-                       <onleft>60</onleft>
-                       <onright>60</onright>
-                       <ondown>60</ondown>
-                       <onup>60</onup>
-                       <showonepage>true</showonepage>
-                       <orientation>vertical</orientation>
-                       <visible>Container.Scrolling</visible>
-                       <animation effect="fade" time="150">Visible</animation>
-                       <animation effect="fade" time="150">Hidden</animation>
-               </control>
-       </include>
-       <include name="HomeButtonCommons">
-               <control type="button">
-                       <description>Home Button</description>
-                       <posx>0</posx>
-                       <posy>25</posy>
-                       <width>64</width>
-                       <height>64</height>
-                       <texturenofocus>icon_home.png</texturenofocus>
-                       <texturefocus>icon_home.png</texturefocus>
-                       <onclick>ActivateWindow(Home)</onclick>
-               </control>
-       </include>
-       <include name="OptionsButtonCommons">
-               <control type="button">
-                       <description>Options Button</description>
-                       <posx>64r</posx>
-                       <posy>25</posy>
-                       <width>64</width>
-                       <height>64</height>
-                       <texturenofocus>icon_system.png</texturenofocus>
-                       <texturefocus>icon_system.png</texturefocus>
-                       <onclick>Skin.ToggleSetting(MediaSubMenuVisible)</onclick>
-               </control>
-       </include>
-       <include name="DialogCloseButtonCommons">
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>2</width>
-                       <height>59</height>
-                       <texture>header-divide.png</texture>
-               </control>
-               <control type="button">
-                       <description>Close Button</description>
-                       <posx>7</posx>
-                       <posy>0</posy>
-                       <width>60</width>
-                       <height>60</height>
-                       <font>-</font>
-                       <onclick>previousmenu</onclick>
-                       <texturefocus>icon_close.png</texturefocus>
-                       <texturenofocus>icon_close.png</texturenofocus>
-               </control>
-       </include>
-       <include name="MediaSubMenu">
-               <control type="button" id="19">
-                       <description>Filter button needed for panel below to work</description>
-                       <visible>false</visible>
-               </control>
-               <control type="panel" id="9002">
-                       <visible>!Window.IsActive(PlayerControls)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <include>SubMenuCommonLayout</include>
-                       <content>
-                               <item>
-                                       <label>31200</label>
-                                       <onclick>ParentDir</onclick>
-                                       <icon>icon_back.png</icon>
-                               </item>
-                               <item>
-                                       <label>31202</label>
-                                       <onclick>Container.NextViewMode</onclick>
-                                       <icon>icon_view.png</icon>
-                               </item>
-                               <item>
-                                       <label>587</label>
-                                       <onclick>SendClick(19)</onclick>
-                                       <icon>icon_filter.png</icon>
-                                       <visible>IsEmpty(Window.Property(filter))</visible>
-                               </item>
-                               <item>
-                                       <label>587</label>
-                                       <onclick>SendClick(19)</onclick>
-                                       <icon>icon_filter_on.png</icon>
-                                       <visible>!IsEmpty(Window.Property(filter))</visible>
-                               </item>
-                       </content>
-               </control>
-       </include>
-       <include name="SubMenuCommonLayout">
-               <include>Window_OpenClose_Animation</include>
-               <posx>10</posx>
-               <posy>105r</posy>
-               <width>620</width>
-               <height>120</height>
-               <onleft>9002</onleft>
-               <onright>9002</onright>
-               <onup>9001</onup>
-               <ondown>20</ondown>
-               <pagecontrol>-</pagecontrol>
-               <scrolltime>300</scrolltime>
-               <orientation>Horizontal</orientation>
-               <itemlayout height="200" width="112">
-                       <control type="image">
-                               <posx>16</posx>
-                               <posy>80</posy>
-                               <width>80</width>
-                               <height>40</height>
-                               <texture border="5">IconBack_reflect.png</texture>
-                       </control>
-                       <control type="image">
-                               <posx>16</posx>
-                               <posy>0</posy>
-                               <width>80</width>
-                               <height>80</height>
-                               <bordertexture border="5">IconBack.png</bordertexture>
-                               <bordersize>12</bordersize>
-                               <texture>$INFO[ListItem.Icon]</texture>
-                       </control>
-                       <control type="label">
-                               <posx>56</posx>
-                               <posy>82</posy>
-                               <width>100</width>
-                               <height>20</height>
-                               <font>font11</font>
-                               <textcolor>white</textcolor>
-                               <shadowcolor>black</shadowcolor>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <label>$INFO[ListItem.Label]</label>
-                       </control>
-               </itemlayout>
-               <focusedlayout height="200" width="112">
-                       <control type="image">
-                               <posx>16</posx>
-                               <posy>80</posy>
-                               <width>80</width>
-                               <height>40</height>
-                               <texture border="5">IconBack_reflect.png</texture>
-                       </control>
-                       <control type="image">
-                               <posx>16</posx>
-                               <posy>0</posy>
-                               <width>80</width>
-                               <height>80</height>
-                               <bordertexture border="5">IconBack-focus.png</bordertexture>
-                               <bordersize>12</bordersize>
-                               <texture>$INFO[ListItem.Icon]</texture>
-                       </control>
-                       <control type="label">
-                               <posx>56</posx>
-                               <posy>82</posy>
-                               <width>100</width>
-                               <height>20</height>
-                               <font>font11</font>
-                               <textcolor>white</textcolor>
-                               <shadowcolor>black</shadowcolor>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <label>$INFO[ListItem.Label]</label>
-                       </control>
-               </focusedlayout>
-       </include>
-       <include name="ButtonCommonValues2">
-               <height>60</height>
-               <width>298</width>
-               <textoffsetx>10</textoffsetx>
-               <textwidth>280</textwidth>
-               <textcolor>black</textcolor>
-               <align>left</align>
-               <aligny>center</aligny>
-               <font>font13</font>
-               <texturefocus>button-focus2.png</texturefocus>
-               <texturenofocus>button-nofocus.png</texturenofocus>
-               <pulseonselect>false</pulseonselect>
-       </include>
-       <include name="ButtonInfoDialogsCommonValues">
-               <height>50</height>
-               <width>158</width>
-               <align>center</align>
-               <aligny>center</aligny>
-               <font>font12_title</font>
-               <texturefocus border="5">IconBack-focus.png</texturefocus>
-               <texturenofocus border="5">ListNF.png</texturenofocus>
-               <pulseonselect>false</pulseonselect>
-       </include>
-       <include name="CommonNowPlaying">
-               <control type="group">
-                       <posx>110</posx>
-                       <posy>25</posy>
-                       <visible>Player.HasMedia + !Window.IsVisible(PlayerControls)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <control type="button">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>270</width>
-                               <height>67</height>
-                               <texturefocus border="8">IconBack.png</texturefocus>
-                               <texturenofocus border="8">IconBack.png</texturenofocus>
-                               <onclick>ActivateWindow(PlayerControls)</onclick>
-                       </control>
-                       <control type="fadelabel">
-                               <posx>10</posx>
-                               <posy>5</posy>
-                               <width>250</width>
-                               <height>15</height>
-                               <scrollout>false</scrollout>
-                               <pauseatend>3000</pauseatend>
-                               <label>$LOCALIZE[31040]</label>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <font>font10_title</font>
-                               <textcolor>black</textcolor>
-                               <visible>!Player.Paused</visible>
-                       </control>
-                       <control type="fadelabel">
-                               <posx>10</posx>
-                               <posy>5</posy>
-                               <width>250</width>
-                               <height>15</height>
-                               <scrollout>false</scrollout>
-                               <pauseatend>3000</pauseatend>
-                               <label>$LOCALIZE[31043]</label>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <font>font10_title</font>
-                               <textcolor>black</textcolor>
-                               <visible>Player.Paused</visible>
-                       </control>
-                       <control type="fadelabel">
-                               <posx>10</posx>
-                               <posy>24</posy>
-                               <width>250</width>
-                               <height>20</height>
-                               <scrollout>false</scrollout>
-                               <pauseatend>3000</pauseatend>
-                               <label>[B]$INFO[MusicPlayer.Title]$INFO[VideoPlayer.Title][/B]</label>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <font>font12</font>
-                               <textcolor>black</textcolor>
-                       </control>
-                       <control type="fadelabel">
-                               <posx>10</posx>
-                               <posy>45</posy>
-                               <width>250</width>
-                               <height>15</height>
-                               <scrollout>false</scrollout>
-                               <pauseatend>3000</pauseatend>
-                               <label>[B]$INFO[MusicPlayer.Artist][/B]</label>
-                               <label>[B]$INFO[MusicPlayer.Album][/B]</label>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <font>font10</font>
-                               <textcolor>black</textcolor>
-                               <visible>Player.HasAudio</visible>
-                       </control>
-                       <control type="fadelabel">
-                               <posx>10</posx>
-                               <posy>45</posy>
-                               <width>250</width>
-                               <height>15</height>
-                               <scrollout>false</scrollout>
-                               <pauseatend>3000</pauseatend>
-                               <label>[B]$INFO[VideoPlayer.Studio][/B]</label>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <font>font10</font>
-                               <textcolor>black</textcolor>
-                               <visible>Player.HasVideo + VideoPlayer.Content(Movies)</visible>
-                       </control>
-                       <control type="fadelabel">
-                               <posx>10</posx>
-                               <posy>45</posy>
-                               <width>250</width>
-                               <height>15</height>
-                               <scrollout>false</scrollout>
-                               <pauseatend>3000</pauseatend>
-                               <label>[B]$INFO[VideoPlayer.TVShowTitle][/B]</label>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <font>font10</font>
-                               <textcolor>black</textcolor>
-                               <visible>Player.HasVideo + VideoPlayer.Content(Episodes)</visible>
-                       </control>
-                       <control type="fadelabel">
-                               <posx>10</posx>
-                               <posy>45</posy>
-                               <width>250</width>
-                               <height>15</height>
-                               <scrollout>false</scrollout>
-                               <pauseatend>3000</pauseatend>
-                               <label>[B]$INFO[VideoPlayer.Artist][/B]</label>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <font>font10</font>
-                               <textcolor>black</textcolor>
-                               <visible>Player.HasVideo + VideoPlayer.Content(MusicVideos)</visible>
-                       </control>
-               </control>
-       </include>
-       <include name="ScrollOffsetLabel">
-               <control type="group">
-                       <visible>Container.Scrolling + [StringCompare(Container.SortMethod,$LOCALIZE[551]) | StringCompare(Container.SortMethod,$LOCALIZE[561]) | StringCompare(Container.SortMethod,$LOCALIZE[558]) | StringCompare(Container.SortMethod,$LOCALIZE[557]) | StringCompare(Container.SortMethod,$LOCALIZE[556])]</visible>
-                       <animation effect="fade" time="100">Visible</animation>
-                       <animation effect="fade" time="300">Hidden</animation>
-                       <posx>600</posx>
-                       <posy>410</posy>
-                       <width>320</width>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>80</width>
-                               <height>80</height>
-                               <texture border="5">IconBack.png</texture>
-                       </control>
-                       <control type="label">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>80</width>
-                               <height>80</height>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <label>[B]$INFO[ListItem.SortLetter][/B]</label>
-                               <textcolor>black</textcolor>
-                               <font>font30</font>
-                       </control>
-               </control>
-       </include>
-       <include name="Window_OpenClose_Animation">
-               <animation effect="fade" time="250">WindowOpen</animation>
-               <animation effect="fade" time="250">WindowClose</animation>
-       </include>
-       <include name="Window_OpenClose_Animation_Zoom">
-               <animation type="WindowOpen" reversible="false">
-                       <effect type="zoom" start="80" end="100" center="640,480" easing="out" tween="back" time="300" />
-                       <effect type="fade" start="0" end="100" time="300" />
-               </animation>
-               <animation type="WindowClose" reversible="false">
-                       <effect type="zoom" start="100" end="80" center="640,480" easing="in" tween="back" time="300" />
-                       <effect type="fade" start="100" end="0" time="300" />
-               </animation>
-       </include>
-       <include name="dialogeffect">
-               <animation effect="fade" time="250">WindowOpen</animation>
-               <animation effect="fade" time="250">WindowClose</animation>
-       </include>
-       <include name="VisibleFadeEffect">
-               <animation effect="fade" time="300">Visible</animation>
-               <animation effect="fade" time="300">Hidden</animation>
-       </include>
-</includes>
diff --git a/addons/skin.touched/4x3Hirez/script-XBMC-Subtitles-main.xml b/addons/skin.touched/4x3Hirez/script-XBMC-Subtitles-main.xml
deleted file mode 100644 (file)
index 8cf823b..0000000
+++ /dev/null
@@ -1,418 +0,0 @@
-<window>
-       <allowoverlay>no</allowoverlay>
-       <include>Window_OpenClose_Animation_Zoom</include>
-       <coordinates>
-               <system>1</system>
-               <posx>0</posx>
-               <posy>0</posy>
-       </coordinates>
-       <controls>
-               <control type="group">
-                       <posx>240</posx>
-                       <posy>80</posy>
-                       <control type="image">
-                               <description>Shadow Background for dialogs without BehindDialogFadeOut include</description>
-                               <posx>-30</posx>
-                               <posy>-30</posy>
-                               <width>860</width>
-                               <height>860</height>
-                               <texture border="30">DialogShadow.png</texture>
-                       </control>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>800</width>
-                               <height>60</height>
-                               <texture border="5">DialogHeader.png</texture>
-                       </control>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>60</posy>
-                               <width>800</width>
-                               <height>740</height>
-                               <texture border="5">DialogBack.png</texture>
-                       </control>
-                       <control type="label">
-                               <description>header label</description>
-                               <posx>20</posx>
-                               <posy>0</posy>
-                               <include>WindowTitleCommons</include>
-                               <width>700</width>
-                               <label>XBMC Subtitles</label>
-                       </control>
-                       <control type="group">
-                               <posx>730</posx>
-                               <posy>0</posy>
-                               <include>DialogCloseButtonCommons</include>
-                       </control>
-                       <control type="button">
-                               <description>Subtitle chooser Button</description>
-                               <posx>10</posx>
-                               <posy>70</posy>
-                               <width>250</width>
-                               <height>46</height>
-                               <label>-</label>
-                               <texturenofocus border="5">floor_button.png</texturenofocus>
-                               <texturefocus border="5">floor_buttonFO.png</texturefocus>
-                               <onclick>Skin.ToggleSetting(SubtitleSourceChooserVisible)</onclick>
-                       </control>
-                       <control type="image" id="110">
-                               <description>Service Logo</description>
-                               <posx>20</posx>
-                               <posy>75</posy>
-                               <width>230</width>
-                               <height>40</height>
-                               <aspectratio>keep</aspectratio>
-                       </control>
-                       <control type="label" id="100">
-                               <description>textarea</description>
-                               <posx>270</posx>
-                               <posy>70</posy>
-                               <width>490</width>
-                               <height>50</height>
-                               <font>font12_title</font>
-                               <textcolor>black</textcolor>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <wrapmultiline>true</wrapmultiline>
-                       </control>
-                       <control type="group" id="250">
-                               <control type="group" id="111">
-                                       <control type="grouplist">
-                                               <posx>20</posx>
-                                               <posy>120</posy>
-                                               <width>760</width>
-                                               <height>40</height>
-                                               <align>center</align>
-                                               <orientation>horizontal</orientation>
-                                               <itemgap>5</itemgap>
-                                               <control type="image">
-                                                       <width>40</width>
-                                                       <height>40</height>
-                                                       <texture>DefaultIconInfo.png</texture>
-                                               </control>
-                                               <control type="label">
-                                                       <description>notification</description>
-                                                       <width min="1" max="720">auto</width>
-                                                       <height>40</height>
-                                                       <font>font13</font>
-                                                       <textcolor>black</textcolor>
-                                                       <label>$LOCALIZE[SCRIPT655]</label>
-                                                       <aligny>center</aligny>
-                                               </control>
-                                       </control>
-                               </control>
-                               <control type="list" id="120">
-                                       <posx>20</posx>
-                                       <posy>160</posy>
-                                       <width>760</width>
-                                       <height>540</height>
-                                       <onleft>120</onleft>
-                                       <onright>120</onright>
-                                       <onup>120</onup>
-                                       <ondown>120</ondown>
-                                       <viewtype label="535">list</viewtype>
-                                       <pagecontrol>-</pagecontrol>
-                                       <scrolltime>200</scrolltime>
-                                       <itemlayout width="760" height="60">
-                                               <control type="image">
-                                                       <posx>0</posx>
-                                                       <posy>-2</posy>
-                                                       <width>760</width>
-                                                       <height>5</height>
-                                                       <texture>separator.png</texture>
-                                               </control>
-                                               <control type="label">
-                                                       <posx>0</posx>
-                                                       <posy>5</posy>
-                                                       <width>700</width>
-                                                       <height>25</height>
-                                                       <font>font13</font>
-                                                       <aligny>center</aligny>
-                                                       <textcolor>black</textcolor>
-                                                       <selectedcolor>selected</selectedcolor>
-                                                       <align>left</align>
-                                                       <info>ListItem.Label2</info>
-                                                       <visible>ListItem.property(sync)</visible>
-                                               </control>
-                                               <control type="image">
-                                                       <posx>710</posx>
-                                                       <posy>5</posy>
-                                                       <width>50</width>
-                                                       <height>25</height>
-                                                       <texture border="5">flagging/blank.png</texture>
-                                                       <visible>ListItem.property(sync)</visible>
-                                               </control>
-                                               <control type="label">
-                                                       <posx>735</posx>
-                                                       <posy>5</posy>
-                                                       <width>50</width>
-                                                       <height>23</height>
-                                                       <font>font8_title</font>
-                                                       <aligny>center</aligny>
-                                                       <textcolor>white</textcolor>
-                                                       <align>center</align>
-                                                       <aligny>center</aligny>
-                                                       <label>[B]SYNC[/B]</label>
-                                                       <visible>ListItem.property(sync)</visible>
-                                               </control>
-                                               <control type="label">
-                                                       <posx>0</posx>
-                                                       <posy>5</posy>
-                                                       <width>760</width>
-                                                       <height>25</height>
-                                                       <font>font13</font>
-                                                       <aligny>center</aligny>
-                                                       <textcolor>black</textcolor>
-                                                       <selectedcolor>selected</selectedcolor>
-                                                       <align>left</align>
-                                                       <info>ListItem.Label2</info>
-                                                       <visible>!ListItem.property(sync)</visible>
-                                               </control>
-                                               <control type="image">
-                                                       <posx>0</posx>
-                                                       <posy>34</posy>
-                                                       <width>30</width>
-                                                       <height>20</height>
-                                                       <texture>$INFO[Listitem.Thumb]</texture>
-                                               </control>
-                                               <control type="label">
-                                                       <posx>35</posx>
-                                                       <posy>30</posy>
-                                                       <width>80</width>
-                                                       <height>25</height>
-                                                       <font>font12</font>
-                                                       <aligny>center</aligny>
-                                                       <textcolor>black</textcolor>
-                                                       <selectedcolor>selected</selectedcolor>
-                                                       <align>left</align>
-                                                       <info>ListItem.Label</info>
-                                               </control>
-                                               <control type="image">
-                                                       <posx>660</posx>
-                                                       <posy>30</posy>
-                                                       <width>100</width>
-                                                       <height>25</height>
-                                                       <aspectratio align="right">keep</aspectratio>
-                                                       <texture>$INFO[ListItem.ActualIcon,light/rating1to10/rating,.png]</texture>
-                                               </control>
-                                       </itemlayout>
-                                       <focusedlayout width="760" height="60">
-                                               <control type="image">
-                                                       <posx>0</posx>
-                                                       <posy>-2</posy>
-                                                       <width>760</width>
-                                                       <height>5</height>
-                                                       <texture>separator.png</texture>
-                                               </control>
-                                               <control type="label">
-                                                       <posx>0</posx>
-                                                       <posy>5</posy>
-                                                       <width>700</width>
-                                                       <height>25</height>
-                                                       <font>font13</font>
-                                                       <aligny>center</aligny>
-                                                       <textcolor>black</textcolor>
-                                                       <selectedcolor>selected</selectedcolor>
-                                                       <align>left</align>
-                                                       <info>ListItem.Label2</info>
-                                                       <visible>ListItem.property(sync)</visible>
-                                               </control>
-                                               <control type="image">
-                                                       <posx>710</posx>
-                                                       <posy>5</posy>
-                                                       <width>50</width>
-                                                       <height>25</height>
-                                                       <texture border="5">flagging/blank.png</texture>
-                                                       <visible>ListItem.property(sync)</visible>
-                                               </control>
-                                               <control type="label">
-                                                       <posx>735</posx>
-                                                       <posy>5</posy>
-                                                       <width>50</width>
-                                                       <height>23</height>
-                                                       <font>font8_title</font>
-                                                       <aligny>center</aligny>
-                                                       <textcolor>white</textcolor>
-                                                       <align>center</align>
-                                                       <aligny>center</aligny>
-                                                       <label>[B]SYNC[/B]</label>
-                                                       <visible>ListItem.property(sync)</visible>
-                                               </control>
-                                               <control type="label">
-                                                       <posx>0</posx>
-                                                       <posy>5</posy>
-                                                       <width>760</width>
-                                                       <height>25</height>
-                                                       <font>font13</font>
-                                                       <aligny>center</aligny>
-                                                       <textcolor>black</textcolor>
-                                                       <selectedcolor>selected</selectedcolor>
-                                                       <align>left</align>
-                                                       <info>ListItem.Label2</info>
-                                                       <visible>!ListItem.property(sync)</visible>
-                                               </control>
-                                               <control type="image">
-                                                       <posx>0</posx>
-                                                       <posy>34</posy>
-                                                       <width>30</width>
-                                                       <height>20</height>
-                                                       <texture>$INFO[Listitem.Thumb]</texture>
-                                               </control>
-                                               <control type="label">
-                                                       <posx>35</posx>
-                                                       <posy>30</posy>
-                                                       <width>80</width>
-                                                       <height>25</height>
-                                                       <font>font12</font>
-                                                       <aligny>center</aligny>
-                                                       <textcolor>black</textcolor>
-                                                       <selectedcolor>selected</selectedcolor>
-                                                       <align>left</align>
-                                                       <info>ListItem.Label</info>
-                                               </control>
-                                               <control type="image">
-                                                       <posx>660</posx>
-                                                       <posy>30</posy>
-                                                       <width>100</width>
-                                                       <height>25</height>
-                                                       <aspectratio align="right">keep</aspectratio>
-                                                       <texture>$INFO[ListItem.ActualIcon,light/rating1to10/rating,.png]</texture>
-                                               </control>
-                                       </focusedlayout>
-                               </control>
-                               <control type="label">
-                                       <description>number of files/pages in list text label</description>
-                                       <posx>780</posx>
-                                       <posy>750</posy>
-                                       <width>300</width>
-                                       <height>30</height>
-                                       <font>font13</font>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <scroll>true</scroll>
-                                       <textcolor>black</textcolor>
-                                       <label>($INFO[Container(120).NumItems]) $LOCALIZE[31025] - $LOCALIZE[31024] ($INFO[Container(120).CurrentPage]/$INFO[Container(120).NumPages])</label>
-                               </control>
-                       </control>
-               </control>
-               <control type="group">
-                       <visible>Skin.HasSetting(SubtitleSourceChooserVisible)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <control type="button">
-                               <description>Hidden button to close the sort when its focused</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>ScreenWidth</width>
-                               <height>ScreenHeight</height>
-                               <texturenofocus>-</texturenofocus>
-                               <texturefocus>-</texturefocus>
-                               <onclick>Skin.Reset(SubtitleSourceChooserVisible)</onclick>
-                       </control>
-                       <control type="group">
-                               <posx>330</posx>
-                               <posy>230</posy>
-                               <control type="image">
-                                       <description>Shadow Background</description>
-                                       <posx>-30</posx>
-                                       <posy>-30</posy>
-                                       <width>380</width>
-                                       <height>500</height>
-                                       <texture border="30">ShadowBorder.png</texture>
-                               </control>
-                               <control type="button">
-                                       <description>Panel Background image</description>
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>320</width>
-                                       <height>440</height>
-                                       <texturefocus border="5">SubBack.png</texturefocus>
-                                       <texturenofocus border="5">SubBack.png</texturenofocus>
-                                       <onclick>-</onclick>
-                               </control>
-                               <control type="image">
-                                       <description>Panel Forground image</description>
-                                       <posx>10</posx>
-                                       <posy>40</posy>
-                                       <width>300</width>
-                                       <height>390</height>
-                                       <texture border="5">SubBack2.png</texture>
-                               </control>
-                               <control type="image">
-                                       <description>Panel Arrow image</description>
-                                       <posx>50</posx>
-                                       <posy>-34</posy>
-                                       <width>40</width>
-                                       <height>40</height>
-                                       <texture>arrow-big-up.png</texture>
-                               </control>
-                               <control type="label">
-                                       <description>Available sources label</description>
-                                       <posx>10</posx>
-                                       <posy>5</posy>
-                                       <width>300</width>
-                                       <height>25</height>
-                                       <label>$LOCALIZE[SCRIPT760]</label>
-                                       <font>font12_title</font>
-                                       <align>center</align>
-                                       <aligny>top</aligny>
-                                       <textcolor>white</textcolor>
-                               </control>
-                               <control type="panel" id="150">
-                                       <posx>11</posx>
-                                       <posy>40</posy>
-                                       <width>298</width>
-                                       <height>390</height>
-                                       <onleft>150</onleft>
-                                       <onright>150</onright>
-                                       <onup>150</onup>
-                                       <ondown>150</ondown>
-                                       <viewtype label="535">list</viewtype>
-                                       <scrolltime>200</scrolltime>
-                                       <itemlayout width="298" height="60">
-                                               <control type="image">
-                                                       <posx>0</posx>
-                                                       <posy>0</posy>
-                                                       <width>298</width>
-                                                       <height>60</height>
-                                                       <texture>button-nofocus.png</texture>
-                                               </control>
-                                               <control type="label">
-                                                       <posx>149</posx>
-                                                       <posy>0</posy>
-                                                       <width>290</width>
-                                                       <height>60</height>
-                                                       <font>font13</font>
-                                                       <aligny>center</aligny>
-                                                       <textcolor>black</textcolor>
-                                                       <selectedcolor>selected</selectedcolor>
-                                                       <align>center</align>
-                                                       <info>ListItem.Label</info>
-                                               </control>
-                                       </itemlayout>
-                                       <focusedlayout width="298" height="60">
-                                               <control type="image">
-                                                       <posx>0</posx>
-                                                       <posy>0</posy>
-                                                       <width>298</width>
-                                                       <height>60</height>
-                                                       <texture>button-focus2.png</texture>
-                                               </control>
-                                               <control type="label">
-                                                       <posx>149</posx>
-                                                       <posy>0</posy>
-                                                       <width>290</width>
-                                                       <height>60</height>
-                                                       <font>font13</font>
-                                                       <aligny>center</aligny>
-                                                       <textcolor>black</textcolor>
-                                                       <selectedcolor>selected</selectedcolor>
-                                                       <align>center</align>
-                                                       <info>ListItem.Label</info>
-                                               </control>
-                                       </focusedlayout>
-                               </control>
-                       </control>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/addon.xml b/addons/skin.touched/addon.xml
deleted file mode 100644 (file)
index d0c10e9..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<addon
-  id="skin.touched"
-  version="0.8.5"
-  name="Touched"
-  provider-name="Jezz_X">
-  <requires>
-    <import addon="xbmc.gui" version="3.00"/>
-  </requires>
-  <extension
-    point="xbmc.gui.skin"
-    defaultthemename="textures.xbt"
-    debugging="false">
-    <res width="1280" height="960" aspect="4:3" default="true" folder="4x3Hirez" />
-  </extension>
-  <extension point="xbmc.addon.metadata">
-    <summary lang="en">Touched skin by Jezz_X designed to be used on touch screen devices</summary>
-    <description lang="en">Skin designed from the ground up to be used on touch screen devices like the iPad</description>
-    <disclaimer lang="en">Do not use this skin unless you have either touch screen or a mouse connected or you may lose navigation</disclaimer>
-    <platform>all</platform>
-  </extension>
-</addon>
diff --git a/addons/skin.touched/background/background.png b/addons/skin.touched/background/background.png
deleted file mode 100644 (file)
index c1a58b1..0000000
Binary files a/addons/skin.touched/background/background.png and /dev/null differ
diff --git a/addons/skin.touched/background/movies.png b/addons/skin.touched/background/movies.png
deleted file mode 100644 (file)
index 256442f..0000000
Binary files a/addons/skin.touched/background/movies.png and /dev/null differ
diff --git a/addons/skin.touched/background/music.png b/addons/skin.touched/background/music.png
deleted file mode 100644 (file)
index b9a35ac..0000000
Binary files a/addons/skin.touched/background/music.png and /dev/null differ
diff --git a/addons/skin.touched/background/pictures.png b/addons/skin.touched/background/pictures.png
deleted file mode 100644 (file)
index 6964562..0000000
Binary files a/addons/skin.touched/background/pictures.png and /dev/null differ
diff --git a/addons/skin.touched/background/programs.png b/addons/skin.touched/background/programs.png
deleted file mode 100644 (file)
index d47f803..0000000
Binary files a/addons/skin.touched/background/programs.png and /dev/null differ
diff --git a/addons/skin.touched/background/tvshows.png b/addons/skin.touched/background/tvshows.png
deleted file mode 100644 (file)
index b8bd91f..0000000
Binary files a/addons/skin.touched/background/tvshows.png and /dev/null differ
diff --git a/addons/skin.touched/background/videos.png b/addons/skin.touched/background/videos.png
deleted file mode 100644 (file)
index f45b1c3..0000000
Binary files a/addons/skin.touched/background/videos.png and /dev/null differ
diff --git a/addons/skin.touched/colors/defaults.xml b/addons/skin.touched/colors/defaults.xml
deleted file mode 100644 (file)
index 802b33d..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<colors>
-       <color name="white">FFFFFFFF</color>
-       <color name="grey">FFb4b4b4</color>
-       <color name="grey2">FF999999</color>
-       <color name="grey3">FF505050</color>
-       <color name="black">FF000000</color>
-       <color name="blue">FF0084ff</color>
-       <color name="selected">FFEB9E17</color>
-</colors>
\ No newline at end of file
diff --git a/addons/skin.touched/fonts/DejaVuSans-Bold-Caps.ttf b/addons/skin.touched/fonts/DejaVuSans-Bold-Caps.ttf
deleted file mode 100644 (file)
index 5af21ea..0000000
Binary files a/addons/skin.touched/fonts/DejaVuSans-Bold-Caps.ttf and /dev/null differ
diff --git a/addons/skin.touched/fonts/DejaVuSans-Bold.ttf b/addons/skin.touched/fonts/DejaVuSans-Bold.ttf
deleted file mode 100644 (file)
index 54aade0..0000000
Binary files a/addons/skin.touched/fonts/DejaVuSans-Bold.ttf and /dev/null differ
diff --git a/addons/skin.touched/icon.png b/addons/skin.touched/icon.png
deleted file mode 100644 (file)
index b328845..0000000
Binary files a/addons/skin.touched/icon.png and /dev/null differ
diff --git a/addons/skin.touched/language/Chinese (Simple)/strings.xml b/addons/skin.touched/language/Chinese (Simple)/strings.xml
deleted file mode 100644 (file)
index 4dc0243..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<strings>
-  <!-- Misc labels -->
-  <string id="31000">更改你的</string>
-  <string id="31001">关闭</string>
-  <string id="31002">音频设置</string>
-  <string id="31003">IP</string>
-  <string id="31004">大写锁定</string>
-  <string id="31005">视觉效果选项</string>
-  <string id="31006">视觉效果预设</string>
-  <string id="31007">功能菜单</string>
-  <string id="31008">全屏</string>
-  <string id="31009">工作中...</string>
-  <string id="31010">当前登录为</string>
-  <string id="31011">N/A</string> <!-- Used for subtitle button in the OSD -->
-  <string id="31012">音乐 - 文件</string>
-
-  <string id="31024">页</string>
-  <string id="31025">项</string>
-  <!-- ViewType labels -->
-  <string id="31030">信息列表</string>
-  <string id="31031">宽信息列表</string>
-
-  <!-- Extra labels -->
-  <string id="31040">正在播放</string>
-
-  <string id="31042">播放</string>
-  <string id="31043">暂停</string>
-  <string id="31044">快进</string>
-  <string id="31045">回退</string>
-  <string id="31046">音频属性</string>
-  <string id="31047">当前预设</string>
-  <string id="31048">可视化效果设置</string>
-  <string id="31049">结束时间</string>
-  <string id="31050">排序: 升序</string>
-  <string id="31051">排序: 降序</string>
-
-
-  <!-- Playlist Editor labels -->
-  <string id="31055">打开播放列表</string>
-  <string id="31056">保存播放列表</string>
-  <string id="31057">关闭播放列表</string>
-  <string id="31058">系统音乐文件</string>
-  <string id="31059">当前播放列表</string>
-  <string id="31060">这是一个堆叠文件,请选择要播放的片段。</string>
-  
-  <!-- Submenu labels -->
-  <string id="31200">返回</string>
-  <string id="31201">位置</string>
-
-  <!-- Extra labels -->
-  <string id="31300">当前温度</string>
-  <string id="31301">最近修改</string>
-
-  <string id="31309">内存使用:</string>
-  <string id="31312">当前刮削器</string>
-  <string id="31313">选择刮削器</string>
-  <string id="31314">内容扫描选项</string>
-
-  <string id="31319">选择用户配置文件</string>
-  <string id="31320">最近登录</string>
-  <string id="31321">卡拉OK歌曲选择</string>
-  <string id="31322">首播</string>
-
-  <string id="31325">播放列表选项</string>
-
-  <!-- Video and Music OSD Labels  -->
-  <string id="31351">暂停</string>
-  <string id="31352">停止</string>
-  <string id="31353">快进</string>
-  <string id="31354">快退</string>
-  <string id="31355">电影菜单</string>
-  <string id="31356">下载字幕</string>
-
-  <!-- Skin Fontsets -->
-  <string id="31390">皮肤默认</string>
-  <string id="31391">基于Arial字体</string>
-
-  <!-- Description Labels  -->
-  <string id="31400">[B]设置用户界面[/B][CR][CR]变换皮肤 · 设置语言和区域 · 修改文件列表参数 · 设置屏幕保护</string>
-  <string id="31401">[B]设置视频参数[/B][CR][CR]管理视频资料库 · 设置视频播放参数 · 修改视频列表参数 · 设置字幕字体</string>
-  <string id="31402">[B]设置音乐参数[/B][CR][CR]管理音乐资料库 · 设置音乐播放参数 · 修改音乐列表参数 · 设置音乐提交 · 设置卡拉OK选项</string>
-  <string id="31403">[B]设置图片参数[/B][CR][CR]设置图片列表参数 · 设置幻灯片播放</string>
-  <string id="31404">[B]设置天气预报[/B][CR][CR]设置三个获取天气信息的城市</string>
-  <string id="31405">[B]设置网络参数[/B][CR][CR]设置通过UPnP和HTTP控制XBMC · 设置文件共享 · 设置互联网访问参数</string>
-  <string id="31406">[B]设置系统参数[/B][CR][CR]设置和校正显示器 · 设置音频输出 · 设置摇控器 · 设置节电参数 · 启用调试 · 设置管理员和锁定</string>
-  <string id="31407">[B]设置皮肤参数[/B][CR][CR]设置Confluence皮肤 · 增加和删除主菜单项 · 修改皮肤背景</string>
-  <string id="31408">[B]设置扩展功能[/B][CR][CR]管理你安装的扩展功能 · 在xbmc.org浏览并安装扩展功能 · 修改扩展功能设置</string>
-  
-  <string id="31421">选择您的用户配置文件[CR]登录并继续</string>
-</strings>
\ No newline at end of file
diff --git a/addons/skin.touched/language/Dutch/strings.xml b/addons/skin.touched/language/Dutch/strings.xml
deleted file mode 100644 (file)
index 7df80fd..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?>
-<strings>
-  <!-- Misc labels -->
-  <string id="31000">Verander je</string>
-  <string id="31001">Sluiten</string>
-  <string id="31002">Geluidsinstellingen</string>
-  <string id="31003">IP</string>
-  <string id="31004">Caps[CR]Lock</string>
-  <string id="31005">Visualisatie Opties</string>
-  <string id="31006">Visualisatie standaardinstellingen</string>
-  <string id="31007">Context Menu</string>
-  <string id="31008">Volledig Scherm</string>
-  <string id="31009">Bezig...</string>
-  <string id="31010">Momenteel ingelogd als</string>
-  <string id="31011">N/A</string> <!-- Used for subtitle button in the OSD -->
-  <string id="31012">Muziek - Bestanden</string>
-
-  <string id="31024">Pagina</string>
-  <string id="31025">Items</string>
-  <!-- ViewType labels -->
-  <string id="31030">Info Lijst</string>
-  <string id="31031">Info Breed</string>
-
-  <!-- Extra labels -->
-  <string id="31040">Speel nu</string>
-
-  <string id="31042">SPELEN</string>
-  <string id="31043">GEPAUZEERD</string>
-  <string id="31044">VOORUITSPOELEN</string>
-  <string id="31045">TERUGSPOELEN</string>
-  <string id="31046">Geluidsinstellingen</string>
-  <string id="31047">Huidige Instellingen</string>
-  <string id="31048">Visualisatie Standaardinstellingen</string>
-  <string id="31049">End Time</string>
-  <string id="31050">Sorteren: Oplopend</string>
-  <string id="31051">Sorteren: Aflopend</string>
-
-
-  <!-- Playlist Editor labels -->
-  <string id="31055">Open playlist</string>
-  <string id="31056">Save playlist</string>
-  <string id="31057">Sluit playlist</string>
-  <string id="31058">Muziek bestanden</string>
-  <string id="31059">Huidige playlist</string>
-  <string id="31060">Dit bestand is gestapeld, selecteer het deel dat u wilt afspelen.</string>
-  
-  <!-- Submenu labels -->
-  <string id="31200">Terug</string>
-  <string id="31201">Locatie</string>
-
-  <!-- Extra labels -->
-  <string id="31300">Huidige temperatuur</string>
-  <string id="31301">Laatste update</string>
-
-  <string id="31309">Geheugen-verbruik:</string>
-  <string id="31312">Huidige Scraper</string>
-  <string id="31313">Kies een Scraper</string>
-  <string id="31314">Inhoudsscan opties</string>
-
-  <string id="31319">Beschikbare XBMC gebruikersprofielen</string>
-  <string id="31320">Laatste login</string>
-  <string id="31321">Karaoke liedjeskiezer</string>
-  <string id="31322">Uitgezonden</string>
-
-  <string id="31325">Playlist Opties</string>
-
-  <!-- Video and Music OSD Labels  -->
-  <string id="31351">Pauze</string>
-  <string id="31352">Stop</string>
-  <string id="31353">Vooruitspoelen</string>
-  <string id="31354">Terugspoelen</string>
-  <string id="31355">Video Menu</string>
-  <string id="31356">Ondertitels downloaden</string>
-
-  <!-- Skin Fontsets -->
-  <string id="31390">Standaard Skin</string>
-  <string id="31391">Arial lettertype</string>
-
-  <!-- Description Labels  -->
-  <string id="31400">Verander je Skin � Instellen van Taal en Land � Verander bestandslijst opties � Stel een screensaver in</string>
-  <string id="31401">Manage je video bibliotheek � Afspeelopties voor Video � Verander videolijst opties � Stel ondertitel font in</string>
-  <string id="31402">Manage je Muziek bibliotheek � Afspeelopties voor Muziek � Verander Muzieklijst opties � Stel liedjesaanbod in � Stel karaokeopties in</string>
-  <string id="31403">Stel fotolijst opties in � Configureer diashow</string>
-  <string id="31404">Stel drie steden in om weerinformatie te verzamelen</string>
-  <string id="31405">Instellingen voor bedienen XBMC via UPnP en HTTP � Instellingen voor delen van bestanden � Internet instellingen</string>
-  <string id="31406">Instellen en kalibreren van scherm � Configureer geluidsuitgang � Instellen van afstandsbediening � Instellingen voor energiebesparing � Zet debugging aan � Instellingen voor vergrendeling</string>
-  <string id="31407">Instellingen voor Confluence Skin � Toevoegen en verwijderen van Home menu items � Verander skin achtergrond</string>
-  <string id="31408">Manage je geïnstalleerde add-ons � Zoek en installeer add-ons op xbmc.org � Verander add-on instellingen</string>
-
-  <string id="31421">Kies je XBMC gebruikersprofiel[CR]om door te gaan</string>
-</strings>
\ No newline at end of file
diff --git a/addons/skin.touched/language/English/strings.xml b/addons/skin.touched/language/English/strings.xml
deleted file mode 100644 (file)
index a9b534f..0000000
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?>
-<strings>
-  <!-- Misc labels -->
-  <string id="31000">Change Your</string>
-  <string id="31001">Close</string>
-  <string id="31002">Audio Settings</string>
-  <string id="31003">IP</string>
-  <string id="31004">Caps[CR]Lock</string>
-  <string id="31005">Visualization Options</string>
-  <string id="31006">Visualization Presets</string>
-  <string id="31007">Context Menu</string>
-  <string id="31008">Fullscreen</string>
-  <string id="31009">Working...</string>
-  <string id="31010">Currently logged in as</string>
-  <string id="31011">N/A</string> <!-- Used for subtitle button in the OSD -->
-  <string id="31012">Music - Files</string>
-
-  <string id="31024">Page</string>
-  <string id="31025">Items</string>
-  <!-- ViewType labels -->
-  <string id="31030">Info List</string>
-  <string id="31031">Info Wide</string>
-
-  <!-- Extra labels -->
-  <string id="31040">Now Playing</string>
-
-  <string id="31042">PLAYING</string>
-  <string id="31043">PAUSED</string>
-  <string id="31044">FAST FORWARD</string>
-  <string id="31045">REWIND</string>
-  <string id="31046">Audio Properties</string>
-  <string id="31047">Current Preset</string>
-  <string id="31048">Visualization Presets</string>
-  <string id="31049">End Time</string>
-  <string id="31050">Sort: Ascending</string>
-  <string id="31051">Sort: Descending</string>
-
-
-  <!-- Playlist Editor labels -->
-  <string id="31055">Open playlist</string>
-  <string id="31056">Save playlist</string>
-  <string id="31057">Close playlist</string>
-  <string id="31058">System music files</string>
-  <string id="31059">Current playlist</string>
-  <string id="31060">This file is stacked, select the part you want to play from.</string>
-  
-  <!-- Submenu labels -->
-  <string id="31200">Back</string>
-  <string id="31201">Location</string>
-  <string id="31202">View</string>
-
-  <!-- Extra labels -->
-  <string id="31300">Current Temp</string>
-  <string id="31301">Last Updated</string>
-
-  <string id="31309">Memory Used:</string>
-  <string id="31312">Current Scraper</string>
-  <string id="31313">Choose a Scraper</string>
-  <string id="31314">Content Scanning Options</string>
-
-  <string id="31319">Currently available XBMC user profiles</string>
-  <string id="31320">Last Logged In</string>
-  <string id="31321">Karaoke Song Selector</string>
-  <string id="31322">Aired</string>
-
-  <string id="31325">Playlist Options</string>
-
-  <!-- Video and Music OSD Labels  -->
-  <string id="31351">Pause</string>
-  <string id="31352">Stop</string>
-  <string id="31353">Fast Forward</string>
-  <string id="31354">Rewind</string>
-  <string id="31355">Video Menu</string>
-  <string id="31356">Download Subtitles</string>
-  <string id="31357">Image Info</string>
-
-  <!-- Skin Fontsets -->
-  <string id="31390">Skin default</string>
-  <string id="31391">Arial based</string>
-
-  <!-- Description Labels  -->
-  <string id="31400">Change the skin · Set language and region · Change file listing options · Set up a screensaver</string>
-  <string id="31401">Manage your video library · Set video playback options · Change video listing options · Set subtitle fonts</string>
-  <string id="31402">Manage your music library · Set music playback options · Change music listing options · Setup song submission · Set karaoke options</string>
-  <string id="31403">Set picture listing options · Configure slideshows</string>
-  <string id="31404">Set three cities to collect weather information</string>
-  <string id="31405">Setup control of XBMC via UPnP and HTTP · Configure file sharing · Set internet access options</string>
-  <string id="31406">Setup and calibrate displays · Configure audio output · Setup remote controls · Set power saving options · Enable debugging · Setup master lock</string>
-  <string id="31407">Setup the Confluence skin · Add and remove home menu items · Change skin backgrounds</string>
-  <string id="31408">Manage your installed Add-ons · Browse for and install Add-ons from xbmc.org · Modify Add-on settings</string>
-
-  <string id="31421">Select your XBMC user Profile[CR]to login and continue</string>
-
-  <!-- Skin Setting Headers  -->
-  <string id="31500">Home Menu Catagory Buttons</string>
-  <string id="31501">Home Page Add-on Quick Links</string>
-  <string id="31502">Miscellaneous Options</string>
-  <string id="31503">Media Window Add-ons</string>
-
-  <!-- Skin Setting Options  -->
-  <string id="31550">Home Screen Weather Info and button</string>
-  <string id="31551">Add-on Shortcut</string>
-  <string id="31552">Set Add-on to use for subtitles</string>
-  <string id="31553">"Videos" always goes to video root path</string>
-
-  </strings>
diff --git a/addons/skin.touched/language/Finnish/strings.xml b/addons/skin.touched/language/Finnish/strings.xml
deleted file mode 100644 (file)
index 35b34e6..0000000
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<strings>
-  <!-- Misc labels -->
-  <string id="31000">Määritä</string>
-  <string id="31001">Sulje</string>
-  <string id="31002">Ääniasetukset</string>
-  <string id="31003">IP</string>
-  <string id="31004">Caps[CR]Lock</string>
-  <string id="31005">Visualisoinnin asetukset</string>
-  <string id="31006">Visualisoinnin esiasetukset</string>
-  <string id="31007">Pikavalikko</string>
-  <string id="31008">Kokoruutu</string>
-  <string id="31009">Suoritetaan...</string>
-  <string id="31010">Kirjautunut käyttäjänä</string>
-  <string id="31011">N/A</string> <!-- Used for subtitle button in the OSD -->
-  <string id="31012">Musiikki - Tiedostot</string>
-
-  <string id="31024">Sivu</string>
-  <string id="31025">Kohdetta</string>
-
-  <!-- ViewType labels -->
-  <string id="31030">Lista ja tiedot</string>
-  <string id="31031">Leveät tiedot</string>
-
-  <!-- Extra labels -->
-  <string id="31040">Nyt toistetaan</string>
-
-  <string id="31042">TOISTETAAN</string>
-  <string id="31043">TAUKO</string>
-  <string id="31044">KELAUS ETEENPÄIN</string>
-  <string id="31045">KELAUS TAAKSEPÄIN</string>
-  <string id="31046">Ääniasetukset</string>
-  <string id="31047">Nykyinen esiasetus</string>
-  <string id="31048">Visualisoinnin esiasetukset</string>
-  <string id="31049">Päättymisaika</string>
-  <string id="31050">Järjestä: Nousevasti</string>
-  <string id="31051">Järjestä: Laskevasti</string>
-
-
-  <!-- Playlist Editor labels -->
-  <string id="31055">Avaa toistolista</string>
-  <string id="31056">Tallenna toistolista</string>
-  <string id="31057">Sulje toistolista</string>
-  <string id="31058">Musiikkitiedostot</string>
-  <string id="31059">Nykyinen toistolista</string>
-  <string id="31060">Tämä tiedosto on pinottu, valitse osa jonka haluat toistaa.</string>
-
-  <!-- Submenu labels -->
-  <string id="31200">Takaisin</string>
-  <string id="31201">Sijainti</string>
-  <string id="31202">Näkymä</string>
-
-  <!-- Extra labels -->
-  <string id="31300">Tämänhetkinen säätila</string>
-  <string id="31301">Viimeksi päivitetty</string>
-
-  <string id="31309">Käytetty muisti:</string>
-  <string id="31312">Nykyinen hakupaikka</string>
-  <string id="31313">Valitse hakupaikka</string>
-  <string id="31314">Sisällön hakuasetukset</string>
-
-  <string id="31319">Saatavilla olevat käyttäjäprofiilit</string>
-  <string id="31320">Viimeksi kirjauduttu</string>
-  <string id="31321">Karaoke kappaleen valinta</string>
-  <string id="31322">Esitetty</string>
-
-  <string id="31325">Toistolistan asetukset</string>
-
-  <!-- Video and Music OSD Labels  -->
-  <string id="31351">Tauko</string>
-  <string id="31352">Pysäytä</string>
-  <string id="31353">Kelaa eteenpäin</string>
-  <string id="31354">Kelaa taaksepäin</string>
-  <string id="31355">Elokuvavalikko</string>
-  <string id="31356">Lataa tekstitykset</string>
-  <string id="31357">Kuvan tiedot</string>
-
-  <!-- Skin Fontsets -->
-  <string id="31390">Ulkoasun oletus</string>
-  <string id="31391">Arial pohjainen</string>
-
-  <!-- Description Labels  -->
-  <string id="31400">Vaihda ulkoasua · Vaihda kieliasetuksia · Aseta tiedostolistauksen asetukset[CR]Aseta ruudunsäästäjä</string>
-  <string id="31401">Hallitse videokirjastoa · Aseta videotoiston asetukset · Vaihda videolistauksen asetuksia · Aseta tekstitysasetukset</string>
-  <string id="31402">Hallitse musiikkikirjastoa · Aseta musiikkitoiston asetukset · Vaihda musiikkilistauksen asetuksia · Aseta kappaleen lähetysasetuksia · Aseta karaoke-asetukset</string>
-  <string id="31403">Aseta kuvalistauksen asetukset · Määritä kuvaesityksiä</string>
-  <string id="31404">Aseta kolme kaupunkia joista noudetaan säätiedot</string>
-  <string id="31405">Aseta XBMC:n ohjaus UPNP:n ja HTTP:n kautta · Määritä tiedostojen jako · Aseta internet-asetukset</string>
-  <string id="31406">Aseta ja kalibroi näyttö · Määritä äänilähtö · Aseta kauko-ohjaus · Aseta sähkönsäästöasetukset · Ota debuggaus käyttöön · Muokkaa pääkäyttäjän lukituksia</string>
-  <string id="31407">Aseta Confluence-ulkoasun asetukset · Lisää ja poista päävalikon kohteita · Vaihda ulkoasun taustakuvia</string>
-  <string id="31408">Hallitse asennettuja lisäosia · Valitse ja asenna lisäosia xbmc.org:sta · Muokkaa lisäosien asetuksia</string>
-
-  <string id="31421">Valitse XBMC-käyttäjäprofiili[CR]kirjautuaksesi sisään</string>
-
-  <!-- Skin Setting Headers  -->
-  <string id="31500">Päävalikon kategoria-painikkeet</string>
-  <string id="31501">Päävalikon lisäosien pikavalinnat</string>
-  <string id="31502">Sekalaiset asetukset</string>
-  <string id="31503">Mediaikkunan lisäosat</string>
-
-  <!-- Skin Setting Options  -->
-  <string id="31550">Päävalikon säätiedot ja -painike</string>
-  <string id="31551">Lisäosan pikavalinta</string>
-  <string id="31552">Aseta tekstitykset-lisäosa</string>
-  <string id="31553">"Videot"-painike avaa aina "videot"-juurihakemiston</string>
-
-</strings>
diff --git a/addons/skin.touched/language/Korean/strings.xml b/addons/skin.touched/language/Korean/strings.xml
deleted file mode 100644 (file)
index 1e67880..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<strings>
-  <!-- Misc labels -->
-  <string id="31000">변경</string>
-  <string id="31001">닫기</string>
-  <string id="31002">오디오 설정</string>
-  <string id="31003">IP</string>
-  <string id="31004">Caps[CR]Lock</string>
-  <string id="31005">시각화 옵션</string>
-  <string id="31006">시각화 사전설정</string>
-  <string id="31007">컨텍스트 메뉴</string>
-  <string id="31008">전체 화면</string>
-  <string id="31009">작업중...</string>
-  <string id="31010">로그인한 프로파일</string>
-  <string id="31011">N/A</string> <!-- Used for subtitle button in the OSD -->
-  <string id="31012">음악 - 파일</string>
-  
-  <string id="31024">페이지</string>
-  <string id="31025">항목</string>
-
-  <!-- ViewType labels -->
-  <string id="31030">정보표시 목록</string>
-  <string id="31031">정보표시 배너</string>
-
-  <!-- Extra labels -->
-  <string id="31040">지금 재생중</string>
-
-  <string id="31042">재생중</string>
-  <string id="31043">일시정지</string>
-  <string id="31044">빠르게</string>
-  <string id="31045">뒤로</string>
-  <string id="31046">오디오 속성</string>
-  <string id="31047">현재 사전설정</string>
-  <string id="31048">시각화 사전설정</string>
-  <string id="31049">종료 시간</string>
-  <string id="31050">정렬: 오름차</string>
-  <string id="31051">정렬: 내림차</string>
-
-
-  <!-- Playlist Editor labels -->
-  <string id="31055">재생목록 열기</string>
-  <string id="31056">재생목록 저장</string>
-  <string id="31057">재생목록 닫기</string>
-  <string id="31058">시스템 음악 파일</string>
-  <string id="31059">현재 재생목록</string>
-  <string id="31060">이 파일은 연결되었습니다, 재생할 부분을 선택하세요.</string>
-
-  <!-- Submenu Icon labels -->
-  <string id="31200">뒤로</string>
-  <string id="31201">위치</string>
-
-  <!-- Extra labels -->
-  <string id="31300">현재 온도</string>
-  <string id="31301">마지막 업데이트</string>
-
-  <string id="31309">사용 메모리:</string>
-  <string id="31312">현재 자료수집기</string>
-  <string id="31313">자료수집기 선택</string>
-  <string id="31314">컨텐츠 검색 옵션</string>
-
-  <string id="31319">사용가능한 프로파일</string>
-  <string id="31320">마지막 로그인</string>
-  <string id="31321">노래방 노래 선택기</string>
-  <string id="31322">방송</string>
-
-  <string id="31325">재생목록 옵션</string>
-
-  <!-- Video and Music OSD Labels  -->
-  <string id="31351">일시정지</string>
-  <string id="31352">정지</string>
-  <string id="31353">빠르게</string>
-  <string id="31354">뒤로</string>
-  <string id="31355">비디오 메뉴</string>
-  <string id="31356">자막 다운로드</string>
-
-  <!-- Skin Fontsets -->
-  <string id="31390">스킨 기본값</string>
-  <string id="31391">Arial 기본값</string>
-
-  <!-- Description Labels  -->
-  <string id="31400">스킨 변경 · 언어 및 지역 설정 · 파일 목록 옵션 변경 · 화면보호기 설정</string>
-  <string id="31401">비디오 라이브러리 관리 · 비디오 재생 옵션 변경 · 비디오 목록 옵션 변경 · 자막 글꼴 설정</string>
-  <string id="31402">음악 라이브러리 관리 · 음악 재생 옵션 변경 · 음악 목록 옵션 변경 · 노래 전송 설정 · 노래방 옵션 설정</string>
-  <string id="31403">사진 목록 옵션 변경 · 슬라이드쇼 설정</string>
-  <string id="31404">날씨 정보를 수집할 세 도시 설정</string>
-  <string id="31405">UPnP 및 HTTP 를 통한 XBMC 제어 설정 · 파일 공유 설정 · 인터넷 접근 옵션 설정</string>
-  <string id="31406">화면 설정 및 조정 · 오디오 출력 설정 · 원격 제어 설정 · 전원 절약 옵션 설정 · 디버깅 사용 · 마스터 잠금 설정</string>
-  <string id="31407">Confluence 스킨 설정 · 홈 메뉴 항목 추가 및 제거 · 스킨 배경 변경</string>
-  <string id="31408">설치된 추가기능 관리 · xbmc.org 에서 추가기능 찾기 및 설치 · 추가기능 설정 변경</string>
-
-  <string id="31421">로그인할 XBMC 사용자 프로파일을[CR]선택하고 계속하세요</string>
-</strings>
diff --git a/addons/skin.touched/language/Slovenian/strings.xml b/addons/skin.touched/language/Slovenian/strings.xml
deleted file mode 100644 (file)
index 12ef701..0000000
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<strings>
-  <!-- Misc labels -->
-  <string id="31000">Prilagodite va?e</string>
-  <string id="31001">Zapri</string>
-  <string id="31002">Nastavitve zvoka</string>
-  <string id="31003">IP</string>
-  <string id="31004">Caps[CR]Lock</string>
-  <string id="31005">Nastavitve vizualizacije</string>
-  <string id="31006">Privzete vizualizacije</string>
-  <string id="31007">Meni</string>
-  <string id="31008">Celoten zaslon</string>
-  <string id="31009">Prosim, po?akajte...</string>
-  <string id="31010">Trenutno prijavljen kot</string>
-  <string id="31011">Brez</string> <!-- Used for subtitle button in the OSD -->
-  <string id="31012">Glasba - Datoteke</string>
-
-  <string id="31024">Page</string>
-  <string id="31025">Items</string>
-  <!-- ViewType labels -->
-  <string id="31030">Seznam</string>
-  <string id="31031">?irok seznam</string>
-
-  <!-- Extra labels -->
-  <string id="31040">Trenutno predvajam</string>
-
-  <string id="31042">PREDVAJANJE</string>
-  <string id="31043">PREKINJENO</string>
-  <string id="31044">PREVIJANJE NAPREJ</string>
-  <string id="31045">NAZAJ</string>
-  <string id="31046">Zvo?ne lastnosti</string>
-  <string id="31047">Trenutna prednastavitev</string>
-  <string id="31048">Prednastavitve vizualizacije</string>
-  <string id="31049">?as zaklju?ka</string>
-  <string id="31050">Razvrsti: Nara??ajo?e</string>
-  <string id="31051">Razvrsti: Padajo?e</string>
-
-
-  <!-- Playlist Editor labels -->
-  <string id="31055">Odpri predvajalni seznam</string>
-  <string id="31056">Shrani predvajalni seznam</string>
-  <string id="31057">Zapri predvajalni seznam</string>
-  <string id="31058">Sistemske glasbene datoteke</string>
-  <string id="31059">Trenutni predvajalni seznam</string>
-  <string id="31060">Ta datoteka je zdru?ena. Izberite del za predvajanje.</string>
-
-  
-  <!-- Submenu labels -->
-  <string id="31200">Nazaj</string>
-  <string id="31201">Lokacija</string>
-  <string id="31202">Pogled</string>
-
-  <!-- Extra labels -->
-  <string id="31300">Trenutna temp.</string>
-  <string id="31301">Zadnji? posodobljeno</string>
-
-  <string id="31309">Poraba pomnilnika:</string>
-  <string id="31312">Trenutni ponudnik</string>
-  <string id="31313">Izberi ponudnika</string>
-  <string id="31314">Trenutne mo?nosti skeniranja</string>
-
-  <string id="31319">Profili XBMC, ki so trenutno na voljo</string>
-  <string id="31320">Zadnja prijava</string>
-  <string id="31321">Izbira pesmi za karaoke</string>
-  <string id="31322">?e predvajano</string>
-
-  <string id="31325">Mo?nosti predvajalnega seznama</string>
-
-  <!-- Video and Music OSD Labels  -->
-  <string id="31351">Prekini</string>
-  <string id="31352">Ustavi</string>
-  <string id="31353">Previj naprej</string>
-  <string id="31354">Nazaj</string>
-  <string id="31355">Filmski menu</string>
-  <string id="31356">Prenesi podnapise</string>
-  <string id="31357">Informacija o sliki</string>
-
-  <!-- Skin Fontsets -->
-  <string id="31390">Privzeto</string>
-  <string id="31391">Arial</string>
-
-  <!-- Description Labels  -->
-  <string id="31400">Zamenjajte preobleko ? Dolo?ite jezik in regijo ? Spremenite mo?nosti seznamov ? Nastavite ohranjevalnik zaslona</string>
-  <string id="31401">Upravljajte s knji?nico videa ? Nastavite mo?nosti predvajanja videa ? Spremenite mo?nosti seznamov videa ? Dolo?ite pisavo podnapisov</string>
-  <string id="31402">Upravljajte s knji?nico glasbe ? Nastavite mo?nosti predvajanja glasbe ? Spremenite mo?nosti seznamov glasbe ? Nastavite objavo pesmi ? Nastavite karaoke</string>
-  <string id="31403">Spremenite mo?nosti seznamov slik ? Nastavite projekcije slik</string>
-  <string id="31404">Izberite tri mesta, za katere bo na voljo vremenska napoved</string>
-  <string id="31405">Nastavite upravljanje XBMC preko UPnP in HTTP ? Nastavite deljenje datotek ? Nastavite mo?nosti internetne povezave</string>
-  <string id="31406">Nastavite in prilagodite zaslon ? Nastavite zvo?ni izhod ? Nastavite oddaljeno upravljanje ? Nastavite var?evanje z energijo ? Vklju?ite razhro??evanje ? Dolo?ite glavno geslo</string>
-  <string id="31407">Nastavite preobleko Touched ? Dodajte in odstranite elemente na doma?em oknu ? Spremenite ozadja preobleke</string>
-  <string id="31408">Upravljajte name??ene dodatke ? Brskajte in namestite nove dodatke iz xbmc.org ? Nastavite dodatke</string>
-
-  <string id="31421">Izberite va? XBMC uporabni?ki profil[CR]za prijavo in nadaljujte</string>
-
-  <!-- Skin Setting Headers  -->
-  <string id="31500">Gumbi kategorij na doma?i strani</string>
-  <string id="31501">Hitre povezave do dodatkov na doma?i strani</string>
-  <string id="31502">Razne mo?nosti</string>
-  <string id="31503">Dodatki multimedijskega okna</string>
-
-  <!-- Skin Setting Options  -->
-  <string id="31550">Vreme in gumb na doma?em zaslonu</string>
-  <string id="31551">Bli?njica dodatka</string>
-  <string id="31552">Dodatek podnapisov</string>
-  <string id="31553">"Video" vedno odpre korensko pot</string>
-
-  </strings>
diff --git a/addons/skin.touched/media/Textures.xbt b/addons/skin.touched/media/Textures.xbt
deleted file mode 100644 (file)
index f1aae69..0000000
Binary files a/addons/skin.touched/media/Textures.xbt and /dev/null differ
index f1101b3..5505eae 100755 (executable)
@@ -123,8 +123,10 @@ libudev_not_found="== Could not find libudev. Will use polling to check for devi
 libudev_disabled="== udev support disabled. Will use polling to check for device changes. =="
 libusb_not_found="== Could not find libusb. Plug and play USB device support will not be available. =="
 libusb_disabled="== libusb disabled. Plug and play USB device support will not be available. =="
-libcec_not_found="== Could not find libcec. CEC device support will not be available. =="
-libcec_disabled="== libcec disabled. CEC device support will not be available. =="
+libcec_enabled="== libCEC enabled. =="
+libcec_disabled="== libCEC disabled. CEC adapter support will not be available. =="
+libcec_internal="== Using internal libCEC. =="
+libcec_external_missing="== libCEC was not found on your system.  =="
 
 # External library message strings
 external_libraries_enabled="== Use of all supported external libraries enabled. =="
@@ -398,9 +400,9 @@ AC_ARG_ENABLE([libusb],
 
 AC_ARG_ENABLE([libcec],
   [AS_HELP_STRING([--enable-libcec],
-  [enable libcec support (default is auto)])],
+  [enable libcec support (default is no)])],
   [use_libcec=$enableval],
-  [use_libcec=auto])
+  [use_libcec=no])
 
 ### External libraries options
 AC_ARG_ENABLE([external-libraries],
@@ -409,6 +411,12 @@ AC_ARG_ENABLE([external-libraries],
   [use_external_libraries=$enableval],
   [use_external_libraries=no])
 
+AC_ARG_ENABLE([external-libcec],
+  [AS_HELP_STRING([--enable-external-libcec],
+  [external libcec support (default is no) 'Linux only'])],
+  [use_external_libcec=$enableval],
+  [use_external_libcec=no])
+
 AC_ARG_ENABLE([external-ffmpeg],
   [AS_HELP_STRING([--enable-external-ffmpeg],
   [enable use of external ffmpeg libraries (default is no) 'Linux only'])],
@@ -959,6 +967,17 @@ else
   DISABLE_PROJECTM=0
 fi
 
+# skin touched
+use_skin_touched=no
+if [[ -f "addons/skin.touched/addon.xml" ]]; then 
+  use_skin_touched=yes
+  USE_SKIN_TOUCHED=1
+  AC_DEFINE([HAS_SKIN_TOUCHED], [1], [Whether to build skin touched.])
+else
+  USE_SKIN_TOUCHED=0
+fi
+
+
 # libRTMP
 if test "$use_librtmp" != "no"; then
   AC_CHECK_HEADERS([librtmp/log.h librtmp/amf.h librtmp/rtmp.h],,
@@ -1074,68 +1093,75 @@ if test "x$use_airtunes" != "xno"; then
   fi
 fi
 
-# libusb
-USE_LIBUSB=0
-if test "$use_libusb" = "auto"; then
-  PKG_CHECK_MODULES([USB], ["libusb"],
-    use_libusb="yes"; USE_LIBUSB=1; [INCLUDES="$INCLUDES $USB_CFLAGS"; LIBS="$LIBS $USB_LIBS"; USE_LIBUSB=1]; \
-    AC_DEFINE([HAVE_LIBUSB],[1],["Define to 1 if libusb is installed"]),
-    use_libusb="no"; AC_MSG_RESULT($libusb_not_found))
-elif test "$use_libusb" = "yes"; then
-  PKG_CHECK_MODULES([USB], ["libusb"],
-    use_libusb="yes"; USE_LIBUSB=1; [INCLUDES="$INCLUDES $USB_CFLAGS"; LIBS="$LIBS $USB_LIBS"; USE_LIBUSB=1]; \
-    AC_DEFINE([HAVE_LIBUSB],[1],["Define to 1 if libusb is installed"]),
-    use_libusb="no"; AC_MSG_ERROR($libusb_not_found))
-else
-  use_libusb="no"
-  AC_MSG_NOTICE($libusb_disabled)
-fi
-
 # udev
 USE_LIBUDEV=0
-if test "$use_libusb" = "yes"; then
   if test "$host_vendor" = "apple" ; then
+  use_libudev="no"
+  AC_MSG_NOTICE($libudev_disabled)
+else
+  if test "$use_libudev" = "auto"; then
+    PKG_CHECK_MODULES([UDEV], [libudev],
+      use_libudev="yes"; use_libusb="no"; USE_LIBUDEV=1; [INCLUDES="$INCLUDES $UDEV_CFLAGS"; LIBS="$LIBS $UDEV_LIBS"]; \
+      AC_DEFINE([HAVE_LIBUDEV],[1],["Define to 1 if libudev is installed"]),
+      AC_MSG_RESULT($libudev_not_found))
+  elif test "$use_libudev" = "yes" ; then
+    PKG_CHECK_MODULES([UDEV], [libudev],
+      use_libudev="yes"; use_libusb="no"; USE_LIBUDEV=1; [INCLUDES="$INCLUDES $UDEV_CFLAGS"; LIBS="$LIBS $UDEV_LIBS"]; \
+      AC_DEFINE([HAVE_LIBUDEV],[1],["Define to 1 if libudev is installed"]),
+      AC_MSG_ERROR($libudev_not_found))
     use_libudev="no"
     AC_MSG_NOTICE($libudev_disabled)
+  fi
+fi
+
+# libusb
+USE_LIBUSB=0
+if test "$use_libudev" != "yes"; then
+  if test "$host_vendor" = "apple" ; then
+    use_libusb="no"
+    AC_MSG_NOTICE($libusb_disabled)
   else
-    if test "$use_libudev" = "auto"; then
-      PKG_CHECK_MODULES([UDEV], [libudev],
-        use_libudev="yes"; use_libusb="no"; USE_LIBUDEV=1; [INCLUDES="$INCLUDES $UDEV_CFLAGS"; LIBS="$LIBS $UDEV_LIBS"]; \
-        AC_DEFINE([HAVE_LIBUDEV],[1],["Define to 1 if libudev is installed"]),
-           AC_MSG_RESULT($libudev_not_found))
-    elif test "$use_libudev" = "yes" ; then
-      PKG_CHECK_MODULES([UDEV], [libudev],
-        use_libudev="yes"; use_libusb="no"; USE_LIBUDEV=1; [INCLUDES="$INCLUDES $UDEV_CFLAGS"; LIBS="$LIBS $UDEV_LIBS"]; \
-        AC_DEFINE([HAVE_LIBUDEV],[1],["Define to 1 if libudev is installed"]),
-           AC_MSG_ERROR($libudev_not_found))
-    else
-      use_libudev="no"
-      AC_MSG_NOTICE($libudev_disabled)
+    if test "$use_libusb" = "auto"; then
+      PKG_CHECK_MODULES([USB], [libusb],
+        use_libusb="yes"; USE_LIBUSB=1; [INCLUDES="$INCLUDES $USB_CFLAGS"; LIBS="$LIBS $USB_LIBS"; USE_LIBUSB=1]; \
+        AC_DEFINE([HAVE_LIBUSB],[1],["Define to 1 if libusb is installed"]),
+        use_libusb="no"; AC_MSG_RESULT($libusb_not_found))
+    elif test "$use_libusb" = "yes"; then
+      PKG_CHECK_MODULES([USB], [libusb],
+        use_libusb="yes"; USE_LIBUSB=1; [INCLUDES="$INCLUDES $USB_CFLAGS"; LIBS="$LIBS $USB_LIBS"; USE_LIBUSB=1]; \
+        AC_DEFINE([HAVE_LIBUSB],[1],["Define to 1 if libusb is installed"]),
+        use_libusb="no"; AC_MSG_ERROR($libusb_not_found))
+      use_libusb="no"
+      AC_MSG_NOTICE($libusb_disabled)
     fi
   fi
 else
-  use_libudev="no"
-  AC_MSG_NOTICE($libudev_disabled)
+  use_libusb="no"
 fi
 
 # libcec
 USE_LIBCEC=0
-if test "$use_libcec" = "auto"; then
-  PKG_CHECK_MODULES([CEC], [libcec],
-    use_libcec="yes"; USE_LIBCEC=1; [INCLUDES="$INCLUDES $CEC_CFLAGS"; LIBS="$LIBS $CEC_LIBS";] \
-    AC_DEFINE([HAVE_LIBCEC],[1],["Define to 1 if libcec is installed"]),
-       use_libcec="no"; AC_MSG_RESULT($libcec_not_found))
-elif test "$use_libcec" = "yes"; then
-  PKG_CHECK_MODULES([CEC], [libcec],
-    use_libcec="yes"; USE_LIBCEC=1; [INCLUDES="$INCLUDES $CEC_CFLAGS"; LIBS="$LIBS $CEC_LIBS";] \
-    AC_DEFINE([HAVE_LIBCEC],[1],["Define to 1 if libcec is installed"]),
-       use_libcec="no"; AC_MSG_ERROR($libcec_not_found))
+if test "$use_libcec" = "yes"; then
+  USE_LIBCEC=1; AC_DEFINE([HAVE_LIBCEC],[1],["Define to 1 if libCEC is installed"])
+  AC_MSG_NOTICE($libcec_enabled)
 else
   use_libcec="no"
   AC_MSG_NOTICE($libcec_disabled)
 fi
 
 ### External libraries checks
+
+# external libcec
+USE_EXTERNAL_LIBCEC=0
+if test "$use_external_libcec" = "yes"; then
+  USE_EXTERNAL_LIBCEC=1; PKG_CHECK_MODULES([CEC], [libcec],
+    [INCLUDES="$INCLUDES $CEC_CFLAGS"; LIBS="$LIBS $CEC_LIBS"],
+    AC_MSG_ERROR($libcec_external_missing))
+elif test "$use_libcec" = "yes"; then
+  [INCLUDES="$INCLUDES -I\$(abs_top_srcdir)/lib/libcec/include"]
+  AC_MSG_NOTICE($libcec_internal)
+fi
+
 # External FFmpeg
 if test "$use_external_ffmpeg" = "yes"; then
   FFMPEG_LIBNAMES="libavcodec libavfilter libavformat libavutil libpostproc libswscale"
@@ -1573,6 +1599,12 @@ else
   final_message="$final_message\n  ProjectM:\tNo"
 fi
 
+if test "$use_skin_touched" = "yes"; then
+  final_message="$final_message\n  Skin Touched:\tYes"
+else
+  final_message="$final_message\n  Skin Touched:\tNo"
+fi
+
 if test "$use_x11" = "yes"; then
   final_message="$final_message\n  X11:\t\tYes"
 else
@@ -1764,13 +1796,19 @@ else
   final_message="$final_message\n  libusb support:\tNo"
 fi
 
-if test "x$use_libcec" != "xno"; then
-  final_message="$final_message\n  libcec support:\tYes"
+if test "$use_libcec" = "yes"; then
+  final_message="$final_message\n  libCEC support:\tYes"
 else
-  final_message="$final_message\n  libcec support:\tNo"
+  final_message="$final_message\n  libCEC support:\tNo"
 fi
 
 ### External libraries messages
+if test "$use_external_libcec" = "yes"; then
+  final_message="$final_message\n  External libCEC:\tYes"
+else
+  final_message="$final_message\n  External libCEC:\tNo"
+fi
+
 if test "$use_external_ffmpeg" = "yes"; then
   final_message="$final_message\n  External FFmpeg:\tYes"
 else
@@ -1836,7 +1874,12 @@ OUTPUT_FILES="Makefile \
     tools/TexturePacker/Makefile \
     tools/EventClients/Clients/OSXRemote/Makefile \
     xbmc/peripherals/bus/Makefile \
-    xbmc/peripherals/devices/Makefile"
+    xbmc/peripherals/devices/Makefile \
+    lib/libcec/Makefile"
+
+if test "$use_skin_touched" = "yes"; then
+OUTPUT_FILES+=" addons/skin.touched/media/Makefile"
+fi
 
 # Line below is used so we can use AM_INIT_AUTOMAKE. The corresponding
 # .dummy.am does nothing.
@@ -1854,6 +1897,7 @@ AC_SUBST(BUILD_DVDCSS)
 AC_SUBST(DISABLE_GOOM)
 AC_SUBST(DISABLE_RSXS)
 AC_SUBST(DISABLE_PROJECTM)
+AC_SUBST(USE_SKIN_TOUCHED)
 AC_SUBST(USE_EXTERNAL_FFMPEG)
 AC_SUBST(PYTHON_VERSION)
 AC_SUBST(OUTPUT_FILES)
@@ -1891,6 +1935,8 @@ AC_SUBST(USE_AIRTUNES)
 AC_SUBST(USE_LIBUDEV)
 AC_SUBST(USE_LIBUSB)
 AC_SUBST(USE_LIBCEC)
+AC_SUBST(USE_EXTERNAL_LIBCEC)
+
 
 # pushd and popd are not available in other shells besides bash, so implement
 # our own pushd/popd functions
@@ -2159,6 +2205,16 @@ XB_CONFIG_MODULE([lib/cpluff], [
     #LDFLAGS="$LDFLAGS -Wl,-read_only_relocs,suppress"    
 ], [0])
 
+XB_CONFIG_MODULE([lib/libcec], [
+  if test "$use_libcec" = "yes" ; then
+    cd libcec ; ./configure \
+      --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
+      --host=$host_alias \
+      --build=$build_alias \
+      --target=$target_alias CFLAGS="$CFLAGS" CC="$CC" CXX="$CXX"
+  fi    
+], [0])
+
 AC_OUTPUT
 
 final_message="$final_message\n  prefix:\t$prefix\n$dashes"
diff --git a/lib/DllLibbluray.h b/lib/DllLibbluray.h
new file mode 100644 (file)
index 0000000..4ab8d47
--- /dev/null
@@ -0,0 +1,171 @@
+/*
+ *      Copyright (C) 2005-2009 Team XBMC
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+#pragma once
+#include "system.h"
+#ifdef HAVE_LIBBLURAY
+
+#include "DynamicDll.h"
+
+
+extern "C"
+{
+#include <libbluray/bluray.h>
+#include <libbluray/filesystem.h>
+#ifndef HAVE_LIBBLURAY_NOLOGCONTROL
+#include <libbluray/log_control.h>
+#endif
+}
+
+class DllLibblurayInterface
+{
+public:
+  virtual ~DllLibblurayInterface() {};
+  virtual uint32_t bd_get_titles(BLURAY *bd, uint8_t flags, uint32_t min_title_length)=0;
+  virtual BLURAY_TITLE_INFO* bd_get_title_info(BLURAY *bd, uint32_t title_idx, unsigned angle)=0;
+  virtual BLURAY_TITLE_INFO* bd_get_playlist_info(BLURAY *bd, uint32_t playlist, unsigned angle)=0;
+  virtual void bd_free_title_info(BLURAY_TITLE_INFO *title_info)=0;
+  virtual BLURAY *bd_open(const char* device_path, const char* keyfile_path)=0;
+  virtual void bd_close(BLURAY *bd)=0;
+  virtual int64_t bd_seek(BLURAY *bd, uint64_t pos)=0;
+  virtual int64_t bd_seek_time(BLURAY *bd, uint64_t tick)=0;
+  virtual int bd_read(BLURAY *bd, unsigned char *buf, int len)=0;
+  virtual int64_t bd_seek_chapter(BLURAY *bd, unsigned chapter)=0;
+  virtual int64_t bd_chapter_pos(BLURAY *bd, unsigned chapter)=0;
+  virtual uint32_t bd_get_current_chapter(BLURAY *bd)=0;
+  virtual int64_t bd_seek_mark(BLURAY *bd, unsigned mark)=0;
+  virtual int bd_select_playlist(BLURAY *bd, uint32_t playlist)=0;
+  virtual int bd_select_title(BLURAY *bd, uint32_t title)=0;
+  virtual int bd_select_angle(BLURAY *bd, unsigned angle)=0;
+  virtual void bd_seamless_angle_change(BLURAY *bd, unsigned angle)=0;
+  virtual uint64_t bd_get_title_size(BLURAY *bd)=0;
+  virtual uint32_t bd_get_current_title(BLURAY *bd)=0;
+  virtual unsigned bd_get_current_angle(BLURAY *bd)=0;
+  virtual uint64_t bd_tell(BLURAY *bd)=0;
+  virtual uint64_t bd_tell_time(BLURAY *bd)=0;
+  virtual BD_FILE_OPEN bd_register_file(BD_FILE_OPEN p)=0;
+  virtual BD_DIR_OPEN bd_register_dir(BD_DIR_OPEN p)=0;
+
+#ifndef HAVE_LIBBLURAY_NOLOGCONTROL
+  virtual void     bd_set_debug_handler(BD_LOG_FUNC)=0;
+  virtual void     bd_set_debug_mask(uint32_t mask)=0;
+  virtual uint32_t bd_get_debug_mask(void)=0;
+#endif
+};
+
+class DllLibbluray : public DllDynamic, DllLibblurayInterface
+{
+  DECLARE_DLL_WRAPPER(DllLibbluray, DLL_PATH_LIBBLURAY)
+#ifdef HAVE_LIBBBLURAY_HAVE_LIBBLURAY_NOANGLE
+  DEFINE_METHOD3(uint32_t,            bd_get_titles,          (BLURAY *p1, uint8_t p2))
+  DEFINE_METHOD3(BLURAY_TITLE_INFO*,  bd_get_title_info,      (BLURAY *p1, uint32_t p2))
+  DEFINE_METHOD3(BLURAY_TITLE_INFO*,  bd_get_playlist_info,   (BLURAY *p1, uint32_t p2))
+#else
+  DEFINE_METHOD3(uint32_t,            bd_get_titles,          (BLURAY *p1, uint8_t p2, uint32_t p3))
+  DEFINE_METHOD3(BLURAY_TITLE_INFO*,  bd_get_title_info,      (BLURAY *p1, uint32_t p2, unsigned p3))
+  DEFINE_METHOD3(BLURAY_TITLE_INFO*,  bd_get_playlist_info,   (BLURAY *p1, uint32_t p2, unsigned p3))
+#endif
+  DEFINE_METHOD1(void,                bd_free_title_info,     (BLURAY_TITLE_INFO *p1))
+  DEFINE_METHOD2(BLURAY*,             bd_open,                (const char* p1, const char* p2))
+  DEFINE_METHOD1(void,                bd_close,               (BLURAY *p1))
+  DEFINE_METHOD2(int64_t,             bd_seek,                (BLURAY *p1, uint64_t p2))
+  DEFINE_METHOD2(int64_t,             bd_seek_time,           (BLURAY *p1, uint64_t p2))
+  DEFINE_METHOD3(int,                 bd_read,                (BLURAY *p1, unsigned char *p2, int p3))
+  DEFINE_METHOD2(int64_t,             bd_seek_chapter,        (BLURAY *p1, unsigned p2))
+  DEFINE_METHOD2(int64_t,             bd_chapter_pos,         (BLURAY *p1, unsigned p2))
+  DEFINE_METHOD1(uint32_t,            bd_get_current_chapter, (BLURAY *p1))
+  DEFINE_METHOD2(int64_t,             bd_seek_mark,           (BLURAY *p1, unsigned p2))
+  DEFINE_METHOD2(int,                 bd_select_playlist,     (BLURAY *p1, uint32_t p2))
+  DEFINE_METHOD2(int,                 bd_select_title,        (BLURAY *p1, uint32_t p2))
+  DEFINE_METHOD2(int,                 bd_select_angle,        (BLURAY *p1, unsigned p2))
+  DEFINE_METHOD2(void,                bd_seamless_angle_change,(BLURAY *p1, unsigned p2))
+  DEFINE_METHOD1(uint64_t,            bd_get_title_size,      (BLURAY *p1))
+  DEFINE_METHOD1(uint32_t,            bd_get_current_title,   (BLURAY *p1))
+  DEFINE_METHOD1(unsigned,            bd_get_current_angle,   (BLURAY *p1))
+  DEFINE_METHOD1(uint64_t,            bd_tell,                (BLURAY *p1))
+  DEFINE_METHOD1(uint64_t,            bd_tell_time,           (BLURAY *p1))
+  DEFINE_METHOD1(BD_FILE_OPEN,        bd_register_file,       (BD_FILE_OPEN p1))
+  DEFINE_METHOD1(BD_DIR_OPEN,         bd_register_dir,        (BD_DIR_OPEN p1))
+
+#ifndef HAVE_LIBBLURAY_NOLOGCONTROL
+  DEFINE_METHOD1(void,                bd_set_debug_handler,   (BD_LOG_FUNC p1))
+  DEFINE_METHOD1(void,                bd_set_debug_mask,      (uint32_t p1))
+  DEFINE_METHOD0(uint32_t,            bd_get_debug_mask)
+#endif
+
+  BEGIN_METHOD_RESOLVE()
+    RESOLVE_METHOD(bd_get_titles)
+    RESOLVE_METHOD(bd_get_title_info)
+    RESOLVE_METHOD(bd_get_playlist_info)
+    RESOLVE_METHOD_RENAME(bd_free_title_info,   bd_free_title_info)
+    RESOLVE_METHOD_RENAME(bd_open,              bd_open)
+    RESOLVE_METHOD_RENAME(bd_close,             bd_close)
+    RESOLVE_METHOD_RENAME(bd_seek,              bd_seek)
+    RESOLVE_METHOD_RENAME(bd_seek_time,         bd_seek_time)
+    RESOLVE_METHOD_RENAME(bd_read,              bd_read)
+    RESOLVE_METHOD_RENAME(bd_seek_chapter,      bd_seek_chapter)
+    RESOLVE_METHOD_RENAME(bd_chapter_pos,       bd_chapter_pos)
+    RESOLVE_METHOD_RENAME(bd_get_current_chapter, bd_get_current_chapter)
+    RESOLVE_METHOD_RENAME(bd_seek_mark,         bd_seek_mark)
+    RESOLVE_METHOD_RENAME(bd_select_playlist,   bd_select_playlist)
+    RESOLVE_METHOD_RENAME(bd_select_title,      bd_select_title)
+    RESOLVE_METHOD_RENAME(bd_select_angle,      bd_select_angle)
+    RESOLVE_METHOD_RENAME(bd_seamless_angle_change, bd_seamless_angle_change)
+    RESOLVE_METHOD_RENAME(bd_get_title_size,    bd_get_title_size)
+    RESOLVE_METHOD_RENAME(bd_get_current_title, bd_get_current_title)
+    RESOLVE_METHOD_RENAME(bd_get_current_angle, bd_get_current_angle)
+    RESOLVE_METHOD_RENAME(bd_tell,              bd_tell)
+    RESOLVE_METHOD_RENAME(bd_tell_time,         bd_tell_time)
+    RESOLVE_METHOD_RENAME(bd_register_file,     bd_register_file)
+    RESOLVE_METHOD_RENAME(bd_register_dir,      bd_register_dir)
+    RESOLVE_METHOD(bd_set_debug_handler)
+    RESOLVE_METHOD(bd_set_debug_mask)
+    RESOLVE_METHOD(bd_get_debug_mask)
+#ifndef HAVE_LIBBLURAY_NOLOGCONTROL
+    RESOLVE_METHOD(bd_set_debug_handler)
+    RESOLVE_METHOD(bd_set_debug_mask)
+    RESOLVE_METHOD(bd_get_debug_mask)
+#endif
+  END_METHOD_RESOLVE()
+
+#ifdef HAVE_LIBBBLURAY_HAVE_LIBBLURAY_NOANGLE
+  uint32_t bd_get_titles(BLURAY *bd, uint8_t flags, uint32_t min_title_length)
+      {return bd_get_titles_noangle(bd, flags);           }
+  BLURAY_TITLE_INFO* bd_get_title_info(BLURAY *bd, uint32_t title_idx, unsigned angle)
+      {return bd_get_title_info_noangle(bd, title_idx);   }
+  BLURAY_TITLE_INFO* bd_get_playlist_info(BLURAY *bd, uint32_t playlist, unsigned angle)
+      {return bd_get_playlist_info_noangle(bd, playlist); }
+#endif
+
+public:
+  static void       file_close(BD_FILE_H *file);
+  static int64_t    file_seek(BD_FILE_H *file, int64_t offset, int32_t origin);
+  static int64_t    file_tell(BD_FILE_H *file);
+  static int        file_eof(BD_FILE_H *file);
+  static int64_t    file_read(BD_FILE_H *file, uint8_t *buf, int64_t size);
+  static int64_t    file_write(BD_FILE_H *file, const uint8_t *buf, int64_t size);
+  static BD_FILE_H *file_open(const char* filename, const char *mode);
+  static void      dir_close(BD_DIR_H *dir);
+  static int       dir_read(BD_DIR_H *dir, BD_DIRENT *entry);
+  static BD_DIR_H *dir_open(const char* dirname);
+  static void      bluray_logger(const char* msg);
+};
+
+#endif
diff --git a/lib/addons/script.module.pil/Imaging-1.1.7-access.patch b/lib/addons/script.module.pil/Imaging-1.1.7-access.patch
new file mode 100644 (file)
index 0000000..dd51f4a
--- /dev/null
@@ -0,0 +1,13 @@
+diff -rupN Imaging-1.1.7/libImaging/Access.c Imaging-1.1.7-mod/libImaging/Access.c
+--- Imaging-1.1.7/libImaging/Access.c  2009-10-31 20:44:12.000000000 -0400
++++ Imaging-1.1.7-mod/libImaging/Access.c      2011-10-10 19:40:22.000000000 -0400
+@@ -32,7 +32,7 @@ add_item(const char* mode)
+ {
+     UINT32 i = hash(mode);
+     /* printf("hash %s => %d\n", mode, i); */
+-    if (access_table[i].mode) {
++    if (access_table[i].mode && (strcmp(mode, access_table[i].mode) != 0)) {
+         fprintf(stderr, "AccessInit: hash collision: %d for both %s and %s\n",
+                 i, mode, access_table[i].mode);
+         exit(1);
+
index 4fb5db9..a1f4d00 100644 (file)
@@ -41,6 +41,7 @@ $(SOURCE): $(ARCHIVE)
        cd $(SOURCE); \
        patch -p1 < ../Imaging-1.1.7-crosscompiling-0.1.patch; \
        patch -p1 < ../Imaging-1.1.7-setuptools-0.1.patch; \
+       patch -p1 < ../Imaging-1.1.7-access.patch; \
        sed -ie "s|"darwin"|"darwinNot"|g" "setup.py"; \
        fi
 
diff --git a/lib/libcec/Makefile.in b/lib/libcec/Makefile.in
new file mode 100644 (file)
index 0000000..4343cfb
--- /dev/null
@@ -0,0 +1,51 @@
+#  Download and build libCEC
+#
+#  Usage:
+#    make download
+#    make bootstrap
+#    make configure
+#    make
+
+# lib name, version
+LIBNAME=libcec
+VERSION=0.6
+ARCHIVE=$(LIBNAME)-$(VERSION)
+
+# download location and format
+ARCHIVE_BASE_URL=http://github.com/Pulse-Eight/$(LIBNAME)/tarball/
+ARCHIVE_EXTRACTED_DIR=Pulse-Eight-libcec-d9ba5be
+ARCHIVE_URL=$(ARCHIVE_BASE_URL)$(ARCHIVE)
+ARCHIVE_TOOL=tar
+ARCHIVE_TOOL_FLAGS=xf
+ARCHIVE_ADD_EXTENSION=.tar.gz
+RETRIEVE_TOOL=/usr/bin/curl
+RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(ARCHIVE)$(ARCHIVE_ADD_EXTENSION)
+
+# configuration
+PREFIX ?= @abs_top_srcdir@/lib/libcec
+LIBCEC_CONFIGOPTS ?= --prefix=$(PREFIX)
+CONFIGURE=./configure CFLAGS=-D_FILE_OFFSET_BITS=64 $(LIBCEC_CONFIGOPTS)
+
+all: libcec.a
+
+download: distclean
+       $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(ARCHIVE_URL)
+       $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(ARCHIVE)$(ARCHIVE_ADD_EXTENSION)
+       rm -f $(ARCHIVE)$(ARCHIVE_ADD_EXTENSION)
+       mv $(ARCHIVE_EXTRACTED_DIR) $(LIBNAME)
+       mkdir -p include/libcec
+       cp $(LIBNAME)/include/* include/libcec
+
+libcec.a:
+       make -C $(LIBNAME)
+       cp $(LIBNAME)/src/lib/.libs/libcec.a libcec.a
+
+clean:
+       rm -f libcec.a
+       make -C $(LIBNAME) clean
+
+distclean:
+       rm -f $(ARCHIVE) libcec.a Makefile
+       rm -rf include
+       rm -rf $(LIBNAME)
+       rm -rf $(ARCHIVE_DIR)
index 2a776bc..b0970d2 100644 (file)
@@ -8,7 +8,8 @@ CALL dlextract.bat libcec %FILES%
 cd %TMP_PATH%
 
 xcopy libcec\include\* "%CUR_PATH%\include\libcec" /E /Q /I /Y
-xcopy libcec\*.dll "%CUR_PATH%\lib\." /Y
-xcopy libcec\*.lib "%CUR_PATH%\lib\." /Y
 
-cd %LOC_PATH%
\ No newline at end of file
+copy libcec\libcec.dll "%XBMC_PATH%\system\."
+copy libcec\pthreadVC2.dll "%XBMC_PATH%\system\."
+
+cd %LOC_PATH%
index 9019c8b..b3a9005 100644 (file)
@@ -1,2 +1,3 @@
 ; filename                        mirror                                      source of the file
-libcec2.zip                       http://xbmc.opdenkamp.eu/                   http://packages.pulse-eight.net/
+
+libcec6.zip                       http://xbmc.opdenkamp.eu/                   http://packages.pulse-eight.net/
index d3d10dd..f0061b6 100644 (file)
@@ -7,7 +7,7 @@ CALL dlextract.bat libplist %FILES%
 
 cd %TMP_PATH%
 
-xcopy libplist-1.7-win32-1\include\* "%CUR_PATH%\include\" /E /Q /I /Y
-xcopy libplist-1.7-win32-1\bin\* "%XBMC_PATH%\system\" /E /Q /I /Y
+xcopy libplist-1.7-win32-2\include\* "%CUR_PATH%\include\" /E /Q /I /Y
+xcopy libplist-1.7-win32-2\bin\* "%XBMC_PATH%\system\" /E /Q /I /Y
 
 cd %LOC_PATH%
index e70486a..affb546 100644 (file)
@@ -1,2 +1,2 @@
 ; filename                          source of the file
-libplist-1.7-win32-1.7z               http://mirrors.xbmc.org/build-deps/win32/
+libplist-1.7-win32-2.7z               http://mirrors.xbmc.org/build-deps/win32/
diff --git a/tools/darwin/depends/libcec/Makefile b/tools/darwin/depends/libcec/Makefile
new file mode 100644 (file)
index 0000000..7f6e12f
--- /dev/null
@@ -0,0 +1,38 @@
+include ../Makefile.include
+
+# lib name, version
+LIBNAME=libcec
+VERSION=0.6
+SOURCE=$(LIBNAME)-$(VERSION)
+ARCHIVE=$(SOURCE).tar.gz
+
+# configuration settings
+CONFIGURE=./configure --prefix=$(PREFIX)
+
+LIBDYLIB=$(SOURCE)/.libs/$(LIBNAME).dylib
+
+all: $(LIBDYLIB) .installed
+
+$(TARBALLS_LOCATION)/$(ARCHIVE):
+       $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
+
+$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE)
+       rm -rf $(SOURCE)
+       $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
+       echo $(SOURCE) > .gitignore
+       cd $(SOURCE); autoreconf -vif
+       cd $(SOURCE); $(CONFIGURE)
+
+$(LIBDYLIB): $(SOURCE)
+       make -j 1 -C $(SOURCE)
+
+.installed:
+       make -C $(SOURCE) install
+       touch $@
+
+clean:
+       rm -rf $(SOURCE) .installed
+
+distclean::
+       rm -rf $(SOURCE) .installed
+
index db169c0..1a2aeaa 100644 (file)
@@ -282,7 +282,8 @@ const infomap network_labels[] = {{ "isdhcp",            NETWORK_IS_DHCP },
                                   { "ipaddress",         NETWORK_IP_ADDRESS }, //labels from here
                                   { "linkstate",         NETWORK_LINK_STATE },
                                   { "macaddress",        NETWORK_MAC_ADDRESS },
-                                  { "subnetaddress",     NETWORK_SUBNET_ADDRESS },
+                                  { "subnetaddress",     NETWORK_SUBNET_MASK }, //subnetaddress is misleading/wrong. should be deprecated. use subnetmask in stead
+                                  { "subnetmask",        NETWORK_SUBNET_MASK },
                                   { "gatewayaddress",    NETWORK_GATEWAY_ADDRESS },
                                   { "dns1address",       NETWORK_DNS1_ADDRESS },
                                   { "dns2address",       NETWORK_DNS2_ADDRESS },
@@ -1524,7 +1525,7 @@ CStdString CGUIInfoManager::GetLabel(int info, int contextWindow)
         return iface->GetCurrentIPAddress();
     }
     break;
-  case NETWORK_SUBNET_ADDRESS:
+  case NETWORK_SUBNET_MASK:
     {
       CNetworkInterface* iface = g_application.getNetwork().GetFirstConnectedInterface();
       if (iface)
index 7e6c386..70517b4 100644 (file)
@@ -183,7 +183,7 @@ namespace INFO
 #define NETWORK_MAC_ADDRESS         191
 #define NETWORK_IS_DHCP             192
 #define NETWORK_LINK_STATE          193
-#define NETWORK_SUBNET_ADDRESS      194
+#define NETWORK_SUBNET_MASK         194
 #define NETWORK_GATEWAY_ADDRESS     195
 #define NETWORK_DNS1_ADDRESS        196
 #define NETWORK_DNS2_ADDRESS        197
index a921a17..16941ee 100644 (file)
@@ -313,7 +313,7 @@ void CURL::Parse(const CStdString& strURL1)
   SetFileName(m_strFileName);
 
   /* decode urlencoding on this stuff */
-  if( m_strProtocol.Equals("rar") || m_strProtocol.Equals("zip") || m_strProtocol.Equals("musicsearch"))
+  if(URIUtils::ProtocolHasEncodedHostname(m_strProtocol))
   {
     Decode(m_strHostName);
     // Validate it as it is likely to contain a filename
@@ -555,7 +555,7 @@ CStdString CURL::GetWithoutUserDetails() const
 
   if (m_strHostName != "")
   {
-    if (m_strProtocol.Equals("rar") || m_strProtocol.Equals("zip"))
+    if (URIUtils::ProtocolHasParentInHostname(m_strProtocol))
       strURL += CURL(m_strHostName).GetWithoutUserDetails();
     else
       strURL += m_strHostName;
@@ -617,7 +617,7 @@ CStdString CURL::GetWithoutFilename() const
 
   if (m_strHostName != "")
   {
-    if( m_strProtocol.Equals("rar") || m_strProtocol.Equals("zip") || m_strProtocol.Equals("musicsearch"))
+    if( URIUtils::ProtocolHasEncodedHostname(m_strProtocol) )
       strURL += URLEncodeInline(m_strHostName);
     else
       strURL += m_strHostName;
index 2984ff6..3ab0b78 100644 (file)
@@ -223,7 +223,7 @@ CStdString CUtil::GetTitleFromPath(const CStdString& strFileNameAndPath, bool bI
   else if (path.Left(24).Equals("special://videoplaylists"))
     strFilename = g_localizeStrings.Get(136);
 
-  else if ((url.GetProtocol() == "rar" || url.GetProtocol() == "zip") && strFilename.IsEmpty())
+  else if (URIUtils::ProtocolHasParentInHostname(url.GetProtocol()) && strFilename.IsEmpty())
     strFilename = URIUtils::GetFileName(url.GetHostName());
 
   // now remove the extension if needed
index 399f76e..3cc4a93 100644 (file)
@@ -195,6 +195,9 @@ bool CRepositoryUpdateJob::DoWork()
   database.Open();
   for (unsigned int i=0;i<addons.size();++i)
   {
+    // manager told us to feck off
+    if (ShouldCancel(0,0))
+      break;
     if (!CAddonInstaller::Get().CheckDependencies(addons[i]))
       addons[i]->Props().broken = g_localizeStrings.Get(24044);
 
index 27a2997..8d86fa8 100644 (file)
 #ifdef HAVE_LIBBLURAY
 
 #include "DVDInputStreamBluray.h"
-#include "DynamicDll.h"
 #include "utils/log.h"
 #include "utils/URIUtils.h"
 #include "filesystem/File.h"
 #include "filesystem/Directory.h"
+#include "DllLibbluray.h"
 
 #define LIBBLURAY_BYTESEEK 0
 
-extern "C"
-{
-#include <libbluray/bluray.h>
-#include <libbluray/filesystem.h>
-#ifndef HAVE_LIBBLURAY_NOLOGCONTROL
-#include <libbluray/log_control.h>
-#endif
-}
-
-class DllLibblurayInterface
-{
-public:
-  virtual ~DllLibblurayInterface() {};
-  virtual uint32_t bd_get_titles(BLURAY *bd, uint8_t flags, uint32_t min_title_length)=0;
-  virtual BLURAY_TITLE_INFO* bd_get_title_info(BLURAY *bd, uint32_t title_idx, unsigned angle)=0;
-  virtual BLURAY_TITLE_INFO* bd_get_playlist_info(BLURAY *bd, uint32_t playlist, unsigned angle)=0;
-  virtual void bd_free_title_info(BLURAY_TITLE_INFO *title_info)=0;
-  virtual BLURAY *bd_open(const char* device_path, const char* keyfile_path)=0;
-  virtual void bd_close(BLURAY *bd)=0;
-  virtual int64_t bd_seek(BLURAY *bd, uint64_t pos)=0;
-  virtual int64_t bd_seek_time(BLURAY *bd, uint64_t tick)=0;
-  virtual int bd_read(BLURAY *bd, unsigned char *buf, int len)=0;
-  virtual int64_t bd_seek_chapter(BLURAY *bd, unsigned chapter)=0;
-  virtual int64_t bd_chapter_pos(BLURAY *bd, unsigned chapter)=0;
-  virtual uint32_t bd_get_current_chapter(BLURAY *bd)=0;
-  virtual int64_t bd_seek_mark(BLURAY *bd, unsigned mark)=0;
-  virtual int bd_select_playlist(BLURAY *bd, uint32_t playlist)=0;
-  virtual int bd_select_title(BLURAY *bd, uint32_t title)=0;
-  virtual int bd_select_angle(BLURAY *bd, unsigned angle)=0;
-  virtual void bd_seamless_angle_change(BLURAY *bd, unsigned angle)=0;
-  virtual uint64_t bd_get_title_size(BLURAY *bd)=0;
-  virtual uint32_t bd_get_current_title(BLURAY *bd)=0;
-  virtual unsigned bd_get_current_angle(BLURAY *bd)=0;
-  virtual uint64_t bd_tell(BLURAY *bd)=0;
-  virtual uint64_t bd_tell_time(BLURAY *bd)=0;
-  virtual BD_FILE_OPEN bd_register_file(BD_FILE_OPEN p)=0;
-  virtual BD_DIR_OPEN bd_register_dir(BD_DIR_OPEN p)=0;
-
-#ifndef HAVE_LIBBLURAY_NOLOGCONTROL
-  virtual void     bd_set_debug_handler(BD_LOG_FUNC)=0;
-  virtual void     bd_set_debug_mask(uint32_t mask)=0;
-  virtual uint32_t bd_get_debug_mask(void)=0;
-#endif
-};
-
-class DllLibbluray : public DllDynamic, DllLibblurayInterface
-{
-  DECLARE_DLL_WRAPPER(DllLibbluray, DLL_PATH_LIBBLURAY)
-#ifdef HAVE_LIBBBLURAY_HAVE_LIBBLURAY_NOANGLE
-  DEFINE_METHOD3(uint32_t,            bd_get_titles,          (BLURAY *p1, uint8_t p2))
-  DEFINE_METHOD3(BLURAY_TITLE_INFO*,  bd_get_title_info,      (BLURAY *p1, uint32_t p2))
-  DEFINE_METHOD3(BLURAY_TITLE_INFO*,  bd_get_playlist_info,   (BLURAY *p1, uint32_t p2))
-#else
-  DEFINE_METHOD3(uint32_t,            bd_get_titles,          (BLURAY *p1, uint8_t p2, uint32_t p3))
-  DEFINE_METHOD3(BLURAY_TITLE_INFO*,  bd_get_title_info,      (BLURAY *p1, uint32_t p2, unsigned p3))
-  DEFINE_METHOD3(BLURAY_TITLE_INFO*,  bd_get_playlist_info,   (BLURAY *p1, uint32_t p2, unsigned p3))
-#endif
-  DEFINE_METHOD1(void,                bd_free_title_info,     (BLURAY_TITLE_INFO *p1))
-  DEFINE_METHOD2(BLURAY*,             bd_open,                (const char* p1, const char* p2))
-  DEFINE_METHOD1(void,                bd_close,               (BLURAY *p1))
-  DEFINE_METHOD2(int64_t,             bd_seek,                (BLURAY *p1, uint64_t p2))
-  DEFINE_METHOD2(int64_t,             bd_seek_time,           (BLURAY *p1, uint64_t p2))
-  DEFINE_METHOD3(int,                 bd_read,                (BLURAY *p1, unsigned char *p2, int p3))
-  DEFINE_METHOD2(int64_t,             bd_seek_chapter,        (BLURAY *p1, unsigned p2))
-  DEFINE_METHOD2(int64_t,             bd_chapter_pos,         (BLURAY *p1, unsigned p2))
-  DEFINE_METHOD1(uint32_t,            bd_get_current_chapter, (BLURAY *p1))
-  DEFINE_METHOD2(int64_t,             bd_seek_mark,           (BLURAY *p1, unsigned p2))
-  DEFINE_METHOD2(int,                 bd_select_playlist,     (BLURAY *p1, uint32_t p2))
-  DEFINE_METHOD2(int,                 bd_select_title,        (BLURAY *p1, uint32_t p2))
-  DEFINE_METHOD2(int,                 bd_select_angle,        (BLURAY *p1, unsigned p2))
-  DEFINE_METHOD2(void,                bd_seamless_angle_change,(BLURAY *p1, unsigned p2))
-  DEFINE_METHOD1(uint64_t,            bd_get_title_size,      (BLURAY *p1))
-  DEFINE_METHOD1(uint32_t,            bd_get_current_title,   (BLURAY *p1))
-  DEFINE_METHOD1(unsigned,            bd_get_current_angle,   (BLURAY *p1))
-  DEFINE_METHOD1(uint64_t,            bd_tell,                (BLURAY *p1))
-  DEFINE_METHOD1(uint64_t,            bd_tell_time,           (BLURAY *p1))
-  DEFINE_METHOD1(BD_FILE_OPEN,        bd_register_file,       (BD_FILE_OPEN p1))
-  DEFINE_METHOD1(BD_DIR_OPEN,         bd_register_dir,        (BD_DIR_OPEN p1))
-
-#ifndef HAVE_LIBBLURAY_NOLOGCONTROL
-  DEFINE_METHOD1(void,                bd_set_debug_handler,   (BD_LOG_FUNC p1))
-  DEFINE_METHOD1(void,                bd_set_debug_mask,      (uint32_t p1))
-  DEFINE_METHOD0(uint32_t,            bd_get_debug_mask)
-#endif
-
-  BEGIN_METHOD_RESOLVE()
-#ifdef HAVE_LIBBBLURAY_HAVE_LIBBLURAY_NOANGLE
-    RESOLVE_METHOD_RENAME(bd_get_titles,        bd_get_titles_noangle)
-    RESOLVE_METHOD_RENAME(bd_get_title_info,    bd_get_title_info_noangle)
-    RESOLVE_METHOD_RENAME(bd_get_playlist_info, bd_get_playlist_info_noangle)
-#else
-    RESOLVE_METHOD(bd_get_titles)
-    RESOLVE_METHOD(bd_get_title_info)
-    RESOLVE_METHOD(bd_get_playlist_info)
-#endif
-    RESOLVE_METHOD_RENAME(bd_free_title_info,   bd_free_title_info)
-    RESOLVE_METHOD_RENAME(bd_open,              bd_open)
-    RESOLVE_METHOD_RENAME(bd_close,             bd_close)
-    RESOLVE_METHOD_RENAME(bd_seek,              bd_seek)
-    RESOLVE_METHOD_RENAME(bd_seek_time,         bd_seek_time)
-    RESOLVE_METHOD_RENAME(bd_read,              bd_read)
-    RESOLVE_METHOD_RENAME(bd_seek_chapter,      bd_seek_chapter)
-    RESOLVE_METHOD_RENAME(bd_chapter_pos,       bd_chapter_pos)
-    RESOLVE_METHOD_RENAME(bd_get_current_chapter, bd_get_current_chapter)
-    RESOLVE_METHOD_RENAME(bd_seek_mark,         bd_seek_mark)
-    RESOLVE_METHOD_RENAME(bd_select_playlist,   bd_select_playlist)
-    RESOLVE_METHOD_RENAME(bd_select_title,      bd_select_title)
-    RESOLVE_METHOD_RENAME(bd_select_angle,      bd_select_angle)
-    RESOLVE_METHOD_RENAME(bd_seamless_angle_change, bd_seamless_angle_change)
-    RESOLVE_METHOD_RENAME(bd_get_title_size,    bd_get_title_size)
-    RESOLVE_METHOD_RENAME(bd_get_current_title, bd_get_current_title)
-    RESOLVE_METHOD_RENAME(bd_get_current_angle, bd_get_current_angle)
-    RESOLVE_METHOD_RENAME(bd_tell,              bd_tell)
-    RESOLVE_METHOD_RENAME(bd_tell_time,         bd_tell_time)
-    RESOLVE_METHOD_RENAME(bd_register_file,     bd_register_file)
-    RESOLVE_METHOD_RENAME(bd_register_dir,      bd_register_dir)
-#ifndef HAVE_LIBBLURAY_NOLOGCONTROL
-    RESOLVE_METHOD(bd_set_debug_handler)
-    RESOLVE_METHOD(bd_set_debug_mask)
-    RESOLVE_METHOD(bd_get_debug_mask)
-#endif
-  END_METHOD_RESOLVE()
-
-#ifdef HAVE_LIBBBLURAY_HAVE_LIBBLURAY_NOANGLE
-  uint32_t bd_get_titles(BLURAY *bd, uint8_t flags, uint32_t min_title_length)
-      {return bd_get_titles_noangle(bd, flags);           }
-  BLURAY_TITLE_INFO* bd_get_title_info(BLURAY *bd, uint32_t title_idx, unsigned angle)
-      {return bd_get_title_info_noangle(bd, title_idx);   }
-  BLURAY_TITLE_INFO* bd_get_playlist_info(BLURAY *bd, uint32_t playlist, unsigned angle)
-      {return bd_get_playlist_info_noangle(bd, playlist); }
-#endif
-};
-
-
 using namespace std;
 using namespace XFILE;
 
@@ -183,7 +49,7 @@ static bool is_udf_iso_path(const char* filename)
   return bResult;
 }
 
-static void file_close(BD_FILE_H *file)
+void DllLibbluray::file_close(BD_FILE_H *file)
 {
   if (file)
   {
@@ -194,17 +60,17 @@ static void file_close(BD_FILE_H *file)
   }
 }
 
-static int64_t file_seek(BD_FILE_H *file, int64_t offset, int32_t origin)
+int64_t DllLibbluray::file_seek(BD_FILE_H *file, int64_t offset, int32_t origin)
 {
   return static_cast<CFile*>(file->internal)->Seek(offset, origin);
 }
 
-static int64_t file_tell(BD_FILE_H *file)
+int64_t DllLibbluray::file_tell(BD_FILE_H *file)
 {
   return static_cast<CFile*>(file->internal)->GetPosition();
 }
 
-static int file_eof(BD_FILE_H *file)
+int DllLibbluray::file_eof(BD_FILE_H *file)
 {
   if(static_cast<CFile*>(file->internal)->GetPosition() == static_cast<CFile*>(file->internal)->GetLength())
     return 1;
@@ -212,17 +78,17 @@ static int file_eof(BD_FILE_H *file)
     return 0;
 }
 
-static int64_t file_read(BD_FILE_H *file, uint8_t *buf, int64_t size)
+int64_t DllLibbluray::file_read(BD_FILE_H *file, uint8_t *buf, int64_t size)
 {
   return static_cast<CFile*>(file->internal)->Read(buf, size);
 }
 
-static int64_t file_write(BD_FILE_H *file, const uint8_t *buf, int64_t size)
+int64_t DllLibbluray::file_write(BD_FILE_H *file, const uint8_t *buf, int64_t size)
 {
     return -1;
 }
 
-static BD_FILE_H *file_open(const char* filename, const char *mode)
+BD_FILE_H * DllLibbluray::file_open(const char* filename, const char *mode)
 {
     BD_FILE_H *file = new BD_FILE_H;
 
@@ -271,7 +137,7 @@ struct SDirState
   int           curr;
 };
 
-static void dir_close(BD_DIR_H *dir)
+void DllLibbluray::dir_close(BD_DIR_H *dir)
 {
   if (dir)
   {
@@ -282,7 +148,7 @@ static void dir_close(BD_DIR_H *dir)
 }
 
 
-static int dir_read(BD_DIR_H *dir, BD_DIRENT *entry)
+int DllLibbluray::dir_read(BD_DIR_H *dir, BD_DIRENT *entry)
 {
     SDirState* state = static_cast<SDirState*>(dir->internal);
 
@@ -296,7 +162,7 @@ static int dir_read(BD_DIR_H *dir, BD_DIRENT *entry)
     return 0;
 }
 
-static BD_DIR_H *dir_open(const char* dirname)
+BD_DIR_H *DllLibbluray::dir_open(const char* dirname)
 {
     CLog::Log(LOGDEBUG, "CDVDInputStreamBluray - Opening dir %s\n", dirname);
     SDirState *st = new SDirState();
@@ -326,7 +192,7 @@ static BD_DIR_H *dir_open(const char* dirname)
 
 
 #ifndef HAVE_LIBBLURAY_NOLOGCONTROL
-static void bluray_logger(const char* msg)
+void DllLibbluray::bluray_logger(const char* msg)
 {
   CLog::Log(LOGDEBUG, "CDVDInputStreamBluray::Logger - %s", msg);
 }
@@ -377,10 +243,10 @@ bool CDVDInputStreamBluray::Open(const char* strFile, const std::string& content
   if (!m_dll)
     return false;
 
-  m_dll->bd_register_dir(dir_open);
-  m_dll->bd_register_file(file_open);
+  m_dll->bd_register_dir(DllLibbluray::dir_open);
+  m_dll->bd_register_file(DllLibbluray::file_open);
 #ifndef HAVE_LIBBLURAY_NOLOGCONTROL
-  m_dll->bd_set_debug_handler(bluray_logger);
+  m_dll->bd_set_debug_handler(DllLibbluray::bluray_logger);
   m_dll->bd_set_debug_mask(DBG_CRIT);
 #endif
 
index 1089335..47b1ec2 100644 (file)
@@ -1226,10 +1226,7 @@ void CDVDPlayer::ProcessAudioData(CDemuxStream* pStream, DemuxPacket* pPacket)
   CheckStartCaching(m_CurrentAudio);
 
   CheckContinuity(m_CurrentAudio, pPacket);
-  if(pPacket->dts != DVD_NOPTS_VALUE)
-    m_CurrentAudio.dts = pPacket->dts;
-  else if(pPacket->pts != DVD_NOPTS_VALUE)
-    m_CurrentAudio.dts = pPacket->pts;
+  UpdateTimestamps(m_CurrentAudio, pPacket);
 
   bool drop = false;
   if (CheckPlayerInit(m_CurrentAudio, DVDPLAYER_AUDIO))
@@ -1279,10 +1276,7 @@ void CDVDPlayer::ProcessVideoData(CDemuxStream* pStream, DemuxPacket* pPacket)
   if( pPacket->iSize != 4) //don't check the EOF_SEQUENCE of stillframes
   {
     CheckContinuity(m_CurrentVideo, pPacket);
-    if(pPacket->dts != DVD_NOPTS_VALUE)
-      m_CurrentVideo.dts = pPacket->dts;
-    else if(pPacket->pts != DVD_NOPTS_VALUE)
-      m_CurrentVideo.dts = pPacket->pts;
+    UpdateTimestamps(m_CurrentVideo, pPacket);
   }
 
   bool drop = false;
@@ -1307,10 +1301,8 @@ void CDVDPlayer::ProcessSubData(CDemuxStream* pStream, DemuxPacket* pPacket)
 
     m_CurrentSubtitle.stream = (void*)pStream;
   }
-  if(pPacket->dts != DVD_NOPTS_VALUE)
-    m_CurrentSubtitle.dts = pPacket->dts;
-  else if(pPacket->pts != DVD_NOPTS_VALUE)
-    m_CurrentSubtitle.dts = pPacket->pts;
+
+  UpdateTimestamps(m_CurrentSubtitle, pPacket);
 
   bool drop = false;
   if (CheckPlayerInit(m_CurrentSubtitle, DVDPLAYER_SUBTITLE))
@@ -1336,10 +1328,7 @@ void CDVDPlayer::ProcessTeletextData(CDemuxStream* pStream, DemuxPacket* pPacket
 
     m_CurrentTeletext.stream = (void*)pStream;
   }
-  if(pPacket->dts != DVD_NOPTS_VALUE)
-    m_CurrentTeletext.dts = pPacket->dts;
-  else if(pPacket->pts != DVD_NOPTS_VALUE)
-    m_CurrentTeletext.dts = pPacket->pts;
+  UpdateTimestamps(m_CurrentTeletext, pPacket);
 
   bool drop = false;
   if (CheckPlayerInit(m_CurrentTeletext, DVDPLAYER_TELETEXT))
@@ -1600,6 +1589,17 @@ bool CDVDPlayer::CheckPlayerInit(CCurrentStream& current, unsigned int source)
   return false;
 }
 
+void CDVDPlayer::UpdateTimestamps(CCurrentStream& current, DemuxPacket* pPacket)
+{
+  double dts = current.dts;
+  /* update stored values */
+  if(pPacket->dts != DVD_NOPTS_VALUE)
+    dts = pPacket->dts;
+  else if(pPacket->pts != DVD_NOPTS_VALUE)
+    dts = pPacket->pts;
+
+  current.dts = dts;
+}
 void CDVDPlayer::CheckContinuity(CCurrentStream& current, DemuxPacket* pPacket)
 {
   if (m_playSpeed < DVD_PLAYSPEED_PAUSE)
index b6ebee2..9ceca9c 100644 (file)
@@ -291,6 +291,7 @@ protected:
   bool CheckSceneSkip(CCurrentStream& current);
   bool CheckPlayerInit(CCurrentStream& current, unsigned int source);
   bool CheckStartCaching(CCurrentStream& current);
+  void UpdateTimestamps(CCurrentStream& current, DemuxPacket* pPacket);
   void SendPlayerMessage(CDVDMsg* pMsg, unsigned int target);
 
   bool ReadPacket(DemuxPacket*& packet, CDemuxStream*& stream);
index d5b597e..a10575c 100644 (file)
@@ -426,6 +426,7 @@ void CGUIDialogMediaSource::UpdateButtons()
     return;
 
   CONTROL_ENABLE_ON_CONDITION(CONTROL_OK, !m_paths->Get(0)->GetPath().IsEmpty() && !m_name.IsEmpty());
+  CONTROL_ENABLE_ON_CONDITION(CONTROL_PATH_ADD, !m_paths->Get(0)->GetPath().IsEmpty());
   CONTROL_ENABLE_ON_CONDITION(CONTROL_PATH_REMOVE, m_paths->Size() > 1);
   // name
   SET_CONTROL_LABEL2(CONTROL_NAME, m_name);
index 192487c..8336773 100644 (file)
@@ -64,7 +64,7 @@ bool CAFPDirectory::ResolveSymlink( const CStdString &dirName, const CStdString
   URIUtils::AddSlashAtEnd(fullpath);
   fullpath += fileName;
   
-  resolvedUrl.Reset();
+  CPasswordManager::GetInstance().AuthenticateURL(resolvedUrl);
   resolvedUrl.SetProtocol("afp");
   resolvedUrl.SetHostName(gAfpConnection.GetConnectedIp());   
   
@@ -210,7 +210,7 @@ bool CAFPDirectory::GetDirectory(const CStdString& strPath, CFileItemList &items
             //resolve symlinks
             if(S_ISLNK(info.st_mode))
             {
-              CURL linkUrl;
+              CURL linkUrl(url);
               if(!ResolveSymlink(strDirName, strFile, &info, linkUrl))
               {
                 lock.Leave();              
index 37e9155..d53856d 100644 (file)
@@ -55,7 +55,7 @@ JSON_STATUS CFileOperations::GetRootDirectory(const CStdString &method, ITranspo
       }
     }
 
-    CVariant param = parameterObject["properties"];
+    CVariant param(CVariant::VariantTypeObject);
     param["properties"] = CVariant(CVariant::VariantTypeArray);
     param["properties"].append("file");
 
index 71ae484..13c4afa 100644 (file)
@@ -206,7 +206,7 @@ bool CJSONRPC::HandleMethodCall(const CVariant& request, CVariant& response, ITr
     JSONRPC::MethodCall method;
     CVariant params;
 
-    if ((errorCode = CJSONServiceDescription::CheckCall(methodName, request["params"], client, isNotification, method, params)) == OK)
+    if ((errorCode = CJSONServiceDescription::CheckCall(methodName, request["params"], transport, client, isNotification, method, params)) == OK)
       errorCode = method(methodName, transport, client, params, result);
     else
       result = params;
index 850ae54..d771a43 100644 (file)
@@ -536,49 +536,52 @@ JSON_STATUS CJSONServiceDescription::Print(CVariant &result, ITransportLayer *tr
   return OK;
 }
 
-JSON_STATUS CJSONServiceDescription::CheckCall(const char* const method, const CVariant &requestParameters, IClient *client, bool notification, MethodCall &methodCall, CVariant &outputParameters)
+JSON_STATUS CJSONServiceDescription::CheckCall(const char* const method, const CVariant &requestParameters, ITransportLayer *transport, IClient *client, bool notification, MethodCall &methodCall, CVariant &outputParameters)
 {
   CJsonRpcMethodMap::JsonRpcMethodIterator iter = m_actionMap.find(method);
   if (iter != m_actionMap.end())
   {
-    if (client != NULL && (client->GetPermissionFlags() & iter->second.permission) == iter->second.permission && (!notification || (iter->second.permission & OPERATION_PERMISSION_NOTIFICATION) == iter->second.permission))
+    if (transport != NULL && (transport->GetCapabilities() & iter->second.transportneed) == iter->second.transportneed)
     {
-      methodCall = iter->second.method;
+      if (client != NULL && (client->GetPermissionFlags() & iter->second.permission) == iter->second.permission && (!notification || (iter->second.permission & OPERATION_PERMISSION_NOTIFICATION) == iter->second.permission))
+      {
+        methodCall = iter->second.method;
 
-      // Count the number of actually handled (present)
-      // parameters
-      unsigned int handled = 0;
-      CVariant errorData = CVariant(CVariant::VariantTypeObject);
-      errorData["method"] = iter->second.name;
+        // Count the number of actually handled (present)
+        // parameters
+        unsigned int handled = 0;
+        CVariant errorData = CVariant(CVariant::VariantTypeObject);
+        errorData["method"] = iter->second.name;
 
-      // Loop through all the parameters to check
-      for (unsigned int i = 0; i < iter->second.parameters.size(); i++)
-      {
-        // Evaluate the current parameter
-        JSON_STATUS status = checkParameter(requestParameters, iter->second.parameters.at(i), i, outputParameters, handled, errorData);
-        if (status != OK)
+        // Loop through all the parameters to check
+        for (unsigned int i = 0; i < iter->second.parameters.size(); i++)
+        {
+          // Evaluate the current parameter
+          JSON_STATUS status = checkParameter(requestParameters, iter->second.parameters.at(i), i, outputParameters, handled, errorData);
+          if (status != OK)
+          {
+            // Return the error data object in the outputParameters reference
+            outputParameters = errorData;
+            return status;
+          }
+        }
+
+        // Check if there were unnecessary parameters
+        if (handled < requestParameters.size())
         {
-          // Return the error data object in the outputParameters reference
+          errorData["message"] = "Too many parameters";
           outputParameters = errorData;
-          return status;
+          return InvalidParams;
         }
-      }
 
-      // Check if there were unnecessary parameters
-      if (handled < requestParameters.size())
-      {
-        errorData["message"] = "Too many parameters";
-        outputParameters = errorData;
-        return InvalidParams;
+        return OK;
       }
-
-      return OK;
+      else
+        return BadPermission;
     }
-    else
-      return BadPermission;
   }
-  else
-    return MethodNotFound;
+
+  return MethodNotFound;
 }
 
 void CJSONServiceDescription::printType(const JSONSchemaTypeDefinition &type, bool isParameter, bool isGlobal, bool printDefault, bool printDescriptions, CVariant &output)
index 27b51d2..38cbbb6 100644 (file)
@@ -352,7 +352,7 @@ namespace JSONRPC
      actual C/C++ implementation of the method to the "methodCall" parameter and checks the
      given parameters from the request against the json schema description for the given method.
      */
-    static JSON_STATUS CheckCall(const char* const method, const CVariant &requestParameters, IClient *client, bool notification, MethodCall &methodCall, CVariant &outputParameters);
+    static JSON_STATUS CheckCall(const char* const method, const CVariant &requestParameters, ITransportLayer *transport, IClient *client, bool notification, MethodCall &methodCall, CVariant &outputParameters);
 
   private:
     static bool prepareDescription(std::string &description, CVariant &descriptionObject, std::string &name);
index 40bda0b..8d68b3f 100644 (file)
@@ -27,7 +27,7 @@
 #include "devices/PeripheralNIC.h"
 #include "devices/PeripheralNyxboard.h"
 #include "devices/PeripheralTuner.h"
-#ifdef HAVE_LIBCEC
+#if defined(HAVE_LIBCEC)
 #include "devices/PeripheralCecAdapter.h"
 #endif
 #include "bus/PeripheralBusUSB.h"
@@ -204,80 +204,74 @@ bool CPeripherals::HasPeripheralWithFeature(const PeripheralFeature feature, Per
 
 CPeripheral *CPeripherals::CreatePeripheral(CPeripheralBus &bus, const PeripheralType type, const CStdString &strLocation, int iVendorId /* = 0 */, int iProductId /* = 0 */)
 {
-  CPeripheral *peripheral = GetPeripheralAtLocation(strLocation, bus.Type());
-
-  /* only create a new device instances if there's no device at the given location */
-  if (!peripheral)
+  CPeripheral *peripheral = NULL;
+  /* check whether there's something mapped in peripherals.xml */
+  PeripheralType mappedType = type;
+  CStdString strDeviceName;
+  int iMappingPtr = GetMappingForDevice(bus, type, iVendorId, iProductId);
+  bool bHasMapping(iMappingPtr >= 0);
+  if (bHasMapping)
   {
-    /* check whether there's something mapped in peripherals.xml */
-    PeripheralType mappedType = type;
-    CStdString strDeviceName;
-    int iMappingPtr = GetMappingForDevice(bus, type, iVendorId, iProductId);
-    bool bHasMapping(iMappingPtr >= 0);
-    if (bHasMapping)
-    {
-      mappedType    = m_mappings[iMappingPtr].m_mappedTo;
-      strDeviceName = m_mappings[iMappingPtr].m_strDeviceName;
-    }
-    else
-    {
-      /* don't create instances for devices that aren't mapped in peripherals.xml */
-      return NULL;
-    }
-
-    switch(mappedType)
-    {
-    case PERIPHERAL_HID:
-      peripheral = new CPeripheralHID(type, bus.Type(), strLocation, strDeviceName, iVendorId, iProductId);
-      break;
-
-    case PERIPHERAL_NIC:
-      peripheral = new CPeripheralNIC(type, bus.Type(), strLocation, strDeviceName, iVendorId, iProductId);
-      break;
-
-    case PERIPHERAL_DISK:
-      peripheral = new CPeripheralDisk(type, bus.Type(), strLocation, strDeviceName, iVendorId, iProductId);
-      break;
-
-    case PERIPHERAL_NYXBOARD:
-      peripheral = new CPeripheralNyxboard(type, bus.Type(), strLocation, strDeviceName, iVendorId, iProductId);
-      break;
-
-    case PERIPHERAL_TUNER:
-      peripheral = new CPeripheralTuner(type, bus.Type(), strLocation, strDeviceName, iVendorId, iProductId);
-      break;
-
-    case PERIPHERAL_BLUETOOTH:
-      peripheral = new CPeripheralBluetooth(type, bus.Type(), strLocation, strDeviceName, iVendorId, iProductId);
-      break;
+    mappedType    = m_mappings[iMappingPtr].m_mappedTo;
+    strDeviceName = m_mappings[iMappingPtr].m_strDeviceName;
+  }
+  else
+  {
+    /* don't create instances for devices that aren't mapped in peripherals.xml */
+    return NULL;
+  }
 
-#ifdef HAVE_LIBCEC
-    case PERIPHERAL_CEC:
-      peripheral = new CPeripheralCecAdapter(type, bus.Type(), strLocation, strDeviceName, iVendorId, iProductId);
-      break;
+  switch(mappedType)
+  {
+  case PERIPHERAL_HID:
+    peripheral = new CPeripheralHID(type, bus.Type(), strLocation, strDeviceName, iVendorId, iProductId);
+    break;
+
+  case PERIPHERAL_NIC:
+    peripheral = new CPeripheralNIC(type, bus.Type(), strLocation, strDeviceName, iVendorId, iProductId);
+    break;
+
+  case PERIPHERAL_DISK:
+    peripheral = new CPeripheralDisk(type, bus.Type(), strLocation, strDeviceName, iVendorId, iProductId);
+    break;
+
+  case PERIPHERAL_NYXBOARD:
+    peripheral = new CPeripheralNyxboard(type, bus.Type(), strLocation, strDeviceName, iVendorId, iProductId);
+    break;
+
+  case PERIPHERAL_TUNER:
+    peripheral = new CPeripheralTuner(type, bus.Type(), strLocation, strDeviceName, iVendorId, iProductId);
+    break;
+
+  case PERIPHERAL_BLUETOOTH:
+    peripheral = new CPeripheralBluetooth(type, bus.Type(), strLocation, strDeviceName, iVendorId, iProductId);
+    break;
+
+#if defined(HAVE_LIBCEC)
+  case PERIPHERAL_CEC:
+    peripheral = new CPeripheralCecAdapter(type, bus.Type(), strLocation, strDeviceName, iVendorId, iProductId);
+    break;
 #endif
 
-    default:
-      peripheral = new CPeripheral(type, bus.Type(), strLocation, strDeviceName, iVendorId, iProductId);
-      break;
-    }
+  default:
+    break;
+  }
 
-    if (peripheral)
+  if (peripheral)
+  {
+    /* try to initialise the new peripheral
+     * Initialise() will make sure that each device is only initialised once */
+    if (peripheral->Initialise())
     {
-      /* try to initialise the new peripheral
-       * Initialise() will make sure that each device is only initialised once */
-      if (peripheral->Initialise())
-      {
-        if (!bHasMapping)
-          peripheral->SetHidden(true);
-        bus.Register(peripheral);
-      }
-      else
-      {
-        CLog::Log(LOGDEBUG, "%s - failed to initialise peripheral on '%s'", __FUNCTION__, strLocation.c_str());
-        delete peripheral;
-        peripheral = NULL;
-      }
+      if (!bHasMapping)
+        peripheral->SetHidden(true);
+      bus.Register(peripheral);
+    }
+    else
+    {
+      CLog::Log(LOGDEBUG, "%s - failed to initialise peripheral on '%s'", __FUNCTION__, strLocation.c_str());
+      delete peripheral;
+      peripheral = NULL;
     }
   }
 
index baba6f2..2595a9c 100644 (file)
@@ -1,11 +1,11 @@
 SRCS=PeripheralBus.cpp
 
-ifeq (@USE_LIBUSB@,1)
 ifeq (@USE_LIBUDEV@,1)
 SRCS+=linux/PeripheralBusUSBLibUdev.cpp
-else
-SRCS+=linux/PeripheralBusUSBLibUSB.cpp
 endif
+
+ifeq (@USE_LIBUSB@,1)
+SRCS+=linux/PeripheralBusUSBLibUSB.cpp
 endif
 
 ifeq ($(findstring osx,@ARCH@),osx)
index 4b680e5..9adff51 100644 (file)
@@ -159,7 +159,7 @@ void CPeripheralBus::RegisterNewDevices(const PeripheralScanResults &results)
   for (unsigned int iResultPtr = 0; iResultPtr < results.m_results.size(); iResultPtr++)
   {
     PeripheralScanResult result = results.m_results.at(iResultPtr);
-    if (!HasPeripheral(result.m_strLocation) && result.m_type != PERIPHERAL_UNKNOWN)
+    if (!HasPeripheral(result.m_strLocation))
       g_peripherals.CreatePeripheral(*this, result.m_type, result.m_strLocation, result.m_iVendorId, result.m_iProductId);
   }
 }
index 183318a..b84ad7a 100644 (file)
@@ -129,7 +129,8 @@ bool CPeripheralBusUSB::PerformDeviceScan(const GUID *guid, const PeripheralType
       result.m_iVendorId    = PeripheralTypeTranslator::HexStringToInt(strVendorId.c_str());
       result.m_iProductId   = PeripheralTypeTranslator::HexStringToInt(strProductId.c_str());
 
-      results.m_results.push_back(result);
+      if (!results.ContainsResult(result))
+        results.m_results.push_back(result);
     }
   }
 
index e871c84..13f28cb 100644 (file)
@@ -12,5 +12,5 @@ endif
 
 LIB = peripheral-devices.a
 
-include ../../../Makefile.include
+include @abs_top_srcdir@/Makefile.include
 -include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))
index 291f679..559a561 100644 (file)
@@ -32,7 +32,7 @@ namespace PERIPHERALS
 
   class CPeripheral
   {
-    friend class CGUIDialogPeripheralSettings;;
+    friend class CGUIDialogPeripheralSettings;
 
   public:
     CPeripheral(const PeripheralType type, const PeripheralBusType busType, const CStdString &strLocation, const CStdString &strDeviceName, int iVendorId, int iProductId);
index bdc97a8..ce82318 100644 (file)
@@ -20,7 +20,7 @@
  */
 #include "system.h"
 
-#ifdef HAVE_LIBCEC
+#if defined(HAVE_LIBCEC)
 #include "PeripheralCecAdapter.h"
 #include "input/XBIRRemote.h"
 #include "Application.h"
@@ -37,27 +37,27 @@ using namespace PERIPHERALS;
 using namespace ANNOUNCEMENT;
 using namespace CEC;
 
-#define CEC_LIB_SUPPORTED_VERSION 2
+#define CEC_LIB_SUPPORTED_VERSION 6
 
 CPeripheralCecAdapter::CPeripheralCecAdapter(const PeripheralType type, const PeripheralBusType busType, const CStdString &strLocation, const CStdString &strDeviceName, int iVendorId, int iProductId) :
   CPeripheralHID(type, busType, strLocation, strDeviceName, iVendorId, iProductId),
-  CThread("CEC parser"),
+  CThread("CEC Adapter"),
   m_bStarted(false),
   m_bHasButton(false),
   m_bIsReady(false)
 {
-  m_cecParser = LoadLibCec("XBMC", CECDEVICE_PLAYBACKDEVICE1);
-  if (!m_cecParser || m_cecParser->GetMinVersion() > CEC_LIB_SUPPORTED_VERSION)
+  m_cecAdapter = LoadLibCec("XBMC", CECDEVICE_PLAYBACKDEVICE1);
+  if (!m_cecAdapter || m_cecAdapter->GetMinVersion() > CEC_LIB_SUPPORTED_VERSION)
   {
     /* unsupported libcec version */
-    CLog::Log(LOGERROR, g_localizeStrings.Get(36013).c_str(), CEC_LIB_SUPPORTED_VERSION, m_cecParser ? m_cecParser->GetMinVersion() : -1);
+    CLog::Log(LOGERROR, g_localizeStrings.Get(36013).c_str(), CEC_LIB_SUPPORTED_VERSION, m_cecAdapter ? m_cecAdapter->GetMinVersion() : -1);
 
     CStdString strMessage;
-    strMessage.Format(g_localizeStrings.Get(36013).c_str(), CEC_LIB_SUPPORTED_VERSION, m_cecParser ? m_cecParser->GetMinVersion() : -1);
+    strMessage.Format(g_localizeStrings.Get(36013).c_str(), CEC_LIB_SUPPORTED_VERSION, m_cecAdapter ? m_cecAdapter->GetMinVersion() : -1);
     CGUIDialogKaiToast::QueueNotification(CGUIDialogKaiToast::Error, g_localizeStrings.Get(36000), strMessage);
     m_bError = true;
-    UnloadLibCec(m_cecParser);
-    m_cecParser = NULL;
+    UnloadLibCec(m_cecAdapter);
+    m_cecAdapter = NULL;
   }
   else
   {
@@ -68,53 +68,61 @@ CPeripheralCecAdapter::CPeripheralCecAdapter(const PeripheralType type, const Pe
 CPeripheralCecAdapter::~CPeripheralCecAdapter(void)
 {
   CAnnouncementManager::RemoveAnnouncer(this);
-  if (m_cecParser)
+
+  m_bStop = true;
+  StopThread(true);
+
+  if (m_cecAdapter)
   {
     FlushLog();
-    m_cecParser->Close(1000);
-    UnloadLibCec(m_cecParser);
+    UnloadLibCec(m_cecAdapter);
+    m_cecAdapter = NULL;
   }
-  StopThread(true);
 }
 
 void CPeripheralCecAdapter::Announce(EAnnouncementFlag flag, const char *sender, const char *message, const CVariant &data)
 {
-  if (flag == System && !strcmp(sender, "xbmc") && !strcmp(message, "ApplicationStop") && m_bIsReady)
+  if (flag == System && !strcmp(sender, "xbmc") && !strcmp(message, "OnQuit") && m_bIsReady)
   {
     if (GetSettingBool("cec_power_off_shutdown"))
-      m_cecParser->PowerOffDevices();
+      m_cecAdapter->StandbyDevices();
     else if (GetSettingBool("cec_mark_inactive_shutdown"))
-      m_cecParser->SetInactiveView();
+      m_cecAdapter->SetInactiveView();
   }
   else if (flag == GUI && !strcmp(sender, "xbmc") && !strcmp(message, "OnScreensaverDeactivated") && GetSettingBool("cec_standby_screensaver") && m_bIsReady)
   {
-    m_cecParser->PowerOnDevices();
+    m_cecAdapter->PowerOnDevices();
   }
   else if (flag == GUI && !strcmp(sender, "xbmc") && !strcmp(message, "OnScreensaverActivated") && GetSettingBool("cec_standby_screensaver"))
   {
-    m_cecParser->StandbyDevices();
+    m_cecAdapter->StandbyDevices();
   }
   else if (flag == System && !strcmp(sender, "xbmc") && !strcmp(message, "OnSleep"))
   {
     if (GetSettingBool("cec_power_off_shutdown") && m_bIsReady)
-      m_cecParser->PowerOffDevices();
+      m_cecAdapter->StandbyDevices();
+    CSingleLock lock(m_critSection);
+    m_bStop = true;
+    WaitForThreadExit(0);
   }
   else if (flag == System && !strcmp(sender, "xbmc") && !strcmp(message, "OnWake"))
   {
+    CSingleLock lock(m_critSection);
     CLog::Log(LOGDEBUG, "%s - reconnecting to the CEC adapter after standby mode", __FUNCTION__);
-    m_cecParser->Close();
+    m_cecAdapter->Close();
 
     CStdString strPort = GetSettingString("port");
-    if (!m_cecParser->Open(strPort.c_str(), 10000))
+    if (!m_cecAdapter->Open(strPort.c_str(), 10000))
     {
       CLog::Log(LOGERROR, "%s - failed to reconnect to the CEC adapter", __FUNCTION__);
+      FlushLog();
       m_bStop = true;
     }
     else
     {
       if (GetSettingBool("cec_power_on_startup"))
         PowerOnCecDevices();
-      m_cecParser->SetActiveView();
+      m_cecAdapter->SetActiveView();
     }
   }
 }
@@ -138,17 +146,14 @@ void CPeripheralCecAdapter::Process(void)
     m_bStarted = false;
     return;
   }
-
-  // the device needs a second to settle after it's plugged in
-  Sleep(CEC_SETTLE_DOWN_TIME);
-
+  
   CStdString strPort = GetSettingString("port");
   if (strPort.IsEmpty())
   {
-    std::vector<cec_device> deviceList;
     strPort = m_strFileLocation;
+    cec_adapter deviceList[10];
     TranslateComPort(strPort);
-    int iFound = m_cecParser->FindDevices(deviceList, strPort);
+    uint8_t iFound = m_cecAdapter->FindAdapters(deviceList, 10, strPort.c_str());
 
     if (iFound <= 0)
     {
@@ -159,14 +164,14 @@ void CPeripheralCecAdapter::Process(void)
     }
     else
     {
-      cec_device dev = deviceList[0];
+      cec_adapter *dev = &deviceList[0];
       if (iFound > 1)
         CLog::Log(LOGDEBUG, "%s - multiple com ports found for device. taking the first one", __FUNCTION__);
       else
-        CLog::Log(LOGDEBUG, "%s - autodetect com port '%s'", __FUNCTION__, dev.comm.c_str());
-      if (!strPort.Equals(dev.comm.c_str()))
+        CLog::Log(LOGDEBUG, "%s - autodetect com port '%s'", __FUNCTION__, dev->comm);
+      if (!strPort.Equals(dev->comm))
       {
-        strPort = dev.comm.c_str();
+        strPort = dev->comm;
         SetSetting("port", strPort);
       }
     }
@@ -175,7 +180,7 @@ void CPeripheralCecAdapter::Process(void)
   // open the CEC adapter
   CLog::Log(LOGDEBUG, "%s - opening a connection to the CEC adapter: %s", __FUNCTION__, strPort.c_str());
 
-  if (!m_cecParser->Open(strPort.c_str(), 10000))
+  if (!m_cecAdapter->Open(strPort.c_str(), 10000))
   {
     FlushLog();
     CLog::Log(LOGERROR, "%s - could not opening a connection to the CEC adapter", __FUNCTION__);
@@ -190,43 +195,32 @@ void CPeripheralCecAdapter::Process(void)
 
   if (GetSettingBool("cec_power_on_startup"))
     PowerOnCecDevices();
-  m_cecParser->SetActiveView();
+  m_cecAdapter->SetActiveView();
   FlushLog();
 
   while (!m_bStop)
   {
     FlushLog();
-    ProcessNextCommand();
-    Sleep(50);
+    if (!m_bStop)
+      ProcessNextCommand();
+    if (!m_bStop)
+      Sleep(50);
   }
 
-  m_cecParser->Close(500);
+  m_cecAdapter->Close();
 
   CLog::Log(LOGDEBUG, "%s - CEC adapter processor thread ended", __FUNCTION__);
   m_bStarted = false;
 }
 
-bool CPeripheralCecAdapter::PowerOffCecDevices(void)
-{
-  bool bReturn(false);
-
-  if (m_cecParser && m_bIsReady)
-  {
-    CLog::Log(LOGDEBUG, "%s - powering off CEC capable devices", __FUNCTION__);
-    bReturn = m_cecParser->PowerOffDevices();
-  }
-
-  return bReturn;
-}
-
 bool CPeripheralCecAdapter::PowerOnCecDevices(void)
 {
   bool bReturn(false);
 
-  if (m_cecParser && m_bIsReady)
+  if (m_cecAdapter && m_bIsReady)
   {
     CLog::Log(LOGDEBUG, "%s - powering on CEC capable devices", __FUNCTION__);
-    bReturn = m_cecParser->PowerOnDevices();
+    bReturn = m_cecAdapter->PowerOnDevices();
   }
 
   return bReturn;
@@ -236,10 +230,10 @@ bool CPeripheralCecAdapter::StandbyCecDevices(void)
 {
   bool bReturn(false);
 
-  if (m_cecParser && m_bIsReady)
+  if (m_cecAdapter && m_bIsReady)
   {
     CLog::Log(LOGDEBUG, "%s - putting CEC capable devices in standby mode", __FUNCTION__);
-    bReturn = m_cecParser->StandbyDevices();
+    bReturn = m_cecAdapter->StandbyDevices();
   }
 
   return bReturn;
@@ -248,10 +242,10 @@ bool CPeripheralCecAdapter::StandbyCecDevices(void)
 bool CPeripheralCecAdapter::SendPing(void)
 {
   bool bReturn(false);
-  if (m_cecParser && m_bIsReady)
+  if (m_cecAdapter && m_bIsReady)
   {
     CLog::Log(LOGDEBUG, "%s - sending ping to the CEC adapter", __FUNCTION__);
-    bReturn = m_cecParser->Ping();
+    bReturn = m_cecAdapter->PingAdapter();
   }
 
   return bReturn;
@@ -260,10 +254,10 @@ bool CPeripheralCecAdapter::SendPing(void)
 bool CPeripheralCecAdapter::StartBootloader(void)
 {
   bool bReturn(false);
-  if (m_cecParser && m_bIsReady)
+  if (m_cecAdapter && m_bIsReady)
   {
     CLog::Log(LOGDEBUG, "%s - starting the bootloader", __FUNCTION__);
-    bReturn = m_cecParser->StartBootloader();
+    bReturn = m_cecAdapter->StartBootloader();
   }
 
   return bReturn;
@@ -272,16 +266,16 @@ bool CPeripheralCecAdapter::StartBootloader(void)
 void CPeripheralCecAdapter::ProcessNextCommand(void)
 {
   cec_command command;
-  if (m_cecParser && m_bIsReady && m_cecParser->GetNextCommand(&command))
+  if (m_cecAdapter && m_bIsReady && m_cecAdapter->GetNextCommand(&command))
   {
-    CLog::Log(LOGDEBUG, "%s - processing command: initiator=%d destination=%d opcode=%d", __FUNCTION__, command.source, command.destination, command.opcode);
+    CLog::Log(LOGDEBUG, "%s - processing command: initiator=%d destination=%d opcode=%d", __FUNCTION__, command.initiator, command.destination, command.opcode);
 
     switch (command.opcode)
     {
     case CEC_OPCODE_STANDBY:
       /* a device was put in standby mode */
-      CLog::Log(LOGDEBUG, "%s - device %d was put in standby mode", __FUNCTION__, command.source);
-      if (command.source == CECDEVICE_TV && GetSettingBool("standby_pc_on_tv_standby"))
+      CLog::Log(LOGDEBUG, "%s - device %d was put in standby mode", __FUNCTION__, command.initiator);
+      if (command.initiator == CECDEVICE_TV && GetSettingBool("standby_pc_on_tv_standby"))
       {
         m_bStarted = false;
         g_application.getApplicationMessenger().Suspend();
@@ -300,7 +294,7 @@ bool CPeripheralCecAdapter::GetNextKey(void)
     return false;
 
   cec_keypress key;
-  if (!m_bIsReady || !(m_bHasButton = m_cecParser->GetNextKeypress(&key)))
+  if (!m_bIsReady || !(m_bHasButton = m_cecAdapter->GetNextKeypress(&key)))
     return false;
 
   CLog::Log(LOGDEBUG, "%s - received key %d", __FUNCTION__, key.keycode);
@@ -369,7 +363,7 @@ bool CPeripheralCecAdapter::GetNextKey(void)
     m_button.iButton = XINPUT_IR_REMOTE_STOP;
     break;
   case CEC_USER_CONTROL_CODE_PAUSE:
-    m_button.iButton = XINPUT_IR_REMOTE_STOP;
+    m_button.iButton = XINPUT_IR_REMOTE_PAUSE;
     break;
   case CEC_USER_CONTROL_CODE_REWIND:
     m_button.iButton = XINPUT_IR_REMOTE_REVERSE;
@@ -519,9 +513,9 @@ void CPeripheralCecAdapter::OnSettingChanged(const CStdString &strChangedSetting
   if (strChangedSetting.Equals("enabled"))
   {
     bool bEnabled(GetSettingBool("enabled"));
-    if (!bEnabled && m_cecParser && m_bStarted)
+    if (!bEnabled && m_cecAdapter && m_bStarted)
       StopThread(true);
-    else if (bEnabled && !m_cecParser && m_bStarted)
+    else if (bEnabled && !m_cecAdapter && m_bStarted)
       InitialiseFeature(FEATURE_CEC);
   }
 }
@@ -529,7 +523,7 @@ void CPeripheralCecAdapter::OnSettingChanged(const CStdString &strChangedSetting
 void CPeripheralCecAdapter::FlushLog(void)
 {
   cec_log_message message;
-  while (m_cecParser && m_cecParser->GetNextLogMessage(&message))
+  while (m_cecAdapter && m_cecAdapter->GetNextLogMessage(&message))
   {
     int iLevel = -1;
     switch (message.level)
@@ -550,7 +544,7 @@ void CPeripheralCecAdapter::FlushLog(void)
     }
 
     if (iLevel >= 0)
-      CLog::Log(iLevel, "%s - %s", __FUNCTION__, message.message.c_str());
+      CLog::Log(iLevel, "%s - %s", __FUNCTION__, message.message);
   }
 }
 
index ee566c0..9c5fb6d 100644 (file)
@@ -28,7 +28,7 @@
 
 namespace CEC
 {
-  class ICECDevice;
+  class ICECAdapter;
 };
 
 namespace PERIPHERALS
@@ -48,7 +48,6 @@ namespace PERIPHERALS
     virtual ~CPeripheralCecAdapter(void);
 
     virtual void Announce(ANNOUNCEMENT::EAnnouncementFlag flag, const char *sender, const char *message, const CVariant &data);
-    virtual bool PowerOffCecDevices(void);
     virtual bool PowerOnCecDevices(void);
     virtual bool StandbyCecDevices(void);
 
@@ -70,11 +69,11 @@ namespace PERIPHERALS
     static bool FindConfigLocation(CStdString &strString);
     static bool TranslateComPort(CStdString &strPort);
 
-    CEC::ICECDevice *m_cecParser;
-    bool             m_bStarted;
-    bool             m_bHasButton;
-    bool             m_bIsReady;
-    CecButtonPress   m_button;
-    CCriticalSection m_critSection;
+    CEC::ICECAdapter* m_cecAdapter;
+    bool              m_bStarted;
+    bool              m_bHasButton;
+    bool              m_bIsReady;
+    CecButtonPress    m_button;
+    CCriticalSection  m_critSection;
   };
 }
index b0169f6..0249ddd 100644 (file)
@@ -240,7 +240,7 @@ void CGUISettings::Initialize()
   AddBool(pic, "pictures.usetags", 14082, true);
   AddBool(pic,"pictures.generatethumbs",13360,true);
   AddBool(pic, "pictures.useexifrotation", 20184, true);
-  AddBool(pic, "pictures.showvideos", 22022, false);
+  AddBool(pic, "pictures.showvideos", 22022, true);
   // FIXME: hide this setting until it is properly respected. In the meanwhile, default to AUTO.
   AddInt(NULL, "pictures.displayresolution", 169, (int)RES_AUTORES, (int)RES_AUTORES, 1, (int)RES_AUTORES, SPIN_CONTROL_TEXT);
 
@@ -484,7 +484,7 @@ void CGUISettings::Initialize()
   AddSeparator(in, "input.sep1");
 #endif
   AddBool(in, "input.remoteaskeyboard", 21449, false);
-#if (defined(__APPLE__) && defined(__arm_))
+#if defined(TARGET_DARWIN_IOS)
   AddBool(NULL, "input.enablemouse", 21369, true);
 #else
   AddBool(in, "input.enablemouse", 21369, true);
index e977e0c..358537d 100644 (file)
@@ -727,7 +727,8 @@ void CGUIWindowSettingsCategory::UpdateSettings()
     }
 #ifdef HAS_WEB_SERVER
     else if (strSetting.Equals("services.webserverusername") ||
-             strSetting.Equals("services.webserverpassword"))
+             strSetting.Equals("services.webserverpassword") ||
+             strSetting.Equals("services.webserverport"))
     {
       CGUIEditControl *pControl = (CGUIEditControl *)GetControl(pSettingControl->GetID());
       if (pControl)
@@ -1290,16 +1291,37 @@ void CGUIWindowSettingsCategory::OnSettingChanged(CBaseSettingControl *pSettingC
   {
 #ifdef HAS_ZEROCONF
     //ifdef zeroconf here because it's only found in guisettings if defined
-    CZeroconf::GetInstance()->Stop();
     if(g_guiSettings.GetBool("services.zeroconf"))
+    {
+      CZeroconf::GetInstance()->Stop();
       CZeroconf::GetInstance()->Start();
+    }
+#ifdef HAS_AIRPLAY
+    else
+    {
+      g_application.StopAirplayServer(true);
+      g_guiSettings.SetBool("services.airplay", false);
+      CZeroconf::GetInstance()->Stop();
+    }
+#endif
 #endif
   }
   else if (strSetting.Equals("services.airplay"))
   {  
 #ifdef HAS_AIRPLAY  
     if (g_guiSettings.GetBool("services.airplay"))
+    {
+#ifdef HAS_ZEROCONF
+      // AirPlay needs zeroconf
+      if(!g_guiSettings.GetBool("services.zeroconf"))
+      {
+        g_guiSettings.SetBool("services.zeroconf", true);
+        CZeroconf::GetInstance()->Stop();
+        CZeroconf::GetInstance()->Start();
+      }
+#endif //HAS_ZEROCONF
       g_application.StartAirplayServer();//will stop the server before internal
+    }
     else
       g_application.StopAirplayServer(true);//will stop the server before internal    
 #endif//HAS_AIRPLAY      
index e7c494d..3d9e97b 100644 (file)
@@ -23,7 +23,7 @@
 #define PRE_SKIN_VERSION_9_10_COMPATIBILITY 1
 #define PRE_SKIN_VERSION_11_COMPATIBILITY 1
 
-#if defined(TARGET_DARWIN_IOS) && !defined(TARGET_DARWIN_IOS_ATV2)
+#if defined(HAS_SKIN_TOUCHED) && defined(TARGET_DARWIN_IOS) && !defined(TARGET_DARWIN_IOS_ATV2)
 #define DEFAULT_SKIN          "skin.touched"
 #else
 #define DEFAULT_SKIN          "skin.confluence"
index 7f6be61..0262fde 100644 (file)
 #define HAS_FILESYSTEM_NFS
 #define HAS_ZEROCONF
 #define HAS_AIRPLAY
+#define HAVE_LIBCEC
 #endif
 
 /*****************
index 6873a39..584e948 100644 (file)
@@ -228,6 +228,18 @@ void URIUtils::GetCommonPath(CStdString& strParent, const CStdString& strPath)
   }
 }
 
+bool URIUtils::ProtocolHasParentInHostname(const CStdString& prot)
+{
+  return prot.Equals("zip")
+      || prot.Equals("rar");
+}
+
+bool URIUtils::ProtocolHasEncodedHostname(const CStdString& prot)
+{
+  return ProtocolHasParentInHostname(prot)
+      || prot.Equals("musicsearch");
+}
+
 CStdString URIUtils::GetParentPath(const CStdString& strPath)
 {
   CStdString strReturn;
@@ -241,7 +253,7 @@ bool URIUtils::GetParentPath(const CStdString& strPath, CStdString& strParent)
 
   CURL url(strPath);
   CStdString strFile = url.GetFileName();
-  if ( ((url.GetProtocol() == "rar") || (url.GetProtocol() == "zip")) && strFile.IsEmpty())
+  if ( URIUtils::ProtocolHasParentInHostname(url.GetProtocol()) && strFile.IsEmpty())
   {
     strFile = url.GetHostName();
     return GetParentPath(strFile, strParent);
index 7e854b4..751f1f0 100644 (file)
@@ -108,5 +108,8 @@ public:
     AddFileToFolder(strFolder, strFile, result);
     return result;
   }
+
+  static bool ProtocolHasParentInHostname(const CStdString& prot);
+  static bool ProtocolHasEncodedHostname(const CStdString& prot);
 };
 
index 1840016..dcd1fef 100644 (file)
@@ -116,7 +116,7 @@ void CGUIWindowSystemInfo::FrameMove()
     SetControlLabel(i++, "%s: %s", 149, NETWORK_MAC_ADDRESS);
 #endif
     SetControlLabel(i++, "%s: %s", 150, NETWORK_IP_ADDRESS);
-    SetControlLabel(i++, "%s: %s", 13159, NETWORK_SUBNET_ADDRESS);
+    SetControlLabel(i++, "%s: %s", 13159, NETWORK_SUBNET_MASK);
     SetControlLabel(i++, "%s: %s", 13160, NETWORK_GATEWAY_ADDRESS);
     SetControlLabel(i++, "%s: %s", 13161, NETWORK_DNS1_ADDRESS);
     SetControlLabel(i++, "%s: %s", 20307, NETWORK_DNS2_ADDRESS);