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

Merge pull request #1126 from lhhxxxxx/dev

Browse Source 
[perf] 代码清理喵
This commit is contained in:
MistEO
2022-07-09 20:30:31 +08:00
committed by GitHub
parent 9e9770116c 76b9e77e18
commit 5d4fc6c490
7 changed files with 12 additions and 393 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/MeoAsstGui/App.xaml
View File

@@ -21,8 +21,6 @@
</s:ApplicationLoader>
<ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/SkinDefault.xaml" />
<ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/Theme.xaml" />
<ResourceDictionary Source="Resources/Icon.xaml" />
<ResourceDictionary Source="Resources/Styles.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>

18
src/MeoAsstGui/MeoAsstGui.csproj
View File

@@ -133,9 +133,6 @@
<Compile Include="UserControl\PenguinReportSettingsUserControl.xaml.cs">
<DependentUpon>PenguinReportSettingsUserControl.xaml</DependentUpon>
</Compile>
<Compile Include="UserControl\ToastSettingsUserControl.xaml.cs">
<DependentUpon>ToastSettingsUserControl.xaml</DependentUpon>
</Compile>
<Compile Include="UserControl\AboutUserControl.xaml.cs">
<DependentUpon>AboutUserControl.xaml</DependentUpon>
</Compile>
@@ -153,14 +150,6 @@
<DependentUpon>App.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Page Include="Resources\Icon.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Resources\Styles.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="UserControl\StartSettingsUserControl.xaml" />
<Page Include="UserControl\TimerSettingsUserControl.xaml">
<Generator>MSBuild:Compile</Generator>
@@ -194,10 +183,6 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="UserControl\ToastSettingsUserControl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="UserControl\AboutUserControl.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
@@ -421,6 +406,9 @@
<ItemGroup>
<Resource Include="newlogo.ico" />
</ItemGroup>
<ItemGroup>
<Folder Include="Resources" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>xcopy /e /y /i /c "$(ProjectDir)..\..\3rdparty\tools" "$(TargetDir)"

237
src/MeoAsstGui/Resources/Icon.xaml
View File

@@ -1,237 +0,0 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<DrawingImage x:Key="MyTree">
<DrawingImage.Drawing>
<DrawingGroup>
<DrawingGroup.ClipGeometry>
<RectangleGeometry Rect="0,0,1024,1024" />
</DrawingGroup.ClipGeometry>
<GeometryDrawing Brush="#FF90EB7A">
<GeometryDrawing.Geometry>
<PathGeometry FillRule="Nonzero" Figures="M250.4,919C242.1,919 234.5,915.6 229,910.1 223.5,904.6 220.1,897.1 220.1,888.7L220.1,795.8C220.1,779.1 233.6,765.6 250.3,765.6 258.6,765.6 266.2,769 271.7,774.5 277.2,780 280.6,787.5 280.6,795.9L280.6,888.8C280.7,905.4,267.1,919,250.4,919z" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FF008486">
<GeometryDrawing.Geometry>
<PathGeometry FillRule="Nonzero" Figures="M695.3,919C687,919 679.4,915.6 673.9,910.1 668.4,904.6 665,897.1 665,888.7L665,795.8C665,779.1 678.5,765.6 695.2,765.6 703.5,765.6 711.1,769 716.6,774.5 722.1,780 725.5,787.5 725.5,795.9L725.5,888.8C725.5,905.4,712,919,695.3,919z" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FF00AD95">
<GeometryDrawing.Geometry>
<PathGeometry FillRule="Nonzero" Figures="M356.2,919C347.9,919 340.3,915.6 334.8,910.1 329.3,904.6 325.9,897.1 325.9,888.7L325.9,830.1C325.9,813.4 339.4,799.9 356.1,799.9 364.4,799.9 372,803.3 377.5,808.8 383,814.3 386.4,821.8 386.4,830.2L386.4,888.9C386.4,905.4,372.9,919,356.2,919z" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FFB05C25">
<GeometryDrawing.Geometry>
<PathGeometry FillRule="Nonzero" Figures="M448.3,644.9L572.7,644.9 572.7,904 448.3,904z" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FF00AD95">
<GeometryDrawing.Geometry>
<PathGeometry FillRule="Nonzero" Figures="M805,733.9L777.2,722.2C764.6,717,750.3,717,737.6,722.2L653.8,757.2C641.2,762.6,626.9,762.6,614.2,757.2L530.4,722.2C524,719.5 517.3,718.2 510.6,718.2 503.9,718.2 497.1,719.5 490.8,722.2L407,757.2C394.4,762.6,380.1,762.6,367.4,757.2L283.6,722.2C271,717,256.7,717,244,722.2L216.2,733.9C195.9,742.4,177.6,718.4,191.2,701.1L493.9,316C498.1,310.5 504.4,307.9 510.6,307.9 516.9,307.9 523.1,310.6 527.3,316L830,701.1C843.7,718.4,825.4,742.4,805,733.9z" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FF00D16C">
<GeometryDrawing.Geometry>
<PathGeometry FillRule="Nonzero" Figures="M719.2,514.2L699.4,505.9C690.5,502.1,680.3,502.1,671.4,505.9L612,530.8C603.1,534.6,592.9,534.6,584,530.8L524.7,506C520.2,504.1 515.4,503.2 510.6,503.2 505.8,503.2 501.1,504.1 496.5,506L437.1,530.9C428.2,534.7,418,534.7,409.1,530.9L349.8,506C340.9,502.2,330.7,502.2,321.8,506L302,514.3C287.6,520.3,274.7,503.3,284.3,491L498.8,218.2C501.8,214.4 506.3,212.4 510.6,212.4 514.9,212.4 519.4,214.3 522.4,218.2L736.8,491C746.6,503.2,733.6,520.1,719.2,514.2z" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FF90EB7A">
<GeometryDrawing.Geometry>
<PathGeometry FillRule="Nonzero" Figures="M667.2,318.3L652.4,312C645.7,309.2,638.1,309.2,631.3,312L586.8,330.6C580.1,333.4,572.5,333.4,565.7,330.6L521.2,312.1C517.9,310.6 514.3,310 510.7,310 507.1,310 503.6,310.7 500.2,312.1L455.7,330.7C449,333.5,441.4,333.5,434.6,330.7L390.1,312.1C383.4,309.3,375.8,309.3,369,312.1L354.2,318.4C343.4,322.9,333.7,310.1,340.9,300.9L501.7,96.1C503.9,93.2 507.3,91.7 510.6,91.7 513.9,91.7 517.2,93.2 519.5,96.1L680.4,300.9C687.7,310.1,678,322.9,667.2,318.3z" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FF00D16C">
<GeometryDrawing.Geometry>
<PathGeometry FillRule="Nonzero" Figures="M932,901.9C932,910.2 928.6,917.8 923.1,923.3 917.6,928.8 910.1,932.2 901.7,932.2L122.2,932.2C105.5,932.2 92,918.7 92,902 92,893.7 95.4,886.1 100.9,880.6 106.4,875.1 113.9,871.7 122.3,871.7L901.8,871.7C918.5,871.7,932,885.2,932,901.9z" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FF8E4A1F">
<GeometryDrawing.Geometry>
<PathGeometry FillRule="Nonzero" Figures="M510.6,644.9L572.9,644.9 572.9,904 510.6,904z" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FF008486">
<GeometryDrawing.Geometry>
<PathGeometry FillRule="Nonzero" Figures="M805,733.9L777.2,722.2C764.6,717,750.3,717,737.6,722.2L653.8,757.2C641.2,762.6,626.9,762.6,614.2,757.2L530.4,722.2C524,719.5,517.3,718.2,510.6,718.2L510.6,307.9C516.9,307.9,523.1,310.6,527.3,316L830,701.1C843.7,718.4,825.4,742.4,805,733.9z" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FF00AD95">
<GeometryDrawing.Geometry>
<PathGeometry FillRule="Nonzero" Figures="M719.2,514.2L699.4,505.9C690.5,502.1,680.3,502.1,671.4,505.9L612,530.8C603.1,534.6,592.9,534.6,584,530.8L524.7,506C520.2,504.1,515.4,503.2,510.6,503.2L510.6,212.4C515.1,212.4,519.4,214.3,522.4,218.2L736.8,491C746.6,503.2,733.6,520.1,719.2,514.2z" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FF00D16C">
<GeometryDrawing.Geometry>
<PathGeometry FillRule="Nonzero" Figures="M667.2,318.3L652.4,312C645.7,309.2,638.1,309.2,631.3,312L586.8,330.6C580.1,333.4,572.5,333.4,565.7,330.6L521.2,312.1C517.9,310.6,514.3,310,510.7,310L510.7,91.8C514,91.8,517.3,93.3,519.6,96.2L680.5,301C687.7,310.1,678,322.9,667.2,318.3z" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FF00AD95">
<GeometryDrawing.Geometry>
<PathGeometry FillRule="Nonzero" Figures="M932,901.9C932,910.2 928.6,917.8 923.1,923.3 917.6,928.8 910.1,932.2 901.7,932.2L510.6,932.2 510.6,871.7 901.8,871.7C918.5,871.7,932,885.2,932,901.9z" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FF466AC6">
<GeometryDrawing.Geometry>
<PathGeometry FillRule="Nonzero" Figures="M434.5,264.9C425.2,264.9,417.8,257.3,417.8,248.2L417.8,215.3C417.8,206.1 425.4,198.6 434.5,198.6 443.7,198.6 451.2,206.1 451.2,215.3L451.2,248.2C451.2,257.4,443.6,264.9,434.5,264.9z" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FF00D16C">
<GeometryDrawing.Geometry>
<PathGeometry FillRule="Nonzero" Figures="M439.8,264.8C437.3,271.8,429.8,275.5,422.8,273.1L385.3,260.2C378.3,257.7 374.6,250.2 377,243.2 379.5,236.2 387,232.5 394,234.9L431.5,247.8C438.5,250.2,442.2,257.7,439.8,264.8z" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FF00D16C">
<GeometryDrawing.Geometry>
<PathGeometry FillRule="Nonzero" Figures="M429.1,264.8C431.6,271.8,439.1,275.5,446.1,273.1L483.6,260.2C490.6,257.7 494.3,250.2 491.9,243.2 489.4,236.2 481.9,232.5 474.9,234.9L437.4,247.7C430.5,250.2,426.8,257.7,429.1,264.8z" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FF00D16C">
<GeometryDrawing.Geometry>
<PathGeometry FillRule="Nonzero" Figures="M434.5,268.3 M418.4,268.3A16.1,16.1,0,1,0,450.6,268.3A16.1,16.1,0,1,0,418.4,268.3z" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FF414EAF">
<GeometryDrawing.Geometry>
<PathGeometry FillRule="Nonzero" Figures="M353.4,436.9C344.1,436.9,336.7,429.3,336.7,420.2L336.7,387.3C336.7,378.1 344.2,370.6 353.4,370.6 362.6,370.6 370.1,378.2 370.1,387.3L370.1,420.2C370.2,429.3,362.6,436.9,353.4,436.9z" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FF00AD95">
<GeometryDrawing.Geometry>
<PathGeometry FillRule="Nonzero" Figures="M358.8,436.7C356.3,443.7,348.8,447.4,341.8,445L304.3,432C297.3,429.5 293.6,422 296,415 298.5,408 306,404.3 313,406.7L350.5,419.6C357.5,422,361.1,429.7,358.8,436.7z" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FF00AD95">
<GeometryDrawing.Geometry>
<PathGeometry FillRule="Nonzero" Figures="M348.1,436.7C350.6,443.7,358.1,447.4,365.1,445L402.6,432.1C409.6,429.6 413.3,422.1 410.9,415.1 408.4,408.1 400.9,404.4 393.9,406.8L356.4,419.7C349.4,422,345.7,429.7,348.1,436.7z" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FF00AD95">
<GeometryDrawing.Geometry>
<PathGeometry FillRule="Nonzero" Figures="M353.4,440.2 M337.3,440.2A16.1,16.1,0,1,0,369.5,440.2A16.1,16.1,0,1,0,337.3,440.2z" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FF414EAF">
<GeometryDrawing.Geometry>
<PathGeometry FillRule="Nonzero" Figures="M711.4,660.9C702.2,660.9,694.7,653.3,694.7,644.2L694.7,611.3C694.7,602.1 702.3,594.6 711.4,594.6 720.6,594.6 728.1,602.2 728.1,611.3L728.1,644.2C728.1,653.4,720.7,660.9,711.4,660.9z" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FF00AD95">
<GeometryDrawing.Geometry>
<PathGeometry FillRule="Nonzero" Figures="M716.8,660.7C714.3,667.7,706.8,671.4,699.8,669L662.3,656C655.3,653.5 651.6,646 654,639 656.5,632 664,628.3 671,630.7L708.5,643.6C715.4,646.2,719.1,653.7,716.8,660.7z" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FF00AD95">
<GeometryDrawing.Geometry>
<PathGeometry FillRule="Nonzero" Figures="M706,660.7C708.5,667.7,716,671.4,723,669L760.5,656.1C767.5,653.6 771.2,646.1 768.8,639.1 766.3,632.1 758.8,628.4 751.8,630.8L714.3,643.7C707.4,646.2,703.7,653.7,706,660.7z" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FF00AD95">
<GeometryDrawing.Geometry>
<PathGeometry FillRule="Nonzero" Figures="M711.4,664.4 M695.3,664.4A16.1,16.1,0,1,0,727.5,664.4A16.1,16.1,0,1,0,695.3,664.4z" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FF414EAF">
<GeometryDrawing.Geometry>
<PathGeometry FillRule="Nonzero" Figures="M607.4,470C598.2,470,590.7,462.4,590.7,453.3L590.7,420.4C590.7,411.2 598.3,403.7 607.4,403.7 616.6,403.7 624.1,411.2 624.1,420.4L624.1,453.3C624.1,462.6,616.5,470,607.4,470z" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FF008486">
<GeometryDrawing.Geometry>
<PathGeometry FillRule="Nonzero" Figures="M612.6,469.9C610.1,476.9,602.6,480.6,595.6,478.2L558.1,465.3C551.1,462.8 547.4,455.3 549.8,448.3 552.3,441.3 559.8,437.6 566.8,440L604.3,452.9C611.4,455.3,615.1,462.9,612.6,469.9z" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FF008486">
<GeometryDrawing.Geometry>
<PathGeometry FillRule="Nonzero" Figures="M602,469.9C604.5,476.9,612,480.6,619,478.2L656.5,465.3C663.5,462.8 667.2,455.3 664.8,448.3 662.3,441.3 654.8,437.6 647.8,440L610.3,453C603.4,455.3,599.7,462.9,602,469.9z" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FF008486">
<GeometryDrawing.Geometry>
<PathGeometry FillRule="Nonzero" Figures="M607.4,473.5 M591.3,473.5A16.1,16.1,0,1,0,623.5,473.5A16.1,16.1,0,1,0,591.3,473.5z" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FF414EAF">
<GeometryDrawing.Geometry>
<PathGeometry FillRule="Nonzero" Figures="M437.7,641.5C428.4,641.5,421,633.9,421,624.8L421,591.9C421,582.7 428.6,575.2 437.7,575.2 446.9,575.2 454.4,582.8 454.4,591.9L454.4,624.8C454.5,634,446.9,641.5,437.7,641.5z" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FF008486">
<GeometryDrawing.Geometry>
<PathGeometry FillRule="Nonzero" Figures="M443,641.2C440.5,648.2,433,651.9,426,649.5L388.5,636.6C381.5,634.1 377.8,626.6 380.2,619.6 382.7,612.6 390.2,608.9 397.2,611.3L434.7,624.2C441.7,626.7,445.4,634.3,443,641.2z" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FF008486">
<GeometryDrawing.Geometry>
<PathGeometry FillRule="Nonzero" Figures="M432.4,641.2C434.9,648.2,442.4,651.9,449.4,649.5L486.9,636.6C493.9,634.1 497.6,626.6 495.2,619.6 492.7,612.6 485.2,608.9 478.2,611.3L440.7,624.2C433.6,626.7,429.9,634.3,432.4,641.2z" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FF008486">
<GeometryDrawing.Geometry>
<PathGeometry FillRule="Nonzero" Figures="M437.7,644.8 M421.6,644.8A16.1,16.1,0,1,0,453.8,644.8A16.1,16.1,0,1,0,421.6,644.8z" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FF414EAF">
<GeometryDrawing.Geometry>
<PathGeometry FillRule="Nonzero" Figures="M269.2,699C260,699,252.5,691.4,252.5,682.3L252.5,649.4C252.5,640.2 260.1,632.7 269.2,632.7 278.4,632.7 285.9,640.3 285.9,649.4L285.9,682.3C285.9,691.5,278.4,699,269.2,699z" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FF008486">
<GeometryDrawing.Geometry>
<PathGeometry FillRule="Nonzero" Figures="M274.5,698.8C272,705.8,264.5,709.5,257.5,707.1L220,694.2C213,691.7 209.3,684.2 211.7,677.2 214.2,670.2 221.7,666.5 228.7,668.9L266.2,681.8C273.2,684.2,277,691.8,274.5,698.8z" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FF008486">
<GeometryDrawing.Geometry>
<PathGeometry FillRule="Nonzero" Figures="M263.9,698.8C266.4,705.8,273.9,709.5,280.9,707.1L318.4,694.2C325.4,691.7 329.1,684.2 326.7,677.2 324.2,670.2 316.7,666.5 309.7,668.9L272.2,681.7C265.2,684.2,261.5,691.8,263.9,698.8z" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FF008486">
<GeometryDrawing.Geometry>
<PathGeometry FillRule="Nonzero" Figures="M269.2,702.4 M253.1,702.4A16.1,16.1,0,1,0,285.3,702.4A16.1,16.1,0,1,0,253.1,702.4z" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FF414EAF">
<GeometryDrawing.Geometry>
<PathGeometry FillRule="Nonzero" Figures="M624.1,289.9C614.9,289.9,607.4,282.3,607.4,273.2L607.4,240.4C607.4,231.2 615,223.7 624.1,223.7 633.3,223.7 640.8,231.2 640.8,240.4L640.8,273.3C640.9,282.4,633.3,289.9,624.1,289.9z" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FF00AD95">
<GeometryDrawing.Geometry>
<PathGeometry FillRule="Nonzero" Figures="M629.4,289.8C626.9,296.8,619.4,300.5,612.4,298.1L574.9,285.2C567.9,282.7 564.2,275.2 566.6,268.2 569.1,261.2 576.6,257.5 583.6,259.9L621.1,272.8C628.1,275.2,631.8,282.7,629.4,289.8z" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FF00AD95">
<GeometryDrawing.Geometry>
<PathGeometry FillRule="Nonzero" Figures="M618.8,289.8C621.3,296.8,628.8,300.5,635.8,298.1L673.3,285.2C680.3,282.7 684,275.2 681.6,268.2 679.1,261.2 671.6,257.5 664.6,259.9L627,272.7A13.5,13.5,0,0,0,618.8,289.8z" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FF00AD95">
<GeometryDrawing.Geometry>
<PathGeometry FillRule="Nonzero" Figures="M624.1,293.3 M608,293.3A16.1,16.1,0,1,0,640.2,293.3A16.1,16.1,0,1,0,608,293.3z" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FF414EAF">
<GeometryDrawing.Geometry>
<PathGeometry FillRule="Nonzero" Figures="M546.9,169C537.7,169,530.2,161.5,530.2,152.3L530.2,119.4C530.2,110.2 537.8,102.7 546.9,102.7 556.1,102.7 563.6,110.2 563.6,119.4L563.6,152.3C563.6,161.4,556,169,546.9,169z" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FF00AD95">
<GeometryDrawing.Geometry>
<PathGeometry FillRule="Nonzero" Figures="M552.2,168.8C549.7,175.8,542.2,179.5,535.2,177.1L497.7,164.2C490.7,161.7 487,154.2 489.4,147.2 491.9,140.2 499.4,136.5 506.4,138.9L543.9,151.8C550.9,154.2,554.6,161.9,552.2,168.8z" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FF00AD95">
<GeometryDrawing.Geometry>
<PathGeometry FillRule="Nonzero" Figures="M541.5,168.8C544,175.8,551.5,179.5,558.5,177.1L596,164.2C603,161.7 606.7,154.2 604.3,147.2 601.8,140.2 594.3,136.5 587.3,138.9L549.8,151.8C542.9,154.2,539.2,161.9,541.5,168.8z" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FF00AD95">
<GeometryDrawing.Geometry>
<PathGeometry FillRule="Nonzero" Figures="M546.9,172.4 M530.8,172.4A16.1,16.1,0,1,0,563,172.4A16.1,16.1,0,1,0,530.8,172.4z" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
</DrawingGroup>
</DrawingImage.Drawing>
</DrawingImage>
</ResourceDictionary>

27
src/MeoAsstGui/Resources/Styles.xaml
View File

@@ -1,27 +0,0 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:s="https://github.com/canton7/Stylet">
<Style x:Key="StyletConductorTabControl" TargetType="TabControl" BasedOn="{StaticResource TabControlInLine}">
<Setter Property="ItemsSource" Value="{Binding Items}" />
<Setter Property="SelectedItem" Value="{s:RethrowingBinding ActiveItem}" />
<Setter Property="DisplayMemberPath" Value="DisplayName" />
<Setter Property="ContentTemplate">
<Setter.Value>
<DataTemplate>
<ContentControl s:View.Model="{Binding}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" IsTabStop="False" />
</DataTemplate>
</Setter.Value>
</Setter>
</Style>
<Style x:Key="StyletConductorItemsControl" TargetType="ItemsControl">
<Setter Property="ItemsSource" Value="{Binding Items}" />
<Setter Property="ItemTemplate">
<Setter.Value>
<DataTemplate>
<ContentControl s:View.Model="{Binding}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" IsTabStop="False" />
</DataTemplate>
</Setter.Value>
</Setter>
</Style>
</ResourceDictionary>

85
src/MeoAsstGui/UserControl/ToastSettingsUserControl.xaml
View File

@@ -1,85 +0,0 @@
<UserControl
x:Class="MeoAsstGui.ToastSettingsUserControl"
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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:s="https://github.com/canton7/Stylet" d:DesignHeight="300"
xmlns:vm="clr-namespace:MeoAsstGui;assembly=MeoAsstGui"
xmlns:c="clr-namespace:CalcBinding;assembly=CalcBinding"
d:DataContext="{d:DesignInstance {x:Type vm:SettingsViewModel}}"
d:DesignWidth="550" mc:Ignorable="d">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition Width="100" />
</Grid.ColumnDefinitions>
<StackPanel>
<CheckBox
Content="使用Windows系统推送通知（Win10/Win11）"
HorizontalAlignment="Center"
VerticalAlignment="Center"
IsChecked="{Binding ToastUsingSystem}"
Visibility="{c:Binding ToastOS, FalseToVisibility=Collapsed}"
Margin="10" />
<TextBlock
HorizontalAlignment="Center" Block.TextAlignment="Center"
Style="{StaticResource TextBlockDefault}"
TextWrapping="Wrap"
Text="默认通知显示位置设置，系统通知无效，若无勾选则只有通知提示音"
Margin="10" />
<Border BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" CornerRadius="4" MaxWidth="400" Margin="10">
<Grid IsEnabled="{c:Binding !(ToastOS and ToastUsingSystem)}">
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition />
<RowDefinition />
</Grid.RowDefinitions>
<CheckBox
Grid.Row="0" Grid.Column="0" Margin="16" HorizontalAlignment="Left"
VerticalAlignment="Top" Content="↖ 左上"
IsChecked="{Binding ToastPositionTopLeft}" />
<CheckBox
Grid.Row="1" Grid.Column="0" Margin="16" HorizontalAlignment="Left"
VerticalAlignment="Center" Content="← 左边"
IsChecked="{Binding ToastPositionCenterLeft}" />
<CheckBox
Grid.Row="2" Grid.Column="0" Margin="16" HorizontalAlignment="Left"
VerticalAlignment="Bottom" Content="↙ 左下"
IsChecked="{Binding ToastPositionBottomLeft}" />
<CheckBox
Grid.Row="0" Grid.Column="1" Margin="16" HorizontalAlignment="Center"
VerticalAlignment="Top" Content="↑ 上边"
IsChecked="{Binding ToastPositionTopCenter}" />
<CheckBox
Grid.Row="2" Grid.Column="1" Margin="16" HorizontalAlignment="Center"
VerticalAlignment="Bottom" Content="↓ 下边"
IsChecked="{Binding ToastPositionBottomCenter}" />
<CheckBox
Grid.Row="0" Grid.Column="2" Margin="16" HorizontalAlignment="Right"
VerticalAlignment="Top" Content="↗ 右上"
IsChecked="{Binding ToastPositionTopRight}" />
<CheckBox
Grid.Row="1" Grid.Column="2" Margin="16" HorizontalAlignment="Right"
VerticalAlignment="Center" Content="→ 右边"
IsChecked="{Binding ToastPositionCenterRight}" />
<CheckBox
Grid.Row="2" Grid.Column="2" Margin="16" HorizontalAlignment="Right"
VerticalAlignment="Bottom" Content="↘ 右下"
IsChecked="{Binding ToastPositionBottomRight}" />
</Grid>
</Border>
</StackPanel>
<Button
Grid.Column="1" Height="36" MaxWidth="200" Margin="6"
VerticalAlignment="Bottom"
Command="{s:Action ToastPositionTest}"
Content="测试通知" />
</Grid>
</UserControl>

26
src/MeoAsstGui/UserControl/ToastSettingsUserControl.xaml.cs
View File

@@ -1,26 +0,0 @@
// MeoAsstGui - A part of the MeoAssistantArknights project
// Copyright (C) 2021 MistEO and Contributors
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY
using System.Windows.Controls;
namespace MeoAsstGui
{
/// <summary>
/// ToastSettingsUserControl.xaml 的交互逻辑
/// </summary>
public partial class ToastSettingsUserControl : UserControl
{
public ToastSettingsUserControl()
{
InitializeComponent();
}
}
}

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

@@ -9,6 +9,14 @@
d:DataContext="{d:DesignInstance {x:Type vm:RootViewModel}}"
Title="{Binding WindowTitle}" Height="595" Width="800">
<DockPanel>
<TabControl Style="{StaticResource StyletConductorTabControl}" Margin="0,10,0,0" />
<TabControl ItemsSource="{Binding Items}" SelectedItem="{s:RethrowingBinding ActiveItem}"
DisplayMemberPath="DisplayName" Margin="0,10,0,0" Style="{StaticResource TabControlInLine}">
<TabControl.ContentTemplate>
<DataTemplate>
<ContentControl s:View.Model="{Binding}" VerticalContentAlignment="Stretch"
HorizontalContentAlignment="Stretch" IsTabStop="False" />
</DataTemplate>
</TabControl.ContentTemplate>
</TabControl>
</DockPanel>
</Window>