Browse Source

Hide JDKRoot on OS X, store ant path

Josh Engebretson 10 years ago
parent
commit
6b270ae26c

+ 30 - 6
Script/AtomicEditor/ui/modal/build/platforms/AndroidSettingsWidget.ts

@@ -15,6 +15,21 @@ class AndroidSettingsWidget extends Atomic.UIWidget {
         this.productNameEdit = <Atomic.UIEditField>this.getWidget("product_name");
         this.productNameEdit = <Atomic.UIEditField>this.getWidget("product_name");
         this.companyNameEdit = <Atomic.UIEditField>this.getWidget("company_name");
         this.companyNameEdit = <Atomic.UIEditField>this.getWidget("company_name");
 
 
+        this.jdkRootText = <Atomic.UITextField>this.getWidget("jdk_root_text");
+        this.jdkRootChooseButton = <Atomic.UIButton>this.getWidget("choose_jdk_root");
+        this.jdkRootEdit = <Atomic.UIEditField>this.getWidget("jdk_root");
+
+        this.antPathEdit = <Atomic.UIEditField>this.getWidget("ant_path");
+
+
+
+        if (Atomic.platform == "MacOSX") {
+
+            this.jdkRootText.visibility = Atomic.UI_WIDGET_VISIBILITY_GONE;
+            this.jdkRootChooseButton.visibility = Atomic.UI_WIDGET_VISIBILITY_GONE;
+            this.jdkRootEdit.visibility = Atomic.UI_WIDGET_VISIBILITY_GONE;
+        }
+
         this.refreshWidgets();
         this.refreshWidgets();
 
 
         this.subscribeToEvent(this, "WidgetEvent", (ev) => this.handleWidgetEvent(ev));
         this.subscribeToEvent(this, "WidgetEvent", (ev) => this.handleWidgetEvent(ev));
@@ -106,12 +121,15 @@ class AndroidSettingsWidget extends Atomic.UIWidget {
 
 
     storeValues() {
     storeValues() {
 
 
-      this.settings.appName = this.appNameEdit.text;
-      this.settings.packageName = this.packageNameEdit.text;
-      this.settings.productName = this.productNameEdit.text;
-      this.settings.companyName = this.companyNameEdit.text;
-      
-      this.settings.sDKVersion = this.sdkTargetSelect.text;
+        this.settings.appName = this.appNameEdit.text;
+        this.settings.packageName = this.packageNameEdit.text;
+        this.settings.productName = this.productNameEdit.text;
+        this.settings.companyName = this.companyNameEdit.text;
+
+        if (this.antPathEdit.text.length && this.antPathEdit.text != ToolCore.toolEnvironment.toolPrefs.antPath)
+            ToolCore.toolEnvironment.toolPrefs.antPath = this.antPathEdit.text;
+
+        this.settings.sDKVersion = this.sdkTargetSelect.text;
 
 
     }
     }
 
 
@@ -119,6 +137,12 @@ class AndroidSettingsWidget extends Atomic.UIWidget {
     sdkTargetSource: Atomic.UISelectItemSource = new Atomic.UISelectItemSource();
     sdkTargetSource: Atomic.UISelectItemSource = new Atomic.UISelectItemSource();
     sdkTargetSelect: Atomic.UISelectDropdown;
     sdkTargetSelect: Atomic.UISelectDropdown;
 
 
+    jdkRootText: Atomic.UITextField;
+    jdkRootChooseButton: Atomic.UIButton;
+    jdkRootEdit: Atomic.UIEditField;
+
+    antPathEdit: Atomic.UIEditField;
+
     appNameEdit: Atomic.UIEditField;
     appNameEdit: Atomic.UIEditField;
     packageNameEdit: Atomic.UIEditField;
     packageNameEdit: Atomic.UIEditField;
     productNameEdit: Atomic.UIEditField;
     productNameEdit: Atomic.UIEditField;