aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.in10
-rw-r--r--configure.in22
-rwxr-xr-xlanguage/English/strings.po35
-rw-r--r--project/Win32BuildSetup/BuildSetup.bat2
-rwxr-xr-xtools/darwin/Support/CopyRootFiles-ios.command2
-rw-r--r--xbmc/settings/SettingConditions.cpp4
-rw-r--r--xbmc/settings/Settings.cpp2
-rw-r--r--xbmc/system.h2
8 files changed, 39 insertions, 40 deletions
diff --git a/Makefile.in b/Makefile.in
index 5e8172acc3..529a5df030 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.re-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@
@@ -347,8 +347,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/configure.in b/configure.in
index 3f8177f215..50a124ce8f 100644
--- a/configure.in
+++ b/configure.in
@@ -1396,14 +1396,14 @@ else
DISABLE_PROJECTM=0
fi
-# skin touched
-use_skin_touched=no
+# touch skin
+use_touch_skin=no
if [[ -f "addons/skin.re-touched/addon.xml" ]]; then
- use_skin_touched=yes
- USE_SKIN_TOUCHED=1
- AC_DEFINE([HAS_SKIN_TOUCHED], [1], [Whether to build skin touched.])
+ 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
@@ -2101,10 +2101,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
@@ -2466,7 +2466,7 @@ if test "$use_wayland" = "yes"; then
OUTPUT_FILES="$OUTPUT_FILES xbmc/windowing/tests/wayland/Makefile"
fi
-if test "$use_skin_touched" = "yes"; then
+if test "$use_touch_skin" = "yes"; then
OUTPUT_FILES="$OUTPUT_FILES addons/skin.re-touched/media/Makefile"
fi
@@ -2506,7 +2506,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/language/English/strings.po b/language/English/strings.po
index 6e7c98c702..42f85d069f 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"
@@ -12143,7 +12143,7 @@ msgid "Version:"
msgstr ""
#: skin.confluence
-#: skin.touched
+#: skin.retouched
msgctxt "#24052"
msgid "Disclaimer"
msgstr ""
@@ -12532,7 +12532,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 ""
@@ -12543,7 +12543,6 @@ msgid "QWERTY keyboard"
msgstr ""
#: skin.confluence
-#: skin.touched
msgctxt "#29802"
msgid "Passthrough Audio in use"
msgstr ""
@@ -12781,8 +12780,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 4f53ec5587..875ffe8493 100644
--- a/project/Win32BuildSetup/BuildSetup.bat
+++ b/project/Win32BuildSetup/BuildSetup.bat
@@ -244,7 +244,7 @@ set WORKSPACE=%CD%\..\..
cd %build_path%
IF EXIST ..\..\addons\skin.re-touched\build.bat (
- ECHO Building Touched Skin...
+ ECHO Building Touch Skin...
cd ..\..\addons\skin.re-touched
call build.bat > NUL
cd %build_path%
diff --git a/tools/darwin/Support/CopyRootFiles-ios.command b/tools/darwin/Support/CopyRootFiles-ios.command
index 6b62bae6c0..9249aa025a 100755
--- a/tools/darwin/Support/CopyRootFiles-ios.command
+++ b/tools/darwin/Support/CopyRootFiles-ios.command
@@ -40,7 +40,7 @@ ${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
+# sync touch skin if it exists
if [ -f "$SRCROOT/addons/skin.re-touched/addon.xml" ]; then
SYNCSKIN_A=${SKINSYNC}
if [ -f "$SRCROOT/addons/skin.re-touched/media/Textures.xbt" ]; then
diff --git a/xbmc/settings/SettingConditions.cpp b/xbmc/settings/SettingConditions.cpp
index 7b615127d1..363dbd4d9d 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 8d1c8daac6..b87e984e8c 100644
--- a/xbmc/settings/Settings.cpp
+++ b/xbmc/settings/Settings.cpp
@@ -522,7 +522,7 @@ 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)
+#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
diff --git a/xbmc/system.h b/xbmc/system.h
index ebaf927409..41c1f5ded1 100644
--- a/xbmc/system.h
+++ b/xbmc/system.h
@@ -272,7 +272,7 @@
/****************
* default skin
****************/
-#if defined(HAS_SKIN_TOUCHED) && defined(TARGET_DARWIN_IOS) && !defined(TARGET_DARWIN_IOS_ATV2)
+#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"
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-26 20:47:49 +0000