From 6378887f493519667554c9cb3eb7a576440459d6 Mon Sep 17 00:00:00 2001 From: genete Date: Wed, 10 Sep 2008 22:50:34 +0000 Subject: [PATCH] Add a ComboBox to the Document tab of the Settings Dialog to select form predefined standard resolutions for the new created documents. git-svn-id: https://synfig.svn.sourceforge.net/svnroot/synfig@2043 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-studio/trunk/src/gtkmm/app.cpp | 14 +++++++ synfig-studio/trunk/src/gtkmm/app.h | 1 + synfig-studio/trunk/src/gtkmm/dialog_setup.cpp | 54 ++++++++++++++++++++++++-- synfig-studio/trunk/src/gtkmm/dialog_setup.h | 8 +++- 4 files changed, 72 insertions(+), 5 deletions(-) diff --git a/synfig-studio/trunk/src/gtkmm/app.cpp b/synfig-studio/trunk/src/gtkmm/app.cpp index 8cd64ff..beb061d 100644 --- a/synfig-studio/trunk/src/gtkmm/app.cpp +++ b/synfig-studio/trunk/src/gtkmm/app.cpp @@ -277,6 +277,7 @@ bool studio::App::restrict_radius_ducks=false; String studio::App::custom_filename_prefix(DEFAULT_FILENAME_PREFIX); int studio::App::preferred_x_size=480; int studio::App::preferred_y_size=270; +String studio::App::predefined_size(DEFAULT_PREDEFINED_SIZE); #ifdef USE_OPEN_FOR_URLS String studio::App::browser_command("open"); // MacOS only #else @@ -529,6 +530,12 @@ public: value=strprintf("%i",App::preferred_y_size); return true; } + if(key=="predefined_size") + { + value=strprintf("%s",App::predefined_size.c_str()); + return true; + } + return synfigapp::Settings::get_value(key,value); } @@ -614,6 +621,11 @@ public: App::preferred_y_size=i; return true; } + if(key=="predefined_size") + { + App::predefined_size=value; + return true; + } return synfigapp::Settings::set_value(key,value); } @@ -634,6 +646,7 @@ public: ret.push_back("custom_filename_prefix"); ret.push_back("preferred_x_size"); ret.push_back("preferred_y_size"); + ret.push_back("predefined_size"); return ret; } }; @@ -1718,6 +1731,7 @@ App::reset_initial_window_configuration() synfigapp::Main::settings().set_value("pref.custom_filename_prefix",DEFAULT_FILENAME_PREFIX); synfigapp::Main::settings().set_value("pref.preferred_x_size","480"); synfigapp::Main::settings().set_value("pref.preferred_y_size","270"); + synfigapp::Main::settings().set_value("pref.predefined_size",DEFAULT_PREDEFINED_SIZE); synfigapp::Main::settings().set_value("window.toolbox.pos","4 4"); } diff --git a/synfig-studio/trunk/src/gtkmm/app.h b/synfig-studio/trunk/src/gtkmm/app.h index e6fa884..72067f0 100644 --- a/synfig-studio/trunk/src/gtkmm/app.h +++ b/synfig-studio/trunk/src/gtkmm/app.h @@ -201,6 +201,7 @@ public: static synfig::String custom_filename_prefix; static int preferred_x_size; static int preferred_y_size; + static synfig::String predefined_size; /* -- ** -- S I G N A L S ------------------------------------------------------- */ diff --git a/synfig-studio/trunk/src/gtkmm/dialog_setup.cpp b/synfig-studio/trunk/src/gtkmm/dialog_setup.cpp index 113a899..0899732 100644 --- a/synfig-studio/trunk/src/gtkmm/dialog_setup.cpp +++ b/synfig-studio/trunk/src/gtkmm/dialog_setup.cpp @@ -214,12 +214,12 @@ Dialog_Setup::Dialog_Setup(): 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,2,false)); + 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, 2, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 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 @@ -233,7 +233,30 @@ Dialog_Setup::Dialog_Setup(): 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); + show_all_children(); } @@ -285,6 +308,9 @@ Dialog_Setup::on_apply_pressed() // 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(); App::save_settings(); } @@ -329,6 +355,24 @@ 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) + { + 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); + return; +} void Dialog_Setup::refresh() @@ -381,7 +425,9 @@ Dialog_Setup::refresh() // 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); } GammaPattern::GammaPattern(): diff --git a/synfig-studio/trunk/src/gtkmm/dialog_setup.h b/synfig-studio/trunk/src/gtkmm/dialog_setup.h index 2c14868..1ae3454 100644 --- a/synfig-studio/trunk/src/gtkmm/dialog_setup.h +++ b/synfig-studio/trunk/src/gtkmm/dialog_setup.h @@ -38,13 +38,16 @@ #include #include #include +#include #include #include #include /* === M A C R O S ========================================================= */ - +#ifndef DEFAULT_PREDEFINED_SIZE +#define DEFAULT_PREDEFINED_SIZE _("Custom Size") +#endif /* === T Y P E D E F S ===================================================== */ /* === C L A S S E S & S T R U C T S ======================================= */ @@ -151,6 +154,7 @@ class Dialog_Setup : public Gtk::Dialog void on_gamma_b_change(); void on_black_level_change(); void on_red_blue_level_change(); + void on_size_template_combo_change(); GammaPattern gamma_pattern; BlackLevelSelector black_level_selector; @@ -179,6 +183,8 @@ class Dialog_Setup : public Gtk::Dialog Gtk::CheckButton toggle_restrict_radius_ducks; Gtk::Entry textbox_browser_command; + + Gtk::ComboBoxText* size_template_combo; Gtk::Entry textbox_custom_filename_prefix; Gtk::Adjustment adj_pref_x_size; Gtk::Adjustment adj_pref_y_size; -- 2.7.4