From 84ce8c004a140dd052fc14febd5d505d2ef7f526 Mon Sep 17 00:00:00 2001
From: vczh <vczh@163.com>
Date: Sat, 31 Oct 2015 22:22:50 -0700
Subject: [PATCH] Update Release

---
 .../GacUI_Layout/RichTextEmbedding/Main.cpp   |  11 ++++++++-
 .../RichTextEmbedding/UI/MainWindow.xml       |   6 ++++-
 .../RichTextEmbedding/UI/Resource.xml         |  15 ++++++++++++
 .../UI/Source/DemoPartialClasses.cpp          |  15 +++++++++---
 .../UI/Source/DemoPartialClasses.h            |  23 ++++++++++++++++--
 .../GacUI_Layout/UIRes/RichTextEmbedding.bin  | Bin 71155 -> 75176 bytes
 6 files changed, 63 insertions(+), 7 deletions(-)

diff --git a/Tutorial/GacUI_Layout/RichTextEmbedding/Main.cpp b/Tutorial/GacUI_Layout/RichTextEmbedding/Main.cpp
index 1d01f21c..e14100d6 100644
--- a/Tutorial/GacUI_Layout/RichTextEmbedding/Main.cpp
+++ b/Tutorial/GacUI_Layout/RichTextEmbedding/Main.cpp
@@ -9,6 +9,15 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi
 	return SetupWindowsDirect2DRenderer();
 }
 
+class ViewModel : public Object, public virtual demo::IViewModel
+{
+public:
+	void OpenUrl(WString url)override
+	{
+		ShellExecute(NULL, L"OPEN", url.Buffer(), NULL, NULL, SW_MAXIMIZE);
+	}
+};
+
 void GuiMain()
 {
 	{
@@ -17,7 +26,7 @@ void GuiMain()
 		auto resource = GuiResource::LoadPrecompiledBinary(fileStream, errors);
 		GetInstanceLoaderManager()->SetResource(L"Resource", resource);
 	}
-	demo::MainWindow window;
+	demo::MainWindow window(new ViewModel);
 	window.MoveToScreenCenter();
 	GetApplication()->Run(&window);
 }
\ No newline at end of file
diff --git a/Tutorial/GacUI_Layout/RichTextEmbedding/UI/MainWindow.xml b/Tutorial/GacUI_Layout/RichTextEmbedding/UI/MainWindow.xml
index 2910cf35..379d7b29 100644
--- a/Tutorial/GacUI_Layout/RichTextEmbedding/UI/MainWindow.xml
+++ b/Tutorial/GacUI_Layout/RichTextEmbedding/UI/MainWindow.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Instance ref.CodeBehind="false" ref.Class="demo::MainWindow">
+  <ref.Parameter Name="ViewModel" Class="demo::IViewModel"/>
   <Window Text="RichTextEmbedding" ClientSize="x:480 y:320">
     <att.BoundsComposition-set PreferredMinSize="x:480 y:640"/>
     <att.ContainerComposition-set MinSizeLimitation="LimitToElementAndChildren"/>
 
-    <DocumentViewer EditMode="Selectable" Document-uri="res://EmbeddedDocument/Document">
+    <DocumentViewer ref.Name="documentViewer" EditMode="ViewOnly" Document-uri="res://EmbeddedDocument/Document">
       <att.BoundsComposition-set AlignmentToParent="left:5 top:5 right:5 bottom:5"/>
+      <ev.ActiveHyperlinkExecuted-eval>
+        ViewModel.OpenUrl(documentViewer.ActiveHyperlinkReference);
+      </ev.ActiveHyperlinkExecuted-eval>
       <DocumentItem Name="Button">
         <Button Text="Button"/>
       </DocumentItem>
diff --git a/Tutorial/GacUI_Layout/RichTextEmbedding/UI/Resource.xml b/Tutorial/GacUI_Layout/RichTextEmbedding/UI/Resource.xml
index efe1417a..40ce9cd8 100644
--- a/Tutorial/GacUI_Layout/RichTextEmbedding/UI/Resource.xml
+++ b/Tutorial/GacUI_Layout/RichTextEmbedding/UI/Resource.xml
@@ -17,6 +17,21 @@
     <Doc content="File" name="Document">Document.xml</Doc>
   </Folder>
   <Folder name="MainWindow">
+    <Script name="ViewModelResource">
+      <Workflow-ViewModel>
+        <![CDATA[
+          module viewmodel;
+          
+          namespace demo
+          {
+            interface IViewModel
+            {
+              func OpenUrl(url : string) : void;
+            }
+          }
+        ]]>
+      </Workflow-ViewModel>
+    </Script>
     <Instance content="File" name="MainWindowResource">MainWindow.xml</Instance>
   </Folder>
 </Resource>
\ No newline at end of file
diff --git a/Tutorial/GacUI_Layout/RichTextEmbedding/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Layout/RichTextEmbedding/UI/Source/DemoPartialClasses.cpp
index aa0483a1..61230574 100644
--- a/Tutorial/GacUI_Layout/RichTextEmbedding/UI/Source/DemoPartialClasses.cpp
+++ b/Tutorial/GacUI_Layout/RichTextEmbedding/UI/Source/DemoPartialClasses.cpp
@@ -16,9 +16,9 @@ namespace demo
 
 	// #endregion CLASS_MEMBER_GUIEVENT_HANDLER
 
-	MainWindow::MainWindow()
+	MainWindow::MainWindow(Ptr<demo::IViewModel> ViewModel)
 	{
-		InitializeComponents();
+		InitializeComponents(ViewModel);
 	}
 
 	MainWindow::~MainWindow()
@@ -35,11 +35,19 @@ namespace vl
 		namespace description
 		{
 			#define _ ,
+			IMPL_CPP_TYPE_INFO(demo::IViewModel)
 			IMPL_CPP_TYPE_INFO(demo::MainWindow)
 
+			BEGIN_CLASS_MEMBER(demo::IViewModel)
+				CLASS_MEMBER_BASE(vl::reflection::IDescriptable)
+				CLASS_MEMBER_METHOD(OpenUrl, { L"url" });
+			END_CLASS_MEMBER(demo::IViewModel)
+
 			BEGIN_CLASS_MEMBER(demo::MainWindow)
 				CLASS_MEMBER_BASE(vl::presentation::controls::GuiWindow)
-				CLASS_MEMBER_CONSTRUCTOR(demo::MainWindow*(), NO_PARAMETER)
+				CLASS_MEMBER_CONSTRUCTOR(demo::MainWindow*(Ptr<demo::IViewModel>), { L"ViewModel" })
+
+				CLASS_MEMBER_PROPERTY_READONLY_FAST(ViewModel)
 			END_CLASS_MEMBER(demo::MainWindow)
 
 			#undef _
@@ -49,6 +57,7 @@ namespace vl
 			public:
 				void Load(ITypeManager* manager)
 				{
+					ADD_TYPE_INFO(demo::IViewModel)
 					ADD_TYPE_INFO(demo::MainWindow)
 				}
 
diff --git a/Tutorial/GacUI_Layout/RichTextEmbedding/UI/Source/DemoPartialClasses.h b/Tutorial/GacUI_Layout/RichTextEmbedding/UI/Source/DemoPartialClasses.h
index 8088a85f..3624621e 100644
--- a/Tutorial/GacUI_Layout/RichTextEmbedding/UI/Source/DemoPartialClasses.h
+++ b/Tutorial/GacUI_Layout/RichTextEmbedding/UI/Source/DemoPartialClasses.h
@@ -15,30 +15,48 @@ DO NOT MODIFY
 
 namespace demo
 {
+	class IViewModel;
 	class MainWindow;
 
+	class IViewModel : public virtual vl::reflection::IDescriptable, public vl::reflection::Description<IViewModel>
+	{
+	public:
+		virtual void OpenUrl(vl::WString url) = 0;
+	};
+
 	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:
+		Ptr<demo::IViewModel> ViewModel_;
 	protected:
+		vl::presentation::controls::GuiDocumentViewer* documentViewer;
 
-		void InitializeComponents()
+		void InitializeComponents(Ptr<demo::IViewModel> ViewModel)
 		{
+			ViewModel_ = ViewModel;
 			if (InitializeFromResource())
 			{
+				GUI_INSTANCE_REFERENCE(documentViewer);
 			}
 			else
 			{
+				ViewModel_ = 0;
 			}
 		}
 	public:
 		MainWindow_()
 			:vl::presentation::GuiInstancePartialClass<vl::presentation::controls::GuiWindow>(L"demo::MainWindow")
 			,vl::presentation::controls::GuiWindow(vl::presentation::theme::GetCurrentTheme()->CreateWindowStyle())
+			,documentViewer(0)
 		{
 		}
+
+		Ptr<demo::IViewModel> GetViewModel()
+		{
+			return ViewModel_;
+		}
 	};
 
 }
@@ -48,6 +66,7 @@ namespace vl
 	{
 		namespace description
 		{
+			DECL_TYPE_INFO(demo::IViewModel)
 			DECL_TYPE_INFO(demo::MainWindow)
 
 		}
@@ -64,7 +83,7 @@ namespace demo
 		// #region CLASS_MEMBER_GUIEVENT_HANDLER (DO NOT PUT OTHER CONTENT IN THIS #region.)
 		// #endregion CLASS_MEMBER_GUIEVENT_HANDLER
 	public:
-		MainWindow();
+		MainWindow(Ptr<demo::IViewModel> ViewModel);
 		~MainWindow();
 	};
 }
diff --git a/Tutorial/GacUI_Layout/UIRes/RichTextEmbedding.bin b/Tutorial/GacUI_Layout/UIRes/RichTextEmbedding.bin
index 5a092047fb272a10655611831004468b48833407..a911153e0dbc01030258d0cda755c595c0e3c9ce 100644
GIT binary patch
delta 4586
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

delta 1424
zcma)6OKTHR6uw_(GOsk#B-7N`q{Tjx&_x6-T}TBjMG^4<ZCw=XqE^8|(NG`Qg+IYX
z33?V<*Mev%S-23zoeSOg0|dc;V7In-&g4!_+A(<H&V8Kke&@SqzL{5F%$?UJ%neL!
zUwZz#SXHfN@NiGvQume29;h|7(m1=j-1xqGp?Pj^HSzQ(W|IQ-=yU=l^w5F~y|m?`
z<YgoR?k>GZpb9G-T%nStQCXRr(rG${fHDS>bkab<>z7FD{JepQ_VtE=VYt*ZZ~{kY
z+U0YbX=I49{CMNT=Z%*>2J?NILTD0to~H#9r&vzI#Do@GEpRYQCZjY#M^cZ<hAa&7
zlBjw`Sqs1=Rua&aBrFWjw$1a~N#xoABF??4>RiS<N@JRFm^rni9x_T}_6}eMER07v
zj=S*o>sX?14p*y96Q|7EkJJjkH%<25LXPVdYB|q=)xUXmIplR-u-Na&UFDM8I*9{X
zwBbZT*6o<f&NBH;b+?tfjKlh*X7&vGX<uK(iQ$=Hj=EaccPP!Y<nS{_*%JqYk*JSM
z7L#?yVGrthZ~=8aiqTeGwyc(yp1CM!V_=ZJikXi|c5%@#{c_oLBQ1}QM%&s6iynK=
zA-@Mj+DsuwQ$0+37|iA@ci=w9<MyrH1|I9mccyE!M*o+nMq8{thN@lA+ce^`9f15Z
zrLF<9gxNg)?vX)&G0OB}wqv*myGv|{tSl~5&Ou*lQeH^dELzK=TubYvygTV0_c?Z`
zd;-htz$JAfocp|=pifK``_mYrksPkM3<{e|l>n1S(e(i1u?O-J8l?{b{Ct_uMERq?
QQ03i^0FO=iK^<y;0D2wEZ~y=R