press S to save, C to close changeset
[potlatch2.git] / net / systemeD / potlatch2 / controller / ControllerState.as
index 840508c..42ee032 100644 (file)
@@ -6,6 +6,7 @@ package net.systemeD.potlatch2.controller {
     import net.systemeD.halcyon.connection.*;
     import net.systemeD.potlatch2.EditController;
        import net.systemeD.halcyon.Globals;
+       import net.systemeD.potlatch2.save.SaveManager;
 
     public class ControllerState {
 
@@ -26,6 +27,10 @@ package net.systemeD.potlatch2.controller {
                 this.previousState = previousState;
         }
    
+               public function isSelectionState():Boolean {
+                       return true;
+               }
+
         public function processMouseEvent(event:MouseEvent, entity:Entity):ControllerState {
             return this;
         }
@@ -39,7 +44,7 @@ package net.systemeD.potlatch2.controller {
                }
 
         public function enterState():void {}
-        public function exitState():void {}
+        public function exitState(newState:ControllerState):void {}
 
                public function toString():String {
                        return "(No state)";
@@ -47,8 +52,13 @@ package net.systemeD.potlatch2.controller {
                
                protected function sharedKeyboardEvents(event:KeyboardEvent):ControllerState {
                        switch (event.keyCode) {
-                               case 68:        controller.map.paint.alpha=1.3-controller.map.paint.alpha; return null; // D
-                               case 90:        MainUndoStack.getGlobalStack().undo(); return null;                                             // Z
+                               case 67:        controller.connection.closeChangeset(); break;                                                  // C - close changeset
+                               case 68:        controller.map.paint.alpha=1.3-controller.map.paint.alpha; return null; // D - dim
+                               case 83:        SaveManager.saveChanges(); break;                                                                               // S - save
+                               case 84:        controller.tagViewer.togglePanel(); return null;                                                // T - toggle tags panel
+                               case 87:        if (selectedWay) { return new SelectedWay(selectedWay); }; return null; // W - select way
+                               case 90:        MainUndoStack.getGlobalStack().undo(); return null;                                             // Z - undo
+                               case 187:       controller.tagViewer.addNewTag(); return null;                                                  // + - add tag
                        }
                        return null;
                }
@@ -57,11 +67,19 @@ package net.systemeD.potlatch2.controller {
                        var paint:MapPaint = getMapPaint(DisplayObject(event.target));
             var focus:Entity = getTopLevelFocusEntity(entity);
 
+                       if ( paint && paint.isBackground ) {
+                               if ( event.type == MouseEvent.MOUSE_DOWN && ((event.shiftKey && event.ctrlKey) || event.altKey) ) {
+                                       // alt-click to pull data out of vector background layer
+                                       var newEntity:Entity=paint.findSource().pullThrough(entity,controller.connection);
+                                       if (entity is Way) { return new SelectedWay(newEntity as Way); }
+                                       else if (entity is Node) { return new SelectedPOINode(newEntity as Node); }
+                               } else if ( event.type == MouseEvent.MOUSE_UP ) { 
+                                       return (this is NoSelection) ? null : new NoSelection();
+                               } else { return null; }
+                       }
+
                        if ( event.type == MouseEvent.MOUSE_DOWN ) {
-                               if ( entity is Way && event.altKey && paint.isBackground ) {
-                                       // pull way out of vector background layer
-                                       return new SelectedWay(paint.findSource().pullThrough(entity,controller.connection));
-                               } else if ( entity is Way ) {
+                               if ( entity is Way ) {
                                        // click way
                                        return new DragWay(focus as Way, event);
                                } else if ( focus is Node ) {
@@ -77,8 +95,10 @@ package net.systemeD.potlatch2.controller {
                                        // drag map
                                        return new DragBackground(event);
                                }
-                       } else if ( event.type == MouseEvent.MOUSE_UP && focus == null && map.dragstate!=map.DRAGGING ) {
-                               return new NoSelection();
+                       } else if ( event.type == MouseEvent.MOUSE_UP && focus == null && map.dragstate!=map.DRAGGING) {
+                               return (this is NoSelection) ? null : new NoSelection();
+                       } else if ( event.type == MouseEvent.MOUSE_UP && focus && map.dragstate==map.DRAGGING) {
+                               map.mouseUpHandler();   // in case the end-drag is over an EntityUI
                        } else if ( event.type == MouseEvent.ROLL_OVER ) {
                                controller.map.setHighlight(focus, { hover: true });
                        } else if ( event.type == MouseEvent.MOUSE_OUT ) {