diff --git a/Tutorial/GacUI_Controls/DocumentEditor/DocumentEditor.vcxproj b/Tutorial/GacUI_Controls/DocumentEditor/DocumentEditor.vcxproj
index 77416505..4123419a 100644
--- a/Tutorial/GacUI_Controls/DocumentEditor/DocumentEditor.vcxproj
+++ b/Tutorial/GacUI_Controls/DocumentEditor/DocumentEditor.vcxproj
@@ -150,7 +150,6 @@
-
@@ -163,11 +162,6 @@
-
-
- {96c559ca-9718-4bec-a053-28a0ab6a8ca2}
-
-
diff --git a/Tutorial/GacUI_Controls/DocumentEditor/DocumentEditor.vcxproj.filters b/Tutorial/GacUI_Controls/DocumentEditor/DocumentEditor.vcxproj.filters
index b66cc1f6..8fd1078c 100644
--- a/Tutorial/GacUI_Controls/DocumentEditor/DocumentEditor.vcxproj.filters
+++ b/Tutorial/GacUI_Controls/DocumentEditor/DocumentEditor.vcxproj.filters
@@ -18,9 +18,6 @@
-
- Source Files
-
UI
diff --git a/Tutorial/GacUI_Controls/DocumentEditorRibbon/DocumentEditorRibbon.vcxproj b/Tutorial/GacUI_Controls/DocumentEditorRibbon/DocumentEditorRibbon.vcxproj
new file mode 100644
index 00000000..5965b605
--- /dev/null
+++ b/Tutorial/GacUI_Controls/DocumentEditorRibbon/DocumentEditorRibbon.vcxproj
@@ -0,0 +1,160 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ x64
+
+
+
+ 15.0
+ {5B82834D-51AB-44D1-B5D4-F1209F7EC54F}
+ Win32Proj
+ DocumentEditorRibbon
+ 10.0.16299.0
+
+
+
+ Application
+ true
+ v141
+ Unicode
+
+
+ Application
+ false
+ v141
+ true
+ Unicode
+
+
+ Application
+ true
+ v141
+ Unicode
+
+
+ Application
+ false
+ v141
+ true
+ Unicode
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ $(ProjectDir)..\..\..\Import;$(ProjectDir)..\DocumentEditor\UI\Source;$(IncludePath)
+
+
+ true
+
+
+ false
+
+
+ false
+
+
+
+ Level3
+ Disabled
+ true
+ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);VCZH_DEBUG_NO_REFLECTION
+ true
+
+
+ true
+ Console
+
+
+
+
+ Level3
+ Disabled
+ true
+ _DEBUG;_CONSOLE;%(PreprocessorDefinitions);VCZH_DEBUG_NO_REFLECTION
+ true
+
+
+ true
+ Console
+
+
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+ true
+ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);VCZH_DEBUG_NO_REFLECTION
+ true
+
+
+ true
+ true
+ true
+ Console
+
+
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+ true
+ NDEBUG;_CONSOLE;%(PreprocessorDefinitions);VCZH_DEBUG_NO_REFLECTION
+ true
+
+
+ true
+ true
+ true
+ Console
+
+
+
+
+ {96c559ca-9718-4bec-a053-28a0ab6a8ca2}
+
+
+ {db0eeade-e377-4a35-a432-96982efc6af6}
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Tutorial/GacUI_Controls/DocumentEditorRibbon/DocumentEditorRibbon.vcxproj.filters b/Tutorial/GacUI_Controls/DocumentEditorRibbon/DocumentEditorRibbon.vcxproj.filters
new file mode 100644
index 00000000..948faede
--- /dev/null
+++ b/Tutorial/GacUI_Controls/DocumentEditorRibbon/DocumentEditorRibbon.vcxproj.filters
@@ -0,0 +1,22 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+ {93995380-89BD-4b04-88EB-625FBE52EBFB}
+ h;hh;hpp;hxx;hm;inl;inc;xsd
+
+
+ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
+ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms
+
+
+
+
+ Source Files
+
+
+
\ No newline at end of file
diff --git a/Tutorial/GacUI_Controls/DocumentEditor/Main.cpp b/Tutorial/GacUI_Controls/DocumentEditorRibbon/Main.cpp
similarity index 88%
rename from Tutorial/GacUI_Controls/DocumentEditor/Main.cpp
rename to Tutorial/GacUI_Controls/DocumentEditorRibbon/Main.cpp
index a75b8086..59775d6d 100644
--- a/Tutorial/GacUI_Controls/DocumentEditor/Main.cpp
+++ b/Tutorial/GacUI_Controls/DocumentEditorRibbon/Main.cpp
@@ -1,5 +1,5 @@
#define GAC_HEADER_USE_NAMESPACE
-#include "UI/Source/Demo.h"
+#include "Demo.h"
using namespace vl::collections;
using namespace vl::stream;
@@ -13,7 +13,7 @@ void GuiMain()
auto resource = GuiResource::LoadPrecompiledBinary(fileStream);
GetResourceManager()->SetResource(resource);
}
- demo::MainWindow window;
+ demo::DocumentEditorRibbonWindow window;
window.MoveToScreenCenter();
GetApplication()->Run(&window);
}
\ No newline at end of file
diff --git a/Tutorial/GacUI_Controls/DocumentEditorToolstrip/DocumentEditorToolstrip.vcxproj b/Tutorial/GacUI_Controls/DocumentEditorToolstrip/DocumentEditorToolstrip.vcxproj
new file mode 100644
index 00000000..aba24009
--- /dev/null
+++ b/Tutorial/GacUI_Controls/DocumentEditorToolstrip/DocumentEditorToolstrip.vcxproj
@@ -0,0 +1,160 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ x64
+
+
+
+ 15.0
+ {167634D8-D94B-4F76-9CEF-30B2D3D33308}
+ Win32Proj
+ DocumentEditorToolstrip
+ 10.0.16299.0
+
+
+
+ Application
+ true
+ v141
+ Unicode
+
+
+ Application
+ false
+ v141
+ true
+ Unicode
+
+
+ Application
+ true
+ v141
+ Unicode
+
+
+ Application
+ false
+ v141
+ true
+ Unicode
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ $(ProjectDir)..\..\..\Import;$(ProjectDir)..\DocumentEditor\UI\Source;$(IncludePath)
+
+
+ true
+
+
+ false
+
+
+ false
+
+
+
+ Level3
+ Disabled
+ true
+ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);VCZH_DEBUG_NO_REFLECTION
+ true
+
+
+ true
+ Console
+
+
+
+
+ Level3
+ Disabled
+ true
+ _DEBUG;_CONSOLE;%(PreprocessorDefinitions);VCZH_DEBUG_NO_REFLECTION
+ true
+
+
+ true
+ Console
+
+
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+ true
+ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);VCZH_DEBUG_NO_REFLECTION
+ true
+
+
+ true
+ true
+ true
+ Console
+
+
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+ true
+ NDEBUG;_CONSOLE;%(PreprocessorDefinitions);VCZH_DEBUG_NO_REFLECTION
+ true
+
+
+ true
+ true
+ true
+ Console
+
+
+
+
+ {96c559ca-9718-4bec-a053-28a0ab6a8ca2}
+
+
+ {db0eeade-e377-4a35-a432-96982efc6af6}
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Tutorial/GacUI_Controls/DocumentEditorToolstrip/DocumentEditorToolstrip.vcxproj.filters b/Tutorial/GacUI_Controls/DocumentEditorToolstrip/DocumentEditorToolstrip.vcxproj.filters
new file mode 100644
index 00000000..948faede
--- /dev/null
+++ b/Tutorial/GacUI_Controls/DocumentEditorToolstrip/DocumentEditorToolstrip.vcxproj.filters
@@ -0,0 +1,22 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+ {93995380-89BD-4b04-88EB-625FBE52EBFB}
+ h;hh;hpp;hxx;hm;inl;inc;xsd
+
+
+ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
+ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms
+
+
+
+
+ Source Files
+
+
+
\ No newline at end of file
diff --git a/Tutorial/GacUI_Controls/DocumentEditorToolstrip/Main.cpp b/Tutorial/GacUI_Controls/DocumentEditorToolstrip/Main.cpp
new file mode 100644
index 00000000..f3272cbb
--- /dev/null
+++ b/Tutorial/GacUI_Controls/DocumentEditorToolstrip/Main.cpp
@@ -0,0 +1,19 @@
+#define GAC_HEADER_USE_NAMESPACE
+#include "Demo.h"
+
+using namespace vl::collections;
+using namespace vl::stream;
+using namespace vl::reflection::description;
+using namespace demo;
+
+void GuiMain()
+{
+ {
+ FileStream fileStream(L"../UIRes/DocumentEditor.bin", FileStream::ReadOnly);
+ auto resource = GuiResource::LoadPrecompiledBinary(fileStream);
+ GetResourceManager()->SetResource(resource);
+ }
+ demo::DocumentEditorToolstripWindow window;
+ window.MoveToScreenCenter();
+ GetApplication()->Run(&window);
+}
\ No newline at end of file
diff --git a/Tutorial/GacUI_Controls/GacUI_Controls.sln b/Tutorial/GacUI_Controls/GacUI_Controls.sln
index ef78ad4d..13f20e2d 100644
--- a/Tutorial/GacUI_Controls/GacUI_Controls.sln
+++ b/Tutorial/GacUI_Controls/GacUI_Controls.sln
@@ -31,6 +31,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MenuVisibility", "MenuVisib
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Localization", "Localization\Localization.vcxproj", "{145FBB41-62AB-4E29-B5A5-0F48518AECC7}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocumentEditorToolstrip", "DocumentEditorToolstrip\DocumentEditorToolstrip.vcxproj", "{167634D8-D94B-4F76-9CEF-30B2D3D33308}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocumentEditorRibbon", "DocumentEditorRibbon\DocumentEditorRibbon.vcxproj", "{5B82834D-51AB-44D1-B5D4-F1209F7EC54F}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -133,6 +137,22 @@ Global
{145FBB41-62AB-4E29-B5A5-0F48518AECC7}.Release|Win32.Build.0 = Release|Win32
{145FBB41-62AB-4E29-B5A5-0F48518AECC7}.Release|x64.ActiveCfg = Release|x64
{145FBB41-62AB-4E29-B5A5-0F48518AECC7}.Release|x64.Build.0 = Release|x64
+ {167634D8-D94B-4F76-9CEF-30B2D3D33308}.Debug|Win32.ActiveCfg = Debug|Win32
+ {167634D8-D94B-4F76-9CEF-30B2D3D33308}.Debug|Win32.Build.0 = Debug|Win32
+ {167634D8-D94B-4F76-9CEF-30B2D3D33308}.Debug|x64.ActiveCfg = Debug|x64
+ {167634D8-D94B-4F76-9CEF-30B2D3D33308}.Debug|x64.Build.0 = Debug|x64
+ {167634D8-D94B-4F76-9CEF-30B2D3D33308}.Release|Win32.ActiveCfg = Release|Win32
+ {167634D8-D94B-4F76-9CEF-30B2D3D33308}.Release|Win32.Build.0 = Release|Win32
+ {167634D8-D94B-4F76-9CEF-30B2D3D33308}.Release|x64.ActiveCfg = Release|x64
+ {167634D8-D94B-4F76-9CEF-30B2D3D33308}.Release|x64.Build.0 = Release|x64
+ {5B82834D-51AB-44D1-B5D4-F1209F7EC54F}.Debug|Win32.ActiveCfg = Debug|Win32
+ {5B82834D-51AB-44D1-B5D4-F1209F7EC54F}.Debug|Win32.Build.0 = Debug|Win32
+ {5B82834D-51AB-44D1-B5D4-F1209F7EC54F}.Debug|x64.ActiveCfg = Debug|x64
+ {5B82834D-51AB-44D1-B5D4-F1209F7EC54F}.Debug|x64.Build.0 = Debug|x64
+ {5B82834D-51AB-44D1-B5D4-F1209F7EC54F}.Release|Win32.ActiveCfg = Release|Win32
+ {5B82834D-51AB-44D1-B5D4-F1209F7EC54F}.Release|Win32.Build.0 = Release|Win32
+ {5B82834D-51AB-44D1-B5D4-F1209F7EC54F}.Release|x64.ActiveCfg = Release|x64
+ {5B82834D-51AB-44D1-B5D4-F1209F7EC54F}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE