diff --git a/TV Player WPF/Assets/AppStyle.xaml b/TV Player WPF/Assets/AppStyle.xaml index a0d588f..93e8f3a 100644 --- a/TV Player WPF/Assets/AppStyle.xaml +++ b/TV Player WPF/Assets/AppStyle.xaml @@ -15,7 +15,7 @@ - программ + @@ -101,9 +101,9 @@ c-0.781-0.781-0.788-2.047-0.007-2.828L51.438,14.43c1.754-1.755,1.753-4.61-0.001- - + - + diff --git a/TV Player WPF/Assets/en-US.xaml b/TV Player WPF/Assets/en-US.xaml new file mode 100644 index 0000000..128794a --- /dev/null +++ b/TV Player WPF/Assets/en-US.xaml @@ -0,0 +1,12 @@ + + + Settings + Fullscreen + Remember last seen programm + Add new playlist + Playlist URL + Playlist name + programs + \ No newline at end of file diff --git a/TV Player WPF/PlaylistWorker/M3UParser.cs b/TV Player WPF/PlaylistWorker/M3UParser.cs index 030d9b0..23018f1 100644 --- a/TV Player WPF/PlaylistWorker/M3UParser.cs +++ b/TV Player WPF/PlaylistWorker/M3UParser.cs @@ -103,7 +103,7 @@ namespace TV_Player } } - public static async Task ParseEpg(string channelId) + public static async Task ParseEpg(string groupName, string channelId) { XmlReaderSettings settings = new XmlReaderSettings(); settings.IgnoreWhitespace = true; @@ -112,9 +112,9 @@ namespace TV_Player settings.Async = true; ProgramGuide channel = null; - var fileName = "guide.xml"; + var fileName = groupName+"_guide.xml"; string programDataPath = Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData); - string filePath = Path.Combine(programDataPath, "TV_Player", fileName); + string filePath = Path.Combine(programDataPath, "TVPlayer", fileName); using (XmlReader reader = XmlReader.Create(filePath, settings)) { diff --git a/TV Player WPF/Settings.xaml b/TV Player WPF/Settings.xaml index 628f3fa..cdf0cb5 100644 --- a/TV Player WPF/Settings.xaml +++ b/TV Player WPF/Settings.xaml @@ -6,6 +6,7 @@ mc:Ignorable="d"> +