Skip to content

Commit

Permalink
UI redesign + notification dialog
Browse files Browse the repository at this point in the history
  • Loading branch information
@NateShoffner
NateShoffner committed Jun 15, 2018
1 parent 653ea65 commit 817a143
Show file tree
Hide file tree
Showing 60 changed files with 708 additions and 7,257 deletions.
10 changes: 1 addition & 9 deletions DisableNvidiaTelemetry.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26228.9
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DisableNvidiaTelemetry", "DisableNvidiaTelemetry\DisableNvidiaTelemetry.csproj", "{C1F82E8F-C847-4C96-AA98-B0C2967296BC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DisableNvidiaTelemetryWPF", "DisableNvidiaTelemetryWPF\DisableNvidiaTelemetryWPF.csproj", "{96BD5143-61F8-4B32-A6DD-8125A4EFE8AA}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DisableNvidiaTelemetry", "DisableNvidiaTelemetry\DisableNvidiaTelemetry.csproj", "{96BD5143-61F8-4B32-A6DD-8125A4EFE8AA}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -14,12 +12,6 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{C1F82E8F-C847-4C96-AA98-B0C2967296BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C1F82E8F-C847-4C96-AA98-B0C2967296BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C1F82E8F-C847-4C96-AA98-B0C2967296BC}.Portable|Any CPU.ActiveCfg = Portable|Any CPU
{C1F82E8F-C847-4C96-AA98-B0C2967296BC}.Portable|Any CPU.Build.0 = Portable|Any CPU
{C1F82E8F-C847-4C96-AA98-B0C2967296BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C1F82E8F-C847-4C96-AA98-B0C2967296BC}.Release|Any CPU.Build.0 = Release|Any CPU
{96BD5143-61F8-4B32-A6DD-8125A4EFE8AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{96BD5143-61F8-4B32-A6DD-8125A4EFE8AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{96BD5143-61F8-4B32-A6DD-8125A4EFE8AA}.Portable|Any CPU.ActiveCfg = Portable|Any CPU
Expand Down
54 changes: 30 additions & 24 deletions DisableNvidiaTelemetry/App.config
View file
Original file line number Diff line number Diff line change
@@ -1,46 +1,52 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>

<configuration>
<configSections>
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="DisableNvidiaTelemetry.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
<sectionGroup name="userSettings"
type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="DisableNvidiaTelemetry.Properties.Settings"
type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
allowExeDefinition="MachineToLocalUser" requirePermission="false" />
</sectionGroup>
</configSections>
<log4net>
<appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender">
<lockingModel type="log4net.Appender.FileAppender+MinimalLock"/>
<file type="log4net.Util.PatternString" value="%property{LogDirectory}\"/>
<datePattern value="yyyy-MM-dd'.log'"/>
<staticLogFileName value="false"/>
<appendToFile value="true"/>
<rollingStyle value="Composite"/>
<maxSizeRollBackups value="10"/>
<maximumFileSize value="5MB"/>
<lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
<file type="log4net.Util.PatternString" value="%property{LogDirectory}\" />
<datePattern value="yyyy-MM-dd'.log'" />
<staticLogFileName value="false" />
<appendToFile value="true" />
<rollingStyle value="Composite" />
<maxSizeRollBackups value="10" />
<maximumFileSize value="5MB" />
<layout type="log4net.Layout.PatternLayout">
<header value="[BEGIN LOGGING AT %date{yyyy-MM-dd HH:mm:ss}]%newline%property{HeaderInfo}%newline" type="log4net.Util.PatternString"/>
<conversionPattern value="[%date{yyyy-MM-dd HH:mm:ss}] [%level] - %message%newline"/>
<footer value="[END LOGGING AT %date{yyyy-MM-dd HH:mm:ss}]%newline" type="log4net.Util.PatternString"/>
<header value="[BEGIN LOGGING AT %date{yyyy-MM-dd HH:mm:ss}]%newline%property{HeaderInfo}%newline"
type="log4net.Util.PatternString" />
<conversionPattern value="[%date{yyyy-MM-dd HH:mm:ss}] [%level] - %message%newline" />
<footer value="[END LOGGING AT %date{yyyy-MM-dd HH:mm:ss}]%newline" type="log4net.Util.PatternString" />
</layout>
</appender>
<appender name="EventLogAppender" type="log4net.Appender.EventLogAppender">
<param name="ApplicationName" value="Disable Nvidia Telemetry"/>
<param name="ApplicationName" value="Disable Nvidia Telemetry" />
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="[%date{yyyy-MM-dd HH:mm:ss}] [%level] - %message%newline"/>
<conversionPattern value="[%date{yyyy-MM-dd HH:mm:ss}] [%level] - %message%newline" />
</layout>
</appender>
<logger name="FileLogger">
<level value="ALL"/>
<appender-ref ref="LogFileAppender"/>
<level value="ALL" />
<appender-ref ref="LogFileAppender" />
</logger>
<logger name="EventLogger">
<level value="ALL"/>
<appender-ref ref="EventLogAppender"/>
<level value="ALL" />
<appender-ref ref="EventLogAppender" />
</logger>
</log4net>
<startup>


<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup>

<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</startup>
<userSettings>
<DisableNvidiaTelemetry.Properties.Settings>
<setting name="StartupUpdate" serializeAs="String">
Expand All @@ -54,4 +60,4 @@
</setting>
</DisableNvidiaTelemetry.Properties.Settings>
</userSettings>
</configuration>
</configuration>
65 changes: 24 additions & 41 deletions DisableNvidiaTelemetryWPF/App.xaml → DisableNvidiaTelemetry/App.xaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Application x:Class="DisableNvidiaTelemetryWPF.App"
<Application x:Class="DisableNvidiaTelemetry.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:DisableNvidiaTelemetryWPF"
xmlns:local="clr-namespace:DisableNvidiaTelemetry"
Startup="App_OnStartup">

<Application.Resources>
Expand Down Expand Up @@ -65,11 +65,31 @@
<Setter Property="Margin" Value="0,0,0,0" />
</Style>

<SolidColorBrush x:Key="Button.MouseOver.Background" Color="#6BA504" />
<SolidColorBrush x:Key="Button.MouseOver.Border" Color="#FF5593FF" />
<SolidColorBrush x:Key="Button.Disabled.Background" Color="#6BA504" />
<SolidColorBrush x:Key="Button.Disabled.Border" Color="#FFBCBCBC" />
<SolidColorBrush x:Key="Button.Pressed.Background" Color="#6BA504" />
<SolidColorBrush x:Key="Button.Pressed.Border" Color="#6BA504" />
<Style TargetType="{x:Type Button}">
<Setter Property="Background" Value="#76B900" />
<Setter Property="Foreground" Value="#FFFFFF" />
<Setter Property="BorderThickness" Value="0" />
<Setter Property="Padding" Value="10" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Button}">
<Border Background="{TemplateBinding Background}" BorderBrush="Black" BorderThickness="1">
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
</Border>
</ControlTemplate>
</Setter.Value>
</Setter>
<Style.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Background" Value="#5E9100" />
</Trigger>
</Style.Triggers>
</Style>

<Style TargetType="{x:Type Label}">
Expand Down Expand Up @@ -211,7 +231,7 @@
<Setter Property="BorderThickness" Value="0.0, 0, 0, 0" />
<Setter Property="Padding" Value="0" />
<Setter Property="Margin" Value="0" />
<Setter Property="Background" Value="Transparent" />
<Setter Property="Background" Value="#242424" />
</Style>

<Style TargetType="{x:Type TabItem}">
Expand Down Expand Up @@ -384,44 +404,6 @@
<!-- End CheckBox -->


<ControlTemplate x:Key="ButtonBaseControlTemplate" TargetType="{x:Type ButtonBase}">
<Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}"
SnapsToDevicePixels="True">
<ContentPresenter x:Name="contentPresenter" ContentTemplate="{TemplateBinding ContentTemplate}"
Content="{TemplateBinding Content}"
ContentStringFormat="{TemplateBinding ContentStringFormat}" Focusable="False"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
Margin="{TemplateBinding Padding}" RecognizesAccessKey="True"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
</Border>
<ControlTemplate.Triggers>
<Trigger Property="Button.IsDefaulted" Value="True">
<Setter Property="BorderBrush" TargetName="border"
Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
</Trigger>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Background" TargetName="border" Value="#5D8C00" />
<Setter Property="BorderBrush" TargetName="border" Value="#FF3C7FB1" />
</Trigger>
<Trigger Property="IsPressed" Value="True">
<Setter Property="Background" TargetName="border" Value="#76B900" />
<Setter Property="BorderBrush" TargetName="border" Value="#FF2C628B" />
</Trigger>
<Trigger Property="ToggleButton.IsChecked" Value="True">
<Setter Property="Background" TargetName="border" Value="#5D8C00" />
<Setter Property="BorderBrush" TargetName="border" Value="#FF245A83" />
</Trigger>
<Trigger Property="IsEnabled" Value="False">
<Setter Property="Background" TargetName="border" Value="#76B900" />
<Setter Property="BorderBrush" TargetName="border" Value="#FFADB2B5" />
<Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="#FF838383" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>


<ControlTemplate x:Key="CustomProgressBar" TargetType="{x:Type ProgressBar}">
<Grid Name="TemplateRoot" SnapsToDevicePixels="True">
<Rectangle RadiusX="2" RadiusY="2" Fill="Transparent" />
Expand Down Expand Up @@ -630,6 +612,7 @@
<SolidColorBrush x:Key="CheckedBackgroundColor" Color="#76B900" />
<SolidColorBrush x:Key="UncheckedBackgroundColor" Color="#FF939393" />
<Style x:Key="SwitchCheckBox" TargetType="{x:Type CheckBox}">
<Setter Property="Cursor" Value="Hand" />
<Setter Property="Foreground" Value="#C2C2C2" />
<Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
<Setter Property="Template">
Expand Down
Loading

0 comments on commit 817a143

Please sign in to comment.