From 3c2e30dbccad414198822006f206cb75e2350137 Mon Sep 17 00:00:00 2001 From: Alberto Griggio Date: Sun, 14 Jan 2018 21:36:25 +0100 Subject: [PATCH 1/3] renamed Wavelet tab to Advanced and moved more tools there (see #4298) --- rtdata/languages/default | 6 +++--- rtgui/partialpastedlg.cc | 40 ++++++++++++++++++++-------------------- rtgui/partialpastedlg.h | 6 +++--- rtgui/toolpanelcoord.cc | 26 +++++++++++++------------- rtgui/toolpanelcoord.h | 4 ++-- 5 files changed, 41 insertions(+), 41 deletions(-) diff --git a/rtdata/languages/default b/rtdata/languages/default index ec93fd41e..ccadda440 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -815,6 +815,8 @@ MAIN_MSG_QOVERWRITE;Do you want to overwrite it? MAIN_MSG_SETPATHFIRST;You first have to set a target path in Preferences in order to use this function! MAIN_MSG_TOOMANYOPENEDITORS;Too many open editors.\nPlease close an editor to continue. MAIN_MSG_WRITEFAILED;Failed to write\n"%1"\n\nMake sure that the folder exists and that you have write permission to it. +MAIN_TAB_ADVANCED;Advanced +MAIN_TAB_ADVANCED_TOOLTIP;Shortcut: Alt-w MAIN_TAB_COLOR;Color MAIN_TAB_COLOR_TOOLTIP;Shortcut: Alt-c MAIN_TAB_DETAIL;Detail @@ -833,8 +835,6 @@ MAIN_TAB_RAW;Raw MAIN_TAB_RAW_TOOLTIP;Shortcut: Alt-r MAIN_TAB_TRANSFORM;Transform MAIN_TAB_TRANSFORM_TOOLTIP;Shortcut: Alt-t -MAIN_TAB_WAVELET;Wavelet -MAIN_TAB_WAVELET_TOOLTIP;Shortcut: Alt-w MAIN_TOOLTIP_BACKCOLOR0;Background color of the preview: Theme-based\nShortcut: 9 MAIN_TOOLTIP_BACKCOLOR1;Background color of the preview: Black\nShortcut: 9 MAIN_TOOLTIP_BACKCOLOR2;Background color of the preview: White\nShortcut: 9 @@ -869,6 +869,7 @@ NAVIGATOR_XY_FULL;Width: %1, Height: %2 NAVIGATOR_XY_NA;x: --, y: -- OPTIONS_DEFIMG_MISSING;The default profile for non-raw photos could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\nDefault internal values will be used. OPTIONS_DEFRAW_MISSING;The default profile for raw photos could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\nDefault internal values will be used. +PARTIALPASTE_ADVANCEDGROUP;Advanced Settings PARTIALPASTE_BASICGROUP;Basic Settings PARTIALPASTE_CACORRECTION;Chromatic aberration correction PARTIALPASTE_CHANNELMIXER;Channel mixer @@ -940,7 +941,6 @@ PARTIALPASTE_SHARPENMICRO;Microcontrast PARTIALPASTE_TM_FATTAL;HDR Tone mapping PARTIALPASTE_VIBRANCE;Vibrance PARTIALPASTE_VIGNETTING;Vignetting correction -PARTIALPASTE_WAVELETGROUP;Wavelet Levels PARTIALPASTE_WHITEBALANCE;White balance PREFERENCES_ADD;Add PREFERENCES_APPLNEXTSTARTUP;restart required diff --git a/rtgui/partialpastedlg.cc b/rtgui/partialpastedlg.cc index 898b6dad5..392da6db3 100644 --- a/rtgui/partialpastedlg.cc +++ b/rtgui/partialpastedlg.cc @@ -43,8 +43,8 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring &title, Gtk::Window* paren meta ->set_name("PartialPasteHeader"); raw = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_RAWGROUP"))); raw ->set_name("PartialPasteHeader"); - wav = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_WAVELETGROUP"))); - wav ->set_name("PartialPasteHeader"); + advanced = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_ADVANCEDGROUP"))); + advanced ->set_name("PartialPasteHeader"); // options in basic: wb = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_WHITEBALANCE"))); @@ -147,11 +147,9 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring &title, Gtk::Window* paren vboxes[0]->pack_start (*sh, Gtk::PACK_SHRINK, 2); vboxes[0]->pack_start (*epd, Gtk::PACK_SHRINK, 2); vboxes[0]->pack_start (*fattal, Gtk::PACK_SHRINK, 2); - vboxes[0]->pack_start (*retinex, Gtk::PACK_SHRINK, 2); vboxes[0]->pack_start (*pcvignette, Gtk::PACK_SHRINK, 2); vboxes[0]->pack_start (*gradient, Gtk::PACK_SHRINK, 2); vboxes[0]->pack_start (*labcurve, Gtk::PACK_SHRINK, 2); - vboxes[0]->pack_start (*colorappearance, Gtk::PACK_SHRINK, 2); //DETAIL vboxes[1]->pack_start (*detail, Gtk::PACK_SHRINK, 2); @@ -170,7 +168,6 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring &title, Gtk::Window* paren vboxes[2]->pack_start (*icm, Gtk::PACK_SHRINK, 2); //vboxes[2]->pack_start (*gam, Gtk::PACK_SHRINK, 2); vboxes[2]->pack_start (*vibrance, Gtk::PACK_SHRINK, 2); - vboxes[2]->pack_start (*chmixer, Gtk::PACK_SHRINK, 2); vboxes[2]->pack_start (*blackwhite, Gtk::PACK_SHRINK, 2); vboxes[2]->pack_start (*hsveq, Gtk::PACK_SHRINK, 2); vboxes[2]->pack_start (*filmSimulation, Gtk::PACK_SHRINK, 2); @@ -197,8 +194,11 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring &title, Gtk::Window* paren vboxes[4]->pack_start (*commonTrans, Gtk::PACK_SHRINK, 2); //WAVELET - vboxes[5]->pack_start (*wav, Gtk::PACK_SHRINK, 2); + vboxes[5]->pack_start (*advanced, Gtk::PACK_SHRINK, 2); vboxes[5]->pack_start (*hseps[5], Gtk::PACK_SHRINK, 2); + vboxes[5]->pack_start (*chmixer, Gtk::PACK_SHRINK, 2); + vboxes[5]->pack_start (*retinex, Gtk::PACK_SHRINK, 2); + vboxes[5]->pack_start (*colorappearance, Gtk::PACK_SHRINK, 2); vboxes[5]->pack_start (*wavelet, Gtk::PACK_SHRINK, 2); //RAW @@ -296,7 +296,7 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring &title, Gtk::Window* paren compositionConn = composition->signal_toggled().connect (sigc::mem_fun(*this, &PartialPasteDlg::compositionToggled)); metaConn = meta->signal_toggled().connect (sigc::mem_fun(*this, &PartialPasteDlg::metaToggled)); rawConn = raw->signal_toggled().connect (sigc::mem_fun(*this, &PartialPasteDlg::rawToggled)); - wavConn = wav->signal_toggled().connect (sigc::mem_fun(*this, &PartialPasteDlg::wavToggled)); + advancedConn = advanced->signal_toggled().connect (sigc::mem_fun(*this, &PartialPasteDlg::advancedToggled)); wbConn = wb->signal_toggled().connect (sigc::bind (sigc::mem_fun(*basic, &Gtk::CheckButton::set_inconsistent), true)); exposureConn = exposure->signal_toggled().connect (sigc::bind (sigc::mem_fun(*basic, &Gtk::CheckButton::set_inconsistent), true)); @@ -318,7 +318,7 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring &title, Gtk::Window* paren dirpyreqConn = dirpyreq->signal_toggled().connect (sigc::bind (sigc::mem_fun(*detail, &Gtk::CheckButton::set_inconsistent), true)); defringeConn = defringe->signal_toggled().connect (sigc::bind (sigc::mem_fun(*detail, &Gtk::CheckButton::set_inconsistent), true)); - waveletConn = wavelet->signal_toggled().connect (sigc::bind (sigc::mem_fun(*wav, &Gtk::CheckButton::set_inconsistent), true)); + waveletConn = wavelet->signal_toggled().connect (sigc::bind (sigc::mem_fun(*advanced, &Gtk::CheckButton::set_inconsistent), true)); icmConn = icm->signal_toggled().connect (sigc::bind (sigc::mem_fun(*color, &Gtk::CheckButton::set_inconsistent), true)); //gamcsconn = gam->signal_toggled().connect (sigc::bind (sigc::mem_fun(*color, &Gtk::CheckButton::set_inconsistent), true)); @@ -389,7 +389,7 @@ void PartialPasteDlg::everythingToggled () ConnectionBlocker compositionBlocker(compositionConn); ConnectionBlocker metaBlocker(metaConn); ConnectionBlocker rawBlocker(rawConn); - ConnectionBlocker wavBlocker(wavConn); + ConnectionBlocker advancedBlocker(advancedConn); everything->set_inconsistent (false); @@ -401,7 +401,7 @@ void PartialPasteDlg::everythingToggled () composition->set_active(everything->get_active()); meta->set_active(everything->get_active()); raw->set_active(everything->get_active()); - wav->set_active(everything->get_active()); + advanced->set_active(everything->get_active()); //toggle group children PartialPasteDlg::basicToggled (); @@ -411,7 +411,7 @@ void PartialPasteDlg::everythingToggled () PartialPasteDlg::compositionToggled (); PartialPasteDlg::metaToggled (); PartialPasteDlg::rawToggled (); - PartialPasteDlg::wavToggled (); + PartialPasteDlg::advancedToggled (); } void PartialPasteDlg::rawToggled () @@ -481,9 +481,7 @@ void PartialPasteDlg::basicToggled () ConnectionBlocker fattalBlocker(fattalConn); ConnectionBlocker pcvignetteBlocker(pcvignetteConn); ConnectionBlocker gradientBlocker(gradientConn); - ConnectionBlocker retinexBlocker(retinexConn); ConnectionBlocker labcurveBlocker(labcurveConn); - ConnectionBlocker colorappearanceBlocker(colorappearanceConn); basic->set_inconsistent (false); @@ -495,9 +493,7 @@ void PartialPasteDlg::basicToggled () fattal->set_active (basic->get_active ()); pcvignette->set_active (basic->get_active ()); gradient->set_active (basic->get_active ()); - retinex->set_active (basic->get_active ()); labcurve->set_active (basic->get_active ()); - colorappearance->set_active (basic->get_active ()); } void PartialPasteDlg::detailToggled () @@ -522,13 +518,19 @@ void PartialPasteDlg::detailToggled () dirpyreq->set_active (detail->get_active ()); } -void PartialPasteDlg::wavToggled () +void PartialPasteDlg::advancedToggled () { ConnectionBlocker waveletBlocker(waveletConn); + ConnectionBlocker chmixerBlocker(chmixerConn); + ConnectionBlocker retinexBlocker(retinexConn); + ConnectionBlocker colorappearanceBlocker(colorappearanceConn); - wav->set_inconsistent (false); - wavelet->set_active (wav->get_active ()); + advanced->set_inconsistent (false); + wavelet->set_active (advanced->get_active ()); + chmixer->set_active (color->get_active ()); + retinex->set_active (basic->get_active ()); + colorappearance->set_active (basic->get_active ()); } void PartialPasteDlg::colorToggled () @@ -536,7 +538,6 @@ void PartialPasteDlg::colorToggled () ConnectionBlocker icmBlocker(icmConn); ConnectionBlocker vibranceBlocker(vibranceConn); - ConnectionBlocker chmixerBlocker(chmixerConn); ConnectionBlocker chmixerbwBlocker(chmixerbwConn); ConnectionBlocker hsveqBlocker(hsveqConn); ConnectionBlocker filmSimulationBlocker(filmSimulationConn); @@ -549,7 +550,6 @@ void PartialPasteDlg::colorToggled () icm->set_active (color->get_active ()); //gam->set_active (color->get_active ()); vibrance->set_active (color->get_active ()); - chmixer->set_active (color->get_active ()); blackwhite->set_active (color->get_active ()); hsveq->set_active (color->get_active ()); filmSimulation->set_active (color->get_active ()); diff --git a/rtgui/partialpastedlg.h b/rtgui/partialpastedlg.h index d1ae056c3..08e8ed81e 100644 --- a/rtgui/partialpastedlg.h +++ b/rtgui/partialpastedlg.h @@ -39,7 +39,7 @@ public: Gtk::CheckButton* composition; Gtk::CheckButton* meta; Gtk::CheckButton* raw; - Gtk::CheckButton* wav; + Gtk::CheckButton* advanced; // options in basic: Gtk::CheckButton* wb; @@ -123,7 +123,7 @@ public: Gtk::CheckButton* ff_BlurType; Gtk::CheckButton* ff_ClipControl; - sigc::connection everythingConn, basicConn, detailConn, colorConn, lensConn, compositionConn, metaConn, rawConn, wavConn; + sigc::connection everythingConn, basicConn, detailConn, colorConn, lensConn, compositionConn, metaConn, rawConn, advancedConn; sigc::connection wbConn, exposureConn, localcontrastConn, shConn, pcvignetteConn, gradientConn, labcurveConn, colorappearanceConn; sigc::connection sharpenConn, gradsharpenConn, microcontrastConn, impdenConn, dirpyrdenConn, defringeConn, epdConn, fattalConn, dirpyreqConn, waveletConn, retinexConn; @@ -147,7 +147,7 @@ public: void compositionToggled (); void metaToggled (); void rawToggled (); - void wavToggled (); + void advancedToggled (); }; #endif diff --git a/rtgui/toolpanelcoord.cc b/rtgui/toolpanelcoord.cc index 7726f9a5e..464aea25b 100644 --- a/rtgui/toolpanelcoord.cc +++ b/rtgui/toolpanelcoord.cc @@ -36,7 +36,7 @@ ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), hasChan colorPanel = Gtk::manage (new ToolVBox ()); transformPanel = Gtk::manage (new ToolVBox ()); rawPanel = Gtk::manage (new ToolVBox ()); - waveletPanel = Gtk::manage (new ToolVBox ()); + advancedPanel = Gtk::manage (new ToolVBox ()); coarse = Gtk::manage (new CoarsePanel ()); toneCurve = Gtk::manage (new ToneCurve ()); @@ -102,7 +102,7 @@ ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), hasChan addPanel (colorPanel, whitebalance); addPanel (exposurePanel, toneCurve); addPanel (colorPanel, vibrance); - addPanel (colorPanel, chmixer); + addPanel (advancedPanel, chmixer); addPanel (colorPanel, blackwhite); addPanel (exposurePanel, localContrast); addPanel (exposurePanel, shadowshighlights); @@ -115,16 +115,16 @@ ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), hasChan addPanel (colorPanel, colortoning); addPanel (exposurePanel, epd); addPanel (exposurePanel, fattal); - addPanel (exposurePanel, retinex); + addPanel (advancedPanel, retinex); addPanel (exposurePanel, pcvignette); addPanel (exposurePanel, gradient); addPanel (exposurePanel, lcurve); - addPanel (exposurePanel, colorappearance); + addPanel (advancedPanel, colorappearance); addPanel (detailsPanel, impulsedenoise); addPanel (detailsPanel, dirpyrdenoise); addPanel (detailsPanel, defringe); addPanel (detailsPanel, dirpyrequalizer); - addPanel (waveletPanel, wavelet); + addPanel (advancedPanel, wavelet); addPanel (transformPanel, crop); addPanel (transformPanel, resize); addPanel (resize->getPackBox(), prsharpening, 2); @@ -161,7 +161,7 @@ ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), hasChan colorPanelSW = Gtk::manage (new MyScrolledWindow ()); transformPanelSW = Gtk::manage (new MyScrolledWindow ()); rawPanelSW = Gtk::manage (new MyScrolledWindow ()); - waveletPanelSW = Gtk::manage (new MyScrolledWindow ()); + advancedPanelSW = Gtk::manage (new MyScrolledWindow ()); updateVScrollbars (options.hideTPVScrollbar); // load panel endings @@ -185,9 +185,9 @@ ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), hasChan colorPanel->pack_start (*Gtk::manage (new Gtk::HSeparator), Gtk::PACK_SHRINK, 0); colorPanel->pack_start (*vbPanelEnd[2], Gtk::PACK_SHRINK, 4); - waveletPanelSW->add (*waveletPanel); - waveletPanel->pack_start (*Gtk::manage (new Gtk::HSeparator), Gtk::PACK_SHRINK, 0); - waveletPanel->pack_start (*vbPanelEnd[5], Gtk::PACK_SHRINK, 0); + advancedPanelSW->add (*advancedPanel); + advancedPanel->pack_start (*Gtk::manage (new Gtk::HSeparator), Gtk::PACK_SHRINK, 0); + advancedPanel->pack_start (*vbPanelEnd[5], Gtk::PACK_SHRINK, 0); transformPanelSW->add (*transformPanel); transformPanel->pack_start (*Gtk::manage (new Gtk::HSeparator), Gtk::PACK_SHRINK, 0); @@ -204,7 +204,7 @@ ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), hasChan toiE = Gtk::manage (new TextOrIcon ("exposure.png", M ("MAIN_TAB_EXPOSURE"), M ("MAIN_TAB_EXPOSURE_TOOLTIP"), type)); toiD = Gtk::manage (new TextOrIcon ("detail.png", M ("MAIN_TAB_DETAIL"), M ("MAIN_TAB_DETAIL_TOOLTIP"), type)); toiC = Gtk::manage (new TextOrIcon ("colour.png", M ("MAIN_TAB_COLOR"), M ("MAIN_TAB_COLOR_TOOLTIP"), type)); - toiW = Gtk::manage (new TextOrIcon ("wavelet.png", M ("MAIN_TAB_WAVELET"), M ("MAIN_TAB_WAVELET_TOOLTIP"), type)); + toiW = Gtk::manage (new TextOrIcon ("wavelet.png", M ("MAIN_TAB_ADVANCED"), M ("MAIN_TAB_ADVANCED_TOOLTIP"), type)); toiT = Gtk::manage (new TextOrIcon ("transform.png", M ("MAIN_TAB_TRANSFORM"), M ("MAIN_TAB_TRANSFORM_TOOLTIP"), type)); toiR = Gtk::manage (new TextOrIcon ("raw.png", M ("MAIN_TAB_RAW"), M ("MAIN_TAB_RAW_TOOLTIP"), type)); toiM = Gtk::manage (new TextOrIcon ("meta.png", M ("MAIN_TAB_METADATA"), M ("MAIN_TAB_METADATA_TOOLTIP"), type)); @@ -212,7 +212,7 @@ ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), hasChan toolPanelNotebook->append_page (*exposurePanelSW, *toiE); toolPanelNotebook->append_page (*detailsPanelSW, *toiD); toolPanelNotebook->append_page (*colorPanelSW, *toiC); - toolPanelNotebook->append_page (*waveletPanelSW, *toiW); + toolPanelNotebook->append_page (*advancedPanelSW, *toiW); toolPanelNotebook->append_page (*transformPanelSW, *toiT); toolPanelNotebook->append_page (*rawPanelSW, *toiR); toolPanelNotebook->append_page (*metadata, *toiM); @@ -801,7 +801,7 @@ bool ToolPanelCoordinator::handleShortcutKey (GdkEventKey* event) return true; case GDK_KEY_w: - toolPanelNotebook->set_current_page (toolPanelNotebook->page_num (*waveletPanelSW)); + toolPanelNotebook->set_current_page (toolPanelNotebook->page_num (*advancedPanelSW)); return true; case GDK_KEY_m: @@ -822,7 +822,7 @@ void ToolPanelCoordinator::updateVScrollbars (bool hide) colorPanelSW->set_policy (Gtk::POLICY_AUTOMATIC, policy); transformPanelSW->set_policy (Gtk::POLICY_AUTOMATIC, policy); rawPanelSW->set_policy (Gtk::POLICY_AUTOMATIC, policy); - waveletPanelSW->set_policy (Gtk::POLICY_AUTOMATIC, policy); + advancedPanelSW->set_policy (Gtk::POLICY_AUTOMATIC, policy); for (auto currExp : expList) { currExp->updateVScrollbars (hide); diff --git a/rtgui/toolpanelcoord.h b/rtgui/toolpanelcoord.h index 11f6dfc0a..c6d2e6380 100644 --- a/rtgui/toolpanelcoord.h +++ b/rtgui/toolpanelcoord.h @@ -160,7 +160,7 @@ protected: ToolVBox* colorPanel; ToolVBox* transformPanel; ToolVBox* rawPanel; - ToolVBox* waveletPanel; + ToolVBox* advancedPanel; ToolBar* toolBar; TextOrIcon* toiE; @@ -179,7 +179,7 @@ protected: Gtk::ScrolledWindow* colorPanelSW; Gtk::ScrolledWindow* transformPanelSW; Gtk::ScrolledWindow* rawPanelSW; - Gtk::ScrolledWindow* waveletPanelSW; + Gtk::ScrolledWindow* advancedPanelSW; std::vector expList; From 466efd3993c66912a6bf27e88121b75f3e7268a5 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Sun, 21 Jan 2018 19:11:21 +0100 Subject: [PATCH 2/3] Added "Advanced" tab icon. Added equalizer and atom icons, and set the Advanced tab to use the atom icon. #4298 --- rtdata/images/Dark/actions/atom.png | Bin 0 -> 1325 bytes .../images/Dark/actions/equalizer-narrow.png | Bin 0 -> 1038 bytes rtdata/images/Dark/actions/equalizer-wide.png | Bin 0 -> 918 bytes rtdata/images/Light/actions/atom.png | Bin 0 -> 1312 bytes .../images/Light/actions/equalizer-narrow.png | Bin 0 -> 1017 bytes .../images/Light/actions/equalizer-wide.png | Bin 0 -> 927 bytes rtgui/toolpanelcoord.cc | 2 +- tools/source_icons/scalable/atom.file | 1 + tools/source_icons/scalable/atom.svg | 121 +++++++++ .../scalable/equalizer-narrow.file | 1 + .../scalable/equalizer-narrow.svg | 201 ++++++++++++++ .../source_icons/scalable/equalizer-wide.file | 1 + .../source_icons/scalable/equalizer-wide.svg | 256 ++++++++++++++++++ 13 files changed, 582 insertions(+), 1 deletion(-) create mode 100644 rtdata/images/Dark/actions/atom.png create mode 100644 rtdata/images/Dark/actions/equalizer-narrow.png create mode 100644 rtdata/images/Dark/actions/equalizer-wide.png create mode 100644 rtdata/images/Light/actions/atom.png create mode 100644 rtdata/images/Light/actions/equalizer-narrow.png create mode 100644 rtdata/images/Light/actions/equalizer-wide.png create mode 100644 tools/source_icons/scalable/atom.file create mode 100644 tools/source_icons/scalable/atom.svg create mode 100644 tools/source_icons/scalable/equalizer-narrow.file create mode 100644 tools/source_icons/scalable/equalizer-narrow.svg create mode 100644 tools/source_icons/scalable/equalizer-wide.file create mode 100644 tools/source_icons/scalable/equalizer-wide.svg diff --git a/rtdata/images/Dark/actions/atom.png b/rtdata/images/Dark/actions/atom.png new file mode 100644 index 0000000000000000000000000000000000000000..1e7ce3da01bcd1af1fce3eb1f18c90b01697c981 GIT binary patch literal 1325 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 IM6N<$g3Q**wEzGB literal 0 HcmV?d00001 diff --git a/rtdata/images/Dark/actions/equalizer-wide.png b/rtdata/images/Dark/actions/equalizer-wide.png new file mode 100644 index 0000000000000000000000000000000000000000..50cfed8fa8b4fbb59fbb363664d20cc1e0660f0b GIT binary patch literal 918 zcmV;H18Mw;P)(^b8FWQhbW?9;ba!ELWdL_~cP?peYja~^ zaAhuUa%Y?FJQ@H1055b!SaeirbZlh+Nn>wrb0B7Kav*eQWgsF&cyMKMbRr;hVPYU@ zZXi-&cT{L)a$#^~WeEx?i~s-t7IZ~ebU}4=Xm4@=O>c5%VQwHuVRB@5Z*OE^P<7b= z002^SMObu0Z*X~XX=iA307F9{L3DI-X<~JBX>V>VQ)ppwWkGCdYh@s4baZe!FE3+q zWnpw_c4cF4ZEbIEb1rXkXD@7NV`Xl0WpgiLc`b8cFElPNFT+$~1poj7SV=@dR5*>b z)v;?7Q4j|3Z|1$rMFh>ANfWS5qsS2y6$>Q?v9U6h7NUY+r@?=~^acbGB~`$}N>R%T z9I*`;7Su+OAd&+$IZm@jNN(SZ&2E^@7AFaL&AxB<&2MLyw=8f#gR)7Z(HI4AILpqt z?RvfbeXp=L^C!%FA`2me4uEs}hE?@N2;q2^iD+Z5XbvW#8$@)dnqDI zSr(B${fZYB7H$#I5mU1=IXU?*2aCv*s*Y!wnb!b3>to*$k>M;5(K3KMOhio)`DOBY zzmAD$NmY-T{4tx`U9srBkFpR#*zO05NR@~xS!U*=1z1(DtLhnZ_n!c6_vv^{z)&NZRdcB(W{;q|S zB>4g0n~27Ns`3O+|DvH{{?_jsT73}<}6$)m7;V_M^(id zg^rndLqseb13Q{3vH$=8 literal 0 HcmV?d00001 diff --git a/rtdata/images/Light/actions/atom.png b/rtdata/images/Light/actions/atom.png new file mode 100644 index 0000000000000000000000000000000000000000..55feaf8d7659c568fb3412db6b7b78eb2a4995ab GIT binary patch literal 1312 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 + + + + Icons for the "Expert" tab in RawTherapee + + + + + + + + image/svg+xml + + Icons for the "Expert" tab in RawTherapee + + + Morgan Hardwood + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/source_icons/scalable/equalizer-narrow.file b/tools/source_icons/scalable/equalizer-narrow.file new file mode 100644 index 000000000..c922b3554 --- /dev/null +++ b/tools/source_icons/scalable/equalizer-narrow.file @@ -0,0 +1 @@ +equalizer-narrow.png,w22,actions diff --git a/tools/source_icons/scalable/equalizer-narrow.svg b/tools/source_icons/scalable/equalizer-narrow.svg new file mode 100644 index 000000000..b31128b36 --- /dev/null +++ b/tools/source_icons/scalable/equalizer-narrow.svg @@ -0,0 +1,201 @@ + + + + + Icons for the "Expert" tab in RawTherapee + + + + + + + + image/svg+xml + + Icons for the "Expert" tab in RawTherapee + + + Morgan Hardwood + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/source_icons/scalable/equalizer-wide.file b/tools/source_icons/scalable/equalizer-wide.file new file mode 100644 index 000000000..22ee0b4b9 --- /dev/null +++ b/tools/source_icons/scalable/equalizer-wide.file @@ -0,0 +1 @@ +equalizer-wide.png,w22,actions diff --git a/tools/source_icons/scalable/equalizer-wide.svg b/tools/source_icons/scalable/equalizer-wide.svg new file mode 100644 index 000000000..dcf184f56 --- /dev/null +++ b/tools/source_icons/scalable/equalizer-wide.svg @@ -0,0 +1,256 @@ + + + + + Icons for the "Expert" tab in RawTherapee + + + + + + + + image/svg+xml + + Icons for the "Expert" tab in RawTherapee + + + Morgan Hardwood + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 2aea7aa97cb4c1464528687b6b79c463cca18d91 Mon Sep 17 00:00:00 2001 From: Alberto Griggio Date: Sat, 20 Jan 2018 18:50:01 +0100 Subject: [PATCH 3/3] moved channel mixer back to the color tab --- rtgui/partialpastedlg.cc | 6 +++--- rtgui/toolpanelcoord.cc | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rtgui/partialpastedlg.cc b/rtgui/partialpastedlg.cc index 392da6db3..9271ccb58 100644 --- a/rtgui/partialpastedlg.cc +++ b/rtgui/partialpastedlg.cc @@ -168,6 +168,7 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring &title, Gtk::Window* paren vboxes[2]->pack_start (*icm, Gtk::PACK_SHRINK, 2); //vboxes[2]->pack_start (*gam, Gtk::PACK_SHRINK, 2); vboxes[2]->pack_start (*vibrance, Gtk::PACK_SHRINK, 2); + vboxes[2]->pack_start (*chmixer, Gtk::PACK_SHRINK, 2); vboxes[2]->pack_start (*blackwhite, Gtk::PACK_SHRINK, 2); vboxes[2]->pack_start (*hsveq, Gtk::PACK_SHRINK, 2); vboxes[2]->pack_start (*filmSimulation, Gtk::PACK_SHRINK, 2); @@ -196,7 +197,6 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring &title, Gtk::Window* paren //WAVELET vboxes[5]->pack_start (*advanced, Gtk::PACK_SHRINK, 2); vboxes[5]->pack_start (*hseps[5], Gtk::PACK_SHRINK, 2); - vboxes[5]->pack_start (*chmixer, Gtk::PACK_SHRINK, 2); vboxes[5]->pack_start (*retinex, Gtk::PACK_SHRINK, 2); vboxes[5]->pack_start (*colorappearance, Gtk::PACK_SHRINK, 2); vboxes[5]->pack_start (*wavelet, Gtk::PACK_SHRINK, 2); @@ -522,13 +522,11 @@ void PartialPasteDlg::advancedToggled () { ConnectionBlocker waveletBlocker(waveletConn); - ConnectionBlocker chmixerBlocker(chmixerConn); ConnectionBlocker retinexBlocker(retinexConn); ConnectionBlocker colorappearanceBlocker(colorappearanceConn); advanced->set_inconsistent (false); wavelet->set_active (advanced->get_active ()); - chmixer->set_active (color->get_active ()); retinex->set_active (basic->get_active ()); colorappearance->set_active (basic->get_active ()); } @@ -538,6 +536,7 @@ void PartialPasteDlg::colorToggled () ConnectionBlocker icmBlocker(icmConn); ConnectionBlocker vibranceBlocker(vibranceConn); + ConnectionBlocker chmixerBlocker(chmixerConn); ConnectionBlocker chmixerbwBlocker(chmixerbwConn); ConnectionBlocker hsveqBlocker(hsveqConn); ConnectionBlocker filmSimulationBlocker(filmSimulationConn); @@ -550,6 +549,7 @@ void PartialPasteDlg::colorToggled () icm->set_active (color->get_active ()); //gam->set_active (color->get_active ()); vibrance->set_active (color->get_active ()); + chmixer->set_active (color->get_active ()); blackwhite->set_active (color->get_active ()); hsveq->set_active (color->get_active ()); filmSimulation->set_active (color->get_active ()); diff --git a/rtgui/toolpanelcoord.cc b/rtgui/toolpanelcoord.cc index fcdf9a0e4..e9cb3ea43 100644 --- a/rtgui/toolpanelcoord.cc +++ b/rtgui/toolpanelcoord.cc @@ -102,7 +102,7 @@ ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), hasChan addPanel (colorPanel, whitebalance); addPanel (exposurePanel, toneCurve); addPanel (colorPanel, vibrance); - addPanel (advancedPanel, chmixer); + addPanel (colorPanel, chmixer); addPanel (colorPanel, blackwhite); addPanel (exposurePanel, localContrast); addPanel (exposurePanel, shadowshighlights);