From 0c3210fe7552487284c54e0c42e40aa092314a2f Mon Sep 17 00:00:00 2001
From: klugier <klugier@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sat, 6 May 2017 22:38:19 +0000
Subject: [PATCH] .ide Cosmetics related to MacroManager.

git-svn-id: svn://ultimatepp.org/upp/trunk@11056 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/ide/MacroManager.cpp | 7 ++++++-
 uppsrc/ide/ide.h            | 4 ++--
 uppsrc/ide/idebar.cpp       | 3 ++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/uppsrc/ide/MacroManager.cpp b/uppsrc/ide/MacroManager.cpp
index 1f4225b9f..448b341cc 100644
--- a/uppsrc/ide/MacroManager.cpp
+++ b/uppsrc/ide/MacroManager.cpp
@@ -46,7 +46,7 @@ Image MacroElement::GetImage(Type type)
 
 #define METHOD_NAME "MacroManagerWindow " << UPP_FUNCTION_NAME << "(): "
 
-class MacroManagerWindow : public WithMacroManagerLayout<TopWindow> {
+class MacroManagerWindow final : public WithMacroManagerLayout<TopWindow> {
 	using MacroStore = ArrayMap<String, Array<MacroElement>>;
 
 public:
@@ -84,6 +84,11 @@ private:
 	
 	MacroStore macrosStore;
 	TreeCtrl   macrosTree;
+	// TODO:
+	// - Macro should be organized in two tree roots - global and packages macros.
+	// - The path of macro should not be shown in tree - it can be show in corresponding label.
+	//   Only file title and package name (if macro belongs to package) should be show.
+	
 	CodeEditor editor;
 };
 
diff --git a/uppsrc/ide/ide.h b/uppsrc/ide/ide.h
index b32ea113f..e0dfd394e 100644
--- a/uppsrc/ide/ide.h
+++ b/uppsrc/ide/ide.h
@@ -729,9 +729,7 @@ public:
 	TimeCallback text_updated;
 	void      TriggerAssistSync();
 
-	void      DoEditKeys();
 	void      AKEditor();
-	void      DoMacroManager();
 	
 	void      PackageMenu(Bar& menu);
 
@@ -898,12 +896,14 @@ public:
 
 	void      Setup(Bar& menu);
 		void  SetupFormat();
+		void  DoEditKeys();
 		void  ToggleVerboseBuild();
 		void  AutoSetup();
 		void  CheckUpdates(bool verbose);
 		void  CheckUpdatesManual();
 		void  SetUpdateTimer(int period);
 		void  Abbreviations();
+		void  DoMacroManager();
 	
 	void      SetupMobilePlatforms(Bar& bar);
 		void  SetupAndroidMobilePlatform(Bar& bar, const AndroidSDK& androidSDK);
diff --git a/uppsrc/ide/idebar.cpp b/uppsrc/ide/idebar.cpp
index 898a61c66..c22f7c653 100644
--- a/uppsrc/ide/idebar.cpp
+++ b/uppsrc/ide/idebar.cpp
@@ -356,7 +356,8 @@ void Ide::Setup(Bar& menu)
 		.Help("Edit key bindings");
 	menu.Add("Build methods..", THISBACK(SetupBuildMethods))
 	    .Help("Setup build methods");
-	menu.Add("Macro Manager..", THISBACK(DoMacroManager));
+	menu.Add("Macro Manager..", THISBACK(DoMacroManager))
+		.Help("Manage macros collection..");
 #ifdef PLATFORM_WIN32
 	menu.Add("Automatic build methods setup..", callback(InstantSetup))
 	    .Help("Setups/fixes build methods and basic assemblies..");