Skip to content

[Pull Request] 链接修复, 文本校对 #130

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

Merged
Dynesshely merged 3 commits into from
Sep 22, 2022
Merged

[Pull Request] 链接修复, 文本校对 #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
10d1876
💾 Feat: 更新了关于页链接
Dynesshely Sep 21, 2022
a4b8c1b
🔧 Fix(Dashboard): Anouncement 拼错了都
Dynesshely Sep 22, 2022
91c8d4b
Merge branch 'main' of github.com:Crequency/KitX into dev=main
Dynesshely Sep 22, 2022
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/Services/AnouncementManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ await FileHelper.ReadAllAsync(confPath)
{
Dispatcher.UIThread.Post(() =>
{
var toast = new AnnouncementsWindow();
var toast = new AnouncementsWindow();
toast.UpdateSource(src, readed);
toast.Show();
});
Expand Down
6 changes: 3 additions & 3 deletions ...iewModels/AnnouncementsWindowViewModel.cs → ...ViewModels/AnouncementsWindowViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@

namespace KitX_Dashboard.ViewModels
{
internal class AnnouncementsWindowViewModel : ViewModelBase, INotifyPropertyChanged
internal class AnouncementsWindowViewModel : ViewModelBase, INotifyPropertyChanged
{
public AnnouncementsWindowViewModel()
public AnouncementsWindowViewModel()
{
InitCommands();
}
Expand Down Expand Up @@ -85,7 +85,7 @@ internal Dictionary<string, string> Sources
}
}

internal AnnouncementsWindow? Window { get; set; }
internal AnouncementsWindow? Window { get; set; }

internal List<string>? Readed { get; set; }

Expand Down
2 changes: 1 addition & 1 deletion ...Dashboard/Views/AnnouncementsWindow.axaml → ... Dashboard/Views/AnouncementsWindow.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
xmlns:uip="using:FluentAvalonia.UI.Controls.Primitives"
xmlns:md="using:Markdown.Avalonia"
xmlns:ctxt="clr-namespace:ColorTextBlock.Avalonia;assembly=ColorTextBlock.Avalonia"
x:Class="KitX_Dashboard.Views.AnnouncementsWindow"
x:Class="KitX_Dashboard.Views.AnouncementsWindow"
Title="{DynamicResource Text_Public_Announcement}"
Icon="/Assets/KitX.png"
Width="{Binding Window_Width}" Height="{Binding Window_Height}"
Expand Down
6 changes: 3 additions & 3 deletions ...hboard/Views/AnnouncementsWindow.axaml.cs → ...shboard/Views/AnouncementsWindow.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@

namespace KitX_Dashboard.Views
{
public partial class AnnouncementsWindow : Window
public partial class AnouncementsWindow : Window
{
private readonly AnnouncementsWindowViewModel viewModel = new();
private readonly AnouncementsWindowViewModel viewModel = new();

public AnnouncementsWindow()
public AnouncementsWindow()
{
InitializeComponent();

Expand Down
4 changes: 2 additions & 2 deletions KitX Dashboard/Views/Pages/Controls/Settings_About.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,10">

<ui:HyperlinkButton NavigateUri="https://github.com/Catrol-org/KitX/"
<ui:HyperlinkButton NavigateUri="https://github.com/Crequency/KitX/"
ToolTip.Tip="{Binding $self.NavigateUri}"
Margin="5,0">
<StackPanel Orientation="Horizontal">
Expand All @@ -50,7 +50,7 @@
</StackPanel>
</ui:HyperlinkButton>

<ui:HyperlinkButton NavigateUri="https://apps.catrol.cn/KitX/"
<ui:HyperlinkButton NavigateUri="https://kitx.apps.catrol.cn"
ToolTip.Tip="{Binding $self.NavigateUri}"
Margin="5,0">
<StackPanel Orientation="Horizontal">
Expand Down