[Kde-imaging] extragear/libs/kipi-plugins/rawconverter

[Gilles Caulier]

SVN commit 584185 by cgilles:

kipi-plugins from trunk : Raw Converter : print dcraw version detected at startup to the header of RAW decoding settings area.

CCMAIL: kde-imaging at kde.org

CCBUGS: 107905, 128394

 M  +2 -2      batchdialog.cpp  
 M  +1 -1      batchdialog.h  
 M  +4 -2      dcrawsettingswidget.cpp  
 M  +1 -1      dcrawsettingswidget.h  
 M  +10 -6     plugin_rawconverter.cpp  
 M  +1 -1      plugin_rawconverter.h  
 M  +2 -2      singledialog.cpp  
 M  +1 -1      singledialog.h  


--- trunk/extragear/libs/kipi-plugins/rawconverter/batchdialog.cpp #584184:584185
@@ -74,7 +74,7 @@
 namespace KIPIRawConverterPlugin
 {
 
-BatchDialog::BatchDialog(QWidget* /*parent*/)
+BatchDialog::BatchDialog(QWidget* /*parent*/, const QString& dcrawVersion)
            : KDialogBase(0, 0, false, i18n("Raw Images Batch Converter"),
                          Help|User1|User2|Close, Close, true,
                          i18n("Con&vert"), i18n("&Abort"))
@@ -125,7 +125,7 @@
 
     // ---------------------------------------------------------------
 
-    m_decodingSettingsBox = new DcrawSettingsWidget(m_page);
+    m_decodingSettingsBox = new DcrawSettingsWidget(m_page, dcrawVersion);
     m_saveSettingsBox     = new SaveSettingsWidget(m_page);
 
     mainLayout->addMultiCellWidget(m_decodingSettingsBox, 1, 1, 1, 1);
--- trunk/extragear/libs/kipi-plugins/rawconverter/batchdialog.h #584184:584185
@@ -55,7 +55,7 @@
 
 public:
 
-    BatchDialog(QWidget *parent);
+    BatchDialog(QWidget *parent, const QString& dcrawVersion);
     ~BatchDialog();
 
     void addItems(const QStringList& itemList);
--- trunk/extragear/libs/kipi-plugins/rawconverter/dcrawsettingswidget.cpp #584184:584185
@@ -93,8 +93,10 @@
     KDoubleNumInput *NRSigmaRange;
 };
 
-DcrawSettingsWidget::DcrawSettingsWidget(QWidget *parent)
-                   : QGroupBox(0, Qt::Vertical, i18n("RAW Decoding Settings"), parent)
+DcrawSettingsWidget::DcrawSettingsWidget(QWidget *parent, const QString& dcrawVersion)
+                   : QGroupBox(0, Qt::Vertical, 
+                               i18n("RAW Decoding Settings (dcraw %1)").arg(dcrawVersion), 
+                               parent)
 {
     d = new DcrawSettingsWidgetPriv;
     QGridLayout* settingsBoxLayout = new QGridLayout(layout(), 10, 1, KDialog::spacingHint());
--- trunk/extragear/libs/kipi-plugins/rawconverter/dcrawsettingswidget.h #584184:584185
@@ -40,7 +40,7 @@
     
 public:
 
-    DcrawSettingsWidget(QWidget *parent);
+    DcrawSettingsWidget(QWidget *parent, const QString& dcrawVersion);
     ~DcrawSettingsWidget();
 
     bool   useCameraWB();
--- trunk/extragear/libs/kipi-plugins/rawconverter/plugin_rawconverter.cpp #584184:584185
@@ -122,9 +122,10 @@
     return false;
 }
 
-bool Plugin_RawConverter::checkBinaries()
+bool Plugin_RawConverter::checkBinaries(QString &dcrawVersion)
 {
     KIPIRawConverterPlugin::DcrawBinary dcrawBinary;
+    dcrawVersion = dcrawBinary.version();
 
     if (!dcrawBinary.isAvailable()) 
     {
@@ -154,7 +155,7 @@
                           "or <a href=\"%2\">download the source</a>.</p>"
                           "<p>Note: at least, dcraw version %3 is required by this "
                           "plugin</p></qt>")
-                          .arg(dcrawBinary.version())
+                          .arg(dcrawVersion)
                           .arg("http://www.cybercom.net/~dcoffin/dcraw")
                           .arg(dcrawBinary.minimalVersion()),
                      QString::null,
@@ -182,7 +183,8 @@
     if ( !images.isValid() )
         return;
 
-    if (!checkBinaries()) 
+    QString dcrawVersion;
+    if (!checkBinaries(dcrawVersion)) 
         return;
 
     if (!isRAWFile(images.images()[0].path()))
@@ -193,7 +195,8 @@
     }
 
     KIPIRawConverterPlugin::SingleDialog *converter = 
-        new KIPIRawConverterPlugin::SingleDialog(images.images()[0].path(), kapp->activeWindow()); 
+        new KIPIRawConverterPlugin::SingleDialog(images.images()[0].path(), 
+            kapp->activeWindow(), dcrawVersion); 
 
     converter->show();
 }
@@ -214,11 +217,12 @@
     if ( !images.isValid() )
         return;
 
-    if (!checkBinaries()) 
+    QString dcrawVersion;
+    if (!checkBinaries(dcrawVersion)) 
         return;
 
     KIPIRawConverterPlugin::BatchDialog *converter =
-        new KIPIRawConverterPlugin::BatchDialog(kapp->activeWindow());
+        new KIPIRawConverterPlugin::BatchDialog(kapp->activeWindow(), dcrawVersion);
 
     KURL::List urls = images.images();
     QStringList files;
--- trunk/extragear/libs/kipi-plugins/rawconverter/plugin_rawconverter.h #584184:584185
@@ -46,7 +46,7 @@
     
 private:
 
-    bool checkBinaries();
+    bool checkBinaries(QString &dcrawVersion);
     bool isRAWFile(const QString& filePath);
 
 private slots:
--- trunk/extragear/libs/kipi-plugins/rawconverter/singledialog.cpp #584184:584185
@@ -65,7 +65,7 @@
 namespace KIPIRawConverterPlugin
 {
 
-SingleDialog::SingleDialog(const QString& file, QWidget *parent)
+SingleDialog::SingleDialog(const QString& file, QWidget *parent, const QString& dcrawVersion)
             : KDialogBase(parent, 0, false, i18n("Raw Image Converter"),
                           Help|User1|User2|User3|Close, Close, true,
                           i18n("&Preview"), i18n("Con&vert"), i18n("&Abort"))
@@ -115,7 +115,7 @@
 
     // ---------------------------------------------------------------
 
-    m_decodingSettingsBox = new DcrawSettingsWidget(page);
+    m_decodingSettingsBox = new DcrawSettingsWidget(page, dcrawVersion);
     m_saveSettingsBox     = new SaveSettingsWidget(page);
 
     mainLayout->addMultiCellWidget(m_decodingSettingsBox, 1, 1, 1, 1);
--- trunk/extragear/libs/kipi-plugins/rawconverter/singledialog.h #584184:584185
@@ -49,7 +49,7 @@
 
 public:
 
-    SingleDialog(const QString& file, QWidget *parent);
+    SingleDialog(const QString& file, QWidget *parent, const QString& dcrawVersion);
     ~SingleDialog();
 
 protected: