X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fcanvasproperties.cpp;h=d09533173cb91da5b085413c2c3c29ea8ab5e0d7;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=331f8b29488ecbe63479b49f8d2362b60515cc71;hpb=e10033355e7df3cd6b2dc9799cf9423d16e3c4ce;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/canvasproperties.cpp b/synfig-studio/trunk/src/gtkmm/canvasproperties.cpp index 331f8b2..d095331 100644 --- a/synfig-studio/trunk/src/gtkmm/canvasproperties.cpp +++ b/synfig-studio/trunk/src/gtkmm/canvasproperties.cpp @@ -2,10 +2,11 @@ /*! \file canvasproperties.cpp ** \brief Template File ** -** $Id: canvasproperties.cpp,v 1.1.1.1 2005/01/07 03:34:35 darco Exp $ +** $Id$ ** ** \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 #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 canvas_interface): +CanvasProperties::CanvasProperties(Gtk::Window& parent,etl::handle canvas_interface): Gtk::Dialog(_("Canvas Properties"),parent,false,true), canvas_interface_(canvas_interface) { @@ -79,7 +82,7 @@ CanvasProperties::CanvasProperties(Gtk::Window& parent,handleset_padding(6, 0, 24, 0); info_frame->add(*infoPadding); - + Gtk::Table *info_table=manage(new Gtk::Table(2,2,false)); info_table->set_row_spacings(6); info_table->set_col_spacings(12); @@ -92,7 +95,7 @@ CanvasProperties::CanvasProperties(Gtk::Window& parent,handleset_alignment(0, 0.5); idLabel->set_mnemonic_widget(entry_id); - info_table->attach(*idLabel, 0, 1, 0, 1, Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0); + info_table->attach(*idLabel, 0, 1, 0, 1, Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0); info_table->attach(entry_id, 1, 2, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0); } Gtk::Label *nameLabel = manage(new Gtk::Label(_("_Name"), true)); @@ -101,14 +104,15 @@ CanvasProperties::CanvasProperties(Gtk::Window& parent,handleset_alignment(0, 0.5); descriptionLabel->set_mnemonic_widget(entry_description); - info_table->attach(*nameLabel, 0, 1, 1, 2, Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0); - info_table->attach(*descriptionLabel, 0, 1, 2, 3, Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0); - info_table->attach(entry_name, 1, 2, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0); - info_table->attach(entry_description, 1, 2, 2, 3, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0); + info_table->attach(*nameLabel, 0, 1, 1, 2, Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0); + info_table->attach(*descriptionLabel, 0, 1, 2, 3, Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0); + info_table->attach(entry_name, 1, 2, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0); + info_table->attach(entry_description, 1, 2, 2, 3, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0); 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(); @@ -126,7 +130,7 @@ CanvasProperties::CanvasProperties(Gtk::Window& parent,handlesignal_clicked().connect(sigc::mem_fun(*this, &studio::CanvasProperties::on_cancel_pressed)); //set_default_response(1); - + get_vbox()->show_all(); refresh(); @@ -138,13 +142,13 @@ CanvasProperties::create_meta_data_view() { MetaDataTreeStore::Model model; meta_data_tree_view=(manage(new class Gtk::TreeView())); - + meta_data_tree_view->append_column(_("Key"),model.key); meta_data_tree_view->append_column_editable(_("Data"),model.data); meta_data_tree_view->set_model(MetaDataTreeStore::create(canvas_interface_)); meta_data_tree_view->set_rules_hint(); meta_data_tree_view->show(); - + Gtk::ScrolledWindow *scrolledwindow = manage(new class Gtk::ScrolledWindow()); scrolledwindow->set_flags(Gtk::CAN_FOCUS); scrolledwindow->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); @@ -152,11 +156,11 @@ CanvasProperties::create_meta_data_view() scrolledwindow->set_shadow_type(Gtk::SHADOW_ETCHED_IN); scrolledwindow->show(); - - + + Gtk::Table *table=manage(new Gtk::Table()); table->attach(*scrolledwindow, 0, 2, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); - + Gtk::Button* button_add(manage(new Gtk::Button(Gtk::StockID("gtk-add")))); button_add->show(); button_add->signal_clicked().connect(sigc::mem_fun(*this,&CanvasProperties::on_button_meta_data_add)); @@ -164,9 +168,9 @@ CanvasProperties::create_meta_data_view() Gtk::Button* button_delete(manage(new Gtk::Button(Gtk::StockID("gtk-delete")))); button_delete->show(); - button_delete->signal_clicked().connect(sigc::mem_fun(*this,&CanvasProperties::on_button_meta_data_delete)); + button_delete->signal_clicked().connect(sigc::mem_fun(*this,&CanvasProperties::on_button_meta_data_delete)); table->attach(*button_delete, 1, 2, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0); - + table->show(); return *table; } @@ -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," "); } @@ -200,7 +204,7 @@ CanvasProperties::refresh() entry_id.set_text(canvas_interface_->get_canvas()->get_id()); entry_name.set_text(canvas_interface_->get_canvas()->get_name()); entry_description.set_text(canvas_interface_->get_canvas()->get_description()); - + dirty_rend_desc=false; update_title(); @@ -219,15 +223,20 @@ CanvasProperties::on_rend_desc_changed() void CanvasProperties::on_apply_pressed() { - if(dirty_rend_desc) - canvas_interface_->set_rend_desc(widget_rend_desc.get_rend_desc()); - 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()); - + 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; }