(THIS IS A TRANSITIONAL REVISION, DO NOT USE, WAIT FOR UPDATED DEPS)

[xonotic/netradiant.git] / radiant / mainframe.cpp

diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp
index f066482a1728d929a730b5410ceecda2b2bd77ae..6af2cf8f69854028ae087b79b817054ae9840cde 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");
 }
 
   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");
 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));
 
 
   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));
   RotateFlip_constructToolbar(toolbar);
 
   gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));


@@ -2880,7 +2890,7 @@ void MainFrame::Create()
 
 #if !defined(WIN32)
   {
 
 #if !defined(WIN32)
   {

-    GdkPixbuf* pixbuf = pixbuf_new_from_file_with_mask("icon.bmp");
+    GdkPixbuf* pixbuf = pixbuf_new_from_file_with_mask("bitmaps/icon.bmp");

     if(pixbuf != 0)
     {
       gtk_window_set_icon(window, pixbuf);
     if(pixbuf != 0)
     {
       gtk_window_set_icon(window, pixbuf);