Assign relations to function keys

diff --git a/net/systemeD/potlatch2/EditController.as b/net/systemeD/potlatch2/EditController.as
index 04b46fc7059eeb2e27268fb1fe9f7dd9f81027ba..16540c901b572dc53fee1b6d7495319a7d522b77 100644 (file)
--- a/net/systemeD/potlatch2/EditController.as
+++ b/net/systemeD/potlatch2/EditController.as
@@ -76,6 +76,8 @@ package net.systemeD.potlatch2 {
 
             FunctionKeyManager.instance().registerListener('Saved tags',
                 function(o:String):void { state.recallTags(o); });
+            FunctionKeyManager.instance().registerListener('Add to relation',
+                function(o:String):void { state.recallRelation(o); });
 
             if (this.moveFunction) {
                 var lon:Number = ( map.edge_r + map.edge_l ) / 2;

diff --git a/net/systemeD/potlatch2/FunctionKeyManager.as b/net/systemeD/potlatch2/FunctionKeyManager.as
index 511f5c63bfcfc57e10ad773c59deb304657cd1c7..f3ab21500e6517408d0a24f75fa6dbf64507a387 100644 (file)
--- a/net/systemeD/potlatch2/FunctionKeyManager.as
+++ b/net/systemeD/potlatch2/FunctionKeyManager.as
@@ -44,7 +44,7 @@ package net.systemeD.potlatch2 {
                        keys[fkey]={ code:code, value:value };
                        var obj:SharedObject=SharedObject.getLocal("user_state","/");
                        obj.setProperty('F'+fkey,{ code:code, value:value });
-                       try { obj.flush(); } catch (e:Error) {}
+                       try { obj.flush(); } catch (e:Error) { trace("Error: "+e.toString()); }
                        dispatchEvent(new Event("key_changed"));
                }
 

diff --git a/net/systemeD/potlatch2/TagViewer.mxml b/net/systemeD/potlatch2/TagViewer.mxml
index 928fc99144387351bbc0fadff36ff9a5f67b8695..188aeedfbe3cb405d57ae5c05f11f051b81af631 100644 (file)
--- a/net/systemeD/potlatch2/TagViewer.mxml
+++ b/net/systemeD/potlatch2/TagViewer.mxml
@@ -78,6 +78,7 @@
                                                </fx:Component>
                                        </mx:itemRenderer>
                                </mx:DataGridColumn>
+                               <mx:DataGridColumn minWidth="4" /><!-- Dummy column forces Flex to render previous one at proper width -->
             </mx:columns>
         </mx:DataGrid>
 
@@ -791,6 +792,7 @@
       }
 
       private function relationRoleChanged(event:DataGridEvent):void {
+               if (!selectedEntity) return;
                if (event.dataField != 'role') { return; }      // shouldn't really happen
 
                var relations:Array=event.currentTarget.dataProvider.toArray();
@@ -813,11 +815,13 @@
       }
 
       private function relationTagChanged(event:TagEvent):void {
+          if (!selectedEntity) return;
           resetRelationsGrid(selectedEntity);
           refreshFeatureIcon();
       }
 
       private function entityRelationMemberChanged(event:RelationMemberEvent):void {
+          if (!selectedEntity) return;
           resetRelationsGrid(selectedEntity);
       }
 
@@ -883,7 +887,11 @@
                var dp:Object = [ {label: "Select all members"}, 
                                                  {label: "Deselect all members"}, 
                                                  {label: "Add selection to this relation", enabled: false},
-                                                 {label: "Delete relation"} ]; 
+                                                 {label: "Delete relation"},
+                                                 {label: "Assign to F1"},
+                                                 {label: "Assign to F2"},
+                                                 {label: "Assign to F3"},
+                                                 {label: "Assign to F4"} ]; 
                menu.dataProvider = dp; 
                menu.addEventListener("itemClick", selectRelationMenu); 
                button.popUp = menu;
@@ -944,6 +952,13 @@
                                                rel.remove(MainUndoStack.getGlobalStack().addAction);
                                        } , null, Alert.CANCEL);
                                break;
+                               
+                       case 4: // Function key assignment
+                       case 5:
+                       case 6:
+                       case 7:
+                               FunctionKeyManager.instance().setKey(event.index-3, 'Add to relation',String(rel.id));
+                               break;
                }
        }
 

diff --git a/net/systemeD/potlatch2/controller/ControllerState.as b/net/systemeD/potlatch2/controller/ControllerState.as
index f68869fa32bcecaea36525eb34374a5b1426169d..1cd8c638206036e1201920a1049ee395222e7155 100644 (file)
--- a/net/systemeD/potlatch2/controller/ControllerState.as
+++ b/net/systemeD/potlatch2/controller/ControllerState.as
@@ -307,6 +307,25 @@ package net.systemeD.potlatch2.controller {
                        for each (item in _selection) item.resume();
                }
 
+               /** Recall memorised relation by ID. */
+               public function recallRelation(str:String):void {
+                       if (selectCount==0) return;
+                       var rel:Relation = controller.map.editableLayer.connection.getRelation(Number(str));
+                       if (!rel) {
+                               controller.dispatchEvent(new AttentionEvent(AttentionEvent.ALERT, null, "That relation hasn't been loaded"));
+                               return;
+                       }
+                       var undo:CompositeUndoableAction = new CompositeUndoableAction("Recall relation");
+                       for each (var item:Entity in _selection) {
+                               item.suspend();
+                               rel.appendMember(new RelationMember(item, ''), undo.push);
+                       }
+                       MainUndoStack.getGlobalStack().addAction(undo);
+                       controller.updateSelectionUI();
+                       for each (item in _selection) item.resume();
+                       controller.dispatchEvent(new AttentionEvent(AttentionEvent.ALERT, null, "Added to relation"));
+               }
+
         /** Show the history dialog, if only one object is selected. */
         protected function showHistory():void {
             if (selectCount == 1 && firstSelected.id>0) {