Remove .gitignore do nothing is ignored.

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

diff --git a/synfig-studio/trunk/src/gtkmm/canvasproperties.cpp b/synfig-studio/trunk/src/gtkmm/canvasproperties.cpp
index f437c12..d095331 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/canvasproperties.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvasproperties.cpp
@@ -6,6 +6,7 @@
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**     Copyright (c) 2007, 2008 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
@@ -40,6 +41,8 @@
 #include <gtkmm/scrolledwindow.h>
 #include "app.h"
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -57,7 +60,7 @@ using namespace studio;
 
 /* === M E T H O D S ======================================================= */
 
-CanvasProperties::CanvasProperties(Gtk::Window& parent,handle<synfigapp::CanvasInterface> canvas_interface):
+CanvasProperties::CanvasProperties(Gtk::Window& parent,etl::handle<synfigapp::CanvasInterface> canvas_interface):
        Gtk::Dialog(_("Canvas Properties"),parent,false,true),
        canvas_interface_(canvas_interface)
 {
@@ -109,6 +112,7 @@ CanvasProperties::CanvasProperties(Gtk::Window& parent,handle<synfigapp::CanvasI
        dialogBox->pack_start(widget_rend_desc, false, false, 0);
 
        canvas_interface_->signal_rend_desc_changed().connect(sigc::mem_fun(*this,&studio::CanvasProperties::refresh));
+       canvas_interface_->signal_id_changed().connect(sigc::mem_fun(*this,&studio::CanvasProperties::refresh));
 
        Gtk::Button *ok_button(manage(new class Gtk::Button(Gtk::StockID("gtk-ok"))));
        ok_button->show();
@@ -175,7 +179,7 @@ void
 CanvasProperties::on_button_meta_data_add()
 {
        synfig::String key;
-       if(App::dialog_entry("New MetaData Entry", "Please enter the name of the key",key) && !key.empty())
+       if(App::dialog_entry(_("New MetaData Entry"), _("Please enter the name of the key"),key) && !key.empty())
        {
                canvas_interface_->set_meta_data(key," ");
        }
@@ -219,14 +223,19 @@ CanvasProperties::on_rend_desc_changed()
 void
 CanvasProperties::on_apply_pressed()
 {
-       if(entry_id.get_text()!=canvas_interface_->get_canvas()->get_id())
-               canvas_interface_->set_id(entry_id.get_text());
-       if(entry_name.get_text()!=canvas_interface_->get_canvas()->get_name())
-               canvas_interface_->set_name(entry_name.get_text());
-       if(entry_description.get_text()!=canvas_interface_->get_canvas()->get_description())
-               canvas_interface_->set_description(entry_description.get_text());
-       if(dirty_rend_desc)                     // do this last, because it causes the dialog to be refreshed with currently set values
-               canvas_interface_->set_rend_desc(widget_rend_desc.get_rend_desc());
+       synfigapp::Action::PassiveGrouper group(canvas_interface_->get_instance().get(),_("Edit Canvas Properties"));
+
+       // fetch these three values first, because each set_() method refreshes the dialog with currently set values
+       String id = entry_id.get_text();
+       String name = entry_name.get_text();
+       String description = entry_description.get_text();
+
+       // do this first, because the other three cause the dialog to be refreshed with currently set values
+       if (dirty_rend_desc) canvas_interface_->set_rend_desc(widget_rend_desc.get_rend_desc());
+
+       if (id != canvas_interface_->get_canvas()->get_id() && !id.empty())             canvas_interface_->set_id(id);
+       if (name != canvas_interface_->get_canvas()->get_name())                                canvas_interface_->set_name(name);
+       if (description != canvas_interface_->get_canvas()->get_description())  canvas_interface_->set_description(description);
 
        dirty_rend_desc=false;
 }