Skip to content

Commit

Permalink
Update to v1.3
Browse files Browse the repository at this point in the history 
Add color animations, chaning theme now need to restart app, fix button behaviour - opening already present page, code cleanup
  • Loading branch information
Adison Cavani committed Oct 5, 2021
1 parent b41be79 commit 9954dc9
Show file tree
Hide file tree
Showing 16 changed files with 233 additions and 154 deletions.
98 changes: 31 additions & 67 deletions setup/setup.vdproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,19 @@
{
"Entry"
{
"MsmKey" = "8:_8B957720D2EC4937A1419455175E8DAC"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_8E33D3F4DE2643E4B3744CE748D6BA89"
"MsmKey" = "8:_67404BB72E4B4A539625DE434F07C4AC"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_9F036398E8564F518A368682087CE452"
"MsmKey" = "8:_8B957720D2EC4937A1419455175E8DAC"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_D2ACB47C335D4C37A9C2FB63FD23C1E5"
"MsmKey" = "8:_C42C4E62D1834F9DB7B1C185D2D28DBB"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
Expand Down Expand Up @@ -134,9 +128,9 @@
}
"File"
{
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_8E33D3F4DE2643E4B3744CE748D6BA89"
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_67404BB72E4B4A539625DE434F07C4AC"
{
"SourcePath" = "8:..\\..\\..\\..\\..\\Documents\\LICENSE.rtf"
"SourcePath" = "8:..\\..\\..\\Documents\\LICENSE.rtf"
"TargetName" = "8:LICENSE.rtf"
"Tag" = "8:"
"Folder" = "8:_B2F53B19DCBE4A67B2CBE48442EE9AB6"
Expand All @@ -150,13 +144,13 @@
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:TRUE"
"Exclude" = "11:FALSE"
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9F036398E8564F518A368682087CE452"
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C42C4E62D1834F9DB7B1C185D2D28DBB"
{
"SourcePath" = "8:..\\..\\..\\..\\..\\Pictures\\icon.ico"
"SourcePath" = "8:..\\src\\icon.ico"
"TargetName" = "8:icon.ico"
"Tag" = "8:"
"Folder" = "8:_B2F53B19DCBE4A67B2CBE48442EE9AB6"
Expand All @@ -174,26 +168,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_D2ACB47C335D4C37A9C2FB63FD23C1E5"
{
"SourcePath" = "8:..\\..\\..\\..\\..\\Pictures\\banner.jpg"
"TargetName" = "8:banner.jpg"
"Tag" = "8:"
"Folder" = "8:_B2F53B19DCBE4A67B2CBE48442EE9AB6"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:TRUE"
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
}
"FileType"
{
Expand Down Expand Up @@ -250,16 +224,16 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:RSA"
"ProductCode" = "8:{7BEBA8E9-85BC-4758-97E8-B168DAEDC0E4}"
"PackageCode" = "8:{5C1B0D8C-5A77-49FB-8742-A8FA1CD62FF6}"
"ProductCode" = "8:{FFDE719D-1D28-44AE-BA46-36D85AE4F9F5}"
"PackageCode" = "8:{49CDAE4A-4769-4353-965D-FF3D86DE84A6}"
"UpgradeCode" = "8:{53A62D50-2C68-4C0A-8371-753E95D6A84C}"
"AspNetVersion" = "8:2.0.50727.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:1.0.0"
"Manufacturer" = "8:\\"
"ProductVersion" = "8:1.3"
"Manufacturer" = "8:Adison"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:https://github.com/AdisonCavani/RSA-WPF"
"Title" = "8:Setup"
Expand All @@ -268,7 +242,7 @@
"Keywords" = "8:"
"ARPCOMMENTS" = "8:"
"ARPURLINFOABOUT" = "8:"
"ARPPRODUCTICON" = "8:_9F036398E8564F518A368682087CE452"
"ARPPRODUCTICON" = "8:_C42C4E62D1834F9DB7B1C185D2D28DBB"
"ARPIconIndex" = "3:0"
"SearchPath" = "8:"
"UseSystemSearchPath" = "11:TRUE"
Expand Down Expand Up @@ -371,7 +345,7 @@
}
"Shortcut"
{
"{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_098C5ED9F0A84FF1865A1BA30B1CE36D"
"{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_2CC0E6274FB24E4C804BAD6689E33BCC"
{
"Name" = "8:RSA"
"Arguments" = "8:"
Expand All @@ -380,12 +354,12 @@
"IconIndex" = "3:0"
"Transitive" = "11:FALSE"
"Target" = "8:_8B957720D2EC4937A1419455175E8DAC"
"Folder" = "8:_F83AD9F1ADD0481F8925C3319184CBEA"
"Folder" = "8:_08DFDAF3ACEB4ACF876EA660C971544C"
"WorkingFolder" = "8:_B2F53B19DCBE4A67B2CBE48442EE9AB6"
"Icon" = "8:_9F036398E8564F518A368682087CE452"
"Icon" = "8:_C42C4E62D1834F9DB7B1C185D2D28DBB"
"Feature" = "8:"
}
"{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_DD14FA3005844280B0E6ACA20FD9168C"
"{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_ECF6439044934209B6F65B432DBA8ABE"
{
"Name" = "8:RSA"
"Arguments" = "8:"
Expand All @@ -394,9 +368,9 @@
"IconIndex" = "3:0"
"Transitive" = "11:FALSE"
"Target" = "8:_8B957720D2EC4937A1419455175E8DAC"
"Folder" = "8:_08DFDAF3ACEB4ACF876EA660C971544C"
"Folder" = "8:_F83AD9F1ADD0481F8925C3319184CBEA"
"WorkingFolder" = "8:_B2F53B19DCBE4A67B2CBE48442EE9AB6"
"Icon" = "8:_9F036398E8564F518A368682087CE452"
"Icon" = "8:_C42C4E62D1834F9DB7B1C185D2D28DBB"
"Feature" = "8:"
}
}
Expand Down Expand Up @@ -426,8 +400,7 @@
"Type" = "3:8"
"ContextData" = "8:Bitmap"
"Attributes" = "3:4"
"Setting" = "3:2"
"Value" = "8:_D2ACB47C335D4C37A9C2FB63FD23C1E5"
"Setting" = "3:0"
"UsePlugInResources" = "11:TRUE"
}
}
Expand Down Expand Up @@ -464,8 +437,7 @@
"Type" = "3:8"
"ContextData" = "8:Bitmap"
"Attributes" = "3:4"
"Setting" = "3:2"
"Value" = "8:_D2ACB47C335D4C37A9C2FB63FD23C1E5"
"Setting" = "3:0"
"UsePlugInResources" = "11:TRUE"
}
"ShowProgress"
Expand Down Expand Up @@ -509,8 +481,7 @@
"Type" = "3:8"
"ContextData" = "8:Bitmap"
"Attributes" = "3:4"
"Setting" = "3:2"
"Value" = "8:_D2ACB47C335D4C37A9C2FB63FD23C1E5"
"Setting" = "3:0"
"UsePlugInResources" = "11:TRUE"
}
"UpdateText"
Expand Down Expand Up @@ -554,8 +525,7 @@
"Type" = "3:8"
"ContextData" = "8:Bitmap"
"Attributes" = "3:4"
"Setting" = "3:2"
"Value" = "8:_D2ACB47C335D4C37A9C2FB63FD23C1E5"
"Setting" = "3:0"
"UsePlugInResources" = "11:TRUE"
}
"ShowProgress"
Expand Down Expand Up @@ -599,8 +569,7 @@
"Type" = "3:8"
"ContextData" = "8:Bitmap"
"Attributes" = "3:4"
"Setting" = "3:2"
"Value" = "8:_D2ACB47C335D4C37A9C2FB63FD23C1E5"
"Setting" = "3:0"
"UsePlugInResources" = "11:TRUE"
}
"InstallAllUsersVisible"
Expand Down Expand Up @@ -635,8 +604,7 @@
"Type" = "3:8"
"ContextData" = "8:Bitmap"
"Attributes" = "3:4"
"Setting" = "3:2"
"Value" = "8:_D2ACB47C335D4C37A9C2FB63FD23C1E5"
"Setting" = "3:0"
"UsePlugInResources" = "11:TRUE"
}
"CopyrightWarning"
Expand Down Expand Up @@ -684,8 +652,7 @@
"Type" = "3:8"
"ContextData" = "8:Bitmap"
"Attributes" = "3:4"
"Setting" = "3:2"
"Value" = "8:_D2ACB47C335D4C37A9C2FB63FD23C1E5"
"Setting" = "3:0"
"UsePlugInResources" = "11:TRUE"
}
"EulaText"
Expand All @@ -697,7 +664,7 @@
"ContextData" = "8:"
"Attributes" = "3:0"
"Setting" = "3:2"
"Value" = "8:_8E33D3F4DE2643E4B3744CE748D6BA89"
"Value" = "8:_67404BB72E4B4A539625DE434F07C4AC"
"UsePlugInResources" = "11:TRUE"
}
"Sunken"
Expand Down Expand Up @@ -747,8 +714,7 @@
"Type" = "3:8"
"ContextData" = "8:Bitmap"
"Attributes" = "3:4"
"Setting" = "3:2"
"Value" = "8:_D2ACB47C335D4C37A9C2FB63FD23C1E5"
"Setting" = "3:0"
"UsePlugInResources" = "11:TRUE"
}
}
Expand All @@ -770,8 +736,7 @@
"Type" = "3:8"
"ContextData" = "8:Bitmap"
"Attributes" = "3:4"
"Setting" = "3:2"
"Value" = "8:_D2ACB47C335D4C37A9C2FB63FD23C1E5"
"Setting" = "3:0"
"UsePlugInResources" = "11:TRUE"
}
"EulaText"
Expand All @@ -783,7 +748,7 @@
"ContextData" = "8:"
"Attributes" = "3:0"
"Setting" = "3:2"
"Value" = "8:_8E33D3F4DE2643E4B3744CE748D6BA89"
"Value" = "8:_67404BB72E4B4A539625DE434F07C4AC"
"UsePlugInResources" = "11:TRUE"
}
"Sunken"
Expand Down Expand Up @@ -818,8 +783,7 @@
"Type" = "3:8"
"ContextData" = "8:Bitmap"
"Attributes" = "3:4"
"Setting" = "3:2"
"Value" = "8:_D2ACB47C335D4C37A9C2FB63FD23C1E5"
"Setting" = "3:0"
"UsePlugInResources" = "11:TRUE"
}
"CopyrightWarning"
Expand Down
8 changes: 3 additions & 5 deletions src/App.xaml
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
<Application x:Class="RSA_WPF.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:RSA_WPF"
xmlns:properties="clr-namespace:RSA_WPF.Properties"
StartupUri="MainWindow.xaml">
xmlns:local="clr-namespace:RSA_WPF">
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<!--<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="/Resources/DarkTheme.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary.MergedDictionaries>-->

<!--#region Text styles-->
<Style x:Key="TitleText" TargetType="{x:Type TextBlock}">
Expand Down
28 changes: 28 additions & 0 deletions src/App.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,33 @@ namespace RSA_WPF
/// </summary>
public partial class App : Application
{
protected override void OnStartup(StartupEventArgs e)
{
base.OnStartup(e);
var lightTheme = new ResourceDictionary()
{
Source = new Uri("pack://application:,,,/Resources/LightTheme.xaml", UriKind.RelativeOrAbsolute)
};

var darkTheme = new ResourceDictionary()
{
Source = new Uri("pack://application:,,,/Resources/DarkTheme.xaml", UriKind.RelativeOrAbsolute)
};

if (RSA_WPF.Properties.Settings.Default.Theme == 0)
{
Current.Resources.MergedDictionaries.Clear();
Current.Resources.MergedDictionaries.Add(lightTheme);
}

else if (RSA_WPF.Properties.Settings.Default.Theme == 1)
{
Current.Resources.MergedDictionaries.Clear();
Current.Resources.MergedDictionaries.Add(darkTheme);
}

MainWindow = new MainWindow();
MainWindow.Show();
}
}
}
Loading

0 comments on commit 9954dc9

Please sign in to comment.