Visual Updates/Improvements
This commit is contained in:
parent
ffe05ef98a
commit
b3def6bc6c
11 changed files with 403 additions and 15 deletions
|
@ -10,11 +10,33 @@ namespace Release_Tool
|
||||||
static List<file> files = new List<file>();
|
static List<file> files = new List<file>();
|
||||||
public static string globalTimestamp = null;
|
public static string globalTimestamp = null;
|
||||||
public static string releaseFolder = "debug_release";
|
public static string releaseFolder = "debug_release";
|
||||||
public static string releaseFileName = "currentRelease.zip";
|
public static string releaseFileName = "currentRelease";
|
||||||
|
public static string fileending = ".zip";
|
||||||
public static string destFolder = null;
|
public static string destFolder = null;
|
||||||
public static bool success = true;
|
public static bool success = true;
|
||||||
|
public static bool Contains(string source, string toCheck, StringComparison comp)
|
||||||
|
{
|
||||||
|
return source?.IndexOf(toCheck, comp) >= 0;
|
||||||
|
}
|
||||||
public static void Main(string[] args)
|
public static void Main(string[] args)
|
||||||
{
|
{
|
||||||
|
var lines = File.ReadAllLines(".\\WeeXnes\\Core\\Globals.cs");
|
||||||
|
string versionLine = "";
|
||||||
|
foreach (var line in lines)
|
||||||
|
{
|
||||||
|
if (Contains(line, "public static string version", StringComparison.OrdinalIgnoreCase))
|
||||||
|
{
|
||||||
|
versionLine = line;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Console.WriteLine(versionLine);
|
||||||
|
string versionnr =
|
||||||
|
versionLine.Substring(versionLine.IndexOf("\""), versionLine.Length - versionLine.IndexOf("\""));
|
||||||
|
versionnr = versionnr.Substring(1, versionnr.Length - 1);
|
||||||
|
versionnr = versionnr.Substring(0, versionnr.IndexOf("\""));
|
||||||
|
string VersionNumber = versionnr;
|
||||||
|
releaseFileName = releaseFileName + "_" + versionnr + fileending;
|
||||||
|
Console.WriteLine("Packing " + releaseFileName);
|
||||||
Console.Title = "WeeXnes Automated Release Tool";
|
Console.Title = "WeeXnes Automated Release Tool";
|
||||||
SetTimestamp();
|
SetTimestamp();
|
||||||
SetPaths();
|
SetPaths();
|
||||||
|
|
|
@ -13,6 +13,7 @@
|
||||||
<ResourceDictionary Source="Theme/TextBoxTheme.xaml"/>
|
<ResourceDictionary Source="Theme/TextBoxTheme.xaml"/>
|
||||||
<ResourceDictionary Source="Theme/ControlButtonTheme.xaml"/>
|
<ResourceDictionary Source="Theme/ControlButtonTheme.xaml"/>
|
||||||
<ResourceDictionary Source="Theme/ModernCheckbox.xaml"/>
|
<ResourceDictionary Source="Theme/ModernCheckbox.xaml"/>
|
||||||
|
<ResourceDictionary Source="Theme/Scrollbar.xaml"/>
|
||||||
</ResourceDictionary.MergedDictionaries>
|
</ResourceDictionary.MergedDictionaries>
|
||||||
|
|
||||||
<DataTemplate DataType="{x:Type viewModel:HomeViewModel}">
|
<DataTemplate DataType="{x:Type viewModel:HomeViewModel}">
|
||||||
|
|
|
@ -15,7 +15,7 @@ namespace WeeXnes.Core
|
||||||
public static string encryptionKey = "8zf5#RdyQ]$4x4_";
|
public static string encryptionKey = "8zf5#RdyQ]$4x4_";
|
||||||
public static string AppDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "WeeXnes");
|
public static string AppDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "WeeXnes");
|
||||||
public static string SettingsFileName = "settings.ini";
|
public static string SettingsFileName = "settings.ini";
|
||||||
public static string version = "3.2";
|
public static string version = "3.3";
|
||||||
public static bool info_isRpcRunning = false;
|
public static bool info_isRpcRunning = false;
|
||||||
public static bool info_RpcAutoStart;
|
public static bool info_RpcAutoStart;
|
||||||
public static string apiUrl = "http://www.weexnes.com:5169/";
|
public static string apiUrl = "http://www.weexnes.com:5169/";
|
||||||
|
|
BIN
WeeXnes/Images/discord.png
Normal file
BIN
WeeXnes/Images/discord.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 26 KiB |
BIN
WeeXnes/Images/home.png
Normal file
BIN
WeeXnes/Images/home.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 20 KiB |
BIN
WeeXnes/Images/key.png
Normal file
BIN
WeeXnes/Images/key.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 4 KiB |
BIN
WeeXnes/Images/settings.png
Normal file
BIN
WeeXnes/Images/settings.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 7.5 KiB |
|
@ -18,11 +18,7 @@
|
||||||
Deactivated="Window_Deactivated"
|
Deactivated="Window_Deactivated"
|
||||||
StateChanged="Window_StateChanged"
|
StateChanged="Window_StateChanged"
|
||||||
Closing="Window_Closing">
|
Closing="Window_Closing">
|
||||||
<Window.Resources>
|
|
||||||
<Style TargetType="Image">
|
|
||||||
<Setter Property="RenderOptions.BitmapScalingMode" Value="HighQuality" />
|
|
||||||
</Style>
|
|
||||||
</Window.Resources>
|
|
||||||
<Window.DataContext>
|
<Window.DataContext>
|
||||||
<viewModel:MainViewModel/>
|
<viewModel:MainViewModel/>
|
||||||
</Window.DataContext>
|
</Window.DataContext>
|
||||||
|
@ -70,16 +66,17 @@
|
||||||
Height="50"
|
Height="50"
|
||||||
Foreground="White"
|
Foreground="White"
|
||||||
FontSize="14"
|
FontSize="14"
|
||||||
Style="{StaticResource MenuButtonRoundTheme}"
|
Style="{StaticResource HomeMenuButton}"
|
||||||
IsChecked="True"
|
IsChecked="True"
|
||||||
Command="{Binding HomeViewCommand}"
|
Command="{Binding HomeViewCommand}"
|
||||||
Name="HomeMenuButton"/>
|
Name="HomeMenuButton"
|
||||||
|
Tag="/Images/wicon.png"/>
|
||||||
|
|
||||||
<RadioButton Content="Key Manager"
|
<RadioButton Content="Key Manager"
|
||||||
Height="50"
|
Height="50"
|
||||||
Foreground="White"
|
Foreground="White"
|
||||||
FontSize="14"
|
FontSize="14"
|
||||||
Style="{StaticResource MenuButtonRoundTheme}"
|
Style="{StaticResource KeyManagerMenuButton}"
|
||||||
Command="{Binding KeyManagerViewCommand}"
|
Command="{Binding KeyManagerViewCommand}"
|
||||||
Name="KMMenuButton"/>
|
Name="KMMenuButton"/>
|
||||||
|
|
||||||
|
@ -87,7 +84,7 @@
|
||||||
Height="50"
|
Height="50"
|
||||||
Foreground="White"
|
Foreground="White"
|
||||||
FontSize="14"
|
FontSize="14"
|
||||||
Style="{StaticResource MenuButtonRoundTheme}"
|
Style="{StaticResource DiscordMenuButton}"
|
||||||
Command="{Binding DiscordRpcViewCommand}"
|
Command="{Binding DiscordRpcViewCommand}"
|
||||||
Name="RpcMenuButton"/>
|
Name="RpcMenuButton"/>
|
||||||
|
|
||||||
|
@ -95,7 +92,7 @@
|
||||||
Height="50"
|
Height="50"
|
||||||
Foreground="White"
|
Foreground="White"
|
||||||
FontSize="14"
|
FontSize="14"
|
||||||
Style="{StaticResource MenuButtonRoundTheme}"
|
Style="{StaticResource SettingsMenuButton}"
|
||||||
Command="{Binding SettingsViewCommand}"
|
Command="{Binding SettingsViewCommand}"
|
||||||
Name="SettingsMenuButton"/>
|
Name="SettingsMenuButton"/>
|
||||||
|
|
||||||
|
@ -171,4 +168,194 @@
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
</Border>
|
</Border>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<Window.Resources>
|
||||||
|
<Style TargetType="Image">
|
||||||
|
<Setter Property="RenderOptions.BitmapScalingMode" Value="HighQuality" />
|
||||||
|
</Style>
|
||||||
|
<SolidColorBrush x:Key="StandardBorderBrush" Color="#888" />
|
||||||
|
<SolidColorBrush x:Key="StandardBackgroundBrush" Color="Black" />
|
||||||
|
<SolidColorBrush x:Key="HoverBorderBrush" Color="#DDD" />
|
||||||
|
<SolidColorBrush x:Key="SelectedBackgroundBrush" Color="Gray" />
|
||||||
|
<SolidColorBrush x:Key="SelectedForegroundBrush" Color="White" />
|
||||||
|
<SolidColorBrush x:Key="DisabledForegroundBrush" Color="#888" />
|
||||||
|
<SolidColorBrush x:Key="GlyphBrush" Color="#444" />
|
||||||
|
<SolidColorBrush x:Key="NormalBrush" Color="#888" />
|
||||||
|
<SolidColorBrush x:Key="NormalBorderBrush" Color="#888" />
|
||||||
|
<SolidColorBrush x:Key="HorizontalNormalBrush" Color="#FF686868" />
|
||||||
|
<SolidColorBrush x:Key="HorizontalNormalBorderBrush" Color="#888" />
|
||||||
|
|
||||||
|
<LinearGradientBrush x:Key="ListBoxBackgroundBrush" StartPoint="0,0" EndPoint="1,0.001">
|
||||||
|
<GradientBrush.GradientStops>
|
||||||
|
<GradientStopCollection>
|
||||||
|
<GradientStop Color="White" Offset="0.0" />
|
||||||
|
<GradientStop Color="White" Offset="0.6" />
|
||||||
|
<GradientStop Color="#DDDDDD" Offset="1.2"/>
|
||||||
|
</GradientStopCollection>
|
||||||
|
</GradientBrush.GradientStops>
|
||||||
|
</LinearGradientBrush>
|
||||||
|
<LinearGradientBrush x:Key="StandardBrush" StartPoint="0,0" EndPoint="0,1">
|
||||||
|
<GradientBrush.GradientStops>
|
||||||
|
<GradientStopCollection>
|
||||||
|
<GradientStop Color="#FFF" Offset="0.0"/>
|
||||||
|
<GradientStop Color="#CCC" Offset="1.0"/>
|
||||||
|
</GradientStopCollection>
|
||||||
|
</GradientBrush.GradientStops>
|
||||||
|
</LinearGradientBrush>
|
||||||
|
<LinearGradientBrush x:Key="PressedBrush" StartPoint="0,0" EndPoint="0,1">
|
||||||
|
<GradientBrush.GradientStops>
|
||||||
|
<GradientStopCollection>
|
||||||
|
<GradientStop Color="#BBB" Offset="0.0"/>
|
||||||
|
<GradientStop Color="#EEE" Offset="0.1"/>
|
||||||
|
<GradientStop Color="#EEE" Offset="0.9"/>
|
||||||
|
<GradientStop Color="#FFF" Offset="1.0"/>
|
||||||
|
</GradientStopCollection>
|
||||||
|
</GradientBrush.GradientStops>
|
||||||
|
</LinearGradientBrush>
|
||||||
|
|
||||||
|
<Style x:Key="ScrollBarLineButton" TargetType="{x:Type RepeatButton}">
|
||||||
|
<Setter Property="Visibility" Value="Hidden"/>
|
||||||
|
<Setter Property="SnapsToDevicePixels" Value="True"/>
|
||||||
|
<Setter Property="OverridesDefaultStyle" Value="true"/>
|
||||||
|
<Setter Property="Focusable" Value="false"/>
|
||||||
|
<Setter Property="Template">
|
||||||
|
<Setter.Value>
|
||||||
|
<ControlTemplate TargetType="{x:Type RepeatButton}">
|
||||||
|
<Border Name="Border" Margin="1" CornerRadius="2" Background="{StaticResource NormalBrush}" BorderBrush="{StaticResource NormalBorderBrush}" BorderThickness="1">
|
||||||
|
<Path HorizontalAlignment="Center" VerticalAlignment="Center" Fill="{StaticResource GlyphBrush}" Data="{Binding Path=Content, RelativeSource={RelativeSource TemplatedParent}}" />
|
||||||
|
</Border>
|
||||||
|
<ControlTemplate.Triggers>
|
||||||
|
<Trigger Property="IsPressed" Value="true">
|
||||||
|
<Setter TargetName="Border" Property="Background" Value="{StaticResource PressedBrush}" />
|
||||||
|
</Trigger>
|
||||||
|
<Trigger Property="IsEnabled" Value="false">
|
||||||
|
<Setter Property="Foreground" Value="{StaticResource DisabledForegroundBrush}"/>
|
||||||
|
</Trigger>
|
||||||
|
</ControlTemplate.Triggers>
|
||||||
|
</ControlTemplate>
|
||||||
|
</Setter.Value>
|
||||||
|
</Setter>
|
||||||
|
</Style>
|
||||||
|
<Style x:Key="ScrollBarPageButton" TargetType="{x:Type RepeatButton}">
|
||||||
|
<Setter Property="Visibility" Value="Hidden"/>
|
||||||
|
<Setter Property="SnapsToDevicePixels" Value="True"/>
|
||||||
|
<Setter Property="OverridesDefaultStyle" Value="true"/>
|
||||||
|
<Setter Property="IsTabStop" Value="false"/>
|
||||||
|
<Setter Property="Focusable" Value="false"/>
|
||||||
|
<Setter Property="Template">
|
||||||
|
<Setter.Value>
|
||||||
|
<ControlTemplate TargetType="{x:Type RepeatButton}">
|
||||||
|
<Border Background="Black" />
|
||||||
|
</ControlTemplate>
|
||||||
|
</Setter.Value>
|
||||||
|
</Setter>
|
||||||
|
</Style>
|
||||||
|
|
||||||
|
<Style x:Key="ScrollBarThumb" TargetType="{x:Type Thumb}">
|
||||||
|
<Setter Property="SnapsToDevicePixels" Value="True"/>
|
||||||
|
<Setter Property="OverridesDefaultStyle" Value="true"/>
|
||||||
|
<Setter Property="IsTabStop" Value="false"/>
|
||||||
|
<Setter Property="Focusable" Value="false"/>
|
||||||
|
<Setter Property="Template">
|
||||||
|
<Setter.Value>
|
||||||
|
<ControlTemplate TargetType="{x:Type Thumb}">
|
||||||
|
<Border CornerRadius="4" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="0" Width="8" Margin="8,0,-2,0"/>
|
||||||
|
</ControlTemplate>
|
||||||
|
</Setter.Value>
|
||||||
|
</Setter>
|
||||||
|
</Style>
|
||||||
|
|
||||||
|
<ControlTemplate x:Key="VerticalScrollBar" TargetType="{x:Type ScrollBar}">
|
||||||
|
<Grid>
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition MaxHeight="0"/>
|
||||||
|
<RowDefinition Height="0.00001*"/>
|
||||||
|
<RowDefinition MaxHeight="0"/>
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
<Border Grid.RowSpan="3" CornerRadius="2" Background="Transparent" />
|
||||||
|
<RepeatButton Grid.Row="0" Style="{StaticResource ScrollBarLineButton}" Height="18" Command="ScrollBar.LineUpCommand" Content="M 0 4 L 8 4 L 4 0 Z" />
|
||||||
|
<Track Name="PART_Track" Grid.Row="1" IsDirectionReversed="true">
|
||||||
|
<Track.DecreaseRepeatButton>
|
||||||
|
<RepeatButton Style="{StaticResource ScrollBarPageButton}" Command="ScrollBar.PageUpCommand" />
|
||||||
|
</Track.DecreaseRepeatButton>
|
||||||
|
<Track.Thumb>
|
||||||
|
<Thumb Style="{StaticResource ScrollBarThumb}" Margin="1,0,1,0" Background="{StaticResource HorizontalNormalBrush}" BorderBrush="{StaticResource HorizontalNormalBorderBrush}" />
|
||||||
|
</Track.Thumb>
|
||||||
|
<Track.IncreaseRepeatButton>
|
||||||
|
<RepeatButton Style="{StaticResource ScrollBarPageButton}" Command="ScrollBar.PageDownCommand" />
|
||||||
|
</Track.IncreaseRepeatButton>
|
||||||
|
</Track>
|
||||||
|
<RepeatButton Grid.Row="3" Style="{StaticResource ScrollBarLineButton}" Height="18" Command="ScrollBar.LineDownCommand" Content="M 0 0 L 4 4 L 8 0 Z"/>
|
||||||
|
</Grid>
|
||||||
|
</ControlTemplate>
|
||||||
|
<ControlTemplate x:Key="HorizontalScrollBar" TargetType="{x:Type ScrollBar}">
|
||||||
|
<Grid>
|
||||||
|
<Grid.ColumnDefinitions>
|
||||||
|
<ColumnDefinition MaxWidth="18"/>
|
||||||
|
<ColumnDefinition Width="0.00001*"/>
|
||||||
|
<ColumnDefinition MaxWidth="18"/>
|
||||||
|
</Grid.ColumnDefinitions>
|
||||||
|
<Border Grid.ColumnSpan="3" CornerRadius="2" Background="#F0F0F0"/>
|
||||||
|
<RepeatButton Grid.Column="0" Style="{StaticResource ScrollBarLineButton}" Width="18" Command="ScrollBar.LineLeftCommand" Content="M 4 0 L 4 8 L 0 4 Z" />
|
||||||
|
<Track Name="PART_Track" Grid.Column="1" IsDirectionReversed="False">
|
||||||
|
<Track.DecreaseRepeatButton>
|
||||||
|
<RepeatButton Style="{StaticResource ScrollBarPageButton}" Command="ScrollBar.PageLeftCommand" />
|
||||||
|
</Track.DecreaseRepeatButton>
|
||||||
|
<Track.Thumb>
|
||||||
|
<Thumb Style="{StaticResource ScrollBarThumb}" Margin="0,1,0,1" Background="{StaticResource NormalBrush}" BorderBrush="{StaticResource NormalBorderBrush}" />
|
||||||
|
</Track.Thumb>
|
||||||
|
<Track.IncreaseRepeatButton>
|
||||||
|
<RepeatButton Style="{StaticResource ScrollBarPageButton}" Command="ScrollBar.PageRightCommand" />
|
||||||
|
</Track.IncreaseRepeatButton>
|
||||||
|
</Track>
|
||||||
|
<RepeatButton Grid.Column="3" Style="{StaticResource ScrollBarLineButton}" Width="18" Command="ScrollBar.LineRightCommand" Content="M 0 0 L 4 4 L 0 8 Z"/>
|
||||||
|
</Grid>
|
||||||
|
</ControlTemplate>
|
||||||
|
<Style x:Key="{x:Type ScrollBar}" TargetType="{x:Type ScrollBar}">
|
||||||
|
<Setter Property="SnapsToDevicePixels" Value="True"/>
|
||||||
|
<Setter Property="OverridesDefaultStyle" Value="true"/>
|
||||||
|
<Style.Triggers>
|
||||||
|
<Trigger Property="Orientation" Value="Horizontal">
|
||||||
|
<Setter Property="Width" Value="Auto"/>
|
||||||
|
<Setter Property="Height" Value="18" />
|
||||||
|
<Setter Property="Template" Value="{StaticResource HorizontalScrollBar}" />
|
||||||
|
</Trigger>
|
||||||
|
<Trigger Property="Orientation" Value="Vertical">
|
||||||
|
<Setter Property="Width" Value="18"/>
|
||||||
|
<Setter Property="Height" Value="Auto" />
|
||||||
|
<Setter Property="Template" Value="{StaticResource VerticalScrollBar}" />
|
||||||
|
</Trigger>
|
||||||
|
</Style.Triggers>
|
||||||
|
</Style>
|
||||||
|
|
||||||
|
<Style x:Key="FavsScrollViewer" TargetType="{x:Type ScrollViewer}">
|
||||||
|
<Setter Property="OverridesDefaultStyle" Value="True"/>
|
||||||
|
<Setter Property="Template">
|
||||||
|
<Setter.Value>
|
||||||
|
<ControlTemplate TargetType="{x:Type ScrollViewer}">
|
||||||
|
<Grid>
|
||||||
|
<Grid.ColumnDefinitions>
|
||||||
|
<ColumnDefinition Width="Auto"/>
|
||||||
|
<ColumnDefinition/>
|
||||||
|
</Grid.ColumnDefinitions>
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition/>
|
||||||
|
<RowDefinition Height="Auto"/>
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
<ScrollContentPresenter Grid.Column="1"/>
|
||||||
|
<ScrollBar Name="PART_VerticalScrollBar" Value="{TemplateBinding VerticalOffset}" Maximum="{TemplateBinding ScrollableHeight}" ViewportSize="{TemplateBinding ViewportHeight}" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}"/>
|
||||||
|
<ScrollBar Name="PART_HorizontalScrollBar" Orientation="Horizontal" Grid.Row="1" Grid.Column="1" Value="{TemplateBinding HorizontalOffset}" Maximum="{TemplateBinding ScrollableWidth}" ViewportSize="{TemplateBinding ViewportWidth}" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}"/>
|
||||||
|
</Grid>
|
||||||
|
</ControlTemplate>
|
||||||
|
</Setter.Value>
|
||||||
|
</Setter>
|
||||||
|
</Style>
|
||||||
|
</Window.Resources>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</Window>
|
</Window>
|
||||||
|
|
|
@ -41,9 +41,164 @@
|
||||||
HorizontalAlignment="Stretch">
|
HorizontalAlignment="Stretch">
|
||||||
<Border Background="{TemplateBinding Background}"
|
<Border Background="{TemplateBinding Background}"
|
||||||
CornerRadius="4">
|
CornerRadius="4">
|
||||||
<TextBlock Text="{TemplateBinding Property=Content}"
|
<StackPanel Orientation="Horizontal">
|
||||||
VerticalAlignment="Center"
|
<TextBlock Text="{TemplateBinding Property=Content}"
|
||||||
Margin="50,0,0,0"/>
|
VerticalAlignment="Center"
|
||||||
|
Margin="50,0,0,0"/>
|
||||||
|
</StackPanel>
|
||||||
|
|
||||||
|
</Border>
|
||||||
|
|
||||||
|
</Grid>
|
||||||
|
|
||||||
|
</ControlTemplate>
|
||||||
|
</Setter.Value>
|
||||||
|
</Setter>
|
||||||
|
<Setter Property="Background" Value="Transparent"/>
|
||||||
|
<Setter Property="BorderThickness" Value="0"/>
|
||||||
|
</Style.Setters>
|
||||||
|
<Style.Triggers>
|
||||||
|
<Trigger Property="IsChecked" Value="True">
|
||||||
|
<Setter Property="Background" Value="#212329"/>
|
||||||
|
</Trigger>
|
||||||
|
</Style.Triggers>
|
||||||
|
</Style>
|
||||||
|
<Style BasedOn="{StaticResource {x:Type ToggleButton}}"
|
||||||
|
TargetType="{x:Type RadioButton}"
|
||||||
|
x:Key="DiscordMenuButton">
|
||||||
|
<Style.Setters>
|
||||||
|
<Setter Property="Template">
|
||||||
|
<Setter.Value>
|
||||||
|
<ControlTemplate TargetType="RadioButton">
|
||||||
|
|
||||||
|
<Grid VerticalAlignment="Stretch"
|
||||||
|
HorizontalAlignment="Stretch">
|
||||||
|
<Border Background="{TemplateBinding Background}"
|
||||||
|
CornerRadius="4">
|
||||||
|
<StackPanel Orientation="Horizontal">
|
||||||
|
<Image Margin="10,0,10,0" RenderOptions.BitmapScalingMode="HighQuality"
|
||||||
|
Source="/../Images/discord.png" Width="30">
|
||||||
|
|
||||||
|
</Image>
|
||||||
|
<TextBlock Text="{TemplateBinding Property=Content}"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
Margin="0,0,0,0"/>
|
||||||
|
</StackPanel>
|
||||||
|
|
||||||
|
</Border>
|
||||||
|
|
||||||
|
</Grid>
|
||||||
|
|
||||||
|
</ControlTemplate>
|
||||||
|
</Setter.Value>
|
||||||
|
</Setter>
|
||||||
|
<Setter Property="Background" Value="Transparent"/>
|
||||||
|
<Setter Property="BorderThickness" Value="0"/>
|
||||||
|
</Style.Setters>
|
||||||
|
<Style.Triggers>
|
||||||
|
<Trigger Property="IsChecked" Value="True">
|
||||||
|
<Setter Property="Background" Value="#212329"/>
|
||||||
|
</Trigger>
|
||||||
|
</Style.Triggers>
|
||||||
|
</Style>
|
||||||
|
<Style BasedOn="{StaticResource {x:Type ToggleButton}}"
|
||||||
|
TargetType="{x:Type RadioButton}"
|
||||||
|
x:Key="HomeMenuButton">
|
||||||
|
<Style.Setters>
|
||||||
|
<Setter Property="Template">
|
||||||
|
<Setter.Value>
|
||||||
|
<ControlTemplate TargetType="RadioButton">
|
||||||
|
|
||||||
|
<Grid VerticalAlignment="Stretch"
|
||||||
|
HorizontalAlignment="Stretch">
|
||||||
|
<Border Background="{TemplateBinding Background}"
|
||||||
|
CornerRadius="4">
|
||||||
|
<StackPanel Orientation="Horizontal">
|
||||||
|
<Image Margin="10,0,10,0" RenderOptions.BitmapScalingMode="HighQuality"
|
||||||
|
Source="/../Images/home.png" Width="30">
|
||||||
|
|
||||||
|
</Image>
|
||||||
|
<TextBlock Text="{TemplateBinding Property=Content}"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
Margin="0,0,0,0"/>
|
||||||
|
</StackPanel>
|
||||||
|
|
||||||
|
</Border>
|
||||||
|
|
||||||
|
</Grid>
|
||||||
|
|
||||||
|
</ControlTemplate>
|
||||||
|
</Setter.Value>
|
||||||
|
</Setter>
|
||||||
|
<Setter Property="Background" Value="Transparent"/>
|
||||||
|
<Setter Property="BorderThickness" Value="0"/>
|
||||||
|
</Style.Setters>
|
||||||
|
<Style.Triggers>
|
||||||
|
<Trigger Property="IsChecked" Value="True">
|
||||||
|
<Setter Property="Background" Value="#212329"/>
|
||||||
|
</Trigger>
|
||||||
|
</Style.Triggers>
|
||||||
|
</Style>
|
||||||
|
<Style BasedOn="{StaticResource {x:Type ToggleButton}}"
|
||||||
|
TargetType="{x:Type RadioButton}"
|
||||||
|
x:Key="SettingsMenuButton">
|
||||||
|
<Style.Setters>
|
||||||
|
<Setter Property="Template">
|
||||||
|
<Setter.Value>
|
||||||
|
<ControlTemplate TargetType="RadioButton">
|
||||||
|
|
||||||
|
<Grid VerticalAlignment="Stretch"
|
||||||
|
HorizontalAlignment="Stretch">
|
||||||
|
<Border Background="{TemplateBinding Background}"
|
||||||
|
CornerRadius="4">
|
||||||
|
<StackPanel Orientation="Horizontal">
|
||||||
|
<Image Margin="10,0,10,0" RenderOptions.BitmapScalingMode="HighQuality"
|
||||||
|
Source="/../Images/settings.png" Width="30">
|
||||||
|
|
||||||
|
</Image>
|
||||||
|
<TextBlock Text="{TemplateBinding Property=Content}"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
Margin="0,0,0,0"/>
|
||||||
|
</StackPanel>
|
||||||
|
|
||||||
|
</Border>
|
||||||
|
|
||||||
|
</Grid>
|
||||||
|
|
||||||
|
</ControlTemplate>
|
||||||
|
</Setter.Value>
|
||||||
|
</Setter>
|
||||||
|
<Setter Property="Background" Value="Transparent"/>
|
||||||
|
<Setter Property="BorderThickness" Value="0"/>
|
||||||
|
</Style.Setters>
|
||||||
|
<Style.Triggers>
|
||||||
|
<Trigger Property="IsChecked" Value="True">
|
||||||
|
<Setter Property="Background" Value="#212329"/>
|
||||||
|
</Trigger>
|
||||||
|
</Style.Triggers>
|
||||||
|
</Style>
|
||||||
|
<Style BasedOn="{StaticResource {x:Type ToggleButton}}"
|
||||||
|
TargetType="{x:Type RadioButton}"
|
||||||
|
x:Key="KeyManagerMenuButton">
|
||||||
|
<Style.Setters>
|
||||||
|
<Setter Property="Template">
|
||||||
|
<Setter.Value>
|
||||||
|
<ControlTemplate TargetType="RadioButton">
|
||||||
|
|
||||||
|
<Grid VerticalAlignment="Stretch"
|
||||||
|
HorizontalAlignment="Stretch">
|
||||||
|
<Border Background="{TemplateBinding Background}"
|
||||||
|
CornerRadius="4">
|
||||||
|
<StackPanel Orientation="Horizontal">
|
||||||
|
<Image Margin="10,0,10,0" RenderOptions.BitmapScalingMode="HighQuality"
|
||||||
|
Source="/../Images/key.png" Width="30">
|
||||||
|
|
||||||
|
</Image>
|
||||||
|
<TextBlock Text="{TemplateBinding Property=Content}"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
Margin="0,0,0,0"/>
|
||||||
|
</StackPanel>
|
||||||
|
|
||||||
</Border>
|
</Border>
|
||||||
|
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
18
WeeXnes/Theme/Scrollbar.xaml
Normal file
18
WeeXnes/Theme/Scrollbar.xaml
Normal file
|
@ -0,0 +1,18 @@
|
||||||
|
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
||||||
|
|
||||||
|
<Style x:Key="ScrollBarThumbHor" TargetType="{x:Type Thumb}">
|
||||||
|
<Setter Property="SnapsToDevicePixels" Value="True"/>
|
||||||
|
<Setter Property="OverridesDefaultStyle" Value="true"/>
|
||||||
|
<Setter Property="IsTabStop" Value="false"/>
|
||||||
|
<Setter Property="Focusable" Value="false"/>
|
||||||
|
<Setter Property="Template">
|
||||||
|
<Setter.Value>
|
||||||
|
<ControlTemplate TargetType="{x:Type Thumb}">
|
||||||
|
<Border CornerRadius="1" Background="#c8c8c8" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="0" Height="8" Margin="0,0,-2,0"/>
|
||||||
|
</ControlTemplate>
|
||||||
|
</Setter.Value>
|
||||||
|
</Setter>
|
||||||
|
</Style>
|
||||||
|
|
||||||
|
</ResourceDictionary>
|
|
@ -91,6 +91,7 @@
|
||||||
<Page Include="Theme\ControlButtonTheme.xaml" />
|
<Page Include="Theme\ControlButtonTheme.xaml" />
|
||||||
<Page Include="Theme\MenuButtonTheme.xaml" />
|
<Page Include="Theme\MenuButtonTheme.xaml" />
|
||||||
<Page Include="Theme\ModernCheckbox.xaml" />
|
<Page Include="Theme\ModernCheckbox.xaml" />
|
||||||
|
<Page Include="Theme\Scrollbar.xaml" />
|
||||||
<Page Include="Theme\TextBoxTheme.xaml" />
|
<Page Include="Theme\TextBoxTheme.xaml" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
@ -132,6 +133,10 @@
|
||||||
<Resource Include="Images\green.png" />
|
<Resource Include="Images\green.png" />
|
||||||
<Resource Include="Images\red.png" />
|
<Resource Include="Images\red.png" />
|
||||||
<Resource Include="Images\yellow.png" />
|
<Resource Include="Images\yellow.png" />
|
||||||
|
<Resource Include="Images\discord.png" />
|
||||||
|
<Resource Include="Images\home.png" />
|
||||||
|
<Resource Include="Images\key.png" />
|
||||||
|
<Resource Include="Images\settings.png" />
|
||||||
<Content Include="wicns.ico" />
|
<Content Include="wicns.ico" />
|
||||||
<Resource Include="Images\wicon.png" />
|
<Resource Include="Images\wicon.png" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
Loading…
Add table
Reference in a new issue