don't expand to the active URL synchronously, wait until the directory lister has completed its loading

svn path=/trunk/KDE/kdebase/apps/; revision=716899
This commit is contained in:
Peter Penz 2007-09-25 14:56:34 +00:00
parent 41f8286a56
commit 93f8093b66

View file

@ -635,7 +635,9 @@ void DolphinColumnView::showColumn(const KUrl& url)
m_index = columnIndex;
activeColumn()->setActive(true);
expandToActiveUrl();
connect(dirLister, SIGNAL(completed()),
this, SLOT(expandToActiveUrl()));
dirLister->openUrl(rootUrl, false, true);
}
void DolphinColumnView::selectAll()
@ -778,6 +780,9 @@ void DolphinColumnView::updateDecorationSize()
void DolphinColumnView::expandToActiveUrl()
{
disconnect(m_dolphinModel->dirLister(), SIGNAL(completed()),
this, SLOT(expandToActiveUrl()));
const int lastIndex = m_columns.count() - 1;
Q_ASSERT(lastIndex >= 0);
const KUrl& activeUrl = m_columns[lastIndex]->url();
@ -803,9 +808,6 @@ void DolphinColumnView::reloadColumns()
for (int i = 0; i <= end; ++i) {
ColumnWidget* nextColumn = m_columns[i + 1];
KDirLister* dirLister = m_dolphinModel->dirLister();
dirLister->updateDirectory(nextColumn->url());
const QModelIndex rootIndex = nextColumn->rootIndex();
if (rootIndex.isValid()) {
nextColumn->show();