Skip to content

Commit 00cb2a7

Browse files
CodectoryCodectory
committed
1.7.7
[Changed] - Bigger buttons for Info & co. (Add Check now function for updates #48) - added license text [Bug fixes] - Some ui glitches
1 parent 5abef94 commit 00cb2a7

22 files changed

+999
-201
lines changed

‎Source/HDRProfile/App.xaml

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818

1919
<system:String x:Key="DonateLink">https://paypal.me/HeikoH89</system:String>
2020
<system:String x:Key="GitHubRepoLink">https://github.com/Codectory/AutoHDR</system:String>
21-
22-
23-
24-
2521
<Color x:Key="ActiveColor">#2ac987</Color>
2622
<Color x:Key="AccentColor">#ff6666</Color>
2723

@@ -66,7 +62,7 @@
6662
<Color x:Key="HeaderTopColor">#FFC5CBF9</Color>
6763
<Color x:Key="DatagridCurrentCellBorderColor">Black</Color>
6864
<Color x:Key="SliderTrackDarkColor">#FFC5CBF9</Color>
69-
65+
<system:Double x:Key="DefaultFontSize">15</system:Double>
7066

7167

7268
<Color x:Key="NavButtonFrameColor">#fa4d4d</Color>
@@ -125,9 +121,20 @@
125121
<StaticResource x:Key="ButtonBackgroundBrush" ResourceKey="AccentBrush"/>
126122
<CornerRadius x:Key="CornerRadius">3</CornerRadius>
127123

128-
<Style TargetType="TextBlock" >
124+
<Style x:Key="DefaultLabel" TargetType="Label">
125+
<Setter Property="FontSize" Value="{StaticResource DefaultFontSize}"/>
126+
</Style>
127+
<Style TargetType="Label" BasedOn="{StaticResource DefaultLabel}"/>
128+
129+
130+
131+
<Style x:Key="DefaultTextBlock" TargetType="TextBlock">
132+
<Setter Property="FontSize" Value="15"/>
129133
<Setter Property="Foreground" Value="Black"/>
134+
130135
</Style>
136+
<Style TargetType="TextBlock" BasedOn="{StaticResource DefaultTextBlock}"/>
137+
131138

132139
<Style x:Key="RoundedBorder" TargetType="Border">
133140
<Setter Property="CornerRadius" Value="{StaticResource CornerRadius}"/>
@@ -148,6 +155,8 @@
148155

149156
<Style x:Key="DefaultTextBox" TargetType="TextBox" >
150157
<Setter Property="BorderThickness" Value="0"/>
158+
<Setter Property="FontSize" Value="{StaticResource DefaultFontSize}"/>
159+
151160
<Setter Property="Template">
152161
<Setter.Value>
153162
<ControlTemplate TargetType="TextBoxBase">
@@ -190,11 +199,12 @@
190199
</Style>
191200
<Style TargetType="TextBox" BasedOn="{StaticResource DefaultTextBox}"/>
192201

193-
194202
<Style x:Key="DefaultButton" TargetType="Button" >
195203
<Setter Property="Background" Value="{StaticResource AccentBrush}"/>
196204
<Setter Property="Foreground" Value="{StaticResource ButtonForegroundBrush}"/>
197205
<Setter Property="Height" Value="25"/>
206+
<Setter Property="FontSize" Value="20"/>
207+
198208
<Setter Property="Template">
199209
<Setter.Value>
200210
<ControlTemplate TargetType="Button">
@@ -272,6 +282,11 @@
272282

273283
<Setter Property="SnapsToDevicePixels"
274284
Value="true" />
285+
286+
<Setter Property="Height"
287+
Value="25" />
288+
<Setter Property="Width"
289+
Value="25" />
275290
<Setter Property="OverridesDefaultStyle"
276291
Value="true" />
277292
<Setter Property="FocusVisualStyle"
@@ -281,7 +296,7 @@
281296
<ControlTemplate TargetType="{x:Type CheckBox}">
282297
<BulletDecorator Background="Transparent">
283298
<BulletDecorator.Bullet>
284-
<Border x:Name="Border" Width="15" Height="15" CornerRadius="{StaticResource CornerRadius}" BorderThickness="1" BorderBrush="{DynamicResource AccentBrush}">
299+
<Border x:Name="Border" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" CornerRadius="{StaticResource CornerRadius}" BorderThickness="1" BorderBrush="{DynamicResource AccentBrush}">
285300
<Border.Background>
286301
<SolidColorBrush Color="Transparent"/>
287302
</Border.Background>
@@ -640,7 +655,6 @@
640655
</Style>
641656
<Style TargetType="ComboBox" BasedOn="{StaticResource DefaultComboBox}"/>
642657

643-
644658
<Style x:Key="DefaultTabHeader" TargetType="TabItem">
645659
<Setter Property="Background" Value="{StaticResource AccentBrush}"/>
646660
<Setter Property="Foreground" Value="{StaticResource ButtonForegroundBrush}"/>
@@ -655,12 +669,15 @@
655669
<DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsSelected}" Value="True" >
656670
<Setter TargetName="HeaderContent" Property="Foreground" Value="{StaticResource ButtonForegroundBrush}"/>
657671
<Setter TargetName="HeaderBorder" Property="Background" Value="{StaticResource AccentBrush}"/>
658-
<Setter TargetName="HeaderContent" Property="FontSize" Value="18"/>
672+
<Setter TargetName="HeaderContent" Property="FontSize" Value="{StaticResource DefaultFontSize}"/>
673+
<Setter TargetName="HeaderContent" Property="FontWeight" Value="DemiBold"/>
659674

660675
</DataTrigger>
661676

662677
<DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsSelected}" Value="False" >
663678
<Setter TargetName="HeaderContent" Property="Foreground" Value="Black"/>
679+
<Setter TargetName="HeaderContent" Property="FontSize" Value="{StaticResource DefaultFontSize}"/>
680+
664681
</DataTrigger>
665682

666683
</ControlTemplate.Triggers>
@@ -788,6 +805,9 @@
788805
<DataTemplate DataType="{x:Type info:AutoHDRInfo}">
789806
<views:AutoHDRInfoView></views:AutoHDRInfoView>
790807
</DataTemplate>
808+
<DataTemplate DataType="{x:Type info:AutoHDRLicense}">
809+
<views:AutoHDRLicenseView></views:AutoHDRLicenseView>
810+
</DataTemplate>
791811
<DataTemplate DataType="{x:Type info:LogsStorage}">
792812
<views:AutoHDRLogsView></views:AutoHDRLogsView>
793813
</DataTemplate>

‎Source/HDRProfile/AutoHDR.csproj

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@
192192
<Compile Include="Displays\DisplayInterop.cs" />
193193
<Compile Include="FastObservableCollection.cs" />
194194
<Compile Include="Globals.cs" />
195+
<Compile Include="Info\AutoHDRLicense.cs" />
195196
<Compile Include="Info\LogsStorage.cs" />
196197
<Compile Include="Profiles\Actions\ActionEndResult.cs" />
197198
<Compile Include="Profiles\Actions\ActionTypeDescription.cs" />
@@ -210,10 +211,18 @@
210211
<Compile Include="Profiles\Actions\ProfileActionBase.cs" />
211212
<Compile Include="Profiles\Profile.cs" />
212213
<Compile Include="Profiles\ProfileMode.cs" />
214+
<Compile Include="ProjectResources\Locale_Texts.Designer.cs">
215+
<AutoGen>True</AutoGen>
216+
<DesignTime>True</DesignTime>
217+
<DependentUpon>Locale_Texts.resx</DependentUpon>
218+
</Compile>
213219
<Compile Include="SortedObservableCollection.cs" />
214220
<Compile Include="Views\AudioActionView.xaml.cs">
215221
<DependentUpon>AudioActionView.xaml</DependentUpon>
216222
</Compile>
223+
<Compile Include="Views\AutoHDRLicenseView.xaml.cs">
224+
<DependentUpon>AutoHDRLicenseView.xaml</DependentUpon>
225+
</Compile>
217226
<Compile Include="Views\AutoHDRLogsView.xaml.cs">
218227
<DependentUpon>AutoHDRLogsView.xaml</DependentUpon>
219228
</Compile>
@@ -251,11 +260,6 @@
251260
<DesignTime>True</DesignTime>
252261
<DependentUpon>Locale_Texts.de.resx</DependentUpon>
253262
</Compile>
254-
<Compile Include="ProjectResources\Locale_Texts.Designer.cs">
255-
<AutoGen>True</AutoGen>
256-
<DesignTime>True</DesignTime>
257-
<DependentUpon>Locale_Texts.resx</DependentUpon>
258-
</Compile>
259263
<Compile Include="NightLightManager.cs" />
260264
<Compile Include="TrayMenuHelper.cs" />
261265
<Compile Include="UWP\AppxManifest.cs" />
@@ -265,6 +269,10 @@
265269
<Generator>MSBuild:Compile</Generator>
266270
<SubType>Designer</SubType>
267271
</Page>
272+
<Page Include="Views\AutoHDRLicenseView.xaml">
273+
<Generator>MSBuild:Compile</Generator>
274+
<SubType>Designer</SubType>
275+
</Page>
268276
<Page Include="Views\AutoHDRLogsView.xaml">
269277
<Generator>MSBuild:Compile</Generator>
270278
<SubType>Designer</SubType>
@@ -365,8 +373,8 @@
365373
</EmbeddedResource>
366374
<EmbeddedResource Include="ProjectResources\Locale_Texts.resx">
367375
<Generator>PublicResXFileCodeGenerator</Generator>
368-
<LastGenOutput>Locale_Texts.Designer.cs</LastGenOutput>
369376
<SubType>Designer</SubType>
377+
<LastGenOutput>Locale_Texts.Designer.cs</LastGenOutput>
370378
</EmbeddedResource>
371379
<EmbeddedResource Include="Properties\Resources.resx">
372380
<Generator>ResXFileCodeGenerator</Generator>
@@ -411,6 +419,9 @@
411419
<EmbeddedResource Include="Costura32\HDRController.dll" />
412420
<EmbeddedResource Include="Costura64\HDRController.dll" />
413421
</ItemGroup>
422+
<ItemGroup>
423+
<Resource Include="Resources\beer.png" />
424+
</ItemGroup>
414425
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
415426
<Import Project="..\packages\Fody.6.0.0\build\Fody.targets" Condition="Exists('..\packages\Fody.6.0.0\build\Fody.targets')" />
416427
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

‎Source/HDRProfile/AutoHDRDaemon.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ public class AutoHDRDaemon : BaseViewModel
5555
public RelayCommand<Profile> RemoveProfileCommand { get; private set; }
5656
public RelayCommand ShowInfoCommand { get; private set; }
5757
public RelayCommand ShowLogsCommand { get; private set; }
58+
public RelayCommand ShowLicenseCommand { get; private set; }
5859

5960

6061
public RelayCommand LoadingCommand { get; private set; }
@@ -293,6 +294,7 @@ private void CreateRelayCommands()
293294
ClosingCommand = new RelayCommand(Closing);
294295
ShutdownCommand = new RelayCommand(Shutdown);
295296
StartApplicationCommand = new RelayCommand<ApplicationItem>(StartApplication);
297+
ShowLicenseCommand = new RelayCommand(ShowLicense);
296298
ShowInfoCommand = new RelayCommand(ShowInfo);
297299
ShowLogsCommand = new RelayCommand(ShowLogs);
298300

@@ -631,6 +633,13 @@ private void ShowLogs()
631633
DialogService.ShowDialogModal(_logsStorage, new System.Drawing.Size(600, 1000));
632634
}
633635

636+
private void ShowLicense()
637+
{
638+
if (DialogService != null)
639+
DialogService.ShowDialogModal(new AutoHDRLicense(), new System.Drawing.Size(600, 1000));
640+
}
641+
642+
634643
private void ShowInfo(GitHubData data)
635644
{
636645
AutoHDRInfo info;

‎Source/HDRProfile/Info/AutoHDRLicense.cs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
using CodectoryCore.UI.Wpf;
2+
using System;
3+
using System.Collections.Generic;
4+
using System.Linq;
5+
using System.Text;
6+
using System.Threading.Tasks;
7+
8+
namespace AutoHDR.Info
9+
{
10+
public class AutoHDRLicense : DialogViewModelBase
11+
{
12+
}
13+
}

‎Source/HDRProfile/ProjectResources/Locale_Texts.Designer.cs

Lines changed: 35 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Source/HDRProfile/ProjectResources/Locale_Texts.de.resx

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,13 @@
127127
<value>HDR aktivieren</value>
128128
</data>
129129
<data name="AddApplication" xml:space="preserve">
130-
<value>Anwendung hinzufügen</value>
130+
<value>Hinzufügen</value>
131+
</data>
132+
<data name="AddProfile" xml:space="preserve">
133+
<value>Hinzufügen</value>
131134
</data>
132135
<data name="AddProfileAction" xml:space="preserve">
133-
<value>Aktion hinzufügen</value>
136+
<value>Hinzufügen</value>
134137
</data>
135138
<data name="AllDisplays" xml:space="preserve">
136139
<value>Alle Displays</value>
@@ -258,6 +261,9 @@
258261
<data name="LastAction" xml:space="preserve">
259262
<value>Letzte Aktion</value>
260263
</data>
264+
<data name="License" xml:space="preserve">
265+
<value>License</value>
266+
</data>
261267
<data name="Local" xml:space="preserve">
262268
<value>Lokal</value>
263269
</data>
@@ -316,7 +322,10 @@
316322
<value>Veröffentlichung</value>
317323
</data>
318324
<data name="RemoveApplication" xml:space="preserve">
319-
<value>Anwendung entfernen</value>
325+
<value>Entfernen</value>
326+
</data>
327+
<data name="RemoveProfile" xml:space="preserve">
328+
<value>Entfernen</value>
320329
</data>
321330
<data name="Resolution" xml:space="preserve">
322331
<value>Auflösung</value>

0 commit comments

Comments
 (0)