From 82d0f5c325bdc14fc95de4fe6f16cb524556611a Mon Sep 17 00:00:00 2001 From: natureh 510 Date: Tue, 26 Nov 2013 21:39:45 +0100 Subject: [PATCH] Renamed files to "blackwhite.cc/h" + small bugfix in BlackWhite::setting changed --- rtgui/CMakeLists.txt | 2 +- rtgui/{chmixerbw.cc => blackwhite.cc} | 4 +++- rtgui/{chmixerbw.h => blackwhite.h} | 4 ++-- rtgui/toolpanelcoord.h | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) rename rtgui/{chmixerbw.cc => blackwhite.cc} (99%) rename rtgui/{chmixerbw.h => blackwhite.h} (98%) diff --git a/rtgui/CMakeLists.txt b/rtgui/CMakeLists.txt index b2b529828..704a7a844 100644 --- a/rtgui/CMakeLists.txt +++ b/rtgui/CMakeLists.txt @@ -5,7 +5,7 @@ set (BASESOURCEFILES ilabel.cc thumbbrowserbase.cc adjuster.cc filebrowserentry.cc filebrowser.cc filethumbnailbuttonset.cc cachemanager.cc cacheimagedata.cc shcselector.cc perspective.cc thresholdselector.cc thresholdadjuster.cc clipboard.cc thumbimageupdater.cc bqentryupdater.cc lensgeom.cc coloredbar.cc - coarsepanel.cc cacorrection.cc hlrec.cc chmixer.cc chmixerbw.cc + coarsepanel.cc cacorrection.cc hlrec.cc chmixer.cc blackwhite.cc resize.cc icmpanel.cc crop.cc shadowshighlights.cc impulsedenoise.cc dirpyrdenoise.cc epd.cc exifpanel.cc toolpanel.cc lensprofile.cc diff --git a/rtgui/chmixerbw.cc b/rtgui/blackwhite.cc similarity index 99% rename from rtgui/chmixerbw.cc rename to rtgui/blackwhite.cc index ccc9c1f76..a6dc8761f 100644 --- a/rtgui/chmixerbw.cc +++ b/rtgui/blackwhite.cc @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with RawTherapee. If not, see . */ -#include "chmixerbw.h" +#include "blackwhite.h" #include "rtimage.h" #include "../rtengine/color.h" #include @@ -706,6 +706,8 @@ void BlackWhite::settingChanged () { else if ( setting->get_active_row_number()==14 ) { // Infrared filter->set_active (0); + showMixer(3, false); + hideEnabledCC(); hideFilter(); } else { diff --git a/rtgui/chmixerbw.h b/rtgui/blackwhite.h similarity index 98% rename from rtgui/chmixerbw.h rename to rtgui/blackwhite.h index 065544de5..0d8c60971 100644 --- a/rtgui/chmixerbw.h +++ b/rtgui/blackwhite.h @@ -16,8 +16,8 @@ * You should have received a copy of the GNU General Public License * along with RawTherapee. If not, see . */ -#ifndef _CHMIXERBW_H_ -#define _CHMIXERBW_H_ +#ifndef _BLACKWHITE_H_ +#define _BLACKWHITE_H_ #include #include "adjuster.h" diff --git a/rtgui/toolpanelcoord.h b/rtgui/toolpanelcoord.h index f174973ca..ec9475e51 100644 --- a/rtgui/toolpanelcoord.h +++ b/rtgui/toolpanelcoord.h @@ -44,7 +44,7 @@ #include "icmpanel.h" #include "resize.h" #include "chmixer.h" -#include "chmixerbw.h" +#include "blackwhite.h" #include "hlrec.h" #include "cacorrection.h" #include "lensprofile.h"