Merge pull request #8 from Snoothy/develop

UCR v0.3.1

README.md

@@ -1,31 +1,45 @@
+<img src="icon.png" align="right" />
+
 # Universal Control Remapper
-[![GitHub release](https://img.shields.io/badge/release-v0.3.0-blue.svg)](https://github.com/Snoothy/UCR/releases/tag/v0.3.0) [![IOWrapper version](https://img.shields.io/badge/IOWrapper-v0.5.1-blue.svg)](https://github.com/evilC/IOWrapper) [![license](https://img.shields.io/github/license/snoothy/ucr.svg)](https://github.com/Snoothy/UCR/blob/master/LICENSE) [![Github All Releases](https://img.shields.io/github/downloads/snoothy/ucr/total.svg)](https://github.com/Snoothy/UCR/releases)
+[![GitHub release](https://img.shields.io/badge/release-v0.3.1-blue.svg)](https://github.com/Snoothy/UCR/releases/tag/v0.3.0) [![IOWrapper version](https://img.shields.io/badge/IOWrapper-v0.5.4-blue.svg)](https://github.com/evilC/IOWrapper) [![license](https://img.shields.io/github/license/snoothy/ucr.svg)](https://github.com/Snoothy/UCR/blob/master/LICENSE) [![Github All Releases](https://img.shields.io/github/downloads/snoothy/ucr/total.svg)](https://github.com/Snoothy/UCR/releases)
 
 Universal Control Remapper is a complete rewrite of the original [UCR](https://github.com/evilC/UCR), created in collaboration with [evilC](https://github.com/evilC/).
 
-Universal Control Remapper is a Windows application which allows the end-user to remap any inputs from devices, such as keyboards, mice, joysticks, racing wheels, eyetrackers, etc. to virtual output devices. Remapping is achieved by transforming inputs through plugins to a desired output device.
+Universal Control Remapper is a Windows application which allows the end-user to remap any inputs from devices, such as keyboards, mice, joysticks, racing wheels, eye trackers, etc. to virtual output devices. Remapping is achieved by transforming inputs through plugins to a desired output device.
+
+
 
 ## Table of Contents ##
 
 - [Downloads](#downloads)
 - [Documentation](#documentation)
+- [Support / Discussion / Feedback](#support--discussion--feedback)
 - [Features](#features)
 - [Device support](#device-support)
 - [License](#license)
 
+
+
 ## Downloads ##
 
 The latest release of the Universal Control Remapper can be [downloaded from GitHub](https://github.com/snoothy/ucr/releases).
 
+
+
 ## Documentation ##
 
 Documentation for Universal Control Remapper are hosted on GitHub at [https://github.com/snoothy/ucr/wiki](https://github.com/snoothy/ucr/wiki).
 
+
+
 ## Support / Discussion / Feedback
 
-Please **do not** use the UCR thread on the AutoHotkey forums. Either raise an issue on the [issue tracker](issues) or join us in the [HidWizards chat channel on Discord](https://discord.gg/MmnhQYQ)
+Please **do not** use the UCR thread on the AutoHotkey forums. Either raise an issue on the [issue tracker](https://github.com/Snoothy/UCR/issues) or join us in the [HidWizards chat channel on Discord](https://discord.gg/MmnhQYQ)
+
+
 
 ## Features ##
+
 - Remap any number of inputs to any number of outputs on emulated output devices, with full analog support
 - Profiles and nesting allows for easy configuration 
 - Endless remapping potential through plugin extension support
@@ -35,6 +49,8 @@ Please **do not** use the UCR thread on the AutoHotkey forums. Either raise an i
 - Remap your own, or unsupported, input/output devices through extension support for device providers
 - Uses no injection making it compatible with games using anti-tampering technologies, such as Denuvo
 
+
+
 ## Device support ##
 
 UCR supports input and output devices through plugins using the [IOWrapper](https://github.com/evilC/IOWrapper) backend. UCR is released with standard plugins but can be extended with third party plugins to add additional device support.
@@ -55,6 +71,8 @@ UCR supports input and output devices through plugins using the [IOWrapper](http
 - Keyboard (using [interception](https://github.com/oblitum/Interception))
 - Mouse (using [interception](https://github.com/oblitum/Interception))
 
+
+
 ## License ##
 
-Universal Control Remapper is Open Source software and Universal Control Remapper is released under the [MIT license](https://github.com/Snoothy/UCR/blob/master/LICENSE). 
+Universal Control Remapper is Open Source software and is released under the [MIT license](https://github.com/Snoothy/UCR/blob/master/LICENSE). 

UCR/UCR.csproj

@@ -14,6 +14,7 @@
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -26,7 +27,6 @@
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>0</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
@@ -49,6 +49,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>UCR.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="RestSharp, Version=105.2.3.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\RestSharp.105.2.3\lib\net452\RestSharp.dll</HintPath>
@@ -271,6 +274,9 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="UCR.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

UCR/Views/AboutWindow.xaml.cs

@@ -22,7 +22,7 @@ private void Hyperlink_RequestNavigate(object sender, System.Windows.Navigation.
 
         private string GetVersion()
         {
-            return "v0.3.0";
+            return "v0.3.1";
             // TODO
             System.Reflection.Assembly assembly = System.Reflection.Assembly.GetExecutingAssembly();
             FileVersionInfo fvi = FileVersionInfo.GetVersionInfo(assembly.Location);

UCR/Views/Controls/DeviceListControl.xaml

@@ -37,6 +37,11 @@
                     </StackPanel>
                 </HierarchicalDataTemplate>
             </TreeView.Resources>
+            <TreeView.ItemContainerStyle>
+                <Style TargetType="{x:Type TreeViewItem}">
+                    <Setter Property="IsExpanded" Value="True"/>
+                </Style>
+            </TreeView.ItemContainerStyle>
         </TreeView>
         <StackPanel Grid.Column="1" Grid.Row="1" VerticalAlignment="Center">
             <Button Margin="0,0,0,10" Click="AddDevice_OnClick">Add</Button>
@@ -88,6 +93,11 @@
                     </StackPanel>
                 </HierarchicalDataTemplate>
             </TreeView.Resources>
+            <TreeView.ItemContainerStyle>
+                <Style TargetType="{x:Type TreeViewItem}">
+                    <Setter Property="IsExpanded" Value="True"/>
+                </Style>
+            </TreeView.ItemContainerStyle>
         </TreeView>
     </Grid>
 </UserControl>

UCR/Views/ProfileViews/ProfileWindow.xaml

@@ -59,7 +59,7 @@
                         </Grid>
                     </GroupBox>
 
-                    <ListBox Grid.Row="1" Grid.Column="0" Margin="0,5,0,0" x:Name="MappingsListBox"  ItemsSource="{Binding MappingsList}" VirtualizingPanel.IsVirtualizing='True' VerticalAlignment="Stretch"
+                    <ListBox Grid.Row="1" Grid.Column="0" Margin="0,10,0,0" x:Name="MappingsListBox"  ItemsSource="{Binding MappingsList}" VirtualizingPanel.IsVirtualizing='True' VerticalAlignment="Stretch"
                              VirtualizingPanel.IsVirtualizingWhenGrouping='True'
                              VirtualizingPanel.ScrollUnit='Pixel'
                              ScrollViewer.HorizontalScrollBarVisibility="Disabled"