Merged two 'if' statements into one.

[synfig.git] / synfig-studio / trunk / src / gtkmm / toolbox.cpp

diff --git a/synfig-studio/trunk/src/gtkmm/toolbox.cpp b/synfig-studio/trunk/src/gtkmm/toolbox.cpp
index 6764b88..5b83382 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/toolbox.cpp
+++ b/synfig-studio/trunk/src/gtkmm/toolbox.cpp
@@ -6,6 +6,7 @@
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**     Copyright (c) 2007 Chris Moore
 **
 **     This package is free software; you can redistribute it and/or
 **     modify it under the terms of the GNU General Public License as
@@ -131,8 +132,7 @@ save_selected_instance()
                return;
        }
 
-       if(studio::App::get_selected_instance()->save() == studio::Instance::STATUS_ERROR)
-               App::dialog_error_blocking("Save - Error","Unable to save file");
+       studio::App::get_selected_instance()->save();
 }
 
 void
@@ -218,6 +218,8 @@ Toolbox::Toolbox():
        dock_dialogs->items().push_back(Gtk::Menu_Helpers::MenuElem("Canvases, History",sigc::ptr_fun(_create_stock_dialog1)));
        dock_dialogs->items().push_back(Gtk::Menu_Helpers::MenuElem("Layers, Children, Params",sigc::ptr_fun(_create_stock_dialog2)));
        dock_dialogs->items().push_back(Gtk::Menu_Helpers::SeparatorElem());
+       dock_dialogs->items().push_back(Gtk::Menu_Helpers::MenuElem("Reset Windows to Original Layout",sigc::ptr_fun(App::reset_initial_window_configuration)));
+       dock_dialogs->items().push_back(Gtk::Menu_Helpers::SeparatorElem());
 
 
        filemenu->items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::Stock::NEW,
@@ -586,8 +588,8 @@ Toolbox::on_drop_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& contex
        {
                synfig::String selection_data((gchar *)(selection_data_.get_data()));
 
-               // For some reason, GTK hands us a list of URL's seperated
-               // by not only Carrage-Returns, but also Line-Feeds.
+               // For some reason, GTK hands us a list of URLs separated
+               // by not only Carriage-Returns, but also Line-Feeds.
                // Line-Feeds will mess us up. Remove all the line-feeds.
                while(selection_data.find_first_of('\r')!=synfig::String::npos)
                        selection_data.erase(selection_data.begin()+selection_data.find_first_of('\r'));