diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile.in | 10 | ||||
| -rw-r--r-- | addons/resource.language.en_gb/resources/strings.po | 32 | ||||
| -rw-r--r-- | configure.ac | 22 | ||||
| -rw-r--r-- | docs/README.android | 1 | ||||
| -rw-r--r-- | docs/README.ios | 1 | ||||
| -rw-r--r-- | project/Win32BuildSetup/BuildSetup.bat | 14 | ||||
| -rw-r--r-- | project/cmake/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | system/addon-manifest.xml | 1 | ||||
| -rw-r--r-- | system/settings/darwin_ios.xml | 9 | ||||
| -rw-r--r-- | tools/buildsteps/android/prepare-xbmc | 8 | ||||
| -rw-r--r-- | tools/buildsteps/androidx86/prepare-xbmc | 8 | ||||
| -rwxr-xr-x | tools/buildsteps/ios/prepare-xbmc | 8 | ||||
| -rw-r--r-- | tools/buildsteps/win32/prepare-env.bat | 4 | ||||
| -rwxr-xr-x | tools/darwin/Support/CopyRootFiles-ios.command | 15 | ||||
| -rwxr-xr-x | tools/darwin/Support/CopyRootFiles-osx.command | 6 | ||||
| -rw-r--r-- | xbmc/settings/SettingConditions.cpp | 3 | ||||
| -rw-r--r-- | xbmc/system.h | 4 |
18 files changed, 53 insertions, 100 deletions
diff --git a/.gitignore b/.gitignore index c943ed8f91..ffc39188ce 100644 --- a/.gitignore +++ b/.gitignore @@ -116,6 +116,8 @@ cmake_install.cmake /addons/packages /addons/skin.estuary/media/Makefile /addons/skin.estuary/media/*.xbt +/addons/skin.estouchy/media/Makefile +/addons/skin.estouchy/media/Textures.xbt /addons/skin.pm3-hd/media/Textures.xbt /addons/visualization.itunes/iTunes.mvis /addons/script.module.pil/ diff --git a/Makefile.in b/Makefile.in index 5c5dea8085..10afc8b886 100644 --- a/Makefile.in +++ b/Makefile.in @@ -199,10 +199,8 @@ LIBADDON_DIRS=\ ESTUARY_MEDIA=addons/skin.estuary/media SKIN_DIRS=$(ESTUARY_MEDIA) -ifeq (@USE_TOUCH_SKIN@,1) -TOUCH_SKIN_MEDIA=addons/skin.re-touched/media -SKIN_DIRS+=$(TOUCH_SKIN_MEDIA) -endif +ESTOUCHY_MEDIA=addons/skin.estouchy/media +SKIN_DIRS+=$(ESTOUCHY_MEDIA) LIBS=@LIBS@ CFLAGS=@CFLAGS@ @@ -284,9 +282,7 @@ config.status: configure ifeq (@USE_TEXTUREPACKER@,1) skins: @TEXTUREPACKER@ $(MAKE) -C $(ESTUARY_MEDIA) -ifeq (@USE_TOUCH_SKIN@,1) - $(MAKE) -C $(TOUCH_SKIN_MEDIA) -endif + $(MAKE) -C $(ESTOUCHY_MEDIA) else skins: endif diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po index 12be6bdb76..8255ee0bcf 100644 --- a/addons/resource.language.en_gb/resources/strings.po +++ b/addons/resource.language.en_gb/resources/strings.po @@ -5125,62 +5125,62 @@ msgstr "" #empty strings from id 12023 to 12309 -#: skin.retouched #: addons/skin.estuary/1080i/DialogNumeric.xml +#: skin.estouchy msgctxt "#12310" msgid "0" msgstr "" -#: skin.retouched #: addons/skin.estuary/1080i/DialogNumeric.xml +#: skin.estouchy msgctxt "#12311" msgid "1" msgstr "" -#: skin.retouched #: addons/skin.estuary/1080i/DialogNumeric.xml +#: skin.estouchy msgctxt "#12312" msgid "2" msgstr "" -#: skin.retouched #: addons/skin.estuary/1080i/DialogNumeric.xml +#: skin.estouchy msgctxt "#12313" msgid "3" msgstr "" -#: skin.retouched #: addons/skin.estuary/1080i/DialogNumeric.xml +#: skin.estouchy msgctxt "#12314" msgid "4" msgstr "" -#: skin.retouched #: addons/skin.estuary/1080i/DialogNumeric.xml +#: skin.estouchy msgctxt "#12315" msgid "5" msgstr "" -#: skin.retouched #: addons/skin.estuary/1080i/DialogNumeric.xml +#: skin.estouchy msgctxt "#12316" msgid "6" msgstr "" -#: skin.retouched #: addons/skin.estuary/1080i/DialogNumeric.xml +#: skin.estouchy msgctxt "#12317" msgid "7" msgstr "" -#: skin.retouched #: addons/skin.estuary/1080i/DialogNumeric.xml +#: skin.estouchy msgctxt "#12318" msgid "8" msgstr "" -#: skin.retouched #: addons/skin.estuary/1080i/DialogNumeric.xml +#: skin.estouchy msgctxt "#12319" msgid "9" msgstr "" @@ -5543,14 +5543,14 @@ msgctxt "#13011" msgid "Suspend" msgstr "" -#: skin.retouched #: addons/skin.estuary/1080i/DialogButtonMenu.xml +#: skin.estouchy msgctxt "#13012" msgid "Exit" msgstr "" -#: skin.retouched #: addons/skin.estuary/1080i/DialogButtonMenu.xml +#: skin.estouchy msgctxt "#13013" msgid "Reboot" msgstr "" @@ -5565,8 +5565,8 @@ msgctxt "#13015" msgid "Power button action" msgstr "" -#: skin.retouched #: addons/skin.estuary/1080i/DialogButtonMenu.xml +#: skin.estouchy msgctxt "#13016" msgid "Power off system" msgstr "" @@ -5864,7 +5864,7 @@ msgstr "" #empty strings from id 13175 to 13199 -#: skin.retouched +#: skin.estouchy #: xbmc\profiles\ProfilesManager.cpp #: xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp #: addons/skin.estuary/1080i/SettingsProfile.xml @@ -13701,8 +13701,8 @@ msgctxt "#24051" msgid "Version:" msgstr "" -#: skin.retouched #: addons/skin.estuary/1080i/DialogAddonInfo.xml +#: skin.estouchy msgctxt "#24052" msgid "Disclaimer" msgstr "" @@ -15056,8 +15056,8 @@ msgctxt "#33062" msgid "Play the" msgstr "" -#: skin.retouched #: addons/skin.estuary/1080i/Includes.xml +#: skin.estouchy msgctxt "#33063" msgid "Options" msgstr "" diff --git a/configure.ac b/configure.ac index c9507907de..4549020f00 100644 --- a/configure.ac +++ b/configure.ac @@ -1309,16 +1309,6 @@ else AC_MSG_RESULT($x11_disabled) fi -# touch skin -use_touch_skin=no -if [[ -f "addons/skin.re-touched/addon.xml" ]]; then - use_touch_skin=yes - USE_TOUCH_SKIN=1 - AC_DEFINE([HAS_TOUCH_SKIN], [1], [Whether to build the touch skin.]) -else - USE_TOUCH_SKIN=0 -fi - # libssh if test "x$use_ssh" = "xno"; then AC_MSG_NOTICE(ssh support disabled by user) @@ -1951,12 +1941,6 @@ else final_message="$final_message\n Joystick:\tNo" fi -if test "$use_touch_skin" = "yes"; then - final_message="$final_message\n Touch skin:\tYes" -else - final_message="$final_message\n Touch skin:\tNo" -fi - if test "$use_x11" = "yes"; then USE_X11=1 final_message="$final_message\n X11:\t\tYes" @@ -2213,6 +2197,7 @@ fi OUTPUT_FILES="Makefile \ Makefile.include \ addons/skin.estuary/media/Makefile \ + addons/skin.estouchy/media/Makefile \ xbmc/Makefile \ xbmc/cdrip/Makefile \ xbmc/cores/Makefile \ @@ -2296,10 +2281,6 @@ if test "$use_webserver" = "yes"; then OUTPUT_FILES="$OUTPUT_FILES xbmc/network/httprequesthandler/python/Makefile" fi -if test "$use_touch_skin" = "yes"; then -OUTPUT_FILES="$OUTPUT_FILES addons/skin.re-touched/media/Makefile" -fi - if test "$use_sse4" = "yes"; then OUTPUT_FILES="$OUTPUT_FILES xbmc/linux/sse4/Makefile" fi @@ -2348,7 +2329,6 @@ AC_SUBST(USE_STATIC_FFMPEG) AC_SUBST(GNUTLS_ALL_LIBS) AC_SUBST(VORBISENC_ALL_LIBS) AC_SUBST(DCADEC_ALL_LIBS) -AC_SUBST(USE_TOUCH_SKIN) AC_SUBST(USE_LIBAV_HACKS) AC_SUBST(PYTHON_VERSION) AC_SUBST(OUTPUT_FILES) diff --git a/docs/README.android b/docs/README.android index 014aebfa2c..e1d6149f3e 100644 --- a/docs/README.android +++ b/docs/README.android @@ -176,7 +176,6 @@ probably just means a debug key already existed, no cause for alarm. $ cd $HOME $ git clone git://github.com/xbmc/xbmc.git kodi-android $ cd kodi-android - $ git submodule update --init addons/skin.re-touched ----------------------------------------------------------------------------- 5. How to compile diff --git a/docs/README.ios b/docs/README.ios index 0e02b91535..89ce2ba57e 100644 --- a/docs/README.ios +++ b/docs/README.ios @@ -44,7 +44,6 @@ character itself should NOT be typed as part of the command. $ cd $HOME $ git clone git://github.com/xbmc/xbmc.git Kodi $ cd Kodi - $ git submodule update --init addons/skin.re-touched ----------------------------------------------------------------------------- 3.1 Install Xcode diff --git a/project/Win32BuildSetup/BuildSetup.bat b/project/Win32BuildSetup/BuildSetup.bat index a0acacdbdb..3364d24403 100644 --- a/project/Win32BuildSetup/BuildSetup.bat +++ b/project/Win32BuildSetup/BuildSetup.bat @@ -191,8 +191,8 @@ set WORKSPACE=%CD%\..\.. Echo addons\repository.pvr-osx32.xbmc.org\>>exclude.txt Echo addons\repository.pvr-osx64.xbmc.org\>>exclude.txt rem Exclude skins as they're copied by their own script - Echo addons\skin.re-touched\>>exclude.txt Echo addons\skin.estuary\>>exclude.txt + Echo addons\skin.estouchy\>>exclude.txt md BUILD_WIN32\application @@ -232,13 +232,11 @@ set WORKSPACE=%CD%\..\.. cd ..\..\addons\skin.estuary call build.bat > NUL cd %build_path% - - IF EXIST ..\..\addons\skin.re-touched\build.bat ( - ECHO Building Touch Skin... - cd ..\..\addons\skin.re-touched - call build.bat > NUL - cd %build_path% - ) + + ECHO Building Estouchy Skin... + cd ..\..\addons\skin.estouchy + call build.bat > NUL + cd %build_path% rem restore color and title, some scripts mess these up COLOR 1B diff --git a/project/cmake/CMakeLists.txt b/project/cmake/CMakeLists.txt index dbfd88d201..f929b3f11b 100644 --- a/project/cmake/CMakeLists.txt +++ b/project/cmake/CMakeLists.txt @@ -197,10 +197,6 @@ if(NOT WIN32) endif() endif() -if(ENABLE_SKIN_TOUCHED) - list(APPEND DEP_DEFINES "-DHAS_SKIN_TOUCHED=1") -endif() - if(ENABLE_CCACHE) core_optional_dep(CCache) endif() @@ -260,6 +256,7 @@ copy_files_from_filelist_to_buildtree(${PROJECT_SOURCE_DIR}/installdata/common/* ${PROJECT_SOURCE_DIR}/installdata/${CORE_SYSTEM_NAME}/*.txt) list(APPEND SKINS "${CORE_SOURCE_DIR}/addons/skin.estuary\;${CORE_SOURCE_DIR}") +list(APPEND SKINS "${CORE_SOURCE_DIR}/addons/skin.estouchy\;${CORE_SOURCE_DIR}") # These are skins that are copied into place from the source tree foreach(skin ${SKINS}) diff --git a/system/addon-manifest.xml b/system/addon-manifest.xml index e33792dd76..3d9a532cb7 100644 --- a/system/addon-manifest.xml +++ b/system/addon-manifest.xml @@ -26,6 +26,7 @@ <addon>script.module.pil</addon> <addon>service.xbmc.versioncheck</addon> <addon>skin.estuary</addon> + <addon>skin.estouchy</addon> <addon>webinterface.default</addon> <addon>xbmc.addon</addon> <addon>xbmc.audioencoder</addon> diff --git a/system/settings/darwin_ios.xml b/system/settings/darwin_ios.xml index 16bb97f491..63278b964a 100644 --- a/system/settings/darwin_ios.xml +++ b/system/settings/darwin_ios.xml @@ -68,4 +68,13 @@ </group> </category> </section> + <section id="appearance"> + <category id="lookandfeel"> + <group id="1"> + <setting id="lookandfeel.skin" type="addon"> + <default>skin.estouchy</default> + </setting> + </group> + </category> + </section> </settings> diff --git a/tools/buildsteps/android/prepare-xbmc b/tools/buildsteps/android/prepare-xbmc index bccdcb0453..144ed52d88 100644 --- a/tools/buildsteps/android/prepare-xbmc +++ b/tools/buildsteps/android/prepare-xbmc @@ -2,14 +2,6 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} XBMC_PLATFORM_DIR=android . $WORKSPACE/tools/buildsteps/defaultenv -#fetch submodules -cd $WORKSPACE -if test -d $WORKSPACE/addons/skin.re-touched -then -rm -r $WORKSPACE/addons/skin.re-touched -fi -git submodule update --init $WORKSPACE/addons/skin.re-touched - #build binary addons before building xbmc... #make sure that binary_addons don't clean the native tools #here (e.x. on release builds where pathChanged always returns 1 diff --git a/tools/buildsteps/androidx86/prepare-xbmc b/tools/buildsteps/androidx86/prepare-xbmc index bccdcb0453..144ed52d88 100644 --- a/tools/buildsteps/androidx86/prepare-xbmc +++ b/tools/buildsteps/androidx86/prepare-xbmc @@ -2,14 +2,6 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} XBMC_PLATFORM_DIR=android . $WORKSPACE/tools/buildsteps/defaultenv -#fetch submodules -cd $WORKSPACE -if test -d $WORKSPACE/addons/skin.re-touched -then -rm -r $WORKSPACE/addons/skin.re-touched -fi -git submodule update --init $WORKSPACE/addons/skin.re-touched - #build binary addons before building xbmc... #make sure that binary_addons don't clean the native tools #here (e.x. on release builds where pathChanged always returns 1 diff --git a/tools/buildsteps/ios/prepare-xbmc b/tools/buildsteps/ios/prepare-xbmc index 0d96ee12ec..c408c67e7d 100755 --- a/tools/buildsteps/ios/prepare-xbmc +++ b/tools/buildsteps/ios/prepare-xbmc @@ -2,14 +2,6 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} XBMC_PLATFORM_DIR=ios . $WORKSPACE/tools/buildsteps/defaultenv -#fetch submodules -cd $WORKSPACE -if test -d $WORKSPACE/addons/skin.re-touched -then -rm -r $WORKSPACE/addons/skin.re-touched -fi -git submodule update --init $WORKSPACE/addons/skin.re-touched - #build binary addons before building xbmc... #make sure that binary_addons don't clean the native tools #here (e.x. on release builds where pathChanged always returns 1 diff --git a/tools/buildsteps/win32/prepare-env.bat b/tools/buildsteps/win32/prepare-env.bat index 7e1d30cbd9..b1a169abb5 100644 --- a/tools/buildsteps/win32/prepare-env.bat +++ b/tools/buildsteps/win32/prepare-env.bat @@ -23,7 +23,3 @@ IF EXIST %WORKSPACE%\project\BuildDependencies\msys rmdir %WORKSPACE%\project\Bu IF EXIST %WORKSPACE%\project\VS2010Express\XBMC rmdir %WORKSPACE%\project\VS2010Express\XBMC /S /Q IF EXIST %WORKSPACE%\project\VS2010Express\objs rmdir %WORKSPACE%\project\VS2010Express\objs /S /Q IF EXIST %WORKSPACE%\project\VS2010Express\libs rmdir %WORKSPACE%\project\VS2010Express\libs /S /Q - -rem fetch submodules -IF EXIST "%WORKSPACE%\addons\skin.re-touched" rmdir "%WORKSPACE%\addons\skin.re-touched" /S /Q || exit /b 10 -git submodule update --init "%WORKSPACE%\addons\skin.re-touched" || exit /b 30 diff --git a/tools/darwin/Support/CopyRootFiles-ios.command b/tools/darwin/Support/CopyRootFiles-ios.command index b830776da3..03a7f201ef 100755 --- a/tools/darwin/Support/CopyRootFiles-ios.command +++ b/tools/darwin/Support/CopyRootFiles-ios.command @@ -17,7 +17,7 @@ SYNC="rsync -aq --exclude .git* --exclude .DS_Store* --exclude *.dll --exclude * SKINSYNC="rsync -aq --exclude .git* --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *.bat" # rsync command for including everything but the skins -ADDONSYNC="rsync -aq --no-links --exclude .git* --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude addons/skin.estuary --exclude addons/skin.re-touched" +ADDONSYNC="rsync -aq --no-links --exclude .git* --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude addons/skin.estuary --exclude addons/skin.estouchy" # binary name is Kodi but we build Kodi.bin so to get a clean binary each time mv $TARGET_BUILD_DIR/$TARGET_NAME/$APP_NAME.bin $TARGET_BUILD_DIR/$TARGET_NAME/$APP_NAME @@ -35,16 +35,15 @@ ${SYNC} "$SRCROOT/xbmc/platform/darwin/Credits.html" "$TARGET_BUILD_DIR/$TARGET ${ADDONSYNC} "$SRCROOT/addons" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome" ${SYNC} "$SRCROOT/media" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome" -# sync touch skin if it exists -if [ -f "$SRCROOT/addons/skin.re-touched/addon.xml" ]; then +# sync skin.estouchy SYNCSKIN_A=${SKINSYNC} -if [ -f "$SRCROOT/addons/skin.re-touched/media/Textures.xbt" ]; then +if [ -f "$SRCROOT/addons/skin.estouchy/media/Textures.xbt" ]; then SYNCSKIN_A="${SKINSYNC} --exclude *.png --exclude *.jpg" fi -${SYNCSKIN_A} "$SRCROOT/addons/skin.re-touched" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/addons" -${SYNC} "$SRCROOT/addons/skin.re-touched/background" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/addons/skin.re-touched" -${SYNC} "$SRCROOT/addons/skin.re-touched/icon.png" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/addons/skin.re-touched" -fi +${SYNCSKIN_A} "$SRCROOT/addons/skin.estouchy" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/addons" +${SYNC} "$SRCROOT/addons/skin.estouchy/background" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/addons/skin.estouchy" +${SYNC} "$SRCROOT/addons/skin.estouchy/icon.png" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/addons/skin.estouchy" +${SYNC} "$SRCROOT/addons/skin.estouchy/fanart.jpg" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/addons/skin.estouchy" # sync skin.estuary SYNCSKIN_B=${SKINSYNC} diff --git a/tools/darwin/Support/CopyRootFiles-osx.command b/tools/darwin/Support/CopyRootFiles-osx.command index 80ef5be29a..a4831eb3c0 100755 --- a/tools/darwin/Support/CopyRootFiles-osx.command +++ b/tools/darwin/Support/CopyRootFiles-osx.command @@ -17,7 +17,7 @@ SYNC="rsync -aq --exclude .git* --exclude .DS_Store* --exclude *.dll --exclude * SYNCSKIN="rsync -aq --exclude .git* --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *.png --exclude *.jpg --exclude *.bat" # rsync command for including everything but the skins -ADDONSYNC="rsync -aq --no-links --exclude .git* --exclude .DS_Store* --exclude addons/skin.estuary --exclude addons/skin.re-touched" +ADDONSYNC="rsync -aq --no-links --exclude .git* --exclude .DS_Store* --exclude addons/skin.estuary --exclude addons/skin.estouchy" mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME" mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/addons" @@ -37,6 +37,10 @@ ${SYNCSKIN} "$SRCROOT/addons/skin.estuary" "$TARGET_BUILD_DIR/$TARGET_NAME/Cont ${SYNC} "$SRCROOT/addons/skin.estuary/extras" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/addons/skin.estuary" ${SYNC} "$SRCROOT/addons/skin.estuary/icon.png" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/addons/skin.estuary" ${SYNC} "$SRCROOT/addons/skin.estuary/fanart.jpg" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/addons/skin.estuary" +${SYNCSKIN} "$SRCROOT/addons/skin.estouchy" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/addons" +${SYNC} "$SRCROOT/addons/skin.estouchy/background" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/addons/skin.estouchy" +${SYNC} "$SRCROOT/addons/skin.estouchy/icon.png" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/addons/skin.estouchy" +${SYNC} "$SRCROOT/addons/skin.estouchy/fanart.jpg" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/addons/skin.estouchy" ${SYNC} "$SRCROOT/system" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME" ${SYNC} "$SRCROOT/userdata" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME" diff --git a/xbmc/settings/SettingConditions.cpp b/xbmc/settings/SettingConditions.cpp index 4f603a9636..206d2a1142 100644 --- a/xbmc/settings/SettingConditions.cpp +++ b/xbmc/settings/SettingConditions.cpp @@ -209,9 +209,6 @@ void CSettingConditions::Initialize() #ifdef HAS_SDL_JOYSTICK m_simpleConditions.insert("has_sdl_joystick"); #endif -#ifdef HAS_TOUCH_SKIN - m_simpleConditions.insert("has_touch_skin"); -#endif #ifdef HAS_TIME_SERVER m_simpleConditions.insert("has_time_server"); #endif diff --git a/xbmc/system.h b/xbmc/system.h index 60fe668799..0f69303836 100644 --- a/xbmc/system.h +++ b/xbmc/system.h @@ -264,8 +264,8 @@ /**************** * default skin ****************/ -#if defined(HAS_TOUCH_SKIN) && defined(TARGET_DARWIN_IOS) -#define DEFAULT_SKIN "skin.re-touched" +#if defined(TARGET_DARWIN_IOS) +#define DEFAULT_SKIN "skin.estouchy" #else #define DEFAULT_SKIN "skin.estuary" #endif |