liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Manual merge from Branch3

Browse Source
This commit is contained in:
Oliver Duis
2011-03-20 11:38:27 +01:00
parent f9d74687b9
commit bfb5012eb4
9 changed files with 153 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
rtgui/preferences.cc
View File

@@ -38,6 +38,7 @@ Preferences::Preferences (RTWindow *rtwindow):parent(rtwindow) {
// Do not increase height, since it's not visible on e.g. smaller netbook screens
set_size_request (650, 600);
set_default_size (options.preferencesWidth, options.preferencesHeight);
set_border_width (4);
Gtk::VBox* mainvb = get_vbox ();
@@ -91,6 +92,11 @@ Preferences::Preferences (RTWindow *rtwindow):parent(rtwindow) {
set_modal (true);
}
Preferences::~Preferences () {
options.preferencesWidth = get_width();
options.preferencesHeight = get_height();
}
Gtk::Widget* Preferences::getBatchProcPanel () {
Gtk::VBox* mvbpp = Gtk::manage (new Gtk::VBox ());
@@ -440,7 +446,7 @@ Gtk::Widget* Preferences::getGeneralPanel () {
mvbsd->pack_start (*ftheme, Gtk::PACK_SHRINK, 4);
//-----
Gtk::HBox* hbcd = new Gtk::HBox ();
Gtk::Frame* frl = new Gtk::Frame (M("PREFERENCES_CLIPPINGIND"));
blinkClipped = new Gtk::CheckButton (M("PREFERENCES_BLINKCLIPPED"));
Gtk::VBox* vbrl = new Gtk::VBox ();
@@ -454,7 +460,7 @@ Gtk::Widget* Preferences::getGeneralPanel () {
hlThresh->set_increments (1, 10);
hlThresh->set_range (0, 255);
vbhl->pack_start (*hll, Gtk::PACK_SHRINK, 8);
vbhl->pack_start (*hlThresh, Gtk::PACK_SHRINK, 8);
vbhl->pack_end (*hlThresh, Gtk::PACK_SHRINK, 8);
vbrl->pack_start (*vbhl, Gtk::PACK_SHRINK, 4);
@@ -466,14 +472,14 @@ Gtk::Widget* Preferences::getGeneralPanel () {
shThresh->set_increments (1, 10);
shThresh->set_range (0, 255);
vbsh->pack_start (*shl, Gtk::PACK_SHRINK, 8);
vbsh->pack_start (*shThresh, Gtk::PACK_SHRINK, 8);
vbsh->pack_end (*shThresh, Gtk::PACK_SHRINK, 8);
vbrl->pack_start (*vbsh, Gtk::PACK_SHRINK, 4);
frl->add (*vbrl);
mvbsd->pack_start (*frl, Gtk::PACK_SHRINK, 4);
hbcd->pack_start (*frl, true, true, 0);
//-----
Gtk::Frame* fdf = new Gtk::Frame (M("PREFERENCES_DATEFORMAT"));
Gtk::Frame* fdf = new Gtk::Frame (M("PREFERENCES_DATEFORMATFRAME"));
Gtk::HBox* hb6 = new Gtk::HBox ();
Gtk::VBox* dfvb = new Gtk::VBox ();
@@ -487,7 +493,8 @@ Gtk::Widget* Preferences::getGeneralPanel () {
fdf->add (*dfvb);
dfvb->set_border_width (4);
mvbsd->pack_start (*fdf, Gtk::PACK_SHRINK, 4);
hbcd->pack_start (*fdf, true, true, 0);
mvbsd->pack_start (*hbcd, Gtk::PACK_SHRINK, 4);
//-----
Gtk::Frame* fdg = new Gtk::Frame (M("PREFERENCES_EXTERNALEDITOR"));