fix save dialogue

diff --git a/TODO.txt b/TODO.txt
index fe2c16263b79ec3839bf7e521bf0aa53b6732d98..c9ca1795f2b5f0e65ea70a3dde5b28d33c8e1814 100644 (file)
--- a/TODO.txt
+++ b/TODO.txt
@@ -5,6 +5,7 @@ Potlatch 2: main outstanding issues
 == Core geometry ==
 
 ** Straighten way + undo + redo looks fine in the UI, but doesn't reinsert the nodes into the way properly when saving (maybe way isn't dirty?)
+* Dragging multipolygons (or constituent nodes) doesn't force redraw of all ways - need to hook something up to WAY_NODE_MOVED
 * Make parallelise properly undoable
 * Make Quadralatalawhatsit properly undoable
 * Splitway + undo leaves way marked dirty
@@ -22,7 +23,6 @@ Potlatch 2: main outstanding issues
 
 == Saving ==
 
-** Comment and advanced -> "comment" should show the same thing
 * Save should be deactivated until there's things to change
 * Should be able to reuse changesets
 * Shouldn't be able to change created_by and version on changeset

diff --git a/net/systemeD/potlatch2/save/SaveDialog.mxml b/net/systemeD/potlatch2/save/SaveDialog.mxml
index 5fb732d853fb9c2bac0e20b6794f3d3ec20a6f69..a3fa522e9089941eeacc5aa3c0b7b28c95869d02 100644 (file)
--- a/net/systemeD/potlatch2/save/SaveDialog.mxml
+++ b/net/systemeD/potlatch2/save/SaveDialog.mxml
@@ -3,11 +3,11 @@
        xmlns:mx="http://www.adobe.com/2006/mxml" 
        layout="vertical"
        horizontalAlign="center" title="Save Changes"
-       width="350" height="250" verticalGap="0">
+       width="350" height="330" verticalGap="0">
 
   <mx:ArrayCollection id="changesetTags">
     <mx:Object k="created_by" v="Potlatch 2"/>
-    <mx:Object k="version" v="x.xx.x"/>
+    <mx:Object k="version" v="{Application.application.version}"/>
     <mx:Object k="comment" v=""/>
   </mx:ArrayCollection>
   
@@ -24,18 +24,23 @@
             </mx:text>
           </mx:Text>
           <mx:Label text="Comment:"/>
-          <mx:TextArea id="comment" width="100%" height="100%"/>
+          <mx:TextArea id="comment" width="100%" height="100%" change="commentChanged(event);" />
         </mx:VBox>
         
         <mx:VBox width="100%" height="100%" label="Advanced">
           <mx:Label text="Changeset tags:"/>
-          <mx:DataGrid editable="true" width="100%" height="100%" id="advancedTagGrid"
+          <mx:DataGrid editable="true" width="100%" id="advancedTagGrid"
               dataProvider="{changesetTags}">
             <mx:columns>
                 <mx:DataGridColumn editable="true" dataField="k" headerText="Key"/>
                 <mx:DataGridColumn editable="true" dataField="v" headerText="Value"/>
             </mx:columns>
           </mx:DataGrid>        
+                 <mx:HBox horizontalAlign="right" width="100%">
+                   <mx:LinkButton label="Delete" click="removeTag()" enabled="{advancedTagGrid.selectedItem != null? true : false}"/>
+                   <mx:LinkButton label="Add" click="addNewTag()"/>
+                 </mx:HBox>
+                 <mx:HRule width="100%" />
         </mx:VBox>
       </mx:ViewStack>
       <mx:LinkBar dataProvider="{tagStack}"/>
@@ -69,6 +74,7 @@
   
     import mx.controls.*;
     import mx.managers.PopUpManager;
+       import mx.core.Application;
     
     import net.systemeD.halcyon.connection.*;
     
@@ -76,6 +82,22 @@
     
     [Bindable]
     private var failureText:String = "";
+
+       private function commentChanged(event:Event):void {
+               for (var i:int=changesetTags.length-1; i>0; i--) {
+                       if (changesetTags[i]['k']=='comment') { changesetTags.removeItemAt(i); }
+               }
+               changesetTags.addItem( { k:'comment', v: event.target.text } );
+    }
+
+       private function addNewTag():void {
+               changesetTags.addItem( { k:'(new key)', v:'(new value)' } );
+               advancedTagGrid.editedItemPosition = { rowIndex: changesetTags.length-1, columnIndex: 0 };
+       }
+
+       private function removeTag():void {
+               changesetTags.removeItemAt(advancedTagGrid.selectedIndex);
+       }
     
     private function startSave():void {
     
@@ -93,7 +115,7 @@
         conn.addEventListener(Connection.NEW_CHANGESET_ERROR, changesetError);
         conn.createChangeset(tags);
     }
-    
+
     private function changesetCreated(event:EntityEvent):void {
         var changeset:Changeset = conn.getActiveChangeset();
         addStatus("Changeset created (id: "+changeset.id+")");

diff --git a/potlatch2.mxml b/potlatch2.mxml
index b37f77fff20108ff6582caf38e2212ab13333788..521aebbb67131be93c560405c12dc205ac281c32 100755 (executable)
--- a/potlatch2.mxml
+++ b/potlatch2.mxml
@@ -141,6 +141,8 @@
 
                private var savecount:uint=0;
                private var loadcount:uint=0;
+               
+               public var version:String="(Foxbase) Alpha";                    // mxml won't read it if it's a const. Go figure
 
                private function initApp():void {