Skip to content

Commit d4c0981

Browse files
committing changes.
1 parent 3a55123 commit d4c0981

11 files changed

+53
-117
lines changed

Samples/DockItem Header/WpfApp2.sln

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 17
4-
VisualStudioVersion = 17.13.35828.75 d17.13
4+
VisualStudioVersion = 17.13.35828.75
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfApp2", "WpfApp2\WpfApp2.csproj", "{09487682-923B-4B3C-92A8-B5ABDB8CEAB6}"
77
EndProject
-5.2 KB
Binary file not shown.
+34-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,39 @@
1-
<Application x:Class="WpfApp2.App"
2-
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4-
xmlns:local="clr-namespace:WpfApp2"
5-
StartupUri="MainWindow.xaml">
1+
<Application
2+
x:Class="WpfApp2.App"
3+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5+
xmlns:local="clr-namespace:WpfApp2"
6+
StartupUri="MainWindow.xaml">
67
<Application.Resources>
78
<DataTemplate x:Key="HeaderTemplate">
8-
<local:CustomHeader/>
9+
<Grid>
10+
<Grid.ColumnDefinitions>
11+
<ColumnDefinition Width="Auto" />
12+
<ColumnDefinition />
13+
</Grid.ColumnDefinitions>
14+
<Path
15+
x:Name="data"
16+
Width="{Binding IconSize.Width}"
17+
Height="{Binding IconSize.Height}"
18+
Margin="0,0,0,0"
19+
Data="{Binding IconData}"
20+
Fill="#FF000000"
21+
RenderTransformOrigin="0.5,0.5"
22+
Stretch="Uniform">
23+
<Path.RenderTransform>
24+
<TransformGroup>
25+
<TransformGroup.Children>
26+
<RotateTransform Angle="0" />
27+
<ScaleTransform ScaleX="1" ScaleY="1" />
28+
</TransformGroup.Children>
29+
</TransformGroup>
30+
</Path.RenderTransform>
31+
</Path>
32+
<TextBlock Grid.Column="1"
33+
Margin="3,0"
34+
VerticalAlignment="Center"
35+
Text="{Binding Title}" />
36+
</Grid>
937
</DataTemplate>
1038
</Application.Resources>
1139
</Application>
Binary file not shown.
-2.68 KB
Binary file not shown.

Samples/DockItem Header/WpfApp2/CustomHeader.xaml

-44
This file was deleted.

Samples/DockItem Header/WpfApp2/CustomHeader.xaml.cs

-28
This file was deleted.
Binary file not shown.

Samples/DockItem Header/WpfApp2/MainWindow.xaml.cs

+16-16
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
using System.Windows.Data;
1313
using System.Windows.Documents;
1414
using System.Windows.Input;
15+
using System.Windows.Markup;
1516
using System.Windows.Media;
1617
using System.Windows.Media.Animation;
1718
using System.Windows.Media.Imaging;
@@ -33,8 +34,14 @@ public MainWindow()
3334

3435
public class Header
3536
{
36-
public string DocumentTitle { get; set; }
37-
public bool DocumentIsModified { get; set; }
37+
public string Title { get; set; }
38+
39+
public Geometry IconData
40+
{
41+
get;set;
42+
}
43+
44+
public Size IconSize { get; set; }
3845
}
3946

4047
public class DockViewModel : NotificationObject
@@ -53,30 +60,23 @@ public ObservableCollection<DockItem> DockItemCollection
5360

5461
private void GenerateDockItemCollection()
5562
{
56-
5763
DockItemCollection = new ObservableCollection<DockItem>();
5864

59-
DockItemCollection.Add(new DockItem() { Header = new Header { DocumentIsModified = true, DocumentTitle = "ToolBox"}, Name = "tool", State = DockState.Dock, DesiredWidthInDockedMode = 200d, HeaderTemplate = (DataTemplate)Application.Current.FindResource("HeaderTemplate") });
65+
DockItemCollection.Add(new DockItem() { Header = new Header { Title = "Toolbox", IconData = Geometry.Parse("M9.7000122,0L16.600006,1.6000004 11.100006,6.3999721 17.100006,13.099962 20.600006,9.5999738 20.5,9.3999626C20.299988,8.8999635 20.200012,8.2999603 20.200012,7.6999861 20.200012,4.4999849 22.799988,1.8999874 26,1.8999873 26.600006,1.8999874 27.100006,1.9999931 27.600006,2.0999989L24,3.8999805 24.600006,8.8999635 29.5,9.6999799 31.399994,6.0999858C31.899994,6.4999782 32,6.9999763 32,7.5999805 32,10.799952 29.399994,13.399949 26.200012,13.399949 25.299988,13.399949 24.399994,13.199968 23.700012,12.799945L23.600006,12.699969 20,16.299933 28.399994,25.699927 30.600006,28.099913C31.399994,28.999903 31.399994,30.399893 30.399994,31.299883 29.5,32.099898 28.100006,32.099898 27.200012,31.099901L26.5,30.299887 26.299988,30.099905 24.299988,27.899901C24.200012,27.799895,24.200012,27.799895,24.200012,27.699919L16.700012,19.399929 12.299988,23.699932 12.399994,23.899914C12.600006,24.499918 12.799988,25.199928 12.799988,25.899906 12.799988,29.099909 10.200012,31.699906 7,31.699906 6.3999939,31.699906 5.8999939,31.599901 5.3999939,31.499895L9,29.699913 8.3999939,24.69993 3.2999878,23.99992 1.3999939,27.599915C1.2000122,27.099915 1.2000122,26.499911 1.2000122,25.899906 1.2000122,22.699936 3.7999878,20.09994 7,20.09994 7.7999878,20.09994 8.6000061,20.299919 9.2999878,20.599938L9.3999939,20.699944 13.899994,16.299933 7.8999939,9.4999677 4,12.89995 0,8.5999777z") , IconSize = new Size(15,15) }, Name = "tool", State = DockState.Dock, DesiredWidthInDockedMode = 150, HeaderTemplate = (DataTemplate)Application.Current.FindResource("HeaderTemplate") });
6066

61-
DockItemCollection.Add(new DockItem() { Header = "Integration", State = DockState.Document});
67+
DockItemCollection.Add(new DockItem() { Header = new Header { Title = "MainWindow.xaml.cs" }, State = DockState.Document, HeaderTemplate = (DataTemplate)Application.Current.FindResource("HeaderTemplate") });
6268

63-
DockItemCollection.Add(new DockItem() { Header = new Header { DocumentIsModified = true, DocumentTitle = "Admin" }, State = DockState.Document, HeaderTemplate = (DataTemplate)Application.Current.FindResource("HeaderTemplate") });
69+
DockItemCollection.Add(new DockItem() { Header = new Header { Title = "MainWindow.xaml", IconData = Geometry.Parse("M3.3169894,18.909973L3.3169894,20.480957 14.341993,20.480957 14.341993,18.909973z M3.3169894,12.10199L3.3169894,13.672974 19.114001,13.672974 19.114001,12.10199z M16.406999,1.1129761L21.374013,6.3989868 17.453996,6.3989868C16.875993,6.3989868,16.406999,5.9299927,16.406999,5.3519897z M2.2689838,0L14.893996,0 14.893996,5.6429443C14.893996,6.8959961,15.910995,7.9119873,17.163987,7.9119873L22.457999,7.9119873 22.457999,29.730957C22.457999,30.983948,21.442006,32,20.189015,32L2.2689838,32C1.0159922,32,4.4543413E-08,30.983948,0,29.730957L0,2.2689819C4.4543413E-08,1.0159912,1.0159922,0,2.2689838,0z"), IconSize = new Size(15,15) }, State = DockState.Document , HeaderTemplate = (DataTemplate)Application.Current.FindResource("HeaderTemplate") });
6470

65-
DockItemCollection.Add(new DockItem() { Header = new Header { DocumentIsModified = true, DocumentTitle = "Docking" }, State = DockState.Document, HeaderTemplate = (DataTemplate)Application.Current.FindResource("HeaderTemplate") });
71+
DockItemCollection.Add(new DockItem() { Header = new Header { Title = "Properties", IconData = Geometry.Parse("M11.800031,24L31.799999,24 31.799999,32 11.800031,32z M0,24L7.999988,24 7.999988,32 0,32z M11.800031,12L31.799999,12 31.799999,20 11.800031,20z M0,12L7.999988,12 7.999988,20 0,20z M11.800031,0L31.799999,0 31.799999,8 11.800031,8z M0,0L7.999988,0 7.999988,8 0,8z"), IconSize = new Size(15, 15) }, Name = "Properties", State = DockState.Dock, SideInDockedMode = DockSide.Tabbed, TargetNameInDockedMode = "solution", HeaderTemplate = (DataTemplate)Application.Current.FindResource("HeaderTemplate") });
6672

67-
DockItemCollection.Add(new DockItem() { Header = new Header { DocumentIsModified = true, DocumentTitle = "Bookmark" }, Name = "solution", State = DockState.Dock, SideInDockedMode = DockSide.Right, DesiredWidthInDockedMode = 300d, HeaderTemplate = (DataTemplate)Application.Current.FindResource("HeaderTemplate") });
73+
DockItemCollection.Add(new DockItem() { Header = new Header { Title = "Solution Explorer" }, DesiredWidthInDockedMode = 150, Name = "solution", State = DockState.Dock, SideInDockedMode = DockSide.Right, HeaderTemplate = (DataTemplate)Application.Current.FindResource("HeaderTemplate") });
6874

69-
DockItemCollection.Add(new DockItem() { Header = "Properties Window", Name = "Properties", State = DockState.Dock, SideInDockedMode = DockSide.Tabbed, TargetNameInDockedMode = "solution" });
75+
DockItemCollection.Add(new DockItem() { Header = new Header { Title = "Warning", IconData = Geometry.Parse("M14.966003,22.147998L17.112,22.147998 17.112,24.293016 14.966003,24.293016z M14.874008,13.098992L17.195007,13.098992 17.195007,15.726005 16.645004,21.407031 15.432007,21.407031 14.874008,15.726005z M16,5.1690032L4.1110077,27.212022 27.889008,27.212022z M16,0L24,14.832999 32,29.666 16,29.666 0,29.666 8,14.832999z") , IconSize = new Size(15, 15) }, Name = "Output", DesiredHeightInDockedMode = 150, State = DockState.Dock, SideInDockedMode = DockSide.Bottom, HeaderTemplate = (DataTemplate)Application.Current.FindResource("HeaderTemplate") });
7076

71-
DockItemCollection.Add(new DockItem() { Header = new Header { DocumentIsModified = true, DocumentTitle = "Clipboard" }, Name = "Output", State = DockState.Dock, SideInDockedMode = DockSide.Bottom, DesiredHeightInDockedMode = 200d, HeaderTemplate = (DataTemplate)Application.Current.FindResource("HeaderTemplate") });
72-
73-
DockItemCollection.Add(new DockItem() { Header = "Error List", State = DockState.Dock, SideInDockedMode = DockSide.Tabbed, TargetNameInDockedMode = "Output" });
74-
75-
DockItemCollection.Add(new DockItem() { Header = "Find Symbol Results", State = DockState.Dock, SideInDockedMode = DockSide.Tabbed, TargetNameInDockedMode = "Output" });
77+
DockItemCollection.Add(new DockItem() { Header = "Error List", State = DockState.Dock, SideInDockedMode = DockSide.Tabbed, TargetNameInDockedMode = "Output"});
7678

7779
DockItemCollection.Add(new DockItem() { Header = "Find Results", State = DockState.Dock, SideInDockedMode = DockSide.Tabbed, TargetNameInDockedMode = "Output" });
78-
79-
8080
}
8181
}
8282
}
-3.31 KB
Binary file not shown.

Samples/DockItem Header/WpfApp2/WpfApp2.csproj

+2-22
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141
<Reference Include="Syncfusion.Shared.WPF, Version=28.2462.12.0, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
4242
<HintPath>..\packages\Syncfusion.Shared.WPF.28.2.12\lib\net462\Syncfusion.Shared.WPF.dll</HintPath>
4343
</Reference>
44-
<Reference Include="Syncfusion.Tools.WPF, Version=29.1462.27.0, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
44+
<Reference Include="Syncfusion.Tools.WPF, Version=28.1462.33.0, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
4545
<SpecificVersion>False</SpecificVersion>
46-
<HintPath>..\..\..\..\..\..\WPF Build\WPF\29.1.27\precompiledassemblies\4.6.2\Syncfusion.Tools.WPF.dll</HintPath>
46+
<HintPath>D:\Syncfusion\Essential Studio\WPF\28.1.33\precompiledassemblies\4.6.2\Syncfusion.Tools.WPF.dll</HintPath>
4747
</Reference>
4848
<Reference Include="System" />
4949
<Reference Include="System.Data" />
@@ -65,10 +65,6 @@
6565
<Generator>MSBuild:Compile</Generator>
6666
<SubType>Designer</SubType>
6767
</ApplicationDefinition>
68-
<Page Include="CustomHeader.xaml">
69-
<SubType>Designer</SubType>
70-
<Generator>MSBuild:Compile</Generator>
71-
</Page>
7268
<Page Include="MainWindow.xaml">
7369
<Generator>MSBuild:Compile</Generator>
7470
<SubType>Designer</SubType>
@@ -77,9 +73,6 @@
7773
<DependentUpon>App.xaml</DependentUpon>
7874
<SubType>Code</SubType>
7975
</Compile>
80-
<Compile Include="CustomHeader.xaml.cs">
81-
<DependentUpon>CustomHeader.xaml</DependentUpon>
82-
</Compile>
8376
<Compile Include="MainWindow.xaml.cs">
8477
<DependentUpon>MainWindow.xaml</DependentUpon>
8578
<SubType>Code</SubType>
@@ -112,18 +105,5 @@
112105
<ItemGroup>
113106
<None Include="App.config" />
114107
</ItemGroup>
115-
<ItemGroup>
116-
<Resource Include="Docking-Manager.png" />
117-
</ItemGroup>
118-
<ItemGroup>
119-
<Resource Include="Toolbox-02.png" />
120-
</ItemGroup>
121-
<ItemGroup>
122-
<Resource Include="Admin2.png" />
123-
<Resource Include="Clipboard-02.png" />
124-
</ItemGroup>
125-
<ItemGroup>
126-
<Resource Include="Bookmark Delete01-WF.png" />
127-
</ItemGroup>
128108
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
129109
</Project>

0 commit comments

Comments
 (0)