X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftags%2Fstable%2Fsrc%2Fgtkmm%2Ftoolbox.cpp;h=55c43ae454dc31bd6573ea00b1bb954764af4f4d;hb=47fce282611fbba1044921d22ca887f9b53ad91a;hp=2b03fa6e8c2055f843336f52dd336a3c973efa57;hpb=7c6d5426922cb3cda793f688dcd4d534b02765c8;p=synfig.git diff --git a/synfig-studio/tags/stable/src/gtkmm/toolbox.cpp b/synfig-studio/tags/stable/src/gtkmm/toolbox.cpp index 2b03fa6..55c43ae 100644 --- a/synfig-studio/tags/stable/src/gtkmm/toolbox.cpp +++ b/synfig-studio/tags/stable/src/gtkmm/toolbox.cpp @@ -1,18 +1,24 @@ -/*! ======================================================================== -** Sinfg -** Template File -** $Id: toolbox.cpp,v 1.3 2005/01/13 20:23:01 darco Exp $ +/* === S Y N F I G ========================================================= */ +/*! \file toolbox.cpp +** \brief writeme ** -** Copyright (c) 2002 Robert B. Quattlebaum Jr. +** $Id$ ** -** This software and associated documentation -** are CONFIDENTIAL and PROPRIETARY property of -** the above-mentioned copyright holder. +** \legal +** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley +** Copyright (c) 2007, 2008 Chris Moore +** Copyright (c) 2008 Paul Wise ** -** You may not copy, print, publish, or in any -** other way distribute this software without -** a prior written agreement with -** the copyright holder. +** This package is free software; you can redistribute it and/or +** modify it under the terms of the GNU General Public License as +** published by the Free Software Foundation; either version 2 of +** the License, or (at your option) any later version. +** +** This package is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** General Public License for more details. +** \endlegal ** ** === N O T E S =========================================================== ** @@ -72,23 +78,27 @@ #include "widget_defaults.h" -#include +#include + +#include "general.h" #endif using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; using namespace studio; -using namespace SigC; +using namespace sigc; /* === M A C R O S ========================================================= */ -#define GRAB_HINT_DATA(y) { \ +#define GRAB_HINT_DATA(y,default) { \ String x; \ - if(sinfgapp::Main::settings().get_value(String("pref.")+y+"_hints",x)) \ + if(synfigapp::Main::settings().get_value(String("pref.")+y+"_hints",x)) \ { \ - set_type_hint((Gdk::WindowTypeHint)atoi(x.c_str())); \ + set_type_hint((Gdk::WindowTypeHint)atoi(x.c_str())); \ + } else {\ + set_type_hint(default); \ } \ } @@ -121,12 +131,11 @@ save_selected_instance() { if(!studio::App::get_selected_instance()) { - App::dialog_error_blocking("Cannot save","Nothing to save"); + App::dialog_error_blocking(_("Cannot save"),_("Nothing to save")); return; } - if(!studio::App::get_selected_instance()->save()) - App::dialog_error_blocking("Save - Error","Unable to save file"); + studio::App::get_selected_instance()->save(); } void @@ -134,7 +143,7 @@ save_as_selected_instance() { if(!studio::App::get_selected_instance()) { - App::dialog_error_blocking("Cannot save as","Nothing to save"); + App::dialog_error_blocking(_("Cannot save as"),_("Nothing to save")); return; } @@ -142,18 +151,26 @@ save_as_selected_instance() } void +save_all() +{ + std::list >::iterator iter; + for(iter=App::instance_list.begin();iter!=App::instance_list.end();iter++) + (*iter)->save(); +} + +void close_selected_instance() { etl::handle instance=studio::App::get_selected_instance(); if(!instance) { - App::dialog_error_blocking("Cannot close","Nothing to close"); + App::dialog_error_blocking(_("Cannot close"),_("Nothing to close")); return; } instance->safe_close(); - + //assert(instance.unique()); } @@ -178,40 +195,49 @@ 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") { + GRAB_HINT_DATA( + "toolbox", +//#ifdef __APPLE__ + Gdk::WINDOW_TYPE_HINT_NORMAL +//#else +// Gdk::WINDOW_TYPE_HINT_UTILITY +//#endif + ); + set_keep_above(false); + set_role("toolbox"); + + + recent_files_menu= manage(new class Gtk::Menu()); - + Gtk::Menu *filemenu =manage(new class Gtk::Menu()); dock_dialogs=manage(new class Gtk::Menu()); - dock_dialogs->items().push_back(Gtk::Menu_Helpers::MenuElem("Canvases, History",sigc::ptr_fun(_create_stock_dialog1))); - dock_dialogs->items().push_back(Gtk::Menu_Helpers::MenuElem("Layers, Children , Params",sigc::ptr_fun(_create_stock_dialog2))); + dock_dialogs->items().push_back(Gtk::Menu_Helpers::MenuElem(_("Vertical Dock: Canvases, History"),sigc::ptr_fun(_create_stock_dialog1))); + dock_dialogs->items().push_back(Gtk::Menu_Helpers::MenuElem(_("Horizontal Dock: Layers, Children, Params"),sigc::ptr_fun(_create_stock_dialog2))); dock_dialogs->items().push_back(Gtk::Menu_Helpers::SeparatorElem()); + dock_dialogs->items().push_back(Gtk::Menu_Helpers::MenuElem(_("Reset Windows to Original Layout"),sigc::ptr_fun(App::reset_initial_window_configuration))); + dock_dialogs->items().push_back(Gtk::Menu_Helpers::SeparatorElem()); + - filemenu->items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::Stock::NEW, - sigc::ptr_fun(&studio::App::new_instance))); + sigc::ptr_fun(&studio::App::new_instance))); filemenu->items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::Stock::OPEN, - sigc::ptr_fun(&studio::App::dialog_open))); + sigc::bind(sigc::ptr_fun(&studio::App::dialog_open), ""))); filemenu->items().push_back(Gtk::Menu_Helpers::MenuElem(_("Open Recent"),*recent_files_menu)); - - filemenu->items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("sinfg-saveall"), - sigc::ptr_fun(&studio::App::dialog_not_implemented))); + + filemenu->items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("synfig-saveall"), + sigc::ptr_fun(save_all))); filemenu->items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::Stock::CLOSE, sigc::ptr_fun(close_selected_instance))); filemenu->items().push_back(Gtk::Menu_Helpers::SeparatorElem()); - filemenu->items().push_back(Gtk::Menu_Helpers::MenuElem(_("Dialogs"),*dock_dialogs)); + filemenu->items().push_back(Gtk::Menu_Helpers::MenuElem(_("Panels"),*dock_dialogs)); //filemenu->items().push_back(Gtk::Menu_Helpers::MenuElem(_("Canvas Browser..."), // sigc::mem_fun(studio::App::show_comp_view))); @@ -228,74 +254,86 @@ Toolbox::Toolbox(): filemenu->items().push_back(Gtk::Menu_Helpers::MenuElem(_("Setup..."), sigc::ptr_fun(&studio::App::show_setup))); - filemenu->items().push_back(Gtk::Menu_Helpers::SeparatorElem()); + filemenu->items().push_back(Gtk::Menu_Helpers::SeparatorElem()); filemenu->items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID(Gtk::Stock::QUIT), - sigc::ptr_fun(studio::App::quit))); - + sigc::ptr_fun(studio::App::quit))); + +#define WIKI(title,page) \ + helpmenu->items().push_back(Gtk::Menu_Helpers::MenuElem(title, \ + sigc::bind(sigc::ptr_fun(&studio::App::open_url),String("http://synfig.org")+page))) + Gtk::Menu *helpmenu = manage(new class Gtk::Menu()); - helpmenu->items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::Stock::HELP, - sigc::ptr_fun(studio::App::dialog_not_implemented))); - helpmenu->items().push_back(Gtk::Menu_Helpers::SeparatorElem()); - helpmenu->items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("sinfg-about"), - sigc::ptr_fun(studio::App::dialog_about))); - + helpmenu->items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::Stock::HELP, sigc::ptr_fun(studio::App::dialog_help))); + helpmenu->items().push_back(Gtk::Menu_Helpers::SeparatorElem()); + + /* TRANSLATORS: Help menu entry */ WIKI(_("Synfig Wiki"), /* TRANSLATORS: a wiki page */ _("/Main_Page") ); + /* TRANSLATORS: Help menu entry */ WIKI(_("Tutorials"), /* TRANSLATORS: a wiki page */ _("/Tutorials") ); + /* TRANSLATORS: Help menu entry */ WIKI(_("Frequently Asked Questions"),/* TRANSLATORS: a wiki page */ _("/FAQ") ); + /* TRANSLATORS: Help menu entry */ WIKI(_("Get Support"), /* TRANSLATORS: a wiki page */ _("/Contact") ); + /* TRANSLATORS: Help menu entry */ WIKI(_("Keyboard Shortcuts"), /* TRANSLATORS: a wiki page */ _("/Keyboard_Shortcuts") ); + /* TRANSLATORS: Help menu entry */ WIKI(_("Mouse Shortcuts"), /* TRANSLATORS: a wiki page */ _("/Mouse_Shortcuts") ); + /* TRANSLATORS: Help menu entry */ WIKI(_("All Pages"), "/Special:Allpages" ); + + helpmenu->items().push_back(Gtk::Menu_Helpers::SeparatorElem()); + helpmenu->items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("synfig-about"), + sigc::ptr_fun(studio::App::dialog_about))); + Gtk::MenuBar *menubar1 = manage(new class Gtk::MenuBar()); - menubar1->items().push_back(Gtk::Menu_Helpers::MenuElem("_File",*filemenu)); - menubar1->items().push_back(Gtk::Menu_Helpers::MenuElem("_Help",*helpmenu)); + menubar1->items().push_back(Gtk::Menu_Helpers::MenuElem(_("_File"),*filemenu)); + menubar1->items().push_back(Gtk::Menu_Helpers::MenuElem(_("_Help"),*helpmenu)); + - menubar1->show(); - - Gtk::Image *icon; - - ADD_TOOLBOX_BUTTON(button_new,"gtk-new","New"); - ADD_TOOLBOX_BUTTON(button_open,"gtk-open","Open"); - ADD_TOOLBOX_BUTTON(button_save,"gtk-save","Save"); - ADD_TOOLBOX_BUTTON(button_saveas,"gtk-save-as","SaveAs"); - ADD_TOOLBOX_BUTTON(button_save_all,"sinfg-saveall","Save All"); - TOOLBOX_BUTTON(button_undo,"gtk-undo","Undo"); - TOOLBOX_BUTTON(button_redo,"gtk-redo","Redo"); - ADD_TOOLBOX_BUTTON(button_about,"sinfg-about","About Sinfg Studio"); - ADD_TOOLBOX_BUTTON(button_color,"sinfg-color","Color Dialog"); - - TOOLBOX_BUTTON(button_rotoscope_bline,"sinfg-rotoscope_bline",_("Old Rotoscope BLine")); - TOOLBOX_BUTTON(button_rotoscope_polygon,"sinfg-rotoscope_polygon",_("Rotoscope Polygon")); - TOOLBOX_BUTTON(button_eyedrop,"sinfg-eyedrop",_("Eyedrop Tool")); - TOOLBOX_BUTTON(button_rotoscope,"sinfg-rotoscope_bline",_("Rotoscope 2")); - + Gtk::Image *icon; + ADD_TOOLBOX_BUTTON(button_new,"gtk-new",_("New...")); + ADD_TOOLBOX_BUTTON(button_open,"gtk-open",_("Open...")); + ADD_TOOLBOX_BUTTON(button_save,"gtk-save",_("Save")); + ADD_TOOLBOX_BUTTON(button_saveas,"gtk-save-as",_("Save As...")); + ADD_TOOLBOX_BUTTON(button_save_all,"synfig-saveall",_("Save All")); + TOOLBOX_BUTTON(button_undo,"gtk-undo",_("Undo")); + TOOLBOX_BUTTON(button_redo,"gtk-redo",_("Redo")); + ADD_TOOLBOX_BUTTON(button_setup,"gtk-properties",_("Setup")); + ADD_TOOLBOX_BUTTON(button_about,"synfig-about",_("About Synfig Studio")); + ADD_TOOLBOX_BUTTON(button_help,"gtk-help",_("Help")); + + button_setup->signal_clicked().connect(sigc::ptr_fun(studio::App::show_setup)); button_about->signal_clicked().connect(sigc::ptr_fun(studio::App::dialog_about)); + button_help->signal_clicked().connect(sigc::ptr_fun(studio::App::dialog_help)); button_new->signal_clicked().connect(sigc::ptr_fun(studio::App::new_instance)); - button_open->signal_clicked().connect(sigc::ptr_fun(studio::App::dialog_open)); + button_open->signal_clicked().connect(sigc::bind(sigc::ptr_fun(studio::App::dialog_open), "")); button_save->signal_clicked().connect(sigc::ptr_fun(save_selected_instance)); button_saveas->signal_clicked().connect(sigc::ptr_fun(save_as_selected_instance)); - button_save_all->signal_clicked().connect(sigc::ptr_fun(studio::App::dialog_not_implemented)); + 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)); - file_buttons->attach(*button_new,0,1,0,1, Gtk::SHRINK, Gtk::SHRINK, 0, 0); - file_buttons->attach(*button_open,1,2,0,1, Gtk::SHRINK, Gtk::SHRINK, 0, 0); - file_buttons->attach(*button_save,2,3,0,1, Gtk::SHRINK, Gtk::SHRINK, 0, 0); - file_buttons->attach(*button_saveas,3,4,0,1, Gtk::SHRINK, Gtk::SHRINK, 0, 0); - file_buttons->attach(*button_save_all,0,1,1,2, Gtk::SHRINK, Gtk::SHRINK, 0, 0); - file_buttons->attach(*button_undo,1,2,1,2, Gtk::SHRINK, Gtk::SHRINK, 0, 0); - file_buttons->attach(*button_redo,2,3,1,2, Gtk::SHRINK, Gtk::SHRINK, 0, 0); - file_buttons->attach(*button_about,3,4,1,2, Gtk::SHRINK, Gtk::SHRINK, 0, 0); - //file_buttons->attach(*button_color,0,1,2,3, Gtk::SHRINK, Gtk::SHRINK, 0, 0); + Gtk::Table *file_buttons=manage(new class Gtk::Table()); + + file_buttons->attach(*button_new, 0,1, 0,1, Gtk::SHRINK, Gtk::SHRINK, 0, 0); + file_buttons->attach(*button_open, 1,2, 0,1, Gtk::SHRINK, Gtk::SHRINK, 0, 0); + file_buttons->attach(*button_save, 2,3, 0,1, Gtk::SHRINK, Gtk::SHRINK, 0, 0); + file_buttons->attach(*button_saveas, 3,4, 0,1, Gtk::SHRINK, Gtk::SHRINK, 0, 0); + file_buttons->attach(*button_save_all, 4,5, 0,1, Gtk::SHRINK, Gtk::SHRINK, 0, 0); + + file_buttons->attach(*button_undo, 0,1, 1,2, Gtk::SHRINK, Gtk::SHRINK, 0, 0); + file_buttons->attach(*button_redo, 1,2, 1,2, Gtk::SHRINK, Gtk::SHRINK, 0, 0); + file_buttons->attach(*button_setup, 2,3, 1,2, Gtk::SHRINK, Gtk::SHRINK, 0, 0); + file_buttons->attach(*button_about, 3,4, 1,2, Gtk::SHRINK, Gtk::SHRINK, 0, 0); + file_buttons->attach(*button_help, 4,5, 1,2, Gtk::SHRINK, Gtk::SHRINK, 0, 0); + file_buttons->show(); - tool_table=manage(new class Gtk::Table(4, 4, false)); + tool_table=manage(new class Gtk::Table()); tool_table->show(); Gtk::HandleBox* handle_tools(manage(new Gtk::HandleBox())); handle_tools->add(*tool_table); handle_tools->show(); handle_tools->set_handle_position(Gtk::POS_TOP); handle_tools->set_snap_edge(Gtk::POS_TOP); - + Widget_Defaults* widget_defaults(manage(new Widget_Defaults())); widget_defaults->show(); Gtk::HandleBox* handle_defaults(manage(new Gtk::HandleBox())); @@ -303,30 +341,30 @@ Toolbox::Toolbox(): handle_defaults->show(); handle_defaults->set_handle_position(Gtk::POS_TOP); handle_defaults->set_snap_edge(Gtk::POS_TOP); - + // Create the toplevel table Gtk::Table *table1 = manage(new class Gtk::Table(1, 2, false)); table1->set_row_spacings(0); table1->set_col_spacings(0); - table1->attach(*menubar1, 0, 1, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::SHRINK, 0, 0); - table1->attach(*file_buttons, 0, 1, 1, 2, Gtk::FILL|Gtk::EXPAND,Gtk::EXPAND|Gtk::FILL, 0, 0); + table1->attach(*menubar1, 0,1, 0,1, Gtk::FILL|Gtk::EXPAND, Gtk::SHRINK, 0, 0); + table1->attach(*file_buttons, 0,1, 1,2, Gtk::FILL|Gtk::EXPAND,Gtk::EXPAND|Gtk::FILL, 0, 0); //table1->attach(*manage(new Gtk::Label(_("Tools"))), 0, 1, 2, 3, Gtk::FILL|Gtk::EXPAND,Gtk::EXPAND|Gtk::FILL, 0, 0); - table1->attach(*handle_tools, 0, 1, 3, 4, Gtk::FILL|Gtk::EXPAND,Gtk::EXPAND|Gtk::FILL, 0, 0); - table1->attach(*handle_defaults, 0, 1, 4, 5, Gtk::FILL|Gtk::EXPAND,Gtk::EXPAND|Gtk::FILL, 0, 0); + table1->attach(*handle_tools, 0,1, 3,4, Gtk::FILL|Gtk::EXPAND,Gtk::EXPAND|Gtk::FILL, 0, 0); + table1->attach(*handle_defaults, 0,1, 4,5, Gtk::FILL|Gtk::EXPAND,Gtk::EXPAND|Gtk::FILL, 0, 0); table1->show_all(); - - - + + + // Set the parameters for this window add(*table1); - set_title("Synfig Studio"); + set_title(_("Synfig Studio")); set_modal(false); property_window_position().set_value(Gtk::WIN_POS_NONE); signal_delete_event().connect(sigc::ptr_fun(App::shutdown_request)); set_resizable(false); - + App::signal_instance_selected().connect( sigc::hide( sigc::mem_fun(*this,&studio::Toolbox::update_undo_redo) @@ -338,12 +376,7 @@ 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); - + button_redo->set_sensitive(false); std::list listTargets; listTargets.push_back( Gtk::TargetEntry("text/plain") ); @@ -352,21 +385,21 @@ Toolbox::Toolbox(): drag_dest_set(listTargets); signal_drag_data_received().connect( sigc::mem_fun(*this, &studio::Toolbox::on_drop_drag_data_received) ); - + App::dock_manager->signal_dockable_registered().connect(sigc::mem_fun(*this,&Toolbox::dockable_registered)); - + changing_state_=false; - - GRAB_HINT_DATA("toolbox"); + + add_accel_group(App::ui_manager()->get_accel_group()); - - App::signal_present_all().connect(sigc::mem_fun(*this,&Toolbox::present)); + + App::signal_present_all().connect(sigc::mem_fun0(*this,&Toolbox::present)); } Toolbox::~Toolbox() { hide(); - //studio::App::cb.task("Toolbox: I was nailed!"); + //studio::App::cb.task(_("Toolbox: I was nailed!")); //studio::App::quit(); if(studio::App::toolbox==this) @@ -375,17 +408,17 @@ Toolbox::~Toolbox() } void -Toolbox::set_active_state(const String& statename) +Toolbox::set_active_state(const synfig::String& statename) { - std::map::iterator iter; + std::map::iterator iter; changing_state_=true; - - sinfgapp::Main::set_state(statename); - + + synfigapp::Main::set_state(statename); + try { - + for(iter=state_button_map.begin();iter!=state_button_map.end();++iter) { if(iter->first==statename) @@ -409,7 +442,7 @@ Toolbox::set_active_state(const String& statename) } void -Toolbox::change_state(const sinfg::String& statename) +Toolbox::change_state(const synfig::String& statename) { etl::handle canvas_view(studio::App::get_selected_canvas_view()); if(canvas_view) @@ -418,14 +451,14 @@ Toolbox::change_state(const sinfg::String& statename) { return; } - + if(state_button_map.count(statename)) { state_button_map[statename]->clicked(); } else { - sinfg::error("Unknown state \"%s\"",statename.c_str()); + synfig::error("Unknown state \"%s\"",statename.c_str()); } } } @@ -436,7 +469,7 @@ Toolbox::change_state_(const Smach::state_base *state) if(changing_state_) return; changing_state_=true; - + try { etl::handle canvas_view(studio::App::get_selected_canvas_view()); @@ -444,7 +477,7 @@ Toolbox::change_state_(const Smach::state_base *state) { if(state->get_name()==String("normal")) { - canvas_view->get_smach().egress(); + canvas_view->get_smach().egress(); } else { @@ -459,7 +492,7 @@ Toolbox::change_state_(const Smach::state_base *state) changing_state_=false; throw; } - + changing_state_=false; } @@ -471,63 +504,62 @@ Toolbox::add_state(const Smach::state_base *state) assert(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("sinfg-"+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; + int row=state_button_map.size()/5; + int col=state_button_map.size()%5; tool_table->attach(*button,col,col+1,row,row+1, Gtk::SHRINK, Gtk::SHRINK, 0, 0); - + state_button_map[name]=button; - + button->signal_clicked().connect( sigc::bind( sigc::mem_fun(*this,&studio::Toolbox::change_state_), state ) ); - - + refresh(); } void Toolbox::update_undo_redo() -{ +{ etl::handle instance=App::get_selected_instance(); if(instance) { button_undo->set_sensitive(instance->get_undo_status()); - button_redo->set_sensitive(instance->get_redo_status()); + button_redo->set_sensitive(instance->get_redo_status()); } - + // 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()) { - std::map::iterator iter; - + std::map::iterator iter; + for(iter=state_button_map.begin();iter!=state_button_map.end();++iter) iter->second->set_sensitive(true); } else { - std::map::iterator iter; - + std::map::iterator iter; + for(iter=state_button_map.begin();iter!=state_button_map.end();++iter) iter->second->set_sensitive(false); } @@ -544,69 +576,77 @@ Toolbox::update_undo_redo() void Toolbox::on_recent_files_changed() -{ +{ while(recent_files_menu->get_children().size()) recent_files_menu->remove(**recent_files_menu->get_children().begin()); - + list::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& context, int x, int y, const Gtk::SelectionData& selection_data_, guint info, guint time) +Toolbox::on_drop_drag_data_received(const Glib::RefPtr& 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); - + if ((selection_data_.get_length() >= 0) && (selection_data_.get_format() == 8)) { - sinfg::String selection_data((gchar *)(selection_data_.get_data())); + synfig::String selection_data((gchar *)(selection_data_.get_data())); - // For some reason, GTK hands us a list of URL's seperated - // by not only Carrage-Returns, but also Line-Feeds. + // For some reason, GTK hands us a list of URLs separated + // by not only Carriage-Returns, but also Line-Feeds. // Line-Feeds will mess us up. Remove all the line-feeds. - while(selection_data.find_first_of('\r')!=sinfg::String::npos) + while(selection_data.find_first_of('\r')!=synfig::String::npos) selection_data.erase(selection_data.begin()+selection_data.find_first_of('\r')); std::stringstream stream(selection_data); while(stream) { - sinfg::String filename,URI; + synfig::String filename,URI; getline(stream,filename); - + // If we don't have a filename, move on. if(filename.empty()) continue; - + // Make sure this URL is of the "file://" type. URI=String(filename.begin(),filename.begin()+sizeof("file://")-1); if(URI!="file://") { - sinfg::warning("Unknown URI (%s) in \"%s\"",URI.c_str(),filename.c_str()); + synfig::warning("Unknown URI (%s) in \"%s\"",URI.c_str(),filename.c_str()); continue; } - + // Strip the "file://" part from the filename - filename=sinfg::String(filename.begin()+sizeof("file://")-1,filename.end()); - - sinfg::info("Attempting to open "+filename); + filename=synfig::String(filename.begin()+sizeof("file://")-1,filename.end()); + + synfig::info("Attempting to open "+filename); if(App::open(filename)) success=true; else - sinfg::error("Drop failed: Unable to open "+filename); + synfig::error("Drop failed: Unable to open "+filename); } } else - sinfg::error("Drop failed: bad selection data"); + synfig::error("Drop failed: bad selection data"); // Finish the drag context->drag_finish(success, false, time);