X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Flayertree.cpp;h=70fd8bebbc7fa96e41610ae3c16aee63aeb2c17e;hb=ff2f23ced8c3a508754ff35836c7906ce62bfa8b;hp=c30605081f761b1a454bb80c1e3ea86da7ae93c1;hpb=2e59ea806abc21a2ab36b54825490ca6020c31b0;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/layertree.cpp b/synfig-studio/trunk/src/gtkmm/layertree.cpp
index c306050..70fd8be 100644
--- a/synfig-studio/trunk/src/gtkmm/layertree.cpp
+++ b/synfig-studio/trunk/src/gtkmm/layertree.cpp
@@ -303,7 +303,7 @@ LayerTree::create_param_tree()
 	Gtk::IconSize icon_size(Gtk::ICON_SIZE_SMALL_TOOLBAR);
 
 	{	// --- N A M E --------------------------------------------------------
-		Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column(_("Param")) );
+		Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column(_("Name")) );
 
 		// Set up the icon cell-renderer
 		Gtk::CellRendererPixbuf* icon_cellrenderer = Gtk::manage( new Gtk::CellRendererPixbuf() );
@@ -337,14 +337,14 @@ LayerTree::create_param_tree()
 		get_param_tree_view().append_column(*column);
 	}
 	{	// --- V A L U E  -----------------------------------------------------
-		Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column(_("ValueBase")) );
+		Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column(_("Value")) );
 
 		// Set up the value cell-renderer
 		cellrenderer_value=LayerParamTreeStore::add_cell_renderer_value(column);
 		cellrenderer_value->signal_edited().connect(sigc::mem_fun(*this, &studio::LayerTree::on_edited_value));
 		cellrenderer_value->property_value()=synfig::ValueBase();
 		column->add_attribute(cellrenderer_value->property_param_desc(), param_model.param_desc);
-		column->add_attribute(cellrenderer_value->property_inconsistant(),param_model.is_inconsistent);
+		column->add_attribute(cellrenderer_value->property_inconsistent(),param_model.is_inconsistent);
 		//cellrenderer_value->property_canvas()=canvas_interface->get_canvas(); // Is this line necessary?
 		cellrenderer_value->property_attributes()=attr_list;
 
@@ -648,7 +648,7 @@ LayerTree::on_selection_changed()
 	button_duplicate->set_sensitive(true);
 	button_delete->set_sensitive(true);
 
-	if(layer_list.size()==1 && (*layer_list.begin())->get_param("amount").is_valid()&& (*layer_list.begin())->get_param("amount").same_as(Real()))
+	if(layer_list.size()==1 && (*layer_list.begin())->get_param("amount").is_valid()&& (*layer_list.begin())->get_param("amount").same_type_as(Real()))
 	{
 		quick_layer=*layer_list.begin();
 	}
@@ -871,11 +871,13 @@ LayerTree::on_param_tree_event(GdkEvent *event)
 					{
 						synfigapp::ValueDesc value_desc(row[param_model.value_desc]);
 						Gtk::Menu* menu(manage(new Gtk::Menu()));
+						menu->signal_hide().connect(sigc::bind(sigc::ptr_fun(&delete_widget), menu));
 						App::get_instance(param_tree_store_->canvas_interface()->get_canvas())->make_param_menu(menu,param_tree_store_->canvas_interface()->get_canvas(),value_desc,0.5f);
 						menu->popup(event->button.button,gtk_get_current_event_time());
 						return true;
 					}
 					Gtk::Menu* menu(manage(new Gtk::Menu()));
+					menu->signal_hide().connect(sigc::bind(sigc::ptr_fun(&delete_widget), menu));
 					std::list<synfigapp::ValueDesc> value_desc_list;
 					ParamDesc param_desc(row[param_model.param_desc]);
 					for(;!layer_list.empty();layer_list.pop_back())