Merge commit '2.0' into history
authorAndy Allan <andy@gravitystorm.co.uk>
Sun, 3 Apr 2011 14:02:04 +0000 (15:02 +0100)
committerAndy Allan <andy@gravitystorm.co.uk>
Sun, 3 Apr 2011 14:02:04 +0000 (15:02 +0100)
1  2 
net/systemeD/halcyon/connection/Connection.as
net/systemeD/halcyon/connection/Relation.as
net/systemeD/halcyon/connection/XMLBaseConnection.as
net/systemeD/halcyon/connection/XMLConnection.as
net/systemeD/potlatch2/TagViewer.mxml
net/systemeD/potlatch2/controller/ControllerState.as

Simple merge
@@@ -67,10 -65,10 +67,11 @@@ package net.systemeD.potlatch2.controll
                                case 66:        setSourceTag(); break;                                                                                                  // B - set source tag for current object
                                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 72:    showHistory(); break;                                                   // H - History
                                case 83:        SaveManager.saveChanges(); break;                                                                               // S - save
                                case 84:        controller.tagViewer.togglePanel(); return null;                                                // T - toggle tags panel
-                               case 90:        MainUndoStack.getGlobalStack().undo(); return null;                                             // Z - undo
+                               case 90:        if (!event.shiftKey) { MainUndoStack.getGlobalStack().undo(); return null;}// Z - undo
+                                           else { MainUndoStack.getGlobalStack().redo(); return null;  }           // Shift-Z - redo                                           
                                case Keyboard.ESCAPE:   revertSelection(); break;                                                                       // ESC - revert to server version
                                case Keyboard.NUMPAD_ADD:                                                                                                                       // + - add tag
                                case 187:       controller.tagViewer.selectAdvancedPanel();                                                             //   |