From 58814389fac0ecf0f12e2509f3bf522082ed9f0f Mon Sep 17 00:00:00 2001
From: chr <chrry550@163.com>
Date: 星期二, 05 三月 2024 12:01:45 +0800
Subject: [PATCH] 优化输出目录结构；
---
App.xaml | 2 +-
WPFProject.csproj | 1 +
UI/Test/SequnceList.xaml | 2 +-
App.xaml.cs | 10 ++++++++++
App.config | 5 +++++
Style/WindowResources.xaml | 2 +-
6 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/App.config b/App.config
index 56efbc7..d17fa4e 100644
--- a/App.config
+++ b/App.config
@@ -3,4 +3,9 @@
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
</startup>
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <probing privatePath="Libs;ThirdParty"/>
+ </assemblyBinding>
+ </runtime>
</configuration>
\ No newline at end of file
diff --git a/App.xaml b/App.xaml
index 08013fa..292ccd8 100644
--- a/App.xaml
+++ b/App.xaml
@@ -2,7 +2,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:WPFProject"
- StartupUri="MainWindow.xaml">
+ Startup="Application_Startup">
<Application.Resources>
</Application.Resources>
diff --git a/App.xaml.cs b/App.xaml.cs
index 90c0dc3..58430ef 100644
--- a/App.xaml.cs
+++ b/App.xaml.cs
@@ -13,5 +13,15 @@
/// </summary>
public partial class App : Application
{
+ public void test()
+ {
+
+ }
+
+ private void Application_Startup(object sender, StartupEventArgs e)
+ {
+ MainWindow window = new MainWindow();
+ window.Show();
+ }
}
}
diff --git a/Style/WindowResources.xaml b/Style/WindowResources.xaml
index a710975..b1c0574 100644
--- a/Style/WindowResources.xaml
+++ b/Style/WindowResources.xaml
@@ -59,7 +59,7 @@
<Style x:Key="LinkButton" TargetType="Button">
<Setter Property="ctls:DpPlugin.HoverColor" Value="{StaticResource ChildBorder}"/>
<Setter Property="FontFamily" Value="{StaticResource iconfont}"/>
- <Setter Property="Foreground" Value="#000"/>
+ <Setter Property="Foreground" Value="{StaticResource ChildBorder}"/>
<Setter Property="Template">
<Setter.Value>
diff --git a/UI/Test/SequnceList.xaml b/UI/Test/SequnceList.xaml
index f541201..4c24513 100644
--- a/UI/Test/SequnceList.xaml
+++ b/UI/Test/SequnceList.xaml
@@ -204,7 +204,7 @@
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<StackPanel Orientation="Horizontal">
- <Button Style="{StaticResource LinkButton}" Margin="0,0,20,0">123</Button>
+ <Button Style="{StaticResource LinkButton}" Margin="0,0,20,0">缂栬緫</Button>
<Button Style="{StaticResource LinkButton}">鍒犻櫎</Button>
</StackPanel>
</DataTemplate>
diff --git a/WPFProject.csproj b/WPFProject.csproj
index d3baa9a..61e0439 100644
--- a/WPFProject.csproj
+++ b/WPFProject.csproj
@@ -134,6 +134,7 @@
<Compile Include="Models\CanvasPosition.cs" />
<Compile Include="Models\FuncModel.cs" />
<Compile Include="Models\NotifyBase.cs" />
+ <Compile Include="Models\Variable.cs" />
<Compile Include="Models\Param.cs" />
<Compile Include="Models\Program.cs" />
<Compile Include="Models\Sequence.cs" />
--
Gitblit v1.9.1