Skip to content

Commit

Permalink
更名
Browse files Browse the repository at this point in the history
  • Loading branch information
aiqinxuancai committed Feb 21, 2024
1 parent a1f6ad2 commit 8675ac1
Show file tree
Hide file tree
Showing 73 changed files with 154 additions and 147 deletions.
4 changes: 2 additions & 2 deletions WkyFast.UI.Test/App.xaml → Aria2Fast.UI.Test/App.xaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Application x:Class="WkyFast.UI.Test.App"
<Application x:Class="Aria2Fast.UI.Test.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:WkyFast.UI.Test"
xmlns:local="clr-namespace:Aria2Fast.UI.Test"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
StartupUri="MainWindow.xaml">
<Application.Resources>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
using System.Windows;
using Wpf.Ui;

namespace WkyFast.UI.Test
namespace Aria2Fast.UI.Test
{
/// <summary>
/// Interaction logic for App.xaml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\WkyFast\WkyFast.csproj" />
<ProjectReference Include="..\Aria2Fast\Aria2Fast.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Windows;
using System.Windows;

[assembly: ThemeInfo(
ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<ui:FluentWindow
x:Class="WkyFast.UI.Test.MainWindow"
x:Class="Aria2Fast.UI.Test.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:WkyFast.UI.Test"
xmlns:local="clr-namespace:Aria2Fast.UI.Test"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
Title="MainWindow"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using WkyFast.Service;
using Aria2Fast.Service;
using Wpf.Ui;
using Wpf.Ui.Controls;

namespace WkyFast.UI.Test
namespace Aria2Fast.UI.Test
{
/// <summary>
/// Interaction logic for MainWindow.xaml
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;

namespace WkyFast.UI.Test
namespace Aria2Fast.UI.Test
{
public class MainWindowViewModel
{
Expand Down
4 changes: 2 additions & 2 deletions WkyFast.sln → Aria2Fast.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.31903.59
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WkyFast", "WkyFast\WkyFast.csproj", "{93542562-AD8C-49B3-BAFA-2721E6200282}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aria2Fast", "Aria2Fast\Aria2Fast.csproj", "{93542562-AD8C-49B3-BAFA-2721E6200282}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WkyFast.UI.Test", "WkyFast.UI.Test\WkyFast.UI.Test.csproj", "{274BB079-3656-4645-8602-CF79E7811317}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aria2Fast.UI.Test", "Aria2Fast.UI.Test\Aria2Fast.UI.Test.csproj", "{274BB079-3656-4645-8602-CF79E7811317}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
4 changes: 2 additions & 2 deletions WkyFast/App.xaml → Aria2Fast/App.xaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Application x:Class="WkyFast.App"
<Application x:Class="Aria2Fast.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:WkyFast"
xmlns:local="clr-namespace:Aria2Fast"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
StartupUri="MainWindow.xaml">
<Application.Resources>
Expand Down
12 changes: 6 additions & 6 deletions WkyFast/App.xaml.cs → Aria2Fast/App.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Media;
using WkyFast.Service;
using WkyFast.Utils;
using Aria2Fast.Service;
using Aria2Fast.Utils;

namespace WkyFast
namespace Aria2Fast
{
/// <summary>
/// Interaction logic for App.xaml
Expand All @@ -25,11 +25,11 @@ static App()
TextOptions.TextFormattingModeProperty.OverrideMetadata(typeof(Window),
new FrameworkPropertyMetadata(TextFormattingMode.Display, FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender | FrameworkPropertyMetadataOptions.Inherits));
}
public static void ExitWkyFast()
public static void ExitAria2Fast()
{
if (WkyFast.MainWindow.Instance != null)
if (Aria2Fast.MainWindow.Instance != null)
{
WkyFast.MainWindow.Instance.Close();
Aria2Fast.MainWindow.Instance.Close();
}
App.Current.Shutdown();
}
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion WkyFast/AssemblyInfo.cs → Aria2Fast/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Windows;
using System.Windows;

[assembly: ThemeInfo(
ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
20 changes: 10 additions & 10 deletions WkyFast/MainWindow.xaml → Aria2Fast/MainWindow.xaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<Window
x:Class="WkyFast.MainWindow"
x:Class="Aria2Fast.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:dialogs="clr-namespace:WkyFast.Dialogs"
xmlns:local="clr-namespace:WkyFast"
xmlns:dialogs="clr-namespace:Aria2Fast.Dialogs"
xmlns:local="clr-namespace:Aria2Fast"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:service="clr-namespace:WkyFast.Service"
xmlns:service="clr-namespace:Aria2Fast.Service"
xmlns:tb="http://www.hardcodet.net/taskbar"
xmlns:tray="http://schemas.lepo.co/wpfui/2022/xaml/tray"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
xmlns:view="clr-namespace:WkyFast.View"
Title="WkyFast"
xmlns:view="clr-namespace:Aria2Fast.View"
Title="Aria2Fast"
Width="1020"
Height="680"
Closing="Window_Closing"
Expand Down Expand Up @@ -47,7 +47,7 @@

<ui:TitleBar
x:Name="Bar"
Title="WkyFast"
Title="Aria2Fast"
Grid.Row="0"
Grid.ColumnSpan="2"
CloseClicked="TitleBar_CloseClicked"
Expand Down Expand Up @@ -126,7 +126,7 @@
Cursor="Hand"
Icon="Settings24"
PageTag="settings"
PageType="{x:Type view:WkyFastSettingView}">
PageType="{x:Type view:Aria2FastSettingView}">
<Grid>
<TextBlock FontSize="12" Text="设置" />
</Grid>
Expand All @@ -149,7 +149,7 @@
FocusOnLeftClick="True"
Icon="icon.ico"
MenuOnRightClick="True"
TooltipText="WkyFast">
TooltipText="Aria2Fast">
<ui:NotifyIcon.Menu>
<ContextMenu>
<MenuItem
Expand All @@ -162,7 +162,7 @@

<!--<tb:TaskbarIcon x:Name="MainNotifyIcon"
Visibility="Visible"
ToolTipText="WkyFast"
ToolTipText="Aria2Fast"
MenuActivation="LeftOrRightClick"
PopupActivation="DoubleClick"
LeftClickCommand=""
Expand Down
25 changes: 16 additions & 9 deletions WkyFast/MainWindow.xaml.cs → Aria2Fast/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using WkyFast.Service;
using WkyFast.Utils;
using WkyFast.View.Model;
using WkyFast.Dialogs;
using Aria2Fast.Service;
using Aria2Fast.Utils;
using Aria2Fast.View.Model;
using Aria2Fast.Dialogs;
using System.Threading;
using Wpf.Ui.Mvvm.Contracts;
using Wpf.Ui.Controls;
using System.Reactive.Linq;
using WkyFast.Service.Model;
using Aria2Fast.Service.Model;

namespace WkyFast
namespace Aria2Fast
{
/// <summary>
/// Interaction logic for MainWindow.xaml
Expand Down Expand Up @@ -126,7 +126,7 @@ private void MetroWindow_Unloaded(object sender, RoutedEventArgs e)

private void ButtonGithub_Click(object sender, RoutedEventArgs e)
{
BrowserHelper.OpenUrlBrowser("https://github.com/aiqinxuancai/WkyFast");
BrowserHelper.OpenUrlBrowser("https://github.com/aiqinxuancai/Aria2Fast");
}

private void MainNotifyIcon_TrayLeftMouseDown(object sender, RoutedEventArgs e)
Expand All @@ -144,12 +144,12 @@ private void MainNotifyIcon_TrayLeftMouseDown(object sender, RoutedEventArgs e)

private void NavigationItem_Home_Click(object sender, RoutedEventArgs e)
{
BrowserHelper.OpenUrlBrowser("https://github.com/aiqinxuancai/WkyFast");
BrowserHelper.OpenUrlBrowser("https://github.com/aiqinxuancai/Aria2Fast");
}

private void HomeButton_MouseDown(object sender, MouseButtonEventArgs e)
{
BrowserHelper.OpenUrlBrowser("https://github.com/aiqinxuancai/WkyFast");
BrowserHelper.OpenUrlBrowser("https://github.com/aiqinxuancai/Aria2Fast");
}

private void TitleBar_CloseClicked(object sender, RoutedEventArgs e)
Expand Down Expand Up @@ -198,12 +198,19 @@ private void UpdateConnectionStatus(LinkStatus status)
LinkStatusProgressBar.Visibility = Visibility.Collapsed;
myBrush.Color = (Color)ColorConverter.ConvertFromString("#ffed4014");
LinkStatusBorder.Background = myBrush;

if (string.IsNullOrWhiteSpace(Aria2ApiManager.Instance.ConnectedRpc))
{
Aria2RpcHostTextBlock.Text = "请在设置中添加Aria2Rpc地址";
}
break;
case LinkStatus.Success:
LinkStatusProgressBar.IsIndeterminate = false;
LinkStatusProgressBar.Visibility = Visibility.Collapsed;
myBrush.Color = (Color)ColorConverter.ConvertFromString("#ff19be6b");
LinkStatusBorder.Background = myBrush;


break;

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using System.Windows;
using Wpf.Ui.Common;

namespace WkyFast
namespace Aria2Fast
{
public partial class MainWindow
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
using System.Runtime.CompilerServices;
using System.Threading;

namespace WkyFast.Service
namespace Aria2Fast.Service
{
[AddINotifyPropertyChangedInterface]
public class AppConfigData : INotifyPropertyChanged
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System.Diagnostics;
using System.IO;
using System.Threading.Tasks;
using WkyFast.Service.Model;
using Aria2Fast.Service.Model;
using Aria2NET;
using System.Reactive.Subjects;
using System.Reactive.Linq;
Expand All @@ -17,7 +17,7 @@
using System.Timers;


namespace WkyFast.Service
namespace Aria2Fast.Service
{
public enum LinkStatus
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
using System.Text;
using System.Text.Json.Nodes;
using System.Threading.Tasks;
using WkyFast.Utils;
using Aria2Fast.Utils;

namespace WkyFast.Service
namespace Aria2Fast.Service
{
internal class ChatGPTTranslatorManager
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
using System.Threading;
using System.IO;
using System.Diagnostics;
using WkyFast.Utils;
using Aria2Fast.Utils;
using System.Diagnostics.Eventing.Reader;

namespace WkyFast.Service
namespace Aria2Fast.Service
{
public class EasyLogManager
{
Expand Down
6 changes: 3 additions & 3 deletions WkyFast/Service/GAHelper.cs → Aria2Fast/Service/GAHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
using System.Collections.Generic;
using Flurl.Http;
using System.Threading.Tasks;
using WkyFast.Service;
using Aria2Fast.Service;
using System.Diagnostics;

namespace WkyFast.Service
namespace Aria2Fast.Service
{
/// <summary>
/// 相关文档:
Expand Down Expand Up @@ -92,7 +92,7 @@ public async Task Login()
name = "login",
@params = new
{
method = "WkyFast",
method = "Aria2Fast",
},
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
using System.ComponentModel;
using System.Runtime.Serialization;

namespace WkyFast.Service.Model
namespace Aria2Fast.Service.Model
{

public record Aria2Event
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
using System.Text;
using System.Threading.Tasks;

namespace WkyFast.Service.Model
namespace Aria2Fast.Service.Model
{
[AddINotifyPropertyChangedInterface]
public class BaseNotificationModel : INotifyPropertyChanged
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.Text;
using System.Threading.Tasks;

namespace WkyFast.Service.Model
namespace Aria2Fast.Service.Model
{
public class WkyDownloadResult
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//
// var subscriptionModel = SubscriptionModel.FromJson(jsonString);

namespace WkyFast.Service.Model.SubscriptionModel
namespace Aria2Fast.Service.Model.SubscriptionModel
{
using System;
using System.Collections.Generic;
Expand Down Expand Up @@ -135,12 +135,12 @@ public partial class SubscriptionSubTaskModel : BaseNotificationModel

public partial class SubscriptionModel
{
public static SubscriptionModel[] FromJson(string json) => JsonConvert.DeserializeObject<SubscriptionModel[]>(json, WkyFast.Service.Model.SubscriptionModel.Converter.Settings);
public static SubscriptionModel[] FromJson(string json) => JsonConvert.DeserializeObject<SubscriptionModel[]>(json, Aria2Fast.Service.Model.SubscriptionModel.Converter.Settings);
}

public static class Serialize
{
public static string ToJson(this SubscriptionModel[] self) => JsonConvert.SerializeObject(self, WkyFast.Service.Model.SubscriptionModel.Converter.Settings);
public static string ToJson(this SubscriptionModel[] self) => JsonConvert.SerializeObject(self, Aria2Fast.Service.Model.SubscriptionModel.Converter.Settings);
}

internal static class Converter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
using System.Threading.Tasks;
using System.Xml.Linq;

namespace WkyFast.Service.Model
namespace Aria2Fast.Service.Model
{


Expand Down
Loading

0 comments on commit 8675ac1

Please sign in to comment.