From 78ed248fda6a3993c6ff456b05ba1a96ef2d7634 Mon Sep 17 00:00:00 2001
From: Kjell Kernen <github@kernen.se>
Date: Mon, 17 Mar 2014 01:34:35 +0100
Subject: [PATCH] Added GPL information

---
 speaker/App.xaml.cs                | 18 ++++++++++++-
 speaker/MainWindow.xaml            | 11 ++++----
 speaker/MainWindow.xaml.cs         | 18 ++++++++++++-
 speaker/Properties/AssemblyInfo.cs | 28 +++++++++++++++-----
 speaker/aboutWindow.xaml           | 41 ++++++++++++++++++------------
 speaker/aboutWindow.xaml.cs        | 20 ++++++++++++---
 speaker/installvoices.xaml.cs      | 18 ++++++++++++-
 speaker/sentencetables.cs          | 18 ++++++++++++-
 8 files changed, 137 insertions(+), 35 deletions(-)

diff --git a/speaker/App.xaml.cs b/speaker/App.xaml.cs
index b6053db6e..431106446 100644
--- a/speaker/App.xaml.cs
+++ b/speaker/App.xaml.cs
@@ -1,4 +1,20 @@
-using System;
+/* This file is part of OpenTX Speaker.
+ * OpenTX Speaker is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * OpenTX Speaker is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with Foobar.  If not, see <http://www.gnu.org/licenses/>. 
+ *
+ * Copyright 2014 Kjell Kernen  */
+
+using System;
 using System.Collections.Generic;
 using System.Configuration;
 using System.Data;
diff --git a/speaker/MainWindow.xaml b/speaker/MainWindow.xaml
index 4de79c307..9ed94b625 100644
--- a/speaker/MainWindow.xaml
+++ b/speaker/MainWindow.xaml
@@ -2,10 +2,10 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         Title="OpenTX Speaker" 
-        Height="480" 
+        Height="460" 
         MinWidth="840"
         MaxWidth="840"
-        ResizeMode="CanResizeWithGrip" MinHeight="480">
+        ResizeMode="CanResizeWithGrip" MinHeight="460" SizeToContent="Width">
 
     <Grid VerticalAlignment="Stretch" >
         <Grid.ColumnDefinitions>
@@ -17,8 +17,7 @@
             <ListView Name="lvSentences" 
                       SelectionMode="Single" 
                       MouseDoubleClick="lvSentences_MouseDoubleClick" 
-                      VerticalAlignment="Stretch" 
-                      Margin="0, 0, 0, 10">
+                      VerticalAlignment="Stretch" >
                 <ListView.View>
                     <GridView>
                         <GridView.Columns>
@@ -112,8 +111,8 @@
             </StackPanel>
             <Button Content="Generate Voice Files" Name="buttonGenerate" Click="buttonSaveFiles_Click" Margin="10,10,10,0" />
             <Separator Height="5" />
-            <StackPanel Width="Auto" Orientation="Vertical">
-                <TextBlock FontSize="18" VerticalAlignment="Center" MouseLeftButtonDown="InstallVoices_MouseLeftButtonDown" Cursor="Hand" HorizontalAlignment="Right" Margin="0,0,10,0">Install Voices</TextBlock>
+            <StackPanel Width="Auto" Orientation="Horizontal">
+                <TextBlock FontSize="18" VerticalAlignment="Center" MouseLeftButtonDown="InstallVoices_MouseLeftButtonDown" Cursor="Hand" HorizontalAlignment="Center" Margin="20,5,20,0" TextWrapping="Wrap" Height="48" Width="59" IsHyphenationEnabled="True">Install Voices</TextBlock>
                 <Image Name="openTXLogo" Height="48" Source="/OpenTXspeak;component/speaker_logo.png" MouseLeftButtonDown="openTXLogo_MouseLeftButtonDown" HorizontalAlignment="Right" Cursor="Hand" Margin="0,5,10,0"/>
             </StackPanel>
         </StackPanel>
diff --git a/speaker/MainWindow.xaml.cs b/speaker/MainWindow.xaml.cs
index a2b824208..b49d98b81 100644
--- a/speaker/MainWindow.xaml.cs
+++ b/speaker/MainWindow.xaml.cs
@@ -1,4 +1,20 @@
-using System;
+/* This file is part of OpenTX Speaker.
+ * OpenTX Speaker is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * OpenTX Speaker is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with Foobar.  If not, see <http://www.gnu.org/licenses/>. 
+ *
+ * Copyright 2014 Kjell Kernen  */
+
+using System;
 using System.IO;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/speaker/Properties/AssemblyInfo.cs b/speaker/Properties/AssemblyInfo.cs
index d08c67a89..e9e95b723 100644
--- a/speaker/Properties/AssemblyInfo.cs
+++ b/speaker/Properties/AssemblyInfo.cs
@@ -1,4 +1,20 @@
-using System.Reflection;
+/* This file is part of OpenTX Speaker.
+* OpenTX Speaker is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+
+* OpenTX Speaker is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+
+* You should have received a copy of the GNU General Public License
+* along with Foobar.  If not, see <http://www.gnu.org/licenses/>. 
+*
+* Copyright 2014 Kjell Kernen  */
+
+using System.Reflection;
 using System.Resources;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
@@ -8,11 +24,11 @@ using System.Windows;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("OpenTX Speaker")]
-[assembly: AssemblyDescription("This application is used to edit OpenTX voice strings and generate audio files for use in the FrSky Taranis radio.")]
+[assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Kjell Kernen")]
+[assembly: AssemblyCompany("OpenTX Team")]
 [assembly: AssemblyProduct("OpenTX Speaker")]
-[assembly: AssemblyCopyright("Copyright © The OpenTX Team 2014")]
+[assembly: AssemblyCopyright("Copyright © Kjell Kernen 2014")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -51,5 +67,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1")]
-[assembly: AssemblyFileVersion("1.1")]
+[assembly: AssemblyVersion("1.2")]
+[assembly: AssemblyFileVersion("1.2")]
diff --git a/speaker/aboutWindow.xaml b/speaker/aboutWindow.xaml
index 4cde3ce00..fda15c602 100644
--- a/speaker/aboutWindow.xaml
+++ b/speaker/aboutWindow.xaml
@@ -1,27 +1,36 @@
 <Window x:Class="OpenTXspeak.AboutWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="OpenTX About Window" Height="241" Width="330" Icon="/OpenTXspeak;component/icon.ico" Background="Gray">
+        Title="OpenTX About Window" Height="354" Width="357" Icon="/OpenTXspeak;component/icon.ico">
     <Grid>
         <StackPanel>
             <StackPanel Orientation="Horizontal">
-                <Label Content="Product:" Foreground="White">
-                </Label>
-                <Label Content="Product Name" Name="lblProductName"  Foreground="White"/>
-            </StackPanel>
-            <StackPanel Orientation="Horizontal">
-                <Label Content="Version:" Foreground="White"/>
-                <Label Content="Version" Name="lblVersion"  Foreground="White"/>
-            </StackPanel>
-            <StackPanel Orientation="Horizontal">
-                <Label Content="Author:"  Foreground="White"/>
-                <Label Content="Author:" Name="lblCompanyName"  Foreground="White"/>
-            </StackPanel>
-            <Label Content="Copyright" Name="lblCopyright"  Foreground="White"/>
-            <StackPanel Orientation="Horizontal">
-                <TextBlock Text="TextBlock" Name="description" Height="88" Margin="5,5,10,0" TextWrapping="Wrap" Width="200"  Foreground="White"/>
+                <StackPanel Orientation="Vertical">
+                    <StackPanel Orientation="Horizontal" Width="240" HorizontalAlignment="Left">
+                        <Label Content="Product:">
+                        </Label>
+                        <Label Content="Product Name" Name="lblProductName"/>
+                    </StackPanel>
+                    <StackPanel Orientation="Horizontal"  HorizontalAlignment="Left">
+                        <Label Content="Version:"/>
+                        <Label Content="Version" Name="lblVersion"/>
+                    </StackPanel>
+                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                        <Label Content="Company:" />
+                        <Label Content="Company" Name="lblCompanyName"/>
+                    </StackPanel>
+                    <Label Content="Copyright" Name="lblCopyright" HorizontalAlignment="Left" />
+                </StackPanel>
                 <Image Source="/OpenTXspeak;component/icon.ico" Stretch="Uniform" Height="90" Width="90" />
             </StackPanel>
+            <StackPanel Orientation="Vertical">
+                <TextBlock Margin="5,5,0,0" TextWrapping="Wrap"
+                    Text="This application is used to edit OpenTX voice strings and generate audio files for use in the FrSky Taranis radio." />
+                <TextBlock Margin="5,10,0,0" TextWrapping="Wrap"
+                    Text= "This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or any later version." />
+                <TextBlock Margin="5,5,0,0" TextWrapping="Wrap"
+                    Text= "This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details." />
+            </StackPanel>
         </StackPanel>
     </Grid>
 </Window>
diff --git a/speaker/aboutWindow.xaml.cs b/speaker/aboutWindow.xaml.cs
index a7597e2c7..01deac64b 100644
--- a/speaker/aboutWindow.xaml.cs
+++ b/speaker/aboutWindow.xaml.cs
@@ -1,4 +1,20 @@
-using System;
+/* This file is part of OpenTX Speaker.
+ * OpenTX Speaker is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * OpenTX Speaker is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with Foobar.  If not, see <http://www.gnu.org/licenses/>. 
+ *
+ * Copyright 2014 Kjell Kernen  */
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
@@ -25,7 +41,6 @@ namespace OpenTXspeak
             AssemblyProductAttribute product = (AssemblyProductAttribute)app.GetCustomAttributes(typeof(AssemblyProductAttribute), false)[0];
             AssemblyCopyrightAttribute copyright = (AssemblyCopyrightAttribute)app.GetCustomAttributes(typeof(AssemblyCopyrightAttribute), false)[0];
             AssemblyCompanyAttribute company = (AssemblyCompanyAttribute)app.GetCustomAttributes(typeof(AssemblyCompanyAttribute), false)[0];
-            AssemblyDescriptionAttribute description = (AssemblyDescriptionAttribute)app.GetCustomAttributes(typeof(AssemblyDescriptionAttribute), false)[0];
             Version version = app.GetName().Version;
            
             this.Title = String.Format("About {0}", title.Title);
@@ -33,7 +48,6 @@ namespace OpenTXspeak
             this.lblVersion.Content = String.Format("Version {0}", version.ToString());
             this.lblCopyright.Content = copyright.Copyright.ToString();
             this.lblCompanyName.Content = company.Company;
-            this.description.Text = description.Description;
         }
     }
 }
diff --git a/speaker/installvoices.xaml.cs b/speaker/installvoices.xaml.cs
index 7f06f9057..04f8d1024 100644
--- a/speaker/installvoices.xaml.cs
+++ b/speaker/installvoices.xaml.cs
@@ -1,4 +1,20 @@
-using System;
+/* This file is part of OpenTX Speaker.
+ * OpenTX Speaker is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * OpenTX Speaker is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with Foobar.  If not, see <http://www.gnu.org/licenses/>. 
+ *
+ * Copyright 2014 Kjell Kernen  */
+
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
diff --git a/speaker/sentencetables.cs b/speaker/sentencetables.cs
index 011564658..196a1b190 100644
--- a/speaker/sentencetables.cs
+++ b/speaker/sentencetables.cs
@@ -1,4 +1,20 @@
-using System;
+/* This file is part of OpenTX Speaker.
+ * OpenTX Speaker is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * OpenTX Speaker is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with Foobar.  If not, see <http://www.gnu.org/licenses/>. 
+ *
+ * Copyright 2014 Kjell Kernen  */
+
+using System;
 using System.Collections.Generic;
 using System.Configuration;
 using System.Data;