projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix the error about being unable to parse the grid_size metadata. It was previously...
[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
98c1da8
..
bd916aa
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/app.h
+++ b/
synfig-studio/trunk/src/gtkmm/app.h
@@
-6,6
+6,7
@@
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+** Copyright (c) 2007 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
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
@@
-27,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>
@@
-43,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 ======================================= */
@@
-98,9
+104,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;
@@
-183,6
+189,8
@@
public:
static bool use_colorspace_gamma;
static bool use_colorspace_gamma;
+ static bool single_threaded;
+
/*
-- ** -- S I G N A L S -------------------------------------------------------
*/
/*
-- ** -- S I G N A L S -------------------------------------------------------
*/
@@
-262,6
+270,7
@@
public:
static synfig::String get_base_path();
static void save_settings();
static void load_settings();
static synfig::String get_base_path();
static void save_settings();
static void load_settings();
+ static void reset_initial_window_configuration();
static const std::list<std::string>& get_recent_files();
static const std::list<std::string>& get_recent_files();
@@
-304,8
+313,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);
@@
-323,6
+332,8
@@
public:
static synfig::String get_config_file(const synfig::String& file);
}; // END of class App
static synfig::String get_config_file(const synfig::String& file);
}; // END of class App
+ void delete_widget(Gtk::Widget *widget);
+
}; // END namespace studio
/* === E N D =============================================================== */
}; // END namespace studio
/* === E N D =============================================================== */