diff --git a/Tutorial/GacUI_Controls/AddressBook/AddressBook.vcxproj b/Tutorial/GacUI_Controls/AddressBook/AddressBook.vcxproj index 5342a3bd..74952ee3 100644 --- a/Tutorial/GacUI_Controls/AddressBook/AddressBook.vcxproj +++ b/Tutorial/GacUI_Controls/AddressBook/AddressBook.vcxproj @@ -87,6 +87,7 @@ + @@ -94,6 +95,7 @@ + diff --git a/Tutorial/GacUI_Controls/AddressBook/AddressBook.vcxproj.filters b/Tutorial/GacUI_Controls/AddressBook/AddressBook.vcxproj.filters index 77e14c98..ae22dee6 100644 --- a/Tutorial/GacUI_Controls/AddressBook/AddressBook.vcxproj.filters +++ b/Tutorial/GacUI_Controls/AddressBook/AddressBook.vcxproj.filters @@ -24,6 +24,9 @@ UI + + UI + @@ -37,5 +40,8 @@ UI + + UI + \ No newline at end of file diff --git a/Tutorial/GacUI_Controls/AddressBook/UI/Contact.png b/Tutorial/GacUI_Controls/AddressBook/UI/Contact.png new file mode 100644 index 00000000..f8a2fd8e Binary files /dev/null and b/Tutorial/GacUI_Controls/AddressBook/UI/Contact.png differ diff --git a/Tutorial/GacUI_Controls/AddressBook/UI/Delete.png b/Tutorial/GacUI_Controls/AddressBook/UI/Delete.png new file mode 100644 index 00000000..657a5263 Binary files /dev/null and b/Tutorial/GacUI_Controls/AddressBook/UI/Delete.png differ diff --git a/Tutorial/GacUI_Controls/AddressBook/UI/Folder.png b/Tutorial/GacUI_Controls/AddressBook/UI/Folder.png new file mode 100644 index 00000000..89788173 Binary files /dev/null and b/Tutorial/GacUI_Controls/AddressBook/UI/Folder.png differ diff --git a/Tutorial/GacUI_Controls/AddressBook/UI/ListView_Big.png b/Tutorial/GacUI_Controls/AddressBook/UI/ListView_Big.png new file mode 100644 index 00000000..d104485a Binary files /dev/null and b/Tutorial/GacUI_Controls/AddressBook/UI/ListView_Big.png differ diff --git a/Tutorial/GacUI_Controls/AddressBook/UI/ListView_Detail.png b/Tutorial/GacUI_Controls/AddressBook/UI/ListView_Detail.png new file mode 100644 index 00000000..ada498f8 Binary files /dev/null and b/Tutorial/GacUI_Controls/AddressBook/UI/ListView_Detail.png differ diff --git a/Tutorial/GacUI_Controls/AddressBook/UI/ListView_Info.png b/Tutorial/GacUI_Controls/AddressBook/UI/ListView_Info.png new file mode 100644 index 00000000..8a3b1d4d Binary files /dev/null and b/Tutorial/GacUI_Controls/AddressBook/UI/ListView_Info.png differ diff --git a/Tutorial/GacUI_Controls/AddressBook/UI/ListView_List.png b/Tutorial/GacUI_Controls/AddressBook/UI/ListView_List.png new file mode 100644 index 00000000..e7ee74af Binary files /dev/null and b/Tutorial/GacUI_Controls/AddressBook/UI/ListView_List.png differ diff --git a/Tutorial/GacUI_Controls/AddressBook/UI/ListView_Small.png b/Tutorial/GacUI_Controls/AddressBook/UI/ListView_Small.png new file mode 100644 index 00000000..99d3020c Binary files /dev/null and b/Tutorial/GacUI_Controls/AddressBook/UI/ListView_Small.png differ diff --git a/Tutorial/GacUI_Controls/AddressBook/UI/ListView_Tile.png b/Tutorial/GacUI_Controls/AddressBook/UI/ListView_Tile.png new file mode 100644 index 00000000..514634ee Binary files /dev/null and b/Tutorial/GacUI_Controls/AddressBook/UI/ListView_Tile.png differ diff --git a/Tutorial/GacUI_Controls/AddressBook/UI/NewContact.png b/Tutorial/GacUI_Controls/AddressBook/UI/NewContact.png new file mode 100644 index 00000000..3fb0619e Binary files /dev/null and b/Tutorial/GacUI_Controls/AddressBook/UI/NewContact.png differ diff --git a/Tutorial/GacUI_Controls/AddressBook/UI/NewFolder.png b/Tutorial/GacUI_Controls/AddressBook/UI/NewFolder.png new file mode 100644 index 00000000..0b8c930c Binary files /dev/null and b/Tutorial/GacUI_Controls/AddressBook/UI/NewFolder.png differ diff --git a/Tutorial/GacUI_Controls/AddressBook/UI/Resource.xml b/Tutorial/GacUI_Controls/AddressBook/UI/Resource.xml index df5b6f3b..de51c513 100644 --- a/Tutorial/GacUI_Controls/AddressBook/UI/Resource.xml +++ b/Tutorial/GacUI_Controls/AddressBook/UI/Resource.xml @@ -12,12 +12,141 @@ AddressBook.bin + + + NewContact.png + NewFolder.png + Delete.png + + Folder.png + Contact.png + + ListView_Big.png + ListView_Small.png + ListView_List.png + ListView_Detail.png + ListView_Tile.png + ListView_Info.png + - + + + + commandNewFolder_Executed + + + commandDeleteFolder_Executed + + + commandNewContact_Executed + + + commandDeleteContact_Executed + + + + commandBigIcon_Executed + + + commandSmallIcon_Executed + + + commandList_Executed + + + commandDetail_Executed + + + commandTile_Executed + + + commandInformation_Executed + + + + + composeType:Percentage percentage:1.0 + + + composeType:Absolute absolute:160 + composeType:Percentage percentage:1.0 + + + + + + + + + +
+ + composeType:MinSize + composeType:Percentage percentage:1.0 + + + composeType:Percentage percentage:1.0 + + + + + + + + + + + + + + + +
+ + + + + + + + + + + composeType:MinSize + composeType:Percentage percentage:1.0 + + + composeType:Percentage percentage:1.0 + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
diff --git a/Tutorial/GacUI_Controls/AddressBook/UI/Source/Demo.h b/Tutorial/GacUI_Controls/AddressBook/UI/Source/Demo.h index febeba0f..0f5f6c6b 100644 --- a/Tutorial/GacUI_Controls/AddressBook/UI/Source/Demo.h +++ b/Tutorial/GacUI_Controls/AddressBook/UI/Source/Demo.h @@ -12,5 +12,6 @@ DO NOT MODIFY #define VCZH_GACUI_RESOURCE_CODE_GENERATOR_Demo #include "DemoPartialClasses.h" +#include "MainWindow.h" #endif diff --git a/Tutorial/GacUI_Controls/AddressBook/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Controls/AddressBook/UI/Source/DemoPartialClasses.cpp index 4be7d2d3..eb6758fa 100644 --- a/Tutorial/GacUI_Controls/AddressBook/UI/Source/DemoPartialClasses.cpp +++ b/Tutorial/GacUI_Controls/AddressBook/UI/Source/DemoPartialClasses.cpp @@ -10,34 +10,6 @@ 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 @@ -50,6 +22,17 @@ namespace vl BEGIN_CLASS_MEMBER(demo::MainWindow) CLASS_MEMBER_BASE(vl::presentation::controls::GuiWindow) CLASS_MEMBER_CONSTRUCTOR(demo::MainWindow*(), NO_PARAMETER) + + CLASS_MEMBER_GUIEVENT_HANDLER(commandBigIcon_Executed, vl::presentation::compositions::GuiEventArgs) + CLASS_MEMBER_GUIEVENT_HANDLER(commandDeleteContact_Executed, vl::presentation::compositions::GuiEventArgs) + CLASS_MEMBER_GUIEVENT_HANDLER(commandDeleteFolder_Executed, vl::presentation::compositions::GuiEventArgs) + CLASS_MEMBER_GUIEVENT_HANDLER(commandDetail_Executed, vl::presentation::compositions::GuiEventArgs) + CLASS_MEMBER_GUIEVENT_HANDLER(commandInformation_Executed, vl::presentation::compositions::GuiEventArgs) + CLASS_MEMBER_GUIEVENT_HANDLER(commandList_Executed, vl::presentation::compositions::GuiEventArgs) + CLASS_MEMBER_GUIEVENT_HANDLER(commandNewContact_Executed, vl::presentation::compositions::GuiEventArgs) + CLASS_MEMBER_GUIEVENT_HANDLER(commandNewFolder_Executed, vl::presentation::compositions::GuiEventArgs) + CLASS_MEMBER_GUIEVENT_HANDLER(commandSmallIcon_Executed, vl::presentation::compositions::GuiEventArgs) + CLASS_MEMBER_GUIEVENT_HANDLER(commandTile_Executed, vl::presentation::compositions::GuiEventArgs) END_CLASS_MEMBER(demo::MainWindow) #undef _ diff --git a/Tutorial/GacUI_Controls/AddressBook/UI/Source/DemoPartialClasses.h b/Tutorial/GacUI_Controls/AddressBook/UI/Source/DemoPartialClasses.h index 8383bfe1..4ebe0d8f 100644 --- a/Tutorial/GacUI_Controls/AddressBook/UI/Source/DemoPartialClasses.h +++ b/Tutorial/GacUI_Controls/AddressBook/UI/Source/DemoPartialClasses.h @@ -23,11 +23,35 @@ namespace demo friend struct vl::reflection::description::CustomTypeDescriptorSelector; private: protected: + vl::presentation::controls::GuiToolstripCommand* commandBigIcon; + vl::presentation::controls::GuiToolstripCommand* commandDeleteContact; + vl::presentation::controls::GuiToolstripCommand* commandDeleteFolder; + vl::presentation::controls::GuiToolstripCommand* commandDetail; + vl::presentation::controls::GuiToolstripCommand* commandInformation; + vl::presentation::controls::GuiToolstripCommand* commandList; + vl::presentation::controls::GuiToolstripCommand* commandNewContact; + vl::presentation::controls::GuiToolstripCommand* commandNewFolder; + vl::presentation::controls::GuiToolstripCommand* commandSmallIcon; + vl::presentation::controls::GuiToolstripCommand* commandTile; + vl::presentation::controls::GuiListView* listViewContacts; + vl::presentation::controls::GuiTreeView* treeViewFolders; void InitializeComponents() { if (InitializeFromResource()) { + GUI_INSTANCE_REFERENCE(commandBigIcon); + GUI_INSTANCE_REFERENCE(commandDeleteContact); + GUI_INSTANCE_REFERENCE(commandDeleteFolder); + GUI_INSTANCE_REFERENCE(commandDetail); + GUI_INSTANCE_REFERENCE(commandInformation); + GUI_INSTANCE_REFERENCE(commandList); + GUI_INSTANCE_REFERENCE(commandNewContact); + GUI_INSTANCE_REFERENCE(commandNewFolder); + GUI_INSTANCE_REFERENCE(commandSmallIcon); + GUI_INSTANCE_REFERENCE(commandTile); + GUI_INSTANCE_REFERENCE(listViewContacts); + GUI_INSTANCE_REFERENCE(treeViewFolders); } else { @@ -37,6 +61,18 @@ namespace demo MainWindow_() :vl::presentation::GuiInstancePartialClass(L"demo::MainWindow") ,vl::presentation::controls::GuiWindow(vl::presentation::theme::GetCurrentTheme()->CreateWindowStyle()) + ,commandBigIcon(0) + ,commandDeleteContact(0) + ,commandDeleteFolder(0) + ,commandDetail(0) + ,commandInformation(0) + ,commandList(0) + ,commandNewContact(0) + ,commandNewFolder(0) + ,commandSmallIcon(0) + ,commandTile(0) + ,listViewContacts(0) + ,treeViewFolders(0) { } }; @@ -53,24 +89,5 @@ namespace vl } } } -namespace demo -{ - class MainWindow : public demo::MainWindow_ - { - friend class demo::MainWindow_; - friend struct vl::reflection::description::CustomTypeDescriptorSelector; - 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 diff --git a/Tutorial/GacUI_Controls/AddressBook/UI/Source/MainWindow.cpp b/Tutorial/GacUI_Controls/AddressBook/UI/Source/MainWindow.cpp new file mode 100644 index 00000000..7699bbb0 --- /dev/null +++ b/Tutorial/GacUI_Controls/AddressBook/UI/Source/MainWindow.cpp @@ -0,0 +1,76 @@ +/*********************************************************************** +Vczh Library++ 3.0 +Developer: Zihan Chen(vczh) +GacUI::MainWindow + +This file is generated by: Vczh GacUI Resource Code Generator +***********************************************************************/ + +#include "Demo.h" + +namespace demo +{ + // #region CLASS_MEMBER_GUIEVENT_HANDLER (DO NOT PUT OTHER CONTENT IN THIS #region.) + + void MainWindow::commandBigIcon_Executed(GuiGraphicsComposition* sender, vl::presentation::compositions::GuiEventArgs& arguments) + { + } + + void MainWindow::commandDeleteContact_Executed(GuiGraphicsComposition* sender, vl::presentation::compositions::GuiEventArgs& arguments) + { + } + + void MainWindow::commandDeleteFolder_Executed(GuiGraphicsComposition* sender, vl::presentation::compositions::GuiEventArgs& arguments) + { + } + + void MainWindow::commandDetail_Executed(GuiGraphicsComposition* sender, vl::presentation::compositions::GuiEventArgs& arguments) + { + } + + void MainWindow::commandInformation_Executed(GuiGraphicsComposition* sender, vl::presentation::compositions::GuiEventArgs& arguments) + { + } + + void MainWindow::commandList_Executed(GuiGraphicsComposition* sender, vl::presentation::compositions::GuiEventArgs& arguments) + { + } + + void MainWindow::commandNewContact_Executed(GuiGraphicsComposition* sender, vl::presentation::compositions::GuiEventArgs& arguments) + { + } + + void MainWindow::commandNewFolder_Executed(GuiGraphicsComposition* sender, vl::presentation::compositions::GuiEventArgs& arguments) + { + } + + void MainWindow::commandSmallIcon_Executed(GuiGraphicsComposition* sender, vl::presentation::compositions::GuiEventArgs& arguments) + { + } + + void MainWindow::commandTile_Executed(GuiGraphicsComposition* sender, vl::presentation::compositions::GuiEventArgs& arguments) + { + } + + void MainWindow::OnCreate() + { + } + + void MainWindow::OnDestroy() + { + } + + // #endregion CLASS_MEMBER_GUIEVENT_HANDLER + + MainWindow::MainWindow() + { + InitializeComponents(); + OnCreate(); + } + + MainWindow::~MainWindow() + { + OnDestroy(); + ClearSubscriptions(); + } +} diff --git a/Tutorial/GacUI_Controls/AddressBook/UI/Source/MainWindow.h b/Tutorial/GacUI_Controls/AddressBook/UI/Source/MainWindow.h new file mode 100644 index 00000000..cfb70b3e --- /dev/null +++ b/Tutorial/GacUI_Controls/AddressBook/UI/Source/MainWindow.h @@ -0,0 +1,42 @@ +/*********************************************************************** +Vczh Library++ 3.0 +Developer: Zihan Chen(vczh) +GacUI::MainWindow + +This file is generated by: Vczh GacUI Resource Code Generator +***********************************************************************/ + +#ifndef VCZH_GACUI_RESOURCE_CODE_GENERATOR_Demo_MainWindow +#define VCZH_GACUI_RESOURCE_CODE_GENERATOR_Demo_MainWindow + +#include "DemoPartialClasses.h" + +namespace demo +{ + class MainWindow : public demo::MainWindow_ + { + friend class demo::MainWindow_; + friend struct vl::reflection::description::CustomTypeDescriptorSelector; + protected: + + // #region CLASS_MEMBER_GUIEVENT_HANDLER (DO NOT PUT OTHER CONTENT IN THIS #region.) + void commandBigIcon_Executed(GuiGraphicsComposition* sender, vl::presentation::compositions::GuiEventArgs& arguments); + void commandDeleteContact_Executed(GuiGraphicsComposition* sender, vl::presentation::compositions::GuiEventArgs& arguments); + void commandDeleteFolder_Executed(GuiGraphicsComposition* sender, vl::presentation::compositions::GuiEventArgs& arguments); + void commandDetail_Executed(GuiGraphicsComposition* sender, vl::presentation::compositions::GuiEventArgs& arguments); + void commandInformation_Executed(GuiGraphicsComposition* sender, vl::presentation::compositions::GuiEventArgs& arguments); + void commandList_Executed(GuiGraphicsComposition* sender, vl::presentation::compositions::GuiEventArgs& arguments); + void commandNewContact_Executed(GuiGraphicsComposition* sender, vl::presentation::compositions::GuiEventArgs& arguments); + void commandNewFolder_Executed(GuiGraphicsComposition* sender, vl::presentation::compositions::GuiEventArgs& arguments); + void commandSmallIcon_Executed(GuiGraphicsComposition* sender, vl::presentation::compositions::GuiEventArgs& arguments); + void commandTile_Executed(GuiGraphicsComposition* sender, vl::presentation::compositions::GuiEventArgs& arguments); + void OnCreate(); + void OnDestroy(); + // #endregion CLASS_MEMBER_GUIEVENT_HANDLER + public: + MainWindow(); + ~MainWindow(); + }; +} + +#endif diff --git a/Tutorial/GacUI_Controls/UIRes/AddressBook.bin b/Tutorial/GacUI_Controls/UIRes/AddressBook.bin index 535b0520..1cb37414 100644 Binary files a/Tutorial/GacUI_Controls/UIRes/AddressBook.bin and b/Tutorial/GacUI_Controls/UIRes/AddressBook.bin differ