From f2ab78b12e5ad413f10fbfdf7c7546cdc70362e4 Mon Sep 17 00:00:00 2001
From: klugier <klugier@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sun, 28 Feb 2016 12:46:26 +0000
Subject: [PATCH] IDE now can launch Android Device Monitor

git-svn-id: svn://ultimatepp.org/upp/trunk@9536 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/ide/Android/Android.h | 1 +
 uppsrc/ide/ide.h             | 1 +
 uppsrc/ide/idebar.cpp        | 1 +
 uppsrc/ide/idetool.cpp       | 6 ++++++
 4 files changed, 9 insertions(+)

diff --git a/uppsrc/ide/Android/Android.h b/uppsrc/ide/Android/Android.h
index 22cf1304f..663e567f7 100644
--- a/uppsrc/ide/Android/Android.h
+++ b/uppsrc/ide/Android/Android.h
@@ -71,6 +71,7 @@ public:
 	String AdbPath() const        { return PlatformToolsDir() + DIR_SEPS + "adb" + GetExeExt(); }
 	String AndroidPath() const    { return ToolsDir() + DIR_SEPS + "android" + Android::GetScriptExt(); }
 	String EmulatorPath() const   { return ToolsDir() + DIR_SEPS + "emulator" + GetExeExt(); }
+	String MonitorPath() const    { return ToolsDir() + DIR_SEPS + "monitor" + Android::GetScriptExt(); }
 	
 public:
 	String GetLauchSDKManagerCmd() const { return NormalizeExePath(AndroidPath()) + " sdk"; }
diff --git a/uppsrc/ide/ide.h b/uppsrc/ide/ide.h
index 80e74a5e6..0bb820a95 100644
--- a/uppsrc/ide/ide.h
+++ b/uppsrc/ide/ide.h
@@ -896,6 +896,7 @@ public:
 		void  SetupAndroidMobilePlatform(Bar& bar, const AndroidSDK& androidSDK);
 		void  LaunchAndroidSDKManager(const AndroidSDK& androidSDK);
 		void  LaunchAndroidAVDManager(const AndroidSDK& androidSDK);
+		void  LauchAndroidDeviceMonitor(const AndroidSDK& androidSDK);
 	
 	void      BrowseMenu(Bar& menu);
 		void  CheckCodeBase();
diff --git a/uppsrc/ide/idebar.cpp b/uppsrc/ide/idebar.cpp
index 25741e239..5be5e0b85 100644
--- a/uppsrc/ide/idebar.cpp
+++ b/uppsrc/ide/idebar.cpp
@@ -381,6 +381,7 @@ void Ide::SetupAndroidMobilePlatform(Bar& menu, const AndroidSDK& androidSDK)
 {
 	menu.Add("SDK Manager", THISBACK1(LaunchAndroidSDKManager, androidSDK));
 	menu.Add("AVD Manager", THISBACK1(LaunchAndroidAVDManager, androidSDK));
+	menu.Add("Device monitor", THISBACK1(LauchAndroidDeviceMonitor, androidSDK));
 }
 
 void Ide::ProjectSvn(Bar& menu)
diff --git a/uppsrc/ide/idetool.cpp b/uppsrc/ide/idetool.cpp
index f323ecb9e..fc9429f6d 100644
--- a/uppsrc/ide/idetool.cpp
+++ b/uppsrc/ide/idetool.cpp
@@ -514,3 +514,9 @@ void Ide::LaunchAndroidAVDManager(const AndroidSDK& androidSDK)
 	One<Host> host = CreateHost(false);
 	IGNORE_RESULT(host->Execute(androidSDK.GetLauchAVDManagerCmd()));
 }
+
+void Ide::LauchAndroidDeviceMonitor(const AndroidSDK& androidSDK)
+{
+	One<Host> host = CreateHost(false);
+	IGNORE_RESULT(host->Execute(androidSDK.MonitorPath()));
+}