Renamed files to "blackwhite.cc/h" + small bugfix in BlackWhite::setting changed

This commit is contained in:
natureh 510
2013-11-26 21:39:45 +01:00
parent 5d2bb1724b
commit 82d0f5c325
4 changed files with 7 additions and 5 deletions

View File

@@ -5,7 +5,7 @@ set (BASESOURCEFILES
ilabel.cc thumbbrowserbase.cc adjuster.cc filebrowserentry.cc filebrowser.cc filethumbnailbuttonset.cc ilabel.cc thumbbrowserbase.cc adjuster.cc filebrowserentry.cc filebrowser.cc filethumbnailbuttonset.cc
cachemanager.cc cacheimagedata.cc shcselector.cc perspective.cc thresholdselector.cc thresholdadjuster.cc cachemanager.cc cacheimagedata.cc shcselector.cc perspective.cc thresholdselector.cc thresholdadjuster.cc
clipboard.cc thumbimageupdater.cc bqentryupdater.cc lensgeom.cc coloredbar.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 resize.cc icmpanel.cc crop.cc shadowshighlights.cc
impulsedenoise.cc dirpyrdenoise.cc epd.cc impulsedenoise.cc dirpyrdenoise.cc epd.cc
exifpanel.cc toolpanel.cc lensprofile.cc exifpanel.cc toolpanel.cc lensprofile.cc

View File

@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>. * along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "chmixerbw.h" #include "blackwhite.h"
#include "rtimage.h" #include "rtimage.h"
#include "../rtengine/color.h" #include "../rtengine/color.h"
#include <iomanip> #include <iomanip>
@@ -706,6 +706,8 @@ void BlackWhite::settingChanged () {
else if ( setting->get_active_row_number()==14 ) { else if ( setting->get_active_row_number()==14 ) {
// Infrared // Infrared
filter->set_active (0); filter->set_active (0);
showMixer(3, false);
hideEnabledCC();
hideFilter(); hideFilter();
} }
else { else {

View File

@@ -16,8 +16,8 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>. * along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef _CHMIXERBW_H_ #ifndef _BLACKWHITE_H_
#define _CHMIXERBW_H_ #define _BLACKWHITE_H_
#include <gtkmm.h> #include <gtkmm.h>
#include "adjuster.h" #include "adjuster.h"

View File

@@ -44,7 +44,7 @@
#include "icmpanel.h" #include "icmpanel.h"
#include "resize.h" #include "resize.h"
#include "chmixer.h" #include "chmixer.h"
#include "chmixerbw.h" #include "blackwhite.h"
#include "hlrec.h" #include "hlrec.h"
#include "cacorrection.h" #include "cacorrection.h"
#include "lensprofile.h" #include "lensprofile.h"