[Kde-imaging] kdeextragear-libs-1/kipi-plugins/sendimages

[Gilles Caulier]

CVS commit by cgilles: 

Fixed target images files name (resized before to E-mail) without double file extension (it's not really a bug).
Using '_' instead "." for the first file extension (like foo_png.jpg for example).
CCMAIL: kde-imaging at kde.org


  M +1 -1      listimageserrordialog.cpp   1.4
  M +1 -1      listimageserrordialog.h   1.3
  M +8 -3      sendimagesdialog.cpp   1.12
  M +7 -4      sendimagesdialog.h   1.5


--- kdeextragear-libs-1/kipi-plugins/sendimages/listimageserrordialog.cpp  #1.3:1.4
@@ -3,5 +3,5 @@
 //    LISTIMAGESERRORDIALOG.CPP
 //
-//    Copyright (C) 2003 Gilles CAULIER <caulier dot gilles at free.fr>
+//    Copyright (C) 2003 Gilles Caulier <caulier dot gilles at free.fr>
 //
 //    This program is free software; you can redistribute it and/or modify

--- kdeextragear-libs-1/kipi-plugins/sendimages/listimageserrordialog.h  #1.2:1.3
@@ -3,5 +3,5 @@
 //    LISTIMAGESERRORDIALOG.H
 //
-//    Copyright (C) 2003 Gilles CAULIER <caulier dot gilles at free.fr>
+//    Copyright (C) 2003 Gilles Caulier <caulier dot gilles at free.fr>
 //
 //    This program is free software; you can redistribute it and/or modify

--- kdeextragear-libs-1/kipi-plugins/sendimages/sendimagesdialog.cpp  #1.11:1.12
@@ -3,5 +3,5 @@
 //    SENDIMAGESDIALOG.CPP
 //
-//    Copyright (C) 2003 Gilles CAULIER <caulier dot gilles at free.fr>
+//    Copyright (C) 2003 Gilles Caulier <caulier dot gilles at free.fr>
 //
 //    This program is free software; you can redistribute it and/or modify
@@ -677,5 +677,8 @@ void SendImagesDialog::slotOk()
            QString imageFormat = m_imagesFormat->currentText();
            QString imageFileName = ItemName;
-           QString imageNameFormat = pitem->album() + "-" + imageFileName + extension(imageFormat);
+          
+           QString imageNameFormat = pitem->album() + "-" + 
+                                     imageFileName.replace(QChar('.'), "_") + 
+                                     extension(imageFormat);
            int sizeFactor = getSize( m_imagesResize->currentItem() );
            int imageCompression = m_imageCompression->value();
@@ -983,5 +986,7 @@ void SendImagesDialog::slotMozillaExited
              *m_mailAgentProc2 << "netscape" << "-mail";
 
-       if (m_mailAgentProc2->start() == false)     // Start an instance of mozilla mail agent before a remote call.
+       // Start an instance of mozilla mail agent before a remote call.
+       
+       if (m_mailAgentProc2->start() == false)   
           {
           KMessageBox::error(0, i18n("Cannot start '%1' program.\nPlease, "

--- kdeextragear-libs-1/kipi-plugins/sendimages/sendimagesdialog.h  #1.4:1.5
@@ -3,5 +3,5 @@
 //    SENDIMAGESDIALOG.H
 //
-//    Copyright (C) 2003 Gilles CAULIER <caulier dot gilles at free.fr>
+//    Copyright (C) 2003 Gilles Caulier <caulier dot gilles at free.fr>
 //
 //    This program is free software; you can redistribute it and/or modify
@@ -82,5 +82,7 @@ Q_OBJECT
 
 public:
-   SendImagesDialog(QWidget *parent, QString TmpPath, KIPI::Interface* interface, const KIPI::ImageCollection& images );
+   SendImagesDialog(QWidget *parent, QString TmpPath,
+                    KIPI::Interface* interface, 
+                    const KIPI::ImageCollection& images );
    ~SendImagesDialog();
 
@@ -153,6 +155,7 @@ protected:
    bool deldir(QString dirname);
    int  getSize ( int choice );
-   bool ResizeImage( const QString &SourcePath, const QString &DestPath, const QString &ImageFormat,
-                     const QString &ImageName, int SizeFactor, int ImageCompression);
+   bool ResizeImage( const QString &SourcePath, const QString &DestPath,
+                     const QString &ImageFormat, const QString &ImageName,
+                     int SizeFactor, int ImageCompression);
 
  private: