Added copyright lines for files I've edited this year.

[synfig.git] / synfig-studio / trunk / src / gtkmm / toolbox.cpp

diff --git a/synfig-studio/trunk/src/gtkmm/toolbox.cpp b/synfig-studio/trunk/src/gtkmm/toolbox.cpp
index 5b83382..0318892 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/toolbox.cpp
+++ b/synfig-studio/trunk/src/gtkmm/toolbox.cpp
@@ -6,7 +6,7 @@
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-**     Copyright (c) 2007 Chris Moore
+**     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
@@ -79,13 +79,15 @@
 
 #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 ========================================================= */
 
@@ -128,7 +130,7 @@ 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;
        }
 
@@ -140,7 +142,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;
        }
 
@@ -162,7 +164,7 @@ close_selected_instance()
 
        if(!instance)
        {
-               App::dialog_error_blocking("Cannot close","Nothing to close");
+               App::dialog_error_blocking(_("Cannot close"),_("Nothing to close"));
                return;
        }
 
@@ -215,10 +217,10 @@ Toolbox::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::MenuElem(_("Reset Windows to Original Layout"),sigc::ptr_fun(App::reset_initial_window_configuration)));
        dock_dialogs->items().push_back(Gtk::Menu_Helpers::SeparatorElem());
 
 
@@ -234,7 +236,7 @@ Toolbox::Toolbox():
        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)));
@@ -263,22 +265,22 @@ Toolbox::Toolbox():
                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","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");
+       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));
@@ -304,7 +306,7 @@ Toolbox::Toolbox():
 
        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);
@@ -335,7 +337,7 @@ Toolbox::Toolbox():
 
        // 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));
@@ -377,7 +379,7 @@ Toolbox::Toolbox():
 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)
@@ -386,7 +388,7 @@ Toolbox::~Toolbox()
 }
 
 void
-Toolbox::set_active_state(const String& statename)
+Toolbox::set_active_state(const synfig::String& statename)
 {
        std::map<synfig::String,Gtk::ToggleButton *>::iterator iter;
 
@@ -495,8 +497,8 @@ Toolbox::add_state(const Smach::state_base *state)
        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);