[Pkg-kde-commits] rev 999 - in kde-extras/kipi-plugins/trunk/debian: . patches
Achim Bohnet
ach-guest@costa.debian.org
Wed, 13 Apr 2005 23:57:04 +0000
Author: ach-guest
Date: 2005-04-13 23:57:03 +0000 (Wed, 13 Apr 2005)
New Revision: 999
Added:
kde-extras/kipi-plugins/trunk/debian/patches/
kde-extras/kipi-plugins/trunk/debian/patches/01_rawconverter_dcraw7.0+kde3.4-fixes-from-head.diff
Modified:
kde-extras/kipi-plugins/trunk/debian/changelog
kde-extras/kipi-plugins/trunk/debian/control
kde-extras/kipi-plugins/trunk/debian/rules
Log:
Sync rawconverter with CVS. rawconverter did not work with
dcraw >= 5.88 (sarge).
Pity an upload (better) has to wait until the pending sid->sarge
transition :( Maybe next week with urgency high.
Modified: kde-extras/kipi-plugins/trunk/debian/changelog
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/changelog 2005-04-10 01:23:20 UTC (rev 998)
+++ kde-extras/kipi-plugins/trunk/debian/changelog 2005-04-13 23:57:03 UTC (rev 999)
@@ -1,10 +1,14 @@
-kipi-plugins (0.1+beta2-21) UNRELEASED; urgency=low
+kipi-plugins (0.1+beta2-21~svn1) UNRELEASED; urgency=medium
* NOT RELEASED YET
+ * patches/01_rawconverter_dcraw7.0+kde3.4-fixes-from-head.diff
+ o rawconverter plugin broken. dcraw changed interface
+ somewhere in 5.xx series. Now plugin works again with
+ 5.88 in sarge and 7.02 in sid -> urgency medium
* remove mjpegtools (>= 1.6.0) from suggests. It's from
'ftp://ftp.nerim.net/debian-marillat <dist> main'.
- -- Achim Bohnet <ach@mpe.mpg.de> Thu, 24 Mar 2005 23:26:55 +0100
+ -- Achim Bohnet <ach@mpe.mpg.de> Thu, 14 Apr 2005 01:45:40 +0200
kipi-plugins (0.1+beta2-20) unstable; urgency=low
Modified: kde-extras/kipi-plugins/trunk/debian/control
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/control 2005-04-10 01:23:20 UTC (rev 998)
+++ kde-extras/kipi-plugins/trunk/debian/control 2005-04-13 23:57:03 UTC (rev 999)
@@ -9,7 +9,7 @@
Replaces: digikamplugins
Architecture: any
Depends: ${shlibs:Depends}
-Suggests: k3b, imagemagick (>=5.4.8), dcraw
+Suggests: k3b, imagemagick (>=5.4.8), dcraw (>= 5.88)
Description: image manipulation/handling plugins for KIPI aware programs
KIPI plugins (KDE Image Plugin Interface) can be used by any
application that implements the KIPI host interface, like e.g., digikam,
Added: kde-extras/kipi-plugins/trunk/debian/patches/01_rawconverter_dcraw7.0+kde3.4-fixes-from-head.diff
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/patches/01_rawconverter_dcraw7.0+kde3.4-fixes-from-head.diff 2005-04-10 01:23:20 UTC (rev 998)
+++ kde-extras/kipi-plugins/trunk/debian/patches/01_rawconverter_dcraw7.0+kde3.4-fixes-from-head.diff 2005-04-13 23:57:03 UTC (rev 999)
@@ -0,0 +1,556 @@
+# cvs head from 13-Apr-2005. Modifications
+# o removed the .desktop hunk
+
+Index: kipi-plugins/rawconverter/batchdialog.cpp
+===================================================================
+RCS file: /home/kde/kdeextragear-libs-1/kipi-plugins/rawconverter/batchdialog.cpp,v
+retrieving revision 1.24
+retrieving revision 1.25
+diff -u -3 -p -r1.24 -r1.25
+--- kipi-plugins/rawconverter/batchdialog.cpp 13 Jan 2005 12:48:02 -0000 1.24
++++ kipi-plugins/rawconverter/batchdialog.cpp 5 Apr 2005 22:57:47 -0000 1.25
+@@ -155,17 +155,6 @@ BatchDialog::BatchDialog(QWidget *parent
+
+ // ---------------------------------------------------------------
+
+- hboxLayout = new QHBoxLayout(0,0,6,"layout1");
+- gammaSpinBox_ = new CSpinBox(settingsBox);
+- gammaSpinBox_->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+-
+- hboxLayout->addWidget(gammaSpinBox_);
+- hboxLayout->addWidget(new QLabel(i18n("Gamma"), settingsBox));
+- QToolTip::add(gammaSpinBox_,
+- i18n("Specify the gamma value"));
+- settingsBoxLayout->addLayout(hboxLayout);
+-
+- // ---------------------------------------------------------------
+
+ hboxLayout = new QHBoxLayout(0,0,6,"layout2");
+ brightnessSpinBox_ = new CSpinBox(settingsBox);
+@@ -208,22 +197,21 @@ BatchDialog::BatchDialog(QWidget *parent
+ saveButtonGroup_ = new QVButtonGroup(i18n("Save Format"),this);
+ saveButtonGroup_->setRadioButtonExclusive(true);
+
+- QRadioButton *radioButton;
+- radioButton = new QRadioButton("JPEG",saveButtonGroup_);
+- QToolTip::add(radioButton,
++ jpegButton_ = new QRadioButton("JPEG",saveButtonGroup_);
++ QToolTip::add(jpegButton_,
+ i18n("Output the processed images in JPEG Format.\n"
+ "This is a lossy format, but will give\n"
+ "smaller-sized files"));
+- radioButton->setChecked(true);
++ jpegButton_->setChecked(true);
+
+- radioButton = new QRadioButton("TIFF",saveButtonGroup_);
+- QToolTip::add(radioButton,
++ tiffButton_ = new QRadioButton("TIFF",saveButtonGroup_);
++ QToolTip::add(tiffButton_,
+ i18n("Output the processed images in TIFF Format.\n"
+ "This generates large files, without\n"
+ "losing quality"));
+
+- radioButton = new QRadioButton("PPM",saveButtonGroup_);
+- QToolTip::add(radioButton,
++ ppmButton_ = new QRadioButton("PPM",saveButtonGroup_);
++ QToolTip::add(ppmButton_,
+ i18n("Output the processed images in PPM Format.\n"
+ "This generates the largest files, without\n"
+ "losing quality"));
+@@ -236,9 +224,9 @@ BatchDialog::BatchDialog(QWidget *parent
+ conflictButtonGroup_ = new QVButtonGroup(i18n("If Target File Exists"),this);
+ conflictButtonGroup_->setRadioButtonExclusive(true);
+
+- radioButton = new QRadioButton(i18n("Overwrite"),conflictButtonGroup_);
+- radioButton->setChecked(true);
+- radioButton = new QRadioButton(i18n("Open file dialog"),conflictButtonGroup_);
++ overwriteButton_ = new QRadioButton(i18n("Overwrite"),conflictButtonGroup_);
++ overwriteButton_->setChecked(true);
++ promptButton_ = new QRadioButton(i18n("Open file dialog"),conflictButtonGroup_);
+
+ // ---------------------------------------------------------------
+
+@@ -286,7 +274,8 @@ BatchDialog::BatchDialog(QWidget *parent
+
+ KHelpMenu* helpMenu = new KHelpMenu(this, about, false);
+ helpMenu->menu()->removeItemAt(0);
+- helpMenu->menu()->insertItem(i18n("RAW Images Batch Converter Handbook"), this, SLOT(slotHelp()), 0, -1, 0);
++ helpMenu->menu()->insertItem(i18n("RAW Images Batch Converter Handbook"),
++ this, SLOT(slotHelp()), 0, -1, 0);
+ helpButton_->setPopup( helpMenu->menu() );
+
+ // ---------------------------------------------------------------
+@@ -356,8 +345,12 @@ void BatchDialog::addItems(const QString
+ {
+ QString ext;
+
+- QButton *btn = saveButtonGroup_->selected();
+- if (btn) ext = btn->text().lower();
++ if (saveButtonGroup_->selected() == jpegButton_)
++ ext = "JPEG";
++ else if (saveButtonGroup_->selected() == tiffButton_)
++ ext = "TIFF";
++ else
++ ext = "PPM";
+
+ KURL::List urlList;
+
+@@ -393,7 +386,6 @@ void BatchDialog::readSettings()
+
+ config->setGroup("RawConverter Settings");
+
+- gammaSpinBox_->setValue(config->readNumEntry("Gamma", 8));
+ brightnessSpinBox_->setValue(config->readNumEntry("Brightness",10));
+
+ redSpinBox_->setValue(config->readNumEntry("Red Scale",10));
+@@ -412,7 +404,6 @@ void BatchDialog::saveSettings()
+
+ config->setGroup("RawConverter Settings");
+
+- config->writeEntry("Gamma", gammaSpinBox_->value());
+ config->writeEntry("Brightness", brightnessSpinBox_->value());
+
+ config->writeEntry("Red Scale", redSpinBox_->value());
+@@ -431,9 +422,15 @@ void BatchDialog::saveSettings()
+
+ void BatchDialog::slotSaveFormatChanged()
+ {
+- QString ext = saveButtonGroup_->selected()->text().lower();
+- if (ext.isEmpty()) return;
++ QString ext;
+
++ if (saveButtonGroup_->selected() == jpegButton_)
++ ext = "JPEG";
++ else if (saveButtonGroup_->selected() == tiffButton_)
++ ext = "TIFF";
++ else
++ ext = "PPM";
++
+ QListViewItemIterator it( listView_ );
+ while ( it.current() ) {
+ CListViewItem *item = (CListViewItem*) it.current();
+@@ -470,11 +467,15 @@ void BatchDialog::slotProcess()
+ Settings& s = controller_->settings;
+ s.cameraWB = cameraWBCheckBox_->isChecked();
+ s.fourColorRGB = fourColorCheckBox_->isChecked();
+- s.gamma = gammaSpinBox_->value()/10.0;
+ s.brightness = brightnessSpinBox_->value()/10.0;
+ s.redMultiplier = redSpinBox_->value()/10.0;
+ s.blueMultiplier = blueSpinBox_->value()/10.0;
+- s.outputFormat = saveButtonGroup_->selected()->text();
++ if (saveButtonGroup_->selected() == jpegButton_)
++ s.outputFormat = "JPEG";
++ else if (saveButtonGroup_->selected() == tiffButton_)
++ s.outputFormat = "TIFF";
++ else
++ s.outputFormat = "PPM";
+
+ processOne();
+ }
+@@ -509,7 +510,6 @@ void BatchDialog::slotBusy(bool busy)
+ conflictButtonGroup_->setEnabled(!busy);
+ cameraWBCheckBox_->setEnabled(!busy);
+ fourColorCheckBox_->setEnabled(!busy);
+- gammaSpinBox_->setEnabled(!busy);
+ brightnessSpinBox_->setEnabled(!busy);
+ redSpinBox_->setEnabled(!busy);
+ blueSpinBox_->setEnabled(!busy);
+@@ -577,15 +577,13 @@ void BatchDialog::slotProcessed(const QS
+ QString destFile(rawItem->directory + QString("/") +
+ rawItem->dest);
+
+- if (conflictButtonGroup_->selected()->text() != i18n("Overwrite"))
++ if (conflictButtonGroup_->selected() != overwriteButton_)
+ {
+ struct stat statBuf;
+ if (::stat(QFile::encodeName(destFile), &statBuf) == 0) {
+- QString filter("*.");
+- filter += saveButtonGroup_->selected()->text().lower();
+ destFile = KFileDialog::
+- getSaveFileName(rawItem->directory,
+- filter, this,
++ getSaveFileName(rawItem->directory, QString(),
++ this,
+ i18n("Save Raw Image converted "
+ "from '%1' as").arg(rawItem->src));
+ }
+Index: kipi-plugins/rawconverter/batchdialog.h
+===================================================================
+RCS file: /home/kde/kdeextragear-libs-1/kipi-plugins/rawconverter/batchdialog.h,v
+retrieving revision 1.7
+retrieving revision 1.8
+diff -u -3 -p -r1.7 -r1.8
+--- kipi-plugins/rawconverter/batchdialog.h 16 Dec 2004 23:46:30 -0000 1.7
++++ kipi-plugins/rawconverter/batchdialog.h 5 Apr 2005 22:57:47 -0000 1.8
+@@ -31,6 +31,7 @@
+ class QListViewItem;
+ class QCheckBox;
+ class QPushButton;
++class QRadioButton;
+ class QVButtonGroup;
+ class QLabel;
+ class QPixmap;
+@@ -80,7 +81,6 @@ private:
+ KListView* listView_;
+ QCheckBox* cameraWBCheckBox_;
+ QCheckBox* fourColorCheckBox_;
+- CSpinBox* gammaSpinBox_;
+ CSpinBox* brightnessSpinBox_;
+ CSpinBox* redSpinBox_;
+ CSpinBox* blueSpinBox_;
+@@ -95,6 +95,13 @@ private:
+ QPushButton* closeButton_;
+ QPushButton* abortButton_;
+
++ QRadioButton* jpegButton_;
++ QRadioButton* tiffButton_;
++ QRadioButton* ppmButton_;
++
++ QRadioButton* overwriteButton_;
++ QRadioButton* promptButton_;
++
+ QDict<RawItem> itemDict_;
+ ProcessController *controller_;
+ bool busy_;
+Index: kipi-plugins/rawconverter/dcrawprocess.cpp
+===================================================================
+RCS file: /home/kde/kdeextragear-libs-1/kipi-plugins/rawconverter/dcrawprocess.cpp,v
+retrieving revision 1.2
+retrieving revision 1.3
+diff -u -3 -p -r1.2 -r1.3
+--- kipi-plugins/rawconverter/dcrawprocess.cpp 8 Nov 2004 20:27:09 -0000 1.2
++++ kipi-plugins/rawconverter/dcrawprocess.cpp 5 Apr 2005 22:57:47 -0000 1.3
+@@ -47,7 +47,6 @@ struct
+ bool quick;
+ std::string red;
+ std::string blue;
+- std::string gamma;
+ std::string brightness;
+ bool jpeg;
+ bool tiff;
+@@ -121,10 +120,8 @@ void forkDcraw()
+ argl[index++] = "-d";
+
+ if (dcParams.quick)
+- argl[index++] = "-q";
++ argl[index++] = "-h";
+
+- argl[index++] = "-g";
+- argl[index++] = dcParams.gamma.c_str();
+ argl[index++] = "-b";
+ argl[index++] = dcParams.brightness.c_str();
+ argl[index++] = "-r";
+@@ -136,8 +133,7 @@ void forkDcraw()
+ argl[index++] = dcParams.inFile.c_str();
+ argl[index] = 0;
+
+-
+- if (execvp("dcraw", (char* const*) argl) == -1) {
++ if (execvp("dcraw", (char* const*) argl) == -1) {
+ std::cerr << "Failed to start dcraw process" << std::endl;
+ exit(EXIT_FAILURE);
+ }
+@@ -165,7 +161,6 @@ int main(int argc, char *argv[])
+ dcParams.cameraWB = false;
+ dcParams.documentMode = false;
+ dcParams.quick = false;
+- dcParams.gamma = "0.8";
+ dcParams.brightness = "1.0";
+ dcParams.red = "1.0";
+ dcParams.blue = "1.0";
+@@ -176,7 +171,7 @@ int main(int argc, char *argv[])
+
+ int c;
+
+- while ((c = getopt(argc, argv, "ifwdqg:b:r:l:o:F:Q:D:")) != -1) {
++ while ((c = getopt(argc, argv, "ifwdhg:b:r:l:o:F:Q:D:")) != -1) {
+ switch (c) {
+
+ case 'i': {
+@@ -199,15 +194,11 @@ int main(int argc, char *argv[])
+ break;
+ }
+
+- case 'q': {
++ case 'h': {
+ dcParams.quick = true;
+ break;
+ }
+
+- case 'g': {
+- dcParams.gamma = optarg;
+- break;
+- }
+
+ case 'b': {
+ dcParams.brightness = optarg;
+@@ -236,7 +227,10 @@ int main(int argc, char *argv[])
+ else if (format == "TIFF")
+ dcParams.tiff = true;
+ else if (format != "PPM")
++ {
++ std::cerr << "Exiting: wrong format: " << format << std::endl;
+ printUsage();
++ }
+ break;
+ }
+
+@@ -251,6 +245,7 @@ int main(int argc, char *argv[])
+ }
+
+ default: {
++ std::cerr << "Exiting: Unknown option: " << c << std::endl;
+ printUsage();
+ break;
+ }
+Index: kipi-plugins/rawconverter/processcontroller.cpp
+===================================================================
+RCS file: /home/kde/kdeextragear-libs-1/kipi-plugins/rawconverter/processcontroller.cpp,v
+retrieving revision 1.7
+retrieving revision 1.8
+diff -u -3 -p -r1.7 -r1.8
+--- kipi-plugins/rawconverter/processcontroller.cpp 21 Dec 2004 18:25:03 -0000 1.7
++++ kipi-plugins/rawconverter/processcontroller.cpp 5 Apr 2005 22:57:47 -0000 1.8
+@@ -22,6 +22,7 @@
+ #include <qprocess.h>
+ #include <qtimer.h>
+ #include <qfile.h>
++#include <kdebug.h>
+
+ extern "C"
+ {
+@@ -40,6 +41,8 @@ ProcessController::ProcessController(QOb
+ dcProcess_ = new QProcess(this);
+ connect(dcProcess_, SIGNAL(processExited()),
+ SLOT(slotProcessFinished()));
++ connect(dcProcess_, SIGNAL(readyReadStderr()),
++ SLOT(slotProcessStdErr()));
+
+ currTime_ = QString::number(::time(0));
+
+@@ -85,8 +88,6 @@ void ProcessController::process(const QS
+ dcProcess_->addArgument("-w");
+ if (settings.fourColorRGB)
+ dcProcess_->addArgument("-f");
+- dcProcess_->addArgument("-g");
+- dcProcess_->addArgument(QString::number(settings.gamma));
+ dcProcess_->addArgument("-b");
+ dcProcess_->addArgument(QString::number(settings.brightness));
+ dcProcess_->addArgument("-r");
+@@ -119,7 +120,7 @@ void ProcessController::preview(const QS
+ dcProcess_->clearArguments();
+
+ dcProcess_->addArgument("kipidcrawclient");
+- dcProcess_->addArgument("-q");
++ dcProcess_->addArgument("-h");
+ dcProcess_->addArgument("-o");
+ dcProcess_->addArgument(tmpFile_);
+
+@@ -127,14 +128,14 @@ void ProcessController::preview(const QS
+ dcProcess_->addArgument("-w");
+ if (settings.fourColorRGB)
+ dcProcess_->addArgument("-f");
+- dcProcess_->addArgument("-g");
+- dcProcess_->addArgument(QString::number(settings.gamma));
+ dcProcess_->addArgument("-b");
+ dcProcess_->addArgument(QString::number(settings.brightness));
+ dcProcess_->addArgument("-r");
+ dcProcess_->addArgument(QString::number(settings.redMultiplier));
+ dcProcess_->addArgument("-l");
+ dcProcess_->addArgument(QString::number(settings.blueMultiplier));
++ dcProcess_->addArgument("-F");
++ dcProcess_->addArgument(settings.outputFormat);
+ dcProcess_->addArgument(fileCurrent_);
+ dcProcess_->start();
+
+@@ -216,6 +217,15 @@ void ProcessController::slotProcessFinis
+ }
+ }
+
++void ProcessController::slotProcessStdErr()
++{
++ QByteArray ba = dcProcess_->readStderr();
++ if (!ba.isEmpty())
++ {
++ kdWarning() << "ProcessController: stderr: " << ba << endl;
++ }
++}
++
+ } // NameSpace KIPIRawConverterPlugin
+
+ #include "processcontroller.moc"
+Index: kipi-plugins/rawconverter/processcontroller.h
+===================================================================
+RCS file: /home/kde/kdeextragear-libs-1/kipi-plugins/rawconverter/processcontroller.h,v
+retrieving revision 1.3
+retrieving revision 1.4
+diff -u -3 -p -r1.3 -r1.4
+--- kipi-plugins/rawconverter/processcontroller.h 8 Nov 2004 20:27:09 -0000 1.3
++++ kipi-plugins/rawconverter/processcontroller.h 5 Apr 2005 22:57:47 -0000 1.4
+@@ -34,7 +34,6 @@ struct Settings
+ {
+ bool cameraWB;
+ bool fourColorRGB;
+- float gamma;
+ float brightness;
+ float redMultiplier;
+ float blueMultiplier;
+@@ -94,6 +93,7 @@ private:
+ private slots:
+
+ void slotProcessFinished();
++ void slotProcessStdErr();
+ };
+
+ } // NameSpace KIPIRawConverterPlugin
+Index: kipi-plugins/rawconverter/singledialog.cpp
+===================================================================
+RCS file: /home/kde/kdeextragear-libs-1/kipi-plugins/rawconverter/singledialog.cpp,v
+retrieving revision 1.18
+retrieving revision 1.19
+diff -u -3 -p -r1.18 -r1.19
+--- kipi-plugins/rawconverter/singledialog.cpp 13 Jan 2005 12:48:02 -0000 1.18
++++ kipi-plugins/rawconverter/singledialog.cpp 5 Apr 2005 22:57:47 -0000 1.19
+@@ -151,17 +151,6 @@ SingleDialog::SingleDialog(const QString
+
+ QHBoxLayout *hboxLayout;
+
+- // ---------------------------------------------------------------
+-
+- hboxLayout = new QHBoxLayout(0,0,6,"layout1");
+- gammaSpinBox_ = new CSpinBox(settingsBox);
+- gammaSpinBox_->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+-
+- hboxLayout->addWidget(gammaSpinBox_);
+- hboxLayout->addWidget(new QLabel(i18n("Gamma"), settingsBox));
+- QToolTip::add(gammaSpinBox_,
+- i18n("Specify the gamma value"));
+- settingsBoxLayout->addLayout(hboxLayout);
+
+ // ---------------------------------------------------------------
+
+@@ -206,22 +195,21 @@ SingleDialog::SingleDialog(const QString
+ saveButtonGroup_ = new QVButtonGroup(i18n("Save Format"),this);
+ saveButtonGroup_->setRadioButtonExclusive(true);
+
+- QRadioButton *radioButton;
+- radioButton = new QRadioButton("JPEG",saveButtonGroup_);
+- QToolTip::add(radioButton,
++ jpegButton_ = new QRadioButton("JPEG",saveButtonGroup_);
++ QToolTip::add(jpegButton_,
+ i18n("Output the processed image in JPEG Format.\n"
+ "This is a lossy format, but will give\n"
+ "smaller-sized files"));
+- radioButton->setChecked(true);
++ jpegButton_->setChecked(true);
+
+- radioButton = new QRadioButton("TIFF",saveButtonGroup_);
+- QToolTip::add(radioButton,
++ tiffButton_ = new QRadioButton("TIFF",saveButtonGroup_);
++ QToolTip::add(tiffButton_,
+ i18n("Output the processed image in TIFF Format.\n"
+ "This generates larges, without\n"
+ "losing quality"));
+
+- radioButton = new QRadioButton("PPM",saveButtonGroup_);
+- QToolTip::add(radioButton,
++ ppmButton_ = new QRadioButton("PPM",saveButtonGroup_);
++ QToolTip::add(ppmButton_,
+ i18n("Output the processed image in PPM Format.\n"
+ "This generates the largest files, without\n"
+ "losing quality"));
+@@ -372,7 +360,6 @@ void SingleDialog::readSettings()
+
+ config->setGroup("RawConverter Settings");
+
+- gammaSpinBox_->setValue(config->readNumEntry("Gamma", 8));
+ brightnessSpinBox_->setValue(config->readNumEntry("Brightness",10));
+
+ redSpinBox_->setValue(config->readNumEntry("Red Scale",10));
+@@ -390,7 +377,6 @@ void SingleDialog::saveSettings()
+
+ config->setGroup("RawConverter Settings");
+
+- config->writeEntry("Gamma", gammaSpinBox_->value());
+ config->writeEntry("Brightness", brightnessSpinBox_->value());
+
+ config->writeEntry("Red Scale", redSpinBox_->value());
+@@ -416,11 +402,10 @@ void SingleDialog::slotPreview()
+ Settings& s = controller_->settings;
+ s.cameraWB = cameraWBCheckBox_->isChecked();
+ s.fourColorRGB = fourColorCheckBox_->isChecked();
+- s.gamma = gammaSpinBox_->value()/10.0;
+ s.brightness = brightnessSpinBox_->value()/10.0;
+ s.redMultiplier = redSpinBox_->value()/10.0;
+ s.blueMultiplier = blueSpinBox_->value()/10.0;
+- s.outputFormat = saveButtonGroup_->selected()->text();
++ s.outputFormat = "PPM";
+
+ controller_->preview(inputFile_);
+ }
+@@ -430,11 +415,15 @@ void SingleDialog::slotProcess()
+ Settings& s = controller_->settings;
+ s.cameraWB = cameraWBCheckBox_->isChecked();
+ s.fourColorRGB = fourColorCheckBox_->isChecked();
+- s.gamma = gammaSpinBox_->value()/10.0;
+ s.brightness = brightnessSpinBox_->value()/10.0;
+ s.redMultiplier = redSpinBox_->value()/10.0;
+ s.blueMultiplier = blueSpinBox_->value()/10.0;
+- s.outputFormat = saveButtonGroup_->selected()->text();
++ if (saveButtonGroup_->selected() == jpegButton_)
++ s.outputFormat = "JPEG";
++ else if (saveButtonGroup_->selected() == tiffButton_)
++ s.outputFormat = "TIFF";
++ else
++ s.outputFormat = "PPM";
+
+ controller_->process(inputFile_);
+ }
+@@ -497,11 +486,9 @@ void SingleDialog::slotProcessing(const
+ void SingleDialog::slotProcessed(const QString&, const QString& tmpFile_)
+ {
+ previewWidget_->load(tmpFile_);
+- QString filter("*.");
+- filter += saveButtonGroup_->selected()->text().lower();
+ QString saveFile =
+ KFileDialog::getSaveFileName(QFileInfo(inputFile_).dirPath(true),
+- filter, this);
++ QString(), this);
+
+ if (saveFile.isEmpty()) return;
+
+Index: kipi-plugins/rawconverter/singledialog.h
+===================================================================
+RCS file: /home/kde/kdeextragear-libs-1/kipi-plugins/rawconverter/singledialog.h,v
+retrieving revision 1.5
+retrieving revision 1.6
+diff -u -3 -p -r1.5 -r1.6
+--- kipi-plugins/rawconverter/singledialog.h 16 Dec 2004 23:46:30 -0000 1.5
++++ kipi-plugins/rawconverter/singledialog.h 5 Apr 2005 22:57:47 -0000 1.6
+@@ -29,6 +29,7 @@ class QFrame;
+ class QCheckBox;
+ class QPushButton;
+ class QVButtonGroup;
++class QRadioButton;
+ class QCloseEvent;
+
+ namespace KIPIRawConverterPlugin
+@@ -61,7 +62,6 @@ private:
+ QCheckBox* cameraWBCheckBox_;
+ QCheckBox* fourColorCheckBox_;
+
+- CSpinBox* gammaSpinBox_;
+ CSpinBox* brightnessSpinBox_;
+ CSpinBox* redSpinBox_;
+ CSpinBox* blueSpinBox_;
+@@ -71,6 +71,10 @@ private:
+ QPushButton* processButton_;
+ QPushButton* closeButton_;
+ QPushButton* abortButton_;
++
++ QRadioButton* jpegButton_;
++ QRadioButton* tiffButton_;
++ QRadioButton* ppmButton_;
+
+ QVButtonGroup* saveButtonGroup_;
+
Modified: kde-extras/kipi-plugins/trunk/debian/rules
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/rules 2005-04-10 01:23:20 UTC (rev 998)
+++ kde-extras/kipi-plugins/trunk/debian/rules 2005-04-13 23:57:03 UTC (rev 999)
@@ -2,7 +2,7 @@
cdbs_kde_enable_debug = --disable-debug
include /usr/share/cdbs/1/rules/debhelper.mk
-#include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/class/kde.mk
install/kipi-plugins::