kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-20 08:51:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

First step towards progress info when listing (it receives it at least,

Browse source 
now I just need to display it).

svn path=/trunk/kdebase/konqueror/; revision=45469
This commit is contained in:
David Faure 2000-04-02 23:00:05 +00:00
parent 8f01fd4ce6
commit 2f7f1f6b3a
6 changed files with 33 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
konqueror/iconview/konq_iconview.cc
View file

@ -185,7 +185,7 @@ KonqKfmIconView::KonqKfmIconView( QWidget *parentWidget, QObject *parent, const
setWidget( m_pIconView );
m_ulTotalFiles = 0;
//m_ulTotalFiles = 0;
// Don't repaint on configuration changes during construction
m_bInit = true;
@ -714,7 +714,7 @@ void KonqKfmIconView::slotStarted( const QString & /*url*/ )
{
m_pIconView->selectAll( false );
if ( m_bLoading )
emit started( 0 /* no iojob */ );
emit started( m_dirLister->job() );
m_lstPendingMimeIconItems.clear();
}
@ -780,8 +780,9 @@ void KonqKfmIconView::slotNewItems( const KonqFileItemList& entries )
item->setKey( key );
if ( m_ulTotalFiles > 0 )
emit m_extension->loadingProgress( ( m_pIconView->count() * 100 ) / m_ulTotalFiles );
// old method
//if ( m_ulTotalFiles > 0 )
// emit m_extension->loadingProgress( ( m_pIconView->count() * 100 ) / m_ulTotalFiles );
m_lstPendingMimeIconItems.append( item );
}
@ -817,10 +818,12 @@ void KonqKfmIconView::slotClear()
m_lstPendingMimeIconItems.clear();
}
/*
void KonqKfmIconView::slotTotalFiles( int, unsigned long files )
{
m_ulTotalFiles = files;
}
*/
static QString displayString(int items, int files, long size, int dirs)
{
@ -968,15 +971,17 @@ bool KonqKfmIconView::openURL( const KURL &_url )
m_dirLister->openURL( url(), m_pProps->m_bShowDot );
// Note : we don't store the url. KDirLister does it for us.
/*
// should be possible to it without this now
KIO::Job *job = m_dirLister->job();
if ( job )
{
//TODO
//connect( job, SIGNAL( sigTotalFiles( int, unsigned long ) ),
// this, SLOT( slotTotalFiles( int, unsigned long ) ) );
connect( job, SIGNAL( totalSize( KIO::Job *, unsigned long ) ),
this, SLOT( slotTotalFiles( KIO::Job *, unsigned long ) ) );
}
*/
m_ulTotalFiles = 0;
//m_ulTotalFiles = 0;
m_bNeedAlign = false;
// do it after starting the dir lister to avoid changing bgcolor of the

4
konqueror/iconview/konq_iconview.h
View file

@ -111,7 +111,7 @@ protected slots:
void slotClear();
void slotTotalFiles( int, unsigned long files );
//void slotTotalFiles( int, unsigned long files );
void slotDisplayFileSelectionInfo();
@ -148,7 +148,7 @@ protected:
*/
bool m_bNeedAlign;
unsigned long m_ulTotalFiles;
//unsigned long m_ulTotalFiles;
SortCriterion m_eSortCriterion;

15
konqueror/konq_childview.cc
View file

@ -158,7 +158,7 @@ bool KonqChildView::changeViewMode( const QString &serviceType,
{
if ( m_bViewStarted )
stop();
if ( m_lstHistory.count() > 0 )
updateHistoryEntry();
@ -259,25 +259,25 @@ void KonqChildView::slotStarted( KIO::Job * job )
if (job)
{
connect( job, SIGNAL( sigTotalSize( int, unsigned long ) ), this, SLOT( slotTotalSize( int, unsigned long ) ) );
connect( job, SIGNAL( sigProcessedSize( int, unsigned long ) ), this, SLOT( slotProcessedSize( int, unsigned long ) ) );
connect( job, SIGNAL( sigSpeed( int, unsigned long ) ), this, SLOT( slotSpeed( int, unsigned long ) ) );
connect( job, SIGNAL( totalSize( KIO::Job *, unsigned long ) ), this, SLOT( slotTotalSize( KIO::Job *, unsigned long ) ) );
connect( job, SIGNAL( processedSize( KIO::Job *, unsigned long ) ), this, SLOT( slotProcessedSize( KIO::Job *, unsigned long ) ) );
connect( job, SIGNAL( speed( KIO::Job *, unsigned long ) ), this, SLOT( slotSpeed( KIO::Job *, unsigned long ) ) );
}
m_ulTotalDocumentSize = 0;
}
void KonqChildView::slotTotalSize( int, unsigned long size )
void KonqChildView::slotTotalSize( KIO::Job *, unsigned long size )
{
m_ulTotalDocumentSize = size;
}
void KonqChildView::slotProcessedSize( int, unsigned long size )
void KonqChildView::slotProcessedSize( KIO::Job *, unsigned long size )
{
if ( m_ulTotalDocumentSize > (unsigned long)0 )
slotLoadingProgress( size * 100 / m_ulTotalDocumentSize );
}
void KonqChildView::slotSpeed( int, unsigned long bytesPerSecond )
void KonqChildView::slotSpeed( KIO::Job *, unsigned long bytesPerSecond )
{
slotSpeedProgress( (long int)bytesPerSecond );
}
@ -287,6 +287,7 @@ void KonqChildView::slotLoadingProgress( int percent )
m_iProgress = percent;
if ( m_pMainView->currentChildView() == this )
{
kdDebug(1202) << "KonqChildView::slotLoadingProgress " << percent << endl;
m_pMainView->updateStatusBar();
}
}

7
konqueror/konq_childview.h
View file

@ -220,9 +220,10 @@ protected slots:
void slotStarted( KIO::Job * job );
void slotCompleted();
void slotCanceled( const QString & errMsg );
void slotTotalSize( int, unsigned long size );
void slotProcessedSize( int, unsigned long size );
void slotSpeed( int, unsigned long bytesPerSecond );
void slotTotalSize( KIO::Job *, unsigned long size );
void slotProcessedSize( KIO::Job *, unsigned long size );
void slotSpeed( KIO::Job *, unsigned long bytesPerSecond );
// connected to the extension's signals (if the part doesn't use KIO::Job)
void slotLoadingProgress( int percent );
void slotSpeedProgress( int bytesPerSecond );

10
konqueror/listview/konq_listviewwidget.cc
View file

@ -290,7 +290,7 @@ void KonqBaseListViewWidget::viewportDragMoveEvent( QDragMoveEvent *_ev )
_ev->ignore();
m_dragOverItem = 0L;
}
return;
}
@ -479,11 +479,11 @@ void KonqBaseListViewWidget::slotOnViewport()
//TODO: Display summary in DetailedList in statusbar, like iconview does
}
void KonqBaseListViewWidget::slotExecuted( QListViewItem* _item )
void KonqBaseListViewWidget::slotExecuted( QListViewItem* _item )
{
//if ( isSingleClickArea( _mouse->pos() ) )
//if ( isSingleClickArea( _mouse->pos() ) )
{
if ( m_pressedItem->isExpandable() )
m_pressedItem->setOpen( !m_pressedItem->isOpen() );
slotReturnPressed( m_pressedItem );
@ -660,7 +660,7 @@ void KonqBaseListViewWidget::setComplete()
void KonqBaseListViewWidget::slotStarted( const QString & /*url*/ )
{
if (!m_bTopLevelComplete)
emitStarted(0);
emitStarted(m_dirLister->job());
}
void KonqBaseListViewWidget::slotCompleted()

2
konqueror/listview/konq_textviewwidget.cc
View file

@ -158,7 +158,7 @@ bool KonqTextViewWidget::openURL( const KURL &url )
void KonqTextViewWidget::slotStarted( const QString & /*url*/ )
{
if ( !m_bTopLevelComplete )
emitStarted(0);
emitStarted(m_dirLister->job());
setUpdatesEnabled(FALSE);
timer.restart();
if (m_settingsChanged)