Remove .gitignore do nothing is ignored.
[synfig.git] / synfig-studio / trunk / src / gtkmm / dialog_setup.cpp
index e1e7125..89199c9 100644 (file)
@@ -2,10 +2,12 @@
 /*!    \file dialog_setup.cpp
 **     \brief Template File
 **
-**     $Id: dialog_setup.cpp,v 1.1.1.1 2005/01/07 03:34:36 darco Exp $
+**     $Id$
 **
 **     \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
 #include <gtkmm/table.h>
 #include <gtkmm/frame.h>
 #include <gtkmm/notebook.h>
-#include <gtkmm/spinbutton.h>
 #include "widget_enum.h"
+#include "autorecover.h"
 
 #include <ETL/stringf>
 #include <ETL/misc>
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -57,15 +61,32 @@ using namespace studio;
 
 /* === M E T H O D S ======================================================= */
 
+static void
+attach_label(Gtk::Table *table, String str, guint col, guint xpadding, guint ypadding)
+{
+       Gtk::Label* label(manage(new Gtk::Label((str + ":").c_str())));
+       label->set_alignment(Gtk::ALIGN_RIGHT, Gtk::ALIGN_CENTER);
+       table->attach(*label, 0, 1, col, col+1, Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, xpadding, ypadding);
+}
+
 Dialog_Setup::Dialog_Setup():
-       Dialog(_("SYNFIG Studio Setup"),false,true),
+       Dialog(_("Synfig Studio Setup"),false,true),
        adj_gamma_r(2.2,0.1,3.0,0.025,0.025,0.025),
        adj_gamma_g(2.2,0.1,3.0,0.025,0.025,0.025),
        adj_gamma_b(2.2,0.1,3.0,0.025,0.025,0.025),
-       adj_recent_files(15,1,50,1,1,1),
+       adj_recent_files(15,1,50,1,1,0),
        adj_undo_depth(100,10,5000,1,1,1),
-       toggle_use_colorspace_gamma(_("Visually Linear Color Selection"))
-{
+       toggle_use_colorspace_gamma(_("Visually Linear Color Selection")),
+#ifdef SINGLE_THREADED
+       toggle_single_threaded(_("Use Only a Single Thread")),
+#endif
+       toggle_restrict_radius_ducks(_("Restrict Real-Valued Ducks to Top Right Quadrant")),
+       toggle_resize_imported_images(_("Scale New Imported Images to Fit Canvas")),
+       adj_pref_x_size(480,1,10000,1,10,0),
+       adj_pref_y_size(270,1,10000,1,10,0),
+       adj_pref_fps(24.0,1.0,100,0.1,1,0)
+
+       {
        // Setup the buttons
 
        Gtk::Button *ok_button(manage(new class Gtk::Button(Gtk::StockID("gtk-ok"))));
@@ -93,63 +114,62 @@ Dialog_Setup::Dialog_Setup():
        Gtk::Table *gamma_table=manage(new Gtk::Table(2,2,false));
        notebook->append_page(*gamma_table,_("Gamma"));
        //gamma_frame->add(*gamma_table);
-       
-       gamma_table->attach(gamma_pattern, 0, 2, 0, 1, Gtk::EXPAND, Gtk::SHRINK|Gtk::FILL, 0, 0);       
+
+       gamma_table->attach(gamma_pattern, 0, 2, 0, 1, Gtk::EXPAND, Gtk::SHRINK|Gtk::FILL, 0, 0);
 
        Gtk::HScale* scale_gamma_r(manage(new Gtk::HScale(adj_gamma_r)));
-       gamma_table->attach(*manage(new Gtk::Label(_("Red"))), 0, 1, 1, 2, Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0); 
-       gamma_table->attach(*scale_gamma_r, 1, 2, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);    
+       gamma_table->attach(*manage(new Gtk::Label(_("Red"))), 0, 1, 1, 2, Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);
+       gamma_table->attach(*scale_gamma_r, 1, 2, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);
        adj_gamma_r.signal_value_changed().connect(sigc::mem_fun(*this,&studio::Dialog_Setup::on_gamma_r_change));
-       
+
        Gtk::HScale* scale_gamma_g(manage(new Gtk::HScale(adj_gamma_g)));
-       gamma_table->attach(*manage(new Gtk::Label(_("Green"))), 0, 1, 2, 3, Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);       
-       gamma_table->attach(*scale_gamma_g, 1, 2, 2, 3, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);    
+       gamma_table->attach(*manage(new Gtk::Label(_("Green"))), 0, 1, 2, 3, Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);
+       gamma_table->attach(*scale_gamma_g, 1, 2, 2, 3, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);
        adj_gamma_g.signal_value_changed().connect(sigc::mem_fun(*this,&studio::Dialog_Setup::on_gamma_g_change));
 
        Gtk::HScale* scale_gamma_b(manage(new Gtk::HScale(adj_gamma_b)));
-       gamma_table->attach(*manage(new Gtk::Label(_("Blue"))), 0, 1, 3, 4, Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);        
-       gamma_table->attach(*scale_gamma_b, 1, 2, 3, 4, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);    
+       gamma_table->attach(*manage(new Gtk::Label(_("Blue"))), 0, 1, 3, 4, Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);
+       gamma_table->attach(*scale_gamma_b, 1, 2, 3, 4, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);
        adj_gamma_b.signal_value_changed().connect(sigc::mem_fun(*this,&studio::Dialog_Setup::on_gamma_b_change));
 
-       gamma_table->attach(*manage(new Gtk::Label(_("Black Level"))), 0, 1, 4, 5, Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0); 
-       gamma_table->attach(black_level_selector, 1, 2, 4, 5, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);      
+       gamma_table->attach(*manage(new Gtk::Label(_("Black Level"))), 0, 1, 4, 5, Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);
+       gamma_table->attach(black_level_selector, 1, 2, 4, 5, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);
        black_level_selector.signal_value_changed().connect(sigc::mem_fun(*this,&studio::Dialog_Setup::on_black_level_change));
 
-       //gamma_table->attach(*manage(new Gtk::Label(_("Red-Blue Level"))), 0, 1, 5, 6, Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);    
-       //gamma_table->attach(red_blue_level_selector, 1, 2, 5, 6, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0); 
+       //gamma_table->attach(*manage(new Gtk::Label(_("Red-Blue Level"))), 0, 1, 5, 6, Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);
+       //gamma_table->attach(red_blue_level_selector, 1, 2, 5, 6, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);
        //red_blue_level_selector.signal_value_changed().connect(sigc::mem_fun(*this,&studio::Dialog_Setup::on_red_blue_level_change));
 
 
        // Misc
        Gtk::Table *misc_table=manage(new Gtk::Table(2,2,false));
        notebook->append_page(*misc_table,_("Misc."));
-       
+
+       int xpadding(8), ypadding(8);
+
        // Misc - Timestamp
        timestamp_menu=manage(new class Gtk::Menu());
-       misc_table->attach(*manage(new Gtk::Label(_("Timestamp"))), 0, 1, 0, 1, Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);    
-       misc_table->attach(timestamp_optionmenu, 1, 2, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);       
-
-#define ADD_TIMESTAMP(desc,x)  \
-       timestamp_menu->items().push_back(      \
-               Gtk::Menu_Helpers::MenuElem(    \
-                       desc,   \
-                       sigc::bind(     \
-                               sigc::mem_fun(  \
-                                       *this,  \
-                                       &studio::Dialog_Setup::set_time_format  \
-                               ),      \
-                               x       \
-                       )       \
-               )       \
-       );
-       ADD_TIMESTAMP("HH:MM:SS.FF",Time::FORMAT_VIDEO);
-       ADD_TIMESTAMP("(HHh MMm SSs) FFf",Time::FORMAT_NORMAL);
-       ADD_TIMESTAMP("(HHhMMmSSs)FFf",Time::FORMAT_NORMAL|Time::FORMAT_NOSPACES);
-       ADD_TIMESTAMP("HHh MMm SSs FFf",Time::FORMAT_NORMAL|Time::FORMAT_FULL);
-       ADD_TIMESTAMP("HHhMMmSSsFFf",Time::FORMAT_NORMAL|Time::FORMAT_NOSPACES|Time::FORMAT_FULL);
+       attach_label(misc_table, _("Timestamp"), 0, xpadding, ypadding);
+       misc_table->attach(timestamp_optionmenu, 1, 2, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, xpadding, ypadding);
+
+#define ADD_TIMESTAMP(desc,x)                                                                  \
+       timestamp_menu->items().push_back(                                                      \
+               Gtk::Menu_Helpers::MenuElem(                                                    \
+                       desc,                                                                                           \
+                       sigc::bind(                                                                                     \
+                               sigc::mem_fun(                                                                  \
+                                       *this,                                                                          \
+                                       &studio::Dialog_Setup::set_time_format),        \
+                               x)));
+       ADD_TIMESTAMP("HH:MM:SS.FF",            Time::FORMAT_VIDEO      );
+       ADD_TIMESTAMP("(HHh MMm SSs) FFf",      Time::FORMAT_NORMAL     );
+       ADD_TIMESTAMP("(HHhMMmSSs)FFf",         Time::FORMAT_NORMAL     | Time::FORMAT_NOSPACES );
+       ADD_TIMESTAMP("HHh MMm SSs FFf",        Time::FORMAT_NORMAL     | Time::FORMAT_FULL             );
+       ADD_TIMESTAMP("HHhMMmSSsFFf",           Time::FORMAT_NORMAL     | Time::FORMAT_NOSPACES | Time::FORMAT_FULL);
+       ADD_TIMESTAMP("FFf",                            Time::FORMAT_FRAMES );
 
        timestamp_optionmenu.set_menu(*timestamp_menu);
-       
+
 #undef ADD_TIMESTAMP
 
        {
@@ -167,18 +187,109 @@ Dialog_Setup::Dialog_Setup():
                widget_enum=manage(new Widget_Enum());
                widget_enum->set_param_desc(param_desc);
 
-               misc_table->attach(*manage(new Gtk::Label(_("Unit System"))), 0, 1, 3, 4, Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);  
-               misc_table->attach(*widget_enum, 1, 2, 3, 4, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);       
+               attach_label(misc_table, _("Unit System"), 1, xpadding, ypadding);
+               misc_table->attach(*widget_enum, 1, 2, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, xpadding, ypadding);
        }
 
        // Misc - recent files
        Gtk::SpinButton* recent_files_spinbutton(manage(new Gtk::SpinButton(adj_recent_files,1,0)));
-       misc_table->attach(*manage(new Gtk::Label(_("Recent Files"))), 0, 1, 1, 2, Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0); 
-       misc_table->attach(*recent_files_spinbutton, 1, 2, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);   
+       attach_label(misc_table, _("Recent Files"), 2, xpadding, ypadding);
+       misc_table->attach(*recent_files_spinbutton, 1, 2, 2, 3, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, xpadding, ypadding);
 
        // Misc - use_colorspace_gamma
-       misc_table->attach(toggle_use_colorspace_gamma, 0, 2, 2, 3, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);        
-       
+       misc_table->attach(toggle_use_colorspace_gamma, 0, 2, 7, 8, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, xpadding, ypadding);
+
+#ifdef SINGLE_THREADED
+       // Misc - single_threaded
+       misc_table->attach(toggle_single_threaded, 0, 2, 9, 10, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, xpadding, ypadding);
+#endif
+
+       // Misc - auto backup interval
+       attach_label(misc_table, _("Auto Backup Interval (0 to disable)"), 3, xpadding, ypadding);
+       misc_table->attach(auto_backup_interval, 1, 2, 3, 4, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, xpadding, ypadding);
+
+       // Misc - restrict_radius_ducks
+       misc_table->attach(toggle_restrict_radius_ducks, 0, 2, 8, 9, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, xpadding, ypadding);
+
+       // Misc - resize_imported_images
+       misc_table->attach(toggle_resize_imported_images, 0, 2, 9, 10, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, xpadding, ypadding);
+
+       // Misc - browser_command
+       attach_label(misc_table, _("Browser Command"), 4, xpadding, ypadding);
+       misc_table->attach(textbox_browser_command, 1, 2, 4, 5, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, xpadding, ypadding);
+
+       // Document
+       Gtk::Table *document_table = manage(new Gtk::Table(2, 4, false));
+       notebook->append_page(*document_table, _("Document"));
+
+       // Document - Preferred file name prefix
+       attach_label(document_table, _("New Document filename prefix"), 0, xpadding, ypadding);
+       document_table->attach(textbox_custom_filename_prefix, 1, 4, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, xpadding, ypadding);
+       tooltips_.set_tip(textbox_custom_filename_prefix, _("File name prefix for the new created document"));
+
+       // Document - New Document X size
+       pref_x_size_spinbutton = Gtk::manage(new Gtk::SpinButton(adj_pref_x_size, 1, 0));
+       attach_label(document_table, _("New Document X size"),1, xpadding, ypadding);
+       document_table->attach(*pref_x_size_spinbutton, 1, 2, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, xpadding, ypadding);
+       tooltips_.set_tip(*pref_x_size_spinbutton, _("Width in pixels of the new created document"));
+
+       // Document - New Document Y size
+       pref_y_size_spinbutton = Gtk::manage(new Gtk::SpinButton(adj_pref_y_size, 1, 0));
+       attach_label(document_table,_("New Document Y size"), 2, xpadding, ypadding);
+       document_table->attach(*pref_y_size_spinbutton, 1, 2, 2, 3,Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, xpadding, ypadding);
+       tooltips_.set_tip(*pref_y_size_spinbutton, _("High in pixels of the new created document"));
+
+       //Document - Template for predefined sizes of canvases.
+       size_template_combo = Gtk::manage(new Gtk::ComboBoxText());
+       Gtk::Label* label(manage(new Gtk::Label(_("Predefined Resolutions:"))));
+       label->set_alignment(Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
+       document_table->attach(*label, 2, 3, 1, 2, Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, xpadding, ypadding);
+       document_table->attach(*size_template_combo, 2, 3, 2, 3, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, xpadding, ypadding);
+       size_template_combo->signal_changed().connect(sigc::mem_fun(*this, &studio::Dialog_Setup::on_size_template_combo_change));
+       size_template_combo->prepend_text(_("4096x3112 Full Aperture 4K"));
+       size_template_combo->prepend_text(_("2048x1556 Full Aperture Native 2K"));
+       size_template_combo->prepend_text(_("1920x1080 HDTV 1080p/i"));
+       size_template_combo->prepend_text(_("1280x720  HDTV 720p"));
+       size_template_combo->prepend_text(_("720x576   DVD PAL"));
+       size_template_combo->prepend_text(_("720x480   DVD NTSC"));
+       size_template_combo->prepend_text(_("720x540   Web 720x"));
+       size_template_combo->prepend_text(_("720x405   Web 720x HD"));
+       size_template_combo->prepend_text(_("640x480   Web 640x"));
+       size_template_combo->prepend_text(_("640x360   Web 640x HD"));
+       size_template_combo->prepend_text(_("480x360   Web 480x"));
+       size_template_combo->prepend_text(_("480x270   Web 480x HD"));
+       size_template_combo->prepend_text(_("360x270   Web 360x"));
+       size_template_combo->prepend_text(_("360x203   Web 360x HD"));
+       size_template_combo->prepend_text(DEFAULT_PREDEFINED_SIZE);
+
+       //Document - Template for predefined fps
+       fps_template_combo = Gtk::manage(new Gtk::ComboBoxText());
+       Gtk::Label* label1(manage(new Gtk::Label(_("Predefined FPS:"))));
+       label1->set_alignment(Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
+       document_table->attach(*label1, 2, 3, 3, 4, Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, xpadding, ypadding);
+       document_table->attach(*fps_template_combo,2, 3, 4, 5, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, xpadding, ypadding);
+       fps_template_combo->signal_changed().connect(sigc::mem_fun(*this, &studio::Dialog_Setup::on_fps_template_combo_change));
+       //Document - Fill the FPS combo box with proper strings (not localised)
+       float f[8];
+       f[0] = 60;
+       f[1] = 50;
+       f[2] = 30;
+       f[3] = 25;
+       f[4] = 24.967;
+       f[5] = 24;
+       f[6] = 15;
+       f[7] = 12;
+       for (int i=0; i<8; i++)
+               fps_template_combo->prepend_text(strprintf("%5.3f", f[i]));
+
+       fps_template_combo->prepend_text(DEFAULT_PREDEFINED_FPS);
+
+       // Document - New Document FPS
+       pref_fps_spinbutton = Gtk::manage(new Gtk::SpinButton(adj_pref_fps, 1, 3));
+       attach_label(document_table,_("New Document FPS"), 4, xpadding, ypadding);
+       document_table->attach(*pref_fps_spinbutton, 1, 2, 4, 5, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, xpadding, ypadding);
+       tooltips_.set_tip(*pref_fps_spinbutton, _("Frames per second of the new created document"));
+
        show_all_children();
 }
 
@@ -198,16 +309,51 @@ Dialog_Setup::on_apply_pressed()
 {
        App::gamma.set_all(1.0/adj_gamma_r.get_value(),1.0/adj_gamma_g.get_value(),1.0/adj_gamma_b.get_value(),black_level_selector.get_value(),red_blue_level_selector.get_value());
 
-       App::set_max_recent_files((int)adj_recent_files.get_value());   
-       
+       App::set_max_recent_files((int)adj_recent_files.get_value());
+
        // Set the time format
        App::set_time_format(get_time_format());
-       
+
        // Set the use_colorspace_gamma flag
        App::use_colorspace_gamma=toggle_use_colorspace_gamma.get_active();
 
+#ifdef SINGLE_THREADED
+       // Set the single_threaded flag
+       App::single_threaded=toggle_single_threaded.get_active();
+#endif
+
+       // Set the auto backup interval
+       App::auto_recover->set_timeout(auto_backup_interval.get_value() * 1000);
+
        App::distance_system=Distance::System(widget_enum->get_value());
-       
+
+       // Set the restrict_radius_ducks flag
+       App::restrict_radius_ducks=toggle_restrict_radius_ducks.get_active();
+
+       // Set the resize_imported_images flag
+       App::resize_imported_images=toggle_resize_imported_images.get_active();
+
+       // Set the browser_command textbox
+       App::browser_command=textbox_browser_command.get_text();
+
+       // Set the preferred file name prefix
+       App::custom_filename_prefix=textbox_custom_filename_prefix.get_text();
+
+       // Set the preferred new Document X dimension
+       App::preferred_x_size=int(adj_pref_x_size.get_value());
+
+       // Set the preferred new Document Y dimension
+       App::preferred_y_size=int(adj_pref_y_size.get_value());
+
+       // Set the preferred Predefined size
+       App::predefined_size=size_template_combo->get_active_text();
+
+       // Set the preferred Predefined fps
+       App::predefined_fps=fps_template_combo->get_active_text();
+
+       // Set the preferred FPS
+       App::preferred_fps=Real(adj_pref_fps.get_value());
+
        App::save_settings();
 }
 
@@ -251,34 +397,107 @@ Dialog_Setup::on_red_blue_level_change()
        gamma_pattern.queue_draw();
 }
 
+void
+Dialog_Setup::on_size_template_combo_change()
+{
+       String selection(size_template_combo->get_active_text());
+       if(selection==DEFAULT_PREDEFINED_SIZE)
+       {
+               pref_y_size_spinbutton->set_sensitive(true);
+               pref_x_size_spinbutton->set_sensitive(true);
+               return;
+       }
+       String::size_type locx=selection.find_first_of("x"); // here should be some comparison with string::npos
+       String::size_type locspace=selection.find_first_of(" ");
+       String x_size(selection.substr(0,locx));
+       String y_size(selection.substr(locx+1,locspace));
+       int x=atoi(x_size.c_str());
+       int y=atoi(y_size.c_str());
+       adj_pref_x_size.set_value(x);
+       adj_pref_y_size.set_value(y);
+       pref_y_size_spinbutton->set_sensitive(false);
+       pref_x_size_spinbutton->set_sensitive(false);
+
+       return;
+}
+
+void
+Dialog_Setup::on_fps_template_combo_change()
+{
+       String selection(fps_template_combo->get_active_text());
+       if(selection==DEFAULT_PREDEFINED_FPS)
+       {
+               pref_fps_spinbutton->set_sensitive(true);
+               return;
+       }
+       adj_pref_fps.set_value(atof(selection.c_str()));
+       pref_fps_spinbutton->set_sensitive(false);
+       return;
+}
 
 void
 Dialog_Setup::refresh()
 {
-       adj_gamma_r.set_value(1.0/App::gamma.get_gamma_r());    
-       adj_gamma_g.set_value(1.0/App::gamma.get_gamma_g());    
-       adj_gamma_b.set_value(1.0/App::gamma.get_gamma_b());    
+       // Refresh the temporary gamma; do this before adjusting the sliders,
+       // or variables will be used before their initialization.
+       gamma_pattern.set_gamma_r(App::gamma.get_gamma_r());
+       gamma_pattern.set_gamma_g(App::gamma.get_gamma_g());
+       gamma_pattern.set_gamma_b(App::gamma.get_gamma_b());
+       gamma_pattern.set_black_level(App::gamma.get_black_level());
+       gamma_pattern.set_red_blue_level(App::gamma.get_red_blue_level());
+
+       adj_gamma_r.set_value(1.0/App::gamma.get_gamma_r());
+       adj_gamma_g.set_value(1.0/App::gamma.get_gamma_g());
+       adj_gamma_b.set_value(1.0/App::gamma.get_gamma_b());
        black_level_selector.set_value(App::gamma.get_black_level());
        red_blue_level_selector.set_value(App::gamma.get_red_blue_level());
-       
-       // Refresh the temporary gamma
-       gamma_pattern.set_gamma_r(1.0/adj_gamma_r.get_value());
-       gamma_pattern.set_gamma_g(1.0/adj_gamma_g.get_value());
-       gamma_pattern.set_gamma_b(1.0/adj_gamma_b.get_value());
-       gamma_pattern.set_black_level(black_level_selector.get_value());
-       gamma_pattern.set_red_blue_level(red_blue_level_selector.get_value());
+
        gamma_pattern.refresh();
-       
+
        adj_recent_files.set_value(App::get_max_recent_files());
-       
+
        // Refresh the time format
        set_time_format(App::get_time_format());
 
        widget_enum->set_value(App::distance_system);
-       
+
        // Refresh the status of the use_colorspace_gamma flag
        toggle_use_colorspace_gamma.set_active(App::use_colorspace_gamma);
 
+#ifdef SINGLE_THREADED
+       // Refresh the status of the single_threaded flag
+       toggle_single_threaded.set_active(App::single_threaded);
+#endif
+
+       // Refresh the value of the auto backup interval
+       auto_backup_interval.set_value(App::auto_recover->get_timeout() / 1000);
+
+       // Refresh the status of the restrict_radius_ducks flag
+       toggle_restrict_radius_ducks.set_active(App::restrict_radius_ducks);
+
+       // Refresh the status of the resize_imported_images flag
+       toggle_resize_imported_images.set_active(App::resize_imported_images);
+
+       // Refresh the browser_command textbox
+       textbox_browser_command.set_text(App::browser_command);
+
+       // Refresh the preferred filename prefix
+       textbox_custom_filename_prefix.set_text(App::custom_filename_prefix);
+
+       // Refresh the preferred new Document X dimension
+       adj_pref_x_size.set_value(App::preferred_x_size);
+
+       // Refresh the preferred new Document Y dimension
+       adj_pref_y_size.set_value(App::preferred_y_size);
+
+       // Refresh the preferred Predefined size
+       size_template_combo->set_active_text(App::predefined_size);
+
+       //Refresh the preferred FPS
+       adj_pref_fps.set_value(App::preferred_fps);
+
+       //Refresh the predefined FPS
+       fps_template_combo->set_active_text(App::predefined_fps);
 }
 
 GammaPattern::GammaPattern():
@@ -288,7 +507,7 @@ GammaPattern::GammaPattern():
        set_size_request(tile_w*4,tile_h*3);
        signal_expose_event().connect(sigc::mem_fun(*this, &studio::GammaPattern::redraw));
 }
-       
+
 GammaPattern::~GammaPattern()
 {
 }
@@ -297,23 +516,23 @@ void
 GammaPattern::refresh()
 {
        black[0].set_rgb_p(
-               r_F32_to_F32(0.0),      
-               g_F32_to_F32(0.0),      
+               r_F32_to_F32(0.0),
+               g_F32_to_F32(0.0),
                b_F32_to_F32(0.0)
        );
        white[0].set_rgb_p(
-               r_F32_to_F32(1.0),      
-               g_F32_to_F32(1.0),      
+               r_F32_to_F32(1.0),
+               g_F32_to_F32(1.0),
                b_F32_to_F32(1.0)
        );
        gray50[0].set_rgb_p(
-               r_F32_to_F32(0.5),      
-               g_F32_to_F32(0.5),      
+               r_F32_to_F32(0.5),
+               g_F32_to_F32(0.5),
                b_F32_to_F32(0.5)
        );
        gray25[0].set_rgb_p(
-               r_F32_to_F32(0.25),     
-               g_F32_to_F32(0.25),     
+               r_F32_to_F32(0.25),
+               g_F32_to_F32(0.25),
                b_F32_to_F32(0.25)
        );
 
@@ -337,29 +556,29 @@ GammaPattern::refresh()
 }
 
 bool
-GammaPattern::redraw(GdkEventExpose*bleh)
+GammaPattern::redraw(GdkEventExpose */*bleh*/)
 {
        static const char hlines[] = { 3, 0 };
 
        Glib::RefPtr<Gdk::GC> gc(Gdk::GC::create(get_window()));
-       
+
        int i;
        Gdk::Color trueblack("#000000");
-       
+
        // 50% Pattern
        for(i=0;i<4;i++)
        {
                gc->set_rgb_fg_color(black[i]);
                get_window()->draw_rectangle(gc, true, i*tile_w, 0, tile_w, tile_h);
-       
+
                gc->set_stipple(Gdk::Bitmap::create(hlines,2,2));
                gc->set_fill(Gdk::STIPPLED);
                gc->set_rgb_fg_color(white[i]);
                get_window()->draw_rectangle(gc, true, i*tile_w, 0, tile_w, tile_h);
-       
+
                gc->set_fill(Gdk::SOLID);
                gc->set_rgb_fg_color(gray50[i]);
-       
+
                get_window()->draw_rectangle(gc, true, i*tile_w+tile_w/4, tile_h/4, tile_w-tile_w/2, tile_h-tile_h/2);
        }
 
@@ -368,15 +587,15 @@ GammaPattern::redraw(GdkEventExpose*bleh)
        {
                gc->set_rgb_fg_color(black[i]);
                get_window()->draw_rectangle(gc, true, i*tile_w, tile_h, tile_w, tile_h);
-       
+
                gc->set_stipple(Gdk::Bitmap::create(hlines,2,2));
                gc->set_fill(Gdk::STIPPLED);
                gc->set_rgb_fg_color(gray50[i]);
                get_window()->draw_rectangle(gc, true, i*tile_w, tile_h, tile_w, tile_h);
-       
+
                gc->set_fill(Gdk::SOLID);
                gc->set_rgb_fg_color(gray25[i]);
-       
+
                get_window()->draw_rectangle(gc, true, i*tile_w+tile_w/4, tile_h+tile_h/4, tile_w-tile_w/2, tile_h-tile_h/2);
        }
 
@@ -387,19 +606,19 @@ GammaPattern::redraw(GdkEventExpose*bleh)
        for(i=0;i<4;i++)
        {
                gc->set_rgb_fg_color(black[i]);
-       
+
                get_window()->draw_rectangle(gc, true, i*tile_w+tile_w/4, tile_h*2+tile_h/4, tile_w-tile_w/2, tile_h-tile_h/2);
        }
 
        return true;
 }
 
-       
+
 BlackLevelSelector::BlackLevelSelector()
 {
-       set_size_request(-1,24);        
+       set_size_request(-1,24);
        signal_expose_event().connect(sigc::mem_fun(*this, &studio::BlackLevelSelector::redraw));
-       
+
        add_events(Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK);
        add_events(Gdk::BUTTON1_MOTION_MASK);
        add_events(Gdk::BUTTON1_MOTION_MASK);
@@ -410,7 +629,7 @@ BlackLevelSelector::~BlackLevelSelector()
 }
 
 bool
-BlackLevelSelector::redraw(GdkEventExpose*bleh)
+BlackLevelSelector::redraw(GdkEventExpose */*bleh*/)
 {
        const int w(get_width()),h(get_height());
 
@@ -419,16 +638,16 @@ BlackLevelSelector::redraw(GdkEventExpose*bleh)
        Glib::RefPtr<Gdk::GC> gc(Gdk::GC::create(get_window()));
 
        int i;
-       
+
        // Draw the gradient
        for(i=0;i<w;i++)
        {
                color.set_rgb(i*65536/w,i*65536/w,i*65536/w);
-               
+
                gc->set_rgb_fg_color(color);
                get_window()->draw_rectangle(gc, true, i, 0, 1, h);
        }
-               
+
        // Draw a frame
        gc->set_rgb_fg_color(Gdk::Color("#000000"));
        get_window()->draw_rectangle(gc, false, 0, 0, w-1, h-1);
@@ -439,7 +658,7 @@ BlackLevelSelector::redraw(GdkEventExpose*bleh)
        get_window()->draw_rectangle(gc, true, i, 1, 1, h-1);
 
        // Print out the value
-       Glib::RefPtr<Pango::Layout> layout(Pango::Layout::create(get_pango_context()));         
+       Glib::RefPtr<Pango::Layout> layout(Pango::Layout::create(get_pango_context()));
        layout->set_text(etl::strprintf("%0.01f%%",level*100.0f));
        layout->set_alignment(Pango::ALIGN_CENTER);
        gc->set_rgb_fg_color(Gdk::Color("#a00000"));
@@ -487,22 +706,23 @@ BlackLevelSelector::on_event(GdkEvent *event)
 
 
 void
-Dialog_Setup::set_time_format(Time::Format x)
+Dialog_Setup::set_time_format(synfig::Time::Format x)
 {
        time_format=x;
-       if(x<=Time::FORMAT_VIDEO)
+       if (x <= Time::FORMAT_VIDEO)
                timestamp_optionmenu.set_history(0);
+       else if (x == (Time::FORMAT_NORMAL))
+               timestamp_optionmenu.set_history(1);
+       else if (x == (Time::FORMAT_NORMAL | Time::FORMAT_NOSPACES))
+               timestamp_optionmenu.set_history(2);
+       else if (x == (Time::FORMAT_NORMAL | Time::FORMAT_FULL))
+               timestamp_optionmenu.set_history(3);
+       else if (x == (Time::FORMAT_NORMAL | Time::FORMAT_NOSPACES | Time::FORMAT_FULL))
+               timestamp_optionmenu.set_history(4);
+       else if (x == (Time::FORMAT_FRAMES))
+               timestamp_optionmenu.set_history(5);
        else
-       {
-               if(x==(Time::FORMAT_NOSPACES|Time::FORMAT_FULL))
-                       timestamp_optionmenu.set_history(4);
-               else if(x==(Time::FORMAT_FULL))
-                       timestamp_optionmenu.set_history(3);
-               else if(x==(Time::FORMAT_NOSPACES))
-                       timestamp_optionmenu.set_history(2);
-               else
-                       timestamp_optionmenu.set_history(1);
-       }
+               timestamp_optionmenu.set_history(1);
 }
 
 
@@ -522,9 +742,9 @@ Dialog_Setup::set_time_format(Time::Format x)
 
 RedBlueLevelSelector::RedBlueLevelSelector()
 {
-       set_size_request(-1,24);        
+       set_size_request(-1,24);
        signal_expose_event().connect(sigc::mem_fun(*this, &studio::RedBlueLevelSelector::redraw));
-       
+
        add_events(Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK);
        add_events(Gdk::BUTTON1_MOTION_MASK);
        add_events(Gdk::BUTTON1_MOTION_MASK);
@@ -535,7 +755,7 @@ RedBlueLevelSelector::~RedBlueLevelSelector()
 }
 
 bool
-RedBlueLevelSelector::redraw(GdkEventExpose*bleh)
+RedBlueLevelSelector::redraw(GdkEventExpose */*bleh*/)
 {
        const int w(get_width()),h(get_height());
 
@@ -544,7 +764,7 @@ RedBlueLevelSelector::redraw(GdkEventExpose*bleh)
        Glib::RefPtr<Gdk::GC> gc(Gdk::GC::create(get_window()));
 
        int i;
-       
+
        // Draw the gradient
        for(i=0;i<w;i++)
        {
@@ -552,17 +772,17 @@ RedBlueLevelSelector::redraw(GdkEventExpose*bleh)
                float blue_red(2.0f-(red_blue));
                if(red_blue>1.0f)red_blue=1.0f;
                if(blue_red>1.0f)blue_red=1.0f;
-                       
+
                color.set_rgb(
                        round_to_int(min(red_blue,1.0f)*65535),
                        round_to_int(sqrt(min(red_blue,blue_red))*65535),
                        round_to_int(min(blue_red,1.0f)*65535)
                );
-               
+
                gc->set_rgb_fg_color(color);
                get_window()->draw_rectangle(gc, true, i, 0, 1, h);
        }
-               
+
        // Draw a frame
        gc->set_rgb_fg_color(Gdk::Color("#000000"));
        get_window()->draw_rectangle(gc, false, 0, 0, w-1, h-1);
@@ -573,7 +793,7 @@ RedBlueLevelSelector::redraw(GdkEventExpose*bleh)
        get_window()->draw_rectangle(gc, true, i, 1, 1, h-1);
 
        // Print out the value
-       Glib::RefPtr<Pango::Layout> layout(Pango::Layout::create(get_pango_context()));         
+       Glib::RefPtr<Pango::Layout> layout(Pango::Layout::create(get_pango_context()));
        layout->set_text(etl::strprintf("%0.02f",level));
        layout->set_alignment(Pango::ALIGN_CENTER);
        gc->set_rgb_fg_color(Gdk::Color("#a00000"));