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
0906ef65
Commit
0906ef65
authored
Feb 17, 2025
by
潘栩锋
🚴
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
由于FLY.ControlLibrary 的 Styles.xaml 与 Converters.xaml 改名称,所有需要重新设置
parent
d463d848
Show whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
46 additions
and
18 deletions
+46
-18
App.xaml
MultiLayout/App.xaml
+18
-0
App.xaml.cs
MultiLayout/App.xaml.cs
+21
-0
WdGageTabItemConfigStyle.xaml
MultiLayout/MainEdit/PgMeGage/WdGageTabItemConfigStyle.xaml
+0
-1
WdGraphConfigStyle.xaml
MultiLayout/MainEdit/PgMeGraph/WdGraphConfigStyle.xaml
+0
-1
WdGraphTabItemConfigStyle.xaml
...iLayout/MainEdit/PgMeGraph/WdGraphTabItemConfigStyle.xaml
+0
-1
WdLoadFile.xaml
MultiLayout/MainEdit/WdLoadFile.xaml
+0
-1
WdMainConfigStyle.xaml
MultiLayout/MainEdit/WdMainConfigStyle.xaml
+0
-2
WdSaveFile.xaml
MultiLayout/MainEdit/WdSaveFile.xaml
+0
-1
MainWindow.xaml
MultiLayout/MainWindow.xaml
+0
-2
MultiLayout.csproj
MultiLayout/MultiLayout.csproj
+7
-0
PgLoading.xaml
MultiLayout/PgLoading.xaml
+0
-2
GraphTab.xaml
MultiLayout/Themes/GraphTab.xaml
+0
-1
Styles.xaml
MultiLayout/Themes/Styles.xaml
+0
-2
UcMultiGage.xaml
MultiLayout/UcMultiGage/UcMultiGage.xaml
+0
-2
UcSingleGageStyle.xaml
MultiLayout/UcSingleGage/UcSingleGageStyle.xaml
+0
-2
No files found.
MultiLayout/App.xaml
0 → 100644
View file @
0906ef65
<Application x:Class="MultiLayout.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<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:,,,/FLY.ControlLibrary;component/Themes/Styles.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Converter/Converters.xaml"/>
</ResourceDictionary.MergedDictionaries>
<Style TargetType="GroupBox"/>
<Style TargetType="Expander"/>
</ResourceDictionary>
</Application.Resources>
</Application>
MultiLayout/App.xaml.cs
0 → 100644
View file @
0906ef65
using
System
;
using
System.Collections.Generic
;
using
System.Configuration
;
using
System.Data
;
using
System.IO
;
using
System.Linq
;
using
System.Threading.Tasks
;
using
System.Windows
;
using
Unity
;
namespace
MultiLayout
{
/// <summary>
/// App.xaml 的交互逻辑
/// </summary>
public
partial
class
App
:
Application
{
}
}
MultiLayout/MainEdit/PgMeGage/WdGageTabItemConfigStyle.xaml
View file @
0906ef65
...
@@ -2,7 +2,6 @@
...
@@ -2,7 +2,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks">
xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks">
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary.MergedDictionaries>
<Thickness x:Key="ControlMargin">5</Thickness>
<Thickness x:Key="ControlMargin">5</Thickness>
<Style TargetType="Button" x:Key="ButtonStyle_icon" BasedOn="{StaticResource ButtonStyle_empty}">
<Style TargetType="Button" x:Key="ButtonStyle_icon" BasedOn="{StaticResource ButtonStyle_empty}">
...
...
MultiLayout/MainEdit/PgMeGraph/WdGraphConfigStyle.xaml
View file @
0906ef65
...
@@ -2,7 +2,6 @@
...
@@ -2,7 +2,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks">
xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks">
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary.MergedDictionaries>
<Thickness x:Key="ControlMargin">5</Thickness>
<Thickness x:Key="ControlMargin">5</Thickness>
<Style TargetType="Button" x:Key="ButtonStyle_icon" BasedOn="{StaticResource ButtonStyle_empty}">
<Style TargetType="Button" x:Key="ButtonStyle_icon" BasedOn="{StaticResource ButtonStyle_empty}">
...
...
MultiLayout/MainEdit/PgMeGraph/WdGraphTabItemConfigStyle.xaml
View file @
0906ef65
...
@@ -2,7 +2,6 @@
...
@@ -2,7 +2,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks">
xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks">
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary.MergedDictionaries>
<Thickness x:Key="ControlMargin">5</Thickness>
<Thickness x:Key="ControlMargin">5</Thickness>
<Style TargetType="Button" x:Key="ButtonStyle_icon" BasedOn="{StaticResource ButtonStyle_empty}">
<Style TargetType="Button" x:Key="ButtonStyle_icon" BasedOn="{StaticResource ButtonStyle_empty}">
...
...
MultiLayout/MainEdit/WdLoadFile.xaml
View file @
0906ef65
...
@@ -7,7 +7,6 @@
...
@@ -7,7 +7,6 @@
<Window.Resources>
<Window.Resources>
<ResourceDictionary>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</ResourceDictionary>
</Window.Resources>
</Window.Resources>
...
...
MultiLayout/MainEdit/WdMainConfigStyle.xaml
View file @
0906ef65
...
@@ -3,8 +3,6 @@
...
@@ -3,8 +3,6 @@
xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
>
>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Converter/Dictionary_MyConv.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary.MergedDictionaries>
...
...
MultiLayout/MainEdit/WdSaveFile.xaml
View file @
0906ef65
...
@@ -7,7 +7,6 @@
...
@@ -7,7 +7,6 @@
<Window.Resources>
<Window.Resources>
<ResourceDictionary>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</ResourceDictionary>
</Window.Resources>
</Window.Resources>
...
...
MultiLayout/MainWindow.xaml
View file @
0906ef65
...
@@ -10,8 +10,6 @@
...
@@ -10,8 +10,6 @@
<Window.Resources>
<Window.Resources>
<ResourceDictionary>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Converter/Dictionary_MyConv.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary.MergedDictionaries>
<local:UcMultiGageVmUt x:Key="viewModel" GageTag="机尾" IsErrMsgVisable ="True"/>
<local:UcMultiGageVmUt x:Key="viewModel" GageTag="机尾" IsErrMsgVisable ="True"/>
</ResourceDictionary>
</ResourceDictionary>
...
...
MultiLayout/MultiLayout.csproj
View file @
0906ef65
...
@@ -57,6 +57,9 @@
...
@@ -57,6 +57,9 @@
<Reference
Include=
"PresentationFramework"
/>
<Reference
Include=
"PresentationFramework"
/>
</ItemGroup>
</ItemGroup>
<ItemGroup>
<ItemGroup>
<Compile
Include=
"App.xaml.cs"
>
<DependentUpon>
App.xaml
</DependentUpon>
</Compile>
<Compile
Include=
"CustomMenu\MainEditMenu.cs"
/>
<Compile
Include=
"CustomMenu\MainEditMenu.cs"
/>
<Compile
Include=
"MainEdit\WdLoadFile.xaml.cs"
>
<Compile
Include=
"MainEdit\WdLoadFile.xaml.cs"
>
<DependentUpon>
WdLoadFile.xaml
</DependentUpon>
<DependentUpon>
WdLoadFile.xaml
</DependentUpon>
...
@@ -131,6 +134,10 @@
...
@@ -131,6 +134,10 @@
<Compile
Include=
"FlyLayoutManager.cs"
/>
<Compile
Include=
"FlyLayoutManager.cs"
/>
<Compile
Include=
"UiModule\COMMON.cs"
/>
<Compile
Include=
"UiModule\COMMON.cs"
/>
<Compile
Include=
"UcMultiGage\UcMultiGageVmUt.cs"
/>
<Compile
Include=
"UcMultiGage\UcMultiGageVmUt.cs"
/>
<Page
Include=
"App.xaml"
>
<Generator>
MSBuild:Compile
</Generator>
<SubType>
Designer
</SubType>
</Page>
<Page
Include=
"MainEdit\PgMainEdit.xaml"
>
<Page
Include=
"MainEdit\PgMainEdit.xaml"
>
<Generator>
MSBuild:Compile
</Generator>
<Generator>
MSBuild:Compile
</Generator>
<SubType>
Designer
</SubType>
<SubType>
Designer
</SubType>
...
...
MultiLayout/PgLoading.xaml
View file @
0906ef65
...
@@ -9,8 +9,6 @@
...
@@ -9,8 +9,6 @@
<Page.Resources>
<Page.Resources>
<ResourceDictionary>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Converter/Dictionary_MyConv.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</ResourceDictionary>
</Page.Resources>
</Page.Resources>
...
...
MultiLayout/Themes/GraphTab.xaml
View file @
0906ef65
...
@@ -2,7 +2,6 @@
...
@@ -2,7 +2,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary.MergedDictionaries>
<ControlTemplate x:Key="GraphTab" TargetType="{x:Type TabControl}">
<ControlTemplate x:Key="GraphTab" TargetType="{x:Type TabControl}">
<ControlTemplate.Resources>
<ControlTemplate.Resources>
...
...
MultiLayout/Themes/Styles.xaml
View file @
0906ef65
...
@@ -3,8 +3,6 @@
...
@@ -3,8 +3,6 @@
xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
>
>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Converter/Dictionary_MyConv.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary.MergedDictionaries>
<Thickness x:Key="ControlMargin">5</Thickness>
<Thickness x:Key="ControlMargin">5</Thickness>
...
...
MultiLayout/UcMultiGage/UcMultiGage.xaml
View file @
0906ef65
...
@@ -9,8 +9,6 @@
...
@@ -9,8 +9,6 @@
<UserControl.Resources>
<UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Converter/Dictionary_MyConv.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary.MergedDictionaries>
<local:UcMultiGageVmUt x:Key="viewModel" GageTag="机尾" IsErrMsgVisable ="True"/>
<local:UcMultiGageVmUt x:Key="viewModel" GageTag="机尾" IsErrMsgVisable ="True"/>
</ResourceDictionary>
</ResourceDictionary>
...
...
MultiLayout/UcSingleGage/UcSingleGageStyle.xaml
View file @
0906ef65
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Converter/Dictionary_MyConv.xaml"/>
<ResourceDictionary Source="pack://application:,,,/MultiLayout;component/Themes/GraphTab.xaml"/>
<ResourceDictionary Source="pack://application:,,,/MultiLayout;component/Themes/GraphTab.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary.MergedDictionaries>
<Style TargetType="Button" x:Key="ButtonStyle_option" BasedOn="{StaticResource ButtonStyle_empty}">
<Style TargetType="Button" x:Key="ButtonStyle_option" BasedOn="{StaticResource ButtonStyle_empty}">
...
...
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