- Added Undo/Redo-Toolbarbuttons (Shaderman)

- Fixed Bug #1078 (sogined)

git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@139 8a3a26a2-13c4-0310-b231-cf6edde360e5

diff --git a/CHANGES b/CHANGES
index 22d356abc624ef7bb61b0f2bfc2309cbd0f848c1..18c88211c6751b19916fe9a04cd4c9fa85cfa043 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,11 @@
 This is the changelog for developers, != changelog for the end user 
 that we distribute with the binaries. (see changelog)
 
+24/01/2007
+namespace
+- Added Undo/Redo-Toolbarbuttons (Shaderman)
+- Fixed Bug #1078 (sogined)
+
 18/01/2007
 namespace
 - Weird shiftvalues are now hidden to the user, shiftvalues will

diff --git a/TODO b/TODO
index 6e2e9259713f85b0391a0f485b9954969e4757c7..c0b6aa515ec1c23a7fa94d381f65d359ce9be28d 100644 (file)
--- a/TODO
+++ b/TODO
@@ -119,6 +119,7 @@ Shortcuts: convert shortcuts.ini to xml.
 Shortcuts: warn when duplicate shortcuts are registered
 Shortcuts: rename commands in order to group shortcuts list better.
 upgrade to new API for SymGetModuleInfo - required for compiling with Visual Studio 8.0
+Doom3: lights should stay in place while resizing
 
 
 LOW priority features

diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp
index f066482a1728d929a730b5410ceecda2b2bd77ae..7710d468a62794efad3492a65f740b0012e4f79f 100644 (file)
--- a/radiant/mainframe.cpp
+++ b/radiant/mainframe.cpp
@@ -2417,6 +2417,12 @@ void File_constructToolbar(GtkToolbar* toolbar)
   toolbar_append_button(toolbar, "Save the active map (CTRL + S)", "file_save.bmp", "SaveMap");
 }
 
+void UndoRedo_constructToolbar(GtkToolbar* toolbar)
+{
+  toolbar_append_button(toolbar, "Undo (CTRL + Z)", "undo.bmp", "Undo");
+  toolbar_append_button(toolbar, "Redo (CTRL + Y)", "redo.bmp", "Redo");
+}
+
 void RotateFlip_constructToolbar(GtkToolbar* toolbar)
 {
   toolbar_append_button(toolbar, "x-axis Flip", "brush_flipx.bmp", "MirrorSelectionX");
@@ -2480,6 +2486,10 @@ GtkToolbar* create_main_toolbar(MainFrame::EViewStyle style)
 
   gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));
 
+  UndoRedo_constructToolbar(toolbar);
+
+  gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));
+
   RotateFlip_constructToolbar(toolbar);
 
   gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));

diff --git a/svn.py b/svn.py
index 4fe8cbc243404c0fa48557359539486d7ec5440e..68d60457ee677709910860ec787a51cd492e18ff 100644 (file)
--- a/svn.py
+++ b/svn.py
@@ -8,7 +8,9 @@ def getRevision(path):
     line = cmd.readline()
     if line == "":
       raise Exception("failed to obtain revision number")
-    if line.startswith("Revision: "):
-      revision = int(line[10:])
-      return revision
-      
\ No newline at end of file
+    for word in line.split():
+      try:
+        return int(word)
+      except:
+        pass
+