X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Fsrc%2Fgtkmm%2Fapp.cpp;h=01a4f8fb1191a3e08088e6564ae6f00af0cc58b3;hb=c11c4966980ed301f40b3dcc24e4fbec525f93e3;hp=06671f9e78314adb4c7e92765494743776201c3a;hpb=55f847c55722ae0979e75d74b888ab90f6f67d0e;p=synfig.git diff --git a/synfig-studio/src/gtkmm/app.cpp b/synfig-studio/src/gtkmm/app.cpp index 06671f9..01a4f8f 100644 --- a/synfig-studio/src/gtkmm/app.cpp +++ b/synfig-studio/src/gtkmm/app.cpp @@ -9,6 +9,7 @@ ** Copyright (c) 2007, 2008 Chris Moore ** Copyright (c) 2008 Gerald Young ** Copyright (c) 2008 Carlos López +** Copyright (c) 2009 Nikita Kitaev ** ** This package is free software; you can redistribute it and/or ** modify it under the terms of the GNU General Public License as @@ -73,7 +74,6 @@ #include "dialog_gradient.h" #include "dialog_color.h" #include "toolbox.h" -#include "compview.h" #include "onemoment.h" #include "dockmanager.h" @@ -755,9 +755,9 @@ init_ui_manager() )); } -#define DEFINE_ACTION(x,stock) { Glib::RefPtr action( Gtk::Action::create(x, stock) ); /*action->set_sensitive(false);*/ actions_action_group->add(action); } -#define DEFINE_ACTION2(x,stock,label) { Glib::RefPtr action( Gtk::Action::create(x, stock,label,label) ); /*action->set_sensitive(false);*/ actions_action_group->add(action); } -#define DEFINE_ACTION_SIG(group,x,stock,sig) { Glib::RefPtr action( Gtk::Action::create(x, stock) ); /*action->set_sensitive(false);*/ group->add(action,sig); } +#define DEFINE_ACTION(x,stock) { Glib::RefPtr action( Gtk::Action::create(x, stock) ); actions_action_group->add(action); } +#define DEFINE_ACTION2(x,stock,label) { Glib::RefPtr action( Gtk::Action::create(x, stock,label,label) ); actions_action_group->add(action); } +#define DEFINE_ACTION_SIG(group,x,stock,sig) { Glib::RefPtr action( Gtk::Action::create(x, stock) ); group->add(action,sig); } DEFINE_ACTION2("keyframe-properties", Gtk::StockID("gtk-properties"), _("Keyframe Properties")); DEFINE_ACTION("about", Gtk::StockID("synfig-about")); @@ -844,40 +844,8 @@ init_ui_manager() DEFINE_ACTION("amount-dec", _("Decrease Amount")); #undef DEFINE_ACTION - - -// Set up synfigapp actions - /*{ - synfigapp::Action::Book::iterator iter; - - for(iter=synfigapp::Action::book().begin();iter!=synfigapp::Action::book().end();++iter) - { - Gtk::StockID stock_id; - - if(!(iter->second.category&synfigapp::Action::CATEGORY_HIDDEN)) - { - //Gtk::Image* image(manage(new Gtk::Image())); - if(iter->second.task=="raise") stock_id=Gtk::Stock::GO_UP; - else if(iter->second.task=="lower") stock_id=Gtk::Stock::GO_DOWN; - else if(iter->second.task=="move_top") stock_id=Gtk::Stock::GOTO_TOP; - else if(iter->second.task=="move_bottom") stock_id=Gtk::Stock::GOTO_BOTTOM; - else if(iter->second.task=="remove") stock_id=Gtk::Stock::DELETE; - else if(iter->second.task=="set_on") stock_id=Gtk::Stock::YES; - else if(iter->second.task=="set_off") stock_id=Gtk::Stock::NO; - //else if(iter->second.task=="duplicate") stock_id=Gtk::Stock::COPY; - else if(iter->second.task=="remove") stock_id=Gtk::Stock::DELETE; - else stock_id=Gtk::StockID("synfig-"+iter->second.task); - - actions_action_group->add(Gtk::Action::create( - "action-"+iter->second.name, - stock_id, - iter->second.local_name,iter->second.local_name - )); - } - } - } -*/ - +#undef DEFINE_ACTION_2 +#undef DEFINE_ACTION_SIG Glib::ustring ui_info = "" @@ -1134,6 +1102,7 @@ init_ui_manager() ACCEL("End", "/canvasview/seek-end" ); #undef ACCEL +#undef ACCEL2 } #ifdef _WIN32 @@ -1292,30 +1261,29 @@ App::App(int *argc, char ***argv): studio_init_cb.task(_("Init Tools...")); - /* row 1 */ + /* editing tools */ state_manager->add_state(&state_normal); state_manager->add_state(&state_smooth_move); state_manager->add_state(&state_scale); state_manager->add_state(&state_rotate); studio_init_cb.task(_("Init ModMirror...")); module_list_.push_back(new ModMirror()); module_list_.back()->start(); + if(!getenv("SYNFIG_DISABLE_WIDTH" )) state_manager->add_state(&state_width); // Enabled since 0.61.09 - /* row 2 */ + /* new objects */ state_manager->add_state(&state_circle); state_manager->add_state(&state_rectangle); state_manager->add_state(&state_star); state_manager->add_state(&state_gradient); if(!getenv("SYNFIG_DISABLE_POLYGON")) state_manager->add_state(&state_polygon); // Enabled - for working without ducks - - /* row 3 */ - state_manager->add_state(&state_bline); state_manager->add_state(&state_text); + state_manager->add_state(&state_bline); + if(!getenv("SYNFIG_DISABLE_DRAW" )) state_manager->add_state(&state_draw); // Enabled for now. Let's see whether they're good enough yet. + + /* other */ state_manager->add_state(&state_fill); state_manager->add_state(&state_eyedrop); state_manager->add_state(&state_zoom); - - if(!getenv("SYNFIG_DISABLE_DRAW" )) state_manager->add_state(&state_draw); // Enabled for now. Let's see whether they're good enough yet. if(!getenv("SYNFIG_DISABLE_SKETCH" )) state_manager->add_state(&state_sketch); - if(!getenv("SYNFIG_DISABLE_WIDTH" )) state_manager->add_state(&state_width); // Enabled since 0.61.09 studio_init_cb.task(_("Init ModPalette...")); module_list_.push_back(new ModPalette()); module_list_.back()->start(); @@ -1428,14 +1396,8 @@ App::~App() toolbox->hide(); -// studio::App::iteration(false); - delete toolbox; -// studio::App::iteration(false); - -// studio::App::iteration(false); - delete dialog_setup; delete dialog_gradient; @@ -1447,8 +1409,6 @@ App::~App() delete dock_manager; instance_list.clear(); - -// studio::App::iteration(false); } String @@ -1786,7 +1746,7 @@ App::reset_initial_window_configuration() synfigapp::Main::settings().set_value("pref.distance_system","pt"); synfigapp::Main::settings().set_value("pref.use_colorspace_gamma","1"); #ifdef SINGLE_THREADED - synfigapp::Main::settings().set_value("pref.single_threaded","0"); + synfigapp::Main::settings().set_value("pref.single_threaded","1"); #endif synfigapp::Main::settings().set_value("pref.restrict_radius_ducks","0"); synfigapp::Main::settings().set_value("pref.resize_imported_images","0"); @@ -1956,7 +1916,7 @@ App::dialog_open_file(const std::string &title, std::string &filename, std::stri } return false; -#else +#else // not USE_WIN32_FILE_DIALOGS synfig::String prev_path; if(!_preferences.get_value(preference, prev_path)) @@ -1987,52 +1947,7 @@ App::dialog_open_file(const std::string &title, std::string &filename, std::stri delete dialog; return false; - - /* - - GtkWidget *ok; - GtkWidget *cancel; - int val=0; - - GtkWidget *fileselection; - fileselection = gtk_file_selection_new(title.c_str()); - - - if(basename(filename)==filename) - { - gtk_file_selection_set_filename(GTK_FILE_SELECTION(fileselection),(prev_path+ETL_DIRECTORY_SEPARATOR).c_str()); - } - else - gtk_file_selection_set_filename(GTK_FILE_SELECTION(fileselection),dirname(filename).c_str()); - - gtk_file_selection_complete(GTK_FILE_SELECTION(fileselection),basename(filename).c_str()); - - ok=GTK_FILE_SELECTION(fileselection)->ok_button; - cancel=GTK_FILE_SELECTION(fileselection)->cancel_button; - - gtk_signal_connect(GTK_OBJECT(ok),"clicked",GTK_SIGNAL_FUNC(Signal_Open_Ok),&val); - gtk_signal_connect(GTK_OBJECT(cancel),"clicked",GTK_SIGNAL_FUNC(Signal_Open_Cancel),&val); - - gtk_widget_show(fileselection); - - while(!val) - iteration(); - - - if(val==1) - { - filename=gtk_file_selection_get_filename(GTK_FILE_SELECTION(fileselection)); - _preferences.set_value(preference,dirname(filename)); - } - else - { - gtk_widget_destroy(fileselection); - return false; - } - gtk_widget_destroy(fileselection); - return true; - */ -#endif +#endif // not USE_WIN32_FILE_DIALOGS } bool @@ -2101,7 +2016,8 @@ App::dialog_save_file(const std::string &title, std::string &filename, std::stri { file_type_enum = manage(new Widget_Enum()); file_type_enum->set_param_desc(ParamDesc().set_hint("enum") - .add_enum_value(synfig::RELEASE_VERSION_0_61_09, "0.61.09", strprintf("0.61.09 (%s)", _("current"))) + .add_enum_value(synfig::RELEASE_VERSION_0_62_00, "0.62.00", strprintf("0.62.00 (%s)", _("current"))) + .add_enum_value(synfig::RELEASE_VERSION_0_61_09, "0.61.09", "0.61.09") .add_enum_value(synfig::RELEASE_VERSION_0_61_08, "0.61.08", "0.61.08") .add_enum_value(synfig::RELEASE_VERSION_0_61_07, "0.61.07", "0.61.07") .add_enum_value(synfig::RELEASE_VERSION_0_61_06, "0.61.06", strprintf("0.61.06 %s", _("and older"))));