From 75c42afbbc46d813f55a66a99da46fcac6a30f94 Mon Sep 17 00:00:00 2001 From: Kjell Kernen Date: Sat, 15 Mar 2014 22:26:39 +0100 Subject: [PATCH] Splash screen added to OpenTX Speaker --- speaker/MainWindow.xaml.cs | 13 +++++++++---- speaker/OpenTXspeak.csproj | 3 +++ speaker/aboutWindow.xaml | 6 +++--- speaker/speaker_logo.png | Bin 0 -> 16597 bytes speaker/speaker_logo.xcf | Bin 0 -> 180560 bytes 5 files changed, 15 insertions(+), 7 deletions(-) create mode 100644 speaker/speaker_logo.png create mode 100644 speaker/speaker_logo.xcf diff --git a/speaker/MainWindow.xaml.cs b/speaker/MainWindow.xaml.cs index b727f1d31..a2b824208 100644 --- a/speaker/MainWindow.xaml.cs +++ b/speaker/MainWindow.xaml.cs @@ -3,6 +3,7 @@ using System.IO; using System.Collections.Generic; using System.Linq; using System.Text; +using System.Threading; using System.Windows; using System.Windows.Controls; using System.Windows.Data; @@ -28,7 +29,12 @@ namespace OpenTXspeak public MainWindow() { + SplashScreen splash = new SplashScreen("speaker_logo.png"); + splash.Show(true); + Thread.Sleep(1500); + InitializeComponent(); + lvSentences.ItemsSource = sentences; cbLanguages.ItemsSource = languages; @@ -189,14 +195,14 @@ namespace OpenTXspeak public Sentence(string rawString) { string[] words = rawString.Split(';'); - fileName = words[0]; + fileName = words[0].TrimStart(' ', '\"'); description = words[1]; - voiceString = words[2]; + voiceString = words[2].TrimEnd('\"', ',', ' '); } public string toRaw() { - return fileName + ";" + description + ";" + voiceString; + return "\"" +fileName + ";" + description + ";" + voiceString + "\","; } } @@ -204,7 +210,6 @@ namespace OpenTXspeak { public void Add(string rawString) { - string[] words = rawString.Split(';'); this.Add(new Sentence(rawString)); } } diff --git a/speaker/OpenTXspeak.csproj b/speaker/OpenTXspeak.csproj index 8884787b1..90f9b1ccf 100644 --- a/speaker/OpenTXspeak.csproj +++ b/speaker/OpenTXspeak.csproj @@ -116,6 +116,9 @@ + + +