Update release

This commit is contained in:
vczh
2016-07-16 23:06:40 -07:00
parent 9718c08c27
commit 32b8ef2230
44 changed files with 1015 additions and 24 deletions
+6
View File
@@ -19,6 +19,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Flow", "Flow\Flow.vcxproj",
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RichTextEmbedding", "RichTextEmbedding\RichTextEmbedding.vcxproj", "{A586B9AF-3C54-4353-9214-F15182C4BFB8}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TableSplitter", "TableSplitter\TableSplitter.vcxproj", "{B286F8B7-04DF-4850-9479-3A5F3D3C2554}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -53,6 +55,10 @@ Global
{A586B9AF-3C54-4353-9214-F15182C4BFB8}.Debug|Win32.Build.0 = Debug|Win32
{A586B9AF-3C54-4353-9214-F15182C4BFB8}.Release|Win32.ActiveCfg = Release|Win32
{A586B9AF-3C54-4353-9214-F15182C4BFB8}.Release|Win32.Build.0 = Release|Win32
{B286F8B7-04DF-4850-9479-3A5F3D3C2554}.Debug|Win32.ActiveCfg = Debug|Win32
{B286F8B7-04DF-4850-9479-3A5F3D3C2554}.Debug|Win32.Build.0 = Debug|Win32
{B286F8B7-04DF-4850-9479-3A5F3D3C2554}.Release|Win32.ActiveCfg = Release|Win32
{B286F8B7-04DF-4850-9479-3A5F3D3C2554}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -0,0 +1,23 @@
#include "UI/Source/Demo.h"
#include <Windows.h>
using namespace vl::collections;
using namespace vl::stream;
int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int CmdShow)
{
return SetupWindowsDirect2DRenderer();
}
void GuiMain()
{
{
List<WString> errors;
FileStream fileStream(L"../UIRes/TableSplitter.bin", FileStream::ReadOnly);
auto resource = GuiResource::LoadPrecompiledBinary(fileStream, errors);
GetResourceManager()->SetResource(L"Resource", resource);
}
demo::MainWindow window;
window.MoveToScreenCenter();
GetApplication()->Run(&window);
}
@@ -0,0 +1,101 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{B286F8B7-04DF-4850-9479-3A5F3D3C2554}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>TableSplitter</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(ProjectDir)..\..\..\Import;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>$(ProjectDir)..\..\..\Import;$(IncludePath)</IncludePath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="Main.cpp" />
<ClCompile Include="UI\Source\DemoPartialClasses.cpp" />
</ItemGroup>
<ItemGroup>
<Xml Include="UI\Resource.xml" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="UI\Source\Demo.h" />
<ClInclude Include="UI\Source\DemoPartialClasses.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Lib\GacUI\GacUI.vcxproj">
<Project>{8018d622-66ba-4e65-9d03-bdac37ea9a54}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
<Filter Include="UI">
<UniqueIdentifier>{ee89d17b-263a-4e0e-b063-e14ea5c00f0f}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="Main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="UI\Source\DemoPartialClasses.cpp">
<Filter>UI</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Xml Include="UI\Resource.xml">
<Filter>Resource Files</Filter>
</Xml>
</ItemGroup>
<ItemGroup>
<ClInclude Include="UI\Source\DemoPartialClasses.h">
<Filter>UI</Filter>
</ClInclude>
<ClInclude Include="UI\Source\Demo.h">
<Filter>UI</Filter>
</ClInclude>
</ItemGroup>
</Project>
@@ -0,0 +1 @@
..\..\..\..\Tools\GacGen.exe Resource.xml
@@ -0,0 +1,209 @@
<?xml version="1.0" encoding="utf-8"?>
<Resource>
<Folder name="GacGenConfig">
<Folder name="Cpp">
<Text name="Output">Source</Text>
<Text name="Include">GacUIReflection.h</Text>
<Text name="Name">Demo</Text>
<Text name="Prefix"></Text>
</Folder>
<Folder name="Res">
<Text name="Output">..\..\UIRes</Text>
<Text name="PrecompiledBinary">TableSplitter.bin</Text>
</Folder>
</Folder>
<Folder name="MainWindow">
<Instance name="MainWindowResource">
<Instance ref.CodeBehind="false" ref.Class="demo::MainWindow">
<Window Text="TableSplitter" ClientSize="x:640 y:480">
<att.BoundsComposition-set PreferredMinSize="x:640 y:480"/>
<Table CellPadding="5" AlignmentToParent="left:0 top:0 right:0 bottom:0">
<att.Rows>
<CellOption>composeType:MinSize</CellOption>
<CellOption>composeType:Percentage percentage:1.0</CellOption>
</att.Rows>
<att.Columns>
<CellOption>composeType:Percentage percentage:1.0</CellOption>
</att.Columns>
<Cell Site="row:0 column:0">
<CheckBox ref.Name="checkBorder" Text="Table size contains borders" Selected="true"/>
</Cell>
<Cell Site="row:1 column:0">
<GroupBox Text="Drag spaces between cells to resize">
<att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0"/>
<Bounds AlignmentToParent="left:0 top:0 right:0 bottom:0">
<SolidBorder Color="#0000FF"/>
<Table ref.Name="table" BorderVisible-bind="checkBorder.Selected" CellPadding="5" AlignmentToParent="left:0 top:0 right:0 bottom:0">
<att.Rows>
<CellOption>composeType:MinSize</CellOption>
<CellOption>composeType:Absolute absolute:50</CellOption>
<CellOption>composeType:Absolute absolute:50</CellOption>
<CellOption>composeType:Percentage percentage:0.5</CellOption>
<CellOption>composeType:Percentage percentage:0.5</CellOption>
<CellOption>composeType:Absolute absolute:50</CellOption>
<CellOption>composeType:Absolute absolute:50</CellOption>
</att.Rows>
<att.Columns>
<CellOption>composeType:MinSize</CellOption>
<CellOption>composeType:Absolute absolute:50</CellOption>
<CellOption>composeType:Absolute absolute:50</CellOption>
<CellOption>composeType:Percentage percentage:0.5</CellOption>
<CellOption>composeType:Percentage percentage:0.5</CellOption>
<CellOption>composeType:Absolute absolute:50</CellOption>
<CellOption>composeType:Absolute absolute:50</CellOption>
</att.Columns>
<RowSplitter RowsToTheTop="2"/>
<RowSplitter RowsToTheTop="3"/>
<RowSplitter RowsToTheTop="5"/>
<RowSplitter RowsToTheTop="6"/>
<ColumnSplitter ColumnsToTheLeft="2"/>
<ColumnSplitter ColumnsToTheLeft="3"/>
<ColumnSplitter ColumnsToTheLeft="5"/>
<ColumnSplitter ColumnsToTheLeft="6"/>
<Cell Site="row:0 column:1">
<Label Text-format="$(table.observe as _(_.GetColumnOption(1).absolute on _.ConfigChanged))px"/>
</Cell>
<Cell Site="row:0 column:2">
<Label Text-format="$(table.observe as _(_.GetColumnOption(2).absolute on _.ConfigChanged))px"/>
</Cell>
<Cell Site="row:0 column:3">
<Label Text="50%"/>
</Cell>
<Cell Site="row:0 column:4">
<Label Text="50%"/>
</Cell>
<Cell Site="row:0 column:5">
<Label Text-format="$(table.observe as _(_.GetColumnOption(5).absolute on _.ConfigChanged))px"/>
</Cell>
<Cell Site="row:0 column:6">
<Label Text-format="$(table.observe as _(_.GetColumnOption(6).absolute on _.ConfigChanged))px"/>
</Cell>
<Cell Site="row:1 column:0">
<Label Text-format="$(table.observe as _(_.GetRowOption(1).absolute on _.ConfigChanged))px"/>
</Cell>
<Cell Site="row:2 column:0">
<Label Text-format="$(table.observe as _(_.GetRowOption(2).absolute on _.ConfigChanged))px"/>
</Cell>
<Cell Site="row:3 column:0">
<Label Text="50%"/>
</Cell>
<Cell Site="row:4 column:0">
<Label Text="50%"/>
</Cell>
<Cell Site="row:5 column:0">
<Label Text-format="$(table.observe as _(_.GetRowOption(5).absolute on _.ConfigChanged))px"/>
</Cell>
<Cell Site="row:6 column:0">
<Label Text-format="$(table.observe as _(_.GetRowOption(6).absolute on _.ConfigChanged))px"/>
</Cell>
<Cell Site="row:1 column:1">
<SolidBorder Color="#FF8000"/>
</Cell>
<Cell Site="row:1 column:2">
<SolidBorder Color="#FF8000"/>
</Cell>
<Cell Site="row:2 column:1">
<SolidBorder Color="#FF8000"/>
</Cell>
<Cell Site="row:2 column:2">
<SolidBorder Color="#FF8000"/>
</Cell>
<Cell Site="row:1 column:5">
<SolidBorder Color="#FF8000"/>
</Cell>
<Cell Site="row:1 column:6">
<SolidBorder Color="#FF8000"/>
</Cell>
<Cell Site="row:2 column:5">
<SolidBorder Color="#FF8000"/>
</Cell>
<Cell Site="row:2 column:6">
<SolidBorder Color="#FF8000"/>
</Cell>
<Cell Site="row:5 column:1">
<SolidBorder Color="#FF8000"/>
</Cell>
<Cell Site="row:5 column:2">
<SolidBorder Color="#FF8000"/>
</Cell>
<Cell Site="row:6 column:1">
<SolidBorder Color="#FF8000"/>
</Cell>
<Cell Site="row:6 column:2">
<SolidBorder Color="#FF8000"/>
</Cell>
<Cell Site="row:5 column:5">
<SolidBorder Color="#FF8000"/>
</Cell>
<Cell Site="row:5 column:6">
<SolidBorder Color="#FF8000"/>
</Cell>
<Cell Site="row:6 column:5">
<SolidBorder Color="#FF8000"/>
</Cell>
<Cell Site="row:6 column:6">
<SolidBorder Color="#FF8000"/>
</Cell>
<Cell Site="row:1 column:3 columnSpan:2">
<SolidBorder Color="#FF8000"/>
</Cell>
<Cell Site="row:2 column:3 columnSpan:2">
<SolidBorder Color="#FF8000"/>
</Cell>
<Cell Site="row:5 column:3 columnSpan:2">
<SolidBorder Color="#FF8000"/>
</Cell>
<Cell Site="row:6 column:3 columnSpan:2">
<SolidBorder Color="#FF8000"/>
</Cell>
<Cell Site="row:3 column:1 rowSpan:2">
<SolidBorder Color="#FF8000"/>
</Cell>
<Cell Site="row:3 column:2 rowSpan:2">
<SolidBorder Color="#FF8000"/>
</Cell>
<Cell Site="row:3 column:5 rowSpan:2">
<SolidBorder Color="#FF8000"/>
</Cell>
<Cell Site="row:3 column:6 rowSpan:2">
<SolidBorder Color="#FF8000"/>
</Cell>
<Cell Site="row:3 column:3">
<SolidBorder Color="#008000"/>
</Cell>
<Cell Site="row:3 column:4">
<SolidBorder Color="#008000"/>
</Cell>
<Cell Site="row:4 column:3">
<SolidBorder Color="#008000"/>
</Cell>
<Cell Site="row:4 column:4">
<SolidBorder Color="#008000"/>
</Cell>
</Table>
</Bounds>
</GroupBox>
</Cell>
</Table>
</Window>
</Instance>
</Instance>
</Folder>
</Resource>
@@ -0,0 +1,16 @@
/***********************************************************************
Vczh Library++ 3.0
Developer: Zihan Chen(vczh)
GacUI::Demo
This file is generated by: Vczh GacUI Resource Code Generator
************************************************************************
DO NOT MODIFY
***********************************************************************/
#ifndef VCZH_GACUI_RESOURCE_CODE_GENERATOR_Demo
#define VCZH_GACUI_RESOURCE_CODE_GENERATOR_Demo
#include "DemoPartialClasses.h"
#endif
@@ -0,0 +1,90 @@
/***********************************************************************
Vczh Library++ 3.0
Developer: Zihan Chen(vczh)
GacUI::Partial Classes
This file is generated by: Vczh GacUI Resource Code Generator
************************************************************************
DO NOT MODIFY
***********************************************************************/
#include "Demo.h"
namespace demo
{
// #region CLASS_MEMBER_GUIEVENT_HANDLER (DO NOT PUT OTHER CONTENT IN THIS #region.)
void MainWindow::OnCreate()
{
}
void MainWindow::OnDestroy()
{
}
// #endregion CLASS_MEMBER_GUIEVENT_HANDLER
MainWindow::MainWindow()
{
InitializeComponents();
OnCreate();
}
MainWindow::~MainWindow()
{
OnDestroy();
ClearSubscriptions();
}
}
namespace vl
{
namespace reflection
{
namespace description
{
#define _ ,
IMPL_CPP_TYPE_INFO(demo::MainWindow)
BEGIN_CLASS_MEMBER(demo::MainWindow)
CLASS_MEMBER_BASE(vl::presentation::controls::GuiWindow)
CLASS_MEMBER_CONSTRUCTOR(demo::MainWindow*(), NO_PARAMETER)
END_CLASS_MEMBER(demo::MainWindow)
#undef _
class DemoResourceLoader : public Object, public ITypeLoader
{
public:
void Load(ITypeManager* manager)
{
ADD_TYPE_INFO(demo::MainWindow)
}
void Unload(ITypeManager* manager)
{
}
};
class DemoResourcePlugin : public Object, public vl::presentation::controls::IGuiPlugin
{
public:
void Load()override
{
GetGlobalTypeManager()->AddTypeLoader(new DemoResourceLoader);
}
void AfterLoad()override
{
}
void Unload()override
{
}
};
GUI_REGISTER_PLUGIN(DemoResourcePlugin)
}
}
}
@@ -0,0 +1,82 @@
/***********************************************************************
Vczh Library++ 3.0
Developer: Zihan Chen(vczh)
GacUI::Partial Classes
This file is generated by: Vczh GacUI Resource Code Generator
************************************************************************
DO NOT MODIFY
***********************************************************************/
#ifndef VCZH_GACUI_RESOURCE_CODE_GENERATOR_Demo_PARTIAL_CLASSES
#define VCZH_GACUI_RESOURCE_CODE_GENERATOR_Demo_PARTIAL_CLASSES
#include "GacUIReflection.h"
namespace demo
{
class MainWindow;
template<typename TImpl>
class MainWindow_ : public vl::presentation::controls::GuiWindow, public vl::presentation::GuiInstancePartialClass<vl::presentation::controls::GuiWindow>, public vl::reflection::Description<TImpl>
{
friend struct vl::reflection::description::CustomTypeDescriptorSelector<TImpl>;
private:
protected:
vl::presentation::controls::GuiSelectableButton* checkBorder;
vl::presentation::compositions::GuiTableComposition* table;
void InitializeComponents()
{
if (InitializeFromResource())
{
GUI_INSTANCE_REFERENCE(checkBorder);
GUI_INSTANCE_REFERENCE(table);
}
else
{
}
}
public:
MainWindow_()
:vl::presentation::GuiInstancePartialClass<vl::presentation::controls::GuiWindow>(L"demo::MainWindow")
,vl::presentation::controls::GuiWindow(vl::presentation::theme::GetCurrentTheme()->CreateWindowStyle())
,checkBorder(0)
,table(0)
{
}
};
}
namespace vl
{
namespace reflection
{
namespace description
{
DECL_TYPE_INFO(demo::MainWindow)
}
}
}
namespace demo
{
class MainWindow : public demo::MainWindow_<demo::MainWindow>
{
friend class demo::MainWindow_<demo::MainWindow>;
friend struct vl::reflection::description::CustomTypeDescriptorSelector<demo::MainWindow>;
protected:
// #region CLASS_MEMBER_GUIEVENT_HANDLER (DO NOT PUT OTHER CONTENT IN THIS #region.)
void OnCreate();
void OnDestroy();
// #endregion CLASS_MEMBER_GUIEVENT_HANDLER
public:
MainWindow();
~MainWindow();
};
}
#endif
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.