Merge from branch 3.0

This commit is contained in:
ffsup2
2011-03-19 00:02:29 +01:00
parent 910bcc688c
commit f9d74687b9
20 changed files with 1873 additions and 1586 deletions

View File

@@ -25,11 +25,12 @@
class PartialPasteDlg : public Gtk::Dialog {
public:
Gtk::CheckButton* everything;
Gtk::CheckButton* everything;
// main groups:
Gtk::CheckButton* basic;
Gtk::CheckButton* luminance;
Gtk::CheckButton* detail;
Gtk::CheckButton* color;
Gtk::CheckButton* lens;
Gtk::CheckButton* composition;
@@ -40,24 +41,24 @@ class PartialPasteDlg : public Gtk::Dialog {
Gtk::CheckButton* wb;
Gtk::CheckButton* exposure;
Gtk::CheckButton* hlrec;
// options in luminance:
Gtk::CheckButton* sharpen;
Gtk::CheckButton* impden;
Gtk::CheckButton* lumaden;
Gtk::CheckButton* labcurve;
Gtk::CheckButton* sh;
Gtk::CheckButton* dirpyreq;
Gtk::CheckButton* waveq;
Gtk::CheckButton* labcurve;
// options in detail:
Gtk::CheckButton* sharpen;
Gtk::CheckButton* impden;
Gtk::CheckButton* lumaden;
Gtk::CheckButton* waveq;
Gtk::CheckButton* colorden;
Gtk::CheckButton* dirpyrden;
Gtk::CheckButton* defringe;
Gtk::CheckButton* dirpyreq;
// options in color:
Gtk::CheckButton* colormixer;
Gtk::CheckButton* chmixer;
Gtk::CheckButton* colorshift;
Gtk::CheckButton* colorboost;
Gtk::CheckButton* hsveq;
Gtk::CheckButton* colorden;
Gtk::CheckButton* dirpyrden;
Gtk::CheckButton* hsveq;
// options in lens:
Gtk::CheckButton* distortion;
@@ -69,6 +70,8 @@ class PartialPasteDlg : public Gtk::Dialog {
Gtk::CheckButton* finerot;
Gtk::CheckButton* crop;
Gtk::CheckButton* resize;
Gtk::CheckButton* perspective;
Gtk::CheckButton* commonTrans;
// options in metaicm:
Gtk::CheckButton* exifch;
@@ -76,23 +79,35 @@ class PartialPasteDlg : public Gtk::Dialog {
Gtk::CheckButton* icm;
// options in raw:
Gtk::CheckButton* raw_expos;
Gtk::CheckButton* raw_preser;
Gtk::CheckButton* raw_ca_autocorrect;
Gtk::CheckButton* raw_cared;
Gtk::CheckButton* raw_cablue;
Gtk::CheckButton* raw_hotdeadpix_filt;
Gtk::CheckButton* raw_linenoise;
Gtk::CheckButton* raw_greenthresh;
Gtk::CheckButton* raw_dmethod;
Gtk::CheckButton* raw_ccSteps;
Gtk::CheckButton* raw_dcb_iterations;
Gtk::CheckButton* raw_dcb_enhance;
Gtk::CheckButton* df_file;
Gtk::CheckButton* df_AutoSelect;
Gtk::CheckButton* ff_file;
Gtk::CheckButton* ff_AutoSelect;
Gtk::CheckButton* ff_BlurRadius;
Gtk::CheckButton* ff_BlurType;
sigc::connection everythingConn, basicConn, luminanceConn, colorConn, lensConn, compositionConn, metaicmConn, rawConn;
Gtk::CheckButton* df_AutoSelect;
Gtk::CheckButton* ff_file;
Gtk::CheckButton* ff_AutoSelect;
Gtk::CheckButton* ff_BlurRadius;
Gtk::CheckButton* ff_BlurType;
sigc::connection wbConn, exposureConn, hlrecConn;
sigc::connection sharpenConn, impdenConn, lumadenConn, labcurveConn, shConn, dirpyreqConn, waveqConn, hsveqConn;
sigc::connection colormixerConn, colorshiftConn, colorboostConn, colordenConn, dirpyrdenConn;
sigc::connection everythingConn, basicConn, detailConn, colorConn, lensConn, compositionConn, metaicmConn, rawConn;;
sigc::connection wbConn, exposureConn, hlrecConn, shConn, labcurveConn;
sigc::connection sharpenConn, impdenConn, lumadenConn, dirpyrdenConn, colordenConn, waveqConn, defringeConn, dirpyreqConn;
sigc::connection chmixerConn, colorshiftConn, colorboostConn, hsveqConn;
sigc::connection distortionConn, cacorrConn, vignettingConn;
sigc::connection coarserotConn, finerotConn, cropConn, resizeConn;
sigc::connection coarserotConn, finerotConn, cropConn, resizeConn, perspectiveConn, commonTransConn;
sigc::connection exifchConn, iptcConn, icmConn;
sigc::connection df_fileConn, df_AutoSelectConn,ff_fileConn, ff_AutoSelectConn, ff_BlurRadiusConn, ff_BlurTypeConn;
sigc::connection df_fileConn, df_AutoSelectConn, ff_fileConn, ff_AutoSelectConn, ff_BlurRadiusConn, ff_BlurTypeConn;
sigc::connection raw_caredConn, raw_cablueConn, raw_ca_autocorrectConn, raw_hotdeadpix_filtConn, raw_linenoiseConn, raw_greenthreshConn, raw_ccStepsConn, raw_dmethodConn, raw_dcb_iterationsConn, raw_dcb_enhanceConn, raw_exposConn, raw_preserConn;
public:
PartialPasteDlg ();
@@ -101,7 +116,7 @@ class PartialPasteDlg : public Gtk::Dialog {
void everythingToggled ();
void basicToggled ();
void luminanceToggled ();
void detailToggled ();
void colorToggled ();
void lensToggled ();
void compositionToggled ();