This commit is contained in:
Zihan Chen
2018-07-01 15:17:15 -07:00
parent 0a5fbd2d2b
commit 979ce8fd6b
12 changed files with 118 additions and 91 deletions
@@ -163,7 +163,7 @@
<ClInclude Include="UI\Source\DocumentEditorToolstrip.h" />
</ItemGroup>
<ItemGroup>
<Xml Include="UI\Resource.xml" />
<Xml Include="UI\ResourceBase.xml" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
@@ -49,7 +49,7 @@
</ClInclude>
</ItemGroup>
<ItemGroup>
<Xml Include="UI\Resource.xml">
<Xml Include="UI\ResourceBase.xml">
<Filter>Resource Files</Filter>
</Xml>
</ItemGroup>
@@ -1,89 +0,0 @@
<Resource>
<Folder name="GacGenConfig">
<Xml name="Metadata">
<ResourceMetadata Name="EditorBase" Version="1.0"/>
</Xml>
<Folder name="Cpp">
<Text name="SourceFolder">Source</Text>
<Text name="Resource">..\..\UIRes\DocumentEditor.bin</Text>
<Text name="NormalInclude">GacUI.h</Text>
<Text name="ReflectionInclude">GacUIReflection.h</Text>
<Text name="Name">Demo</Text>
</Folder>
</Folder>
<Instance name="MainWindowResource">
<Instance ref.CodeBehind="false" ref.Class="demo::MainWindow" xmlns:demo="demo::*">
<Window ref.Name="self" Text="DocumentEditor" ClientSize="x:320 y:240">
<att.BoundsComposition-set PreferredMinSize="x:320 y:240"/>
<Table AlignmentToParent="left:0 top:0 right:0 bottom:0" CellPadding="20">
<att.Rows>
<_>composeType:Percentage percentage:1.0</_>
<_>composeType:Percentage percentage:1.0</_>
</att.Rows>
<att.Columns>
<_>composeType:Percentage percentage:1.0</_>
</att.Columns>
<Cell Site="row:0 column:0">
<Button Text="Open document editor with toolstrip">
<att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0"/>
<ev.Clicked-eval>
<![CDATA[
{
var window = new DocumentEditorToolstripWindow*();
window.ForceCalculateSizeImmediately();
window.MoveToScreenCenter();
window.ShowModalAndDelete(self, func():void{});
}
]]>
</ev.Clicked-eval>
</Button>
</Cell>
<Cell Site="row:1 column:0">
<Button Text="Open document editor with ribbon">
<att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0"/>
<ev.Clicked-eval>
<![CDATA[
{
var window = new DocumentEditorRibbonWindow*();
window.ForceCalculateSizeImmediately();
window.MoveToScreenCenter();
window.ShowModalAndDelete(self, func():void{});
}
]]>
</ev.Clicked-eval>
</Button>
</Cell>
</Table>
</Window>
</Instance>
</Instance>
<Folder name="ToolbarImages" content="Link">../../../GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/ToolbarImages/Images.xml</Folder>
<Folder name="DocumentComponents" content="Link">../../../GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/DocumentComponents.xml</Folder>
<Folder name="DocumentEditorBase" content="Link">../../../GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/DocumentEditorBase.xml</Folder>
<Folder name="DocumentEditorRibbon" content="Link">../../../GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/DocumentEditorRibbon.xml</Folder>
<Folder name="DocumentEditorToolstrip" content="Link">../../../GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/DocumentEditorToolstrip.xml</Folder>
<Instance name="DocumentEditorRibbonWindowResource">
<Instance ref.CodeBehind="false" ref.Class="demo::DocumentEditorRibbonWindow" xmlns:demo="demo::*">
<Window Text-bind="editor.Text" ClientSize="x:800 y:600">
<demo:DocumentEditorRibbon ref.Name="editor">
<att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0"/>
</demo:DocumentEditorRibbon>
</Window>
</Instance>
</Instance>
<Instance name="DocumentEditorToolstripWindowResource">
<Instance ref.CodeBehind="false" ref.Class="demo::DocumentEditorToolstripWindow" xmlns:demo="demo::*">
<Window Text-bind="editor.Text" ClientSize="x:800 y:600">
<demo:DocumentEditorToolstrip ref.Name="editor">
<att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0"/>
</demo:DocumentEditorToolstrip>
</Window>
</Instance>
</Instance>
</Resource>
@@ -0,0 +1,38 @@
<Resource>
<Folder name="GacGenConfig">
<Xml name="Metadata">
<ResourceMetadata Name="EditorBase" Version="1.0"/>
</Xml>
<Folder name="Cpp">
<Text name="SourceFolder">Source</Text>
<Text name="Resource">..\..\UIRes\DocumentEditor.bin</Text>
<Text name="NormalInclude">GacUI.h</Text>
<Text name="ReflectionInclude">GacUIReflection.h</Text>
<Text name="Name">EditorBase</Text>
</Folder>
</Folder>
<Folder name="ToolbarImages" content="Link">../../../GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/ToolbarImages/Images.xml</Folder>
<Folder name="DocumentComponents" content="Link">../../../GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/DocumentComponents.xml</Folder>
<Folder name="DocumentEditorBase" content="Link">../../../GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/DocumentEditorBase.xml</Folder>
<Instance name="DocumentEditorRibbonWindowResource">
<Instance ref.CodeBehind="false" ref.Class="demo::DocumentEditorRibbonWindow" xmlns:demo="demo::*">
<Window Text-bind="editor.Text" ClientSize="x:800 y:600">
<demo:DocumentEditorRibbon ref.Name="editor">
<att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0"/>
</demo:DocumentEditorRibbon>
</Window>
</Instance>
</Instance>
<Instance name="DocumentEditorToolstripWindowResource">
<Instance ref.CodeBehind="false" ref.Class="demo::DocumentEditorToolstripWindow" xmlns:demo="demo::*">
<Window Text-bind="editor.Text" ClientSize="x:800 y:600">
<demo:DocumentEditorToolstrip ref.Name="editor">
<att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0"/>
</demo:DocumentEditorToolstrip>
</Window>
</Instance>
</Instance>
</Resource>
@@ -154,6 +154,9 @@
<ItemGroup>
<ClCompile Include="Main.cpp" />
</ItemGroup>
<ItemGroup>
<Xml Include="UI\ResourceRibbon.xml" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
@@ -19,4 +19,9 @@
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Xml Include="UI\ResourceRibbon.xml">
<Filter>Resource Files</Filter>
</Xml>
</ItemGroup>
</Project>
@@ -10,6 +10,7 @@ void GuiMain()
{
{
FileStream fileStream(L"../UIRes/DocumentEditor.bin", FileStream::ReadOnly);
FileStream fileStream(L"../UIRes/DocumentEditorRibbon.bin", FileStream::ReadOnly);
auto resource = GuiResource::LoadPrecompiledBinary(fileStream);
GetResourceManager()->SetResource(resource);
}
@@ -0,0 +1,30 @@
<Resource>
<Folder name="GacGenConfig">
<Xml name="Metadata">
<ResourceMetadata Name="EditorRibbon" Version="1.0"/>
<Dependencies>
<Resource Name="EditorBase"/>
</Dependencies>
</Xml>
<Folder name="Cpp">
<Text name="SourceFolder">Source</Text>
<Text name="Resource">..\..\UIRes\DocumentEditorRibbon.bin</Text>
<Text name="NormalInclude">GacUI.h</Text>
<Text name="ReflectionInclude">GacUIReflection.h</Text>
<Text name="Name">EditorRibbon</Text>
</Folder>
</Folder>
<Folder name="ToolbarImages" content="Link">../../../GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/ToolbarImages/Images.xml</Folder>
<Folder name="DocumentEditorRibbon" content="Link">../../../GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/DocumentEditorRibbon.xml</Folder>
<Instance name="MainWindowResource">
<Instance ref.CodeBehind="false" ref.Class="demo::MainWindow" xmlns:demo="demo::*">
<Window Text-bind="editor.Text" ClientSize="x:800 y:600">
<demo:DocumentEditorRibbon ref.Name="editor">
<att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0"/>
</demo:DocumentEditorRibbon>
</Window>
</Instance>
</Instance>
</Resource>
@@ -154,6 +154,9 @@
<ItemGroup>
<ClCompile Include="Main.cpp" />
</ItemGroup>
<ItemGroup>
<Xml Include="UI\ResourceToolstrip.xml" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
@@ -19,4 +19,9 @@
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Xml Include="UI\ResourceToolstrip.xml">
<Filter>Resource Files</Filter>
</Xml>
</ItemGroup>
</Project>
@@ -10,6 +10,7 @@ void GuiMain()
{
{
FileStream fileStream(L"../UIRes/DocumentEditor.bin", FileStream::ReadOnly);
FileStream fileStream(L"../UIRes/DocumentEditorToolstrip.bin", FileStream::ReadOnly);
auto resource = GuiResource::LoadPrecompiledBinary(fileStream);
GetResourceManager()->SetResource(resource);
}
@@ -0,0 +1,30 @@
<Resource>
<Folder name="GacGenConfig">
<Xml name="Metadata">
<ResourceMetadata Name="EditorToolstrip" Version="1.0"/>
<Dependencies>
<Resource Name="EditorBase"/>
</Dependencies>
</Xml>
<Folder name="Cpp">
<Text name="SourceFolder">Source</Text>
<Text name="Resource">..\..\UIRes\DocumentEditorToolstrip.bin</Text>
<Text name="NormalInclude">GacUI.h</Text>
<Text name="ReflectionInclude">GacUIReflection.h</Text>
<Text name="Name">EditorToolstrip</Text>
</Folder>
</Folder>
<Folder name="ToolbarImages" content="Link">../../../GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/ToolbarImages/Images.xml</Folder>
<Folder name="DocumentEditorToolstrip" content="Link">../../../GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/DocumentEditorToolstrip.xml</Folder>
<Instance name="MainWindowResource">
<Instance ref.CodeBehind="false" ref.Class="demo::MainWindow" xmlns:demo="demo::*">
<Window Text-bind="editor.Text" ClientSize="x:800 y:600">
<demo:DocumentEditorToolstrip ref.Name="editor">
<att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0"/>
</demo:DocumentEditorToolstrip>
</Window>
</Instance>
</Instance>
</Resource>