Finalize for first version

zokker13 · May 24, 2017 · 4ac7ffb · 4ac7ffb
1 parent c30f512
commit 4ac7ffb
Show file tree

Hide file tree

Showing 10 changed files with 81 additions and 94 deletions.
diff --git a/RatherWeird/DirtyInvocation/DirtyInvocation.csproj b/RatherWeird/DirtyInvocation/DirtyInvocation.csproj
@@ -11,6 +11,7 @@
     <AssemblyName>DirtyInvocation</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/RatherWeird/RatherWeird/App.config b/RatherWeird/RatherWeird/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
     </startup>
-</configuration>
+</configuration>
diff --git a/RatherWeird/RatherWeird/MainWindow.xaml b/RatherWeird/RatherWeird/MainWindow.xaml
@@ -5,29 +5,36 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:RatherWeird"
         mc:Ignorable="d"
-        Title="MainWindow" Height="350" Width="525" Loaded="Window_Loaded" Closed="Window_Closed">
-    <Grid Loaded="Grid_Loaded">
-        <GroupBox x:Name="gpWindowBehavior" Header="Window Behavior" HorizontalAlignment="Left" Height="138" Margin="10,10,0,0" VerticalAlignment="Top" Width="170">
+        Title="MainWindow" Height="197" Width="534" Loaded="Window_Loaded" Closed="Window_Closed" ResizeMode="NoResize">
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition/>
+        </Grid.ColumnDefinitions>
+        <GroupBox x:Name="gpWindowBehavior" Header="Window Behavior" HorizontalAlignment="Left" Margin="10,10,0,0" Width="170" Height="138" VerticalAlignment="Top">
             <Grid Margin="0,0,-2,-12">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="Auto"/>
                 </Grid.RowDefinitions>
                 <CheckBox x:Name="chInvokeAltUp" Content="Invoke ALT UP" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" Click="chInvokeAltUp_Click"/>
-                <CheckBox x:Name="chLockCursor" Content="Lock Cursor" HorizontalAlignment="Left" Margin="10,35,0,0" VerticalAlignment="Top" Click="chLockCursor_Click"/>
-                <CheckBox x:Name="chLaunchRa3Windowed" Content="Launch RA3 in Window" HorizontalAlignment="Left" Margin="10,58,0,0" VerticalAlignment="Top" Click="chLaunchRa3Windowed_Click"/>
-                <CheckBox x:Name="chRemoveBorders" Content="Remove Borders" HorizontalAlignment="Left" Margin="10,79,0,-19" VerticalAlignment="Top" Click="chRemoveBorders_Click"/>
+                <CheckBox x:Name="chLockCursor" Content="Lock Cursor" HorizontalAlignment="Left" Margin="10,31,0,0" VerticalAlignment="Top" Click="chLockCursor_Click"/>
+                <CheckBox x:Name="chLaunchRa3Windowed" Content="Launch RA3 in Window" HorizontalAlignment="Left" Margin="10,52,0,0" VerticalAlignment="Top" Click="chLaunchRa3Windowed_Click"/>
+                <CheckBox x:Name="chRemoveBorders" Content="Remove Borders" HorizontalAlignment="Left" Margin="10,73,0,-5" VerticalAlignment="Top" Click="chRemoveBorders_Click"/>
             </Grid>
         </GroupBox>
-        <GroupBox Header="Launch RA3" HorizontalAlignment="Left" Height="138" Margin="185,10,0,0" VerticalAlignment="Top" Width="322">
+        <GroupBox Header="Launch RA3" Margin="185,10,0,0" Height="138" VerticalAlignment="Top" HorizontalAlignment="Left" Width="322">
             <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition/>
+                </Grid.ColumnDefinitions>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="Auto"/>
                     <RowDefinition Height="*"/>
                     <RowDefinition Height="*"/>
                 </Grid.RowDefinitions>
                 <CheckBox x:Name="chRefreshPathToRa3" Content="Refresh Path to RA3 automatically" HorizontalAlignment="Left" VerticalAlignment="Top" Click="chRefreshPathToRa3_Click" Margin="10,10,0,0"/>
-                <TextBox x:Name="txtRa3Path" HorizontalAlignment="Left" Height="23" Margin="10,15,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="290" TextChanged="txtRa3Path_TextChanged" IsEnabled="False" Grid.Row="1"/>
-                <Button x:Name="btnLaunchRa3" Content="Launch RA3" HorizontalAlignment="Left" Margin="10,1,0,0" VerticalAlignment="Top" Width="97" Cursor="" Height="34" Click="btnLaunchRa3_Click" Grid.Row="2"/>
+                <TextBox x:Name="txtRa3Path" HorizontalAlignment="Left" Height="23" Margin="10,9,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="290" TextChanged="txtRa3Path_TextChanged" IsEnabled="False" Grid.Row="1"/>
+                <Button x:Name="btnLaunchRa3" Content="Launch RA3" HorizontalAlignment="Left" Margin="10,1,0,0" Width="97" Cursor="" Click="btnLaunchRa3_Click" Grid.Row="2" Height="34" VerticalAlignment="Top"/>
+                <Label x:Name="lblVersion" Content="Version: 0.1.0" Margin="0,10,10,0" Grid.Row="2" IsEnabled="False" Height="26" VerticalAlignment="Top" HorizontalAlignment="Right" Width="80"/>
             </Grid>
         </GroupBox>
     </Grid>

diff --git a/RatherWeird/RatherWeird/MainWindow.xaml.cs b/RatherWeird/RatherWeird/MainWindow.xaml.cs
@@ -32,19 +32,7 @@ public partial class MainWindow : Window
 
         public MainWindow()
         {
-            InitializeComponent();
-
-
-        }
-
-        private void Grid_Loaded(object sender, RoutedEventArgs e)
-        {
-            _foregroundWatcher.HookForeground();
-            _keyboardWatcher.HookKeyboard();
-
-            _foregroundWatcher.ForegroundChanged += ForegroundWatcher_ForegroundChanged;
-
-            SetupControls();
+            InitializeComponent();   
         }
 
         private void ForegroundWatcher_ForegroundChanged(object sender, ForegroundArgs e)
@@ -92,6 +80,12 @@ private void chInvokeAltUp_Click(object sender, RoutedEventArgs e)
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
             settings = Preferences.Load();
+            SetupControls();
+
+            _foregroundWatcher.HookForeground();
+            _keyboardWatcher.HookKeyboard();
+
+            _foregroundWatcher.ForegroundChanged += ForegroundWatcher_ForegroundChanged;
         }
 
         private void Window_Closed(object sender, EventArgs e)
@@ -123,23 +117,9 @@ private bool CheckFileExistence(string fileToCheck)
         {
             try
             {
-                using (FileStream fs = new FileStream(fileToCheck, FileMode.CreateNew, FileAccess.Write,
-                    FileShare.None, bufferSize: 4096, useAsync: true))
-                {
-
-                }
-
-                // Nothing thrown.. File was created..
-                File.Delete(fileToCheck);
-
-                return false;
+                return File.Exists(fileToCheck);
             }
-            catch (System.IO.IOException ex)
-            {
-                // Assuming the file already exists..
-                return true;
-            }
-            catch (Exception ex)
+            catch (Exception)
             {
                 return false;
             }

diff --git a/RatherWeird/RatherWeird/Preferences.cs b/RatherWeird/RatherWeird/Preferences.cs
@@ -35,11 +35,11 @@ public static bool Write(SettingEntries settings)
 
                 result = true;
             }
-            catch (IOException ex)
+            catch (IOException)
             {
                 // TODO log or whatever
             }
-            catch (Exception ex)
+            catch (Exception)
             {
                 // TODO: Same 
             }

diff --git a/RatherWeird/RatherWeird/Properties/Resources.Designer.cs b/RatherWeird/RatherWeird/Properties/Resources.Designer.cs
diff --git a/RatherWeird/RatherWeird/Properties/Settings.Designer.cs b/RatherWeird/RatherWeird/Properties/Settings.Designer.cs
diff --git a/RatherWeird/RatherWeird/RatherWeird.csproj b/RatherWeird/RatherWeird/RatherWeird.csproj
@@ -13,6 +13,7 @@
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -23,6 +24,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -32,6 +34,11 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>
+    </ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -105,5 +112,8 @@
       <Name>WindowHook</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="hentie.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/RatherWeird/WindowHook/KeyboardWatcher.cs b/RatherWeird/WindowHook/KeyboardWatcher.cs
@@ -3,7 +3,6 @@
 using System.Diagnostics;
 using System.Diagnostics.Eventing.Reader;
 using System.Linq;
-using System.Net.Http.Headers;
 using System.Text;
 using System.Threading.Tasks;
 using System.Runtime.InteropServices;

diff --git a/RatherWeird/WindowHook/WindowHook.csproj b/RatherWeird/WindowHook/WindowHook.csproj
@@ -11,6 +11,7 @@
     <AssemblyName>WindowHook</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -20,6 +21,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -28,6 +30,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -36,7 +39,6 @@
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>