WeeXnes/WeeXnesSuite
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

gui improvements

Browse source
This commit is contained in:
WeeXnes 2022-11-11 16:38:09 +01:00
parent dbc99c429c
commit cb3160940d
9 changed files with 201 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
WeeXnes/Core/Globals.cs
View file

@ -16,7 +16,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.6.7"; public static string version = "3.6.8";
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 = "https://api.github.com/repos/weexnes/weexnessuite/releases/latest"; public static string apiUrl = "https://api.github.com/repos/weexnes/weexnessuite/releases/latest";

231
WeeXnes/MVVM/View/DiscordRpcView.xaml
View file

@ -15,7 +15,7 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid> <Grid HorizontalAlignment="Center">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="220"/> <ColumnDefinition Width="220"/>
<ColumnDefinition/> <ColumnDefinition/>
@ -23,7 +23,7 @@
<Border <Border
CornerRadius="4" CornerRadius="4"
Height="300" Height="300"
VerticalAlignment="Top"> VerticalAlignment="Top">
<Border.Background> <Border.Background>
<LinearGradientBrush StartPoint="0 0" EndPoint="1 1"> <LinearGradientBrush StartPoint="0 0" EndPoint="1 1">
@ -37,6 +37,7 @@
VerticalAlignment="Top" VerticalAlignment="Top"
Background="Transparent" Background="Transparent"
BorderThickness="0" BorderThickness="0"
Name="RpcItemList" Name="RpcItemList"
Foreground="White" Foreground="White"
SelectionChanged="RpcItemList_SelectionChanged" SelectionChanged="RpcItemList_SelectionChanged"
@ -47,7 +48,7 @@
<TextBox Grid.Column="1" <TextBox Grid.Column="1"
Style="{StaticResource MaterialTextBox}" Style="{StaticResource MaterialTextBox}"
Height="33" Height="33"
Width="220" Width="450"
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Top" VerticalAlignment="Top"
Margin="20,20,0,0" Margin="20,20,0,0"
@ -58,22 +59,18 @@
<TextBox Grid.Column="1" <TextBox Grid.Column="1"
Style="{StaticResource MaterialTextBox}" Style="{StaticResource MaterialTextBox}"
Height="33" Height="33"
Width="220" Width="450"
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Top" VerticalAlignment="Top"
Margin="20,60,0,0" Margin="20,60,0,0"
Name="tb_FormPName" Name="tb_FormPName"
Background="#212329" Background="#212329"
Tag="Process Name"/> Tag="Process Name (without .exe)"/>
<Label Content=".exe"
Foreground="White"
FontSize="20" Grid.Column="1"
Margin="240,56,0,0"/>
<TextBox Grid.Column="1" <TextBox Grid.Column="1"
Style="{StaticResource MaterialTextBox}" Style="{StaticResource MaterialTextBox}"
Height="33" Height="33"
Width="220" Width="450"
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Top" VerticalAlignment="Top"
Margin="20,100,0,0" Margin="20,100,0,0"
@ -83,7 +80,7 @@
<TextBox Grid.Column="1" <TextBox Grid.Column="1"
Style="{StaticResource MaterialTextBox}" Style="{StaticResource MaterialTextBox}"
Height="33" Height="33"
Width="220" Width="450"
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Top" VerticalAlignment="Top"
Margin="20,180,0,0" Margin="20,180,0,0"
@ -93,7 +90,7 @@
<TextBox Grid.Column="1" <TextBox Grid.Column="1"
Style="{StaticResource MaterialTextBox}" Style="{StaticResource MaterialTextBox}"
Height="33" Height="33"
Width="220" Width="450"
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Top" VerticalAlignment="Top"
Margin="20,140,0,0" Margin="20,140,0,0"
@ -120,7 +117,7 @@
VerticalAlignment="Top" VerticalAlignment="Top"
Margin="250,220,0,0" Margin="250,220,0,0"
Name="tb_FormLargeImgTxt" Name="tb_FormLargeImgTxt"
Background="#202127" Background="#212329"
Tag="Large Image Text"/> Tag="Large Image Text"/>
<TextBox Grid.Column="1" <TextBox Grid.Column="1"
@ -141,10 +138,10 @@
VerticalAlignment="Top" VerticalAlignment="Top"
Margin="250,260,0,0" Margin="250,260,0,0"
Name="tb_FormSmallImgTxt" Name="tb_FormSmallImgTxt"
Background="#202127" Background="#212329"
Tag="Small Image Text"/> Tag="Small Image Text"/>
<Button Height="30" <Button Height="30"
Width="65" Width="450"
Style="{StaticResource UniversalMaterialButton}" Style="{StaticResource UniversalMaterialButton}"
Name="DiscordRpcSave" Name="DiscordRpcSave"
Click="DiscordRpcSave_Click" Click="DiscordRpcSave_Click"
@ -152,43 +149,185 @@
HorizontalAlignment="Left" HorizontalAlignment="Left"
Grid.Column="1" Grid.Column="1"
Margin="20,0,0,5" Margin="20,0,0,5"
Foreground="DarkGray"
Background="#212329" Background="#212329"
Content="Save"/> Content="Save">
<Button.Triggers>
<!-- Animate the button's Width property. -->
<EventTrigger RoutedEvent="Button.MouseEnter">
<BeginStoryboard>
<Storyboard>
<ColorAnimation
Storyboard.TargetProperty="(Button.Background).(SolidColorBrush.Color)"
To="DarkGray" Duration="0:0:00.1" AutoReverse="False"
/>
<ColorAnimation
Storyboard.TargetProperty="(Button.Foreground).(SolidColorBrush.Color)"
To="#212329" Duration="0:0:00.1" AutoReverse="False"
/>
</Storyboard>
</BeginStoryboard>
</EventTrigger>
<EventTrigger RoutedEvent="Button.MouseLeave">
<BeginStoryboard>
<Storyboard>
<ColorAnimation
Storyboard.TargetProperty="(Button.Background).(SolidColorBrush.Color)"
To="#212329" Duration="0:0:00.1" AutoReverse="False"
/>
<ColorAnimation
Storyboard.TargetProperty="(Button.Foreground).(SolidColorBrush.Color)"
To="DarkGray" Duration="0:0:00.1" AutoReverse="False"
/>
</Storyboard>
</BeginStoryboard>
</EventTrigger>
</Button.Triggers>
</Button>
<Button Height="30" <StackPanel Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Center">
Width="65" <Button Height="30" Cursor="Hand"
Style="{StaticResource UniversalMaterialButton}" Width="65"
Name="DiscordRpcStop" Style="{StaticResource UniversalMaterialButton}"
Click="DiscordRpcStop_Click" Name="DiscordRpcStart"
VerticalAlignment="Bottom" Click="DiscordRpcStart_Click"
HorizontalAlignment="Left" VerticalAlignment="Bottom"
Margin="70,0,0,5" HorizontalAlignment="Left"
Background="#212329" Margin="0,0,5,5"
Content="Stop"/> Foreground="DarkGray"
<Button Height="30" Background="#212329"
Width="65" Content="Start">
Style="{StaticResource UniversalMaterialButton}" <Button.Triggers>
Name="DiscordRpcStart"
Click="DiscordRpcStart_Click" <!-- Animate the button's Width property. -->
VerticalAlignment="Bottom" <EventTrigger RoutedEvent="Button.MouseEnter">
HorizontalAlignment="Left" <BeginStoryboard>
Margin="0,0,0,5" <Storyboard>
Background="#212329" <ColorAnimation
Content="Start"/> Storyboard.TargetProperty="(Button.Background).(SolidColorBrush.Color)"
<Button Height="30" To="DarkGray" Duration="0:0:00.1" AutoReverse="False"
Width="65" />
Style="{StaticResource UniversalMaterialButton}" <ColorAnimation
Name="DiscordRpcNew" Storyboard.TargetProperty="(Button.Foreground).(SolidColorBrush.Color)"
Click="DiscordRpcNew_Click" To="#212329" Duration="0:0:00.1" AutoReverse="False"
VerticalAlignment="Bottom" />
HorizontalAlignment="Left" </Storyboard>
Margin="140,0,0,5" </BeginStoryboard>
Background="#212329" </EventTrigger>
Content="New"/> <EventTrigger RoutedEvent="Button.MouseLeave">
<BeginStoryboard>
<Storyboard>
<ColorAnimation
Storyboard.TargetProperty="(Button.Background).(SolidColorBrush.Color)"
To="#212329" Duration="0:0:00.1" AutoReverse="False"
/>
<ColorAnimation
Storyboard.TargetProperty="(Button.Foreground).(SolidColorBrush.Color)"
To="DarkGray" Duration="0:0:00.1" AutoReverse="False"
/>
</Storyboard>
</BeginStoryboard>
</EventTrigger>
</Button.Triggers>
</Button>
<Button Height="30"
Width="65"
Style="{StaticResource UniversalMaterialButton}"
Name="DiscordRpcStop"
Click="DiscordRpcStop_Click"
VerticalAlignment="Bottom"
HorizontalAlignment="Left"
Margin="5,0,5,5"
Foreground="DarkGray"
Background="#212329"
Content="Stop">
<Button.Triggers>
<!-- Animate the button's Width property. -->
<EventTrigger RoutedEvent="Button.MouseEnter">
<BeginStoryboard>
<Storyboard>
<ColorAnimation
Storyboard.TargetProperty="(Button.Background).(SolidColorBrush.Color)"
To="DarkGray" Duration="0:0:00.1" AutoReverse="False"
/>
<ColorAnimation
Storyboard.TargetProperty="(Button.Foreground).(SolidColorBrush.Color)"
To="#212329" Duration="0:0:00.1" AutoReverse="False"
/>
</Storyboard>
</BeginStoryboard>
</EventTrigger>
<EventTrigger RoutedEvent="Button.MouseLeave">
<BeginStoryboard>
<Storyboard>
<ColorAnimation
Storyboard.TargetProperty="(Button.Background).(SolidColorBrush.Color)"
To="#212329" Duration="0:0:00.1" AutoReverse="False"
/>
<ColorAnimation
Storyboard.TargetProperty="(Button.Foreground).(SolidColorBrush.Color)"
To="DarkGray" Duration="0:0:00.1" AutoReverse="False"
/>
</Storyboard>
</BeginStoryboard>
</EventTrigger>
</Button.Triggers>
</Button>
<Button Height="30"
Width="65"
Style="{StaticResource UniversalMaterialButton}"
Name="DiscordRpcNew"
Click="DiscordRpcNew_Click"
VerticalAlignment="Bottom"
HorizontalAlignment="Left"
Margin="5,0,0,5"
Foreground="DarkGray"
Background="#212329"
Content="New">
<Button.Triggers>
<!-- Animate the button's Width property. -->
<EventTrigger RoutedEvent="Button.MouseEnter">
<BeginStoryboard>
<Storyboard>
<ColorAnimation
Storyboard.TargetProperty="(Button.Background).(SolidColorBrush.Color)"
To="DarkGray" Duration="0:0:00.1" AutoReverse="False"
/>
<ColorAnimation
Storyboard.TargetProperty="(Button.Foreground).(SolidColorBrush.Color)"
To="#212329" Duration="0:0:00.1" AutoReverse="False"
/>
</Storyboard>
</BeginStoryboard>
</EventTrigger>
<EventTrigger RoutedEvent="Button.MouseLeave">
<BeginStoryboard>
<Storyboard>
<ColorAnimation
Storyboard.TargetProperty="(Button.Background).(SolidColorBrush.Color)"
To="#212329" Duration="0:0:00.1" AutoReverse="False"
/>
<ColorAnimation
Storyboard.TargetProperty="(Button.Foreground).(SolidColorBrush.Color)"
To="DarkGray" Duration="0:0:00.1" AutoReverse="False"
/>
</Storyboard>
</BeginStoryboard>
</EventTrigger>
</Button.Triggers>
</Button>
</StackPanel>

1
WeeXnes/MVVM/View/KeyManagerView.xaml
View file

@ -82,6 +82,7 @@
Margin="15,0,0,0" Margin="15,0,0,0"
Click="AddButton_Click" Click="AddButton_Click"
Content="Add" Content="Add"
Foreground="DarkGray"
Background="#1c1e23" Background="#1c1e23"
Style="{StaticResource UniversalMaterialButton}" Style="{StaticResource UniversalMaterialButton}"
/> />

8
WeeXnes/MVVM/View/SettingView.xaml
View file

@ -66,6 +66,7 @@
Style="{StaticResource UniversalMaterialButton}" Style="{StaticResource UniversalMaterialButton}"
Content="Check for Updates" Content="Check for Updates"
Background="#2f313b" Background="#2f313b"
Foreground="DarkGray"
Height="25" Height="25"
Click="CheckForUpdateBtn_OnClick" Click="CheckForUpdateBtn_OnClick"
Margin="4,10,4,0"/> Margin="4,10,4,0"/>
@ -74,6 +75,7 @@
Style="{StaticResource UniversalMaterialButton}" Style="{StaticResource UniversalMaterialButton}"
Content="Create Startmenu Entry" Content="Create Startmenu Entry"
Background="#2f313b" Background="#2f313b"
Foreground="DarkGray"
Height="25" Height="25"
Click="CreateShortcut_OnClick" Click="CreateShortcut_OnClick"
Margin="4,10,4,0"/> Margin="4,10,4,0"/>
@ -82,6 +84,7 @@
Style="{StaticResource UniversalMaterialButton}" Style="{StaticResource UniversalMaterialButton}"
Content="Open AppData Folder" Content="Open AppData Folder"
Background="#2f313b" Background="#2f313b"
Foreground="DarkGray"
Height="25" Height="25"
Margin="4,10,4,0" Margin="4,10,4,0"
Click="OpenAppdataFolder_Click"/> Click="OpenAppdataFolder_Click"/>
@ -139,6 +142,7 @@
Style="{StaticResource UniversalMaterialButton}" Style="{StaticResource UniversalMaterialButton}"
Content="Set Default ClientID" Content="Set Default ClientID"
Background="#2f313b" Background="#2f313b"
Foreground="DarkGray"
Height="25" Height="25"
Click="SaveDefaultID_Click" Click="SaveDefaultID_Click"
Margin="4,10,4,0"/> Margin="4,10,4,0"/>
@ -166,6 +170,7 @@
Style="{StaticResource UniversalMaterialButton}" Style="{StaticResource UniversalMaterialButton}"
Content="Set Rpc Files Path" Content="Set Rpc Files Path"
Background="#2f313b" Background="#2f313b"
Foreground="DarkGray"
Height="25" Height="25"
Click="SetRpcLocation_OnClick" Click="SetRpcLocation_OnClick"
Margin="4,10,4,0"/> Margin="4,10,4,0"/>
@ -173,6 +178,7 @@
Style="{StaticResource UniversalMaterialButton}" Style="{StaticResource UniversalMaterialButton}"
Content="Set Default Path" Content="Set Default Path"
Background="#2f313b" Background="#2f313b"
Foreground="DarkGray"
Height="25" Height="25"
Click="SetRpcLocationDefault_OnClick" Click="SetRpcLocationDefault_OnClick"
Margin="4,10,4,0"/> Margin="4,10,4,0"/>
@ -233,6 +239,7 @@
Style="{StaticResource UniversalMaterialButton}" Style="{StaticResource UniversalMaterialButton}"
Content="Set Key Files Path" Content="Set Key Files Path"
Background="#2f313b" Background="#2f313b"
Foreground="DarkGray"
Height="25" Height="25"
Click="SetKeyLocation_OnClick" Click="SetKeyLocation_OnClick"
Margin="4,10,4,0"/> Margin="4,10,4,0"/>
@ -240,6 +247,7 @@
Style="{StaticResource UniversalMaterialButton}" Style="{StaticResource UniversalMaterialButton}"
Content="Set Default Path" Content="Set Default Path"
Background="#2f313b" Background="#2f313b"
Foreground="DarkGray"
Height="25" Height="25"
Click="SetKeyLocationDefault_OnClick" Click="SetKeyLocationDefault_OnClick"
Margin="4,10,4,0"/> Margin="4,10,4,0"/>

1
WeeXnes/Misc/CriticalMessage.xaml
View file

@ -44,6 +44,7 @@
Content="OK" Content="OK"
Width="140" Width="140"
Height="40" Height="40"
Foreground="DarkGray"
Background="#520b16" Background="#520b16"
Name="okButton" Name="okButton"
Click="okButton_Click" Click="okButton_Click"

1
WeeXnes/Misc/Message.xaml
View file

@ -45,6 +45,7 @@
Width="140" Width="140"
Height="40" Height="40"
Background="#2f313b" Background="#2f313b"
Foreground="DarkGray"
Name="okButton" Name="okButton"
Click="okButton_Click" Click="okButton_Click"
Margin="0,0,0,20"/> Margin="0,0,0,20"/>

2
WeeXnes/Misc/UpdateMessage.xaml
View file

@ -58,6 +58,7 @@
Content="OK" Content="OK"
Width="140" Width="140"
Height="40" Height="40"
Foreground="DarkGray"
Background="#2f313b" Background="#2f313b"
Name="okButton" Name="okButton"
Click="OkButton_OnClick" Click="OkButton_OnClick"
@ -67,6 +68,7 @@
Content="CANCEL" Content="CANCEL"
Width="140" Width="140"
Height="40" Height="40"
Foreground="DarkGray"
Background="#2f313b" Background="#2f313b"
Name="cancelButton" Name="cancelButton"
Click="CancelButton_OnClick" Click="CancelButton_OnClick"

2
WeeXnes/Theme/ControlButtonTheme.xaml
View file

@ -64,7 +64,7 @@
<TextBlock Text="{TemplateBinding Property=Content}" <TextBlock Text="{TemplateBinding Property=Content}"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
Foreground="DarkGray"/> Foreground="{TemplateBinding Foreground}"/>
</Grid> </Grid>
</Border> </Border>
<ControlTemplate.Triggers> <ControlTemplate.Triggers>

2
WeeXnes/WeeXnes.csproj
View file

@ -4,7 +4,7 @@
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<Version>3.6.7</Version> <Version>3.6.8</Version>
<ProjectGuid>{4B33CEE7-C74D-43B9-B99A-8B273D5195BC}</ProjectGuid> <ProjectGuid>{4B33CEE7-C74D-43B9-B99A-8B273D5195BC}</ProjectGuid>
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<RootNamespace>WeeXnes</RootNamespace> <RootNamespace>WeeXnes</RootNamespace>