From baabaf096567c38c4a0d04b3cf5c71eafdd736fd Mon Sep 17 00:00:00 2001
From: Richard Fairhurst <richard@systemeD.net>
Date: Fri, 26 Aug 2011 17:44:10 +0100
Subject: [PATCH] Fix compiler warnings

---
 net/systemeD/potlatch2/BackgroundSelector.mxml  | 6 ++++--
 net/systemeD/potlatch2/RelationSelectPanel.mxml | 8 ++++++--
 net/systemeD/potlatch2/help/HelpDialog.mxml     | 6 ++++--
 net/systemeD/potlatch2/save/SaveDialog.mxml     | 8 ++++----
 potlatch2.mxml                                  | 4 +++-
 styles/Application.css                          | 4 ++--
 6 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/net/systemeD/potlatch2/BackgroundSelector.mxml b/net/systemeD/potlatch2/BackgroundSelector.mxml
index cb65eb61..78d4b91a 100644
--- a/net/systemeD/potlatch2/BackgroundSelector.mxml
+++ b/net/systemeD/potlatch2/BackgroundSelector.mxml
@@ -11,9 +11,9 @@
 	        dataProvider="{Imagery.instance().getAvailableImagery()}"
 	        rowCount="{Imagery.instance().getAvailableImagery().length}"/>
 	<mx:HBox>
-	<mx:CheckBox width="100%" label="Dim" selected="{FlexGlobals.topLevelApplication.theMap.getDimming()}" id="dim"
+	<mx:CheckBox width="100%" label="Dim" selected="{application.theMap.getDimming()}" id="dim"
 	    change="setDimming(dim.selected)" />
-	<mx:CheckBox width="100%" label="Sharpen" selected="{FlexGlobals.topLevelApplication.theMap.getSharpen()}" id="sharpen"
+	<mx:CheckBox width="100%" label="Sharpen" selected="{application.theMap.getSharpen()}" id="sharpen"
 	    change="setSharpen(sharpen.selected)" />
 	</mx:HBox>
 
@@ -32,6 +32,8 @@
 		import mx.collections.ArrayCollection;
 		import mx.managers.PopUpManager;
 
+		[Bindable] private var application:Object = FlexGlobals.topLevelApplication;
+
 		public function setDimming(v:Boolean):void {
 			FlexGlobals.topLevelApplication.theMap.setDimming(dim.selected);
 			FlexGlobals.topLevelApplication.yahoo.alpha = dim.selected ? 0.5 : 1;
diff --git a/net/systemeD/potlatch2/RelationSelectPanel.mxml b/net/systemeD/potlatch2/RelationSelectPanel.mxml
index e626f4f0..00b0bd15 100644
--- a/net/systemeD/potlatch2/RelationSelectPanel.mxml
+++ b/net/systemeD/potlatch2/RelationSelectPanel.mxml
@@ -90,15 +90,19 @@
 			panel.setEntity(entity);
 			PopUpManager.centerPopUp(panel);
 		}
+		
+		public function updateSelectButton():void {
+			selectButton.enabled=relationSelector.selectedItems.length>0;
+		}
         
     ]]></fx:Script>
     <mx:Text id="warning" text="" />
-    <mx:List width="100%" height="100%" id="relationSelector" verticalScrollPolicy="on" allowMultipleSelection="true" > 
+    <mx:List width="100%" height="100%" id="relationSelector" change="updateSelectButton();" verticalScrollPolicy="on" allowMultipleSelection="true" > 
     </mx:List>
     <mx:ControlBar>
       <mx:Button label="New Relation..." click="closeAndNewRelation();" styleName="titleWindowButton" />
       <mx:Button label="Load Relation..." click="closeAndLoadRelation();" styleName="titleWindowButton" />
       <mx:Spacer width="100%"/>
-      <mx:Button label="Select" click="updateEntityAndClose();" enabled="{relationSelector.selectedItems.length>0}" styleName="titleWindowButton" />
+      <mx:Button label="Select" id="selectButton" click="updateEntityAndClose();" enabled="false" styleName="titleWindowButton" />
     </mx:ControlBar>
 </mx:TitleWindow>
diff --git a/net/systemeD/potlatch2/help/HelpDialog.mxml b/net/systemeD/potlatch2/help/HelpDialog.mxml
index 91437be3..f9abf0fd 100644
--- a/net/systemeD/potlatch2/help/HelpDialog.mxml
+++ b/net/systemeD/potlatch2/help/HelpDialog.mxml
@@ -13,9 +13,11 @@
     import mx.core.Application;
     import mx.core.FlexGlobals;
 
+	[Bindable] private var application:Object = FlexGlobals.topLevelApplication;
+
     /** Pops up a multi-tabbed help window in the middle of the screen, then remembers that the user has seen it. */
     public function init():void {
-        PopUpManager.addPopUp(this, Application(FlexGlobals.topLevelApplication), true);
+        PopUpManager.addPopUp(this, Application(application), true);
         PopUpManager.centerPopUp(this);
         this.addEventListener(CloseEvent.CLOSE, helpDialog_close);
 
@@ -355,7 +357,7 @@
   </mx:TabNavigator>
 
   <mx:ControlBar>
-    <mx:Label text="Version: {FlexGlobals.topLevelApplication.version} Build: {FlexGlobals.topLevelApplication.build_number}" />
+    <mx:Label text="Version: {application.version} Build: {application.build_number}" />
     <mx:Spacer width="100%"/>
     <mx:Button label="Ok" click="PopUpManager.removePopUp(this);" styleName="titleWindowButton" />
   </mx:ControlBar>
diff --git a/net/systemeD/potlatch2/save/SaveDialog.mxml b/net/systemeD/potlatch2/save/SaveDialog.mxml
index c0849a5c..510d01f4 100644
--- a/net/systemeD/potlatch2/save/SaveDialog.mxml
+++ b/net/systemeD/potlatch2/save/SaveDialog.mxml
@@ -9,8 +9,8 @@
   <fx:Declarations>
   <mx:ArrayCollection id="changesetTags">
     <fx:Object k="created_by" v="Potlatch 2"/>
-    <fx:Object k="version" v="{FlexGlobals.topLevelApplication.version}"/>
-    <fx:Object k="build" v="{FlexGlobals.topLevelApplication.build_number}"/>
+    <fx:Object k="version" v="{application.version}"/>
+    <fx:Object k="build" v="{application.build_number}"/>
   </mx:ArrayCollection>
   </fx:Declarations>
   
@@ -95,8 +95,8 @@
     private var _connection:Connection;
 	private var doSkip:Boolean = false;
     
-    [Bindable]
-    private var failureText:String = "";
+    [Bindable] private var failureText:String = "";
+	[Bindable] private var application:Object = FlexGlobals.topLevelApplication;
 
 	public function setConnection(connection:Connection):void {
 		_connection=connection;
diff --git a/potlatch2.mxml b/potlatch2.mxml
index 09c9861a..fbf7aeef 100644
--- a/potlatch2.mxml
+++ b/potlatch2.mxml
@@ -32,7 +32,7 @@
         <mx:WipeRight id="wipeIn" duration="250"/>
     </fx:Declarations>
 
-    <mx:ApplicationControlBar dock="true">
+    <mx:ApplicationControlBar id="controlbar" dock="true">
         <mx:PopUpButton id="bgButton" label="Background" openAlways="true" styleName="appBarButton"
             creationComplete="bgButton.popUp = new BackgroundSelector();"/>
         <mx:PopUpButton id="styleButton" label="Map Style" openAlways="true" styleName="appBarButton"
@@ -150,6 +150,8 @@
 		}
 		
 		private function continueInit(r:Event):void {
+			controlbar.setStyle('dropShadowEnabled',"false");	// Flex 4 doesn't permit this in Application.css
+
 			// Set font
 			var FontLibrary:Class = r.target.applicationDomain.getDefinition("FontLibrary") as Class;
 			Font.registerFont(FontLibrary.DejaVu);
diff --git a/styles/Application.css b/styles/Application.css
index b61730be..097833fe 100644
--- a/styles/Application.css
+++ b/styles/Application.css
@@ -90,8 +90,8 @@ mx|ApplicationControlBar {
 	fillAlphas: 1,1;
 	fillColors: haloBlue, #6495ED;
 	/*fillColors: #ffffcc, #ffff99;*/
-	backgroundColor: #ffffcc;
-	dropShadowEnabled: false;
+	/*backgroundColor: #ffffcc;*/
+	/*dropShadowEnabled: false;*/
 	/*borderSkin: ClassReference("mx.skins.halo.ApplicationBackground");*/
 }
 
-- 
2.36.1