projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix 1678554 and implement 1741220: change the about dialog to a splash screen and...
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
app.h
diff --git
a/synfig-studio/trunk/src/gtkmm/app.h
b/synfig-studio/trunk/src/gtkmm/app.h
index
d862795
..
48dd091
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/app.h
+++ b/
synfig-studio/trunk/src/gtkmm/app.h
@@
-28,7
+28,6
@@
/* === H E A D E R S ======================================================= */
/* === H E A D E R S ======================================================= */
-#include <sigc++/compatibility.h>
#include <sigc++/bind.h>
#include <gtkmm/main.h>
#include <sigc++/bind.h>
#include <gtkmm/main.h>
@@
-44,10
+43,16
@@
#include <gtkmm/uimanager.h>
#include <synfigapp/instance.h>
#include <gtkmm/uimanager.h>
#include <synfigapp/instance.h>
-#include "iconcontroler.h"
+#include "iconcontrol
l
er.h"
/* === M A C R O S ========================================================= */
/* === 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 ======================================= */
/* === 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;
typedef Gtk::UIManager UIManager;
+class About;
class Toolbox;
class Instance;
class CanvasView;
class Toolbox;
class Instance;
class CanvasView;
@@
-99,9
+105,9
@@
class IPC;
class Module;
class StateManager;
class Module;
class StateManager;
-class IconControler;
+class IconControl
l
er;
-class App : public Gtk::Main, private IconControler
+class App : public Gtk::Main, private IconControl
l
er
{
friend class Preferences;
friend class Dialog_Setup;
{
friend class Preferences;
friend class Dialog_Setup;
@@
-176,6
+182,7
@@
public:
static synfig::Gamma gamma;
static synfig::Gamma gamma;
+ static About *about;
static Toolbox *toolbox;
static std::list<etl::handle<Instance> > instance_list;
static Toolbox *toolbox;
static std::list<etl::handle<Instance> > instance_list;
@@
-308,8
+315,8
@@
public:
// static bool dialog_file(const std::string &title, std::string &filename);
// 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);
static void dialog_error_blocking(const std::string &title, const std::string &message);