X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fapp.cpp;h=762e46ab544b7b191d3101437097738aa50c2761;hb=e2d2732c368b92259bba1bef890223831d997b5b;hp=1025f07969e2fe94c924735c56a7522c619967a9;hpb=012576f2d8a088ec178f2b01bc70430d8a216ef4;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/app.cpp b/synfig-studio/trunk/src/gtkmm/app.cpp index 1025f07..762e46a 100644 --- a/synfig-studio/trunk/src/gtkmm/app.cpp +++ b/synfig-studio/trunk/src/gtkmm/app.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 @@ -261,7 +261,11 @@ studio::Dock_Curves* dock_curves; std::list< etl::handle< studio::Module > > module_list_; bool studio::App::use_colorspace_gamma=true; +#ifdef SINGLE_THREADED bool studio::App::single_threaded=false; +#endif +bool studio::App::restrict_radius_ducks=false; +String studio::App::browser_command("firefox"); static int max_recent_files_=25; int studio::App::get_max_recent_files() { return max_recent_files_; } @@ -472,16 +476,28 @@ public: value=strprintf("%s",Distance::system_name(App::distance_system).c_str()); return true; } +#ifdef SINGLE_THREADED if(key=="single_threaded") { value=strprintf("%i",(int)App::single_threaded); return true; } +#endif if(key=="auto_recover_backup_interval") { value=strprintf("%i",App::auto_recover->get_timeout()); return true; } + if(key=="restrict_radius_ducks") + { + value=strprintf("%i",(int)App::restrict_radius_ducks); + return true; + } + if(key=="browser_command") + { + value=App::browser_command; + return true; + } return synfigapp::Settings::get_value(key,value); } @@ -532,12 +548,25 @@ public: App::distance_system=Distance::ident_system(value);; return true; } +#ifdef SINGLE_THREADED if(key=="single_threaded") { int i(atoi(value.c_str())); App::single_threaded=i; return true; } +#endif + if(key=="restrict_radius_ducks") + { + int i(atoi(value.c_str())); + App::restrict_radius_ducks=i; + return true; + } + if(key=="browser_command") + { + App::browser_command=value; + return true; + } return synfigapp::Settings::set_value(key,value); } @@ -550,8 +579,12 @@ public: ret.push_back("distance_system"); ret.push_back("file_history.size"); ret.push_back("use_colorspace_gamma"); +#ifdef SINGLE_THREADED ret.push_back("single_threaded"); +#endif ret.push_back("auto_recover_backup_interval"); + ret.push_back("restrict_radius_ducks"); + ret.push_back("browser_command"); return ret; } }; @@ -1451,7 +1484,10 @@ App::reset_initial_window_configuration() synfigapp::Main::settings().set_value("dock.dialog.2.size","1045 235"); 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"); +#endif + synfigapp::Main::settings().set_value("pref.restrict_radius_ducks","0"); synfigapp::Main::settings().set_value("window.toolbox.pos","4 4"); } @@ -1752,14 +1788,15 @@ App::dialog_save_file(const std::string &title, std::string &filename, std::stri dialog->add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); dialog->add_button(Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT); - Widget_Enum *file_type_enum; + Widget_Enum *file_type_enum = 0; if (preference == ANIMATION_DIR_PREFERENCE) { file_type_enum = manage(new Widget_Enum()); file_type_enum->set_param_desc(ParamDesc().set_hint("enum") - .add_enum_value(synfig::FILE_VERSION_0_61_08, "0.61.08", strprintf("0.61.08 (%s)", _("current"))) - .add_enum_value(synfig::FILE_VERSION_0_61_07, "0.61.07", strprintf("0.61.07 %s", _("and older")))); - file_type_enum->set_value(0); + .add_enum_value(synfig::RELEASE_VERSION_0_61_08, "0.61.08", strprintf("0.61.08 (%s)", _("current"))) + .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")))); + file_type_enum->set_value(RELEASE_VERSION_END-1); // default to the most recent version Gtk::HBox *hbox = manage(new Gtk::HBox); hbox->pack_start(*manage(new Gtk::Label(_("File Format Version: "))),Gtk::PACK_SHRINK,0); @@ -1790,7 +1827,7 @@ App::dialog_save_file(const std::string &title, std::string &filename, std::stri if(dialog->run() == GTK_RESPONSE_ACCEPT) { if (preference == ANIMATION_DIR_PREFERENCE) - set_file_version(synfig::FileVersion(file_type_enum->get_value())); + set_file_version(synfig::ReleaseVersion(file_type_enum->get_value())); filename = dialog->get_filename(); info("Saving preference %s = '%s' in App::dialog_save_file()", preference.c_str(), dirname(filename).c_str()); _preferences.set_value(preference, dirname(filename)); @@ -1866,6 +1903,49 @@ App::dialog_not_implemented() dialog.run(); } +static bool +try_open_url(const std::string &url) +{ +#ifdef WIN32 + return ShellExecute(GetDesktopWindow(), "open", url.c_str(), NULL, NULL, SW_SHOW); +#else // WIN32 + gchar* argv[3] = {strdup(App::browser_command.c_str()), strdup(url.c_str()), NULL}; + + GError* gerror = NULL; + gboolean retval; + retval = g_spawn_async(NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, &gerror); + free(argv[0]); + free(argv[1]); + + if (!retval) + { + error(_("Could not execute specified web browser: %s"), gerror->message); + g_error_free(gerror); + return false; + } + + return true; +#endif // WIN32 +} + +void +App::dialog_help() +{ + if (!try_open_url("http://synfig.org/Documentation")) + { + Gtk::MessageDialog dialog(_("Documentation"), false, Gtk::MESSAGE_INFO, Gtk::BUTTONS_CLOSE, true); + dialog.set_secondary_text(_("Documentation for Synfig Studio is available on the website:\n\nhttp://www.synfig.org/Documentation")); + dialog.set_title(_("Help")); + dialog.run(); + } +} + +void +App::open_url(const std::string &url) +{ + try_open_url(url); +} + bool App::dialog_entry(const std::string &title, const std::string &message,std::string &text) { @@ -1967,9 +2047,10 @@ void App::new_instance() { handle canvas=synfig::Canvas::create(); - canvas->set_name(strprintf("%s%d", DEFAULT_FILENAME_PREFIX, Instance::get_count()+1)); - String file_name(strprintf("%s%d.sifz", DEFAULT_FILENAME_PREFIX, Instance::get_count()+1)); + String file_name(strprintf("%s%d", DEFAULT_FILENAME_PREFIX, Instance::get_count()+1)); + canvas->set_name(file_name); + file_name += ".sifz"; canvas->rend_desc().set_frame_rate(24.0); canvas->rend_desc().set_time_start(0.0); @@ -1991,9 +2072,10 @@ App::new_instance() } void -App::dialog_open() +App::dialog_open(string filename) { - string filename="*.sif"; + if (filename.empty()) + filename="*.sif"; while(dialog_open_file("Open", filename, ANIMATION_DIR_PREFERENCE)) {