<?xml version="1.0" encoding="utf-8"?>
-<mx:Application
- xmlns:mx="http://www.adobe.com/2006/mxml"
+<mx:Application
+ xmlns:fx="http://ns.adobe.com/mxml/2009"
+ xmlns:mx="library://ns.adobe.com/flex/mx"
+ xmlns:s="library://ns.adobe.com/flex/spark"
xmlns:halcyon="net.systemeD.halcyon.*"
xmlns:potlatch2="net.systemeD.potlatch2.*"
layout="vertical"
addedToStage="startInit()"
preloader="net.systemeD.potlatch2.Preloader">
- <map:LocalizationMap xmlns:map="l10n.map.*" />
- <mx:Style source="styles/Application.css"/>
- <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"/>
+ <fx:Style source="styles/Application.css"/>
- <mx:ApplicationControlBar dock="true">
+ <fx:Declarations>
+ <map:LocalizationMap xmlns:map="l10n.map.*" />
+ <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"/>
+ </fx:Declarations>
+
+ <mx:ApplicationControlBar id="controlbar" dock="true" tabChildren="false" >
+ <mx:Button label="Save" icon="@Embed('embedded/upload.svg')" disabledIcon="@Embed('embedded/upload_disabled.svg')" styleName="appBarButton"
+ click="SaveManager.saveChanges(theMap.editableLayer.connection);" id="saveButton" enabled="false"/>
+ <mx:Button id="helpButton" label="Help" click="new HelpDialog().init();" styleName="appBarButton" />
+ <mx:Spacer width="40"/>
+ <mx:Button id="undo" label="Undo" click="MainUndoStack.getGlobalStack().undo();" styleName="appBarButton"
+ enabled="{MainUndoStack.getGlobalStack().canUndo()}"
+ toolTip="{MainUndoStack.getGlobalStack().getUndoDescription() ? 'Undo '+MainUndoStack.getGlobalStack().getUndoDescription() : 'Undo last action'}" />
+ <mx:Button id="redo" label="Redo" click="MainUndoStack.getGlobalStack().redo();" styleName="appBarButton"
+ enabled="{MainUndoStack.getGlobalStack().canRedo()}"
+ toolTip="{MainUndoStack.getGlobalStack().getRedoDescription() ? 'Redo '+MainUndoStack.getGlobalStack().getRedoDescription() : 'Redo last action'}" />
+ <mx:Spacer width="100%"/>
<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"
creationComplete="styleButton.popUp = new StyleSelector();"/>
- <mx:PopUpMenuButton id="gpsButton" styleName="appBarButton"
+ <mx:PopUpMenuButton id="gpsButton" label="GPS" styleName="appBarButton"
itemClick="if (event.index==0) { trackLoader.load(); }
else if (event.index==1) { new MyGpxDialog().init(); }
else { mx.controls.Menu(gpsButton.popUp).selectedIndex=0;
mx.controls.Menu(gpsButton.popUp).selectedIndex=0; /* Yes, we do need to call it twice */
theMap.removeLayerByName('GPS tracks'); }">
<mx:dataProvider>
- <mx:Array>
- <mx:Object label="GPS data" id="gpsData" />
- <mx:Object label="My tracks" id="myTracks" />
- <mx:Object label="Clear" id="clearGps" />
- </mx:Array>
+ <fx:Array>
+ <fx:Object label="GPS data" id="gpsData" />
+ <fx:Object label="My tracks" id="myTracks" />
+ <fx:Object label="Clear" id="clearGps" />
+ </fx:Array>
</mx:dataProvider>
</mx:PopUpMenuButton>
- <mx:Spacer width="100%"/>
- <mx:Button id="undo" label="Undo" click="MainUndoStack.getGlobalStack().undo();" styleName="appBarButton"
- enabled="{MainUndoStack.getGlobalStack().canUndo()}"
- toolTip="{MainUndoStack.getGlobalStack().getUndoDescription() ? 'Undo '+MainUndoStack.getGlobalStack().getUndoDescription() : 'Undo last action'}" />
- <mx:Button id="redo" label="Redo" click="MainUndoStack.getGlobalStack().redo();" styleName="appBarButton"
- enabled="{MainUndoStack.getGlobalStack().canRedo()}"
- toolTip="{MainUndoStack.getGlobalStack().getRedoDescription() ? 'Redo '+MainUndoStack.getGlobalStack().getRedoDescription() : 'Redo last action'}" />
- <mx:Spacer width="100%"/>
- <mx:Button id="helpButton" label="Help" click="new HelpDialog().init();" styleName="appBarButton" />
<mx:Button id="optionsButton" label="Options" click="new OptionsDialog().init();" styleName="appBarButton" />
- <mx:Button label="Save" icon="@Embed('embedded/upload.svg')" disabledIcon="@Embed('embedded/upload_disabled.svg')" styleName="appBarButton"
- click="SaveManager.saveChanges(theMap.editableLayer.connection);" id="saveButton" enabled="false"/>
</mx:ApplicationControlBar>
<mx:HDividedBox width="100%" height="100%">
<mx:Canvas id="map_area" resize="onResizeMap()"
top="0" left="0" width="100%" height="100%" dragEnter="dragEnterHandler(event);" dragDrop="dragDropHandler(event);">
</mx:Canvas>
- <mx:Image source="@Embed('embedded/zoomIn.svg')" right="3" top="3" click="theMap.zoomIn();"
+ <mx:Image source="@Embed('embedded/zoomIn.svg')" left="5" top="5" click="theMap.zoomIn();"
rollOverEffect="glowImage" rollOutEffect="unglowImage" toolTip="{'Zoom in - currently z'+getScale()}" />
- <mx:Image source="@Embed('embedded/zoomOut.svg')" right="3" top="20" click="theMap.zoomOut();"
+ <mx:Image source="@Embed('embedded/zoomOut.svg')" left="5" top="22" click="theMap.zoomOut();"
rollOverEffect="glowImage" rollOutEffect="unglowImage" toolTip="{'Zoom out - currently z'+getScale()}" />
- <mx:Image source="@Embed('embedded/search.svg')" right="3" top="40" click="new FindDialog().init();"
+ <mx:Image source="@Embed('embedded/search.svg')" left="5" top="42" click="new FindDialog().init();"
rollOverEffect="glowImage" rollOutEffect="unglowImage" toolTip="Find place" />
- <mx:TextArea id="dataWorking" text="" right="20" top="3" disabledColor="black" backgroundDisabledColor="0xFFFFEA" height="18"
+ <mx:TextArea id="dataWorking" text="" right="5" top="5" disabledColor="black" backgroundDisabledColor="0xFFFFEA" height="18"
enabled="false" borderThickness="0"
showEffect="{wipeIn}" hideEffect="{wipeOut}"/>
- <mx:TextArea id="coordsbox" left="0" top="0" disabledColor="black" backgroundDisabledColor="0xFFFFEA" height="33"
+ <mx:TextArea id="coordsbox" left="25" top="5" disabledColor="black" backgroundDisabledColor="0xFFFFEA" height="33"
width="57" enabled="false" borderThickness="0" visible="false"/>
</mx:Canvas>
</mx:HDividedBox>
- <mx:Script><![CDATA[
+ <fx:Script><![CDATA[
import net.systemeD.halcyon.*;
import net.systemeD.halcyon.connection.*;
import net.systemeD.potlatch2.*;
import net.systemeD.potlatch2.collections.*;
import net.systemeD.potlatch2.controller.*;
import net.systemeD.potlatch2.help.*;
- import net.systemeD.potlatch2.options.*;
+ import net.systemeD.potlatch2.dialogs.*;
import net.systemeD.potlatch2.utils.*;
- import net.systemeD.potlatch2.mygpx.*;
import net.systemeD.controls.FloatingAlert;
+ import net.systemeD.controls.Spinner;
import mx.managers.PopUpManager;
import flash.system.Security;
import flash.net.*;
import mx.core.IChildList;
import mx.containers.Canvas;
import mx.core.Application;
+ import mx.core.FlexGlobals;
import mx.events.DragEvent;
import mx.events.CloseEvent;
import mx.managers.DragManager;
import mx.core.DragSource;
import mx.controls.Alert;
- import com.mindspace.l10n.events.LocaleEvent;
+ import org.babelfx.events.LocaleEvent;
public var theMap:Map;
public var theController:EditController;
- public var yahoo:Yahoo;
public var trackLoader:TrackLoader;
public var toolbox:Toolbox;
public var bugLoader:BugLoader;
private var savecount:uint=0;
private var loadcount:uint=0;
+ private var spinner:Spinner;
private var saveLabel:String='Save';
private var saveTimer:Timer;
include "version.as";
private function startInit():void {
- /* For reasons that I don't yet understand, the en_US locale is the default and doesn't work at all. */
- /* Change this to another locale (e.g. fr_FR) to see the differences. */
- if (loaderInfo.parameters['locale']) {
- dispatchEvent(new LocaleEvent(LocaleEvent.LOAD_LOCALE,loaderInfo.parameters['locale']));
+ var loader:Loader = new Loader();
+ loader.contentLoaderInfo.addEventListener(Event.COMPLETE, startApp);
+ if (loaderInfo.parameters['font_library']) {
+ loader.load(new URLRequest(loaderInfo.parameters['font_library']));
+ } else {
+ loader.load(new URLRequest("FontLibrary.swf"));
}
- // Load font and don't do anything until that's done
- var loader:Loader = new Loader();
- loader.contentLoaderInfo.addEventListener(Event.COMPLETE, continueInit);
- loader.load(new URLRequest("FontLibrary.swf"));
+ if (loaderInfo.parameters['locale'] && loaderInfo.parameters['locale']!='en_US') {
+ // we don't bother with localisation if the user is en_US, as P2 is in English by default
+ Globals.vars.locale = loaderInfo.parameters['locale'];
+ Globals.vars.locale_paths = loaderInfo.parameters['locale_paths'];
+ dispatchEvent(new LocaleEvent(LocaleEvent.LOAD_LOCALE, loaderInfo.parameters['locale']));
+ dispatchEvent(new LocaleEvent(LocaleEvent.LOAD_LOCALE, 'en_US')); // think en_US is default
+ resourceManager.localeChain = [loaderInfo.parameters['locale'], 'en_US'];
+ }
}
- private function continueInit(r:Event):void {
+ private function startApp(event: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;
+ var FontLibrary:Class = event.target.applicationDomain.getDefinition("FontLibrary") as Class;
Font.registerFont(FontLibrary.DejaVu);
Globals.vars.map_area = map_area;
saveLabel=saveButton.label;
// populate sharedObject with loaderInfo parameters if supplied
- var obj:SharedObject = SharedObject.getLocal("user_state");
+ var obj:SharedObject = SharedObject.getLocal("user_state","/");
var objChanged:Boolean = false;
if (loaderInfo.parameters['tileurl']) {
obj.setProperty('background_url',loaderInfo.parameters['tileurl']);
// pass additional parameters to map
var params:Object={}; var k:String;
for (k in this.loaderInfo.parameters) params[k]=this.loaderInfo.parameters[k];
- for (k in SharedObject.getLocal('user_state').data) params[k]=SharedObject.getLocal('user_state').data[k];
+ for (k in SharedObject.getLocal('user_state',"/").data) params[k]=SharedObject.getLocal('user_state',"/").data[k];
// Create map
theMap=new Map();
theMap.backdrop=b;
theMap.updateSize(w,h);
theMap.addEventListener(MapEvent.SCALE, scaleHandler);
-
- yahoo=new Yahoo(theMap);
- yahoo.hide();
- _root.addChild(yahoo);
_root.addChild(theMap);
// Initialise stylesheets
conn.addEventListener(MapEvent.ERROR, onMapError);
conn.addEventListener(AttentionEvent.ATTENTION, onAttention);
conn.addEventListener(AttentionEvent.ALERT, onAlert);
- theMap.addLayer(conn, Stylesheets.instance().selected, false, true);
+ if (params['licence_status']) conn.statusFetcher=new StatusFetcher("http://wtfe.gryph.de/api/0.6/problems",conn);
+ theMap.addLayer(conn, Stylesheets.instance().selected.url, false, true);
// Auto-load vector backgrounds from config
theMap.addEventListener(MapEvent.INITIALISED, function(e:Event):void { VectorBackgrounds.instance().init(theMap); });
+ // Add loading 'spinner' indicator
+ spinner=new Spinner();
+ _root.addChild(spinner);
+ spinner.x=dataWorking.x-20;
+ spinner.y=dataWorking.y+dataWorking.height/2;
+
// Set start position of map
// ** FIXME: if lat/lon/zoom aren't supplied, we need to keep the map in a non-loading state
// until the user has decided where to start editing (e.g. when the first GPX loads)
Globals.vars.map_area.addEventListener(MouseEvent.MOUSE_DOWN, theMap.mouseDownHandler);
// initialise imagery
- theMap.tileset.blocks=[new RegExp("google","i")]; // hard-coded block on Google tiles
+ theMap.tileset.blocks=[/google\./i]; // hard-coded block on Google tiles
theMap.tileset.setDimming(params['background_dim'] ==null ? true : params['background_dim']);
theMap.tileset.setSharpen(params['background_sharpen']==null ? false : params['background_sharpen']);
- Imagery.instance().init(theMap, overlay, yahoo);
- Imagery.instance().addEventListener(MapEvent.BUMP, bumpHandler);
- Imagery.instance().addEventListener(CollectionEvent.SELECT,
+ var imagery:Imagery = Imagery.instance();
+ imagery.init(theMap, overlay);
+ imagery.addEventListener(MapEvent.BUMP, bumpHandler);
+ imagery.addEventListener(CollectionEvent.SELECT,
function(e:CollectionEvent):void { theMap.tileset.init(e.data, e.data!=''); }
);
-
+ theMap.tileset.init(imagery.selected, imagery.selected != '');
+
// keyboard event attached to stage
stage.addEventListener(KeyboardEvent.KEY_UP, theMap.keyUpHandler);
theController.addEventListener(AttentionEvent.ALERT, onAlert);
// set the access token from saved cookie
- var tokenObject:SharedObject = SharedObject.getLocal("access_token");
+ var tokenObject:SharedObject = SharedObject.getLocal("access_token","/");
conn.setAccessToken(tokenObject.data["oauth_token"], tokenObject.data["oauth_token_secret"]);
// Load any requested GPX track
var gpx_url:String = loaderInfo.parameters['gpx_url'];
var connection:Connection = new Connection(name, gpx_url, null, null);
- var gpx:GpxImporter=new GpxImporter(connection, theMap, [gpx_url],
- function(success:Boolean,message:String=null):void {
+ var gpx:GpxImporter=new GpxImporter(connection, theMap,
+ function(connection:Connection,options:Object,success:Boolean,message:String=null):void {
if (!success) return;
var paint:MapPaint = theMap.addLayer(connection, "stylesheets/gpx.css");
paint.updateEntityUIs(false, false);
dispatchEvent(new Event("layers_changed"));
}, false);
+ gpx.importFromRemoteFiles([gpx_url]);
}
// create GPS trackloader
public function onMapError(mapEvent:MapEvent):void {
var buttons:uint=0;
- if (mapEvent.params.no) { trace("no is set"); }
if (mapEvent.params.yes ) buttons|=mx.controls.Alert.YES;
if (mapEvent.params.no ) buttons|=mx.controls.Alert.NO;
if (mapEvent.params.cancel ) buttons|=mx.controls.Alert.CANCEL;
if (mapEvent.params.ok || buttons==0) buttons|=mx.controls.Alert.OK;
- trace("showing alert with "+buttons);
Alert.show(mapEvent.params.message, 'Error', buttons, null, function(closeEvent:CloseEvent):void {
switch (closeEvent.detail) {
case mx.controls.Alert.CANCEL: mapEvent.params.cancel(); break; //fixme? this gets called if user presses escape, even if there's no cancel button.
if (entity is Relation) {
// If it's a relation, just bring up the editor panel
var panel:RelationEditorPanel = RelationEditorPanel(
- PopUpManager.createPopUp(Application(Application.application), RelationEditorPanel, true));
+ PopUpManager.createPopUp(Application(FlexGlobals.topLevelApplication), RelationEditorPanel, true));
panel.setRelation(entity as Relation);
PopUpManager.centerPopUp(panel);
return;
updateDataWorking();
}
private function updateDataWorking():void {
- if (loadcount>0 && savecount>0) { dataWorking.text="Loading/saving..."; }
- else if (loadcount>0) { dataWorking.text="Loading data..."; }
- else if (savecount>0) { dataWorking.text="Saving data..."; }
- else { dataWorking.text=""; }
- dataWorking.visible=(dataWorking.text!="");
+ var t:String;
+ if (loadcount>0 && savecount>0) { t="Loading/saving#..."; }
+ else if (loadcount>0) { t="Loading data#..."; }
+ else if (savecount>0) { t="Saving data..."; }
+ else { t=""; }
+ dataWorking.text=t.replace("#",(loadcount>1) ? (" ("+loadcount+")") : "");
+
+ var previousState:Boolean=dataWorking.visible;
+ var newState:Boolean=(dataWorking.text!="");
+ if (!previousState && newState) spinner.start();
+ if (previousState && !newState) spinner.stop();
+ dataWorking.visible=newState;
}
private function onDataDirty(event:Event):void {
saveButton.enabled=true;
conn.fetchUserTraces();
}
- ]]></mx:Script>
+ ]]></fx:Script>
</mx:Application>
projects / potlatch2.git / blobdiff