From b6038d4d635fa6056d2eab0d4e9f8922e14553b1 Mon Sep 17 00:00:00 2001
From: klugier <klugier@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Thu, 23 Jul 2015 20:37:25 +0000
Subject: [PATCH] ide: reorganize Android builder build method

git-svn-id: svn://ultimatepp.org/upp/trunk@8740 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/ide/Methods.cpp | 45 ++++++++++++++++++++----------------------
 uppsrc/ide/Methods.h   |  6 ++----
 2 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/uppsrc/ide/Methods.cpp b/uppsrc/ide/Methods.cpp
index 31909533b..6bac8c463 100644
--- a/uppsrc/ide/Methods.cpp
+++ b/uppsrc/ide/Methods.cpp
@@ -94,8 +94,6 @@ AndroidBuilderSetup::AndroidBuilderSetup()
 	
 	ndk_path <<= THISBACK(OnNdkPathChange);
 	
-	GroupNdkCtrls();
-	
 	ndkDownload.SetImage(IdeImg::DownloadBlack());
 	ndkDownload.Tip("Download");
 	ndkDownload <<= callback1(LaunchWebBrowser, AndroidNDK::GetDownloadUrl());
@@ -203,13 +201,10 @@ void AndroidBuilderSetup::OnNdkShow()
 		LoadToolchains(ndk);
 		LoadCppRuntimes(ndk);
 		
-		EnableCtrls(ndkCtrls);
-	}
-	else {
-		// TODO: waiting for DisableCtrls method in CtrlCore :)
-		for(int i = 0; i < ndkCtrls.GetCount(); i++)
-			ndkCtrls[i]->Disable();
+		EnableNdkCtrls();
 	}
+	else
+		DisableNdkCtrls();
 }
 
 void AndroidBuilderSetup::OnNdkPathInsert()
@@ -293,23 +288,25 @@ void AndroidBuilderSetup::LoadDropList(DropList& dropList,
 	}
 }
 
-void AndroidBuilderSetup::GroupNdkCtrls()
+void AndroidBuilderSetup::EnableNdkCtrls(bool enable)
 {
-	if(!ndkCtrls.IsEmpty())
-		ndkCtrls.Clear();
-	
-	ndkCtrls.Add(&ndk_blitz);
-	ndkCtrls.Add(&ndk_arch_armeabi);
-	ndkCtrls.Add(&ndk_arch_armeabi_v7a);
-	ndkCtrls.Add(&ndk_arch_arm64_v8a);
-	ndkCtrls.Add(&ndk_arch_x86);
-	ndkCtrls.Add(&ndk_arch_x86_64);
-	ndkCtrls.Add(&ndk_arch_mips);
-	ndkCtrls.Add(&ndk_arch_mips64);
-	ndkCtrls.Add(&ndk_toolchain);
-	ndkCtrls.Add(&ndk_cpp_runtime);
-	ndkCtrls.Add(&ndk_common_cpp_options);
-	ndkCtrls.Add(&ndk_common_c_options);
+	ndk_blitz.Enable(enable);
+	ndk_arch_armeabi.Enable(enable);
+	ndk_arch_armeabi_v7a.Enable(enable);
+	ndk_arch_arm64_v8a.Enable(enable);
+	ndk_arch_x86.Enable(enable);
+	ndk_arch_x86_64.Enable(enable);
+	ndk_arch_mips.Enable(enable);
+	ndk_arch_mips64.Enable(enable);
+	ndk_toolchain.Enable(enable);
+	ndk_cpp_runtime.Enable(enable);
+	ndk_common_cpp_options.Enable(enable);
+	ndk_common_c_options.Enable(enable);
+}
+
+void AndroidBuilderSetup::DisableNdkCtrls()
+{
+	EnableNdkCtrls(false);
 }
 
 void AndroidBuilderSetup::ClearNdkCtrls()
diff --git a/uppsrc/ide/Methods.h b/uppsrc/ide/Methods.h
index b083d8b60..cc2a28359 100644
--- a/uppsrc/ide/Methods.h
+++ b/uppsrc/ide/Methods.h
@@ -93,11 +93,9 @@ private:
 	void LoadDropList(DropList& dropList, const Vector<String>& values, const String& defaultKey = "");
 	
 private:
-	void GroupNdkCtrls();
+	void EnableNdkCtrls(bool enable = true);
+	void DisableNdkCtrls();
 	void ClearNdkCtrls();
-	
-private:
-	Vector<Ptr<Ctrl> > ndkCtrls;
 };
 
 class BuilderSetup {