X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fapp.h;h=d49fae319dd362ea9c5c1c7571c5f75bf296c6f3;hb=756c0d29ac1742f231e6615f9a577e574e35a4af;hp=d8627958a381c55dfd61f34932bbe350256b2c0e;hpb=560dfdcfea7dbf8d80e599d1d204c253f56a505d;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/app.h b/synfig-studio/trunk/src/gtkmm/app.h
index d862795..d49fae3 100644
--- a/synfig-studio/trunk/src/gtkmm/app.h
+++ b/synfig-studio/trunk/src/gtkmm/app.h
@@ -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
@@ -28,7 +28,6 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include <sigc++/compatibility.h>
 #include <sigc++/bind.h>
 
 #include <gtkmm/main.h>
@@ -44,10 +43,16 @@
 #include <gtkmm/uimanager.h>
 
 #include <synfigapp/instance.h>
-#include "iconcontroler.h"
+#include "iconcontroller.h"
 
 /* === M A C R O S ========================================================= */
 
+#define MISC_DIR_PREFERENCE			"misc_dir"
+#define ANIMATION_DIR_PREFERENCE	"animation_dir"
+#define IMAGE_DIR_PREFERENCE		"image_dir"
+#define SKETCH_DIR_PREFERENCE		"sketch_dir"
+#define RENDER_DIR_PREFERENCE		"render_dir"
+
 /* === T Y P E D E F S ===================================================== */
 
 /* === C L A S S E S & S T R U C T S ======================================= */
@@ -71,6 +76,7 @@ namespace studio {
 
 typedef Gtk::UIManager UIManager;
 
+class About;
 class Toolbox;
 class Instance;
 class CanvasView;
@@ -99,9 +105,9 @@ class IPC;
 class Module;
 
 class StateManager;
-class IconControler;
+class IconController;
 
-class App : public Gtk::Main, private IconControler
+class App : public Gtk::Main, private IconController
 {
 	friend class Preferences;
 	friend class Dialog_Setup;
@@ -176,6 +182,7 @@ public:
 
 	static synfig::Gamma gamma;
 
+	static About *about;
 	static Toolbox *toolbox;
 
 	static std::list<etl::handle<Instance> > instance_list;
@@ -186,6 +193,8 @@ public:
 
 	static bool single_threaded;
 
+	static bool restrict_radius_ducks;
+
 	/*
  -- ** -- S I G N A L S -------------------------------------------------------
 	*/
@@ -308,8 +317,8 @@ public:
 
 //	static bool dialog_file(const std::string &title, std::string &filename);
 
-	static bool dialog_open_file(const std::string &title, std::string &filename);
-	static bool dialog_save_file(const std::string &title, std::string &filename);
+	static bool dialog_open_file(const std::string &title, std::string &filename, std::string preference);
+	static bool dialog_save_file(const std::string &title, std::string &filename, std::string preference);
 
 	static void dialog_error_blocking(const std::string &title, const std::string &message);