Imported the ViGEm code by MWisBest, some misc GUI/solution changes, …

…version bump.
TheNathannator · Oct 31, 2020 · e387852 · e387852
1 parent d17a33f
commit e387852
Show file tree

Hide file tree

Showing 9 changed files with 293 additions and 188 deletions.
diff --git a/WiitarThing.sln b/WiitarThing.sln
@@ -1,14 +1,12 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27004.2006
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30204.135
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WiitarThing", "WiitarThing\WiitarThing.csproj", "{4ED3CDAC-B467-497B-A80D-AAB4A395A7EE}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nintroller", "Nintroller\Nintroller.csproj", "{ACC86CB0-CE56-4B4E-8024-DCB49B9FC5FC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScpControl", "Scp\ScpControl\ScpControl.csproj", "{DDECF06E-BE48-4610-8BF8-4AE5140D9F0C}"
-EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "InputManager", "InputManager\InputManager.vbproj", "{E522A5A7-BFB0-43D7-9898-ECEF05A48C8B}"
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Shared", "Shared\Shared.shproj", "{123CEBE5-8D00-4CCB-906E-AC69E0A57219}"
@@ -41,14 +39,6 @@ Global
 		{ACC86CB0-CE56-4B4E-8024-DCB49B9FC5FC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{ACC86CB0-CE56-4B4E-8024-DCB49B9FC5FC}.ReleaseLB|Any CPU.ActiveCfg = ReleaseLB|Any CPU
 		{ACC86CB0-CE56-4B4E-8024-DCB49B9FC5FC}.ReleaseLB|Any CPU.Build.0 = ReleaseLB|Any CPU
-		{DDECF06E-BE48-4610-8BF8-4AE5140D9F0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DDECF06E-BE48-4610-8BF8-4AE5140D9F0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DDECF06E-BE48-4610-8BF8-4AE5140D9F0C}.DebugLB|Any CPU.ActiveCfg = DebugLB|Any CPU
-		{DDECF06E-BE48-4610-8BF8-4AE5140D9F0C}.DebugLB|Any CPU.Build.0 = DebugLB|Any CPU
-		{DDECF06E-BE48-4610-8BF8-4AE5140D9F0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DDECF06E-BE48-4610-8BF8-4AE5140D9F0C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DDECF06E-BE48-4610-8BF8-4AE5140D9F0C}.ReleaseLB|Any CPU.ActiveCfg = ReleaseLB|Any CPU
-		{DDECF06E-BE48-4610-8BF8-4AE5140D9F0C}.ReleaseLB|Any CPU.Build.0 = ReleaseLB|Any CPU
 		{E522A5A7-BFB0-43D7-9898-ECEF05A48C8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E522A5A7-BFB0-43D7-9898-ECEF05A48C8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E522A5A7-BFB0-43D7-9898-ECEF05A48C8B}.DebugLB|Any CPU.ActiveCfg = DebugLB|Any CPU

diff --git a/WiitarThing/Holders/XInputHolder.cs b/WiitarThing/Holders/XInputHolder.cs
diff --git a/WiitarThing/Properties/AssemblyInfo.cs b/WiitarThing/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("WiitarThing")]
-[assembly: AssemblyCopyright("Copyright © 2020 Meowmaritus")]
+[assembly: AssemblyCopyright("Copyright © 2020")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -49,5 +49,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("2.7.0.0")]
-[assembly: AssemblyFileVersion("2.7.0.0")]
+[assembly: AssemblyVersion("2.7.0.1")]
+[assembly: AssemblyFileVersion("2.7.0.1")]
diff --git a/WiitarThing/Properties/Resources.Designer.cs b/WiitarThing/Properties/Resources.Designer.cs
diff --git a/WiitarThing/Properties/Settings.Designer.cs b/WiitarThing/Properties/Settings.Designer.cs
diff --git a/WiitarThing/WiitarThing.csproj b/WiitarThing/WiitarThing.csproj
@@ -9,10 +9,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WiinUSoft</RootNamespace>
     <AssemblyName>WiitarThing</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
+    <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>
@@ -33,6 +35,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DebugSymbols>true</DebugSymbols>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>GHWT_Wii_Guitar.ico</ApplicationIcon>
@@ -52,6 +55,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseLB|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -61,12 +65,19 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Hardcodet.Wpf.TaskbarNotification, Version=1.0.5.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Hardcodet.NotifyIcon.Wpf.1.0.5\lib\net40\Hardcodet.Wpf.TaskbarNotification.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="JetBrains.Annotations, Version=2018.3.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
+      <HintPath>..\packages\JetBrains.Annotations.2018.3.0\lib\net20\JetBrains.Annotations.dll</HintPath>
+    </Reference>
+    <Reference Include="Nefarius.ViGEm.Client, Version=1.16.150.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Nefarius.ViGEm.Client.1.16.150\lib\net452\Nefarius.ViGEm.Client.dll</HintPath>
+    </Reference>
     <Reference Include="RestSharp, Version=105.2.3.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\RestSharp.105.2.3\lib\net4\RestSharp.dll</HintPath>
       <Private>True</Private>
@@ -209,6 +220,7 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <None Include="app.config" />
     <None Include="app.manifest" />
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
@@ -222,10 +234,6 @@
       <Project>{acc86cb0-ce56-4b4e-8024-dcb49b9fc5fc}</Project>
       <Name>Nintroller</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Scp\ScpControl\ScpControl.csproj">
-      <Project>{ddecf06e-be48-4610-8bf8-4ae5140d9f0c}</Project>
-      <Name>ScpControl</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Images\xbox_360_controller-small.png" />

diff --git a/WiitarThing/Windows/MainWindow.xaml b/WiitarThing/Windows/MainWindow.xaml
@@ -8,7 +8,7 @@
         <Grid.Resources>
             <local:ShowWindowCommand x:Key="ShowWindow" />
         </Grid.Resources>
-        <Label Content="Built upon WiinUSoft by Justin Keys. Guitar support added by Meowmaritus." HorizontalAlignment="Left" VerticalAlignment="Bottom" Padding="2" FontSize="12" Margin="8,0,0,3" Width="412"/>
+        <Label Content="Credits: WiinUSoft (Justin Keys), Guitar support (Meowmaritus)&#10;ViGEm support (MWisBest), Almost nothing (Aida Enna)" HorizontalAlignment="Left" VerticalAlignment="Bottom" Padding="0" FontSize="11" Margin="8,0,0,0" Width="600" Height="32"/>
         <tb:TaskbarIcon x:Name="trayIcon" 
                         IconSource="/WiitarThing;component/GHWT_Wii_Guitar.ico"
                         ToolTipText="WiinUSoft" 
@@ -27,7 +27,7 @@
                 <StackPanel x:Name="groupAvailable" HorizontalAlignment="Left" Width="280" Margin="4,4,0,0"/>
             </ScrollViewer>
         </Border>
-        <Border CornerRadius="0" BorderBrush="{DynamicResource BrushJohnTheRevelator}" Background="{DynamicResource BrushAntemWhite}" BorderThickness="2" Margin="308,84,0,64" HorizontalAlignment="Left" Width="292">
+        <Border CornerRadius="0" BorderBrush="{DynamicResource BrushJohnTheRevelator}" Background="{DynamicResource BrushAntemWhite}" BorderThickness="2" Margin="308,81,0,64" HorizontalAlignment="Left" Width="292">
             <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto">
                 <StackPanel x:Name="groupXinput" HorizontalAlignment="Left" Margin="4,4,0,0" Width="280" Background="{DynamicResource BrushAntemWhite}"/>
             </ScrollViewer>
@@ -78,6 +78,7 @@
                     <MenuItem x:Name="menu_MsBluetooth" Header="Microsoft Bluetooth" Click="menu_MsBluetooth_Click"/>
                     <MenuItem x:Name="menu_SetDefaultCalibration" Visibility="Collapsed"
                Header="Set Default Calibration" Click="menu_SetDefaultCalibration_Click"/>
+                    <MenuItem x:Name="menu_Repo" Header="Open Github Repo" Click="menu_Github_Click"/>
                     <MenuItem x:Name="menu_version" Header="version 2.0" IsEnabled="False"/>
                 </ContextMenu>
             </Button.ContextMenu>

diff --git a/WiitarThing/Windows/MainWindow.xaml.cs b/WiitarThing/Windows/MainWindow.xaml.cs
@@ -532,6 +532,11 @@ private void menu_MsBluetooth_Click(object sender, RoutedEventArgs e)
             UserPrefs.SavePrefs();
         }
 
+        private void menu_Github_Click(object sender, RoutedEventArgs e)
+        {
+            Process.Start("https://github.com/Aida-Enna/WiitarThing");
+        }
+
         #region Shortcut Creation
         public void CreateShortcut(string path)
         {

diff --git a/WiitarThing/packages.config b/WiitarThing/packages.config
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Hardcodet.NotifyIcon.Wpf" version="1.0.5" targetFramework="net4" />
+  <package id="Hardcodet.NotifyIcon.Wpf" version="1.0.5" targetFramework="net40" requireReinstallation="true" />
   <package id="InputSimulator" version="1.0.4.0" targetFramework="net4" />
-  <package id="RestSharp" version="105.2.3" targetFramework="net4" />
+  <package id="JetBrains.Annotations" version="2018.3.0" targetFramework="net452" />
+  <package id="Nefarius.ViGEm.Client" version="1.16.150" targetFramework="net452" />
+  <package id="RestSharp" version="105.2.3" targetFramework="net40" requireReinstallation="true" />
 </packages>