Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
T
Thick-Common
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
潘栩锋
Thick-Common
Commits
0ca4b51c
Commit
0ca4b51c
authored
Jan 11, 2022
by
潘栩锋
🚴
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化 FLY.Thick.Base.UI 库的 空间名 从之前的 FLY.Thick.Base.UI.Client 改为 FLY.Thick.Base.UI
parent
dfc736b7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
12 additions
and
8 deletions
+12
-8
App.xaml
Project.FLY.Thick.Base/FLY.Thick.Base.UI/App.xaml
+1
-1
FLY.Thick.Base.UI.csproj
...FLY.Thick.Base/FLY.Thick.Base.UI/FLY.Thick.Base.UI.csproj
+4
-0
Styles.xaml
Project.FLY.Thick.Base/FLY.Thick.Base.UI/Themes/Styles.xaml
+3
-3
MenuProfile.xaml
...LY.Thick.Base/FLY.Thick.Base.UI/UiModule/MenuProfile.xaml
+1
-1
MenuProfile.xaml.cs
...Thick.Base/FLY.Thick.Base.UI/UiModule/MenuProfile.xaml.cs
+1
-1
MenuSetting.xaml
...LY.Thick.Base/FLY.Thick.Base.UI/UiModule/MenuSetting.xaml
+1
-1
MenuSetting.xaml.cs
...Thick.Base/FLY.Thick.Base.UI/UiModule/MenuSetting.xaml.cs
+1
-1
No files found.
Project.FLY.Thick.Base/FLY.Thick.Base.UI/App.xaml
View file @
0ca4b51c
...
...
@@ -9,7 +9,7 @@
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Themes/Light.Blue.xaml" />
</ResourceDictionary.MergedDictionaries>
<Style TargetType="GroupBox" />
</ResourceDictionary>
</Application.Resources>
</Application>
Project.FLY.Thick.Base/FLY.Thick.Base.UI/FLY.Thick.Base.UI.csproj
View file @
0ca4b51c
...
...
@@ -404,6 +404,10 @@
<SubType>
Designer
</SubType>
<Generator>
MSBuild:Compile
</Generator>
</Page>
<Page
Include=
"Themes\DynAreaErrorStyle.xaml"
>
<SubType>
Designer
</SubType>
<Generator>
MSBuild:Compile
</Generator>
</Page>
<Page
Include=
"Themes\GraphStyle.xaml"
>
<Generator>
MSBuild:Compile
</Generator>
<SubType>
Designer
</SubType>
...
...
Project.FLY.Thick.Base/FLY.Thick.Base.UI/Themes/Styles.xaml
View file @
0ca4b51c
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />
<
!--<
ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Themes/Light.Blue.xaml" />
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Themes/Light.Blue.xaml" />
-->
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Converter/Dictionary_MyConv.xaml"/>
</ResourceDictionary.MergedDictionaries>
<
Style TargetType="GroupBox" /
>
<
!--<Style TargetType="GroupBox" />--
>
</ResourceDictionary>
\ No newline at end of file
Project.FLY.Thick.Base/FLY.Thick.Base.UI/UiModule/MenuProfile.xaml
View file @
0ca4b51c
<UserControl x:Class="FLY.Thick.Base.UI.
Client.
UiModule.MenuProfile"
<UserControl x:Class="FLY.Thick.Base.UI.UiModule.MenuProfile"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
...
...
Project.FLY.Thick.Base/FLY.Thick.Base.UI/UiModule/MenuProfile.xaml.cs
View file @
0ca4b51c
...
...
@@ -4,7 +4,7 @@ using System.Windows;
using
System.Windows.Controls
;
using
Unity
;
namespace
FLY.Thick.Base.UI.
Client.
UiModule
namespace
FLY.Thick.Base.UI.UiModule
{
...
...
Project.FLY.Thick.Base/FLY.Thick.Base.UI/UiModule/MenuSetting.xaml
View file @
0ca4b51c
<UserControl x:Class="FLY.Thick.Base.UI.
Client.
UiModule.MenuSetting"
<UserControl x:Class="FLY.Thick.Base.UI.UiModule.MenuSetting"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
...
...
Project.FLY.Thick.Base/FLY.Thick.Base.UI/UiModule/MenuSetting.xaml.cs
View file @
0ca4b51c
...
...
@@ -17,7 +17,7 @@ using System.Windows.Navigation;
using
System.Windows.Shapes
;
using
Unity
;
namespace
FLY.Thick.Base.UI.
Client.
UiModule
namespace
FLY.Thick.Base.UI.UiModule
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment