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

Merge pull request #4210 from lvreclp/dev-move-histogram-profile

Browse Source 
Moved histogram working/output profile settings
This commit is contained in:
Beep6581
2017-12-08 21:53:17 +01:00
committed by GitHub
parent a3d59a864a d6037a880e
commit b99babb809
8 changed files with 884 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
rtgui/editorpanel.cc
View File

@@ -464,6 +464,12 @@ public:
updateParameters ();
}
void updateHistogram()
{
updateParameters();
}
void defaultMonitorProfileChanged (const Glib::ustring &profile_name, bool auto_monitor_profile)
{
ConnectionBlocker profileBlocker (profileConn);
@@ -585,6 +591,16 @@ EditorPanel::EditorPanel (FilePanel* filePanel)
Gtk::VSeparator* vsep1 = Gtk::manage (new Gtk::VSeparator ());
Gtk::VSeparator* vsep2 = Gtk::manage (new Gtk::VSeparator ());
// Histogram profile toggle controls
toggleHistogramProfile = Gtk::manage (new Gtk::ToggleButton ());
Gtk::Image* histProfImg = Gtk::manage (new RTImage ("gamut-hist.png"));
toggleHistogramProfile->add (*histProfImg);
toggleHistogramProfile->set_relief (Gtk::RELIEF_NONE);
toggleHistogramProfile->set_active (options.rtSettings.HistogramWorking);
toggleHistogramProfile->set_tooltip_markup ( (M ("PREFERENCES_HISTOGRAM_TOOLTIP")));
Gtk::VSeparator* vsep3 = Gtk::manage (new Gtk::VSeparator ());
iareapanel = new ImageAreaPanel ();
tpc->setEditProvider (iareapanel->imageArea);
tpc->getToolBar()->setLockablePickerToolListener (iareapanel->imageArea);
@@ -607,6 +623,10 @@ EditorPanel::EditorPanel (FilePanel* filePanel)
toolBarPanel->pack_end (*tpc->coarse, Gtk::PACK_SHRINK, 2);
toolBarPanel->pack_end (*vsepcl, Gtk::PACK_SHRINK, 2);
// Histogram profile toggle
toolBarPanel->pack_end (*toggleHistogramProfile, Gtk::PACK_SHRINK, 1);
toolBarPanel->pack_end (*vsep3, Gtk::PACK_SHRINK, 2);
toolBarPanel->pack_end (*iareapanel->imageArea->indClippedPanel, Gtk::PACK_SHRINK, 0);
toolBarPanel->pack_end (*vsepz, Gtk::PACK_SHRINK, 2);
toolBarPanel->pack_end (*iareapanel->imageArea->previewModePanel, Gtk::PACK_SHRINK, 0);
@@ -819,6 +839,7 @@ EditorPanel::EditorPanel (FilePanel* filePanel)
saveimgas->signal_pressed().connect ( sigc::mem_fun (*this, &EditorPanel::saveAsPressed) );
queueimg->signal_pressed().connect ( sigc::mem_fun (*this, &EditorPanel::queueImgPressed) );
sendtogimp->signal_pressed().connect ( sigc::mem_fun (*this, &EditorPanel::sendToGimpPressed) );
toggleHistogramProfile->signal_toggled().connect( sigc::mem_fun (*this, &EditorPanel::histogramProfile_toggled) );
if (navPrev) {
navPrev->signal_pressed().connect ( sigc::mem_fun (*this, &EditorPanel::openPreviousEditorImage) );
@@ -2015,6 +2036,12 @@ void EditorPanel::syncFileBrowser() // synchronize filebrowser with image in E
}
}
void EditorPanel::histogramProfile_toggled()
{
options.rtSettings.HistogramWorking = toggleHistogramProfile->get_active();
colorMgmtToolBar->updateHistogram();
}
bool EditorPanel::idle_sendToGimp ( ProgressConnector<rtengine::IImage16*> *pc, Glib::ustring fname)
{

3
rtgui/editorpanel.h
View File

@@ -150,6 +150,8 @@ private:
bool idle_saveImage (ProgressConnector<rtengine::IImage16*> *pc, Glib::ustring fname, SaveFormat sf, rtengine::procparams::ProcParams &pparams);
bool idle_sendToGimp ( ProgressConnector<rtengine::IImage16*> *pc, Glib::ustring fname);
bool idle_sentToGimp (ProgressConnector<int> *pc, rtengine::IImage16* img, Glib::ustring filename);
void histogramProfile_toggled ();
Glib::ustring lastSaveAsFileName;
bool realized;
@@ -196,6 +198,7 @@ private:
Gtk::HBox* beforeAfterBox;
Gtk::HBox* beforeHeaderBox;
Gtk::HBox* afterHeaderBox;
Gtk::ToggleButton* toggleHistogramProfile;
Gtk::Frame* ppframe;
ProfilePanel* profilep;

8
rtgui/preferences.cc
View File

@@ -990,18 +990,14 @@ Gtk::Widget* Preferences::getGeneralPanel ()
ckbHistogramPositionLeft = Gtk::manage ( new Gtk::CheckButton (M ("PREFERENCES_HISTOGRAMPOSITIONLEFT")) );
setExpandAlignProperties (ckbHistogramPositionLeft, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
ckbHistogramWorking = Gtk::manage ( new Gtk::CheckButton (M ("PREFERENCES_HISTOGRAMWORKING")) );
setExpandAlignProperties (ckbHistogramWorking, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
ckbHistogramWorking->set_tooltip_markup (M ("PREFERENCES_HISTOGRAM_TOOLTIP"));
workflowGrid->attach_next_to (*ckbHistogramPositionLeft, *curveBBoxPosL, Gtk::POS_BOTTOM, 1, 1);
workflowGrid->attach_next_to (*ckbHistogramWorking, *curveBBoxPosC, Gtk::POS_BOTTOM, 2, 1);
ckbFileBrowserToolbarSingleRow = Gtk::manage ( new Gtk::CheckButton (M ("PREFERENCES_FILEBROWSERTOOLBARSINGLEROW")) );
setExpandAlignProperties (ckbFileBrowserToolbarSingleRow, false, false, Gtk::ALIGN_START, Gtk::ALIGN_START);
ckbShowFilmStripToolBar = Gtk::manage ( new Gtk::CheckButton (M ("PREFERENCES_SHOWFILMSTRIPTOOLBAR")) );
setExpandAlignProperties (ckbShowFilmStripToolBar, false, false, Gtk::ALIGN_START, Gtk::ALIGN_START);
workflowGrid->attach_next_to (*ckbFileBrowserToolbarSingleRow, *ckbHistogramPositionLeft, Gtk::POS_BOTTOM, 1, 1);
workflowGrid->attach_next_to (*ckbShowFilmStripToolBar, *ckbHistogramWorking, Gtk::POS_BOTTOM, 2, 1);
workflowGrid->attach_next_to (*ckbShowFilmStripToolBar, *curveBBoxPosC, Gtk::POS_BOTTOM, 2, 1);
Gtk::Label* hb4label = Gtk::manage ( new Gtk::Label (M ("PREFERENCES_TP_LABEL")) );
setExpandAlignProperties (hb4label, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
@@ -1757,7 +1753,6 @@ void Preferences::storePreferences ()
// moptions.rtSettings.viewinggreySc = greySc->get_active_row_number ();
// moptions.rtSettings.autocielab = cbAutocielab->get_active ();
moptions.rtSettings.ciecamfloat = cbciecamfloat->get_active ();
moptions.rtSettings.HistogramWorking = ckbHistogramWorking->get_active ();
moptions.rtSettings.leveldnv = dnv->get_active_row_number ();
moptions.rtSettings.leveldnti = dnti->get_active_row_number ();
moptions.rtSettings.leveldnliss = dnliss->get_active_row_number ();
@@ -1928,7 +1923,6 @@ void Preferences::fillPreferences ()
// cbAutocielab->set_active (moptions.rtSettings.autocielab);
cbciecamfloat->set_active (moptions.rtSettings.ciecamfloat);
ckbHistogramWorking->set_active (moptions.rtSettings.HistogramWorking);
languages->set_active_text (moptions.language);
ckbLangAutoDetect->set_active (moptions.languageAutoDetect);
int themeNbr = getThemeRowNumber (moptions.theme);

1
rtgui/preferences.h
View File

@@ -195,7 +195,6 @@ class Preferences : public Gtk::Dialog, public ProfileStoreListener
Gtk::ComboBoxText* custProfBuilderLabelType;
Gtk::CheckButton* ckbHistogramPositionLeft;
Gtk::CheckButton* ckbHistogramWorking;
Gtk::CheckButton* ckbFileBrowserToolbarSingleRow;
Gtk::CheckButton* ckbShowFilmStripToolBar;
Gtk::CheckButton* ckbHideTPVScrollbar;