X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fapp.cpp;h=1da982b62ef2e27d989bdf2fb7e65f99e0c2e6e6;hb=c262dc6238e787c97aa7422fc907d0c1a5158965;hp=d9ff579deca3e916935b744ffa6e08a500fdd79a;hpb=4e688c2660236b6d8674882655fa494946f41a8e;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/app.cpp b/synfig-studio/trunk/src/gtkmm/app.cpp
index d9ff579..1da982b 100644
--- a/synfig-studio/trunk/src/gtkmm/app.cpp
+++ b/synfig-studio/trunk/src/gtkmm/app.cpp
@@ -263,6 +263,7 @@ std::list< etl::handle< studio::Module > > module_list_;
 bool studio::App::use_colorspace_gamma=true;
 bool studio::App::single_threaded=false;
 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_; }
@@ -488,6 +489,11 @@ public:
 			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);
 	}
@@ -550,6 +556,11 @@ public:
 			App::restrict_radius_ducks=i;
 			return true;
 		}
+		if(key=="browser_command")
+		{
+			App::browser_command=value;
+			return true;
+		}
 
 		return synfigapp::Settings::set_value(key,value);
 	}
@@ -565,6 +576,7 @@ public:
 		ret.push_back("single_threaded");
 		ret.push_back("auto_recover_backup_interval");
 		ret.push_back("restrict_radius_ducks");
+		ret.push_back("browser_command");
 		return ret;
 	}
 };
@@ -1881,26 +1893,13 @@ App::dialog_not_implemented()
 	dialog.run();
 }
 
-void
-App::dialog_help()
-{
-	if (!open_url("http://www.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();
-	}
-}
-
-bool
-App::open_url(const std::string &url)
+static bool
+try_open_url(const std::string &url)
 {
 #ifdef WIN32
 	return ShellExecute(GetDesktopWindow(), "open", url.c_str(), NULL, NULL, SW_SHOW);
 #else  // WIN32
-	String browser_program("firefox");
-	gchar* argv[3] = {strdup(browser_program.c_str()), strdup(url.c_str()), NULL};
+	gchar* argv[3] = {strdup(App::browser_command.c_str()), strdup(url.c_str()), NULL};
 
 	GError* gerror = NULL;
 	gboolean retval;
@@ -1919,6 +1918,24 @@ App::open_url(const std::string &url)
 #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)
 {
@@ -2020,9 +2037,10 @@ void
 App::new_instance()
 {
 	handle<synfig::Canvas> 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);