Merge pull request #23 from Terence-D/combobox

made the target a combobox - can add default values in now
Terence-D · Feb 21, 2019 · 95f03da · 95f03da
2 parents 7f20e09 + ce3982d
commit 95f03da
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/GameInputCommandSystem/GameInputCommandSystem.csproj b/GameInputCommandSystem/GameInputCommandSystem.csproj
@@ -26,7 +26,7 @@
     <MapFileExtensions>true</MapFileExtensions>
     <AutorunEnabled>true</AutorunEnabled>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.3.0.%2a</ApplicationVersion>
+    <ApplicationVersion>1.4.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>

diff --git a/GameInputCommandSystem/Properties/AssemblyInfo.cs b/GameInputCommandSystem/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // 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.3.0.0")]
-[assembly: AssemblyFileVersion("1.3.0.0")]
+[assembly: AssemblyVersion("1.4.0.0")]
+[assembly: AssemblyFileVersion("1.4.0.0")]
diff --git a/GameInputCommandSystem/Views/MainWindow.xaml b/GameInputCommandSystem/Views/MainWindow.xaml
@@ -16,7 +16,7 @@
         <Label Content="Password&#xD;&#xA;" HorizontalAlignment="Left" Margin="10,41,0,0" VerticalAlignment="Top" Width="72" Height="26"/>
         <PasswordBox x:Name="txtPassword" HorizontalAlignment="Left" Height="23" Margin="1,45,0,0" PasswordChar="*" VerticalAlignment="Top" Width="120" Grid.Column="1"/>
         <Label Content="Target" HorizontalAlignment="Left" Margin="10,72,0,0" VerticalAlignment="Top" RenderTransformOrigin="-0.907,-2.615" Height="26" Width="43"/>
-        <TextBox x:Name="txtTarget" HorizontalAlignment="Left" Height="23" Margin="1,75,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="120" Grid.Column="1"/>
+        <ComboBox x:Name="txtTarget" HorizontalAlignment="Left" Height="23" Margin="1,75,0,0" VerticalAlignment="Top" Width="120" Grid.Column="1" IsEditable="True"/>
         <Button x:Name="btnStart" Content="Start" Margin="10,103,33,0" Click="btnStart_Click" Height="22" VerticalAlignment="Top"/>
         <Button Content="About" Grid.Column="1" HorizontalAlignment="Left" Margin="39,104,0,0" VerticalAlignment="Top" Width="75" Click="Button_Click"/>
 

diff --git a/GameInputCommandSystem/Views/MainWindow.xaml.cs b/GameInputCommandSystem/Views/MainWindow.xaml.cs
@@ -55,7 +55,10 @@ private void btnStart_Click(object sender, RoutedEventArgs e)
 
         private void LoadSettings()
         {
+            txtTarget.Items.Add("Star Citizen");
             txtTarget.Text = Properties.Settings.Default.target;
+            if (txtTarget.Text == "")
+                txtTarget.Text = "Star Citizen";
             if (Properties.Settings.Default.password.Length > 5)
                 txtPassword.Password = CryptoHelper.Decrypt(Properties.Settings.Default.password);
             int port = Properties.Settings.Default.port;