projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove .gitignore do nothing is ignored.
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
dialog_setup.h
diff --git
a/synfig-studio/trunk/src/gtkmm/dialog_setup.h
b/synfig-studio/trunk/src/gtkmm/dialog_setup.h
index
58e27c9
..
530e4fa
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/dialog_setup.h
+++ b/
synfig-studio/trunk/src/gtkmm/dialog_setup.h
@@
-7,6
+7,7
@@
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
** Copyright (c) 2007, 2008 Chris Moore
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
** Copyright (c) 2007, 2008 Chris Moore
+** Copyright (c) 2008, 2009 Carlos López
**
** 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
@@
-38,12
+39,20
@@
#include <gtkmm/checkbutton.h>
#include <gtkmm/widget_time.h>
#include <gtkmm/tooltips.h>
#include <gtkmm/checkbutton.h>
#include <gtkmm/widget_time.h>
#include <gtkmm/tooltips.h>
+#include <gtkmm/comboboxtext.h>
+#include <gtkmm/spinbutton.h>
#include <synfig/gamma.h>
#include <synfig/time.h>
#include <algorithm>
/* === M A C R O S ========================================================= */
#include <synfig/gamma.h>
#include <synfig/time.h>
#include <algorithm>
/* === M A C R O S ========================================================= */
+#ifndef DEFAULT_PREDEFINED_SIZE
+#define DEFAULT_PREDEFINED_SIZE _("Custom Size")
+#endif
+#ifndef DEFAULT_PREDEFINED_FPS
+#define DEFAULT_PREDEFINED_FPS _("Custom fps")
+#endif
/* === T Y P E D E F S ===================================================== */
/* === T Y P E D E F S ===================================================== */
@@
-151,6
+160,8
@@
class Dialog_Setup : public Gtk::Dialog
void on_gamma_b_change();
void on_black_level_change();
void on_red_blue_level_change();
void on_gamma_b_change();
void on_black_level_change();
void on_red_blue_level_change();
+ void on_size_template_combo_change();
+ void on_fps_template_combo_change();
GammaPattern gamma_pattern;
BlackLevelSelector black_level_selector;
GammaPattern gamma_pattern;
BlackLevelSelector black_level_selector;
@@
-177,10
+188,19
@@
class Dialog_Setup : public Gtk::Dialog
Widget_Time auto_backup_interval;
Gtk::CheckButton toggle_restrict_radius_ducks;
Widget_Time auto_backup_interval;
Gtk::CheckButton toggle_restrict_radius_ducks;
+ Gtk::CheckButton toggle_resize_imported_images;
Gtk::Entry textbox_browser_command;
Gtk::Entry textbox_browser_command;
+
+ Gtk::ComboBoxText* size_template_combo;
+ Gtk::ComboBoxText* fps_template_combo;
+ Gtk::Entry textbox_custom_filename_prefix;
Gtk::Adjustment adj_pref_x_size;
Gtk::Adjustment adj_pref_y_size;
Gtk::Adjustment adj_pref_x_size;
Gtk::Adjustment adj_pref_y_size;
+ Gtk::Adjustment adj_pref_fps;
+ Gtk::SpinButton* pref_fps_spinbutton;
+ Gtk::SpinButton* pref_y_size_spinbutton;
+ Gtk::SpinButton* pref_x_size_spinbutton;
Gtk::Tooltips tooltips_;
public:
Gtk::Tooltips tooltips_;
public: