diff --git a/gui_qt/dialogcolorgradation.cpp b/gui_qt/dialogcolorgradation.cpp index 7c2f61b..08eac79 100644 --- a/gui_qt/dialogcolorgradation.cpp +++ b/gui_qt/dialogcolorgradation.cpp @@ -27,14 +27,17 @@ DialogColorGradation::DialogColorGradation(QWidget *parent, ColorGradation* grad _preview_red = new PreviewColorGradation(this, gradation, COLORGRADATIONBAND_RED); _preview_red->setMinimumHeight(50); + connect(_preview_red, SIGNAL(clicked()), this, SLOT(selectRed())); layout()->addWidget(_preview_red); _preview_green = new PreviewColorGradation(this, gradation, COLORGRADATIONBAND_GREEN); _preview_green->setMinimumHeight(50); + connect(_preview_green, SIGNAL(clicked()), this, SLOT(selectGreen())); layout()->addWidget(_preview_green); _preview_blue = new PreviewColorGradation(this, gradation, COLORGRADATIONBAND_BLUE); _preview_blue->setMinimumHeight(50); + connect(_preview_blue, SIGNAL(clicked()), this, SLOT(selectBlue())); layout()->addWidget(_preview_blue); _preview_final = new PreviewColorGradation(this, gradation, COLORGRADATIONBAND_FINAL); @@ -87,8 +90,25 @@ void DialogColorGradation::revert() revertToCurrent(); } -void DialogColorGradation::revertToCurrent() +void DialogColorGradation::selectRed() { colorGradationGetRedCurve(_current, _curve); _curve_editor->setCurve(_curve); } + +void DialogColorGradation::selectGreen() +{ + colorGradationGetGreenCurve(_current, _curve); + _curve_editor->setCurve(_curve); +} + +void DialogColorGradation::selectBlue() +{ + colorGradationGetBlueCurve(_current, _curve); + _curve_editor->setCurve(_curve); +} + +void DialogColorGradation::revertToCurrent() +{ + selectRed(); +} diff --git a/gui_qt/dialogcolorgradation.h b/gui_qt/dialogcolorgradation.h index 65e5ae1..2e445fb 100644 --- a/gui_qt/dialogcolorgradation.h +++ b/gui_qt/dialogcolorgradation.h @@ -21,6 +21,9 @@ public: public slots: virtual void accept(); void revert(); + void selectRed(); + void selectGreen(); + void selectBlue(); protected: virtual void closeEvent(QCloseEvent* e); diff --git a/gui_qt/mainwindow.cpp b/gui_qt/mainwindow.cpp index df7a856..e5d132d 100644 --- a/gui_qt/mainwindow.cpp +++ b/gui_qt/mainwindow.cpp @@ -82,14 +82,14 @@ MainWindow::MainWindow(QWidget *parent) : tabs->addTab(form, tr("Water")); QObject::connect(form, SIGNAL(configApplied()), this, SLOT(refreshAll())); - form = new FormAtmosphere(tabs); - tabs->addTab(form, tr("Atmosphere")); - QObject::connect(form, SIGNAL(configApplied()), this, SLOT(refreshAll())); - form = new FormSky(tabs); tabs->addTab(form, tr("Sky")); QObject::connect(form, SIGNAL(configApplied()), this, SLOT(refreshAll())); + form = new FormAtmosphere(tabs); + tabs->addTab(form, tr("Atmosphere")); + QObject::connect(form, SIGNAL(configApplied()), this, SLOT(refreshAll())); + form = new FormClouds(tabs); tabs->addTab(form, tr("Clouds")); QObject::connect(form, SIGNAL(configApplied()), this, SLOT(refreshAll())); diff --git a/gui_qt/previewcolorgradation.cpp b/gui_qt/previewcolorgradation.cpp index 975ccb9..1675be7 100644 --- a/gui_qt/previewcolorgradation.cpp +++ b/gui_qt/previewcolorgradation.cpp @@ -66,3 +66,8 @@ void PreviewColorGradation::paintEvent(QPaintEvent* event) curveDelete(curve); } + +void PreviewColorGradation::mouseReleaseEvent(QMouseEvent* event) +{ + emit clicked(); +} diff --git a/gui_qt/previewcolorgradation.h b/gui_qt/previewcolorgradation.h index 04acb59..0b4035e 100644 --- a/gui_qt/previewcolorgradation.h +++ b/gui_qt/previewcolorgradation.h @@ -19,6 +19,10 @@ class PreviewColorGradation:public QWidget public: PreviewColorGradation(QWidget* parent, ColorGradation* gradation, EnumColorGradationBand band); void paintEvent(QPaintEvent* event); + void mouseReleaseEvent(QMouseEvent* event); + +signals: + void clicked(); private: ColorGradation* gradation; diff --git a/i18n/paysages_fr.ts b/i18n/paysages_fr.ts index 86ab83f..1270b12 100644 --- a/i18n/paysages_fr.ts +++ b/i18n/paysages_fr.ts @@ -37,7 +37,7 @@ DialogColorGradation - + Paysages 3D - Color gradation editor Paysages 3D - Editeur de gradients de couleur @@ -529,12 +529,12 @@ Eau - + Atmosphere Atmosphère - + Sky Ciel