Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Pull Request] Crequency/KitX#278 #32

Merged
merged 28 commits into from
Feb 25, 2024
Merged

[Pull Request] Crequency/KitX#278 #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
3325136
💾 Feat: Big renaming for web rules.
Dynesshely Jan 19, 2024
8eda5b8
💾 Feat: Big renaming for web rules.
Dynesshely Jan 19, 2024
cdc0d1d
📦 Struct: Optimized.
Dynesshely Jan 26, 2024
e993df0
💾 Feat: Optimized.
Dynesshely Feb 7, 2024
b050b27
🔧 Fix(Dashboard): Error process name in single instance checking.
Dynesshely Feb 9, 2024
7dadf3a
🧩 Refactor: Step 1.
Dynesshely Feb 16, 2024
477910d
🧩 Refactor: Rename something.
Dynesshely Feb 16, 2024
8ebfd17
🔧 Fix: PluginInfo deserialize to json
StardustSeemsInk Feb 17, 2024
37e8c23
💾 Feat: Optimized.
Dynesshely Feb 17, 2024
65ed170
💾 Feat: Evoke the pluginLaunchWindow from TrayIcon menu.
StardustSeemsInk Feb 18, 2024
86e9a9f
💾 Feat: Almost COMPLETE the PluginLaunchWindow UI
StardustSeemsInk Feb 18, 2024
b8ffa2d
💾 Feat(EventService): Optimized.
Dynesshely Feb 18, 2024
880469a
💾 Feat(DebugWindow): Enable to cancel and provide better experience.
Dynesshely Feb 19, 2024
53e0ace
🧩🐛 Refactor, Bug(PluginLauncherWindows):重构为MVVM架构，但是前端Value属性的更改不能同步
StardustSeemsInk Feb 19, 2024
c1b9d78
💾 Feat: Merge from `dev=main`.
Dynesshely Feb 19, 2024
e0d23c7
🧩 Refactor(Dashboard): New PluginsServer with WebSocket, new LibView.
Dynesshely Feb 21, 2024
a6924c8
📄 Docs(README): Updated.
Dynesshely Feb 21, 2024
2d57cbe
💾 Feat(Dashboard): DebugWindow changed to show in center of owner.
Dynesshely Feb 21, 2024
8f46a6b
💾 Feat(Dashboard): Use `ViewInstances.ShowWindow()` to manage sub win…
Dynesshely Feb 21, 2024
dbb0f15
💾 🧩 Feat, Refactor(Dashboard): Updated to `Translate` method and disp…
Dynesshely Feb 21, 2024
2001c36
💾 Feat(Dashboard): Optimized.
Dynesshely Feb 21, 2024
9fdfc5e
💾 Feat(Dashboard): Binding for SelectedPlugin in LaunchWindow.
Dynesshely Feb 21, 2024
79e80f7
💾 Feat(Dashboard): Check if `PluginInfo.Tags` is null.
Dynesshely Feb 21, 2024
1fc3e5d
💾 Feat(Dashboard): Clear collection on exiting.
Dynesshely Feb 21, 2024
9d2773b
💾 Feat(Dashboard): Selectable plugin buttons in LaunchWindow and expe…
Dynesshely Feb 21, 2024
069443d
💾 Feat(Dashboard): Optimized PluginsLaunchWindow.
Dynesshely Feb 24, 2024
eefe60f
💾 Feat: The first time that dashboard invoke plugin function throw ne…
Dynesshely Feb 25, 2024
c3e8d9b
🔧 Fix(Dashboard): Fixed two inheritance-related issues.
Dynesshely Feb 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion KitX Dashboard Assets/KitX.Dashboard.Assets.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<TrimMode>copyused</TrimMode>
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
Expand Down
1 change: 1 addition & 0 deletions KitX Dashboard Assets/KitX.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion KitX Dashboard Core/KitX.Dashboard.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion KitX Dashboard Fonts/KitX.Dashboard.Fonts.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<TrimMode>copyused</TrimMode>
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
Expand Down
2 changes: 1 addition & 1 deletion KitX Dashboard Repair Tool/KitX.Dashboard.RepairTool.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<PublishAot>true</PublishAot>
Expand Down
32 changes: 24 additions & 8 deletions KitX Dashboard Repair Tool/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
KitX Repair Tool (C) Crequency
Environment: {Environment.Version}
OS Version: {Environment.OSVersion}
""");
"""
);
};

var log_exception = (Exception e) =>
Expand All @@ -15,25 +16,35 @@ KitX Repair Tool (C) Crequency
Console.WriteLine(e.StackTrace);
};

T? ask<T>(string tip = "Input: ", Func<string?, T>? parse = null)
static T? ask<T>(string tip = "Input: ", Func<string?, T>? parse = null)
{
Console.Write(tip);
string? input = Console.ReadLine();

var input = Console.ReadLine();

if (input is null) return default(T);
if (parse is not null) return parse(input);
else throw new Exception(input);

if (parse is not null)
return parse(input);
else
throw new Exception(input);
};

var menu = () =>
{
Console.WriteLine(
"""
1. (root) Linux wayland repair (add `LC_ALL=C` to environment variables)
""");
return ask("Your select: ", x => int.TryParse(x, out int y) ? y : -1);
"""
);

return ask("You selected: ", x => int.TryParse(x, out int y) ? y : -1);
};



tip_copyright();

switch (menu())
{
case 1:
Expand All @@ -44,7 +55,12 @@ KitX Repair Tool (C) Crequency
}
try
{
File.AppendAllLines("/etc/environment", new string[] { "LC_ALL=C" });
await File.AppendAllLinesAsync(
"/etc/environment",
[
"LC_ALL=C"
]
);
}
catch (Exception e)
{
Expand Down
2 changes: 1 addition & 1 deletion KitX Dashboard Updater/KitX.Dashboard.Updater.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
15 changes: 12 additions & 3 deletions KitX Dashboard/App.axaml
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's right which is MVVM do.

Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@

<Application.Resources>
<ResourceDictionary>
<x:String x:Key="TrayIconText">KitX</x:String>

<SolidColorBrush x:Key="ThemePrimaryAccent" Color="#FF3873D9"/>
<SolidColorBrush x:Key="ThemePrimaryAccentTransparentAA" Color="#AA3873D9"/>
<SolidColorBrush x:Key="ThemePrimaryAccentTransparentBB" Color="#BB3873D9"/>
Expand All @@ -32,23 +30,34 @@

<FontFamily x:Key="SarasaMonoCL">avares://KitX.Dashboard.Fonts/sarasa-mono-cl-regular.ttf#Sarasa Mono CL</FontFamily>
<FontFamily x:Key="SourceHanSans">avares://KitX.Dashboard.Fonts/SourceHanSans-VF.ttf#Source Han Sans VF</FontFamily>

<ResourceDictionary.MergedDictionaries>

</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>

<Application.Styles>
<sty:FluentAvaloniaTheme/>
<materialIcons:MaterialIconStyles/>

<StyleInclude Source="avares://AvaloniaEdit/Themes/Fluent/AvaloniaEdit.xaml"/>
<StyleInclude Source="avares://AvaloniaProgressRing/Styles/ProgressRing.xaml"/>
<StyleInclude Source="/Styles/FontsStyles.axaml"/>
</Application.Styles>

<TrayIcon.Icons>
<TrayIcons>
<TrayIcon Command="{Binding TrayIconClickedCommand}"
Icon="resm:KitX.Dashboard.Assets.KitX-Icon-256x256.ico"
IsVisible="True"
ToolTipText="{DynamicResource TrayIconText}">
ToolTipText="{Binding TrayIconText}">
<TrayIcon.Menu>
<NativeMenu>
<NativeMenuItem Command="{Binding TrayIconClickedCommand}" Header="{DynamicResource Text_Public_ShowMainWindow}"/>
<NativeMenuItem Command="{Binding PluginLauncherCommand}" Header="{DynamicResource Text_Public_ShowLauncherWindow}"/>
<NativeMenuItemSeparator/>
<NativeMenuItem Command="{Binding ViewLatestAnnouncementsCommand}" Header="{DynamicResource Text_Public_ShowAnnouncements}"/>
<NativeMenuItemSeparator/>
<NativeMenuItem Command="{Binding ExitCommand}" Header="{DynamicResource Text_Public_Exit}"/>
</NativeMenu>
Expand Down
Loading
Loading