Merge pull request #5314 from ronie/re-focus

replace skin.touched with skin.re-touched

19 files changed, 77 insertions, 70 deletions

diff --git a/.gitmodules b/.gitmodules
index a92044bef7..c1fe5780e3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,3 @@
-[submodule "touched"]
-	path = addons/skin.touched
-	url = git://github.com/xbmc/skin.touched.git
-	ignore = all
+[submodule "addons/skin.re-touched"]
+	path = addons/skin.re-touched
+	url = git://github.com/xbmc/skin.re-touched.git
diff --git a/Makefile.in b/Makefile.in
index 75d79a65dd..bda532b726 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -258,9 +258,9 @@ LIBADDON_DIRS=\
 CONFLUENCE_MEDIA=addons/skin.confluence/media
 SKIN_DIRS=$(CONFLUENCE_MEDIA)
 
-ifeq (@USE_SKIN_TOUCHED@,1)
-TOUCHED_MEDIA=addons/skin.touched/media
-SKIN_DIRS+=$(TOUCHED_MEDIA)
+ifeq (@USE_TOUCH_SKIN@,1)
+TOUCH_SKIN_MEDIA=addons/skin.re-touched/media
+SKIN_DIRS+=$(TOUCH_SKIN_MEDIA)
 endif
 
 LIBS=@LIBS@
@@ -353,8 +353,8 @@ config.status: configure
 ifeq (@USE_TEXTUREPACKER@,1)
 skins: tools/TexturePacker/TexturePacker force
 	 $(MAKE) -C $(CONFLUENCE_MEDIA)
-ifeq (@USE_SKIN_TOUCHED@,1)
-	 $(MAKE) -C $(TOUCHED_MEDIA)
+ifeq (@USE_TOUCH_SKIN@,1)
+	 $(MAKE) -C $(TOUCH_SKIN_MEDIA)
 endif
 else
 skins:
diff --git a/addons/skin.re-touched b/addons/skin.re-touched
new file mode 160000
+Subproject 1c4d55a3a701a37e5ebce44033e930bffd1b84b
diff --git a/addons/skin.touched b/addons/skin.touched
deleted file mode 160000
-Subproject 0e390a398490c41a4969cad597bee32dc8f7e87
diff --git a/configure.in b/configure.in
index 4212d31c73..490b12be36 100644
--- a/configure.in
+++ b/configure.in
@@ -1419,14 +1419,14 @@ 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.])
+# 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_SKIN_TOUCHED=0
+  USE_TOUCH_SKIN=0
 fi
 
 # libssh
@@ -2129,10 +2129,10 @@ else
   final_message="$final_message\n  ProjectM:\tNo"
 fi
 
-if test "$use_skin_touched" = "yes"; then
-  final_message="$final_message\n  Skin Touched:\tYes"
+if test "$use_touch_skin" = "yes"; then
+  final_message="$final_message\n  Touch skin:\tYes"
 else
-  final_message="$final_message\n  Skin Touched:\tNo"
+  final_message="$final_message\n  Touch skin:\tNo"
 fi
 
 if test "$use_x11" = "yes"; then
@@ -2494,8 +2494,8 @@ if test "$use_wayland" = "yes"; then
 OUTPUT_FILES="$OUTPUT_FILES xbmc/windowing/tests/wayland/Makefile"
 fi
 
-if test "$use_skin_touched" = "yes"; then
-OUTPUT_FILES="$OUTPUT_FILES addons/skin.touched/media/Makefile"
+if test "$use_touch_skin" = "yes"; then
+OUTPUT_FILES="$OUTPUT_FILES addons/skin.re-touched/media/Makefile"
 fi
 
 if test "$use_codec_libstagefright" = "yes"; then
@@ -2538,7 +2538,7 @@ AC_SUBST(FFMPEG_LIBDIR)
 AC_SUBST(USE_STATIC_FFMPEG)
 AC_SUBST(GNUTLS_ALL_LIBS)
 AC_SUBST(VORBISENC_ALL_LIBS)
-AC_SUBST(USE_SKIN_TOUCHED)
+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 5bfe7297eb..db37050f00 100644
--- a/docs/README.android
+++ b/docs/README.android
@@ -142,7 +142,7 @@ Make sure to pick a toolchain for your desired architecture.
    # cd $HOME
    # git clone git://github.com/xbmc/xbmc.git xbmc-android
    # cd xbmc-android
-   # git submodule update --init addons/skin.touched
+   # git submodule update --init addons/skin.re-touched
 
 -----------------------------------------------------------------------------
 5. How to compile
diff --git a/docs/README.ios b/docs/README.ios
index c1ccad6d9b..59bcaa38ab 100644
--- a/docs/README.ios
+++ b/docs/README.ios
@@ -41,7 +41,7 @@ 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
+ $ git submodule update --init addons/skin.re-touched
 
 -----------------------------------------------------------------------------
 3.0 Install Xcode
diff --git a/language/English/strings.po b/language/English/strings.po
index 2aab89a416..348b77e784 100755
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -4569,61 +4569,61 @@ msgstr ""
 #empty strings from id 12023 to 12309
 
 #: skin.confluence
-#: skin.touched
+#: skin.retouched
 msgctxt "#12310"
 msgid "0"
 msgstr ""
 
 #: skin.confluence
-#: skin.touched
+#: skin.retouched
 msgctxt "#12311"
 msgid "1"
 msgstr ""
 
 #: skin.confluence
-#: skin.touched
+#: skin.retouched
 msgctxt "#12312"
 msgid "2"
 msgstr ""
 
 #: skin.confluence
-#: skin.touched
+#: skin.retouched
 msgctxt "#12313"
 msgid "3"
 msgstr ""
 
 #: skin.confluence
-#: skin.touched
+#: skin.retouched
 msgctxt "#12314"
 msgid "4"
 msgstr ""
 
 #: skin.confluence
-#: skin.touched
+#: skin.retouched
 msgctxt "#12315"
 msgid "5"
 msgstr ""
 
 #: skin.confluence
-#: skin.touched
+#: skin.retouched
 msgctxt "#12316"
 msgid "6"
 msgstr ""
 
 #: skin.confluence
-#: skin.touched
+#: skin.retouched
 msgctxt "#12317"
 msgid "7"
 msgstr ""
 
 #: skin.confluence
-#: skin.touched
+#: skin.retouched
 msgctxt "#12318"
 msgid "8"
 msgstr ""
 
 #: skin.confluence
-#: skin.touched
+#: skin.retouched
 msgctxt "#12319"
 msgid "9"
 msgstr ""
@@ -5024,13 +5024,13 @@ msgid "Suspend"
 msgstr ""
 
 #: skin.confluence
-#: skin.touched
+#: skin.retouched
 msgctxt "#13012"
 msgid "Exit"
 msgstr ""
 
 #: skin.confluence
-#: skin.touched
+#: skin.retouched
 msgctxt "#13013"
 msgid "Reboot"
 msgstr ""
@@ -5046,7 +5046,7 @@ msgid "Power button action"
 msgstr ""
 
 #: skin.confluence
-#: skin.touched
+#: skin.retouched
 msgctxt "#13016"
 msgid "Power off System"
 msgstr ""
@@ -5365,7 +5365,7 @@ msgstr ""
 #empty strings from id 13175 to 13199
 
 #: skin.confluence
-#: skin.touched
+#: skin.retouched
 #: xbmc\profiles\ProfilesManager.cpp
 #: xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp
 msgctxt "#13200"
@@ -12177,7 +12177,7 @@ msgid "Version:"
 msgstr ""
 
 #: skin.confluence
-#: skin.touched
+#: skin.retouched
 msgctxt "#24052"
 msgid "Disclaimer"
 msgstr ""
@@ -12566,7 +12566,7 @@ msgstr ""
 #strings 29800 thru 29998 reserved strings used only in the default Project Mayhem III skin and not c++ code
 
 #: skin.confluence
-#: skin.touched
+#: skin.retouched
 msgctxt "#29800"
 msgid "Library Mode"
 msgstr ""
@@ -12577,7 +12577,6 @@ msgid "QWERTY keyboard"
 msgstr ""
 
 #: skin.confluence
-#: skin.touched
 msgctxt "#29802"
 msgid "Passthrough Audio in use"
 msgstr ""
@@ -12815,8 +12814,8 @@ msgctxt "#33062"
 msgid "Play the"
 msgstr ""
 
-#: addons/skin/touched/
 #: addons/skin/confluence
+#: skin.retouched
 msgctxt "#33063"
 msgid "Options"
 msgstr ""
diff --git a/project/Win32BuildSetup/BuildSetup.bat b/project/Win32BuildSetup/BuildSetup.bat
index 31e37d99a4..8883607992 100644
--- a/project/Win32BuildSetup/BuildSetup.bat
+++ b/project/Win32BuildSetup/BuildSetup.bat
@@ -189,7 +189,7 @@ set WORKSPACE=%CD%\..\..
   Echo addons\visualization.projectm\>>exclude.txt
   Echo addons\visualization.glspectrum\>>exclude.txt
   rem Exclude skins as they're copied by their own script
-  Echo addons\skin.touched\>>exclude.txt
+  Echo addons\skin.re-touched\>>exclude.txt
   Echo addons\skin.confluence\>>exclude.txt
   
   md BUILD_WIN32\application
@@ -234,9 +234,9 @@ set WORKSPACE=%CD%\..\..
   call build.bat > NUL
   cd %build_path%
   
-  IF EXIST  ..\..\addons\skin.touched\build.bat (
-    ECHO Building Touched Skin...
-    cd ..\..\addons\skin.touched
+  IF EXIST  ..\..\addons\skin.re-touched\build.bat (
+    ECHO Building Touch Skin...
+    cd ..\..\addons\skin.re-touched
     call build.bat > NUL
     cd %build_path%
   )
diff --git a/tools/buildsteps/android/prepare-xbmc b/tools/buildsteps/android/prepare-xbmc
index e83b22aad4..3a82e5c600 100644
--- a/tools/buildsteps/android/prepare-xbmc
+++ b/tools/buildsteps/android/prepare-xbmc
@@ -4,5 +4,8 @@ XBMC_PLATFORM_DIR=android
 
 #fetch submodules
 cd $WORKSPACE
-rm -r $WORKSPACE/addons/skin.touched
-git submodule update --init $WORKSPACE/addons/skin.touched
+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
diff --git a/tools/buildsteps/androidx86/prepare-xbmc b/tools/buildsteps/androidx86/prepare-xbmc
index e83b22aad4..3a82e5c600 100644
--- a/tools/buildsteps/androidx86/prepare-xbmc
+++ b/tools/buildsteps/androidx86/prepare-xbmc
@@ -4,5 +4,8 @@ XBMC_PLATFORM_DIR=android
 
 #fetch submodules
 cd $WORKSPACE
-rm -r $WORKSPACE/addons/skin.touched
-git submodule update --init $WORKSPACE/addons/skin.touched
+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
diff --git a/tools/buildsteps/ios/prepare-xbmc b/tools/buildsteps/ios/prepare-xbmc
index 2f2503b437..1b93c2bdb7 100755
--- a/tools/buildsteps/ios/prepare-xbmc
+++ b/tools/buildsteps/ios/prepare-xbmc
@@ -4,5 +4,8 @@ XBMC_PLATFORM_DIR=ios
 
 #fetch submodules
 cd $WORKSPACE
-rm -r $WORKSPACE/addons/skin.touched
-git submodule update --init $WORKSPACE/addons/skin.touched
+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
diff --git a/tools/buildsteps/win32/prepare-env.bat b/tools/buildsteps/win32/prepare-env.bat
index d95fda56d7..7e1d30cbd9 100644
--- a/tools/buildsteps/win32/prepare-env.bat
+++ b/tools/buildsteps/win32/prepare-env.bat
@@ -25,5 +25,5 @@ IF EXIST %WORKSPACE%\project\VS2010Express\objs rmdir %WORKSPACE%\project\VS2010
 IF EXIST %WORKSPACE%\project\VS2010Express\libs rmdir %WORKSPACE%\project\VS2010Express\libs /S /Q
 
 rem fetch submodules
-IF EXIST "%WORKSPACE%\addons\skin.touched" rmdir "%WORKSPACE%\addons\skin.touched" /S /Q || exit /b 10
-git submodule update --init "%WORKSPACE%\addons\skin.touched" || exit /b 30
+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-atv2.command b/tools/darwin/Support/CopyRootFiles-atv2.command
index 95dabad8d3..4f45dd76ee 100755
--- a/tools/darwin/Support/CopyRootFiles-atv2.command
+++ b/tools/darwin/Support/CopyRootFiles-atv2.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 --exclude .git* --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude addons/skin.confluence --exclude addons/skin.touched --exclude screensaver.rsxs* --exclude visualization.*"
+ADDONSYNC="rsync -aq --exclude .git* --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude addons/skin.confluence --exclude addons/skin.re-touched --exclude screensaver.rsxs* --exclude visualization.*"
 
 # binary name is XBMC but we build XBMC.bin so to get a clean binary each time
 mv $TARGET_BUILD_DIR/$TARGET_NAME/XBMC.bin $TARGET_BUILD_DIR/$TARGET_NAME/XBMC
diff --git a/tools/darwin/Support/CopyRootFiles-ios.command b/tools/darwin/Support/CopyRootFiles-ios.command
index bc60a704d3..9249aa025a 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 --exclude .git* --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude addons/skin.confluence --exclude addons/skin.touched --exclude screensaver.rsxs* --exclude visualization.*"
+ADDONSYNC="rsync -aq --exclude .git* --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude addons/skin.confluence --exclude addons/skin.re-touched --exclude screensaver.rsxs* --exclude visualization.*"
 
 # binary name is XBMC but we build XBMC.bin so to get a clean binary each time
 mv $TARGET_BUILD_DIR/$TARGET_NAME/XBMC.bin $TARGET_BUILD_DIR/$TARGET_NAME/XBMC
@@ -40,15 +40,15 @@ ${SYNC} "$SRCROOT/addons/visualization.waveform"      "$TARGET_BUILD_DIR/$TARGET
 ${SYNC} "$SRCROOT/language"   "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome"
 ${SYNC} "$SRCROOT/media"    "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome"
 
-# sync skin.touched if it exists
-if [ -f "$SRCROOT/addons/skin.touched/addon.xml" ]; then
+# sync touch skin if it exists
+if [ -f "$SRCROOT/addons/skin.re-touched/addon.xml" ]; then
 SYNCSKIN_A=${SKINSYNC}
-if [ -f "$SRCROOT/addons/skin.touched/media/Textures.xbt" ]; then
+if [ -f "$SRCROOT/addons/skin.re-touched/media/Textures.xbt" ]; then
 SYNCSKIN_A="${SKINSYNC} --exclude *.png --exclude *.jpg"
 fi
-${SYNCSKIN_A} "$SRCROOT/addons/skin.touched"    "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons"
-${SYNC} "$SRCROOT/addons/skin.touched/background"   "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons/skin.touched"
-${SYNC} "$SRCROOT/addons/skin.touched/icon.png"   "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons/skin.touched"
+${SYNCSKIN_A} "$SRCROOT/addons/skin.re-touched"    "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons"
+${SYNC} "$SRCROOT/addons/skin.re-touched/background"   "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons/skin.re-touched"
+${SYNC} "$SRCROOT/addons/skin.re-touched/icon.png"   "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons/skin.re-touched"
 fi
 
 # sync skin.confluence
@@ -64,4 +64,4 @@ ${SYNC} "$SRCROOT/sounds"     "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome"
 ${SYNC} "$SRCROOT/system"     "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome"
 ${SYNC} "$SRCROOT/userdata"   "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome"
 
-fi
\ No newline at end of file
+fi
diff --git a/tools/darwin/Support/CopyRootFiles-osx.command b/tools/darwin/Support/CopyRootFiles-osx.command
index 783e5e5207..8bc01f2cd1 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 --exclude .git* --exclude .DS_Store* --exclude addons/skin.confluence --exclude addons/skin.touched"
+ADDONSYNC="rsync -aq --exclude .git* --exclude .DS_Store* --exclude addons/skin.confluence --exclude addons/skin.re-touched"
 
 mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC"
 mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons"
diff --git a/xbmc/settings/SettingConditions.cpp b/xbmc/settings/SettingConditions.cpp
index c1cdfc1c0f..11d393f2ae 100644
--- a/xbmc/settings/SettingConditions.cpp
+++ b/xbmc/settings/SettingConditions.cpp
@@ -212,8 +212,8 @@ void CSettingConditions::Initialize()
 #ifdef HAS_SDL_JOYSTICK
   m_simpleConditions.insert("has_sdl_joystick");
 #endif
-#ifdef HAS_SKIN_TOUCHED
-  m_simpleConditions.insert("has_skin_touched");
+#ifdef HAS_TOUCH_SKIN
+  m_simpleConditions.insert("has_touch_skin");
 #endif
 #ifdef HAS_TIME_SERVER
   m_simpleConditions.insert("has_time_server");
diff --git a/xbmc/settings/Settings.cpp b/xbmc/settings/Settings.cpp
index 797e91a553..b87e984e8c 100644
--- a/xbmc/settings/Settings.cpp
+++ b/xbmc/settings/Settings.cpp
@@ -522,8 +522,8 @@ void CSettings::InitializeVisibility()
 void CSettings::InitializeDefaults()
 {
   // set some default values if necessary
-#if defined(HAS_SKIN_TOUCHED) && defined(TARGET_DARWIN_IOS) && !defined(TARGET_DARWIN_IOS_ATV2)
-  ((CSettingAddon*)m_settingsManager->GetSetting("lookandfeel.skin"))->SetDefault("skin.touched");
+#if defined(HAS_TOUCH_SKIN) && defined(TARGET_DARWIN_IOS) && !defined(TARGET_DARWIN_IOS_ATV2)
+  ((CSettingAddon*)m_settingsManager->GetSetting("lookandfeel.skin"))->SetDefault("skin.re-touched");
 #endif
 
 #if defined(TARGET_POSIX)
diff --git a/xbmc/system.h b/xbmc/system.h
index 1ca58d02fe..41c1f5ded1 100644
--- a/xbmc/system.h
+++ b/xbmc/system.h
@@ -272,8 +272,8 @@
 /****************
  * default skin
  ****************/
-#if defined(HAS_SKIN_TOUCHED) && defined(TARGET_DARWIN_IOS) && !defined(TARGET_DARWIN_IOS_ATV2)
-#define DEFAULT_SKIN          "skin.touched"
+#if defined(HAS_TOUCH_SKIN) && defined(TARGET_DARWIN_IOS) && !defined(TARGET_DARWIN_IOS_ATV2)
+#define DEFAULT_SKIN          "skin.re-touched"
 #else
 #define DEFAULT_SKIN          "skin.confluence"
 #endif