X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Ftoolbox.cpp;h=22ba151fcb171b01fc80fd3a323564871e203ecd;hb=c3ad95144d148602f672e95ddda1f18fc35502f8;hp=00da151dad67beb0520eccf1ead3be03a5d2b719;hpb=86fc7ed37ec4b48c7361472b3ac5716e719edda7;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/toolbox.cpp b/synfig-studio/trunk/src/gtkmm/toolbox.cpp
index 00da151..22ba151 100644
--- a/synfig-studio/trunk/src/gtkmm/toolbox.cpp
+++ b/synfig-studio/trunk/src/gtkmm/toolbox.cpp
@@ -192,12 +192,6 @@ void _create_stock_dialog2()
 	dock_dialog->present();
 }
 
-static void
-show_dialog_color()
-{
-	App::dialog_color->present();
-}
-
 Toolbox::Toolbox():
 	Gtk::Window(Gtk::WINDOW_TOPLEVEL),
 	dialog_settings(this,"toolbox")
@@ -283,14 +277,6 @@ Toolbox::Toolbox():
 	TOOLBOX_BUTTON(button_undo,"gtk-undo","Undo");
 	TOOLBOX_BUTTON(button_redo,"gtk-redo","Redo");
 	ADD_TOOLBOX_BUTTON(button_about,"synfig-about","About Synfig Studio");
-	ADD_TOOLBOX_BUTTON(button_color,"synfig-color","Color Dialog");
-
-	TOOLBOX_BUTTON(button_rotoscope_bline,"synfig-rotoscope_bline",_("Old Rotoscope BLine"));
-	TOOLBOX_BUTTON(button_rotoscope_polygon,"synfig-rotoscope_polygon",_("Rotoscope Polygon"));
-	TOOLBOX_BUTTON(button_eyedrop,"synfig-eyedrop",_("Eyedrop Tool"));
-	TOOLBOX_BUTTON(button_rotoscope,"synfig-rotoscope_bline",_("Rotoscope 2"));
-
-
 
 	button_about->signal_clicked().connect(sigc::ptr_fun(studio::App::dialog_about));
 	button_new->signal_clicked().connect(sigc::ptr_fun(studio::App::new_instance));
@@ -300,7 +286,6 @@ Toolbox::Toolbox():
 	button_save_all->signal_clicked().connect(sigc::ptr_fun(save_all));
 	button_undo->signal_clicked().connect(sigc::ptr_fun(studio::App::undo));
 	button_redo->signal_clicked().connect(sigc::ptr_fun(studio::App::redo));
-	button_color->signal_clicked().connect(sigc::ptr_fun(show_dialog_color));
 
 	// Create the file button cluster
 	Gtk::Table *file_buttons=manage(new class Gtk::Table(4, 4, false));
@@ -368,11 +353,6 @@ Toolbox::Toolbox():
 
 	button_undo->set_sensitive(false);
 	button_redo->set_sensitive(false);
-	button_rotoscope_bline->set_sensitive(false);
-	button_rotoscope->set_sensitive(false);
-	button_rotoscope_polygon->set_sensitive(false);
-	button_eyedrop->set_sensitive(false);
-
 
 	std::list<Gtk::TargetEntry> listTargets;
 	listTargets.push_back( Gtk::TargetEntry("text/plain") );
@@ -501,18 +481,18 @@ Toolbox::add_state(const Smach::state_base *state)
 
 	String name=state->get_name();
 
+	Gtk::StockItem stock_item;
+	Gtk::Stock::lookup(Gtk::StockID("synfig-"+name),stock_item);
+
 	Gtk::ToggleButton* button;
 	button=manage(new class Gtk::ToggleButton());
 
-	icon=manage(new Gtk::Image(Gtk::StockID("synfig-"+name),Gtk::IconSize(4)));
+	icon=manage(new Gtk::Image(stock_item.get_stock_id(),Gtk::IconSize(4)));
 	button->add(*icon);
-	tooltips.set_tip(*button,name);
+	tooltips.set_tip(*button,stock_item.get_label());
 	icon->show();
 	button->show();
 
-
-
-
 	int row=state_button_map.size()/4;
 	int col=state_button_map.size()%4;
 
@@ -527,7 +507,6 @@ Toolbox::add_state(const Smach::state_base *state)
 		)
 	);
 
-
 	refresh();
 }
 
@@ -544,7 +523,7 @@ Toolbox::update_undo_redo()
 
 	// This should probably go elsewhere, but it should
 	// work fine here with no troubles.
-	// These next several lines just adjust the rotoscope buttons
+	// These next several lines just adjust the tool buttons
 	// so that they are only clickable when they should be.
 	if(instance && App::get_selected_canvas_view())
 	{
@@ -578,19 +557,27 @@ Toolbox::on_recent_files_changed()
 		recent_files_menu->remove(**recent_files_menu->get_children().begin());
 
 	list<string>::const_iterator iter;
-	// Check to see if the file is already on the list.
-	// If it is, then remove it from the list
 	for(iter=App::get_recent_files().begin();iter!=App::get_recent_files().end();iter++)
-		recent_files_menu->items().push_back(Gtk::Menu_Helpers::MenuElem(basename(*iter),
+	{
+		string raw = basename(*iter), quoted;
+		size_t pos = 0, last_pos = 0;
+
+		// replace _ in filenames by __ or it won't show up in the menu
+		for (pos = last_pos = 0; (pos = raw.find('_', pos)) != string::npos; last_pos = pos)
+			quoted += raw.substr(last_pos, ++pos - last_pos) + '_';
+		quoted += raw.substr(last_pos);
+
+		recent_files_menu->items().push_back(Gtk::Menu_Helpers::MenuElem(quoted,
 			sigc::hide_return(sigc::bind(sigc::ptr_fun(&App::open),*iter))
 		));
+	}
 
 	// HACK
 	show();
 }
 
 void
-Toolbox::on_drop_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, const Gtk::SelectionData& selection_data_, guint info, guint time)
+Toolbox::on_drop_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& context, int /*x*/, int /*y*/, const Gtk::SelectionData& selection_data_, guint /*info*/, guint time)
 {
 	// We will make this true once we have a solid drop
 	bool success(false);