Skip to content

Commit

Permalink
turn feedback off by default and fix setting reading
Browse files Browse the repository at this point in the history
  • Loading branch information
mkalten committed Jun 26, 2017
1 parent 771ef84 commit 7dffd7f
Show file tree
Hide file tree
Showing 11 changed files with 13 additions and 10 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

*.user

*.pdb

obj

/bin/Debug/**
/bin/Debug/**
2 changes: 1 addition & 1 deletion App.config
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<value>3333</value>
</setting>
<setting name="TouchFeedback" serializeAs="String">
<value>True</value>
<value>False</value>
</setting>
</TouchInjector.Properties.Settings>
</userSettings>
Expand Down
2 changes: 1 addition & 1 deletion MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions MainWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("TouchInjector")]
[assembly: AssemblyCopyright("Copyright © 2012")]
[assembly: AssemblyCopyright("Copyright © 2017")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
2 changes: 1 addition & 1 deletion Properties/Settings.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Properties/Settings.settings
Original file line number Diff line number Diff line change
Expand Up @@ -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>
4 changes: 3 additions & 1 deletion TouchInjector.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
Binary file modified bin/Release/TouchInjector.exe
Binary file not shown.
2 changes: 1 addition & 1 deletion bin/Release/TouchInjector.exe.config
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<value>3333</value>
</setting>
<setting name="TouchFeedback" serializeAs="String">
<value>True</value>
<value>False</value>
</setting>
</TouchInjector.Properties.Settings>
</userSettings>
Expand Down
Binary file removed bin/Release/TouchInjector.pdb
Binary file not shown.

0 comments on commit 7dffd7f

Please sign in to comment.