fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-18 18:20:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 修改几个链接的显示位置

Browse Source
This commit is contained in:
uye
2022-11-10 20:23:24 +08:00
parent b3913c545b
commit b4e81a30b5
11 changed files with 56 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/MeoAsstGui/Resources/Localizations/en-us.xaml
View File

@@ -343,7 +343,6 @@
<system:String x:Key="Start">Start</system:String>
<system:String x:Key="CopilotJSONSharing">Copilot task JSON Sharing</system:String>
<system:String x:Key="VideoLink">Video Link</system:String>
<!-- Logs -->

1
src/MeoAsstGui/Resources/Localizations/ja-jp.xaml
View File

@@ -324,7 +324,6 @@
<system:String x:Key="Start">開始</system:String>
<system:String x:Key="CopilotJSONSharing">攻略ファイル・シェアステーション</system:String>
<system:String x:Key="VideoLink">ビデオハイパーリンク</system:String>
<!-- Where use it? -->

1
src/MeoAsstGui/Resources/Localizations/ko-kr.xaml
View File

@@ -311,7 +311,6 @@
<system:String x:Key="Start">시작</system:String>
<system:String x:Key="CopilotJSONSharing">작업 공유 사이트</system:String>
<system:String x:Key="VideoLink">비디오 링크</system:String>
<!-- 로그 -->

1
src/MeoAsstGui/Resources/Localizations/pallas.xaml
View File

@@ -311,7 +311,6 @@
<system:String x:Key="Start">🍺🍺🍻</system:String>
<system:String x:Key="CopilotJSONSharing">🍻🍻🍺🍺🍸🕺🍺</system:String>
<system:String x:Key="VideoLink">🍸🍷🍻🍷🍸</system:String>
<!-- 日志 -->

1
src/MeoAsstGui/Resources/Localizations/zh-cn.xaml
View File

@@ -343,7 +343,6 @@
<system:String x:Key="Start">开始</system:String>
<system:String x:Key="CopilotJSONSharing">作业分享平台</system:String>
<system:String x:Key="VideoLink">视频链接</system:String>
<!-- 日志 -->

1
src/MeoAsstGui/Resources/Localizations/zh-tw.xaml
View File

@@ -311,7 +311,6 @@
<system:String x:Key="Start">開始</system:String>
<system:String x:Key="CopilotJSONSharing">作業分享平台</system:String>
<system:String x:Key="VideoLink">影片連結</system:String>
<!-- 日誌 -->

39
src/MeoAsstGui/UserControl/AboutUserControl.xaml
View File

@@ -205,44 +205,5 @@
<TextBlock Text="{DynamicResource Issue}" />
</Hyperlink>
</TextBlock>
<TextBlock
Margin="5"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Style="{StaticResource TextBlockDefault}">
<Hyperlink
Click="Hyperlink_Click"
NavigateUri="{Binding Source={x:Static local:MaaUrls.PrtsPlus}}"
TextDecorations="None">
<TextBlock Text="{DynamicResource PrtsPlus}" />
</Hyperlink>
</TextBlock>
<TextBlock
Margin="5"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Style="{StaticResource TextBlockDefault}">
<Hyperlink
Click="Hyperlink_Click"
NavigateUri="{Binding Source={x:Static local:MaaUrls.MapPrts}}"
TextDecorations="None">
<TextBlock Text="{DynamicResource MapPrts}" />
</Hyperlink>
</TextBlock>
<TextBlock
Margin="5"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Style="{StaticResource TextBlockDefault}">
<Hyperlink
Click="Hyperlink_Click"
NavigateUri="{Binding Source={x:Static local:MaaUrls.CustomInfrastGenerator}}"
TextDecorations="None">
<TextBlock Text="{DynamicResource CustomInfrastGenerator}" />
</Hyperlink>
</TextBlock>
</StackPanel>
</UserControl>

18
src/MeoAsstGui/UserControl/InfrastSettingsUserControl.xaml
View File

@@ -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">
<Grid>
@@ -138,7 +138,7 @@
Text="{DynamicResource CustomInfrastEnabled}"
TextWrapping="Wrap" />
</CheckBox>
<Grid IsEnabled="{Binding CustomInfrastEnabled}">
<Grid Visibility="{c:Binding CustomInfrastEnabled}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition />
@@ -162,6 +162,20 @@
ItemsSource="{Binding DefaultInfrastList}"
SelectedValue="{Binding DefaultInfrast}"
SelectedValuePath="Value" />
<TextBlock
Grid.Row="0"
Grid.Column="1"
Margin="5"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Style="{StaticResource TextBlockDefault}">
<Hyperlink
Click="Hyperlink_Click"
NavigateUri="{Binding Source={x:Static local:MaaUrls.CustomInfrastGenerator}}"
TextDecorations="None">
<TextBlock Text="{DynamicResource CustomInfrastGenerator}" />
</Hyperlink>
</TextBlock>
<TextBox
Grid.Row="1"
Grid.Column="1"

11
src/MeoAsstGui/UserControl/InfrastSettingsUserControl.xaml.cs
View File

@@ -11,7 +11,10 @@
// but WITHOUT ANY WARRANTY
// </copyright>
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));
}
}
}

21
src/MeoAsstGui/ViewModels/CopilotViewModel.cs
View File

@@ -456,7 +456,7 @@ namespace MeoAsstGui
/// </summary>
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;
/// <summary>
/// The event handler of clicking hyperlink.
/// </summary>
public void Hyperlink_Click2()
{
try
{
if (!string.IsNullOrEmpty(_url2))
{
Process.Start(new ProcessStartInfo(_url2));
}
}
catch (Exception)
{
}
}
/// <summary>
/// 点击后移除界面中元素焦点
/// </summary>

10
src/MeoAsstGui/Views/CopilotView.xaml
View File

@@ -68,13 +68,21 @@
Command="{s:Action Stop}"
Content="{DynamicResource Stop}" />
<TextBlock
Margin="10"
Margin="5"
Block.TextAlignment="Center"
Style="{StaticResource TextBlockDefault}">
<Hyperlink Command="{s:Action Hyperlink_Click}" CommandParameter="{Binding Url}">
<TextBlock Text="{Binding Url}" />
</Hyperlink>
</TextBlock>
<TextBlock
Margin="5"
Block.TextAlignment="Center"
Style="{StaticResource TextBlockDefault}">
<Hyperlink Command="{s:Action Hyperlink_Click2}">
<TextBlock Text="{DynamicResource MapPrts}" />
</Hyperlink>
</TextBlock>
</StackPanel>
<ScrollViewer