Merging dev into master

KeyPuncher · Aug 25, 2024 · 3251a78 · 3251a78
2 parents 692d3c4 + 2502cc7
commit 3251a78
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -15,6 +15,8 @@ Find the latest *WiinUPro* or *WiinUSoft* Release.
 Expand Assets.
 Then download either the \_setup.exe or .zip file.
 
+**Note**: Also requires [Visual C++ Redistributable for Visual Studio 2012 Update 4](https://www.microsoft.com/en-us/download/details.aspx?id=30679)
+
 # WiinUSoft
 This is for people who just want their Nintendo controllers to behave like regular Windows compatible controllers.
 With the help of some drivers (part of the installer setup) it will translate the inputs of one of your connected Nintendo Wii/U familiy controllers to an emulated XInput controller.
@@ -65,6 +67,11 @@ Fun stuff and useful for creating configurations for games that utilize a lot of
 ## Informational Videos:
 [Youtube Tutorial Playlist](https://www.youtube.com/playlist?list=PLGGq1CxIWfVZkVLS2zDx1_O7VqjxdMHZ7)
 
+## Language Support
+WiinUPro currently has translations for *English, Español, Français, Polski, and Deutsch.
+
+If you are someone who would like to add translations for another language, (first of all thanks) you can view the required translations in this [Google Doc Spreadsheet](https://docs.google.com/spreadsheets/d/1GBMtDP-JgyXad1y14ACACvXAcUiwBWiiSj1K1h9dmSs/edit?usp=sharing). Once you've added translations for a new language, create a ticket for that support work to be added to the software.
+
 # Other Questions You May or May Not Ask
 How do I pronounce this?
 * Doesn't matter. I say Win-You-Pro but technically it's spelt like Wing-You-Pro.

diff --git a/Shared/Globalization.cs b/Shared/Globalization.cs
@@ -23,7 +23,6 @@ public struct Data
         public static void SetText(Data data)
         {
             _data = data;
-            System.Diagnostics.Debug.WriteLine(data.languages[1]);
         }
 
         public static void SetSelectedLanguage(int index)

diff --git a/WiinUPro/Controls/NintyControl.xaml b/WiinUPro/Controls/NintyControl.xaml
@@ -11,11 +11,11 @@
             when disconnect is pressed remove this tab 
             Add calibrate button
         -->
-        <Button x:Name="btnDisconnect" Content="Disconnect" HorizontalAlignment="Left" Margin="9,30,0,0" VerticalAlignment="Top" Width="75" Click="btnDisconnect_Click" Style="{StaticResource WarningButton}" Uid="Controller_Disconnect"/>
-        <Button x:Name="btnSave" Content="Save Profile" Margin="0,5,90,0" VerticalAlignment="Top" HorizontalAlignment="Right" Width="75" Click="btnSave_Click" Style="{StaticResource AcceptButton}" Uid="Controller_Save_Profile"/>
-        <Button x:Name="btnLoad" Content="Load Profile" Margin="0,5,10,0" VerticalAlignment="Top" HorizontalAlignment="Right" Width="75" Click="btnLoad_Click" Style="{StaticResource CautionButton}" Uid="Controller_Load_Profile"/>
-        <Button x:Name="btnAddRumble" Content="+/- Rumble" Margin="0,30,90,0" VerticalAlignment="Top" HorizontalAlignment="Right" Width="75" Click="btnAddRumble_Click" Style="{StaticResource BasicButton}" Uid="Controller_Rumble"/>
-        <Button x:Name="btnPrefs" Content="Options" Margin="0,30,10,0" VerticalAlignment="Top" HorizontalAlignment="Right" Width="75" Click="btnPrefs_Click" Style="{StaticResource BasicButton}" Uid="Controller_Options"/>
+        <Button x:Name="btnDisconnect" Content="Disconnect" HorizontalAlignment="Left" Margin="9,30,0,0" VerticalAlignment="Top" Click="btnDisconnect_Click" Style="{StaticResource WarningButton}" Uid="Controller_Disconnect" MinWidth="75" Height="20"/>
+        <Button x:Name="btnSave" Content="Save Profile" Margin="0,5,90,0" VerticalAlignment="Top" HorizontalAlignment="Right" Click="btnSave_Click" Style="{StaticResource AcceptButton}" Uid="Controller_Save_Profile" MinWidth="75" Height="20"/>
+        <Button x:Name="btnLoad" Content="Load Profile" Margin="0,5,10,0" VerticalAlignment="Top" HorizontalAlignment="Right" Click="btnLoad_Click" Style="{StaticResource CautionButton}" Uid="Controller_Load_Profile" MinWidth="75" Height="20"/>
+        <Button x:Name="btnAddRumble" Content="+/- Rumble" Margin="0,30,90,0" VerticalAlignment="Top" HorizontalAlignment="Right" Click="btnAddRumble_Click" Style="{StaticResource BasicButton}" Uid="Controller_Rumble" MinWidth="75" Height="20"/>
+        <Button x:Name="btnPrefs" Content="Options" Margin="0,30,10,0" VerticalAlignment="Top" HorizontalAlignment="Right" Click="btnPrefs_Click" Style="{StaticResource BasicButton}" Uid="Controller_Options" MinWidth="75" Height="20"/>
         <Viewbox x:Name="_view" Margin="0,62,-0.5,0" />
         <Label Content="Shift State" HorizontalAlignment="Left" Margin="10,2,0,0" VerticalAlignment="Top" Width="74" Foreground="{StaticResource TextHeader}" FontWeight="Bold" Uid="Controller_Shift_State"/>
         <ComboBox x:Name="dropShift" HorizontalAlignment="Left" Margin="89,0,0,0" VerticalAlignment="Top" SelectedIndex="0" Padding="0,3,5,3" Width="76" SelectionChanged="dropShift_SelectionChanged">

diff --git a/WiinUPro/Windows/DevicePrefsWindow.xaml b/WiinUPro/Windows/DevicePrefsWindow.xaml
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:WiinUPro.Windows"
         mc:Ignorable="d"
-        Title="Device Properties" Height="345" Width="240" MinHeight="300" MinWidth="240" Background="{StaticResource BackgroundMain}" Uid="Properties_Title" Loaded="Window_Loaded">
+        Title="Device Properties" Height="345" Width="327" MinHeight="300" MinWidth="240" Background="{StaticResource BackgroundMain}" Uid="Properties_Title" Loaded="Window_Loaded">
     <Grid Background="{StaticResource BackgroundSub}" Margin="10">
         <Button x:Name="acceptBtn" Content="Accept" HorizontalAlignment="Right" Margin="0,0,10,10" Width="76" Click="acceptBtn_Click" Height="24" VerticalAlignment="Bottom" Style="{StaticResource AcceptButton}" Uid="Button_Accept"/>
         <Button x:Name="cancelBtn" Content="Cancel" Margin="10,0,0,10" Click="cancelBtn_Click" Height="22" VerticalAlignment="Bottom" HorizontalAlignment="Left" Width="75" Style="{StaticResource WarningButton}" Uid="Button_Cancel"/>

diff --git a/WiinUPro/Windows/InputsWindow.xaml b/WiinUPro/Windows/InputsWindow.xaml
@@ -246,10 +246,10 @@
                             <Label Content="Fast" HorizontalAlignment="Left" Margin="190,261,0,-3" VerticalAlignment="Top" FontSize="10" Foreground="{DynamicResource TextBody}" Uid="Input_Fast"/>
                             <Label Content="Slow" HorizontalAlignment="Left" Margin="10,261,0,-3" VerticalAlignment="Top" FontSize="10" Foreground="{DynamicResource TextBody}" Uid="Input_Slow"/>
                             <Label Content="Movement Speed" HorizontalAlignment="Left" Margin="10,0,0,38" Height="26" VerticalAlignment="Bottom" FontWeight="Bold" Foreground="{StaticResource TextHeader}" Uid="Input_Mouse_Move_Speed"/>
-                            <TextBlock x:Name="textBlock" HorizontalAlignment="Left" Margin="124,0,0,43" TextWrapping="Wrap" Text="{Binding ElementName=mMovementRate, Path=Value, StringFormat={}{0:P0}}" VerticalAlignment="Bottom" FontWeight="Bold" Foreground="{StaticResource TextHeader}"/>
+                            <TextBlock x:Name="textBlock" HorizontalAlignment="Left" Margin="186,0,0,43" TextWrapping="Wrap" Text="{Binding ElementName=mMovementRate, Path=Value, StringFormat={}{0:P0}}" VerticalAlignment="Bottom" FontWeight="Bold" Foreground="{StaticResource TextHeader}"/>
                         </Grid>
                     </GroupBox>
-                    <GroupBox x:Name="groupBox1" Header="Buttons" HorizontalAlignment="Left" Margin="255,10,0,0" VerticalAlignment="Top" Height="304" Width="240" Style="{StaticResource GroupBoxStyle}" Uid="Input_Mouse_Buttons">
+                    <GroupBox x:Name="groupBox1" Header="Buttons" HorizontalAlignment="Left" Margin="255,10,0,0" VerticalAlignment="Top" Height="304" Width="241" Style="{StaticResource GroupBoxStyle}" Uid="Input_Mouse_Buttons">
                         <Grid x:Name="mouseBtnGrid">
                             <Button Content="L" HorizontalAlignment="Left" Margin="44,10,0,0" VerticalAlignment="Top" Width="42" Height="88" Background="#FFCDCDCD" BorderBrush="#FF212121" FontWeight="Bold" FontSize="16" Click="ToggleMouseButton" Tag="Left" Style="{StaticResource KeyButton}" Uid="Input_Mouse_Left"/>
                             <Button Content="M" HorizontalAlignment="Left" Margin="91,10,0,0" VerticalAlignment="Top" Width="42" Height="88" Background="#FFCDCDCD" BorderBrush="#FF212121" FontWeight="Bold" FontSize="16" Click="ToggleMouseButton" Tag="Middle" Style="{StaticResource KeyButton}" Uid="Input_Mouse_Middle"/>
@@ -259,13 +259,13 @@
                             <Label Content="Turbo Rate" HorizontalAlignment="Left" Margin="10,0,0,38" VerticalAlignment="Bottom" Height="26" FontWeight="Bold" Foreground="{StaticResource TextHeader}"/>
                             <Label Content="Fast" HorizontalAlignment="Left" Margin="190,261,0,-3" VerticalAlignment="Top" FontSize="10" Foreground="{DynamicResource TextBody}" Uid="Input_Fast"/>
                             <Label Content="Slow" HorizontalAlignment="Left" Margin="10,261,0,-3" VerticalAlignment="Top" FontSize="10" Foreground="{DynamicResource TextBody}" Uid="Input_Slow"/>
-                            <CheckBox x:Name="mButtonInverseCheck" Content="Inverse Input" HorizontalAlignment="Left" Margin="126,190,0,0" VerticalAlignment="Top" Style="{StaticResource CheckBoxStyle}" Uid="Input_Invert"/>
+                            <CheckBox x:Name="mButtonInverseCheck" Content="Inverse Input" Margin="0,190,10,0" VerticalAlignment="Top" Style="{StaticResource CheckBoxStyle}" Uid="Input_Invert" HorizontalAlignment="Right"/>
                         </Grid>
                     </GroupBox>
                     <GroupBox x:Name="groupBox2" Header="Scroll" HorizontalAlignment="Left" Margin="500,10,0,0" VerticalAlignment="Top" Height="304" Width="240"  Style="{StaticResource GroupBoxStyle}" Uid="Input_Mouse_Scroll">
                         <Grid x:Name="mouseScrollGrid">
-                            <Button Content="Scroll Up" HorizontalAlignment="Left" Margin="62,10,0,0" VerticalAlignment="Top" Width="98" Height="42" Background="#FFCDCDCD" BorderBrush="#FF212121" FontWeight="Bold" FontSize="16" Click="ToggleMouseScroll" Tag="Up" Style="{StaticResource KeyButton}" Uid="Input_Mouse_Scroll_Up"/>
-                            <Button Content="Scroll Down" HorizontalAlignment="Left" Margin="62,57,0,0" VerticalAlignment="Top" Width="98" Height="42" Background="#FFCDCDCD" BorderBrush="#FF212121" FontWeight="Bold" FontSize="16" Click="ToggleMouseScroll" Tag="Down" Style="{StaticResource KeyButton}" Uid="Input_Mouse_Scroll_Down"/>
+                            <Button Content="Scroll Up" HorizontalAlignment="Left" Margin="62,10,0,0" VerticalAlignment="Top" Height="42" Background="#FFCDCDCD" BorderBrush="#FF212121" FontWeight="Bold" FontSize="16" Click="ToggleMouseScroll" Tag="Up" Style="{StaticResource KeyButton}" Uid="Input_Mouse_Scroll_Up" MinWidth="98"/>
+                            <Button Content="Scroll Down" HorizontalAlignment="Left" Margin="62,57,0,0" VerticalAlignment="Top" Height="42" Background="#FFCDCDCD" BorderBrush="#FF212121" FontWeight="Bold" FontSize="16" Click="ToggleMouseScroll" Tag="Down" Style="{StaticResource KeyButton}" Uid="Input_Mouse_Scroll_Down" MinWidth="98"/>
                             <CheckBox x:Name="mScrollContinuousCheck" Content="Continuous" HorizontalAlignment="Left" Margin="14,190,0,0" VerticalAlignment="Top" Style="{StaticResource CheckBoxStyle}" Uid="Input_Mouse_Scroll_Continuous"/>
                             <Slider x:Name="mScrollRate" HorizontalAlignment="Left" Margin="14,0,0,8" VerticalAlignment="Bottom" Width="204" Minimum="1" Value="10" Maximum="20" SmallChange="1" IsDirectionReversed="True" IsSnapToTickEnabled="True" Style="{StaticResource BasicSliderStyle}"/>
                             <Label Content="Scroll Rate" HorizontalAlignment="Left" Margin="10,0,0,38" VerticalAlignment="Bottom" Height="26" FontWeight="Bold" Foreground="{StaticResource TextHeader}" Uid="Input_Mouse_Scroll_Rate"/>
@@ -422,7 +422,7 @@
                             <Label Content="Turbo Rate" HorizontalAlignment="Left" Margin="10,35,0,0" VerticalAlignment="Top" FontWeight="Bold" Foreground="{StaticResource TextHeader}" Uid="Input_Turbo_Rate"/>
                             <Label Content="Fast" HorizontalAlignment="Left" Margin="190,70,0,-3" VerticalAlignment="Top" FontSize="10" Foreground="{DynamicResource TextBody}" Uid="Input_Fast"/>
                             <Label Content="Slow" HorizontalAlignment="Left" Margin="5,70,0,-3" VerticalAlignment="Top" FontSize="10" Foreground="{DynamicResource TextBody}" Uid="Input_Slow"/>
-                            <CheckBox x:Name="xInverseCheck" Content="Inverse Input" HorizontalAlignment="Left" Margin="126,10,0,0" VerticalAlignment="Top" Style="{StaticResource CheckBoxStyle}" Uid="Input_Invert"/>
+                            <CheckBox x:Name="xInverseCheck" Content="Inverse Input" Margin="0,10,9,0" VerticalAlignment="Top" Style="{StaticResource CheckBoxStyle}" Uid="Input_Invert" HorizontalAlignment="Right"/>
                         </Grid>
                     </GroupBox>
                 </Grid>
@@ -477,13 +477,17 @@
                 </Grid>
             </TabItem>
         </TabControl>
-        <Button x:Name="acceptBtn" Content="Accept" HorizontalAlignment="Right" Margin="0,0,9,3" Width="76" Click="acceptBtn_Click" Height="24" VerticalAlignment="Bottom" Style="{StaticResource AcceptButton}" Uid="Button_Accept"/>
-        <Button x:Name="cancelBtn" Content="Cancel" Margin="10,0,0,3" Click="cancelBtn_Click" Height="22" VerticalAlignment="Bottom" HorizontalAlignment="Left" Width="75" Style="{StaticResource WarningButton}" Uid="Button_Cancel"/>
-        <Button x:Name="clearBtn" Content="Clear" Margin="99,0,0,3" Click="clearBtn_Click" Height="22" VerticalAlignment="Bottom" HorizontalAlignment="Left" Width="75" Style="{StaticResource CautionButton}" Uid="Input_Clear"/>
-        <CheckBox x:Name="rumbleOnPress" Content="Rumble On Press" HorizontalAlignment="Left" Margin="708,0,0,7" VerticalAlignment="Bottom" Style="{StaticResource CheckBoxStyle}" FontWeight="Normal" Uid="Input_Rumble">
-            <CheckBox.Foreground>
-                <SolidColorBrush Color="{DynamicResource B250}"/>
-            </CheckBox.Foreground>
-        </CheckBox>
+        <StackPanel Margin="8,0,0,3" Orientation="Horizontal" HorizontalAlignment="Left" Height="24" VerticalAlignment="Bottom">
+            <Button x:Name="cancelBtn" Content="Cancel"  Click="cancelBtn_Click" Height="22" VerticalAlignment="Bottom" Style="{StaticResource WarningButton}" Uid="Button_Cancel" MinWidth="76"/>
+            <Button x:Name="clearBtn" Margin="8,0,0,0" Content="Clear" Click="clearBtn_Click" Height="22" VerticalAlignment="Bottom"  Style="{StaticResource CautionButton}" Uid="Input_Clear" MinWidth="76"/>
+        </StackPanel>
+        <StackPanel Margin="0,0,10,2" Orientation="Horizontal" HorizontalAlignment="Right" Width="458" FlowDirection="RightToLeft" Height="24" VerticalAlignment="Bottom">
+            <Button x:Name="acceptBtn" Margin="0,0,10,0" Content="Accept" Click="acceptBtn_Click" Height="24" VerticalAlignment="Bottom" Style="{StaticResource AcceptButton}" Uid="Button_Accept" MinWidth="76"/>
+            <CheckBox x:Name="rumbleOnPress" Margin="0,0,0,4" Content="Rumble On Press" VerticalAlignment="Bottom" Style="{StaticResource CheckBoxStyle}" FontWeight="Normal" Uid="Input_Rumble">
+                <CheckBox.Foreground>
+                    <SolidColorBrush Color="{DynamicResource B250}"/>
+                </CheckBox.Foreground>
+            </CheckBox>
+        </StackPanel>
     </Grid>
 </Window>
diff --git a/WiinUPro/Windows/MainWindow.xaml b/WiinUPro/Windows/MainWindow.xaml
@@ -6,7 +6,7 @@
         xmlns:tb="http://www.hardcodet.net/taskbar"
         xmlns:local="clr-namespace:WiinUPro"
         mc:Ignorable="d"
-        Title="WiinUPro" Height="520" Width="500" MinWidth="480" MinHeight="320" Icon="/WiinUPro;component/app.ico" Background="{StaticResource BackgroundMain}" 
+        Title="WiinUPro" Height="520" Width="582" MinWidth="480" MinHeight="320" Icon="/WiinUPro;component/app.ico" Background="{StaticResource BackgroundMain}" 
         Loaded="Window_Loaded" Closing="Window_Closing" StateChanged="Window_StateChanged">
     <Grid>
         <Grid.Resources>