reactivated info sidebar again and temporary removed the code which resets the URL after starting Dolphin

svn path=/trunk/KDE/kdebase/apps/; revision=656979
This commit is contained in:
Peter Penz 2007-04-22 21:27:40 +00:00
parent a195131147
commit 0c05681708
2 changed files with 10 additions and 5 deletions

View file

@ -1274,7 +1274,6 @@ void DolphinMainWindow::setupDockWidgets()
// TODO: temporary deactivated info sidebar because of some minor side effects
/*
QDockWidget* infoDock = new QDockWidget(i18n("Information"));
infoDock->setObjectName("infoDock");
infoDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
@ -1285,7 +1284,7 @@ void DolphinMainWindow::setupDockWidgets()
actionCollection()->addAction("show_info_panel", infoDock->toggleViewAction());
addDockWidget(Qt::RightDockWidgetArea, infoDock);
connectSidebarPage(infoWidget);*/
connectSidebarPage(infoWidget);
// setup "Tree View"
QDockWidget* treeViewDock = new QDockWidget(i18n("Folders"));
@ -1302,7 +1301,7 @@ void DolphinMainWindow::setupDockWidgets()
const bool firstRun = DolphinSettings::instance().generalSettings()->firstRun();
if (firstRun) {
//infoDock->hide();
infoDock->hide();
treeViewDock->hide();
}

View file

@ -129,10 +129,16 @@ void InfoSidebarPage::setUrl(const KUrl& url)
void InfoSidebarPage::setSelection(const KFileItemList& selection)
{
cancelRequest();
// TODO: deactivated the following code, as it has side effects. To
// reproduce start Dolphin and open a folder -> the URL navigator gets
// reset. First guess: it seems that a setUrl signal is emitted
// by the following code
Q_UNUSED(selection);
/*cancelRequest();
m_currentSelection = selection;
m_multipleSelection = (m_currentSelection.size() > 1);
showItemInfo();
showItemInfo();*/
}
void InfoSidebarPage::requestDelayedItemInfo(const KUrl& url)