[KBear-cvs] kbear/kbear/lib/interfaces kbearfilesyspartiface.cpp,1.39,1.40 kbearfilesyspartiface.h,1
Brought to you by:
kbjorn
|
From: <fri...@us...> - 2003-11-29 13:52:53
|
Update of /cvsroot/kbear/kbear/kbear/lib/interfaces
In directory sc8-pr-cvs1:/tmp/cvs-serv21014/kbear/lib/interfaces
Modified Files:
kbearfilesyspartiface.cpp kbearfilesyspartiface.h
transfergroup.cpp transfergroup.h
Log Message:
Added reloading function after uploads.
Index: kbearfilesyspartiface.cpp
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/lib/interfaces/kbearfilesyspartiface.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** kbearfilesyspartiface.cpp 27 Nov 2003 16:10:24 -0000 1.39
--- kbearfilesyspartiface.cpp 29 Nov 2003 13:52:50 -0000 1.40
***************
*** 71,74 ****
--- 71,75 ----
#include "kbeardirview.h"
#include "transfermanager.h"
+ #include "transfergroup.h"
#include "kbeardirlisteriface.h"
#include "kbearmainwiniface.h"
***************
*** 113,116 ****
--- 114,118 ----
KFileItem* m_lastFoundItem;
bool m_searchBackwards;
+ int transferFinishCounter, numTransfers;
};
//-----------------------------------------------
***************
*** 782,786 ****
kdDebug()<<"KBearFileSysPartInterface::slotPaste()"<<endl;
! m_api->transferManager()->addTransfers( drag );
if( /*! metaData.contains("Action") || */metaData["Action"] == "move" )
--- 784,792 ----
kdDebug()<<"KBearFileSysPartInterface::slotPaste()"<<endl;
!
! TransferGroup *grp = m_api->transferManager()->addTransfers( drag );
! d->transferFinishCounter = 0;
! d->numTransfers = grp->transfers()->count();
! connect( grp, SIGNAL( transferFinished() ), this, SLOT( slotTransferFinished() ) );
if( /*! metaData.contains("Action") || */metaData["Action"] == "move" )
***************
*** 792,795 ****
--- 798,806 ----
}
//-----------------------------------------------
+ void KBearFileSysPartInterface::slotTransferFinished() {
+ if( ++(d->transferFinishCounter) == d->numTransfers )
+ reload();
+ }
+ //-----------------------------------------------
void KBearFileSysPartInterface::slotDropped( QMimeSource* drop, const QPoint& pos ) {
if( ! QUriDrag::canDecode( drop ) )
***************
*** 829,833 ****
KURLDrag* drag = KURLDrag::newDrag( urls, sourceMeta, widget() );
! m_api->transferManager()->addTransfers( drag );
}
//-----------------------------------------------
--- 840,847 ----
KURLDrag* drag = KURLDrag::newDrag( urls, sourceMeta, widget() );
! TransferGroup *grp = m_api->transferManager()->addTransfers( drag );
! d->transferFinishCounter = 0;
! d->numTransfers = grp->transfers()->count();
! connect( grp, SIGNAL( transferFinished() ), this, SLOT( slotTransferFinished() ) );
}
//-----------------------------------------------
***************
*** 1241,1245 ****
//-----------------------------------------------
KIO::Job* KBearFileSysPartInterface::copyFile( int sID, int dID, const KURL& source, const KURL& dest ) {
-
KIO::Job* job = KBearFileCopyJob::file_copy( dID, sID, source, dest, 0600, true, false, false );
--- 1255,1258 ----
Index: kbearfilesyspartiface.h
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/lib/interfaces/kbearfilesyspartiface.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** kbearfilesyspartiface.h 16 Jul 2003 00:03:07 -0000 1.29
--- kbearfilesyspartiface.h 29 Nov 2003 13:52:50 -0000 1.30
***************
*** 37,40 ****
--- 37,41 ----
#include "siteinfo.h"
+
class QPopupMenu;
class QTimer;
***************
*** 226,229 ****
--- 227,231 ----
void slotOpenEditor();
void slotDropped( QMimeSource*, const QPoint& );
+ void slotTransferFinished();
private:
void clearHistory();
Index: transfergroup.cpp
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/lib/interfaces/transfergroup.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** transfergroup.cpp 9 Jul 2003 19:24:13 -0000 1.3
--- transfergroup.cpp 29 Nov 2003 13:52:50 -0000 1.4
***************
*** 55,58 ****
--- 55,59 ----
return;
m_transfers.append( transfer );
+ connect( transfer, SIGNAL( finished() ), this, SIGNAL( transferFinished() ) );
}
//-----------------------------------------------
Index: transfergroup.h
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/lib/interfaces/transfergroup.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** transfergroup.h 9 Jul 2003 19:24:13 -0000 1.4
--- transfergroup.h 29 Nov 2003 13:52:50 -0000 1.5
***************
*** 49,52 ****
--- 49,57 ----
/** */
QPtrList<Transfer>* transfers() { return &m_transfers; }
+ signals:
+ /**
+ * This is emitted whenever one Transfer object has finished (and therefore emitted the corresponding signal).
+ **/
+ void transferFinished();
private:
QPtrList<Transfer> m_transfers;
|