X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/b28a5a6248059566e16c9fcf887b5545034ba52f..c239ae19de0e9aa8d27dc6b1b813421bdb7379fa:/src/dolphinmainwindow.cpp diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 9b2a1cea8..b4a25a7cf 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -21,22 +21,14 @@ #include "dolphinmainwindow.h" -#include - #include "dolphinapplication.h" #include "dolphindockwidget.h" #include "dolphincontextmenu.h" #include "dolphinnewfilemenu.h" #include "dolphinviewcontainer.h" -#ifdef HAVE_NEPOMUK - #include "panels/search/searchpanel.h" - #include -#endif #include "panels/folders/folderspanel.h" #include "panels/places/placespanel.h" #include "panels/information/informationpanel.h" -#include "search/dolphinsearchbox.h" -#include "search/dolphinsearchinformation.h" #include "settings/dolphinsettingsdialog.h" #include "statusbar/dolphinstatusbar.h" #include "views/dolphinviewactionhandler.h" @@ -49,7 +41,6 @@ #endif #include "dolphin_generalsettings.h" -#include "dolphin_searchsettings.h" #include #include @@ -60,13 +51,13 @@ #include #include #include -#include #include #include #include #include #include #include +#include #include #include #include @@ -88,8 +79,6 @@ #include #include -#include "views/dolphinplacesmodel.h" - #include #include #include @@ -129,13 +118,8 @@ DolphinMainWindow::DolphinMainWindow() : m_settingsDialog(), m_controlButton(0), m_updateToolBarTimer(0), - m_lastHandleUrlStatJob(0), - m_searchDockIsTemporaryVisible(false) + m_lastHandleUrlStatJob(0) { - DolphinPlacesModel::setModel(new KFilePlacesModel(this)); - connect(DolphinPlacesModel::instance(), SIGNAL(errorMessage(QString)), - this, SLOT(showErrorMessage(QString))); - // Workaround for a X11-issue in combination with KModifierInfo // (see DolphinContextMenu::initializeModifierKeyInfo() for // more information): @@ -331,29 +315,23 @@ void DolphinMainWindow::showCommand(CommandType command) DolphinStatusBar* statusBar = m_activeViewContainer->statusBar(); switch (command) { case KIO::FileUndoManager::Copy: - statusBar->setMessage(i18nc("@info:status", "Successfully copied."), - DolphinStatusBar::OperationCompleted); + statusBar->setText(i18nc("@info:status", "Successfully copied.")); break; case KIO::FileUndoManager::Move: - statusBar->setMessage(i18nc("@info:status", "Successfully moved."), - DolphinStatusBar::OperationCompleted); + statusBar->setText(i18nc("@info:status", "Successfully moved.")); break; case KIO::FileUndoManager::Link: - statusBar->setMessage(i18nc("@info:status", "Successfully linked."), - DolphinStatusBar::OperationCompleted); + statusBar->setText(i18nc("@info:status", "Successfully linked.")); break; case KIO::FileUndoManager::Trash: - statusBar->setMessage(i18nc("@info:status", "Successfully moved to trash."), - DolphinStatusBar::OperationCompleted); + statusBar->setText(i18nc("@info:status", "Successfully moved to trash.")); break; case KIO::FileUndoManager::Rename: - statusBar->setMessage(i18nc("@info:status", "Successfully renamed."), - DolphinStatusBar::OperationCompleted); + statusBar->setText(i18nc("@info:status", "Successfully renamed.")); break; case KIO::FileUndoManager::Mkdir: - statusBar->setMessage(i18nc("@info:status", "Created folder."), - DolphinStatusBar::OperationCompleted); + statusBar->setText(i18nc("@info:status", "Created folder.")); break; default: @@ -391,6 +369,13 @@ void DolphinMainWindow::changeUrl(const KUrl& url) } } +void DolphinMainWindow::slotTerminalDirectoryChanged(const KUrl& url) +{ + m_activeViewContainer->setAutoGrabFocus(false); + changeUrl(url); + m_activeViewContainer->setAutoGrabFocus(true); +} + void DolphinMainWindow::slotEditableStateChanged(bool editable) { KToggleAction* editableLocationAction = @@ -449,7 +434,7 @@ void DolphinMainWindow::updateFilterBarAction(bool show) void DolphinMainWindow::openNewMainWindow() { - KRun::run("dolphin", KUrl::List(), this); + KRun::run("dolphin %u", KUrl::List(), this); } void DolphinMainWindow::openNewTab() @@ -513,6 +498,12 @@ void DolphinMainWindow::openNewTab(const KUrl& url) } } +void DolphinMainWindow::openNewActivatedTab(const KUrl& url) +{ + openNewTab(url); + m_tabBar->setCurrentIndex(m_viewTab.count() - 1); +} + void DolphinMainWindow::activateNextTab() { if (m_viewTab.count() >= 2) { @@ -554,7 +545,7 @@ void DolphinMainWindow::openInNewWindow() } if (!newWindowUrl.isEmpty()) { - KRun::run("dolphin", KUrl::List() << newWindowUrl, this); + KRun::run("dolphin %u", KUrl::List() << newWindowUrl, this); } } @@ -636,14 +627,6 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event) GeneralSettings::setVersion(CurrentDolphinVersion); GeneralSettings::self()->writeConfig(); - if (m_searchDockIsTemporaryVisible) { - QDockWidget* searchDock = findChild("searchDock"); - if (searchDock) { - searchDock->hide(); - } - m_searchDockIsTemporaryVisible = false; - } - KXmlGuiWindow::closeEvent(event); } @@ -729,10 +712,7 @@ void DolphinMainWindow::quit() void DolphinMainWindow::showErrorMessage(const QString& message) { - if (!message.isEmpty()) { - DolphinStatusBar* statusBar = m_activeViewContainer->statusBar(); - statusBar->setMessage(message, DolphinStatusBar::Error); - } + m_activeViewContainer->showMessage(message, DolphinViewContainer::Error); } void DolphinMainWindow::slotUndoAvailable(bool available) @@ -807,23 +787,6 @@ void DolphinMainWindow::find() m_activeViewContainer->setSearchModeEnabled(true); } -void DolphinMainWindow::slotSearchLocationChanged() -{ -#ifdef HAVE_NEPOMUK - QDockWidget* searchDock = findChild("searchDock"); - if (!searchDock) { - return; - } - - SearchPanel* searchPanel = qobject_cast(searchDock->widget()); - if (searchPanel) { - searchPanel->setSearchLocation(SearchSettings::location() == QLatin1String("FromHere") - ? SearchPanel::FromCurrentDir - : SearchPanel::Everywhere); - } -#endif -} - void DolphinMainWindow::updatePasteAction() { QAction* pasteAction = actionCollection()->action(KStandardAction::name(KStandardAction::Paste)); @@ -1268,16 +1231,6 @@ void DolphinMainWindow::slotTabMoved(int from, int to) m_tabIndex = m_tabBar->currentIndex(); } -void DolphinMainWindow::handlePlacesClick(const KUrl& url, Qt::MouseButtons buttons) -{ - if (buttons & Qt::MidButton) { - openNewTab(url); - m_tabBar->setCurrentIndex(m_viewTab.count() - 1); - } else { - changeUrl(url); - } -} - void DolphinMainWindow::slotTestCanDecode(const QDragMoveEvent* event, bool& canDecode) { canDecode = KUrl::List::canDecode(event->mimeData()); @@ -1293,11 +1246,14 @@ void DolphinMainWindow::handleUrl(const KUrl& url) } else if (KProtocolManager::supportsListing(url)) { // stat the URL to see if it is a dir or not m_lastHandleUrlStatJob = KIO::stat(url, KIO::HideProgressInfo); + if (m_lastHandleUrlStatJob->ui()) { + m_lastHandleUrlStatJob->ui()->setWindow(this); + } connect(m_lastHandleUrlStatJob, SIGNAL(result(KJob*)), this, SLOT(slotHandleUrlStatFinished(KJob*))); } else { - new KRun(url, this); + new KRun(url, this); // Automatically deletes itself after being finished } } @@ -1309,7 +1265,7 @@ void DolphinMainWindow::slotHandleUrlStatFinished(KJob* job) if (entry.isDir()) { activeViewContainer()->setUrl(url); } else { - new KRun(url, this); + new KRun(url, this); // Automatically deletes itself after being finished } } @@ -1320,7 +1276,10 @@ void DolphinMainWindow::tabDropEvent(int tab, QDropEvent* event) const ViewTab& viewTab = m_viewTab[tab]; const DolphinView* view = viewTab.isPrimaryViewActive ? viewTab.primaryView->view() : viewTab.secondaryView->view(); - DragAndDropHelper::dropUrls(view->rootItem(), view->url(), event); + const QString error = DragAndDropHelper::dropUrls(view->rootItem(), view->url(), event); + if (!error.isEmpty()) { + activeViewContainer()->showMessage(error, DolphinViewContainer::Error); + } } } @@ -1329,52 +1288,6 @@ void DolphinMainWindow::slotWriteStateChanged(bool isFolderWritable) newFileMenu()->setEnabled(isFolderWritable); } -void DolphinMainWindow::slotSearchModeChanged(bool enabled) -{ -#ifdef HAVE_NEPOMUK - const DolphinSearchInformation& searchInfo = DolphinSearchInformation::instance(); - if (!searchInfo.isIndexingEnabled()) { - return; - } - - QDockWidget* searchDock = findChild("searchDock"); - if (!searchDock) { - return; - } - - if (enabled) { - if (!searchDock->isVisible()) { - m_searchDockIsTemporaryVisible = true; - } - searchDock->show(); - } else { - if (searchDock->isVisible() && m_searchDockIsTemporaryVisible) { - searchDock->hide(); - } - m_searchDockIsTemporaryVisible = false; - } - - SearchPanel* searchPanel = qobject_cast(searchDock->widget()); - if (!searchPanel) { - return; - } - - if (enabled) { - SearchPanel::SearchLocation searchLocation = SearchPanel::Everywhere; - const KUrl url = m_activeViewContainer->url(); - const bool isSearchUrl = (url.protocol() == QLatin1String("nepomuksearch")); - if ((SearchSettings::location() == QLatin1String("FromHere") && !isSearchUrl)) { - searchLocation = SearchPanel::FromCurrentDir; - } - searchPanel->setSearchLocation(searchLocation); - } else { - searchPanel->setSearchLocation(SearchPanel::Everywhere); - } -#else - Q_UNUSED(enabled); -#endif -} - void DolphinMainWindow::openContextMenu(const QPoint& pos, const KFileItem& item, const KUrl& url, @@ -1386,7 +1299,7 @@ void DolphinMainWindow::openContextMenu(const QPoint& pos, switch (command) { case DolphinContextMenu::OpenParentFolderInNewWindow: { - KRun::run("dolphin", KUrl::List() << item.url().upUrl(), this); + KRun::run("dolphin %u", KUrl::List() << item.url().upUrl(), this); break; } @@ -1511,6 +1424,11 @@ void DolphinMainWindow::slotControlButtonDeleted() m_updateToolBarTimer->start(); } +void DolphinMainWindow::slotPanelErrorMessage(const QString& error) +{ + activeViewContainer()->showMessage(error, DolphinViewContainer::Error); +} + void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* viewContainer) { Q_ASSERT(viewContainer); @@ -1642,12 +1560,12 @@ void DolphinMainWindow::setupActions() KToggleAction* editableLocation = actionCollection()->add("editable_location"); editableLocation->setText(i18nc("@action:inmenu Navigation Bar", "Editable Location")); - editableLocation->setShortcut(Qt::CTRL | Qt::Key_L); + editableLocation->setShortcut(Qt::Key_F6); connect(editableLocation, SIGNAL(triggered()), this, SLOT(toggleEditLocation())); KAction* replaceLocation = actionCollection()->addAction("replace_location"); replaceLocation->setText(i18nc("@action:inmenu Navigation Bar", "Replace Location")); - replaceLocation->setShortcut(Qt::Key_F6); + replaceLocation->setShortcut(Qt::CTRL | Qt::Key_L); connect(replaceLocation, SIGNAL(triggered()), this, SLOT(replaceLocation())); // setup 'Go' menu @@ -1783,8 +1701,12 @@ void DolphinMainWindow::setupDockWidgets() addDockWidget(Qt::LeftDockWidgetArea, foldersDock); connect(this, SIGNAL(urlChanged(KUrl)), foldersPanel, SLOT(setUrl(KUrl))); - connect(foldersPanel, SIGNAL(changeUrl(KUrl,Qt::MouseButtons)), - this, SLOT(handlePlacesClick(KUrl,Qt::MouseButtons))); + connect(foldersPanel, SIGNAL(folderActivated(KUrl)), + this, SLOT(changeUrl(KUrl))); + connect(foldersPanel, SIGNAL(folderMiddleClicked(KUrl)), + this, SLOT(openNewTab(KUrl))); + connect(foldersPanel, SIGNAL(errorMessage(QString)), + this, SLOT(slotPanelErrorMessage(QString))); // Setup "Terminal" #ifndef Q_OS_WIN @@ -1797,6 +1719,7 @@ void DolphinMainWindow::setupDockWidgets() terminalDock->setWidget(terminalPanel); connect(terminalPanel, SIGNAL(hideTerminalPanel()), terminalDock, SLOT(hide())); + connect(terminalPanel, SIGNAL(changeUrl(KUrl)), this, SLOT(slotTerminalDirectoryChanged(KUrl))); connect(terminalDock, SIGNAL(visibilityChanged(bool)), terminalPanel, SLOT(dockVisibilityChanged())); @@ -1808,32 +1731,11 @@ void DolphinMainWindow::setupDockWidgets() terminalPanel, SLOT(setUrl(KUrl))); #endif - // Setup "Search" -#ifdef HAVE_NEPOMUK - DolphinDockWidget* searchDock = new DolphinDockWidget(i18nc("@title:window", "Search")); - searchDock->setLocked(lock); - searchDock->setObjectName("searchDock"); - searchDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); - Panel* searchPanel = new SearchPanel(searchDock); - searchPanel->setCustomContextMenuActions(QList() << lockLayoutAction); - connect(searchPanel, SIGNAL(urlActivated(KUrl)), this, SLOT(handleUrl(KUrl))); - searchDock->setWidget(searchPanel); - - QAction* searchAction = searchDock->toggleViewAction(); - createPanelAction(KIcon("system-search"), Qt::Key_F12, searchAction, "show_search_panel"); - addDockWidget(Qt::RightDockWidgetArea, searchDock); - connect(this, SIGNAL(urlChanged(KUrl)), - searchPanel, SLOT(setUrl(KUrl))); -#endif - if (GeneralSettings::version() < 200) { infoDock->hide(); foldersDock->hide(); #ifndef Q_OS_WIN terminalDock->hide(); -#endif -#ifdef HAVE_NEPOMUK - searchDock->hide(); #endif } @@ -1844,26 +1746,25 @@ void DolphinMainWindow::setupDockWidgets() placesDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); PlacesPanel* placesPanel = new PlacesPanel(placesDock); - QAction* separator = new QAction(placesPanel); - separator->setSeparator(true); - QList placesActions; - placesActions.append(separator); - placesActions.append(lockLayoutAction); - placesPanel->addActions(placesActions); - placesPanel->setModel(DolphinPlacesModel::instance()); - placesPanel->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + placesPanel->setCustomContextMenuActions(QList() << lockLayoutAction); placesDock->setWidget(placesPanel); QAction* placesAction = placesDock->toggleViewAction(); createPanelAction(KIcon("bookmarks"), Qt::Key_F9, placesAction, "show_places_panel"); addDockWidget(Qt::LeftDockWidgetArea, placesDock); - connect(placesPanel, SIGNAL(urlChanged(KUrl,Qt::MouseButtons)), - this, SLOT(handlePlacesClick(KUrl,Qt::MouseButtons))); + connect(placesPanel, SIGNAL(placeActivated(KUrl)), + this, SLOT(changeUrl(KUrl))); + connect(placesPanel, SIGNAL(placeMiddleClicked(KUrl)), + this, SLOT(openNewTab(KUrl))); + connect(placesPanel, SIGNAL(errorMessage(QString)), + this, SLOT(slotPanelErrorMessage(QString))); connect(this, SIGNAL(urlChanged(KUrl)), placesPanel, SLOT(setUrl(KUrl))); connect(placesDock, SIGNAL(visibilityChanged(bool)), this, SLOT(slotPlacesPanelVisibilityChanged(bool))); + connect(this, SIGNAL(settingsChanged()), + placesPanel, SLOT(readSettings())); // Add actions into the "Panels" menu KActionMenu* panelsMenu = new KActionMenu(i18nc("@action:inmenu View", "Panels"), this); @@ -1875,9 +1776,6 @@ void DolphinMainWindow::setupDockWidgets() panelsMenu->addAction(ac->action("show_folders_panel")); #ifndef Q_OS_WIN panelsMenu->addAction(ac->action("show_terminal_panel")); -#endif -#ifdef HAVE_NEPOMUK - panelsMenu->addAction(ac->action("show_search_panel")); #endif panelsMenu->addSeparator(); panelsMenu->addAction(lockLayoutAction); @@ -2057,11 +1955,13 @@ void DolphinMainWindow::refreshViews() toggleSplitView(); } } + + emit settingsChanged(); } void DolphinMainWindow::clearStatusBar() { - m_activeViewContainer->statusBar()->clear(); + m_activeViewContainer->statusBar()->resetToDefaultText(); } void DolphinMainWindow::connectViewSignals(DolphinViewContainer* container) @@ -2070,12 +1970,6 @@ void DolphinMainWindow::connectViewSignals(DolphinViewContainer* container) this, SLOT(updateFilterBarAction(bool))); connect(container, SIGNAL(writeStateChanged(bool)), this, SLOT(slotWriteStateChanged(bool))); - connect(container, SIGNAL(searchModeChanged(bool)), - this, SLOT(slotSearchModeChanged(bool))); - - const DolphinSearchBox* searchBox = container->searchBox(); - connect(searchBox, SIGNAL(searchLocationChanged(SearchLocation)), - this, SLOT(slotSearchLocationChanged())); DolphinView* view = container->view(); connect(view, SIGNAL(selectionChanged(KFileItemList)), @@ -2088,9 +1982,9 @@ void DolphinMainWindow::connectViewSignals(DolphinViewContainer* container) this, SLOT(openNewTab(KUrl))); connect(view, SIGNAL(requestContextMenu(QPoint,KFileItem,KUrl,QList)), this, SLOT(openContextMenu(QPoint,KFileItem,KUrl,QList))); - connect(view, SIGNAL(dirLoadingStarted()), + connect(view, SIGNAL(directoryLoadingStarted()), this, SLOT(enableStopAction())); - connect(view, SIGNAL(dirLoadingCompleted()), + connect(view, SIGNAL(directoryLoadingCompleted()), this, SLOT(disableStopAction())); connect(view, SIGNAL(goBackRequested()), this, SLOT(goBack())); @@ -2167,7 +2061,13 @@ void DolphinMainWindow::createSecondaryView(int tabIndex) const int newWidth = (viewTab.primaryView->width() - splitter->handleWidth()) / 2; const DolphinView* view = viewTab.primaryView->view(); - viewTab.secondaryView = createViewContainer(view->url(), 0); + // The final parent of the new view container will be set by adding it + // to the splitter. However, we must make sure that the DolphinMainWindow + // is a parent of the view container already when it is constructed + // because this enables the container's KFileItemModel to assign its + // dir lister to the right main window. The dir lister can then cache + // authentication data. + viewTab.secondaryView = createViewContainer(view->url(), this); splitter->addWidget(viewTab.secondaryView); splitter->setSizes(QList() << newWidth << newWidth); @@ -2233,8 +2133,8 @@ void DolphinMainWindow::UndoUiInterface::jobError(KIO::Job* job) { DolphinMainWindow* mainWin= qobject_cast(parentWidget()); if (mainWin) { - DolphinStatusBar* statusBar = mainWin->activeViewContainer()->statusBar(); - statusBar->setMessage(job->errorString(), DolphinStatusBar::Error); + DolphinViewContainer* container = mainWin->activeViewContainer(); + container->showMessage(job->errorString(), DolphinViewContainer::Error); } else { KIO::FileUndoManager::UiInterface::jobError(job); }