nice zoom buttons and a loading message

diff --git a/halcyon.mxml b/halcyon.mxml
index 49f5f6d4c1d3add39fa8deadae2ac36638b04ae7..8e9d2e2b994b6d3f49fe991622d82f150e5c5f1f 100755 (executable)
--- a/halcyon.mxml
+++ b/halcyon.mxml
@@ -7,20 +7,40 @@
        horizontalAlign="center" 
        addedToStage="initApp()">
 
        horizontalAlign="center" 
        addedToStage="initApp()">
 

+    <mx:Glow id="glowImage" duration="100" 
+        alphaFrom="0.3" alphaTo="1.0" 
+        blurXFrom="0.0" blurXTo="5.0" 
+        blurYFrom="0.0" blurYTo="5.0" 
+        color="0xFF8000"/>
+    <mx:Glow id="unglowImage" duration="100" 
+        alphaFrom="1.0" alphaTo="0.3" 
+        blurXFrom="5.0" blurXTo="0.0" 
+        blurYFrom="5.0" blurYTo="0.0" 
+        color="0xFF8000"/>
+    <mx:WipeLeft id="wipeOut" duration="250"/>
+    <mx:WipeRight id="wipeIn" duration="250"/>
+

     <mx:HDividedBox width="100%" height="100%">
 
       <mx:VBox height="100%" width="25%" horizontalAlign="right">
     <mx:HDividedBox width="100%" height="100%">
 
       <mx:VBox height="100%" width="25%" horizontalAlign="right">

-        <mx:HBox>
-          <mx:Button label="-" click="theMap.zoomOut();"/>
-          <mx:Button label="+" click="theMap.zoomIn();"/>
-        </mx:HBox>

         <potlatch2:TagViewer width="100%" height="100%" id="tagViewer"/>
       </mx:VBox>
         <potlatch2:TagViewer width="100%" height="100%" id="tagViewer"/>
       </mx:VBox>

-      <mx:Canvas id="map_area" width="75%" height="100%" resize="onResizeMap()"/>
+      <mx:Canvas width="75%" height="100%">
+        <mx:Canvas id="map_area" resize="onResizeMap()"
+            top="0" left="0" width="100%" height="100%">
+        </mx:Canvas>
+        <mx:Image source="@Embed('embedded/zoomIn.svg')" right="3" top="3" click="theMap.zoomIn();"
+            rollOverEffect="glowImage" rollOutEffect="unglowImage"/>
+        <mx:Image source="@Embed('embedded/zoomOut.svg')" right="3" top="20" click="theMap.zoomOut();"
+            rollOverEffect="glowImage" rollOutEffect="unglowImage"/>
+        <mx:Label id="dataWorking" text="" right="20" top="3"
+            showEffect="{wipeIn}" hideEffect="{wipeOut}"/>
+      </mx:Canvas>

     </mx:HDividedBox>
 
        <mx:Script><![CDATA[
                import net.systemeD.halcyon.*;
     </mx:HDividedBox>
 
        <mx:Script><![CDATA[
                import net.systemeD.halcyon.*;

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

                import net.systemeD.potlatch2.*;
                import flash.system.Security;
                import flash.net.*;
                import net.systemeD.potlatch2.*;
                import flash.system.Security;
                import flash.net.*;


@@ -96,6 +116,10 @@
 
             var controller:EditController = new EditController(theMap, tagViewer);
             controller.setActive();
 
             var controller:EditController = new EditController(theMap, tagViewer);
             controller.setActive();

+            
+            var conn:Connection = Connection.getConnectionInstance();
+            conn.addEventListener(Connection.LOAD_STARTED, onDataStart);
+            conn.addEventListener(Connection.LOAD_COMPLETED, onDataComplete);

                }
 
         public function onResizeMap():void {
                }
 
         public function onResizeMap():void {


@@ -103,6 +127,13 @@
                 theMap.updateSize(map_area.width, map_area.height);
         }
 
                 theMap.updateSize(map_area.width, map_area.height);
         }
 

+        private function onDataStart(event:Event):void {
+            dataWorking.text = event.type == Connection.LOAD_STARTED ? "Loading data..." : "Saving Data...";
+            dataWorking.visible = true;
+        }
+        private function onDataComplete(event:Event):void {
+            dataWorking.visible = false;
+        }

        ]]></mx:Script>
 
 </mx:Application>
        ]]></mx:Script>
 
 </mx:Application>

diff --git a/net/systemeD/halcyon/connection/Connection.as b/net/systemeD/halcyon/connection/Connection.as
index 9cfa9ecbe6b3a05710c2ee706d135efc55f1ad2b..6fad3e0fa5477c7b8510095178044864ca7bb0fa 100755 (executable)
--- a/net/systemeD/halcyon/connection/Connection.as
+++ b/net/systemeD/halcyon/connection/Connection.as
@@ -38,6 +38,10 @@ package net.systemeD.halcyon.connection {
                public function getEnvironment(responder:Responder):void {}
 
         // connection events
                public function getEnvironment(responder:Responder):void {}
 
         // connection events

+        public static var LOAD_STARTED:String = "load_started";
+        public static var LOAD_COMPLETED:String = "load_completed";
+        public static var SAVE_STARTED:String = "save_started";
+        public static var SAVE_COMPLETED:String = "save_completed";

         public static var NEW_NODE:String = "new_node";
         public static var NEW_WAY:String = "new_way";
         public static var NEW_RELATION:String = "new_relation";
         public static var NEW_NODE:String = "new_node";
         public static var NEW_WAY:String = "new_way";
         public static var NEW_RELATION:String = "new_relation";

diff --git a/net/systemeD/halcyon/connection/XMLConnection.as b/net/systemeD/halcyon/connection/XMLConnection.as
index 2d05fb26757976630416b96bc193f7b5b1019796..0fa1c6b54b2f731cc489633643a658f7a8e4f452 100644 (file)
--- a/net/systemeD/halcyon/connection/XMLConnection.as
+++ b/net/systemeD/halcyon/connection/XMLConnection.as
@@ -38,6 +38,7 @@ package net.systemeD.halcyon.connection {
             var mapLoader:URLLoader = new URLLoader();
             mapLoader.addEventListener(Event.COMPLETE, loadedMap);
             mapLoader.load(mapRequest);
             var mapLoader:URLLoader = new URLLoader();
             mapLoader.addEventListener(Event.COMPLETE, loadedMap);
             mapLoader.load(mapRequest);

+            dispatchEvent(new Event(LOAD_STARTED));

                }
 
         private function parseTags(tagElements:XMLList):Object {
                }
 
         private function parseTags(tagElements:XMLList):Object {


@@ -48,6 +49,8 @@ package net.systemeD.halcyon.connection {
         }
 
         private function loadedMap(event:Event):void {
         }
 
         private function loadedMap(event:Event):void {

+            dispatchEvent(new Event(LOAD_COMPLETED));
+

             var map:XML = new XML(URLLoader(event.target).data);
             var id:Number;
             var version:uint;
             var map:XML = new XML(URLLoader(event.target).data);
             var id:Number;
             var version:uint;