[Digikam-devel] extragear/graphics/digikam/imageplugins/coreplugin

[Gilles Caulier]

SVN commit 685338 by cgilles:

digiKam from trunk : HSL correction image plugin is now ported to KDE4
CCMAIL: digikam-devel at kde.org


 M  +4 -4      CMakeLists.txt  
 M  +3 -3      hsl/imageeffect_hsl.cpp  
 M  +13 -12    imageplugin_core.cpp  


--- trunk/extragear/graphics/digikam/imageplugins/coreplugin/CMakeLists.txt #685337:685338
@@ -5,7 +5,7 @@
                     ${CMAKE_SOURCE_DIR}/digikam/imageplugins/coreplugin/ratiocrop
                    )
 
-SET(liblapack_SRCS 
+SET(libclapack_SRCS 
     ${CMAKE_SOURCE_DIR}/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/abort_.c
     ${CMAKE_SOURCE_DIR}/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/dgesv.c 
     ${CMAKE_SOURCE_DIR}/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/dlaswp.c
@@ -40,7 +40,7 @@
    )
 
 SET(digikamimageplugin_core_PART_SRCS 
-    ${liblapack_SRCS} 
+    ${libclapack_SRCS} 
     ${CMAKE_SOURCE_DIR}/digikam/imageplugins/coreplugin/imageplugin_core.cpp 
     ${CMAKE_SOURCE_DIR}/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp 
     ${CMAKE_SOURCE_DIR}/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp 
@@ -49,8 +49,8 @@
     ${CMAKE_SOURCE_DIR}/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp 
     ${CMAKE_SOURCE_DIR}/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp 
     ${CMAKE_SOURCE_DIR}/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp 
-#    ${CMAKE_SOURCE_DIR}/digikam/imageplugins/coreplugin/hsl/hspreviewwidget.cpp
-#    ${CMAKE_SOURCE_DIR}/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp 
+    ${CMAKE_SOURCE_DIR}/digikam/imageplugins/coreplugin/hsl/hspreviewwidget.cpp
+    ${CMAKE_SOURCE_DIR}/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp 
 #    ${CMAKE_SOURCE_DIR}/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp 
 #    ${CMAKE_SOURCE_DIR}/digikam/imageplugins/coreplugin/sharpnesseditor/matrix.cpp
 #    ${CMAKE_SOURCE_DIR}/digikam/imageplugins/coreplugin/sharpnesseditor/refocus.cpp
--- trunk/extragear/graphics/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp #685337:685338
@@ -325,7 +325,7 @@
 {
     KSharedConfig::Ptr config = KGlobal::config();
     KConfigGroup group        = config->group("hsladjust Tool Dialog");
-    m_channelCB->setCurrentItem(group.readEntry("Histogram Channel", 0));    // Luminosity.
+    m_channelCB->setCurrentIndex(group.readEntry("Histogram Channel", 0));    // Luminosity.
     m_scaleBG->button(group.readEntry("Histogram Scale", 
                       (int)Digikam::HistogramWidget::LogScaleHistogram))->setChecked(true);
 
@@ -334,7 +334,7 @@
     m_lInput->setValue(group.readEntry("LighnessAjustment", 0.0));
     slotHChanged(m_hInput->value());
     slotSChanged(m_sInput->value());
-    slotChannelChanged(m_channelCB->currentItem());
+    slotChannelChanged(m_channelCB->currentIndex());
     slotScaleChanged(m_scaleBG->checkedId());
 }
 
@@ -342,7 +342,7 @@
 {
     KSharedConfig::Ptr config = KGlobal::config();
     KConfigGroup group        = config->group("hsladjust Tool Dialog");
-    group.writeEntry("Histogram Channel", m_channelCB->currentItem());
+    group.writeEntry("Histogram Channel", m_channelCB->currentIndex());
     group.writeEntry("Histogram Scale", m_scaleBG->checkedId());
     group.writeEntry("HueAjustment", m_hInput->value());
     group.writeEntry("SaturationAjustment", m_sInput->value());
--- trunk/extragear/graphics/digikam/imageplugins/coreplugin/imageplugin_core.cpp #685337:685338
@@ -83,13 +83,14 @@
     connect(m_BCGAction, SIGNAL(triggered(bool) ), 
             this, SLOT(slotBCG()));
 
-/*
-    m_HSLAction = new KAction(i18n("Hue/Saturation/Lightness..."), "adjusthsl", 
-                      Qt::CTRL+Qt::Key_U,      // NOTE: Photoshop 7 use CTRL+U.
-                      this, SLOT(slotHSL()),
-                      actionCollection(), "implugcore_hsl");
-*/
+    // NOTE: Photoshop 7 use CTRL+U.
+    m_HSLAction = new KAction(KIcon("adjusthsl"), i18n("Hue/Saturation/Lightness..."), this);
+    m_HSLAction->setShortcut(QKeySequence(Qt::CTRL+Qt::Key_U));      
+    actionCollection()->addAction("implugcore_hsl", m_HSLAction );
+    connect(m_HSLAction, SIGNAL(triggered(bool) ), 
+            this, SLOT(slotHSL()));
 
+
     // NOTE: Photoshop 7 use CTRL+B.
     m_RGBAction = new KAction(KIcon("adjustrgb"), i18n("Color Balance..."), this);
     m_RGBAction->setShortcut(QKeySequence(Qt::CTRL+Qt::Key_B));      
@@ -170,9 +171,9 @@
     m_autoCorrectionAction->setEnabled(enable);
     m_BWAction->setEnabled(enable);
     m_colorManagementAction->setEnabled(enable);
+    m_HSLAction->setEnabled(enable);
     
 /*    
-    m_HSLAction->setEnabled(enable);
     m_aspectRatioCropAction->setEnabled(enable);
     m_sharpenAction->setEnabled(enable);
     */
@@ -291,15 +292,15 @@
     dlg.exec();
 }
 
-void ImagePlugin_Core::slotSharpen()
+void ImagePlugin_Core::slotHSL()
 {
-/*    DigikamImagesPluginCore::ImageEffect_Sharpen dlg(parentWidget());
-    dlg.exec();*/
+    DigikamImagesPluginCore::ImageEffect_HSL dlg(parentWidget());
+    dlg.exec();
 }
 
-void ImagePlugin_Core::slotHSL()
+void ImagePlugin_Core::slotSharpen()
 {
-/*    DigikamImagesPluginCore::ImageEffect_HSL dlg(parentWidget());
+/*    DigikamImagesPluginCore::ImageEffect_Sharpen dlg(parentWidget());
     dlg.exec();*/
 }