Changes in Preparation for Next Release.

beninswe · May 18, 2020 · e68f963 · e68f963
1 parent 62e4b52
commit e68f963
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 37 deletions.
diff --git a/GenerationsLib b/GenerationsLib
diff --git a/Sonic3AIR_ModManager/App.xaml b/Sonic3AIR_ModManager/App.xaml
@@ -6,6 +6,8 @@
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
+                <!--<ResourceDictionary Source="/PresentationFramework.Luna, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, ProcessorArchitecture=MSIL;component/themes/luna.normalcolor.xaml" />-->
+                <ResourceDictionary Source="/PresentationFramework.Aero;component/themes/Aero.NormalColor.xaml"/>
                 <skin:SkinResourceDictionary
                     CarJemSource="/GenerationsLib.WPF;Component/Themes/CarJemTheme.xaml" 
                     BetaSource="/GenerationsLib.WPF;Component/Themes/BetaTheme.xaml" 
@@ -22,27 +24,7 @@
                     LightSource="Controls/Assets/Themes/LightTheme.xaml"
                     GammaSource="Controls/Assets/Themes/GammaTheme.xaml"
                     SparksSource="Controls/Assets/Themes/SparksTheme.xaml"/>
-                <ResourceDictionary Source="/GenerationsLib.WPF;Component/Styles/IconLibrary.xaml"></ResourceDictionary>
-                <ResourceDictionary Source="/GenerationsLib.WPF;Component/Styles/ButtonStyle.xaml"></ResourceDictionary>
-                <ResourceDictionary Source="/GenerationsLib.WPF;Component/Styles/ItemContainerStyle.xaml"></ResourceDictionary>
-                <ResourceDictionary Source="/GenerationsLib.WPF;Component/Styles/FlatButtonStyle.xaml"></ResourceDictionary>
-                <ResourceDictionary Source="/GenerationsLib.WPF;Component/Styles/ExpanderStyle.xaml"></ResourceDictionary>
-                <ResourceDictionary Source="/GenerationsLib.WPF;Component/Styles/TextBoxStyle.xaml"></ResourceDictionary>
-                <ResourceDictionary Source="/GenerationsLib.WPF;Component/Styles/TabItemStyle.xaml"></ResourceDictionary>
-                <ResourceDictionary Source="/GenerationsLib.WPF;Component/Styles/ComboBoxStyle.xaml"></ResourceDictionary>
-                <ResourceDictionary Source="/GenerationsLib.WPF;Component/Styles/ScrollBarStyle.xaml"></ResourceDictionary>
-                <ResourceDictionary Source="/GenerationsLib.WPF;Component/Styles/ScrollViewerStyle.xaml"></ResourceDictionary>
-                <ResourceDictionary Source="/GenerationsLib.WPF;Component/Styles/ListViewStyle.xaml"></ResourceDictionary>
-                <ResourceDictionary Source="/GenerationsLib.WPF;Component/Styles/RepeatButtonStyle.xaml"></ResourceDictionary>
-                <ResourceDictionary Source="/GenerationsLib.WPF;Component/Styles/ToolbarStyle.xaml"></ResourceDictionary>
-                <ResourceDictionary Source="/GenerationsLib.WPF;Component/Styles/SliderStyle.xaml"></ResourceDictionary>
-                <ResourceDictionary Source="/GenerationsLib.WPF;Component/Styles/MenuItemContextStyle.xaml"></ResourceDictionary>
-                <ResourceDictionary Source="/GenerationsLib.WPF;Component/Styles/GroupBoxStyle.xaml"></ResourceDictionary>
-                <ResourceDictionary Source="/GenerationsLib.WPF;Component/Styles/SliderStyle.xaml"></ResourceDictionary>
-                <ResourceDictionary Source="/GenerationsLib.WPF;Component/Styles/XceedStyles.xaml"></ResourceDictionary>
-                <ResourceDictionary Source="/GenerationsLib.WPF;Component/Styles/LabelStyle.xaml"></ResourceDictionary>
-                <ResourceDictionary Source="/GenerationsLib.WPF;Component/Styles/CheckboxStyle.xaml"></ResourceDictionary>
-                <ResourceDictionary Source="/GenerationsLib.WPF;Component/Styles/HyperlinkStyle.xaml"></ResourceDictionary>
+                <ResourceDictionary Source="/GenerationsLib.WPF;Component/Themes/StylesResourceDictonary.xaml"></ResourceDictionary>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
 

diff --git a/Sonic3AIR_ModManager/Controls/ModManager.xaml.cs b/Sonic3AIR_ModManager/Controls/ModManager.xaml.cs
@@ -536,10 +536,6 @@ private void TabControl1_SelectedIndexChanged(object sender, SelectionChangedEve
                 {
                     Management.RecordingManagement.CollectGameRecordings(ref Instance);
                 }
-                else if (PrimaryTabControl.SelectedItem == optionsPage)
-                {
-                    Management.InputDeviceManager.RefreshInputMappings();
-                }
             }
         }
 
@@ -552,6 +548,10 @@ private void TabControl3_SelectedIndexChanged(object sender, SelectionChangedEve
                     Management.RecordingManagement.CollectGameRecordings(ref Instance);
                     Management.RecordingManagement.UpdateGameRecordingManagerButtons(ref Instance);
                 }
+                else if (tabControl3.SelectedItem == inputPage)
+                {
+                    Management.InputDeviceManager.RefreshInputMappings();
+                }
             }
         }
 

diff --git a/Sonic3AIR_ModManager/Controls/ModViewer/ModProperties.xaml b/Sonic3AIR_ModManager/Controls/ModViewer/ModProperties.xaml
@@ -1,19 +1,21 @@
-<UserControl x:Class="Sonic3AIR_ModManager.ModProperties"
+<UserControl
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Sonic3AIR_ModManager"
+             x:Class="Sonic3AIR_ModManager.ModProperties"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <GroupBox x:Name="groupBox3" Grid.Row="0" Header="Mod Properties" Foreground="{DynamicResource NormalText}">
         <ScrollViewer Background="Transparent" CanContentScroll="True" HorizontalScrollBarVisibility="Disabled">
             <RichTextBox TextOptions.TextFormattingMode="Display" IsEnabled="False" x:Name="modInfoTextBox" Foreground="{DynamicResource NormalText}"  BorderBrush="Transparent" IsReadOnly="True" IsReadOnlyCaretVisible="False">
                 <RichTextBox.Resources>
                     <Style TargetType="{x:Type Paragraph}">
+                        <Setter Property="OverridesDefaultStyle" Value="True"/>
                         <Setter Property="Margin" Value="0"/>
-                        <Setter Property="TextBlock.TextWrapping" Value="NoWrap"></Setter>
-                        <Setter Property="TextBlock.LineStackingStrategy" Value="BlockLineHeight"></Setter>
+                        <Setter Property="TextBlock.TextWrapping" Value="NoWrap"/>
+                        <Setter Property="TextBlock.LineStackingStrategy" Value="BlockLineHeight"/>
                     </Style>
                 </RichTextBox.Resources>
             </RichTextBox>

diff --git a/Sonic3AIR_ModManager/Controls/ModViewer/ModViewer.xaml b/Sonic3AIR_ModManager/Controls/ModViewer/ModViewer.xaml
@@ -46,7 +46,7 @@
                 <TabItem Header="Mods" Name="ModsTab"></TabItem>
             </TabControl>
             <GridSplitter x:Name="Splitter1"  Background="DarkGray" ResizeDirection="Rows" Grid.Row="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" ResizeBehavior="PreviousAndNext" />
-            <Grid x:Name="PropertiesPanelA" Grid.Row="2"></Grid>
+            <Grid x:Name="PropertiesPanelA" Grid.Row="2" Background="Transparent"></Grid>
         </Grid>
         <Grid Name="PanelView" Visibility="Collapsed" Grid.Row="0">
             <Grid.ColumnDefinitions>
@@ -61,7 +61,7 @@
             <Grid x:Name="PanelA" Grid.Column="0"></Grid>
             <Grid x:Name="PanelB" Grid.Column="1"></Grid>
             <GridSplitter x:Name="Splitter2" Grid.ColumnSpan="2" Background="DarkGray" ResizeDirection="Rows" Grid.Row="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" ResizeBehavior="PreviousAndNext" />
-            <Grid x:Name="PropertiesPanelB" Grid.Row="2" Grid.ColumnSpan="2"></Grid>
+            <Grid x:Name="PropertiesPanelB" Grid.Row="2" Grid.ColumnSpan="2" Background="Transparent"></Grid>
         </Grid>
     </Grid>
 
@@ -80,7 +80,6 @@
                 <Setter Property="BorderThickness" Value="0"/>
                 <Setter Property="KeyboardNavigation.TabNavigation" Value="None"/>
                 <Setter Property="HorizontalContentAlignment" Value="Left"/>
-                <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
                 <Setter Property="AllowDrop" Value="true"/>
                 <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/>
                 <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>

diff --git a/Sonic3AIR_ModManager/Controls/ModViewer/ModViewer.xaml.cs b/Sonic3AIR_ModManager/Controls/ModViewer/ModViewer.xaml.cs
@@ -281,6 +281,9 @@ public void FolderView_SelectionChanged(object sender, SelectionChangedEventArgs
 
         public void Button_Click(object sender, RoutedEventArgs e)
         {
+            if (FolderView.SelectedIndex == 0 || FolderView.SelectedIndex == 1) RemoveCurrentFolderMenuItem.IsEnabled = false;
+            else RemoveCurrentFolderMenuItem.IsEnabled = true;
+
             ChangeFolderButton.ContextMenu.IsOpen = true;
             UpdateSelectedFolderLabel();
         }

diff --git a/Sonic3AIR_ModManager/Controls/Updater/DownloadWindow.xaml b/Sonic3AIR_ModManager/Controls/Updater/DownloadWindow.xaml
@@ -17,6 +17,6 @@
         </Grid.RowDefinitions>
         <TextBlock Foreground="{DynamicResource NormalText}" x:Name="Header" Text="Header" FontSize="30"  HorizontalAlignment="Center" VerticalAlignment="Top" Grid.Row="0" Margin="20,0,20,0"/>
         <ProgressBar x:Name="Progress" Grid.Row="1" Margin="15"/>
-        <TextBlock x:Name="ProgressText" Grid.Row="1" Margin="15" TextAlignment="Center" VerticalAlignment="Center"></TextBlock>
+        <TextBlock x:Name="ProgressText" Foreground="{DynamicResource ProgressBar.Text}" Grid.Row="1" Margin="15" TextAlignment="Center" VerticalAlignment="Center"></TextBlock>
     </Grid>
 </Window>
diff --git a/Sonic3AIR_ModManager/Languages/lang.es.resx b/Sonic3AIR_ModManager/Languages/lang.es.resx
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="AboutString" xml:space="preserve">
-    <value>Acerca de</value>
-  </data>
   <data name="AboutTab" xml:space="preserve">
     <value>Acerca de</value>
   </data>

diff --git a/Sonic3AIR_ModManager/Management/Collections/ModManagement.cs b/Sonic3AIR_ModManager/Management/Collections/ModManagement.cs
@@ -483,7 +483,7 @@ public static void GetAllModContainingSubFolders()
             DirectoryInfo d = new DirectoryInfo(Management.ProgramPaths.Sonic3AIRModsFolder);
             DirectoryInfo[] folders = d.GetDirectories();
             itemsCurrent.Add(new SubDirectoryItem(Management.UserLanguage.BaseModFolderString(), Management.ProgramPaths.Sonic3AIRModsFolder));
-            itemsCurrent.Add(new SubDirectoryItem("All - Show All Mods (including Subdirectories)","")); //TODO : Add User Translation
+            itemsCurrent.Add(new SubDirectoryItem("All Disabled Mods","")); //TODO : Add User Translation
             foreach (DirectoryInfo folder in folders)
             {
                 var files = folder.GetFiles();

diff --git a/Sonic3AIR_ModManager/Sonic3AIR_ModManager.csproj b/Sonic3AIR_ModManager/Sonic3AIR_ModManager.csproj
@@ -140,6 +140,10 @@
     <Reference Include="Microsoft.VisualBasic" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
+    <Reference Include="PresentationFramework.Aero">
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="PresentationFramework.Luna" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
+19 −0		GenerationsLib.Core/BitmapExtensions.cs
+2 −0		GenerationsLib.Core/GenerationsLib.Core.csproj
+140 −0		GenerationsLib.Core/HSLColor.cs
+30 −0		GenerationsLib.WPF/ColorHelper.cs
+94 −0		GenerationsLib.WPF/Controls/ImprovedDropdownBox.cs
+123 −0		GenerationsLib.WPF/Controls/MouseDownHelper.cs
+550 −0		GenerationsLib.WPF/Controls/UniformGridPanel.cs
+530 −0		GenerationsLib.WPF/Controls/VirtualizingTilePanel.cs
+901 −0		GenerationsLib.WPF/Controls/VirtualizingWrapPanel.cs
+44 −0		GenerationsLib.WPF/Converters/ColorToSolidColorBrushValueConverter.cs
+68 −0		GenerationsLib.WPF/Dialog/IntergerPrompt.cs
+28 −0		GenerationsLib.WPF/Dialog/IntergerPrompt.xaml
+7 −7		GenerationsLib.WPF/Dialog/TextPrompt2.xaml
+1 −1		GenerationsLib.WPF/Dialog/TextPrompt2.xaml.cs
+23 −2		GenerationsLib.WPF/GenerationsLib.WPF.csproj
+14 −0		GenerationsLib.WPF/Helpers.cs
+15 −0		GenerationsLib.WPF/Styles/ButtonStyle.xaml
+1 −1		GenerationsLib.WPF/Styles/ComboBoxStyle.xaml
+1 −0		GenerationsLib.WPF/Styles/CommonStyles.xaml
+33 −0		GenerationsLib.WPF/Styles/ItemContainerStyle.xaml
+3 −1		GenerationsLib.WPF/Styles/MenuItemContextStyle.xaml
+66 −0		GenerationsLib.WPF/Styles/ProgressBarStyle.xaml
+50 −6		GenerationsLib.WPF/Styles/TextBoxStyle.xaml
+2 −2		GenerationsLib.WPF/Styles/ToolbarStyle.xaml
+53 −2		GenerationsLib.WPF/Styles/XceedStyles.xaml
+5 −0		GenerationsLib.WPF/Themes/BetaTheme.xaml
+5 −0		GenerationsLib.WPF/Themes/CarJemTheme.xaml
+5 −0		GenerationsLib.WPF/Themes/DarkTheme.xaml
+5 −0		GenerationsLib.WPF/Themes/GammaTheme.xaml
+5 −0		GenerationsLib.WPF/Themes/LightTheme.xaml
+5 −0		GenerationsLib.WPF/Themes/ShardTheme.xaml
+5 −0		GenerationsLib.WPF/Themes/SparksTheme.xaml
+28 −0		GenerationsLib.WPF/Themes/StylesResourceDictonary.xaml
+32 −0		GenerationsLib.WPF/WPFThreadingExtensions.cs