X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fmod_palette%2Fdock_paledit.cpp;h=88c88920d8fc6b8e2df5748f1471a043adf6a7db;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=ee0a975152d7479699e6c3f6a229ec4e9dd57a9f;hpb=837b63e9fb829d66d43f4f169861f8979f76820d;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/mod_palette/dock_paledit.cpp b/synfig-studio/trunk/src/gtkmm/mod_palette/dock_paledit.cpp
index ee0a975..88c8892 100644
--- a/synfig-studio/trunk/src/gtkmm/mod_palette/dock_paledit.cpp
+++ b/synfig-studio/trunk/src/gtkmm/mod_palette/dock_paledit.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
@@ -44,6 +45,8 @@
 #include "../app.h"
 #include "../dialog_color.h"
 
+#include "../general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -119,12 +122,11 @@ Dock_PalEdit::Dock_PalEdit():
 	table(2,2,false)
 {
 	action_group=Gtk::ActionGroup::create();
-	DEBUGPOINT();
 	action_group->add(Gtk::Action::create(
 		"palette-add-color",
 		Gtk::StockID("gtk-add"),
 		_("Add Color"),
-		_("Add current foreground color\nto the palette")
+		_("Add current outline color\nto the palette")
 	),
 		sigc::mem_fun(
 			*this,
@@ -149,7 +151,7 @@ Dock_PalEdit::Dock_PalEdit():
 	/*
 	add_button(
 		Gtk::StockID("gtk-add"),
-		_("Add current foreground color\nto the palette")
+		_("Add current outline color\nto the palette")
 	)->signal_clicked().connect(
 		sigc::mem_fun(
 			*this,
@@ -181,13 +183,14 @@ Dock_PalEdit::set_palette(const synfig::Palette& x)
 void
 Dock_PalEdit::on_add_pressed()
 {
-	add_color(synfigapp::Main::get_foreground_color());
+	add_color(synfigapp::Main::get_outline_color());
 }
 
 void
 Dock_PalEdit::show_menu(int i)
 {
 	Gtk::Menu* menu(manage(new Gtk::Menu()));
+	menu->signal_hide().connect(sigc::bind(sigc::ptr_fun(&delete_widget), menu));
 
 	menu->items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("gtk-select-color"),
 		sigc::bind(
@@ -293,7 +296,7 @@ Dock_PalEdit::edit_color(int i)
 void
 Dock_PalEdit::select_color(int i)
 {
-	synfigapp::Main::set_foreground_color(get_color(i));
+	synfigapp::Main::set_outline_color(get_color(i));
 }
 
 void