diff --git a/3-WPF命令.sln b/3-WPF命令.sln index aa807b4..db64ee3 100644 --- a/3-WPF命令.sln +++ b/3-WPF命令.sln @@ -12,7 +12,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "3-WPF命令5-直接调用 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "3-WPF命令6-复制粘贴示例", "3-WPF命令6-复制粘贴示例\3-WPF命令6-复制粘贴示例.csproj", "{319276CC-0EE8-49C6-83FA-6217C95BAE15}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "4-WPF资源-资源集合", "4-WPF资源-资源集合\4-WPF资源-资源集合.csproj", "{AEB2A056-39EA-49C2-ADFD-AF1E094DDC64}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "4-WPF资源-2资源层次", "4-WPF资源-2资源层次\4-WPF资源-2资源层次.csproj", "{464D6F07-0F7F-41EF-9E36-94E0563360D0}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "4-WPF资源-1资源集合", "4-WPF资源-1资源集合\4-WPF资源-1资源集合.csproj", "{9799011A-197B-4934-A691-7D1CF799AFE7}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -44,9 +46,13 @@ Global {319276CC-0EE8-49C6-83FA-6217C95BAE15}.Debug|Any CPU.Build.0 = Debug|Any CPU {319276CC-0EE8-49C6-83FA-6217C95BAE15}.Release|Any CPU.ActiveCfg = Release|Any CPU {319276CC-0EE8-49C6-83FA-6217C95BAE15}.Release|Any CPU.Build.0 = Release|Any CPU - {AEB2A056-39EA-49C2-ADFD-AF1E094DDC64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AEB2A056-39EA-49C2-ADFD-AF1E094DDC64}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AEB2A056-39EA-49C2-ADFD-AF1E094DDC64}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AEB2A056-39EA-49C2-ADFD-AF1E094DDC64}.Release|Any CPU.Build.0 = Release|Any CPU + {464D6F07-0F7F-41EF-9E36-94E0563360D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {464D6F07-0F7F-41EF-9E36-94E0563360D0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {464D6F07-0F7F-41EF-9E36-94E0563360D0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {464D6F07-0F7F-41EF-9E36-94E0563360D0}.Release|Any CPU.Build.0 = Release|Any CPU + {9799011A-197B-4934-A691-7D1CF799AFE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9799011A-197B-4934-A691-7D1CF799AFE7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9799011A-197B-4934-A691-7D1CF799AFE7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9799011A-197B-4934-A691-7D1CF799AFE7}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection EndGlobal diff --git a/4-WPF资源-资源集合/4-WPF资源-资源集合.csproj b/4-WPF资源-1资源集合/4-WPF资源-1资源集合.csproj similarity index 62% rename from 4-WPF资源-资源集合/4-WPF资源-资源集合.csproj rename to 4-WPF资源-1资源集合/4-WPF资源-1资源集合.csproj index b1c6508..9c3fbb9 100644 --- a/4-WPF资源-资源集合/4-WPF资源-资源集合.csproj +++ b/4-WPF资源-1资源集合/4-WPF资源-1资源集合.csproj @@ -3,16 +3,16 @@ WinExe net8.0-windows - _4_WPF资源_资源集合 + _4_WPF资源_1资源集合 enable enable true - - Always - + + Always + diff --git a/4-WPF资源-资源集合/App.xaml b/4-WPF资源-1资源集合/App.xaml similarity index 68% rename from 4-WPF资源-资源集合/App.xaml rename to 4-WPF资源-1资源集合/App.xaml index bda52cc..c475bad 100644 --- a/4-WPF资源-资源集合/App.xaml +++ b/4-WPF资源-1资源集合/App.xaml @@ -1,7 +1,7 @@ - diff --git a/4-WPF资源-资源集合/App.xaml.cs b/4-WPF资源-1资源集合/App.xaml.cs similarity index 82% rename from 4-WPF资源-资源集合/App.xaml.cs rename to 4-WPF资源-1资源集合/App.xaml.cs index 4dc3cb1..bf18c73 100644 --- a/4-WPF资源-资源集合/App.xaml.cs +++ b/4-WPF资源-1资源集合/App.xaml.cs @@ -2,7 +2,7 @@ using System.Data; using System.Windows; -namespace _4_WPF资源_资源集合; +namespace _4_WPF资源_1资源集合; /// /// Interaction logic for App.xaml diff --git a/4-WPF资源-资源集合/AssemblyInfo.cs b/4-WPF资源-1资源集合/AssemblyInfo.cs similarity index 100% rename from 4-WPF资源-资源集合/AssemblyInfo.cs rename to 4-WPF资源-1资源集合/AssemblyInfo.cs diff --git a/4-WPF资源-资源集合/MainWindow.xaml b/4-WPF资源-1资源集合/MainWindow.xaml similarity index 78% rename from 4-WPF资源-资源集合/MainWindow.xaml rename to 4-WPF资源-1资源集合/MainWindow.xaml index e434b8f..603611f 100644 --- a/4-WPF资源-资源集合/MainWindow.xaml +++ b/4-WPF资源-1资源集合/MainWindow.xaml @@ -1,10 +1,11 @@ - + Icon="public/003540AH4M72.jpg" Title="_4_WPF资源_1资源集合" Height="450" Width="800"> @@ -18,4 +19,4 @@ DynamicResource TileBrush - \ No newline at end of file + diff --git a/4-WPF资源-资源集合/MainWindow.xaml.cs b/4-WPF资源-1资源集合/MainWindow.xaml.cs similarity index 92% rename from 4-WPF资源-资源集合/MainWindow.xaml.cs rename to 4-WPF资源-1资源集合/MainWindow.xaml.cs index fc84476..47369fe 100644 --- a/4-WPF资源-资源集合/MainWindow.xaml.cs +++ b/4-WPF资源-1资源集合/MainWindow.xaml.cs @@ -9,7 +9,7 @@ using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; -namespace _4_WPF资源_资源集合; +namespace _4_WPF资源_1资源集合; /// /// Interaction logic for MainWindow.xaml diff --git a/4-WPF资源-资源集合/public/003540AH4M72.jpg b/4-WPF资源-1资源集合/public/003540AH4M72.jpg similarity index 100% rename from 4-WPF资源-资源集合/public/003540AH4M72.jpg rename to 4-WPF资源-1资源集合/public/003540AH4M72.jpg diff --git a/4-WPF资源-2资源层次/4-WPF资源-2资源层次.csproj b/4-WPF资源-2资源层次/4-WPF资源-2资源层次.csproj new file mode 100644 index 0000000..efbcbb4 --- /dev/null +++ b/4-WPF资源-2资源层次/4-WPF资源-2资源层次.csproj @@ -0,0 +1,18 @@ + + + + WinExe + net8.0-windows + _4_WPF资源_2资源层次 + enable + enable + true + + + + + Always + + + + diff --git a/4-WPF资源-2资源层次/App.xaml b/4-WPF资源-2资源层次/App.xaml new file mode 100644 index 0000000..fa88a6f --- /dev/null +++ b/4-WPF资源-2资源层次/App.xaml @@ -0,0 +1,9 @@ + + + + + diff --git a/4-WPF资源-2资源层次/App.xaml.cs b/4-WPF资源-2资源层次/App.xaml.cs new file mode 100644 index 0000000..a29b41f --- /dev/null +++ b/4-WPF资源-2资源层次/App.xaml.cs @@ -0,0 +1,12 @@ +using System.Configuration; +using System.Data; +using System.Windows; + +namespace _4_WPF资源_2资源层次; + +/// +/// Interaction logic for App.xaml +/// +public partial class App : Application +{ +} \ No newline at end of file diff --git a/4-WPF资源-2资源层次/AssemblyInfo.cs b/4-WPF资源-2资源层次/AssemblyInfo.cs new file mode 100644 index 0000000..4a05c7d --- /dev/null +++ b/4-WPF资源-2资源层次/AssemblyInfo.cs @@ -0,0 +1,10 @@ +using System.Windows; + +[assembly: ThemeInfo( + ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located + //(used if a resource is not found in the page, + // or application resource dictionaries) + ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located + //(used if a resource is not found in the page, + // app, or any theme specific resource dictionaries) +)] \ No newline at end of file diff --git a/4-WPF资源-2资源层次/MainWindow.xaml b/4-WPF资源-2资源层次/MainWindow.xaml new file mode 100644 index 0000000..d053d55 --- /dev/null +++ b/4-WPF资源-2资源层次/MainWindow.xaml @@ -0,0 +1,12 @@ + + + + + diff --git a/4-WPF资源-2资源层次/MainWindow.xaml.cs b/4-WPF资源-2资源层次/MainWindow.xaml.cs new file mode 100644 index 0000000..547469f --- /dev/null +++ b/4-WPF资源-2资源层次/MainWindow.xaml.cs @@ -0,0 +1,23 @@ +using System.Text; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace _4_WPF资源_2资源层次; + +/// +/// Interaction logic for MainWindow.xaml +/// +public partial class MainWindow : Window +{ + public MainWindow() + { + InitializeComponent(); + } +} \ No newline at end of file diff --git a/4-WPF资源-2资源层次/public/003540AH4M72.jpg b/4-WPF资源-2资源层次/public/003540AH4M72.jpg new file mode 100644 index 0000000..4aa96ac Binary files /dev/null and b/4-WPF资源-2资源层次/public/003540AH4M72.jpg differ