Permalink
Browse files

Merge pull request #3552 from jmarshallnz/SubsCore

Move subtitle addon core handling to core.
  • Loading branch information...
amet committed Nov 12, 2013
2 parents 65844f8 + ef87af6 commit 8dc1825fe3eec64f162120670861c36d4ecb25cf
Showing with 1,044 additions and 53 deletions.
  1. +10 −0 XBMC.xcodeproj/project.pbxproj
  2. +415 −0 addons/skin.confluence/720p/DialogSubtitles.xml
  3. +0 −34 addons/skin.confluence/720p/SkinSettings.xml
  4. +2 −6 addons/skin.confluence/720p/VideoOSD.xml
  5. +6 −4 addons/skin.confluence/language/English/strings.po
  6. BIN addons/skin.confluence/media/Subtitles/flags/-.gif
  7. BIN addons/skin.confluence/media/Subtitles/flags/ar.gif
  8. BIN addons/skin.confluence/media/Subtitles/flags/bg.gif
  9. BIN addons/skin.confluence/media/Subtitles/flags/bs.gif
  10. BIN addons/skin.confluence/media/Subtitles/flags/ca.gif
  11. BIN addons/skin.confluence/media/Subtitles/flags/cs.gif
  12. BIN addons/skin.confluence/media/Subtitles/flags/da.gif
  13. BIN addons/skin.confluence/media/Subtitles/flags/de.gif
  14. BIN addons/skin.confluence/media/Subtitles/flags/el.gif
  15. BIN addons/skin.confluence/media/Subtitles/flags/en.gif
  16. BIN addons/skin.confluence/media/Subtitles/flags/es.gif
  17. BIN addons/skin.confluence/media/Subtitles/flags/et.gif
  18. BIN addons/skin.confluence/media/Subtitles/flags/fa.gif
  19. BIN addons/skin.confluence/media/Subtitles/flags/fi.gif
  20. BIN addons/skin.confluence/media/Subtitles/flags/fo.gif
  21. BIN addons/skin.confluence/media/Subtitles/flags/fr.gif
  22. BIN addons/skin.confluence/media/Subtitles/flags/gl.gif
  23. BIN addons/skin.confluence/media/Subtitles/flags/he.gif
  24. BIN addons/skin.confluence/media/Subtitles/flags/hi.gif
  25. BIN addons/skin.confluence/media/Subtitles/flags/hr.gif
  26. BIN addons/skin.confluence/media/Subtitles/flags/hu.gif
  27. BIN addons/skin.confluence/media/Subtitles/flags/hy.gif
  28. BIN addons/skin.confluence/media/Subtitles/flags/id.gif
  29. BIN addons/skin.confluence/media/Subtitles/flags/is.gif
  30. BIN addons/skin.confluence/media/Subtitles/flags/it.gif
  31. BIN addons/skin.confluence/media/Subtitles/flags/ja.gif
  32. BIN addons/skin.confluence/media/Subtitles/flags/kk.gif
  33. BIN addons/skin.confluence/media/Subtitles/flags/ko.gif
  34. BIN addons/skin.confluence/media/Subtitles/flags/lb.gif
  35. BIN addons/skin.confluence/media/Subtitles/flags/lt.gif
  36. BIN addons/skin.confluence/media/Subtitles/flags/lv.gif
  37. BIN addons/skin.confluence/media/Subtitles/flags/mk.gif
  38. BIN addons/skin.confluence/media/Subtitles/flags/ms.gif
  39. BIN addons/skin.confluence/media/Subtitles/flags/nl.gif
  40. BIN addons/skin.confluence/media/Subtitles/flags/no.gif
  41. BIN addons/skin.confluence/media/Subtitles/flags/pb.gif
  42. BIN addons/skin.confluence/media/Subtitles/flags/pl.gif
  43. BIN addons/skin.confluence/media/Subtitles/flags/pt.gif
  44. BIN addons/skin.confluence/media/Subtitles/flags/ro.gif
  45. BIN addons/skin.confluence/media/Subtitles/flags/ru.gif
  46. BIN addons/skin.confluence/media/Subtitles/flags/sk.gif
  47. BIN addons/skin.confluence/media/Subtitles/flags/sl.gif
  48. BIN addons/skin.confluence/media/Subtitles/flags/sq.gif
  49. BIN addons/skin.confluence/media/Subtitles/flags/sr.gif
  50. BIN addons/skin.confluence/media/Subtitles/flags/sv.gif
  51. BIN addons/skin.confluence/media/Subtitles/flags/tr.gif
  52. BIN addons/skin.confluence/media/Subtitles/flags/uk.gif
  53. BIN addons/skin.confluence/media/Subtitles/flags/vi.gif
  54. BIN addons/skin.confluence/media/Subtitles/flags/zh.gif
  55. BIN addons/skin.confluence/media/Subtitles/icon_close_caption.png
  56. BIN addons/skin.confluence/media/Subtitles/icon_sync.png
  57. +56 −1 language/English/strings.po
  58. +2 −0 project/VS2010Express/XBMC.vcxproj
  59. +6 −0 project/VS2010Express/XBMC.vcxproj.filters
  60. +23 −0 system/settings/settings.xml
  61. +3 −0 xbmc/Application.cpp
  62. +3 −3 xbmc/addons/Addon.cpp
  63. +2 −2 xbmc/addons/AddonManager.cpp
  64. +1 −1 xbmc/addons/IAddon.h
  65. +1 −1 xbmc/filesystem/AddonsDirectory.cpp
  66. +1 −1 xbmc/filesystem/AddonsDirectory.h
  67. +1 −0 xbmc/guilib/WindowIDs.h
  68. +1 −0 xbmc/input/ButtonTranslator.cpp
  69. +443 −0 xbmc/video/dialogs/GUIDialogSubtitles.cpp
  70. +67 −0 xbmc/video/dialogs/GUIDialogSubtitles.h
  71. +1 −0 xbmc/video/dialogs/Makefile
@@ -268,6 +268,9 @@
7C4458BD161E203800A905F6 /* Screenshot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C4458BB161E203800A905F6 /* Screenshot.cpp */; };
7C45DBE910F325C400D4BBF3 /* DAVDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C45DBE710F325C400D4BBF3 /* DAVDirectory.cpp */; };
7C4705AE12EF584C00369E51 /* AddonInstaller.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C4705AC12EF584C00369E51 /* AddonInstaller.cpp */; };
+ 7C4E6F721829AA9700F1068F /* GUIDialogSubtitles.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C4E6F701829AA9700F1068F /* GUIDialogSubtitles.cpp */; };
+ 7C4E6F731829AA9700F1068F /* GUIDialogSubtitles.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C4E6F701829AA9700F1068F /* GUIDialogSubtitles.cpp */; };
+ 7C4E6F741829AA9700F1068F /* GUIDialogSubtitles.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C4E6F701829AA9700F1068F /* GUIDialogSubtitles.cpp */; };
7C5608C70F1754930056433A /* ExternalPlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C5608C40F1754930056433A /* ExternalPlayer.cpp */; };
7C62F24210505BC7002AD2C1 /* Bookmark.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C62F24010505BC7002AD2C1 /* Bookmark.cpp */; };
7C62F45E1057A62D002AD2C1 /* DirectoryNodeSingles.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C62F45C1057A62D002AD2C1 /* DirectoryNodeSingles.cpp */; };
@@ -3733,6 +3736,8 @@
7C45DBE810F325C400D4BBF3 /* DAVDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DAVDirectory.h; sourceTree = "<group>"; };
7C4705AC12EF584C00369E51 /* AddonInstaller.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AddonInstaller.cpp; sourceTree = "<group>"; };
7C4705AD12EF584C00369E51 /* AddonInstaller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddonInstaller.h; sourceTree = "<group>"; };
+ 7C4E6F701829AA9700F1068F /* GUIDialogSubtitles.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogSubtitles.cpp; sourceTree = "<group>"; };
+ 7C4E6F711829AA9700F1068F /* GUIDialogSubtitles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogSubtitles.h; sourceTree = "<group>"; };
7C5608C40F1754930056433A /* ExternalPlayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ExternalPlayer.cpp; sourceTree = "<group>"; };
7C5608C50F1754930056433A /* ExternalPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExternalPlayer.h; sourceTree = "<group>"; };
7C62F24010505BC7002AD2C1 /* Bookmark.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Bookmark.cpp; sourceTree = "<group>"; };
@@ -6581,6 +6586,8 @@
E38E17AB0D25F9FA00618676 /* GUIDialogFileStacking.h */,
886328150E07B37200BB3DAB /* GUIDialogFullScreenInfo.cpp */,
886328160E07B37200BB3DAB /* GUIDialogFullScreenInfo.h */,
+ 7C4E6F701829AA9700F1068F /* GUIDialogSubtitles.cpp */,
+ 7C4E6F711829AA9700F1068F /* GUIDialogSubtitles.h */,
F5E55B65107412DE006E788A /* GUIDialogTeletext.cpp */,
F5E55B64107412DE006E788A /* GUIDialogTeletext.h */,
E38E17E00D25F9FA00618676 /* GUIDialogVideoBookmarks.cpp */,
@@ -10717,6 +10724,7 @@
7C7BCDC517727951004842FB /* IListProvider.cpp in Sources */,
7C7BCDC717727951004842FB /* StaticProvider.cpp in Sources */,
7C8FC6EE1829A4580045153D /* DirectoryProvider.cpp in Sources */,
+ 7C4E6F721829AA9700F1068F /* GUIDialogSubtitles.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -11757,6 +11765,7 @@
7C7BCDCB17727951004842FB /* IListProvider.cpp in Sources */,
7C7BCDCD17727952004842FB /* StaticProvider.cpp in Sources */,
7C8FC6F01829A4580045153D /* DirectoryProvider.cpp in Sources */,
+ 7C4E6F741829AA9700F1068F /* GUIDialogSubtitles.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -12799,6 +12808,7 @@
7C7BCDC817727951004842FB /* IListProvider.cpp in Sources */,
7C7BCDCA17727951004842FB /* StaticProvider.cpp in Sources */,
7C8FC6EF1829A4580045153D /* DirectoryProvider.cpp in Sources */,
+ 7C4E6F731829AA9700F1068F /* GUIDialogSubtitles.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Oops, something went wrong.

0 comments on commit 8dc1825

Please sign in to comment.