**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+** Copyright (c) 2007, 2008 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
#include <synfigapp/main.h>
+#include "general.h"
+
#endif
using namespace std;
using namespace etl;
using namespace synfig;
using namespace studio;
-using namespace SigC;
+using namespace sigc;
/* === M A C R O S ========================================================= */
{
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
{
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;
}
if(!instance)
{
- App::dialog_error_blocking("Cannot close","Nothing to close");
+ App::dialog_error_blocking(_("Cannot close"),_("Nothing to close"));
return;
}
dock_dialog->present();
}
-static void
-show_dialog_color()
-{
- App::dialog_color->present();
-}
-
Toolbox::Toolbox():
Gtk::Window(Gtk::WINDOW_TOPLEVEL),
dialog_settings(this,"toolbox")
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::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)));
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,"synfig-saveall","Save All");
- 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"));
-
-
+ 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_about,"synfig-about",_("About Synfig Studio"));
button_about->signal_clicked().connect(sigc::ptr_fun(studio::App::dialog_about));
button_new->signal_clicked().connect(sigc::ptr_fun(studio::App::new_instance));
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);
+
+ 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->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);
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));
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") );
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)
}
void
-Toolbox::set_active_state(const String& statename)
+Toolbox::set_active_state(const synfig::String& statename)
{
std::map<synfig::String,Gtk::ToggleButton *>::iterator iter;
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;
+ 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);
)
);
-
refresh();
}
// 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())
{
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);
{
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')!=synfig::String::npos)
selection_data.erase(selection_data.begin()+selection_data.find_first_of('\r'));
projects / synfig.git / blobdiff