Merge branch 'master' into snapshotserver

[potlatch2.git] / net / systemeD / potlatch2 / BackgroundSelector.mxml

diff --git a/net/systemeD/potlatch2/BackgroundSelector.mxml b/net/systemeD/potlatch2/BackgroundSelector.mxml
index 3e013115d0141414575c9f46e602de035871384b..2c483390bf15a7e5b6f1035ea24c2a5dfb850aa8 100644 (file)
--- a/net/systemeD/potlatch2/BackgroundSelector.mxml
+++ b/net/systemeD/potlatch2/BackgroundSelector.mxml
@@ -4,25 +4,46 @@
        paddingTop="10" paddingLeft="10" paddingRight="10" paddingBottom="10"
        horizontalAlign="left" backgroundColor="white" borderStyle="inset">
        
        paddingTop="10" paddingLeft="10" paddingRight="10" paddingBottom="10"
        horizontalAlign="left" backgroundColor="white" borderStyle="inset">
        

-       <mx:List width="100%" height="100%" id="background" verticalScrollPolicy="on" 
-                       change="Application.application.setBackground(background.selectedItem.label, background.selectedItem.data);"                    
-               dataProvider="{Application.application.theController.imagery}" />
-       <mx:CheckBox width="100%" label="Dim background" selected="true" id="dim"
-           change="Application.application.theMap.setDimming(dim.selected); Application.application.yahoo.alpha = dim.selected ? 0.5 : 1" />
+       <mx:List width="100%" height="100%" id="background"
+                       labelField="name"
+                       change="Application.application.bgButton.close(); Imagery.instance().setBackground(background.selectedItem);"
+               dataProvider="{Imagery.instance().getAvailableImagery()}"
+               rowCount="{Imagery.instance().getAvailableImagery().length}"/>
+       <mx:HBox>
+       <mx:CheckBox width="100%" label="Dim" selected="{Application.application.theMap.getDimming()}" id="dim"
+           change="setDimming(dim.selected)" />
+       <mx:CheckBox width="100%" label="Sharpen" selected="{Application.application.theMap.getSharpen()}" id="sharpen"
+           change="setSharpen(sharpen.selected)" />
+       </mx:HBox>

 
        <mx:HBox>
 
        <mx:HBox>

-       <mx:Button label="Edit..." click="new BackgroundDialog().init('Background imagery',background,Application.application.theController.imagery);" />
-       <mx:Button label="Vector file" click="new VectorSourceDialog().init();" />
+       <mx:Button label="Edit..." click="Application.application.bgButton.close(); new BackgroundDialog().init('Background imagery',background,Imagery.instance());" />
+       <mx:Button label="Vector file..." click="Application.application.bgButton.close(); new VectorSourceDialog().init();" />

        </mx:HBox>
 
        <mx:Script><![CDATA[
        </mx:HBox>
 
        <mx:Script><![CDATA[

+

                import net.systemeD.halcyon.*;
                import net.systemeD.halcyon.connection.*;
                import net.systemeD.potlatch2.*;
                import net.systemeD.halcyon.*;
                import net.systemeD.halcyon.connection.*;
                import net.systemeD.potlatch2.*;

+               import net.systemeD.potlatch2.collections.Imagery;

                import mx.core.*;
                import mx.collections.ArrayCollection;
                import mx.managers.PopUpManager;
                import mx.core.*;
                import mx.collections.ArrayCollection;
                import mx.managers.PopUpManager;

-               import net.systemeD.halcyon.Globals;
+
+               public function setDimming(v:Boolean):void {
+                       Application.application.theMap.setDimming(dim.selected);
+                       Application.application.yahoo.alpha = dim.selected ? 0.5 : 1;
+                       var obj:SharedObject=SharedObject.getLocal("user_state");
+                       obj.setProperty('background_dim',v);
+                       obj.flush();
+               }
+               public function setSharpen(v:Boolean):void {
+                       Application.application.theMap.setSharpen(sharpen.selected);
+                       var obj:SharedObject=SharedObject.getLocal("user_state");
+                       obj.setProperty('background_sharpen',v);
+                       obj.flush();
+               }

     ]]></mx:Script>    
 </mx:VBox>
 
     ]]></mx:Script>    
 </mx:VBox>