All pastes #107108 Raw Edit

Something

public text v1 · immutable
#107108 ·published 2006-07-30 21:00 UTC
rendered paste body
Index: kopetetransfermanager.h
===================================================================
--- kopetetransfermanager.h     (Revision 567576)
+++ kopetetransfermanager.h     (Arbeitskopie)
@@ -40,7 +40,7 @@
 public:
        enum KopeteTransferDirection { Incoming, Outgoing };

-       FileTransferInfo( Contact *, const QString&, const unsigned long size, const QString &, KopeteTransferDirection di, const unsigned int id, QString in
ternalId=QString::null);
+       FileTransferInfo( Contact *, const QString&, const unsigned long size, const QString &, KopeteTransferDirection di, const unsigned int id, QString in
ternalId=QString::null, const KUrl &preview=KUrl() );
        ~FileTransferInfo() {}
        unsigned int transferId() const { return mId; }
        const Contact* contact() const { return mContact; }
@@ -49,6 +49,7 @@
        unsigned long size() const { return mSize; }
        QString internalId() const { return m_intId; }
        KopeteTransferDirection direction() const { return mDirection; }
+       KUrl preview() const { return mPreview; }

 private:
        unsigned long mSize;
@@ -58,6 +59,7 @@
        QString mFile;
        QString m_intId;
        KopeteTransferDirection mDirection;
+       KUrl mPreview;
 };

 /**
@@ -78,7 +80,7 @@
         * @brief Adds a file transfer to the Kopete::TransferManager
         */
        Transfer *addTransfer( Contact *contact, const QString& file, const unsigned long size, const QString &recipient , FileTransferInfo::KopeteTransferDi
rection di);
-       int askIncomingTransfer( Contact *contact, const QString& file, const unsigned long size, const QString& description=QString::null, QString internalI
d=QString::null);
+       int askIncomingTransfer( Contact *contact, const QString& file, const unsigned long size, const QString& description=QString::null, QString internalI
d=QString::null, const KUrl &preview=KUrl());
        void removeTransfer( unsigned int id );

        /**
Index: kopetetransfermanager.cpp
===================================================================
--- kopetetransfermanager.cpp   (Revision 567576)
+++ kopetetransfermanager.cpp   (Arbeitskopie)
@@ -35,7 +35,7 @@
  *  Kopete::FileTransferInfo *
  ***************************/

-Kopete::FileTransferInfo::FileTransferInfo(  Kopete::Contact *contact, const QString& file, const unsigned long size, const QString &recipient, KopeteTransf
erDirection di, const unsigned int id, QString internalId)
+Kopete::FileTransferInfo::FileTransferInfo(  Kopete::Contact *contact, const QString& file, const unsigned long size, const QString &recipient, KopeteTransf
erDirection di, const unsigned int id, QString internalId, const KUrl &preview)
 {
        mContact = contact;
        mFile = file;
@@ -44,6 +44,7 @@
        mRecipient = recipient;
        m_intId= internalId;
        mDirection= di;
+       mPreview = preview;
 }

 /***************************
@@ -183,14 +184,14 @@
        emit accepted(trans,filename);
 }

-int Kopete::TransferManager::askIncomingTransfer(  Kopete::Contact *contact, const QString& file, const unsigned long size, const QString& description, QStr
ing internalId)
+int Kopete::TransferManager::askIncomingTransfer(  Kopete::Contact *contact, const QString& file, const unsigned long size, const QString& description, QStr
ing internalId, const KUrl &preview)
 {
 //     if (nextID != 0)
                nextID++;
-
+
        QString dn= contact ? (contact->metaContact() ? contact->metaContact()->displayName() : contact->contactId()) : i18n("<unknown>");

-       Kopete::FileTransferInfo info(contact, file, size, dn, Kopete::FileTransferInfo::Incoming , nextID , internalId);
+       Kopete::FileTransferInfo info(contact, file, size, dn, Kopete::FileTransferInfo::Incoming , nextID , internalId, preview);

        //FIXME!!! this will not be deleted if it's still open when kopete exits
        KopeteFileConfirmDialog *diag= new KopeteFileConfirmDialog(info, description , 0 )  ;
Index: ui/kopetefileconfirmdialog.cpp
===================================================================
--- ui/kopetefileconfirmdialog.cpp      (Revision 567576)
+++ ui/kopetefileconfirmdialog.cpp      (Arbeitskopie)
@@ -53,6 +53,10 @@
        m_size->setText( KGlobal::locale()->formatNumber( long( info.size() ), 0 ) );
        m_description->setText( description );
        m_filename->setText( info.file() );
+       if( info.preview().isLocalFile() )
+               m_preview->setPixmap( QPixmap( info.preview().path() ) );
+       else
+               m_preview->setVisible( false );

        KGlobal::config()->setGroup("File Transfer");
        const QString defaultPath=KGlobal::config()->readEntry("defaultPath" , QDir::homePath() );