Merge pull request #20 from Yokomoko/master

Vast UI Improvements and bug fixes
Groestlcoin · Dec 16, 2017 · 84aa916 · 84aa916
2 parents 402c613 + 70f23b0
commit 84aa916
Show file tree

Hide file tree

Showing 123 changed files with 93,303 additions and 334 deletions.
diff --git a/Easyminer Installer/Easyminer Installer.vdproj b/Easyminer Installer/Easyminer Installer.vdproj
@@ -436,15 +436,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Groestlcoin Easyminer 2018"
-        "ProductCode" = "8:{49DA6772-6CF8-42A7-9E7E-AC25DA8A2B72}"
-        "PackageCode" = "8:{AC7C1AB0-9F99-4DB4-A526-14A93F4B3AE0}"
+        "ProductCode" = "8:{B822DB09-2014-4C2F-9E89-E80AE18804B8}"
+        "PackageCode" = "8:{75A833A5-9B85-416C-969E-E5EECA708C4D}"
         "UpgradeCode" = "8:{1EFF111F-04AC-49BD-BFEF-AC3FA1186970}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:1.0.15"
+        "ProductVersion" = "8:1.0.19"
         "Manufacturer" = "8:Groestlcoin"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"
@@ -1042,7 +1042,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_F76F036ACD6E4B6AB95EA57FAA62CC42"
             {
-            "SourcePath" = "8:..\\GroestlCoin EasyMiner 2017\\obj\\Release\\GroestlCoin EasyMiner 2017.exe"
+            "SourcePath" = "8:..\\GroestlCoin EasyMiner 2017\\obj\\Debug\\GroestlCoin EasyMiner 2018.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_A6604F32A1494E57AA41A0C56B1AC222"

diff --git a/GroestlCoin EasyMiner 2017/About.xaml b/GroestlCoin EasyMiner 2017/About.xaml
@@ -1,12 +1,13 @@
-<Window x:Class="GroestlCoin_EasyMiner_2017.About"
+<Window x:Class="GroestlCoin_EasyMiner_2018.About"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:GroestlCoin_EasyMiner_2017"
+        xmlns:local="clr-namespace:GroestlCoin_EasyMiner_2018"
         TextElement.Foreground="{DynamicResource MaterialDesignBody}"
         TextElement.FontWeight="Regular"
         TextElement.FontSize="13"
+        ShowInTaskbar="False"
         TextOptions.TextFormattingMode="Ideal" 
         TextOptions.TextRenderingMode="Auto"      
         ResizeMode="NoResize"
@@ -25,13 +26,13 @@
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Window.Resources>
-    <Border BorderThickness="2" BorderBrush="White" CornerRadius="5">
+    <Border BorderThickness="2" BorderBrush="{StaticResource LightColor}" CornerRadius="5">
     <Grid Margin="0">
         <Grid.RowDefinitions>
             <RowDefinition Height="25px"></RowDefinition>
             <RowDefinition Height="Auto"></RowDefinition>
         </Grid.RowDefinitions>
-        <local:Titlebar BorderThickness="0" IsMainWindow="False"></local:Titlebar>
+        <local:Titlebar BorderThickness="0" IsMainWindow="False" IsAbout="True"></local:Titlebar>
         <Grid Margin="5,10,5,10" Grid.Row="1">
            <Grid.ColumnDefinitions>
                <ColumnDefinition Width="Auto"></ColumnDefinition>
@@ -49,35 +50,35 @@
                 <RowDefinition/>
             </Grid.RowDefinitions>
             <Rectangle Grid.Row="0" Grid.Column="0" Fill="{StaticResource GrsLogo}" Height="48" Width="48" HorizontalAlignment="Center"/>
-            <Label Grid.Row="0" Grid.Column="1" Style="{StaticResource LabelLight}" FontSize="26" VerticalAlignment="Center" Foreground="White" HorizontalAlignment="Right">Groestlcoin Easyminer</Label>
-            <Label Grid.Row="1" Style="{StaticResource LabelLight}" FontSize="12" VerticalAlignment="Center" Foreground="White" HorizontalAlignment="Right">Website:</Label>
-            <Label Grid.Row="2" Style="{StaticResource LabelLight}" FontSize="12" VerticalAlignment="Center" Foreground="White" HorizontalAlignment="Right">Facebook:</Label>
-            <Label Grid.Row="3" Style="{StaticResource LabelLight}" FontSize="12" VerticalAlignment="Center" Foreground="White" HorizontalAlignment="Right">Twitter:</Label>
-            <Label Grid.Row="4" Style="{StaticResource LabelLight}" FontSize="12" VerticalAlignment="Center" Foreground="White" HorizontalAlignment="Right">Reddit:</Label>
-            <Label Grid.Row="5" Style="{StaticResource LabelLight}" FontSize="12" VerticalAlignment="Center" Foreground="White" HorizontalAlignment="Right">Discord:</Label>
-            <Label Grid.Row="6" Style="{StaticResource LabelLight}" FontSize="12" VerticalAlignment="Center" Foreground="White" HorizontalAlignment="Right">Github:</Label>
-            <Label Grid.Row="7" Style="{StaticResource LabelLight}" FontSize="12" VerticalAlignment="Center" Foreground="White" HorizontalAlignment="Right">Developer:</Label>
-            <Label Grid.Row="8" Style="{StaticResource LabelLight}" FontSize="12" VerticalAlignment="Center" Foreground="White" HorizontalAlignment="Right">Donate:</Label>
-            <TextBlock Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" Foreground="White">
-                <Hyperlink NavigateUri="https://www.groestlcoin.org" Foreground="White" RequestNavigate="Hyperlink_OnRequestNavigate">https://www.groestlcoin.org</Hyperlink>
+            <Label Grid.Row="0" Grid.Column="1" Style="{StaticResource LabelLight}" FontSize="26" VerticalAlignment="Center" Foreground="{StaticResource LightColor}" HorizontalAlignment="Right">Groestlcoin Easyminer</Label>
+            <Label Grid.Row="1" Style="{StaticResource LabelLight}" FontSize="12" VerticalAlignment="Center" Foreground="{StaticResource LightColor}" HorizontalAlignment="Right">Website:</Label>
+            <Label Grid.Row="2" Style="{StaticResource LabelLight}" FontSize="12" VerticalAlignment="Center" Foreground="{StaticResource LightColor}" HorizontalAlignment="Right">Facebook:</Label>
+            <Label Grid.Row="3" Style="{StaticResource LabelLight}" FontSize="12" VerticalAlignment="Center" Foreground="{StaticResource LightColor}" HorizontalAlignment="Right">Twitter:</Label>
+            <Label Grid.Row="4" Style="{StaticResource LabelLight}" FontSize="12" VerticalAlignment="Center" Foreground="{StaticResource LightColor}" HorizontalAlignment="Right">Reddit:</Label>
+            <Label Grid.Row="5" Style="{StaticResource LabelLight}" FontSize="12" VerticalAlignment="Center" Foreground="{StaticResource LightColor}" HorizontalAlignment="Right">Discord:</Label>
+            <Label Grid.Row="6" Style="{StaticResource LabelLight}" FontSize="12" VerticalAlignment="Center" Foreground="{StaticResource LightColor}" HorizontalAlignment="Right">Github:</Label>
+            <Label Grid.Row="7" Style="{StaticResource LabelLight}" FontSize="12" VerticalAlignment="Center" Foreground="{StaticResource LightColor}" HorizontalAlignment="Right">Developer:</Label>
+            <Label Grid.Row="8" Style="{StaticResource LabelLight}" FontSize="12" VerticalAlignment="Center" Foreground="{StaticResource LightColor}" HorizontalAlignment="Right">Donate:</Label>
+            <TextBlock Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" Foreground="{StaticResource LightColor}">
+                <Hyperlink NavigateUri="https://www.groestlcoin.org" Foreground="{StaticResource LightColor}" RequestNavigate="Hyperlink_OnRequestNavigate">https://www.groestlcoin.org</Hyperlink>
             </TextBlock>
-            <TextBlock Grid.Row="2" Grid.Column="1" VerticalAlignment="Center" Foreground="White">
-                <Hyperlink NavigateUri="https://www.facebook.com/groestlcoin" Foreground="White" RequestNavigate="Hyperlink_OnRequestNavigate">https://www.facebook.com/groestlcoin</Hyperlink>
+            <TextBlock Grid.Row="2" Grid.Column="1" VerticalAlignment="Center" Foreground="{StaticResource LightColor}">
+                <Hyperlink NavigateUri="https://www.facebook.com/groestlcoin" Foreground="{StaticResource LightColor}" RequestNavigate="Hyperlink_OnRequestNavigate">https://www.facebook.com/groestlcoin</Hyperlink>
             </TextBlock>
-            <TextBlock Grid.Row="3" Grid.Column="1" VerticalAlignment="Center" Foreground="White">
-                <Hyperlink NavigateUri="https://twitter.com/GroestlcoinTeam" Foreground="White" RequestNavigate="Hyperlink_OnRequestNavigate">https://twitter.com/GroestlcoinTeam</Hyperlink>
+            <TextBlock Grid.Row="3" Grid.Column="1" VerticalAlignment="Center" Foreground="{StaticResource LightColor}">
+                <Hyperlink NavigateUri="https://twitter.com/GroestlcoinTeam" Foreground="{StaticResource LightColor}" RequestNavigate="Hyperlink_OnRequestNavigate">https://twitter.com/GroestlcoinTeam</Hyperlink>
             </TextBlock>
-            <TextBlock Grid.Row="4" Grid.Column="1" VerticalAlignment="Center" Foreground="White">
-                <Hyperlink NavigateUri="https://www.reddit.com/r/groestlcoin/" Foreground="White" RequestNavigate="Hyperlink_OnRequestNavigate">https://www.reddit.com/r/groestlcoin/</Hyperlink>
+            <TextBlock Grid.Row="4" Grid.Column="1" VerticalAlignment="Center" Foreground="{StaticResource LightColor}">
+                <Hyperlink NavigateUri="https://www.reddit.com/r/groestlcoin/" Foreground="{StaticResource LightColor}" RequestNavigate="Hyperlink_OnRequestNavigate">https://www.reddit.com/r/groestlcoin/</Hyperlink>
             </TextBlock>
-            <TextBlock Grid.Row="5" Grid.Column="1" VerticalAlignment="Center" Foreground="White">
-                <Hyperlink NavigateUri="https://discord.gg/8VURndr" Foreground="White" RequestNavigate="Hyperlink_OnRequestNavigate">https://discord.gg/8VURndr</Hyperlink>
+            <TextBlock Grid.Row="5" Grid.Column="1" VerticalAlignment="Center" Foreground="{StaticResource LightColor}">
+                <Hyperlink NavigateUri="https://discord.gg/8VURndr" Foreground="{StaticResource LightColor}" RequestNavigate="Hyperlink_OnRequestNavigate">https://discord.gg/8VURndr</Hyperlink>
             </TextBlock>
-            <TextBlock Grid.Row="6" Grid.Column="1" VerticalAlignment="Center" Foreground="White">
-                <Hyperlink NavigateUri="https://github.com/Groestlcoin/" Foreground="White" RequestNavigate="Hyperlink_OnRequestNavigate">https://github.com/Groestlcoin/</Hyperlink>
+            <TextBlock Grid.Row="6" Grid.Column="1" VerticalAlignment="Center" Foreground="{StaticResource LightColor}">
+                <Hyperlink NavigateUri="https://github.com/Groestlcoin/" Foreground="{StaticResource LightColor}" RequestNavigate="Hyperlink_OnRequestNavigate">https://github.com/Groestlcoin/</Hyperlink>
             </TextBlock>
-            <TextBlock Grid.Row="7" Grid.Column="1" VerticalAlignment="Center" Foreground="White">Yokomoko</TextBlock>
-            <TextBox Grid.Row="8" Grid.Column="1" IsReadOnly="True" Height="25" Foreground="White" BorderThickness="0" BorderBrush="{DynamicResource LightColor}" CaretBrush="{DynamicResource LightColor}" HorizontalAlignment="Left">FX31y8bTongNXqMuDQMxFtf79L3wXpi3oz</TextBox>
+            <TextBlock Grid.Row="7" Grid.Column="1" VerticalAlignment="Center" Foreground="{StaticResource LightColor}">Yokomoko</TextBlock>
+            <TextBox Grid.Row="8" Grid.Column="1" IsReadOnly="True" Height="25" Foreground="{StaticResource LightColor}" BorderThickness="0" BorderBrush="{DynamicResource LightColor}" CaretBrush="{DynamicResource LightColor}" HorizontalAlignment="Left">FX31y8bTongNXqMuDQMxFtf79L3wXpi3oz</TextBox>
         </Grid>
     </Grid>
     </Border>

diff --git a/GroestlCoin EasyMiner 2017/About.xaml.cs b/GroestlCoin EasyMiner 2017/About.xaml.cs
@@ -14,7 +14,7 @@
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace GroestlCoin_EasyMiner_2017 {
+namespace GroestlCoin_EasyMiner_2018 {
     /// <summary>
     /// Interaction logic for About.xaml
     /// </summary>

diff --git a/GroestlCoin EasyMiner 2017/App.config b/GroestlCoin EasyMiner 2017/App.config
@@ -2,14 +2,14 @@
 <configuration>
     <configSections>
         <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-            <section name="GroestlCoin_EasyMiner_2017.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+            <section name="GroestlCoin_EasyMiner_2018.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
         </sectionGroup>
     </configSections>
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
     </startup>
     <userSettings>
-        <GroestlCoin_EasyMiner_2017.Properties.Settings>
+        <GroestlCoin_EasyMiner_2018.Properties.Settings>
             <setting name="GrsWalletAddress" serializeAs="String">
                 <value />
             </setting>
@@ -43,6 +43,6 @@
             <setting name="FirstLaunch" serializeAs="String">
                 <value>True</value>
             </setting>
-        </GroestlCoin_EasyMiner_2017.Properties.Settings>
+        </GroestlCoin_EasyMiner_2018.Properties.Settings>
     </userSettings>
 </configuration>