1.7.7

[Changed] - Bigger buttons for Info & co. (Add Check now function for updates #48) - added license text [Bug fixes] - Some ui glitches
Codectory · Dec 3, 2021 · 00cb2a7 · 00cb2a7
1 parent 5abef94
commit 00cb2a7
Show file tree

Hide file tree

Showing 22 changed files with 999 additions and 201 deletions.
diff --git a/Source/HDRProfile/App.xaml b/Source/HDRProfile/App.xaml
@@ -18,10 +18,6 @@
 
         <system:String x:Key="DonateLink">https://paypal.me/HeikoH89</system:String>
         <system:String x:Key="GitHubRepoLink">https://github.com/Codectory/AutoHDR</system:String>
-
-
-
-
         <Color x:Key="ActiveColor">#2ac987</Color>
         <Color x:Key="AccentColor">#ff6666</Color>
 
@@ -66,7 +62,7 @@
         <Color x:Key="HeaderTopColor">#FFC5CBF9</Color>
         <Color x:Key="DatagridCurrentCellBorderColor">Black</Color>
         <Color x:Key="SliderTrackDarkColor">#FFC5CBF9</Color>
-
+        <system:Double x:Key="DefaultFontSize">15</system:Double>
 
 
         <Color x:Key="NavButtonFrameColor">#fa4d4d</Color>
@@ -125,9 +121,20 @@
         <StaticResource x:Key="ButtonBackgroundBrush"  ResourceKey="AccentBrush"/>
         <CornerRadius x:Key="CornerRadius">3</CornerRadius>
 
-        <Style TargetType="TextBlock" >
+        <Style x:Key="DefaultLabel" TargetType="Label">
+            <Setter Property="FontSize" Value="{StaticResource DefaultFontSize}"/>
+        </Style>
+        <Style TargetType="Label" BasedOn="{StaticResource DefaultLabel}"/>
+
+
+
+        <Style x:Key="DefaultTextBlock" TargetType="TextBlock">
+            <Setter Property="FontSize" Value="15"/>
             <Setter Property="Foreground" Value="Black"/>
+
         </Style>
+        <Style TargetType="TextBlock" BasedOn="{StaticResource DefaultTextBlock}"/>
+
 
         <Style x:Key="RoundedBorder" TargetType="Border">
             <Setter Property="CornerRadius" Value="{StaticResource CornerRadius}"/>
@@ -148,6 +155,8 @@
 
         <Style x:Key="DefaultTextBox" TargetType="TextBox" >
             <Setter Property="BorderThickness" Value="0"/>
+            <Setter Property="FontSize" Value="{StaticResource DefaultFontSize}"/>
+
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="TextBoxBase">
@@ -190,11 +199,12 @@
         </Style>
         <Style TargetType="TextBox" BasedOn="{StaticResource DefaultTextBox}"/>
 
-
         <Style x:Key="DefaultButton" TargetType="Button" >
             <Setter Property="Background" Value="{StaticResource AccentBrush}"/>
             <Setter Property="Foreground" Value="{StaticResource ButtonForegroundBrush}"/>
             <Setter Property="Height" Value="25"/>
+            <Setter Property="FontSize" Value="20"/>
+
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="Button">
@@ -272,6 +282,11 @@
 
             <Setter Property="SnapsToDevicePixels"
           Value="true" />
+
+            <Setter Property="Height"
+          Value="25" />
+            <Setter Property="Width"
+          Value="25" />
             <Setter Property="OverridesDefaultStyle"
           Value="true" />
             <Setter Property="FocusVisualStyle"
@@ -281,7 +296,7 @@
                     <ControlTemplate TargetType="{x:Type CheckBox}">
                         <BulletDecorator Background="Transparent">
                             <BulletDecorator.Bullet>
-                                <Border x:Name="Border" Width="15" Height="15" CornerRadius="{StaticResource CornerRadius}" BorderThickness="1" BorderBrush="{DynamicResource AccentBrush}">
+                                <Border x:Name="Border" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" CornerRadius="{StaticResource CornerRadius}" BorderThickness="1" BorderBrush="{DynamicResource AccentBrush}">
                                     <Border.Background>
                                         <SolidColorBrush Color="Transparent"/>
                                     </Border.Background>
@@ -640,7 +655,6 @@
         </Style>
         <Style TargetType="ComboBox" BasedOn="{StaticResource DefaultComboBox}"/>
 
-
         <Style x:Key="DefaultTabHeader" TargetType="TabItem">
             <Setter Property="Background" Value="{StaticResource AccentBrush}"/>
             <Setter Property="Foreground" Value="{StaticResource ButtonForegroundBrush}"/>
@@ -655,12 +669,15 @@
                             <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsSelected}" Value="True" >
                                 <Setter TargetName="HeaderContent"  Property="Foreground" Value="{StaticResource ButtonForegroundBrush}"/>
                                 <Setter TargetName="HeaderBorder" Property="Background" Value="{StaticResource AccentBrush}"/>
-                                <Setter TargetName="HeaderContent" Property="FontSize" Value="18"/>
+                                <Setter TargetName="HeaderContent" Property="FontSize" Value="{StaticResource DefaultFontSize}"/>
+                                <Setter TargetName="HeaderContent" Property="FontWeight" Value="DemiBold"/>
 
                             </DataTrigger>
 
                             <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsSelected}" Value="False" >
                                 <Setter  TargetName="HeaderContent" Property="Foreground" Value="Black"/>
+                                <Setter TargetName="HeaderContent" Property="FontSize" Value="{StaticResource DefaultFontSize}"/>
+
                             </DataTrigger>
 
                         </ControlTemplate.Triggers>
@@ -788,6 +805,9 @@
         <DataTemplate DataType="{x:Type info:AutoHDRInfo}">
             <views:AutoHDRInfoView></views:AutoHDRInfoView>
         </DataTemplate>
+        <DataTemplate DataType="{x:Type info:AutoHDRLicense}">
+            <views:AutoHDRLicenseView></views:AutoHDRLicenseView>
+        </DataTemplate>
         <DataTemplate DataType="{x:Type info:LogsStorage}">
             <views:AutoHDRLogsView></views:AutoHDRLogsView>
         </DataTemplate>

diff --git a/Source/HDRProfile/AutoHDR.csproj b/Source/HDRProfile/AutoHDR.csproj
@@ -192,6 +192,7 @@
     <Compile Include="Displays\DisplayInterop.cs" />
     <Compile Include="FastObservableCollection.cs" />
     <Compile Include="Globals.cs" />
+    <Compile Include="Info\AutoHDRLicense.cs" />
     <Compile Include="Info\LogsStorage.cs" />
     <Compile Include="Profiles\Actions\ActionEndResult.cs" />
     <Compile Include="Profiles\Actions\ActionTypeDescription.cs" />
@@ -210,10 +211,18 @@
     <Compile Include="Profiles\Actions\ProfileActionBase.cs" />
     <Compile Include="Profiles\Profile.cs" />
     <Compile Include="Profiles\ProfileMode.cs" />
+    <Compile Include="ProjectResources\Locale_Texts.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Locale_Texts.resx</DependentUpon>
+    </Compile>
     <Compile Include="SortedObservableCollection.cs" />
     <Compile Include="Views\AudioActionView.xaml.cs">
       <DependentUpon>AudioActionView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\AutoHDRLicenseView.xaml.cs">
+      <DependentUpon>AutoHDRLicenseView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\AutoHDRLogsView.xaml.cs">
       <DependentUpon>AutoHDRLogsView.xaml</DependentUpon>
     </Compile>
@@ -251,11 +260,6 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Locale_Texts.de.resx</DependentUpon>
     </Compile>
-    <Compile Include="ProjectResources\Locale_Texts.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Locale_Texts.resx</DependentUpon>
-    </Compile>
     <Compile Include="NightLightManager.cs" />
     <Compile Include="TrayMenuHelper.cs" />
     <Compile Include="UWP\AppxManifest.cs" />
@@ -265,6 +269,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Views\AutoHDRLicenseView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\AutoHDRLogsView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -365,8 +373,8 @@
     </EmbeddedResource>
     <EmbeddedResource Include="ProjectResources\Locale_Texts.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Locale_Texts.Designer.cs</LastGenOutput>
       <SubType>Designer</SubType>
+      <LastGenOutput>Locale_Texts.Designer.cs</LastGenOutput>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
@@ -411,6 +419,9 @@
     <EmbeddedResource Include="Costura32\HDRController.dll" />
     <EmbeddedResource Include="Costura64\HDRController.dll" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\beer.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\Fody.6.0.0\build\Fody.targets" Condition="Exists('..\packages\Fody.6.0.0\build\Fody.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

diff --git a/Source/HDRProfile/AutoHDRDaemon.cs b/Source/HDRProfile/AutoHDRDaemon.cs
@@ -55,6 +55,7 @@ public class AutoHDRDaemon : BaseViewModel
         public RelayCommand<Profile> RemoveProfileCommand { get; private set; }
         public RelayCommand ShowInfoCommand { get; private set; }
         public RelayCommand ShowLogsCommand { get; private set; }
+        public RelayCommand ShowLicenseCommand { get; private set; }
 
 
         public RelayCommand LoadingCommand { get; private set; }
@@ -293,6 +294,7 @@ private void CreateRelayCommands()
             ClosingCommand = new RelayCommand(Closing);
             ShutdownCommand = new RelayCommand(Shutdown);
             StartApplicationCommand = new RelayCommand<ApplicationItem>(StartApplication);
+            ShowLicenseCommand = new RelayCommand(ShowLicense);
             ShowInfoCommand = new RelayCommand(ShowInfo);
             ShowLogsCommand = new RelayCommand(ShowLogs);
 
@@ -631,6 +633,13 @@ private void ShowLogs()
                 DialogService.ShowDialogModal(_logsStorage, new System.Drawing.Size(600, 1000));
         }
 
+        private void ShowLicense()
+        {
+            if (DialogService != null)
+                DialogService.ShowDialogModal(new AutoHDRLicense(), new System.Drawing.Size(600, 1000));
+        }
+
+
         private void ShowInfo(GitHubData data)
         {
             AutoHDRInfo info;

diff --git a/Source/HDRProfile/Info/AutoHDRLicense.cs b/Source/HDRProfile/Info/AutoHDRLicense.cs
@@ -0,0 +1,13 @@
+using CodectoryCore.UI.Wpf;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AutoHDR.Info
+{
+    public class AutoHDRLicense : DialogViewModelBase
+    {
+    }
+}
diff --git a/Source/HDRProfile/ProjectResources/Locale_Texts.Designer.cs b/Source/HDRProfile/ProjectResources/Locale_Texts.Designer.cs
diff --git a/Source/HDRProfile/ProjectResources/Locale_Texts.de.resx b/Source/HDRProfile/ProjectResources/Locale_Texts.de.resx
@@ -127,10 +127,13 @@
     <value>HDR aktivieren</value>
   </data>
   <data name="AddApplication" xml:space="preserve">
-    <value>Anwendung hinzufügen</value>
+    <value>Hinzufügen</value>
+  </data>
+  <data name="AddProfile" xml:space="preserve">
+    <value>Hinzufügen</value>
   </data>
   <data name="AddProfileAction" xml:space="preserve">
-    <value>Aktion hinzufügen</value>
+    <value>Hinzufügen</value>
   </data>
   <data name="AllDisplays" xml:space="preserve">
     <value>Alle Displays</value>
@@ -258,6 +261,9 @@
   <data name="LastAction" xml:space="preserve">
     <value>Letzte Aktion</value>
   </data>
+  <data name="License" xml:space="preserve">
+    <value>License</value>
+  </data>
   <data name="Local" xml:space="preserve">
     <value>Lokal</value>
   </data>
@@ -316,7 +322,10 @@
     <value>Veröffentlichung</value>
   </data>
   <data name="RemoveApplication" xml:space="preserve">
-    <value>Anwendung entfernen</value>
+    <value>Entfernen</value>
+  </data>
+  <data name="RemoveProfile" xml:space="preserve">
+    <value>Entfernen</value>
   </data>
   <data name="Resolution" xml:space="preserve">
     <value>Auflösung</value>