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

[Gilles Caulier]

SVN commit 685376 by cgilles:

digiKam from trunk : SharpnessEditor image plugin (sharp, unsharp mask, and refocus tools) is now ported to KDE4
CCMAIL: digikam-devel at kde.org


 M  +4 -4      CMakeLists.txt  
 M  +7 -8      imageplugin_core.cpp  
 M  +4 -4      sharpnesseditor/imageeffect_sharpen.cpp  


--- trunk/extragear/graphics/digikam/imageplugins/coreplugin/CMakeLists.txt #685375:685376
@@ -51,10 +51,10 @@
     ${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/sharpnesseditor/imageeffect_sharpen.cpp 
-#    ${CMAKE_SOURCE_DIR}/digikam/imageplugins/coreplugin/sharpnesseditor/matrix.cpp
-#    ${CMAKE_SOURCE_DIR}/digikam/imageplugins/coreplugin/sharpnesseditor/refocus.cpp
-#    ${CMAKE_SOURCE_DIR}/digikam/imageplugins/coreplugin/sharpnesseditor/unsharp.cpp
+    ${CMAKE_SOURCE_DIR}/digikam/imageplugins/coreplugin/sharpnesseditor/matrix.cpp
+    ${CMAKE_SOURCE_DIR}/digikam/imageplugins/coreplugin/sharpnesseditor/refocus.cpp
+    ${CMAKE_SOURCE_DIR}/digikam/imageplugins/coreplugin/sharpnesseditor/unsharp.cpp
+    ${CMAKE_SOURCE_DIR}/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp 
 #    ${CMAKE_SOURCE_DIR}/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp
 #    ${CMAKE_SOURCE_DIR}/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp 
    )
--- trunk/extragear/graphics/digikam/imageplugins/coreplugin/imageplugin_core.cpp #685375:685376
@@ -65,11 +65,10 @@
     connect(m_blurAction, SIGNAL(triggered(bool) ), 
             this, SLOT(slotBlur()));
 
-/*
-    m_sharpenAction = new KAction(i18n("Sharpen..."), "sharpenimage", 0,
-                          this, SLOT(slotSharpen()),
-                          actionCollection(), "implugcore_sharpen");
-*/
+    m_sharpenAction = new KAction(KIcon("sharpenimage"), i18n("Sharpen..."), this);
+    actionCollection()->addAction("implugcore_sharpen", m_sharpenAction );
+    connect(m_sharpenAction, SIGNAL(triggered(bool) ), 
+            this, SLOT(slotSharpen()));
 
     m_redeyeAction = new KAction(KIcon("redeyes"), i18n("Red Eye..."), this);
     m_redeyeAction->setWhatsThis( i18n( "This filter can be used to correct red eyes in a photo. "
@@ -172,10 +171,10 @@
     m_BWAction->setEnabled(enable);
     m_colorManagementAction->setEnabled(enable);
     m_HSLAction->setEnabled(enable);
+    m_sharpenAction->setEnabled(enable);
     
 /*    
     m_aspectRatioCropAction->setEnabled(enable);
-    m_sharpenAction->setEnabled(enable);
     */
 }
 
@@ -300,8 +299,8 @@
 
 void ImagePlugin_Core::slotSharpen()
 {
-/*    DigikamImagesPluginCore::ImageEffect_Sharpen dlg(parentWidget());
-    dlg.exec();*/
+    DigikamImagesPluginCore::ImageEffect_Sharpen dlg(parentWidget());
+    dlg.exec();
 }
 
 void ImagePlugin_Core::slotRatioCrop()
--- trunk/extragear/graphics/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp #685375:685376
@@ -393,7 +393,7 @@
     m_gauss->setValue(group.readEntry("RefocusGaussAjustment", 0.0));
     m_correlation->setValue(group.readEntry("RefocusCorrelationAjustment", 0.5));
     m_noise->setValue(group.readEntry("RefocusNoiseAjustment", 0.03));
-    m_sharpMethod->setCurrentItem(group.readEntry("SharpenMethod", (int)SimpleSharp));
+    m_sharpMethod->setCurrentIndex(group.readEntry("SharpenMethod", (int)SimpleSharp));
     m_radiusInput->blockSignals(false);
     m_radiusInput2->blockSignals(false);
     m_amountInput->blockSignals(false);
@@ -404,7 +404,7 @@
     m_correlation->blockSignals(false);
     m_noise->blockSignals(false);
     m_sharpMethod->blockSignals(false);
-    slotSharpMethodActived(m_sharpMethod->currentItem());
+    slotSharpMethodActived(m_sharpMethod->currentIndex());
 }
 
 void ImageEffect_Sharpen::writeUserSettings()
@@ -420,7 +420,7 @@
     group.writeEntry("RefocusGaussAjustment", m_gauss->value());
     group.writeEntry("RefocusCorrelationAjustment", m_correlation->value());
     group.writeEntry("RefocusNoiseAjustment", m_noise->value());
-    group.writeEntry("SharpenMethod", m_sharpMethod->currentItem());
+    group.writeEntry("SharpenMethod", m_sharpMethod->currentIndex());
     config->sync();
 }
 
@@ -530,7 +530,7 @@
             tmpRect.setRight(area.right()+2*ms);
             tmpRect.setTop(area.top()-2*ms);
             tmpRect.setBottom(area.bottom()+2*ms);
-            tmpRect.moveBy(2*MAX_MATRIX_SIZE, 2*MAX_MATRIX_SIZE);
+            tmpRect.translate(2*MAX_MATRIX_SIZE, 2*MAX_MATRIX_SIZE);
             Digikam::DImg imTemp = m_img.copy(tmpRect);
                 
             m_threadedFilter = dynamic_cast<Digikam::DImgThreadedFilter *>