From b4e81a30b50b2dcb6a72a32c6b244c4b37f3fdbf Mon Sep 17 00:00:00 2001
From: uye <2396806385@qq.com>
Date: Thu, 10 Nov 2022 20:23:24 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=87=A0=E4=B8=AA?=
=?UTF-8?q?=E9=93=BE=E6=8E=A5=E7=9A=84=E6=98=BE=E7=A4=BA=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Resources/Localizations/en-us.xaml | 1 -
.../Resources/Localizations/ja-jp.xaml | 1 -
.../Resources/Localizations/ko-kr.xaml | 1 -
.../Resources/Localizations/pallas.xaml | 1 -
.../Resources/Localizations/zh-cn.xaml | 1 -
.../Resources/Localizations/zh-tw.xaml | 1 -
.../UserControl/AboutUserControl.xaml | 39 -------------------
.../InfrastSettingsUserControl.xaml | 18 ++++++++-
.../InfrastSettingsUserControl.xaml.cs | 11 ++++++
src/MeoAsstGui/ViewModels/CopilotViewModel.cs | 21 +++++++++-
src/MeoAsstGui/Views/CopilotView.xaml | 10 ++++-
11 files changed, 56 insertions(+), 49 deletions(-)
diff --git a/src/MeoAsstGui/Resources/Localizations/en-us.xaml b/src/MeoAsstGui/Resources/Localizations/en-us.xaml
index 753eb586a3..936e46f18f 100644
--- a/src/MeoAsstGui/Resources/Localizations/en-us.xaml
+++ b/src/MeoAsstGui/Resources/Localizations/en-us.xaml
@@ -343,7 +343,6 @@
Start
- Copilot task JSON Sharing
Video Link
diff --git a/src/MeoAsstGui/Resources/Localizations/ja-jp.xaml b/src/MeoAsstGui/Resources/Localizations/ja-jp.xaml
index 600d607056..92803e6f8f 100644
--- a/src/MeoAsstGui/Resources/Localizations/ja-jp.xaml
+++ b/src/MeoAsstGui/Resources/Localizations/ja-jp.xaml
@@ -324,7 +324,6 @@
開始
- 攻略ファイル・シェアステーション
ビデオハイパーリンク
diff --git a/src/MeoAsstGui/Resources/Localizations/ko-kr.xaml b/src/MeoAsstGui/Resources/Localizations/ko-kr.xaml
index bdcec2e137..2a065ab45d 100644
--- a/src/MeoAsstGui/Resources/Localizations/ko-kr.xaml
+++ b/src/MeoAsstGui/Resources/Localizations/ko-kr.xaml
@@ -311,7 +311,6 @@
시작
- 작업 공유 사이트
비디오 링크
diff --git a/src/MeoAsstGui/Resources/Localizations/pallas.xaml b/src/MeoAsstGui/Resources/Localizations/pallas.xaml
index 4c6aa3b208..9facd90b7a 100644
--- a/src/MeoAsstGui/Resources/Localizations/pallas.xaml
+++ b/src/MeoAsstGui/Resources/Localizations/pallas.xaml
@@ -311,7 +311,6 @@
🍺🍺🍻
- 🍻🍻🍺🍺🍸🕺🍺
🍸🍷🍻🍷🍸
diff --git a/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml b/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml
index 18f29f8454..6d81c7e9b3 100644
--- a/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml
+++ b/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml
@@ -343,7 +343,6 @@
开始
- 作业分享平台
视频链接
diff --git a/src/MeoAsstGui/Resources/Localizations/zh-tw.xaml b/src/MeoAsstGui/Resources/Localizations/zh-tw.xaml
index ab7f6e228e..3aef096595 100644
--- a/src/MeoAsstGui/Resources/Localizations/zh-tw.xaml
+++ b/src/MeoAsstGui/Resources/Localizations/zh-tw.xaml
@@ -311,7 +311,6 @@
開始
- 作業分享平台
影片連結
diff --git a/src/MeoAsstGui/UserControl/AboutUserControl.xaml b/src/MeoAsstGui/UserControl/AboutUserControl.xaml
index 93e9f29111..85efcf5b18 100644
--- a/src/MeoAsstGui/UserControl/AboutUserControl.xaml
+++ b/src/MeoAsstGui/UserControl/AboutUserControl.xaml
@@ -205,44 +205,5 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/MeoAsstGui/UserControl/InfrastSettingsUserControl.xaml b/src/MeoAsstGui/UserControl/InfrastSettingsUserControl.xaml
index 28b54d06a1..6bdb48c0b1 100644
--- a/src/MeoAsstGui/UserControl/InfrastSettingsUserControl.xaml
+++ b/src/MeoAsstGui/UserControl/InfrastSettingsUserControl.xaml
@@ -5,11 +5,11 @@
xmlns:c="clr-namespace:CalcBinding;assembly=CalcBinding"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:dd="urn:gong-wpf-dragdrop"
+ xmlns:local="clr-namespace:MeoAsstGui"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:s="https://github.com/canton7/Stylet"
xmlns:vm="clr-namespace:MeoAsstGui;assembly=MeoAsstGui"
d:DataContext="{d:DesignInstance {x:Type vm:SettingsViewModel}}"
- d:DesignHeight="400"
d:DesignWidth="550"
mc:Ignorable="d">
@@ -138,7 +138,7 @@
Text="{DynamicResource CustomInfrastEnabled}"
TextWrapping="Wrap" />
-
+
@@ -162,6 +162,20 @@
ItemsSource="{Binding DefaultInfrastList}"
SelectedValue="{Binding DefaultInfrast}"
SelectedValuePath="Value" />
+
+
+
+
+
+using System.Diagnostics;
+using System.Windows;
using System.Windows.Controls;
+using System.Windows.Documents;
namespace MeoAsstGui
{
@@ -27,5 +30,13 @@ namespace MeoAsstGui
{
InitializeComponent();
}
+
+ private void Hyperlink_Click(object sender, RoutedEventArgs e)
+ {
+ Hyperlink link = sender as Hyperlink;
+
+ // 激活的是当前默认的浏览器
+ Process.Start(new ProcessStartInfo(link.NavigateUri.AbsoluteUri));
+ }
}
}
diff --git a/src/MeoAsstGui/ViewModels/CopilotViewModel.cs b/src/MeoAsstGui/ViewModels/CopilotViewModel.cs
index 5e41571e3e..6553946417 100644
--- a/src/MeoAsstGui/ViewModels/CopilotViewModel.cs
+++ b/src/MeoAsstGui/ViewModels/CopilotViewModel.cs
@@ -456,7 +456,7 @@ namespace MeoAsstGui
///
public string Url
{
- get => _url == CopilotUiUrl ? Localization.GetString("CopilotJSONSharing") : Localization.GetString("VideoLink");
+ get => _url == CopilotUiUrl ? Localization.GetString("PrtsPlus") : Localization.GetString("VideoLink");
set => SetAndNotify(ref _url, value);
}
@@ -477,6 +477,25 @@ namespace MeoAsstGui
}
}
+ private readonly string _url2 = MaaUrls.MapPrts;
+
+ ///
+ /// The event handler of clicking hyperlink.
+ ///
+ public void Hyperlink_Click2()
+ {
+ try
+ {
+ if (!string.IsNullOrEmpty(_url2))
+ {
+ Process.Start(new ProcessStartInfo(_url2));
+ }
+ }
+ catch (Exception)
+ {
+ }
+ }
+
///
/// 点击后移除界面中元素焦点
///
diff --git a/src/MeoAsstGui/Views/CopilotView.xaml b/src/MeoAsstGui/Views/CopilotView.xaml
index 780b0307e8..e90de169f1 100644
--- a/src/MeoAsstGui/Views/CopilotView.xaml
+++ b/src/MeoAsstGui/Views/CopilotView.xaml
@@ -68,13 +68,21 @@
Command="{s:Action Stop}"
Content="{DynamicResource Stop}" />
+
+
+
+
+