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

Re-Design + Code Cleanup

Browse source
This commit is contained in:
WeeXnes 2022-06-20 20:15:44 +02:00
parent 1fc48eaae6
commit aa1870198b
8 changed files with 119 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
WeeXnes/Core/Globals.cs
View file

@ -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 = "2.7.9"; public static string version = "3.0";
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/";

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

@ -20,10 +20,19 @@
<ColumnDefinition Width="220"/> <ColumnDefinition Width="220"/>
<ColumnDefinition/> <ColumnDefinition/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Border Background="#22202f" <Border
CornerRadius="10" CornerRadius="4"
Height="300" Height="300"
VerticalAlignment="Top"> VerticalAlignment="Top">
<Border.Background>
<LinearGradientBrush StartPoint="0 0" EndPoint="1 1">
<LinearGradientBrush.GradientStops>
<GradientStop Offset="0.2" Color="#212329" />
<GradientStop Offset="1" Color="#202127" />
</LinearGradientBrush.GradientStops>
</LinearGradientBrush>
</Border.Background>
<ListBox Height="300" <ListBox Height="300"
VerticalAlignment="Top" VerticalAlignment="Top"
Background="Transparent" Background="Transparent"
@ -43,7 +52,7 @@
VerticalAlignment="Top" VerticalAlignment="Top"
Margin="20,20,0,0" Margin="20,20,0,0"
Name="tb_FormName" Name="tb_FormName"
Background="#353340" Background="#212329"
Tag="Name (for List)"/> Tag="Name (for List)"/>
<TextBox Grid.Column="1" <TextBox Grid.Column="1"
@ -54,7 +63,7 @@
VerticalAlignment="Top" VerticalAlignment="Top"
Margin="20,60,0,0" Margin="20,60,0,0"
Name="tb_FormPName" Name="tb_FormPName"
Background="#353340" Background="#212329"
Tag="Process Name"/> Tag="Process Name"/>
<Label Content=".exe" <Label Content=".exe"
Foreground="White" Foreground="White"
@ -69,7 +78,7 @@
VerticalAlignment="Top" VerticalAlignment="Top"
Margin="20,100,0,0" Margin="20,100,0,0"
Name="tb_FormClient" Name="tb_FormClient"
Background="#353340" Background="#212329"
Tag="ClientID"/> Tag="ClientID"/>
<TextBox Grid.Column="1" <TextBox Grid.Column="1"
Style="{StaticResource MaterialTextBox}" Style="{StaticResource MaterialTextBox}"
@ -79,7 +88,7 @@
VerticalAlignment="Top" VerticalAlignment="Top"
Margin="20,180,0,0" Margin="20,180,0,0"
Name="tb_FormState" Name="tb_FormState"
Background="#353340" Background="#212329"
Tag="State"/> Tag="State"/>
<TextBox Grid.Column="1" <TextBox Grid.Column="1"
Style="{StaticResource MaterialTextBox}" Style="{StaticResource MaterialTextBox}"
@ -89,7 +98,7 @@
VerticalAlignment="Top" VerticalAlignment="Top"
Margin="20,140,0,0" Margin="20,140,0,0"
Name="tb_FormDetails" Name="tb_FormDetails"
Background="#353340" Background="#212329"
Tag="Details"/> Tag="Details"/>
@ -101,7 +110,7 @@
VerticalAlignment="Top" VerticalAlignment="Top"
Margin="20,220,0,0" Margin="20,220,0,0"
Name="tb_FormLargeImgKey" Name="tb_FormLargeImgKey"
Background="#353340" Background="#212329"
Tag="Large Image Key"/> Tag="Large Image Key"/>
<TextBox Grid.Column="1" <TextBox Grid.Column="1"
Style="{StaticResource MaterialTextBox}" Style="{StaticResource MaterialTextBox}"
@ -111,7 +120,7 @@
VerticalAlignment="Top" VerticalAlignment="Top"
Margin="250,220,0,0" Margin="250,220,0,0"
Name="tb_FormLargeImgTxt" Name="tb_FormLargeImgTxt"
Background="#353340" Background="#202127"
Tag="Large Image Text"/> Tag="Large Image Text"/>
<TextBox Grid.Column="1" <TextBox Grid.Column="1"
@ -122,7 +131,7 @@
VerticalAlignment="Top" VerticalAlignment="Top"
Margin="20,260,0,0" Margin="20,260,0,0"
Name="tb_FormSmallImgKey" Name="tb_FormSmallImgKey"
Background="#353340" Background="#212329"
Tag="Small Image Key"/> Tag="Small Image Key"/>
<TextBox Grid.Column="1" <TextBox Grid.Column="1"
Style="{StaticResource MaterialTextBox}" Style="{StaticResource MaterialTextBox}"
@ -132,7 +141,7 @@
VerticalAlignment="Top" VerticalAlignment="Top"
Margin="250,260,0,0" Margin="250,260,0,0"
Name="tb_FormSmallImgTxt" Name="tb_FormSmallImgTxt"
Background="#353340" Background="#202127"
Tag="Small Image Text"/> Tag="Small Image Text"/>
<Button Height="30" <Button Height="30"
Width="65" Width="65"
@ -143,7 +152,7 @@
HorizontalAlignment="Left" HorizontalAlignment="Left"
Grid.Column="1" Grid.Column="1"
Margin="20,0,0,5" Margin="20,0,0,5"
Background="#353340" Background="#212329"
Content="Save"/> Content="Save"/>
@ -158,7 +167,7 @@
VerticalAlignment="Bottom" VerticalAlignment="Bottom"
HorizontalAlignment="Left" HorizontalAlignment="Left"
Margin="70,0,0,5" Margin="70,0,0,5"
Background="#353340" Background="#212329"
Content="Stop"/> Content="Stop"/>
<Button Height="30" <Button Height="30"
Width="65" Width="65"
@ -168,7 +177,7 @@
VerticalAlignment="Bottom" VerticalAlignment="Bottom"
HorizontalAlignment="Left" HorizontalAlignment="Left"
Margin="0,0,0,5" Margin="0,0,0,5"
Background="#353340" Background="#212329"
Content="Start"/> Content="Start"/>
<Button Height="30" <Button Height="30"
Width="65" Width="65"
@ -178,7 +187,7 @@
VerticalAlignment="Bottom" VerticalAlignment="Bottom"
HorizontalAlignment="Left" HorizontalAlignment="Left"
Margin="140,0,0,5" Margin="140,0,0,5"
Background="#353340" Background="#212329"
Content="New"/> Content="New"/>
@ -188,8 +197,16 @@
<Border Grid.Row="1" <Border Grid.Row="1"
Background="#22202f" CornerRadius="4">
CornerRadius="10">
<Border.Background>
<LinearGradientBrush StartPoint="0 0" EndPoint="1 1">
<LinearGradientBrush.GradientStops>
<GradientStop Offset="0.2" Color="#212329" />
<GradientStop Offset="1" Color="#1b1c21" />
</LinearGradientBrush.GradientStops>
</LinearGradientBrush>
</Border.Background>
<RichTextBox Grid.Row="1" <RichTextBox Grid.Row="1"
Background="Transparent" Background="Transparent"
BorderThickness="0" BorderThickness="0"

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

@ -21,9 +21,17 @@
<Grid> <Grid>
<Border Background="#22202f" <Border
CornerRadius="10" CornerRadius="4"
Height="375"> Height="375">
<Border.Background>
<LinearGradientBrush StartPoint="0 0" EndPoint="1 1">
<LinearGradientBrush.GradientStops>
<GradientStop Offset="0.2" Color="#212329" />
<GradientStop Offset="1" Color="#1b1c21" />
</LinearGradientBrush.GradientStops>
</LinearGradientBrush>
</Border.Background>
<ListView Name="KeyListView" <ListView Name="KeyListView"
Background="Transparent" Background="Transparent"
Foreground="White" Foreground="White"
@ -59,21 +67,22 @@
HorizontalAlignment="Left" HorizontalAlignment="Left"
Width="250" Width="250"
Style="{StaticResource MaterialTextBox}" Style="{StaticResource MaterialTextBox}"
Background="#353340" Tag="Name"/> Background="#1c1e23" Tag="Name"/>
<TextBox Name="Textbox_Value" <TextBox Name="Textbox_Value"
Height="30" Height="30"
HorizontalAlignment="Right" HorizontalAlignment="Right"
Width="250" Width="250"
Margin="15,0,0,0" Margin="15,0,0,0"
Style="{StaticResource MaterialTextBox}" Style="{StaticResource MaterialTextBox}"
Background="#353340" Tag="Value"/> Background="#1c1e23" Tag="Value"/>
<Button Width="90" <Button Width="90"
Height="30" Height="30"
Name="AddButton" Name="AddButton"
Margin="15,0,0,0" Margin="15,0,0,0"
Click="AddButton_Click" Click="AddButton_Click"
Content="Add" Content="Add"
Style="{StaticResource ModernAddButton}" Background="#1c1e23"
Style="{StaticResource UniversalMaterialButton}"
/> />
</StackPanel> </StackPanel>

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

@ -15,11 +15,17 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Border Grid.Row="0" <Border Grid.Row="0"
Background="#22202f" CornerRadius="4"
CornerRadius="10"
Margin="10,10,10,10" Margin="10,10,10,10"
Padding="0,0,0,5"> Padding="0,0,0,5">
<Border.Background>
<LinearGradientBrush StartPoint="0 0" EndPoint="1 1">
<LinearGradientBrush.GradientStops>
<GradientStop Offset="0.2" Color="#212329" />
<GradientStop Offset="1" Color="#1b1c21" />
</LinearGradientBrush.GradientStops>
</LinearGradientBrush>
</Border.Background>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<Label Content="General" <Label Content="General"
Foreground="White" Foreground="White"
@ -43,7 +49,7 @@
<Button Name="CheckForUpdateBtn" <Button Name="CheckForUpdateBtn"
Style="{StaticResource UniversalMaterialButton}" Style="{StaticResource UniversalMaterialButton}"
Content="Check for Updates" Content="Check for Updates"
Background="#353340" Background="#2f313b"
Height="25" Height="25"
Click="CheckForUpdateBtn_OnClick" Click="CheckForUpdateBtn_OnClick"
Margin="4,10,4,0"/> Margin="4,10,4,0"/>
@ -51,7 +57,7 @@
<Button Name="createShortcut" <Button Name="createShortcut"
Style="{StaticResource UniversalMaterialButton}" Style="{StaticResource UniversalMaterialButton}"
Content="Create Startmenu Entry" Content="Create Startmenu Entry"
Background="#353340" Background="#2f313b"
Height="25" Height="25"
Click="CreateShortcut_OnClick" Click="CreateShortcut_OnClick"
Margin="4,10,4,0"/> Margin="4,10,4,0"/>
@ -59,7 +65,7 @@
<Button Name="OpenAppdataFolder" Grid.Row="1" <Button Name="OpenAppdataFolder" Grid.Row="1"
Style="{StaticResource UniversalMaterialButton}" Style="{StaticResource UniversalMaterialButton}"
Content="Open AppData Folder" Content="Open AppData Folder"
Background="#353340" Background="#2f313b"
Height="25" Height="25"
Margin="4,10,4,0" Margin="4,10,4,0"
Click="OpenAppdataFolder_Click"/> Click="OpenAppdataFolder_Click"/>
@ -70,10 +76,17 @@
</Border> </Border>
<Border Grid.Row="1" <Border Grid.Row="1"
Background="#22202f" CornerRadius="4"
CornerRadius="10"
Margin="10,10,10,10" Margin="10,10,10,10"
Padding="0,0,0,5"> Padding="0,0,0,5">
<Border.Background>
<LinearGradientBrush StartPoint="0 0" EndPoint="1 1">
<LinearGradientBrush.GradientStops>
<GradientStop Offset="0.2" Color="#212329" />
<GradientStop Offset="1" Color="#1b1c21" />
</LinearGradientBrush.GradientStops>
</LinearGradientBrush>
</Border.Background>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<Label Content="RPC" <Label Content="RPC"
Foreground="White" Foreground="White"
@ -102,12 +115,12 @@
<TextBox Style="{StaticResource MaterialTextBox}" <TextBox Style="{StaticResource MaterialTextBox}"
Margin="4,0,4,0" Margin="4,0,4,0"
Name="tb_DefaultClientID" Name="tb_DefaultClientID"
Background="#353340" Background="#2f313b"
Tag="Default Client ID"/> Tag="Default Client ID"/>
<Button Name="SaveDefaultID" <Button Name="SaveDefaultID"
Style="{StaticResource UniversalMaterialButton}" Style="{StaticResource UniversalMaterialButton}"
Content="Set Default ClientID" Content="Set Default ClientID"
Background="#353340" Background="#2f313b"
Height="25" Height="25"
Click="SaveDefaultID_Click" Click="SaveDefaultID_Click"
Margin="4,10,4,0"/> Margin="4,10,4,0"/>
@ -134,14 +147,14 @@
<Button Name="SetRpcLocation" <Button Name="SetRpcLocation"
Style="{StaticResource UniversalMaterialButton}" Style="{StaticResource UniversalMaterialButton}"
Content="Set Rpc Files Path" Content="Set Rpc Files Path"
Background="#353340" Background="#2f313b"
Height="25" Height="25"
Click="SetRpcLocation_OnClick" Click="SetRpcLocation_OnClick"
Margin="4,10,4,0"/> Margin="4,10,4,0"/>
<Button Name="SetRpcLocationDefault" <Button Name="SetRpcLocationDefault"
Style="{StaticResource UniversalMaterialButton}" Style="{StaticResource UniversalMaterialButton}"
Content="Set Default Path" Content="Set Default Path"
Background="#353340" Background="#2f313b"
Height="25" Height="25"
Click="SetRpcLocationDefault_OnClick" Click="SetRpcLocationDefault_OnClick"
Margin="4,10,4,0"/> Margin="4,10,4,0"/>
@ -152,11 +165,17 @@
</Border> </Border>
<Border Grid.Row="2" <Border Grid.Row="2"
Background="#22202f" CornerRadius="4"
CornerRadius="10"
Margin="10,10,10,10" Margin="10,10,10,10"
Padding="0,0,0,5"> Padding="0,0,0,5">
<Border.Background>
<LinearGradientBrush StartPoint="0 0" EndPoint="1 1">
<LinearGradientBrush.GradientStops>
<GradientStop Offset="0.2" Color="#212329" />
<GradientStop Offset="1" Color="#1b1c21" />
</LinearGradientBrush.GradientStops>
</LinearGradientBrush>
</Border.Background>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<Label Content="Key Manager" <Label Content="Key Manager"
Foreground="White" Foreground="White"
@ -195,14 +214,14 @@
<Button Name="SetKeyLocation" <Button Name="SetKeyLocation"
Style="{StaticResource UniversalMaterialButton}" Style="{StaticResource UniversalMaterialButton}"
Content="Set Key Files Path" Content="Set Key Files Path"
Background="#353340" Background="#2f313b"
Height="25" Height="25"
Click="SetKeyLocation_OnClick" Click="SetKeyLocation_OnClick"
Margin="4,10,4,0"/> Margin="4,10,4,0"/>
<Button Name="SetKeyLocationDefault" <Button Name="SetKeyLocationDefault"
Style="{StaticResource UniversalMaterialButton}" Style="{StaticResource UniversalMaterialButton}"
Content="Set Default Path" Content="Set Default Path"
Background="#353340" Background="#2f313b"
Height="25" Height="25"
Click="SetKeyLocationDefault_OnClick" Click="SetKeyLocationDefault_OnClick"
Margin="4,10,4,0"/> Margin="4,10,4,0"/>

25
WeeXnes/MainWindow.xaml
View file

@ -6,8 +6,8 @@
xmlns:local="clr-namespace:WeeXnes" xmlns:local="clr-namespace:WeeXnes"
xmlns:viewModel="clr-namespace:WeeXnes.MVVM.ViewModel" xmlns:viewModel="clr-namespace:WeeXnes.MVVM.ViewModel"
mc:Ignorable="d" mc:Ignorable="d"
Height="600" Height="632"
Width="920" Width="952"
WindowStyle="None" WindowStyle="None"
ResizeMode="NoResize" ResizeMode="NoResize"
Background="Transparent" Background="Transparent"
@ -23,10 +23,23 @@
<viewModel:MainViewModel/> <viewModel:MainViewModel/>
</Window.DataContext> </Window.DataContext>
<Border Background="#272537" <Border
CornerRadius="10" CornerRadius="4"
MouseDown="Border_MouseDown" MouseDown="Border_MouseDown"
Name="window_border"> Name="window_border"
Margin="16">
<Border.Background>
<LinearGradientBrush StartPoint="0 0" EndPoint="1 1">
<LinearGradientBrush.GradientStops>
<GradientStop Offset="0.2" Color="#2c2e36" />
<GradientStop Offset="1" Color="#212329" />
</LinearGradientBrush.GradientStops>
</LinearGradientBrush>
</Border.Background>
<Border.Effect>
<DropShadowEffect BlurRadius="15" Direction="-90"
RenderingBias="Quality" ShadowDepth="0"/>
</Border.Effect>
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
@ -95,7 +108,7 @@
HorizontalAlignment="Left" HorizontalAlignment="Left"
Margin="5" Margin="5"
Style="{StaticResource MaterialTextBox}" Style="{StaticResource MaterialTextBox}"
Background="#353340" Tag="Search..." Background="#212329" Tag="Search..."
TextChanged="Searchbox_TextChanged" TextChanged="Searchbox_TextChanged"
Name="Searchbox" Name="Searchbox"
/> />

28
WeeXnes/Theme/ControlButtonTheme.xaml
View file

@ -1,30 +1,6 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Style TargetType="{x:Type Button}"
x:Key="ModernAddButton">
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Button}">
<Border CornerRadius="10"
Background="#353340">
<Grid>
<Rectangle StrokeThickness="1"/>
<TextBlock Text="Add"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Foreground="DarkGray"/>
</Grid>
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Background" Value="Transparent" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style TargetType="{x:Type Button}" <Style TargetType="{x:Type Button}"
x:Key="ModernCloseButton"> x:Key="ModernCloseButton">
<Setter Property="Template"> <Setter Property="Template">
@ -57,7 +33,7 @@
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="{x:Type Button}"> <ControlTemplate TargetType="{x:Type Button}">
<Border CornerRadius="0" <Border CornerRadius="0"
Background="#22202f"> Background="#25272e">
<Grid> <Grid>
<Rectangle StrokeThickness="1"/> <Rectangle StrokeThickness="1"/>
<TextBlock Text="{TemplateBinding Property=Content}" <TextBlock Text="{TemplateBinding Property=Content}"
@ -81,7 +57,7 @@
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="{x:Type Button}"> <ControlTemplate TargetType="{x:Type Button}">
<Border CornerRadius="10" <Border CornerRadius="4"
Background="{TemplateBinding Background}"> Background="{TemplateBinding Background}">
<Grid> <Grid>
<Rectangle StrokeThickness="1"/> <Rectangle StrokeThickness="1"/>

4
WeeXnes/Theme/MenuButtonTheme.xaml
View file

@ -40,7 +40,7 @@
<Grid VerticalAlignment="Stretch" <Grid VerticalAlignment="Stretch"
HorizontalAlignment="Stretch"> HorizontalAlignment="Stretch">
<Border Background="{TemplateBinding Background}" <Border Background="{TemplateBinding Background}"
CornerRadius="10"> CornerRadius="4">
<TextBlock Text="{TemplateBinding Property=Content}" <TextBlock Text="{TemplateBinding Property=Content}"
VerticalAlignment="Center" VerticalAlignment="Center"
Margin="50,0,0,0"/> Margin="50,0,0,0"/>
@ -56,7 +56,7 @@
</Style.Setters> </Style.Setters>
<Style.Triggers> <Style.Triggers>
<Trigger Property="IsChecked" Value="True"> <Trigger Property="IsChecked" Value="True">
<Setter Property="Background" Value="#22202f"/> <Setter Property="Background" Value="#212329"/>
</Trigger> </Trigger>
</Style.Triggers> </Style.Triggers>
</Style> </Style>

2
WeeXnes/Theme/TextBoxTheme.xaml
View file

@ -5,7 +5,7 @@
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="{x:Type TextBox}"> <ControlTemplate TargetType="{x:Type TextBox}">
<Border CornerRadius="10" <Border CornerRadius="4"
Background="{TemplateBinding Background}"> Background="{TemplateBinding Background}">
<Grid> <Grid>
<Rectangle StrokeThickness="1"/> <Rectangle StrokeThickness="1"/>