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
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::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,
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();
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);