Skip to content
Browse files

Merge branch 'master' into pvr-ppa

  • Loading branch information...
2 parents bd16540 + c707b8c commit 09c02fa24ad7bf12ec9fad3b3884433b8963a7c4 @opdenkamp opdenkamp committed May 21, 2011
Showing with 2,716 additions and 2,916 deletions.
  1. +55 −0 .gitignore
  2. +2 −2 Makefile.in
  3. +0 −6 XBMC-ATV2.xcodeproj/project.pbxproj
  4. +0 −6 XBMC-IOS.xcodeproj/project.pbxproj
  5. +0 −8 XBMC.xcodeproj/project.pbxproj
  6. +4 −0 addons/pvr.hts/resources/language/Dutch/strings.xml
  7. +4 −0 addons/pvr.hts/resources/language/English/strings.xml
  8. +9 −0 addons/pvr.hts/resources/language/German/strings.xml
  9. +3 −0 addons/pvr.vdr.vnsi/resources/language/English/strings.xml
  10. +2 −0 addons/pvr.vdr.vnsi/resources/language/Finnish/strings.xml
  11. +3 −0 addons/pvr.vdr.vnsi/resources/language/German/strings.xml
  12. +1 −0 addons/pvr.vdr.vnsi/resources/settings.xml
  13. +66 −86 addons/skin.confluence/720p/DialogAddonInfo.xml
  14. +84 −91 addons/skin.confluence/720p/DialogAddonSettings.xml
  15. +42 −50 addons/skin.confluence/720p/DialogContentSettings.xml
  16. +16 −25 addons/skin.confluence/720p/DialogContextMenu.xml
  17. +41 −23 addons/skin.confluence/720p/DialogGamepad.xml
  18. +40 −15 addons/skin.confluence/720p/DialogKaraokeSongSelectorLarge.xml
  19. +21 −30 addons/skin.confluence/720p/DialogKeyboard.xml
  20. +62 −79 addons/skin.confluence/720p/DialogMediaSource.xml
  21. +57 −68 addons/skin.confluence/720p/DialogNetworkSetup.xml
  22. +11 −20 addons/skin.confluence/720p/DialogNumeric.xml
  23. +33 −27 addons/skin.confluence/720p/DialogOK.xml
  24. +425 −475 addons/skin.confluence/720p/DialogPVRChannelManager.xml
  25. +70 −71 addons/skin.confluence/720p/DialogPVRChannelsOSD.xml
  26. +40 −42 addons/skin.confluence/720p/DialogPVRGroupManager.xml
  27. +46 −37 addons/skin.confluence/720p/DialogPVRGuideInfo.xml
  28. +49 −50 addons/skin.confluence/720p/DialogPVRGuideOSD.xml
  29. +29 −34 addons/skin.confluence/720p/DialogPVRGuideSearch.xml
  30. +240 −234 addons/skin.confluence/720p/DialogPVRRecordingInfo.xml
  31. +77 −81 addons/skin.confluence/720p/DialogPVRTimerSettings.xml
  32. +106 −68 addons/skin.confluence/720p/DialogPictureInfo.xml
  33. +47 −24 addons/skin.confluence/720p/DialogProgress.xml
  34. +65 −57 addons/skin.confluence/720p/DialogSelect.xml
  35. +273 −278 addons/skin.confluence/720p/DialogSongInfo.xml
  36. +4 −4 addons/skin.confluence/720p/DialogTextViewer.xml
  37. +1 −1 addons/skin.confluence/720p/DialogVideoInfo.xml
  38. +34 −30 addons/skin.confluence/720p/DialogYesNo.xml
  39. +8 −12 addons/skin.confluence/720p/FileBrowser.xml
  40. +31 −37 addons/skin.confluence/720p/LockSettings.xml
  41. +3 −1 addons/skin.confluence/720p/MusicVisualisation.xml
  42. +1 −1 addons/skin.confluence/720p/MyPVR.xml
  43. +10 −0 addons/skin.confluence/720p/MyVideoNav.xml
  44. +34 −40 addons/skin.confluence/720p/ProfileSettings.xml
  45. +83 −92 addons/skin.confluence/720p/SmartPlaylistEditor.xml
  46. +31 −35 addons/skin.confluence/720p/SmartPlaylistRule.xml
  47. +56 −42 addons/skin.confluence/720p/VideoOSDBookmarks.xml
  48. +43 −46 addons/skin.confluence/720p/VideoOSDSettings.xml
  49. +54 −0 addons/skin.confluence/720p/ViewsAddonBrowser.xml
  50. +75 −24 addons/skin.confluence/720p/ViewsPVR.xml
  51. +1 −1 addons/skin.confluence/720p/ViewsPictures.xml
  52. +30 −2 addons/skin.confluence/720p/ViewsVideoLibrary.xml
  53. +52 −40 addons/skin.confluence/720p/VisualisationPresetList.xml
  54. +10 −10 addons/skin.confluence/720p/defaults.xml
  55. +1 −1 addons/skin.confluence/720p/includes.xml
  56. +43 −53 addons/skin.confluence/720p/script-RSS_Editor-rssEditor.xml
  57. +44 −54 addons/skin.confluence/720p/script-RSS_Editor-setEditor.xml
  58. +0 −389 addons/skin.confluence/720p/script-XBMC_Lyrics-settings.xml
  59. +2 −1 addons/skin.confluence/language/English/strings.xml
  60. +9 −4 addons/skin.confluence/language/Finnish/strings.xml
  61. +8 −1 addons/skin.confluence/language/German/strings.xml
  62. BIN addons/skin.confluence/media/Confluence_Logo.png
  63. BIN addons/skin.confluence/media/DialogBack.png
  64. BIN addons/skin.confluence/media/DialogBack2.png
  65. BIN addons/skin.confluence/media/DialogContextBottom.png
  66. BIN addons/skin.confluence/media/DialogContextMiddle.png
  67. BIN addons/skin.confluence/media/DialogContextTop.png
  68. BIN addons/skin.confluence/media/button-focus.png
  69. BIN addons/skin.confluence/media/button-focus2.png
  70. BIN addons/skin.confluence/media/dialogheader.png
  71. BIN addons/skin.confluence/media/flagging/audio/wav.png
  72. BIN addons/skin.confluence/media/flagging/ratings/mpaa_general.png
  73. BIN addons/skin.confluence/media/flagging/ratings/mpaa_nc17.png
  74. BIN addons/skin.confluence/media/flagging/ratings/mpaa_notrated.png
  75. BIN addons/skin.confluence/media/flagging/ratings/mpaa_pg.png
  76. BIN addons/skin.confluence/media/flagging/ratings/mpaa_pg13.png
  77. BIN addons/skin.confluence/media/flagging/ratings/mpaa_restricted.png
  78. +11 −0 addons/visualization.milkdrop/resources/language/Finnish/strings.xml
  79. +8 −0 addons/visualization.projectm/resources/language/Finnish/strings.xml
  80. +3 −0 bootstrap
  81. +1 −8 configure.in
  82. +1 −0 language/Dutch/strings.xml
  83. +1 −0 language/English/strings.xml
Sorry, we could not display the entire diff because too many files (1,242) changed.
View
55 .gitignore
@@ -1013,6 +1013,21 @@ project/Win32BuildSetup/dependencies/libcdio-10.dll
/lib/libapetag/config.h
/lib/libapetag/Debug
/lib/libapetag/Release
+/lib/libapetag/aclocal.m4
+/lib/libapetag/config.guess
+/lib/libapetag/config.h.in
+/lib/libapetag/config.h.in~
+/lib/libapetag/config.sub
+/lib/libapetag/configure
+/lib/libapetag/depcomp
+/lib/libapetag/INSTALL
+/lib/libapetag/ltmain.sh
+/lib/libapetag/m4/libtool.m4
+/lib/libapetag/m4/ltoptions.m4
+/lib/libapetag/m4/ltsugar.m4
+/lib/libapetag/m4/ltversion.m4
+/lib/libapetag/Makefile.in
+/lib/libapetag/missing
# /lib/cmyth/
/lib/cmyth/Makefile.depend
@@ -1060,6 +1075,20 @@ project/Win32BuildSetup/dependencies/libcdio-10.dll
/lib/libid3tag/libid3tag/msvc++/libid3tag.lib
/lib/libid3tag/libid3tag/msvc++/Debug
/lib/libid3tag/libid3tag/msvc++/Release
+/lib/libid3tag/libid3tag/aclocal.m4
+/lib/libid3tag/libid3tag/config.guess
+/lib/libid3tag/libid3tag/config.h.in
+/lib/libid3tag/libid3tag/config.h.in~
+/lib/libid3tag/libid3tag/config.sub
+/lib/libid3tag/libid3tag/depcomp
+/lib/libid3tag/libid3tag/INSTALL
+/lib/libid3tag/libid3tag/install-sh
+/lib/libid3tag/libid3tag/ltmain.sh
+/lib/libid3tag/libid3tag/Makefile.in
+/lib/libid3tag/libid3tag/missing
+/lib/libid3tag/libid3tag/mkinstalldirs
+/lib/libid3tag/libid3tag/msvc++/Makefile.in
+
# /xbmc/interfaces/
/xbmc/interfaces/Makefile
@@ -1151,6 +1180,32 @@ project/Win32BuildSetup/dependencies/libcdio-10.dll
/xbmc/screensavers/rsxs-0.9/src/plasma/rs-plasma
/xbmc/screensavers/rsxs-0.9/src/solarwinds/rs-solarwinds
/xbmc/screensavers/rsxs-0.9/stamp-h1
+/xbmc/screensavers/rsxs-0.9/aclocal.m4
+/xbmc/screensavers/rsxs-0.9/compile
+/xbmc/screensavers/rsxs-0.9/config.guess
+/xbmc/screensavers/rsxs-0.9/config.h.in
+/xbmc/screensavers/rsxs-0.9/config.h.in~
+/xbmc/screensavers/rsxs-0.9/config.sub
+/xbmc/screensavers/rsxs-0.9/config/Makefile.in
+/xbmc/screensavers/rsxs-0.9/depcomp
+/xbmc/screensavers/rsxs-0.9/INSTALL
+/xbmc/screensavers/rsxs-0.9/install-sh
+/xbmc/screensavers/rsxs-0.9/lib/Makefile.in
+/xbmc/screensavers/rsxs-0.9/libltdl/Makefile.in
+/xbmc/screensavers/rsxs-0.9/Makefile.in
+/xbmc/screensavers/rsxs-0.9/missing
+/xbmc/screensavers/rsxs-0.9/src/cyclone/Makefile.in
+/xbmc/screensavers/rsxs-0.9/src/euphoria/Makefile.in
+/xbmc/screensavers/rsxs-0.9/src/fieldlines/Makefile.in
+/xbmc/screensavers/rsxs-0.9/src/flocks/Makefile.in
+/xbmc/screensavers/rsxs-0.9/src/flux/Makefile.in
+/xbmc/screensavers/rsxs-0.9/src/helios/Makefile.in
+/xbmc/screensavers/rsxs-0.9/src/hyperspace/Makefile.in
+/xbmc/screensavers/rsxs-0.9/src/lattice/Makefile.in
+/xbmc/screensavers/rsxs-0.9/src/Makefile.in
+/xbmc/screensavers/rsxs-0.9/src/plasma/Makefile.in
+/xbmc/screensavers/rsxs-0.9/src/skyrocket/Makefile.in
+/xbmc/screensavers/rsxs-0.9/src/solarwinds/Makefile.in
/xbmc/visualizations/DirectXSpectrum/Debug (DirectX)
/xbmc/visualizations/DirectXSpectrum/Release (DirectX)
View
4 Makefile.in
@@ -405,9 +405,9 @@ lib/cpluff/libcpluff/.libs/libcpluff.a: force
system/libcpluff-@ARCH@.so: lib/cpluff/libcpluff/.libs/libcpluff.a
ifeq ($(findstring osx,@ARCH@), osx)
ifeq (@ARCH@, arm-osx)
- $(CXX) $(LDFLAGS) -all_load -bundle -flat_namespace -undefined dynamic_lookup -read_only_relocs suppress -arch armv7 -o $@ $<
+ $(CXX) $(LDFLAGS) -all_load -bundle -flat_namespace -undefined dynamic_lookup -read_only_relocs suppress -o $@ $<
else
- $(CXX) $(LDFLAGS) -all_load -bundle -flat_namespace -undefined dynamic_lookup -arch @ARCHTYPE@ -lexpat $(BUNDLE1_O) -o $@ $<
+ $(CXX) $(LDFLAGS) -all_load -bundle -flat_namespace -undefined dynamic_lookup -lexpat $(BUNDLE1_O) -o $@ $<
endif
else
cp lib/cpluff/libcpluff/.libs/libcpluff.so $@
View
6 XBMC-ATV2.xcodeproj/project.pbxproj
@@ -376,7 +376,6 @@
F56C79E8131EC154000AD0F6 /* QueryParams.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C748E131EC152000AD0F6 /* QueryParams.cpp */; };
F56C79E9131EC154000AD0F6 /* VideoDatabaseDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7490131EC152000AD0F6 /* VideoDatabaseDirectory.cpp */; };
F56C79EA131EC154000AD0F6 /* VirtualDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7492131EC152000AD0F6 /* VirtualDirectory.cpp */; };
- F56C79EB131EC154000AD0F6 /* VirtualPathDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7494131EC152000AD0F6 /* VirtualPathDirectory.cpp */; };
F56C79ED131EC154000AD0F6 /* ZeroconfDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7499131EC152000AD0F6 /* ZeroconfDirectory.cpp */; };
F56C79EE131EC154000AD0F6 /* ZipDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C749B131EC152000AD0F6 /* ZipDirectory.cpp */; };
F56C79EF131EC154000AD0F6 /* ZipManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C749D131EC152000AD0F6 /* ZipManager.cpp */; };
@@ -1769,8 +1768,6 @@
F56C7491131EC152000AD0F6 /* VideoDatabaseDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoDatabaseDirectory.h; sourceTree = "<group>"; };
F56C7492131EC152000AD0F6 /* VirtualDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VirtualDirectory.cpp; sourceTree = "<group>"; };
F56C7493131EC152000AD0F6 /* VirtualDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VirtualDirectory.h; sourceTree = "<group>"; };
- F56C7494131EC152000AD0F6 /* VirtualPathDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VirtualPathDirectory.cpp; sourceTree = "<group>"; };
- F56C7495131EC152000AD0F6 /* VirtualPathDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VirtualPathDirectory.h; sourceTree = "<group>"; };
F56C7498131EC152000AD0F6 /* ZeroconfDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZeroconfDirectory.h; sourceTree = "<group>"; };
F56C7499131EC152000AD0F6 /* ZeroconfDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ZeroconfDirectory.cpp; sourceTree = "<group>"; };
F56C749A131EC152000AD0F6 /* zconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zconf.h; sourceTree = "<group>"; };
@@ -4127,8 +4124,6 @@
F56C7491131EC152000AD0F6 /* VideoDatabaseDirectory.h */,
F56C7492131EC152000AD0F6 /* VirtualDirectory.cpp */,
F56C7493131EC152000AD0F6 /* VirtualDirectory.h */,
- F56C7494131EC152000AD0F6 /* VirtualPathDirectory.cpp */,
- F56C7495131EC152000AD0F6 /* VirtualPathDirectory.h */,
F56C7498131EC152000AD0F6 /* ZeroconfDirectory.h */,
F56C7499131EC152000AD0F6 /* ZeroconfDirectory.cpp */,
F56C749A131EC152000AD0F6 /* zconf.h */,
@@ -6233,7 +6228,6 @@
F56C79E8131EC154000AD0F6 /* QueryParams.cpp in Sources */,
F56C79E9131EC154000AD0F6 /* VideoDatabaseDirectory.cpp in Sources */,
F56C79EA131EC154000AD0F6 /* VirtualDirectory.cpp in Sources */,
- F56C79EB131EC154000AD0F6 /* VirtualPathDirectory.cpp in Sources */,
F56C79ED131EC154000AD0F6 /* ZeroconfDirectory.cpp in Sources */,
F56C79EE131EC154000AD0F6 /* ZipDirectory.cpp in Sources */,
F56C79EF131EC154000AD0F6 /* ZipManager.cpp in Sources */,
View
6 XBMC-IOS.xcodeproj/project.pbxproj
@@ -467,7 +467,6 @@
F56C89D2131F42ED000AD0F6 /* QueryParams.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8471131F42E8000AD0F6 /* QueryParams.cpp */; };
F56C89D3131F42ED000AD0F6 /* VideoDatabaseDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8473131F42E8000AD0F6 /* VideoDatabaseDirectory.cpp */; };
F56C89D4131F42ED000AD0F6 /* VirtualDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8475131F42E8000AD0F6 /* VirtualDirectory.cpp */; };
- F56C89D5131F42ED000AD0F6 /* VirtualPathDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8477131F42E8000AD0F6 /* VirtualPathDirectory.cpp */; };
F56C89D7131F42ED000AD0F6 /* ZeroconfDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C847C131F42E9000AD0F6 /* ZeroconfDirectory.cpp */; };
F56C89D8131F42ED000AD0F6 /* ZipDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C847E131F42E9000AD0F6 /* ZipDirectory.cpp */; };
F56C89D9131F42ED000AD0F6 /* ZipManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8480131F42E9000AD0F6 /* ZipManager.cpp */; };
@@ -1967,8 +1966,6 @@
F56C8474131F42E8000AD0F6 /* VideoDatabaseDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoDatabaseDirectory.h; sourceTree = "<group>"; };
F56C8475131F42E8000AD0F6 /* VirtualDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VirtualDirectory.cpp; sourceTree = "<group>"; };
F56C8476131F42E8000AD0F6 /* VirtualDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VirtualDirectory.h; sourceTree = "<group>"; };
- F56C8477131F42E8000AD0F6 /* VirtualPathDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VirtualPathDirectory.cpp; sourceTree = "<group>"; };
- F56C8478131F42E8000AD0F6 /* VirtualPathDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VirtualPathDirectory.h; sourceTree = "<group>"; };
F56C847B131F42E9000AD0F6 /* ZeroconfDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZeroconfDirectory.h; sourceTree = "<group>"; };
F56C847C131F42E9000AD0F6 /* ZeroconfDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ZeroconfDirectory.cpp; sourceTree = "<group>"; };
F56C847D131F42E9000AD0F6 /* zconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zconf.h; sourceTree = "<group>"; };
@@ -4486,8 +4483,6 @@
F56C8474131F42E8000AD0F6 /* VideoDatabaseDirectory.h */,
F56C8475131F42E8000AD0F6 /* VirtualDirectory.cpp */,
F56C8476131F42E8000AD0F6 /* VirtualDirectory.h */,
- F56C8477131F42E8000AD0F6 /* VirtualPathDirectory.cpp */,
- F56C8478131F42E8000AD0F6 /* VirtualPathDirectory.h */,
F56C847B131F42E9000AD0F6 /* ZeroconfDirectory.h */,
F56C847C131F42E9000AD0F6 /* ZeroconfDirectory.cpp */,
F56C847D131F42E9000AD0F6 /* zconf.h */,
@@ -6340,7 +6335,6 @@
F56C89D2131F42ED000AD0F6 /* QueryParams.cpp in Sources */,
F56C89D3131F42ED000AD0F6 /* VideoDatabaseDirectory.cpp in Sources */,
F56C89D4131F42ED000AD0F6 /* VirtualDirectory.cpp in Sources */,
- F56C89D5131F42ED000AD0F6 /* VirtualPathDirectory.cpp in Sources */,
F56C89D7131F42ED000AD0F6 /* ZeroconfDirectory.cpp in Sources */,
F56C89D8131F42ED000AD0F6 /* ZipDirectory.cpp in Sources */,
F56C89D9131F42ED000AD0F6 /* ZipManager.cpp in Sources */,
View
8 XBMC.xcodeproj/project.pbxproj
@@ -852,7 +852,6 @@
E38E20720D25F9FD00618676 /* QueryParams.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17880D25F9FA00618676 /* QueryParams.cpp */; };
E38E20730D25F9FD00618676 /* VideoDatabaseDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E178A0D25F9FA00618676 /* VideoDatabaseDirectory.cpp */; };
E38E20740D25F9FD00618676 /* VirtualDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E178C0D25F9FA00618676 /* VirtualDirectory.cpp */; };
- E38E20750D25F9FD00618676 /* VirtualPathDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E178E0D25F9FA00618676 /* VirtualPathDirectory.cpp */; };
E38E20770D25F9FD00618676 /* ZipDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17930D25F9FA00618676 /* ZipDirectory.cpp */; };
E38E20780D25F9FD00618676 /* ZipManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17950D25F9FA00618676 /* ZipManager.cpp */; };
E38E207B0D25F9FD00618676 /* GUIDialogBoxBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E179C0D25F9FA00618676 /* GUIDialogBoxBase.cpp */; };
@@ -1434,7 +1433,6 @@
F5A1C9A10F6B06CF00A96ABD /* QueryParams.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17880D25F9FA00618676 /* QueryParams.cpp */; };
F5A1C9A20F6B06CF00A96ABD /* VideoDatabaseDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E178A0D25F9FA00618676 /* VideoDatabaseDirectory.cpp */; };
F5A1C9A30F6B06CF00A96ABD /* VirtualDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E178C0D25F9FA00618676 /* VirtualDirectory.cpp */; };
- F5A1C9A40F6B06CF00A96ABD /* VirtualPathDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E178E0D25F9FA00618676 /* VirtualPathDirectory.cpp */; };
F5A1C9A50F6B06CF00A96ABD /* ZipDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17930D25F9FA00618676 /* ZipDirectory.cpp */; };
F5A1C9A60F6B06CF00A96ABD /* ZipManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17950D25F9FA00618676 /* ZipManager.cpp */; };
F5A1C9A90F6B06CF00A96ABD /* GUIDialogBoxBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E179C0D25F9FA00618676 /* GUIDialogBoxBase.cpp */; };
@@ -3114,8 +3112,6 @@
E38E178B0D25F9FA00618676 /* VideoDatabaseDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoDatabaseDirectory.h; sourceTree = "<group>"; };
E38E178C0D25F9FA00618676 /* VirtualDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VirtualDirectory.cpp; sourceTree = "<group>"; };
E38E178D0D25F9FA00618676 /* VirtualDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VirtualDirectory.h; sourceTree = "<group>"; };
- E38E178E0D25F9FA00618676 /* VirtualPathDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VirtualPathDirectory.cpp; sourceTree = "<group>"; };
- E38E178F0D25F9FA00618676 /* VirtualPathDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VirtualPathDirectory.h; sourceTree = "<group>"; };
E38E17920D25F9FA00618676 /* zconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zconf.h; sourceTree = "<group>"; };
E38E17930D25F9FA00618676 /* ZipDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ZipDirectory.cpp; sourceTree = "<group>"; };
E38E17940D25F9FA00618676 /* ZipDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZipDirectory.h; sourceTree = "<group>"; };
@@ -5986,8 +5982,6 @@
E38E178B0D25F9FA00618676 /* VideoDatabaseDirectory.h */,
E38E178C0D25F9FA00618676 /* VirtualDirectory.cpp */,
E38E178D0D25F9FA00618676 /* VirtualDirectory.h */,
- E38E178E0D25F9FA00618676 /* VirtualPathDirectory.cpp */,
- E38E178F0D25F9FA00618676 /* VirtualPathDirectory.h */,
E49ACD8A100745C400A86ECD /* ZeroconfDirectory.h */,
E49ACD8B100745C400A86ECD /* ZeroconfDirectory.cpp */,
E38E17920D25F9FA00618676 /* zconf.h */,
@@ -7676,7 +7670,6 @@
E38E20720D25F9FD00618676 /* QueryParams.cpp in Sources */,
E38E20730D25F9FD00618676 /* VideoDatabaseDirectory.cpp in Sources */,
E38E20740D25F9FD00618676 /* VirtualDirectory.cpp in Sources */,
- E38E20750D25F9FD00618676 /* VirtualPathDirectory.cpp in Sources */,
E38E20770D25F9FD00618676 /* ZipDirectory.cpp in Sources */,
E38E20780D25F9FD00618676 /* ZipManager.cpp in Sources */,
E38E207B0D25F9FD00618676 /* GUIDialogBoxBase.cpp in Sources */,
@@ -8616,7 +8609,6 @@
F5A1C9A10F6B06CF00A96ABD /* QueryParams.cpp in Sources */,
F5A1C9A20F6B06CF00A96ABD /* VideoDatabaseDirectory.cpp in Sources */,
F5A1C9A30F6B06CF00A96ABD /* VirtualDirectory.cpp in Sources */,
- F5A1C9A40F6B06CF00A96ABD /* VirtualPathDirectory.cpp in Sources */,
F5A1C9A50F6B06CF00A96ABD /* ZipDirectory.cpp in Sources */,
F5A1C9A60F6B06CF00A96ABD /* ZipManager.cpp in Sources */,
F5A1C9A90F6B06CF00A96ABD /* GUIDialogBoxBase.cpp in Sources */,
View
4 addons/pvr.hts/resources/language/Dutch/strings.xml
@@ -9,4 +9,8 @@
<string id="30006">Verbinding timeout in seconden</string>
<string id="30007">Antwoord timeout in seconden</string>
<string id="30008">Toon een melding bij timer updates</string>
+
+ <!-- notifications -->
+ <string id="30500">Verbinding met '%s' verbroken</string>
+ <string id="30501">Verbinding met '%s' hersteld</string>
</strings>
View
4 addons/pvr.hts/resources/language/English/strings.xml
@@ -9,4 +9,8 @@
<string id="30006">Connect timeout in seconds</string>
<string id="30007">Response timeout in seconds</string>
<string id="30008">Display a notification on timer updates</string>
+
+ <!-- notifications -->
+ <string id="30500">Disconnected from '%s'</string>
+ <string id="30501">Reconnected to '%s'</string>
</strings>
View
9 addons/pvr.hts/resources/language/German/strings.xml
@@ -6,4 +6,13 @@
<string id="30002">HTSP Port</string>
<string id="30003">Benutzername</string>
<string id="30004">Passwort</string>
+
+ <string id="30006">Verbindungszeit Überschreitung in Sekunden</string>
+ <string id="30007">Antwortzeit Überschreitung in Sekunden</string>
+ <string id="30008">Zeige eine Benachrichtigung bei Timer Aktualisierungen</string>
+
+
+ <!-- notifications -->
+ <string id="30500">Getrennt von '%s'</string>
+ <string id="30501">Wiederverbunden mit '%s'</string>
</strings>
View
3 addons/pvr.vdr.vnsi/resources/language/English/strings.xml
@@ -45,4 +45,7 @@
<string id="30041">Finished</string>
<string id="30042">Channel search - Canceled</string>
<string id="30043">Channel search - Error</string>
+ <string id="30044">Lost connection to VDR Server</string>
+ <string id="30045">Connection to VDR Server restored</string>
+ <string id="30046">Create channel groups automatically on the server</string>
</strings>
View
2 addons/pvr.vdr.vnsi/resources/language/Finnish/strings.xml
@@ -45,4 +45,6 @@
<string id="30041">Valmis</string>
<string id="30042">Kanavahaku peruutettu</string>
<string id="30043">Kanavahaku virhe</string>
+ <string id="30044">Yhteys VDR-palvelimeen menetetty</string>
+ <string id="30045">Yhteys VDR-palvelimeen palautettu</string>
</strings>
View
3 addons/pvr.vdr.vnsi/resources/language/German/strings.xml
@@ -45,4 +45,7 @@
<string id="30041">Fertig</string>
<string id="30042">Kanalsuche - Abgebrochen</string>
<string id="30043">Kanalsuche - Fehler</string>
+ <string id="30044">Verbindung zum VDR Server unterbrochen</string>
+ <string id="30045">Verbindung zum VDR Server wiederhergestellt</string>
+ <string id="30046">Kanalgruppen automatisch am Server erzeugen</string>
</strings>
View
1 addons/pvr.vdr.vnsi/resources/settings.xml
@@ -6,4 +6,5 @@
<setting id="convertchar" type="bool" label="30003" default="true" />
<setting id="timeout" type="enum" label="30004" values="0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15" default="3"/>
<setting id="handlemessages" type="bool" label="30005" default="true" />
+ <setting id="autochannelgroups" type="bool" label="30046" default="false" />
</settings>
View
152 addons/skin.confluence/720p/DialogAddonInfo.xml
@@ -20,24 +20,30 @@
<texture border="40">DialogBack.png</texture>
</control>
<control type="image">
- <posx>260</posx>
- <posy>10</posy>
- <width>620</width>
- <height>578</height>
- <texture border="5">black-back2.png</texture>
+ <description>Dialog Header image</description>
+ <posx>40</posx>
+ <posy>16</posy>
+ <width>840</width>
+ <height>40</height>
+ <texture>dialogheader.png</texture>
</control>
- <control type="image">
- <posx>260</posx>
- <posy>10</posy>
- <width>610</width>
- <height>100</height>
- <aspectratio>stretch</aspectratio>
- <texture>GlassTitleBar.png</texture>
+ <control type="label">
+ <description>header label</description>
+ <posx>40</posx>
+ <posy>20</posy>
+ <width>840</width>
+ <height>30</height>
+ <font>font13_title</font>
+ <label>$LOCALIZE[24003]</label>
+ <align>center</align>
+ <aligny>center</aligny>
+ <textcolor>selected</textcolor>
+ <shadowcolor>black</shadowcolor>
</control>
<control type="button">
<description>Close Window button</description>
- <posx>810</posx>
- <posy>9</posy>
+ <posx>830</posx>
+ <posy>15</posy>
<width>64</width>
<height>32</height>
<label>-</label>
@@ -51,26 +57,15 @@
<ondown>3</ondown>
<visible>system.getbool(input.enablemouse)</visible>
</control>
- <control type="label">
- <description>header label</description>
- <posx>280</posx>
- <posy>20</posy>
- <width>580</width>
- <height>30</height>
- <font>font30_title</font>
- <label>24003</label>
- <align>left</align>
- <aligny>center</aligny>
- <textcolor>white</textcolor>
- <shadowcolor>black</shadowcolor>
- </control>
<control type="image">
- <posx>35</posx>
- <posy>40</posy>
- <width>200</width>
- <height>200</height>
+ <posx>30</posx>
+ <posy>70</posy>
+ <width>220</width>
+ <height>220</height>
<aspectratio>keep</aspectratio>
<texture>$INFO[ListItem.Icon]</texture>
+ <bordertexture border="8">ThumbShadow.png</bordertexture>
+ <bordersize>8</bordersize>
</control>
<control type="label">
<description>Addon Title value</description>
@@ -97,7 +92,7 @@
<label>$LOCALIZE[146]</label>
<align>right</align>
<aligny>center</aligny>
- <font>font13_title</font>
+ <font>font13</font>
<textcolor>blue</textcolor>
</control>
<control type="label">
@@ -121,7 +116,7 @@
<label>$LOCALIZE[21863]:</label>
<align>right</align>
<aligny>center</aligny>
- <font>font13_title</font>
+ <font>font13</font>
<textcolor>blue</textcolor>
</control>
<control type="label">
@@ -145,7 +140,7 @@
<label>$LOCALIZE[24051]</label>
<align>right</align>
<aligny>center</aligny>
- <font>font13_title</font>
+ <font>font13</font>
<textcolor>blue</textcolor>
</control>
<control type="label">
@@ -169,7 +164,7 @@
<label>$LOCALIZE[563]:</label>
<align>right</align>
<aligny>center</aligny>
- <font>font13_title</font>
+ <font>font13</font>
<textcolor>blue</textcolor>
</control>
<control type="image">
@@ -190,7 +185,7 @@
<label>$LOCALIZE[20037]:</label>
<align>right</align>
<aligny>center</aligny>
- <font>font13_title</font>
+ <font>font13</font>
<textcolor>blue</textcolor>
</control>
<control type="fadelabel">
@@ -229,7 +224,7 @@
<visible>!IsEmpty(ListItem.Property(Addon.Disclaimer))</visible>
<control type="label">
<description>Description Page Count</description>
- <posx>600</posx>
+ <posx>610</posx>
<posy>170</posy>
<width>300</width>
<height>25</height>
@@ -243,10 +238,10 @@
<description>Description</description>
<posx>10</posx>
<posy>195</posy>
- <width>580</width>
+ <width>600</width>
<height>160</height>
<font>font12</font>
- <align>-</align>
+ <align>justify</align>
<textcolor>white</textcolor>
<label>$INFO[ListItem.Property(Addon.Description)]</label>
<pagecontrol>60</pagecontrol>
@@ -282,10 +277,10 @@
<description>Disclaimer</description>
<posx>10</posx>
<posy>395</posy>
- <width>580</width>
+ <width>600</width>
<height>40</height>
<font>font12</font>
- <align>-</align>
+ <align>justify</align>
<textcolor>white</textcolor>
<label>$INFO[ListItem.Property(Addon.Disclaimer)]</label>
<autoscroll time="2000" delay="3000" repeat="5000">true</autoscroll>
@@ -295,7 +290,7 @@
<visible>IsEmpty(ListItem.Property(Addon.Disclaimer))</visible>
<control type="label">
<description>Description Page Count</description>
- <posx>600</posx>
+ <posx>610</posx>
<posy>170</posy>
<width>300</width>
<height>25</height>
@@ -309,10 +304,10 @@
<description>Description</description>
<posx>10</posx>
<posy>195</posy>
- <width>580</width>
+ <width>600</width>
<height>250</height>
<font>font12</font>
- <align>-</align>
+ <align>justify</align>
<textcolor>white</textcolor>
<label>$INFO[ListItem.Property(Addon.Description)]</label>
<pagecontrol>61</pagecontrol>
@@ -335,20 +330,17 @@
</control>
</control>
<control type="group" id="9000">
- <posx>10</posx>
- <posy>280</posy>
+ <posx>30</posx>
+ <posy>310</posy>
<control type="button" id ="6">
<description>Enable Addon button</description>
<posx>0</posx>
<posy>0</posy>
- <width>255</width>
- <height>51</height>
- <textoffsetx>20</textoffsetx>
+ <width>220</width>
+ <height>45</height>
<label>24022</label>
- <font>font13_title</font>
- <align>right</align>
- <texturenofocus border="5">MenuItemNF.png</texturenofocus>
- <texturefocus border="5">MenuItemFO.png</texturefocus>
+ <align>center</align>
+ <font>font12_title</font>
<onleft>60</onleft>
<onright>60</onright>
<onup>10</onup>
@@ -358,14 +350,11 @@
<description>Disable Addon button</description>
<posx>0</posx>
<posy>50</posy>
- <width>255</width>
- <height>51</height>
- <textoffsetx>20</textoffsetx>
+ <width>220</width>
+ <height>45</height>
<label>24021</label>
- <font>font13_title</font>
- <align>right</align>
- <texturenofocus border="5">MenuItemNF.png</texturenofocus>
- <texturefocus border="5">MenuItemFO.png</texturefocus>
+ <align>center</align>
+ <font>font12_title</font>
<onleft>60</onleft>
<onright>60</onright>
<onup>6</onup>
@@ -375,14 +364,11 @@
<description>Addon Settings</description>
<posx>0</posx>
<posy>100</posy>
- <width>255</width>
- <height>51</height>
- <textoffsetx>20</textoffsetx>
+ <width>220</width>
+ <height>45</height>
<label>24020</label>
- <font>font13_title</font>
- <align>right</align>
- <texturenofocus border="5">MenuItemNF.png</texturenofocus>
- <texturefocus border="5">MenuItemFO.png</texturefocus>
+ <align>center</align>
+ <font>font12_title</font>
<onleft>60</onleft>
<onright>60</onright>
<onup>7</onup>
@@ -392,14 +378,11 @@
<description>Update Addon button</description>
<posx>0</posx>
<posy>150</posy>
- <width>255</width>
- <height>51</height>
- <textoffsetx>20</textoffsetx>
+ <width>220</width>
+ <height>45</height>
<label>24069</label>
- <font>font13_title</font>
- <align>right</align>
- <texturenofocus border="5">MenuItemNF.png</texturenofocus>
- <texturefocus border="5">MenuItemFO.png</texturefocus>
+ <align>center</align>
+ <font>font12_title</font>
<onleft>60</onleft>
<onright>60</onright>
<onup>9</onup>
@@ -409,14 +392,11 @@
<description>Changelog button</description>
<posx>0</posx>
<posy>200</posy>
- <width>255</width>
- <height>51</height>
- <textoffsetx>20</textoffsetx>
+ <width>220</width>
+ <height>45</height>
<label>24036</label>
- <font>font13_title</font>
- <align>right</align>
- <texturenofocus border="5">MenuItemNF.png</texturenofocus>
- <texturefocus border="5">MenuItemFO.png</texturefocus>
+ <align>center</align>
+ <font>font12_title</font>
<onleft>60</onleft>
<onright>60</onright>
<onup>8</onup>
@@ -437,10 +417,10 @@
</control>
<control type="image">
<description>Icon image</description>
- <posx>18</posx>
- <posy>18</posy>
- <width>64</width>
- <height>64</height>
+ <posx>20</posx>
+ <posy>20</posy>
+ <width>60</width>
+ <height>60</height>
<texture>DefaultIconError.png</texture>
</control>
<control type="label">
@@ -449,7 +429,7 @@
<posy>15</posy>
<width>800</width>
<height>25</height>
- <font>font13_title</font>
+ <font>font12_title</font>
<label>24096</label>
<align>left</align>
<aligny>center</aligny>
View
175 addons/skin.confluence/720p/DialogAddonSettings.xml
@@ -2,111 +2,117 @@
<defaultcontrol always="true">9</defaultcontrol>
<coordinates>
<system>1</system>
- <posx>160</posx>
- <posy>55</posy>
+ <posx>240</posx>
+ <posy>60</posy>
</coordinates>
<include>dialogeffect</include>
<controls>
<control type="image">
<description>background image</description>
<posx>0</posx>
<posy>0</posy>
- <width>960</width>
- <height>610</height>
+ <width>800</width>
+ <height>600</height>
<texture border="40">DialogBack.png</texture>
+ <visible>![Window.IsVisible(FullscreenVideo) | Window.IsVisible(Visualisation)]</visible>
</control>
<control type="image">
- <description>LOGO</description>
- <posx>30</posx>
- <posy>15</posy>
- <width>220</width>
- <height>80</height>
- <aspectratio>keep</aspectratio>
- <texture>Confluence_Logo.png</texture>
- </control>
- <control type="image">
- <posx>268</posx>
- <posy>10</posy>
- <width>650</width>
- <height>588</height>
- <texture border="5">black-back2.png</texture>
- </control>
- <control type="image">
- <description>separator image</description>
- <posx>268</posx>
- <posy>538</posy>
- <width>650</width>
- <height>1</height>
- <texture>separator2.png</texture>
+ <description>background image</description>
+ <posx>0</posx>
+ <posy>0</posy>
+ <width>800</width>
+ <height>600</height>
+ <texture border="40">DialogBack2.png</texture>
+ <visible>Window.IsVisible(FullscreenVideo) | Window.IsVisible(Visualisation)</visible>
</control>
<control type="image">
- <posx>268</posx>
- <posy>10</posy>
- <width>634</width>
- <height>70</height>
- <aspectratio>stretch</aspectratio>
- <texture>GlassTitleBar.png</texture>
+ <description>Dialog Header image</description>
+ <posx>40</posx>
+ <posy>16</posy>
+ <width>720</width>
+ <height>40</height>
+ <texture>dialogheader.png</texture>
</control>
<control type="label" id="20">
<description>header label</description>
- <posx>300</posx>
+ <posx>40</posx>
<posy>20</posy>
- <width>640</width>
+ <width>720</width>
<height>30</height>
- <font>font16caps</font>
+ <font>font13_title</font>
<label>-</label>
- <align>left</align>
+ <align>center</align>
<aligny>center</aligny>
- <textcolor>white</textcolor>
+ <textcolor>selected</textcolor>
<shadowcolor>black</shadowcolor>
</control>
<control type="button">
<description>Close Window button</description>
- <posx>850</posx>
- <posy>9</posy>
+ <posx>710</posx>
+ <posy>15</posy>
<width>64</width>
<height>32</height>
<label>-</label>
<font>-</font>
<onclick>PreviousMenu</onclick>
<texturefocus>DialogCloseButton-focus.png</texturefocus>
<texturenofocus>DialogCloseButton.png</texturenofocus>
- <onleft>2</onleft>
- <onright>2</onright>
- <onup>2</onup>
- <ondown>2</ondown>
+ <onleft>3</onleft>
+ <onright>3</onright>
+ <onup>3</onup>
+ <ondown>3</ondown>
<visible>system.getbool(input.enablemouse)</visible>
</control>
<control type="grouplist" id="9">
<description>button area</description>
- <posx>10</posx>
- <posy>90</posy>
- <width>258</width>
- <height>481</height>
- <itemgap>-1</itemgap>
- <onleft>30</onleft>
- <onright>2</onright>
- <onup>9</onup>
- <ondown>9</ondown>
+ <posx>45</posx>
+ <posy>70</posy>
+ <width>710</width>
+ <height>40</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="image">
+ <description>Has Previous</description>
+ <posx>25</posx>
+ <posy>80</posy>
+ <width>20</width>
+ <height>20</height>
+ <texture>scroll-left-focus.png</texture>
+ <visible>Container(9).HasPrevious</visible>
+ </control>
+ <control type="image">
+ <description>Has Next</description>
+ <posx>755</posx>
+ <posy>80</posy>
+ <width>20</width>
+ <height>20</height>
+ <texture>scroll-right-focus.png</texture>
+ <visible>Container(9).HasNext</visible>
</control>
<control type="grouplist" id="2">
<description>control area</description>
- <posx>280</posx>
- <posy>70</posy>
- <width>630</width>
- <height>460</height>
- <itemgap>-1</itemgap>
+ <posx>40</posx>
+ <posy>120</posy>
+ <width>720</width>
+ <height>380</height>
+ <itemgap>5</itemgap>
<pagecontrol>30</pagecontrol>
- <onup>9001</onup>
+ <onup>9</onup>
<ondown>9001</ondown>
- <onleft>9</onleft>
+ <onleft>2</onleft>
<onright>30</onright>
</control>
<control type="scrollbar" id="30">
- <posx>920</posx>
- <posy>70</posy>
+ <posx>765</posx>
+ <posy>120</posy>
<width>25</width>
- <height>470</height>
+ <height>380</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>
@@ -118,8 +124,8 @@
<orientation>vertical</orientation>
</control>
<control type="group" id="9001">
- <posy>545</posy>
- <posx>280</posx>
+ <posy>535</posy>
+ <posx>90</posx>
<control type="button" id="10">
<description>OK Button</description>
<posx>0</posx>
@@ -128,14 +134,12 @@
<height>40</height>
<align>center</align>
<aligny>center</aligny>
- <texturenofocus border="5">MenuItemNF.png</texturenofocus>
- <texturefocus border="5">button-focus.png</texturefocus>
<font>font12_title</font>
<label>186</label>
<onleft>12</onleft>
<onright>11</onright>
<onup>2</onup>
- <ondown>2</ondown>
+ <ondown>9</ondown>
</control>
<control type="button" id="11">
<description>Cancel Button</description>
@@ -145,14 +149,12 @@
<height>40</height>
<align>center</align>
<aligny>center</aligny>
- <texturenofocus border="5">MenuItemNF.png</texturenofocus>
- <texturefocus border="5">button-focus.png</texturefocus>
<font>font12_title</font>
<label>222</label>
<onleft>10</onleft>
<onright>12</onright>
<onup>2</onup>
- <ondown>2</ondown>
+ <ondown>9</ondown>
</control>
<control type="button" id="12">
<description>Defaults Button</description>
@@ -162,29 +164,23 @@
<height>40</height>
<align>center</align>
<aligny>center</aligny>
- <texturenofocus border="5">MenuItemNF.png</texturenofocus>
- <texturefocus border="5">button-focus.png</texturefocus>
<font>font12_title</font>
<label>409</label>
<onleft>11</onleft>
<onright>10</onright>
<onup>2</onup>
- <ondown>2</ondown>
+ <ondown>9</ondown>
</control>
</control>
<control type="button" id="13">
<description>Default Category Button</description>
- <height>60</height>
- <width>258</width>
- <textoffsetx>20</textoffsetx>
- <align>right</align>
+ <height>40</height>
+ <width>173</width>
+ <align>center</align>
<aligny>center</aligny>
- <font>font13_title</font>
- <textcolor>grey2</textcolor>
- <focusedcolor>white</focusedcolor>
- <texturefocus border="5">MenuItemFO.png</texturefocus>
- <texturenofocus border="5">MenuItemNF.png</texturenofocus>
+ <font>font12_title</font>
+ <textcolor>white</textcolor>
<pulseonselect>false</pulseonselect>
</control>
<control type="button" id="3">
@@ -193,31 +189,29 @@
<font>font13</font>
<textcolor>grey2</textcolor>
<focusedcolor>white</focusedcolor>
- <texturefocus border="0,2,0,2">MenuItemFO.png</texturefocus>
- <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
+ <texturefocus border="5">button-focus2.png</texturefocus>
</control>
<control type="radiobutton" id="4">
<description>Default RadioButton</description>
<height>40</height>
<font>font13</font>
<textcolor>grey2</textcolor>
<focusedcolor>white</focusedcolor>
- <texturefocus border="0,2,0,2">MenuItemFO.png</texturefocus>
- <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
+ <texturefocus border="5">button-focus2.png</texturefocus>
</control>
<control type="spincontrolex" id="5">
<description>Default spincontrolex</description>
<height>40</height>
<textcolor>grey2</textcolor>
<focusedcolor>white</focusedcolor>
- <texturefocus border="0,2,0,2">MenuItemFO.png</texturefocus>
- <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
+ <texturenofocus border="5">button-nofocus.png</texturenofocus>
+ <texturefocus border="5">button-focus2.png</texturefocus>
<font>font13</font>
<aligny>center</aligny>
<reverse>yes</reverse>
</control>
<control type="label" id="7">
- <height>45</height>
+ <height>35</height>
<font>font13_title</font>
<label>-</label>
<textcolor>blue</textcolor>
@@ -236,8 +230,7 @@
<font>font13</font>
<textcolor>grey2</textcolor>
<focusedcolor>white</focusedcolor>
- <texturefocus border="0,2,0,2">MenuItemFO.png</texturefocus>
- <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
+ <texturefocus border="5">button-focus2.png</texturefocus>
</control>
</controls>
</window>
View
92 addons/skin.confluence/720p/DialogContentSettings.xml
@@ -18,41 +18,41 @@
<texture border="40">DialogBack.png</texture>
</control>
<control type="image">
- <posx>80</posx>
- <posy>10</posy>
- <width>640</width>
- <height>90</height>
- <aspectratio>stretch</aspectratio>
- <texture>GlassTitleBar.png</texture>
+ <description>Dialog Header image</description>
+ <posx>40</posx>
+ <posy>16</posy>
+ <width>720</width>
+ <height>40</height>
+ <texture>dialogheader.png</texture>
</control>
<control type="label" id="1">
<description>header label</description>
- <posx>20</posx>
- <posy>18</posy>
- <width>760</width>
+ <posx>40</posx>
+ <posy>20</posy>
+ <width>720</width>
<height>30</height>
<font>font13_title</font>
<label>$LOCALIZE[20333]</label>
<align>center</align>
<aligny>center</aligny>
- <textcolor>white</textcolor>
+ <textcolor>selected</textcolor>
<shadowcolor>black</shadowcolor>
</control>
<control type="button">
<description>Close Window button</description>
<posx>710</posx>
- <posy>9</posy>
+ <posy>15</posy>
<width>64</width>
<height>32</height>
<label>-</label>
<font>-</font>
<onclick>PreviousMenu</onclick>
<texturefocus>DialogCloseButton-focus.png</texturefocus>
<texturenofocus>DialogCloseButton.png</texturenofocus>
- <onleft>3</onleft>
- <onright>3</onright>
- <onup>3</onup>
- <ondown>3</ondown>
+ <onleft>10</onleft>
+ <onright>10</onright>
+ <onup>10</onup>
+ <ondown>10</ondown>
<visible>system.getbool(input.enablemouse)</visible>
</control>
<control type="label">
@@ -61,7 +61,7 @@
<posy>60</posy>
<width>320</width>
<height>40</height>
- <font>font12caps</font>
+ <font>font12</font>
<label>$LOCALIZE[20344]</label>
<align>center</align>
<aligny>center</aligny>
@@ -75,7 +75,7 @@
<width>320</width>
<height>40</height>
<texturefocus border="5">button-focus.png</texturefocus>
- <texturenofocus border="5">MenuItemNF.png</texturenofocus>
+ <texturenofocus border="5">button-nofocus.png</texturenofocus>
<font>-</font>
<label>-</label>
<reverse>yes</reverse>
@@ -103,7 +103,7 @@
<posy>150</posy>
<width>320</width>
<height>20</height>
- <font>font12caps</font>
+ <font>font12</font>
<label>$LOCALIZE[31312]</label>
<align>center</align>
<aligny>center</aligny>
@@ -144,9 +144,9 @@
<description>Scraper List Header</description>
<posx>400</posx>
<posy>60</posy>
- <width>370</width>
+ <width>360</width>
<height>40</height>
- <font>font12caps</font>
+ <font>font12</font>
<label>$LOCALIZE[31313]</label>
<align>center</align>
<aligny>center</aligny>
@@ -156,21 +156,21 @@
<control type="list" id="4">
<posx>400</posx>
<posy>100</posy>
- <width>340</width>
+ <width>360</width>
<height>241</height>
<onup>4</onup>
<onleft>3</onleft>
<onright>60</onright>
<ondown>4</ondown>
<pagecontrol>60</pagecontrol>
<scrolltime>200</scrolltime>
- <itemlayout height="40">
+ <itemlayout height="45">
<control type="image">
<posx>0</posx>
<posy>0</posy>
- <width>340</width>
- <height>41</height>
- <texture>MenuItemNF.png</texture>
+ <width>360</width>
+ <height>40</height>
+ <texture border="5">button-nofocus.png</texture>
</control>
<control type="image">
<posx>5</posx>
@@ -192,22 +192,22 @@
<info>ListItem.Label</info>
</control>
</itemlayout>
- <focusedlayout height="40">
+ <focusedlayout height="45">
<control type="image">
<posx>0</posx>
<posy>0</posy>
- <width>340</width>
- <height>41</height>
+ <width>360</width>
+ <height>40</height>
<visible>!Control.HasFocus(4)</visible>
- <texture>MenuItemNF.png</texture>
+ <texture border="5">button-nofocus.png</texture>
</control>
<control type="image">
<posx>0</posx>
<posy>0</posy>
- <width>340</width>
- <height>41</height>
+ <width>360</width>
+ <height>40</height>
<visible>Control.HasFocus(4)</visible>
- <texture>MenuItemFO.png</texture>
+ <texture border="5">button-focus2.png</texture>
</control>
<control type="image">
<posx>5</posx>
@@ -231,7 +231,7 @@
</focusedlayout>
</control>
<control type="scrollbar" id="60">
- <posx>745</posx>
+ <posx>760</posx>
<posy>100</posy>
<width>25</width>
<height>240</height>
@@ -242,16 +242,16 @@
<textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
<onleft>4</onleft>
<onright>3</onright>
- <showonepage>false</showonepage>
+ <showonepage>true</showonepage>
<orientation>vertical</orientation>
</control>
<control type="label">
<description>Scanning Options Header</description>
<posx>30</posx>
- <posy>355</posy>
+ <posy>350</posy>
<width>740</width>
- <height>30</height>
- <font>font12caps</font>
+ <height>20</height>
+ <font>font12</font>
<label>$LOCALIZE[31314]</label>
<align>center</align>
<aligny>center</aligny>
@@ -261,10 +261,10 @@
<control type="grouplist" id="5">
<description>control area</description>
<posx>30</posx>
- <posy>390</posy>
+ <posy>380</posy>
<width>740</width>
- <height>200</height>
- <itemgap>-1</itemgap>
+ <height>220</height>
+ <itemgap>4</itemgap>
<onup>3</onup>
<ondown>28</ondown>
<onleft>5</onleft>
@@ -276,17 +276,15 @@
<posy>0</posy>
<height>40</height>
<font>font13</font>
- <texturefocus>MenuItemFO.png</texturefocus>
- <texturenofocus>MenuItemNF.png</texturenofocus>
+ <texturefocus border="5">button-focus2.png</texturefocus>
</control>
<control type="radiobutton" id="8">
<description>Default RadioButton</description>
<posx>0</posx>
<posy>0</posy>
<height>40</height>
<font>font13</font>
- <texturefocus>MenuItemFO.png</texturefocus>
- <texturenofocus>MenuItemNF.png</texturenofocus>
+ <texturefocus border="5">button-focus2.png</texturefocus>
</control>
<control type="group" id="9001">
<posy>615</posy>
@@ -298,8 +296,6 @@
<height>40</height>
<align>center</align>
<aligny>center</aligny>
- <texturenofocus border="5">MenuItemNF.png</texturenofocus>
- <texturefocus border="5">button-focus.png</texturefocus>
<font>font12_title</font>
<label>186</label>
<onleft>6</onleft>
@@ -315,8 +311,6 @@
<height>40</height>
<align>center</align>
<aligny>center</aligny>
- <texturenofocus border="5">MenuItemNF.png</texturenofocus>
- <texturefocus border="5">button-focus.png</texturefocus>
<font>font12_title</font>
<label>222</label>
<onleft>28</onleft>
@@ -332,8 +326,6 @@
<height>40</height>
<align>center</align>
<aligny>center</aligny>
- <texturenofocus border="5">MenuItemNF.png</texturenofocus>
- <texturefocus border="5">button-focus.png</texturefocus>
<font>font12_title</font>
<label>5</label>
<onleft>29</onleft>
View
41 addons/skin.confluence/720p/DialogContextMenu.xml
@@ -10,61 +10,52 @@
<control type="image" id="997">
<description>background top image</description>
<posx>0</posx>
- <posy>-54</posy>
- <width>370</width>
- <height>54</height>
- <texture border="45,45,45,0">DialogContextTop.png</texture>
+ <posy>-30</posy>
+ <width>340</width>
+ <height>30</height>
+ <texture border="20,19,20,0">DialogContextTop.png</texture>
</control>
<control type="button">
<description>Close Window button</description>
<posx>260</posx>
- <posy>-24</posy>
+ <posy>-25</posy>
<width>64</width>
<height>32</height>
<label>-</label>
<font>-</font>
<onclick>PreviousMenu</onclick>
<texturefocus>DialogCloseButton-focus.png</texturefocus>
<texturenofocus>DialogCloseButton.png</texturenofocus>
- <onleft>1000</onleft>
- <onright>1000</onright>
- <onup>1000</onup>
- <ondown>1000</ondown>
- <visible>system.getbool(input.enablemouse)</visible>
- </control>
- <control type="image">
- <posx>34</posx>
- <posy>-6</posy>
- <width>297</width>
- <height>4</height>
- <texture>separator.png</texture>
+ <onleft>2</onleft>
+ <onright>2</onright>
+ <onup>2</onup>
+ <ondown>2</ondown>
</control>
<control type="image" id="999">
<description>background image</description>
<posx>0</posx>
<posy>0</posy>
- <width>370</width>
- <texture border="45,0,45,0">DialogContextMiddle.png</texture>
+ <width>340</width>
+ <texture border="20,0,20,0">DialogContextMiddle.png</texture>
</control>
<control type="image" id="998">
<description>background bottom image</description>
<posx>0</posx>
- <width>370</width>
- <height>50</height>
- <texture border="45,0,45,49">DialogContextBottom.png</texture>
+ <width>340</width>
+ <height>25</height>
+ <texture border="20,0,19,20">DialogContextBottom.png</texture>
</control>
<control type="button" id="1000">
<description>button template</description>
- <posx>34</posx>
+ <posx>20</posx>
<posy>-</posy>
- <width>297</width>
+ <width>300</width>
<height>38</height>
<font>fontContextMenu</font>
<align>center</align>
<textcolor>grey2</textcolor>
<focusedcolor>white</focusedcolor>
<texturefocus border="5">button-focus.png</texturefocus>
- <texturenofocus>-</texturenofocus>
</control>
</controls>
</window>
View
64 addons/skin.confluence/720p/DialogGamepad.xml
@@ -2,43 +2,61 @@
<defaultcontrol always="true">1</defaultcontrol>
<coordinates>
<system>1</system>
- <posx>340</posx>
+ <posx>335</posx>
<posy>235</posy>
</coordinates>
<include>dialogeffect</include>
<controls>
<control type="image">
<posx>0</posx>
<posy>0</posy>
- <width>600</width>
+ <width>610</width>
<height>230</height>
- <texture border="20">OverlayDialogBackground.png</texture>
+ <texture border="40">DialogBack.png</texture>
</control>
<control type="image">
- <posx>0</posx>
- <posy>0</posy>
- <width>600</width>
- <height>230</height>
- <texture border="20">OverlayDialogBackground.png</texture>
+ <description>Dialog Header image</description>
+ <posx>40</posx>
+ <posy>16</posy>
+ <width>530</width>
+ <height>40</height>
+ <texture>dialogheader.png</texture>
</control>
<control type="label" id="1">
<description>header label</description>
- <posx>20</posx>
- <posy>18</posy>
- <width>560</width>
+ <posx>40</posx>
+ <posy>20</posy>
+ <width>530</width>
<height>30</height>
<font>font13_title</font>
- <label>13406</label>
- <align>left</align>
+ <label>$LOCALIZE[13406]</label>
+ <align>center</align>
<aligny>center</aligny>
- <textcolor>white</textcolor>
+ <textcolor>selected</textcolor>
<shadowcolor>black</shadowcolor>
</control>
+ <control type="button">
+ <description>Close Window button</description>
+ <posx>520</posx>
+ <posy>15</posy>
+ <width>64</width>
+ <height>32</height>
+ <label>-</label>
+ <font>-</font>
+ <onclick>PreviousMenu</onclick>
+ <texturefocus>DialogCloseButton-focus.png</texturefocus>
+ <texturenofocus>DialogCloseButton.png</texturenofocus>
+ <onleft>10</onleft>
+ <onright>10</onright>
+ <onup>10</onup>
+ <ondown>10</ondown>
+ <visible>system.getbool(input.enablemouse)</visible>
+ </control>
<control type="label" id="2">
<description>dialog line 1</description>
- <posx>20</posx>
- <posy>60</posy>
- <width>560</width>
+ <posx>30</posx>
+ <posy>70</posy>
+ <width>550</width>
<height>30</height>
<align>left</align>
<aligny>center</aligny>
@@ -47,9 +65,9 @@
</control>
<control type="label" id="3">
<description>dialog line 2</description>
- <posx>20</posx>
- <posy>85</posy>
- <width>560</width>
+ <posx>30</posx>
+ <posy>95</posy>
+ <width>550</width>
<height>30</height>
<align>left</align>
<aligny>center</aligny>
@@ -58,9 +76,9 @@
</control>
<control type="label" id="4">
<description>dialog line 3</description>
- <posx>20</posx>
- <posy>120</posy>
- <width>560</width>
+ <posx>30</posx>
+ <posy>130</posy>
+ <width>550</width>
<height>30</height>
<align>left</align>
<aligny>center</aligny>
View
55 addons/skin.confluence/720p/DialogKaraokeSongSelectorLarge.xml
@@ -3,46 +3,71 @@
<coordinates>
<system>1</system>
<posx>415</posx>
- <posy>225</posy>
+ <posy>275</posy>
</coordinates>
<controls>
<control type="group">
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>450</width>
- <height>150</height>
- <texture border="20">OverlayDialogBackground.png</texture>
+ <height>170</height>
+ <texture border="40">DialogBack.png</texture>
+ </control>
+ <control type="image">
+ <description>Dialog Header image</description>
+ <posx>40</posx>
+ <posy>16</posy>
+ <width>370</width>
+ <height>40</height>
+ <texture>dialogheader.png</texture>
</control>
<control type="label" id="1">
<description>header label</description>
- <posx>20</posx>
- <posy>18</posy>
- <width>410</width>
+ <posx>40</posx>
+ <posy>20</posy>
+ <width>370</width>
<height>30</height>
<font>font13_title</font>
- <label>31321</label>
+ <label>$LOCALIZE[31321]</label>
<align>center</align>
<aligny>center</aligny>
- <textcolor>white</textcolor>
+ <textcolor>selected</textcolor>
<shadowcolor>black</shadowcolor>
</control>
+ <control type="button">
+ <description>Close Window button</description>
+ <posx>360</posx>
+ <posy>15</posy>
+ <width>64</width>
+ <height>32</height>
+ <label>-</label>
+ <font>-</font>
+ <onclick>PreviousMenu</onclick>
+ <texturefocus>DialogCloseButton-focus.png</texturefocus>
+ <texturenofocus>DialogCloseButton.png</texturenofocus>
+ <onleft>10</onleft>
+ <onright>10</onright>
+ <onup>10</onup>
+ <ondown>10</ondown>
+ <visible>system.getbool(input.enablemouse)</visible>
+ </control>
<control type="label" id="401">
<description>Song Number Label</description>
- <posx>20</posx>
- <posy>65</posy>
- <width>410</width>
+ <posx>30</posx>
+ <posy>70</posy>
+ <width>390</width>
<height>30</height>
<font>font28_title</font>
- <textcolor>selected</textcolor>
+ <textcolor>white</textcolor>
<align>center</align>
<aligny>center</aligny>
</control>
<control type="label" id="402">
<description>Song Name Label</description>
- <posx>20</posx>
- <posy>105</posy>
- <width>410</width>
+ <posx>30</posx>
+ <posy>120</posy>
+ <width>390</width>
<height>20</height>
<font>font24</font>
<align>center</align>
View
51 addons/skin.confluence/720p/DialogKeyboard.xml
@@ -18,17 +18,29 @@
<texture border="40">DialogBack.png</texture>
</control>
<control type="image">
- <posx>80</posx>
- <posy>10</posy>
- <width>600</width>
- <height>70</height>
- <aspectratio>stretch</aspectratio>
- <texture>GlassTitleBar.png</texture>
+ <description>Dialog Header image</description>
+ <posx>40</posx>
+ <posy>16</posy>
+ <width>680</width>
+ <height>40</height>
+ <texture>dialogheader.png</texture>
+ </control>
+ <control type="label" id="311">
+ <description>header label</description>
+ <posx>40</posx>
+ <posy>20</posy>
+ <width>720</width>
+ <height>30</height>
+ <font>font13_title</font>
+ <align>center</align>
+ <aligny>center</aligny>
+ <textcolor>selected</textcolor>
+ <shadowcolor>black</shadowcolor>
</control>
<control type="button">
<description>Close Window button</description>
<posx>670</posx>
- <posy>9</posy>
+ <posy>15</posy>
<width>64</width>
<height>32</height>
<label>-</label>
@@ -66,32 +78,11 @@
<width>500</width>
<height>30</height>
<aspectratio>stretch</aspectratio>
- <texture>GlassTitleBar.png</texture>
- </control>
- <control type="image">
- <posx>80</posx>
- <posy>380</posy>
- <width>600</width>
- <height>40</height>
- <aspectratio>stretch</aspectratio>
- <colordiffuse>AAFFFFFF</colordiffuse>
- <texture flipy="true">GlassTitleBar.png</texture>
- </control>
- <control type="label" id="311">
- <description>dialog Heading</description>
- <posx>10</posx>
- <posy>20</posy>
- <width>740</width>
- <height>30</height>
- <font>font13_title</font>
- <textcolor>white</textcolor>
- <shadowcolor>black</shadowcolor>
- <align>center</align>
- <aligny>center</aligny>
+ <texture>DialogHeader.png</texture>
</control>
<control type="group">
<posx>30</posx>
- <posy>135</posy>
+ <posy>140</posy>
<control type="button" id="300">
<description>DONE button</description>
<posx>0</posx>
View
141 addons/skin.confluence/720p/DialogMediaSource.xml
@@ -16,17 +16,30 @@
<texture border="40">DialogBack.png</texture>
</control>
<control type="image">
- <posx>80</posx>
- <posy>10</posy>
- <width>640</width>
- <height>90</height>
- <aspectratio>stretch</aspectratio>
- <texture>GlassTitleBar.png</texture>
+ <description>Dialog Header image</description>
+ <posx>40</posx>
+ <posy>16</posy>
+ <width>720</width>
+ <height>40</height>
+ <texture>dialogheader.png</texture>
+ </control>
+ <control type="label" id="2">
+ <description>header label</description>
+ <posx>40</posx>
+ <posy>20</posy>
+ <width>720</width>
+ <height>30</height>
+ <font>font13_title</font>
+ <label>$LOCALIZE[13406]</label>
+ <align>center</align>
+ <aligny>center</aligny>
+ <textcolor>selected</textcolor>
+ <shadowcolor>black</shadowcolor>
</control>
<control type="button">
<description>Close Window button</description>
<posx>710</posx>
- <posy>9</posy>
+ <posy>15</posy>
<width>64</width>
<height>32</height>
<label>-</label>
@@ -40,50 +53,37 @@
<ondown>10</ondown>
<visible>system.getbool(input.enablemouse)</visible>
</control>
- <control type="label" id="2">
- <description>header label</description>
- <posx>20</posx>
- <posy>18</posy>
- <width>760</width>
- <height>30</height>
- <font>font13_title</font>
- <label>$LOCALIZE[13406]</label>
- <align>center</align>
- <aligny>center</aligny>
- <textcolor>white</textcolor>
- <shadowcolor>black</shadowcolor>
- </control>
<control type="label">
<description>path label</description>
<posx>20</posx>
- <posy>60</posy>
+ <posy>65</posy>
<width>760</width>
<height>30</height>
<align>center</align>
<aligny>center</aligny>
- <font>font12caps</font>
+ <font>font12</font>
<label>1021</label>
<textcolor>blue</textcolor>
<shadowcolor>black</shadowcolor>
</control>
<control type="list" id="10">
<posx>30</posx>
<posy>105</posy>
- <width>500</width>
- <height>201</height>
+ <width>525</width>
+ <height>225</height>
<onup>9001</onup>
<onleft>9000</onleft>
<onright>60</onright>
<ondown>12</ondown>
<pagecontrol>60</pagecontrol>
<scrolltime>200</scrolltime>
- <itemlayout height="40">
+ <itemlayout height="45">
<control type="image">
<posx>0</posx>
<posy>0</posy>
- <width>500</width>
- <height>41</height>
- <texture>MenuItemNF.png</texture>
+ <width>525</width>
+ <height>40</height>
+ <texture border="5">button-nofocus.png</texture>
</control>
<control type="label">
<posx>10</posx>
@@ -98,22 +98,22 @@
<info>ListItem.Label</info>
</control>
</itemlayout>
- <focusedlayout height="40">
+ <focusedlayout height="45">
<control type="image">
<posx>0</posx>
<posy>0</posy>
- <width>500</width>
- <height>41</height>
+ <width>525</width>
+ <height>40</height>
<visible>!Control.HasFocus(10)</visible>
- <texture>MenuItemNF.png</texture>
+ <texture border="5">button-nofocus.png</texture>
</control>
<control type="image">
<posx>0</posx>
<posy>0</posy>
- <width>500</width>
+ <width>525</width>
<height>41</height>
<visible>Control.HasFocus(10)</visible>
- <texture>MenuItemFO.png</texture>
+ <texture border="5">button-focus2.png</texture>
</control>
<control type="label">
<posx>10</posx>
@@ -132,7 +132,7 @@
<posx>555</posx>
<posy>105</posy>
<width>25</width>
- <height>200</height>
+ <height>225</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>
@@ -150,13 +150,13 @@
<description>Browse Button</description>
<posx>0</posx>
<posy>0</posy>
- <width>200</width>
- <height>41</height>
+ <width>190</width>
+ <height>40</height>
<label>1024</label>
<font>font12_title</font>
<align>center</align>
<aligny>center</aligny>
- <texturenofocus border="5">MenuItemNF.png</texturenofocus>
+ <texturenofocus border="5">button-nofocus.png</texturenofocus>
<texturefocus border="5">button-focus.png</texturefocus>
<onup>18</onup>
<onleft>60</onleft>
@@ -166,14 +166,14 @@
<control type="button" id="13">
<description>Add Path Button</description>
<posx>0</posx>
- <posy>40</posy>
- <width>200</width>
- <height>41</height>
+ <posy>45</posy>
+ <width>190</width>
+ <height>40</height>
<label>15019</label>
<font>font12_title</font>
<align>center</align>
<aligny>center</aligny>
- <texturenofocus border="5">MenuItemNF.png</texturenofocus>
+ <texturenofocus border="5">button-nofocus.png</texturenofocus>
<texturefocus border="5">button-focus.png</texturefocus>
<onup>11</onup>
<onleft>60</onleft>
@@ -183,14 +183,14 @@
<control type="button" id="14">
<description>Remove Path Button</description>
<posx>0</posx>
- <posy>80</posy>
- <width>200</width>
- <height>41</height>
+ <posy>90</posy>
+ <width>190</width>
+ <height>40</height>
<label>1210</label>
<font>font12_title</font>
<align>center</align>
<aligny>center</aligny>
- <texturenofocus border="5">MenuItemNF.png</texturenofocus>
+ <texturenofocus border="5">button-nofocus.png</texturenofocus>
<texturefocus border="5">button-focus.png</texturefocus>
<onup>13</onup>
<onleft>60</onleft>
@@ -200,85 +200,68 @@
</control>
<control type="label">
<description>Name label</description>
- <posx>20</posx>
+ <posx>30</posx>
<posy>335</posy>
- <width>760</width>
+ <width>740</width>
<height>30</height>
<align>center</align>
<aligny>center</aligny>
- <font>font12caps</font>
+ <font>font12</font>
<label>1022</label>
<textcolor>blue</textcolor>
<shadowcolor>black</shadowcolor>
</control>
<control type="button" id="12">
<description>Name Button</description>
- <posx>20</posx>
+ <posx>30</posx>
<posy>370</posy>
- <width>760</width>
+ <width>740</width>
<height>40</height>
<align>center</align>
<aligny>center</aligny>
<label>-</label>
<font>font13</font>
- <texturefocus>MenuItemFO.png</texturefocus>
- <texturenofocus>MenuItemNF.png</texturenofocus>
+ <texturefocus border="5">button-focus2.png</texturefocus>
+ <texturenofocus border="5">button-nofocus.png</texturenofocus>
<onup>10</onup>
<onleft>12</onleft>
<onright>19</onright>
<ondown>9001</ondown>
</control>
<control type="group" id="9001">
+ <posx>190</posx>
+ <posy>435</posy>
<control type="button" id="18">
<description>Ok Button</description>
- <posx>300</posx>
- <posy>435</posy>
+ <posx>0</posx>
+ <posy>0</posy>
<width>200</width>
<height>40</height>
<align>center</align>
<aligny>center</aligny>
- <texturenofocus border="5">MenuItemNF.png</texturenofocus>
+ <texturenofocus border="5">button-nofocus.png</texturenofocus>
<texturefocus border="5">button-focus.png</texturefocus>
<label>186</label>
<font>font12_title</font>
<onup>12</onup>
- <onleft>20</onleft>
+ <onleft>19</onleft>
<onright>19</onright>
<ondown>10</ondown>
- <animation effect="slide" start="0,0" end="-102,0" time="0" condition="!Control.IsVisible(20)">Conditional</animation>
</control>
<control type="button" id="19">
<description>Cancel Button</description>
- <posx>510</posx>
- <posy>435</posy>
+ <posx>210</posx>
+ <posy>0</posy>
<width>200</width>
<height>40</height>
<align>center</align>
<aligny>center</aligny>
- <texturenofocus border="5">MenuItemNF.png</texturenofocus>
+ <texturenofocus border="5">button-nofocus.png</texturenofocus>
<texturefocus border="5">button-focus.png</texturefocus>
<label>222</label>
<font>font12_title</font>
<onup>12</onup>
<onleft>18</onleft>
- <onright>20</onright>
- <ondown>10</ondown>