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

merge with dev

Browse Source
This commit is contained in:
Alberto Griggio
2017-12-20 16:58:14 +01:00
parent 8e9304fa73 ba74c5c0e4
commit 59da3c5acd
31 changed files with 50 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtgui/options.cc
View File

@@ -1366,10 +1366,14 @@ void Options::readFromFile (Glib::ustring fname)
FileBrowserToolbarSingleRow = keyFile.get_boolean ("GUI", "FileBrowserToolbarSingleRow");
}
#if defined(__linux__) && ((GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION > 18) || GTK_MAJOR_VERSION > 3)
// Cannot scroll toolbox with mousewheel when HideTPVScrollbar=true #3413
hideTPVScrollbar = false;
#else
if (keyFile.has_key ("GUI", "HideTPVScrollbar")) {
hideTPVScrollbar = keyFile.get_boolean ("GUI", "HideTPVScrollbar");
}
#endif
if (keyFile.has_key ("GUI", "UseIconNoText")) {
UseIconNoText = keyFile.get_boolean ("GUI", "UseIconNoText");
}

9
rtgui/preferences.cc
View File

@@ -205,8 +205,8 @@ Gtk::Widget* Preferences::getBatchProcPanel ()
mi = behModel->append ();
mi->set_value (behavColumns.label, M ("TP_TM_FATTAL_LABEL"));
appendBehavList (mi, M ("TP_TM_FATTAL_ALPHA"), ADDSET_FATTAL_ALPHA, false);
appendBehavList (mi, M ("TP_TM_FATTAL_BETA"), ADDSET_FATTAL_BETA, false);
appendBehavList (mi, M ("TP_TM_FATTAL_THRESHOLD"), ADDSET_FATTAL_ALPHA, false);
appendBehavList (mi, M ("TP_TM_FATTAL_AMOUNT"), ADDSET_FATTAL_BETA, false);
mi = behModel->append ();
mi->set_value (behavColumns.label, M ("TP_RETINEX_LABEL"));
@@ -1011,6 +1011,11 @@ Gtk::Widget* Preferences::getGeneralPanel ()
setExpandAlignProperties (hb4label, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
ckbHideTPVScrollbar = Gtk::manage ( new Gtk::CheckButton (M ("PREFERENCES_TP_VSCROLLBAR")) );
setExpandAlignProperties (ckbHideTPVScrollbar, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
#if defined(__linux__) && ((GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION > 18) || GTK_MAJOR_VERSION > 3)
// Cannot scroll toolbox with mousewheel when HideTPVScrollbar=true #3413
ckbHideTPVScrollbar->set_active(false);
ckbHideTPVScrollbar->set_sensitive(false);
#endif
ckbUseIconNoText = Gtk::manage ( new Gtk::CheckButton (M ("PREFERENCES_TP_USEICONORTEXT")) );
setExpandAlignProperties (ckbUseIconNoText, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
workflowGrid->attach_next_to (*hb4label, *ckbFileBrowserToolbarSingleRow, Gtk::POS_BOTTOM, 1, 1);