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

don't connect each sidebar page with all available signals per default

Browse source 
svn path=/trunk/KDE/kdebase/apps/; revision=660258
This commit is contained in:
Peter Penz 2007-05-02 05:15:03 +00:00
parent 91062574ec
commit eafb93bcfb
2 changed files with 10 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
dolphin/src/dolphinmainwindow.cpp
View file

@ -1267,13 +1267,7 @@ void DolphinMainWindow::setupActions()
void DolphinMainWindow::setupDockWidgets()
{
// TODO: there's a lot copy/paste code here. Provide a generic approach
// after the dock concept has been finalized.
// setup "Information"
// 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);
@ -1284,7 +1278,8 @@ void DolphinMainWindow::setupDockWidgets()
actionCollection()->addAction("show_info_panel", infoDock->toggleViewAction());
addDockWidget(Qt::RightDockWidgetArea, infoDock);
connectSidebarPage(infoWidget);
connect(this, SIGNAL(urlChanged(KUrl)),
infoWidget, SLOT(setUrl(KUrl)));
// setup "Tree View"
QDockWidget* treeViewDock = new QDockWidget(i18n("Folders"));
@ -1297,7 +1292,14 @@ void DolphinMainWindow::setupDockWidgets()
actionCollection()->addAction("show_folders_panel", treeViewDock->toggleViewAction());
addDockWidget(Qt::LeftDockWidgetArea, treeViewDock);
connectSidebarPage(treeWidget);
connect(this, SIGNAL(urlChanged(KUrl)),
treeWidget, SLOT(setUrl(KUrl)));
connect(treeWidget, SIGNAL(changeUrl(KUrl)),
this, SLOT(changeUrl(KUrl)));
connect(treeWidget, SIGNAL(changeSelection(KFileItemList)),
this, SLOT(changeSelection(KFileItemList)));
connect(treeWidget, SIGNAL(urlsDropped(KUrl::List, KUrl)),
this, SLOT(dropUrls(KUrl::List, KUrl)));
const bool firstRun = DolphinSettings::instance().generalSettings()->firstRun();
if (firstRun) {
@ -1489,21 +1491,6 @@ void DolphinMainWindow::connectViewSignals(int viewIndex)
this, SLOT(slotHistoryChanged()));
}
void DolphinMainWindow::connectSidebarPage(SidebarPage* page)
{
connect(page, SIGNAL(changeUrl(KUrl)),
this, SLOT(changeUrl(KUrl)));
connect(page, SIGNAL(changeSelection(KFileItemList)),
this, SLOT(changeSelection(KFileItemList)));
connect(page, SIGNAL(urlsDropped(KUrl::List, KUrl)),
this, SLOT(dropUrls(KUrl::List, KUrl)));
connect(this, SIGNAL(urlChanged(KUrl)),
page, SLOT(setUrl(KUrl)));
connect(this, SIGNAL(selectionChanged(KFileItemList)),
page, SLOT(setSelection(KFileItemList)));
}
DolphinMainWindow::UndoUiInterface::UndoUiInterface(DolphinMainWindow* mainWin) :
KonqUndoManager::UiInterface(mainWin),
m_mainWin(mainWin)

5
dolphin/src/dolphinmainwindow.h
View file

@ -422,11 +422,6 @@ private:
*/
void connectViewSignals(int viewIndex);
/**
* Helper function to connect all signal/slots of the given \sidebar.
*/
void connectSidebarPage(SidebarPage* sidebar);
private:
/**
* DolphinMainWindowsupports only one or two views, which