turn feedback off by default and fix setting reading

michaelosthege · Jun 26, 2017 · 7dffd7f · 7dffd7f
1 parent 771ef84
commit 7dffd7f
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,8 @@
 
 *.user
 
+*.pdb
+
 obj
 
-/bin/Debug/**
+/bin/Debug/**
diff --git a/App.config b/App.config
@@ -14,7 +14,7 @@
                 <value>3333</value>
             </setting>
             <setting name="TouchFeedback" serializeAs="String">
-                <value>True</value>
+                <value>False</value>
             </setting>
         </TouchInjector.Properties.Settings>
     </userSettings>

diff --git a/MainWindow.xaml b/MainWindow.xaml
@@ -40,7 +40,7 @@
                 <Label Grid.Row="0" FontWeight="Normal" x:Name="touchInjectionStatus" HorizontalAlignment="Right" />
                 <Label Grid.Row="1" FontWeight="Normal" Content="Targeted screen" HorizontalAlignment="Left" Margin="0" />
                 <ComboBox x:Name="screenSelector" Grid.Row="1" Margin="0" HorizontalAlignment="Right" FontWeight="Normal" Width="Auto" MinWidth="100" HorizontalContentAlignment="Right" SelectionChanged="screenSelector_SelectionChanged"/>
-                <CheckBox x:Name="feedbackCheckBox" Margin="5" Grid.Row="2" FontWeight="Normal" Content="show Feedback" IsChecked="True" ToolTip="enable/disable touch feedback" Checked="feedbackCheckBox_Changed" Unchecked="feedbackCheckBox_Changed"/>
+                <CheckBox x:Name="feedbackCheckBox" Margin="5" Grid.Row="2" FontWeight="Normal" Content="show Feedback" IsChecked="False" ToolTip="enable/disable touch feedback" Checked="feedbackCheckBox_Changed" Unchecked="feedbackCheckBox_Changed"/>
             </Grid>
 
         </GroupBox>

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
@@ -19,8 +19,7 @@ public partial class MainWindow : Window
         //TODO: in the app.manifest (in the Properties folder), the uiaccess-variable is set to true. In theory this should be the basis to the ability to send touch events 
         //to applications running under the secure desktop (such as the Universal Access Control aka. UAC). According to an MSDN article, UIAccess-applications need to be certified
         //however, I was unable to get it working using a self-signed (and self-trusted) certificate.
-        //If anyone succeeds in enabling UIAccess, please contact Martin Kaltenbrunner via https://github.com/mkalten/TouchInjector, or Michael Osthege via [email protected]
-
+        //If anyone succeeds in enabling UIAccess, please contact Michael Osthege via [email protected]
 
         #region Backend Variables
         TuioChannel channel;

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -12,7 +12,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("TouchInjector")]
-[assembly: AssemblyCopyright("Copyright ©  2012")]
+[assembly: AssemblyCopyright("Copyright ©  2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/Properties/Settings.Designer.cs b/Properties/Settings.Designer.cs
diff --git a/Properties/Settings.settings b/Properties/Settings.settings
@@ -6,7 +6,7 @@
       <Value Profile="(Default)">3333</Value>
     </Setting>
     <Setting Name="TouchFeedback" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">True</Value>
+      <Value Profile="(Default)">False</Value>
     </Setting>
   </Settings>
 </SettingsFile>
diff --git a/TouchInjector.csproj b/TouchInjector.csproj
@@ -158,7 +158,9 @@
     <AppDesigner Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config" />
+    <None Include="App.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\iconGray.ico" />

diff --git a/bin/Release/TouchInjector.exe b/bin/Release/TouchInjector.exe
diff --git a/bin/Release/TouchInjector.exe.config b/bin/Release/TouchInjector.exe.config
@@ -14,7 +14,7 @@
                 <value>3333</value>
             </setting>
             <setting name="TouchFeedback" serializeAs="String">
-                <value>True</value>
+                <value>False</value>
             </setting>
         </TouchInjector.Properties.Settings>
     </userSettings>

diff --git a/bin/Release/TouchInjector.pdb b/bin/Release/TouchInjector.pdb
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,8 @@ @@
     *.user
+    *.pdb
     obj
-    /bin/Debug/**
+    /bin/Debug/**