[Digikam-devel] extragear/graphics/digikam

[Gilles Caulier-2]

SVN commit 630773 by cgilles:

digikam from trunk : prepare the future : dcraw implementation re-organization:

- moving the dcraw settings widget to dcraw libs from digiKam core. In the future, all this dcraw code will go to a shared libkdcraw library.
- digiKam/Showfoto  Setup  : separate dcraw decoding settings from IO File Settings page. A new page dedicaced to dcraw settings have been added.
The "IO File Settings" page have been renamed to "Save Images". Settings from this page will be moved to a other place later 0.9.1, especially to repective saving image dialog like Gimp/Photoshop.
- add new dcraw icon

CCMAIL: [hidden email], [hidden email]

 AM            data/icons/hi128-app-dcraw.png  
 M  +1 -1      libs/dcraw/Makefile.am  
 A             libs/dcraw/dcrawsettingswidget.cpp   utilities/setup/dcrawsettingswidget.cpp#630740
 A             libs/dcraw/dcrawsettingswidget.h   utilities/setup/dcrawsettingswidget.h#630740
 AM            showfoto/icons/hi128-app-dcraw.png  
 M  +21 -12    showfoto/setup/setup.cpp  
 M  +3 -3      showfoto/setup/setup.h  
 M  +4 -4      utilities/setup/Makefile.am  
 D             utilities/setup/dcrawsettingswidget.cpp  
 D             utilities/setup/dcrawsettingswidget.h  
 M  +13 -3     utilities/setup/setup.cpp  
 M  +2 -2      utilities/setup/setup.h  
 M  +5 -42     utilities/setup/setupiofiles.cpp  
 M  +5 -6      utilities/setup/setupiofiles.h  


** trunk/extragear/graphics/digikam/data/icons/hi128-app-dcraw.png #property svn:mime-type
   + image/png
--- trunk/extragear/graphics/digikam/libs/dcraw/Makefile.am #630772:630773
@@ -9,7 +9,7 @@
 
 noinst_LTLIBRARIES = libdcraw.la
 
-libdcraw_la_SOURCES = dcrawbinary.cpp dcrawiface.cpp
+libdcraw_la_SOURCES = dcrawbinary.cpp dcrawiface.cpp dcrawsettingswidget.cpp
 
 libdcraw_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 
** trunk/extragear/graphics/digikam/showfoto/icons/hi128-app-dcraw.png #property svn:mime-type
   + image/png
--- trunk/extragear/graphics/digikam/showfoto/setup/setup.cpp #630772:630773
@@ -3,7 +3,7 @@
  * Date   : 2005-04-02
  * Description : showfoto setup dialog.
  *
- * Copyright 2005-2006 by Gilles Caulier
+ * Copyright 2005-2007 by Gilles Caulier
  *
  * This program is free software; you can redistribute it
  * and/or modify it under the terms of the GNU General
@@ -34,11 +34,13 @@
 // Local includes.
 
 #include "setupeditor.h"
+#include "setupdcraw.h"
 #include "setupiofiles.h"
 #include "setupimgplugins.h"
 #include "setupslideshow.h"
 #include "setupicc.h"
 #include "setup.h"
+#include "setup.moc"
 
 namespace ShowFoto
 {
@@ -49,19 +51,22 @@
 
     SetupPrivate()
     {
+        editorPage      = 0;
+        dcrawPage       = 0;
+        iofilesPage     = 0;
+        imgpluginsPage  = 0;
         slideshowPage   = 0;
-        imgpluginsPage  = 0;
-        iofilesPage     = 0;
         iccPage         = 0;
-        editorPage      = 0;
+        page_editor     = 0;
+        page_dcraw      = 0;
+        page_iofiles    = 0;
+        page_imgplugins = 0;
+        page_slideshow  = 0;
         page_icc        = 0;
-        page_slideshow  = 0;
-        page_imgplugins = 0;
-        page_iofiles    = 0;
-        page_editor     = 0;
     }
 
     QFrame                   *page_editor;
+    QFrame                   *page_dcraw;
     QFrame                   *page_iofiles;
     QFrame                   *page_imgplugins;
     QFrame                   *page_slideshow;
@@ -69,10 +74,11 @@
     
     SetupEditor              *editorPage;
 
-    Digikam::SetupICC        *iccPage;
+    Digikam::SetupDcraw      *dcrawPage;
     Digikam::SetupIOFiles    *iofilesPage;
     Digikam::SetupImgPlugins *imgpluginsPage;
     Digikam::SetupSlideShow  *slideshowPage;
+    Digikam::SetupICC        *iccPage;
 };
 
 Setup::Setup(QWidget* parent, const char* name, Setup::Page page)
@@ -86,7 +92,11 @@
                              BarIcon("showfoto", KIcon::SizeMedium));
     d->editorPage = new SetupEditor(d->page_editor);
 
-    d->page_iofiles = addPage(i18n("IO files"), i18n("IO Image Files Settings"),
+    d->page_dcraw = addPage(i18n("RAW decoding"), i18n("RAW Files Decoding Settings"),
+                              BarIcon("dcraw", KIcon::SizeMedium));
+    d->dcrawPage = new Digikam::SetupDcraw(d->page_dcraw);
+
+    d->page_iofiles = addPage(i18n("Save Images"), i18n("Image Editor Save Images Files Settings"),
                               BarIcon("pipe", KIcon::SizeMedium));
     d->iofilesPage = new Digikam::SetupIOFiles(d->page_iofiles);
     
@@ -129,6 +139,7 @@
 void Setup::slotOkClicked()
 {
     d->editorPage->applySettings();
+    d->dcrawPage->applySettings();
     d->iofilesPage->applySettings();
     d->imgpluginsPage->applySettings();
     d->slideshowPage->applySettings();
@@ -142,5 +153,3 @@
 }
 
 }   // namespace ShowFoto
-
-#include "setup.moc"
--- trunk/extragear/graphics/digikam/showfoto/setup/setup.h #630772:630773
@@ -3,7 +3,7 @@
  * Date   : 2005-04-02
  * Description : showfoto setup dialog.
  *
- * Copyright 2005-2006 by Gilles Caulier
+ * Copyright 2005-2007 by Gilles Caulier
  *
  * This program is free software; you can redistribute it
  * and/or modify it under the terms of the GNU General
@@ -51,6 +51,7 @@
     {
         LastPageUsed = -1,
         EditorPage=0,
+        DcrawPage,
         IOFilesPage,
         PluginsPage,
         SlideshowPage,
@@ -68,8 +69,7 @@
         
 private:
 
-    SetupPrivate* d;
-        
+    SetupPrivate* d;        
 };
 
 }   // namespace ShowFoto
--- trunk/extragear/graphics/digikam/utilities/setup/Makefile.am #630772:630773
@@ -18,13 +18,13 @@
               setupgeneral.cpp setup.cpp setupimgplugins.cpp \
               setupcollections.cpp setupmetadata.cpp \
               setupeditor.cpp setupmisc.cpp setupicc.cpp \
-              setupiofiles.cpp setupslideshow.cpp \
-              setuptooltip.cpp dcrawsettingswidget.cpp
+              setupiofiles.cpp setupdcraw.cpp setupslideshow.cpp \
+              setuptooltip.cpp  
 
 libsetup_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_GPHOTO)
 
-libshowfotosetup_la_SOURCES = setupimgplugins.cpp setupiofiles.cpp \
-                      setupicc.cpp setupslideshow.cpp dcrawsettingswidget.cpp
+libshowfotosetup_la_SOURCES = setupimgplugins.cpp setupiofiles.cpp setupdcraw.cpp \
+                      setupicc.cpp setupslideshow.cpp
 
 libshowfotosetup_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 
--- trunk/extragear/graphics/digikam/utilities/setup/setup.cpp #630772:630773
@@ -5,7 +5,7 @@
  * Description : digiKam setup dialog.
  *
  * Copyright 2003-2005 by Renchi Raju and Gilles Caulier
- * Copyright 2006 by Gilles Caulier
+ * Copyright 2006-2007 by Gilles Caulier
  *
  * This program is free software; you can redistribute it
  * and/or modify it under the terms of the GNU General
@@ -44,6 +44,7 @@
 #include "setupcollections.h"
 #include "setupmime.h"
 #include "setupeditor.h"
+#include "setupdcraw.h"
 #include "setupiofiles.h"
 #include "setupimgplugins.h"
 #include "setupslideshow.h"
@@ -52,6 +53,7 @@
 #include "setupcamera.h"
 #include "setupmisc.h"
 #include "setup.h"
+#include "setup.moc"
 
 namespace Digikam
 {
@@ -69,6 +71,7 @@
         page_collections = 0;
         page_mime        = 0;
         page_editor      = 0;
+        page_dcraw       = 0;
         page_iofiles     = 0;
         page_imgplugins  = 0;
         page_slideshow   = 0;
@@ -84,6 +87,7 @@
         collectionsPage  = 0;
         mimePage         = 0;
         editorPage       = 0;
+        dcrawPage        = 0;
         iofilesPage      = 0;
         slideshowPage    = 0;
         iccPage          = 0;
@@ -100,6 +104,7 @@
     QFrame           *page_collections;
     QFrame           *page_mime;
     QFrame           *page_editor;
+    QFrame           *page_dcraw;
     QFrame           *page_iofiles;
     QFrame           *page_imgplugins;
     QFrame           *page_slideshow;
@@ -115,6 +120,7 @@
     SetupCollections *collectionsPage;
     SetupMime        *mimePage;
     SetupEditor      *editorPage;
+    SetupDcraw       *dcrawPage;
     SetupIOFiles     *iofilesPage;
     SetupSlideShow   *slideshowPage;
     SetupICC         *iccPage;
@@ -159,7 +165,11 @@
                              BarIcon("image", KIcon::SizeMedium));
     d->editorPage = new SetupEditor(d->page_editor);
 
-    d->page_iofiles = addPage(i18n("IO files"), i18n("Image Editor IO Images Files Settings"),
+    d->page_dcraw = addPage(i18n("RAW decoding"), i18n("RAW Files Decoding Settings"),
+                              BarIcon("dcraw", KIcon::SizeMedium));
+    d->dcrawPage = new SetupDcraw(d->page_dcraw);
+
+    d->page_iofiles = addPage(i18n("Save Images"), i18n("Image Editor Save Images Files Settings"),
                               BarIcon("pipe", KIcon::SizeMedium));
     d->iofilesPage = new SetupIOFiles(d->page_iofiles);
 
@@ -221,6 +231,7 @@
     d->mimePage->applySettings();
     d->cameraPage->applySettings();
     d->editorPage->applySettings();
+    d->dcrawPage->applySettings();
     d->iofilesPage->applySettings();
     d->imgpluginsPage->applySettings();
     d->slideshowPage->applySettings();
@@ -256,4 +267,3 @@
 
 }  // namespace Digikam
 
-#include "setup.moc"
--- trunk/extragear/graphics/digikam/utilities/setup/setup.h #630772:630773
@@ -5,7 +5,7 @@
  * Description : digiKam setup dialog.
  *
  * Copyright 2003-2005 by Renchi Raju and Gilles Caulier
- * Copyright 2006 by Gilles Caulier
+ * Copyright 2006-2007 by Gilles Caulier
  *
  * This program is free software; you can redistribute it
  * and/or modify it under the terms of the GNU General
@@ -50,6 +50,7 @@
         Collections,
         Mime,
         Editor,
+ Dcraw,
         IOFiles,
         ImagePlugins,
         Slideshow,
@@ -72,7 +73,6 @@
 private:
 
     SetupPrivate* d;
-
 };
 
 }  // namespace Digikam
--- trunk/extragear/graphics/digikam/utilities/setup/setupiofiles.cpp #630772:630773
@@ -1,10 +1,10 @@
 /* ============================================================
- * Author: Gilles Caulier <caulier dot gilles at kdemail dot net>
- * Date  : 2006-01-23
- * Description : setup image editor Input Output files.
+ * Authors: Gilles Caulier <caulier dot gilles at kdemail dot net>
+ * Date   : 2006-01-23
+ * Description : setup image editor output files settings.
+ *
+ * Copyright 2006-2007 by Gilles Caulier
  *
- * Copyright 2006 by Gilles Caulier
- *
  * This program is free software; you can redistribute it
  * and/or modify it under the terms of the GNU General
  * Public License as published by the Free Software Foundation;
@@ -41,8 +41,6 @@
 
 // Local includes.
 
-#include "dcrawbinary.h"
-#include "dcrawsettingswidget.h"
 #include "setupiofiles.h"
 #include "setupiofiles.moc"
 
@@ -61,7 +59,6 @@
         JPEGcompression      = 0;
         PNGcompression       = 0;
         TIFFcompression      = 0;
-        dcrawSettings        = 0;
     }
 
     QLabel              *labelJPEGcompression;
@@ -71,8 +68,6 @@
 
     KIntNumInput        *JPEGcompression;
     KIntNumInput        *PNGcompression;
-
-    DcrawSettingsWidget *dcrawSettings;
 };
 
 SetupIOFiles::SetupIOFiles(QWidget* parent )
@@ -83,11 +78,6 @@
 
     // --------------------------------------------------------
 
-    d->dcrawSettings = new DcrawSettingsWidget(parent, Digikam::DcrawBinary::instance()->version());
-    layout->addWidget(d->dcrawSettings);
-
-    // --------------------------------------------------------
-
     QGroupBox *savingOptionsGroup = new QGroupBox(0, Qt::Vertical, i18n("Saving Images Options"), parent);
 
     QGridLayout* grid2 = new QGridLayout( savingOptionsGroup->layout(), 2, 1, KDialog::spacingHint());
@@ -150,19 +140,6 @@
     KConfig* config = kapp->config();
 
     config->setGroup("ImageViewer Settings");
-
-    config->writeEntry("SixteenBitsImage", d->dcrawSettings->sixteenBits());
-    config->writeEntry("CameraColorBalance", d->dcrawSettings->useCameraWB());
-    config->writeEntry("AutomaticColorBalance", d->dcrawSettings->useAutoColorBalance());
-    config->writeEntry("RGBInterpolate4Colors", d->dcrawSettings->useFourColor());
-    config->writeEntry("SuperCCDsecondarySensor", d->dcrawSettings->useSecondarySensor());
-    config->writeEntry("EnableNoiseReduction", d->dcrawSettings->useNoiseReduction());
-    config->writeEntry("NRSigmaDomain", d->dcrawSettings->sigmaDomain());
-    config->writeEntry("NRSigmaRange", d->dcrawSettings->sigmaRange());
-    config->writeEntry("UnclipColors", d->dcrawSettings->unclipColor());
-    config->writeEntry("RAWBrightness", d->dcrawSettings->brightness());
-    config->writeEntry("RAWQuality", d->dcrawSettings->quality());
-
     config->writeEntry("JPEGCompression", d->JPEGcompression->value());
     config->writeEntry("PNGCompression", d->PNGcompression->value());
     config->writeEntry("TIFFCompression", d->TIFFcompression->isChecked());
@@ -173,20 +150,6 @@
 {
     KConfig* config = kapp->config();
     config->setGroup("ImageViewer Settings");
-
-    d->dcrawSettings->setSixteenBits(config->readBoolEntry("SixteenBitsImage", false));
-    d->dcrawSettings->setNoiseReduction(config->readBoolEntry("EnableNoiseReduction", false));
-    d->dcrawSettings->setSigmaDomain(config->readDoubleNumEntry("NRSigmaDomain", 2.0));
-    d->dcrawSettings->setSigmaRange(config->readDoubleNumEntry("NRSigmaRange", 4.0));
-    d->dcrawSettings->setSecondarySensor(config->readBoolEntry("SuperCCDsecondarySensor", false));
-    d->dcrawSettings->setUnclipColor(config->readNumEntry("UnclipColors", 0));
-    d->dcrawSettings->setCameraWB(config->readBoolEntry("CameraColorBalance", true));
-    d->dcrawSettings->setAutoColorBalance(config->readBoolEntry("AutomaticColorBalance", true));
-    d->dcrawSettings->setFourColor(config->readBoolEntry("RGBInterpolate4Colors", false));
-    d->dcrawSettings->setQuality((RawDecodingSettings::DecodingQuality)config->readNumEntry("RAWQuality",
-                                  RawDecodingSettings::BILINEAR));
-    d->dcrawSettings->setBrightness(config->readDoubleNumEntry("RAWBrightness", 1.0));
-
     d->JPEGcompression->setValue( config->readNumEntry("JPEGCompression", 75) );
     d->PNGcompression->setValue( config->readNumEntry("PNGCompression", 9) );
     d->TIFFcompression->setChecked(config->readBoolEntry("TIFFCompression", false));
--- trunk/extragear/graphics/digikam/utilities/setup/setupiofiles.h #630772:630773
@@ -1,9 +1,9 @@
 /* ============================================================
- * Author: Gilles Caulier <caulier dot gilles at kdemail dot net>
- * Date  : 2006-01-23
- * Description : setup image editor Input Output files.
+ * Authors: Gilles Caulier <caulier dot gilles at kdemail dot net>
+ * Date   : 2006-01-23
+ * Description : setup image editor output files settings.
  *
- * Copyright 2006 by Gilles Caulier
+ * Copyright 2006-2007 by Gilles Caulier
  *
  * This program is free software; you can redistribute it
  * and/or modify it under the terms of the GNU General
@@ -47,8 +47,7 @@
 
 private:
 
-    SetupIOFilesPriv* d;
-    
+    SetupIOFilesPriv* d;    
 };
 
 }  // namespace Digikam
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel