X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/d1aaeab617d4e0372e5e93b6865d3b63ceb1d596..817f3952e2bed820ea3b50dfdfe91ccb99dcb748:/src/dolphinmainwindow.cpp diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index f551232a7..75d0a059f 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -32,12 +32,10 @@ #include "dolphinsettingsdialog.h" #include "dolphinstatusbar.h" #include "dolphinviewcontainer.h" -#include "fileitemcapabilities.h" #include "infosidebarpage.h" #include "metadatawidget.h" #include "mainwindowadaptor.h" #include "treeviewsidebarpage.h" -#include "viewpropertiesdialog.h" #include "viewproperties.h" #ifndef Q_OS_WIN @@ -63,20 +61,21 @@ #include #include #include -#include +#include #include -#include #include -#include #include #include #include #include #include #include +#include +#include #include #include +#include #include #include #include @@ -102,7 +101,7 @@ DolphinMainWindow::DolphinMainWindow(int id) : new MainWindowAdaptor(this); QDBusConnection::sessionBus().registerObject(QString("/dolphin/MainWindow%1").arg(m_id), this); - KonqFileUndoManager* undoManager = KonqFileUndoManager::self(); + KIO::FileUndoManager* undoManager = KIO::FileUndoManager::self(); undoManager->setUiInterface(new UndoUiInterface()); connect(undoManager, SIGNAL(undoAvailable(bool)), @@ -133,7 +132,7 @@ void DolphinMainWindow::toggleViews() m_viewTab[m_tabIndex].secondaryView = container; } -void DolphinMainWindow::slotDoingOperation(KonqFileUndoManager::CommandType commandType) +void DolphinMainWindow::slotDoingOperation(KIO::FileUndoManager::CommandType commandType) { clearStatusBar(); m_undoCommandTypes.append(commandType); @@ -160,8 +159,8 @@ void DolphinMainWindow::dropUrls(const KUrl::List& urls, const KUrl& destination) { DolphinDropController dropController(this); - connect(&dropController, SIGNAL(doingOperation(KonqFileUndoManager::CommandType)), - this, SLOT(slotDoingOperation(KonqFileUndoManager::CommandType))); + connect(&dropController, SIGNAL(doingOperation(KIO::FileUndoManager::CommandType)), + this, SLOT(slotDoingOperation(KIO::FileUndoManager::CommandType))); dropController.dropUrls(urls, destination); } @@ -203,19 +202,21 @@ void DolphinMainWindow::slotSelectionChanged(const KFileItemList& selection) updateEditActions(); Q_ASSERT(m_viewTab[m_tabIndex].primaryView != 0); - int selectedUrlsCount = m_viewTab[m_tabIndex].primaryView->view()->selectedUrls().count(); + int selectedUrlsCount = m_viewTab[m_tabIndex].primaryView->view()->selectedItemsCount(); if (m_viewTab[m_tabIndex].secondaryView != 0) { - selectedUrlsCount += m_viewTab[m_tabIndex].secondaryView->view()->selectedUrls().count(); + selectedUrlsCount += m_viewTab[m_tabIndex].secondaryView->view()->selectedItemsCount(); } QAction* compareFilesAction = actionCollection()->action("compare_files"); if (selectedUrlsCount == 2) { - const bool kompareInstalled = !KGlobal::dirs()->findExe("kompare").isEmpty(); - compareFilesAction->setEnabled(selectedUrlsCount == 2 && kompareInstalled); + compareFilesAction->setEnabled(isKompareInstalled()); } else { compareFilesAction->setEnabled(false); } + const bool activeViewHasSelection = (activeViewContainer()->view()->selectedItemsCount() > 0); + actionCollection()->action("quick_view")->setEnabled(activeViewHasSelection); + m_activeViewContainer->updateStatusBar(); emit selectionChanged(selection); @@ -277,6 +278,8 @@ void DolphinMainWindow::openNewTab(const KUrl& url) viewTab.primaryView->view()->reload(); m_viewTab.append(viewTab); + + actionCollection()->action("close_tab")->setEnabled(true); } void DolphinMainWindow::toggleActiveView() @@ -355,17 +358,6 @@ void DolphinMainWindow::updateNewMenu() m_newMenu->setPopupFiles(activeViewContainer()->url()); } -void DolphinMainWindow::properties() -{ - const KFileItemList list = m_activeViewContainer->view()->selectedItems(); - - KPropertiesDialog *dialog = new KPropertiesDialog(list, this); - dialog->setAttribute(Qt::WA_DeleteOnClose); - dialog->show(); - dialog->raise(); - dialog->activateWindow(); -} - void DolphinMainWindow::quit() { close(); @@ -387,31 +379,31 @@ void DolphinMainWindow::slotUndoAvailable(bool available) } if (available && (m_undoCommandTypes.count() > 0)) { - const KonqFileUndoManager::CommandType command = m_undoCommandTypes.takeFirst(); + const KIO::FileUndoManager::CommandType command = m_undoCommandTypes.takeFirst(); DolphinStatusBar* statusBar = m_activeViewContainer->statusBar(); switch (command) { - case KonqFileUndoManager::COPY: + case KIO::FileUndoManager::Copy: statusBar->setMessage(i18nc("@info:status", "Copy operation completed."), DolphinStatusBar::OperationCompleted); break; - case KonqFileUndoManager::MOVE: + case KIO::FileUndoManager::Move: statusBar->setMessage(i18nc("@info:status", "Move operation completed."), DolphinStatusBar::OperationCompleted); break; - case KonqFileUndoManager::LINK: + case KIO::FileUndoManager::Link: statusBar->setMessage(i18nc("@info:status", "Link operation completed."), DolphinStatusBar::OperationCompleted); break; - case KonqFileUndoManager::TRASH: + case KIO::FileUndoManager::Trash: statusBar->setMessage(i18nc("@info:status", "Move to trash operation completed."), DolphinStatusBar::OperationCompleted); break; - case KonqFileUndoManager::RENAME: + case KIO::FileUndoManager::Rename: statusBar->setMessage(i18nc("@info:status", "Renaming operation completed."), DolphinStatusBar::OperationCompleted); break; - case KonqFileUndoManager::MKDIR: + case KIO::FileUndoManager::Mkdir: statusBar->setMessage(i18nc("@info:status", "Created folder."), DolphinStatusBar::OperationCompleted); break; @@ -434,8 +426,8 @@ void DolphinMainWindow::slotUndoTextChanged(const QString& text) void DolphinMainWindow::undo() { clearStatusBar(); - KonqFileUndoManager::self()->uiInterface()->setParentWidget(this); - KonqFileUndoManager::self()->undo(); + KIO::FileUndoManager::self()->uiInterface()->setParentWidget(this); + KIO::FileUndoManager::self()->undo(); } void DolphinMainWindow::cut() @@ -500,13 +492,17 @@ void DolphinMainWindow::toggleSplitView() m_viewTab[m_tabIndex].secondaryView->view()->reload(); m_viewTab[m_tabIndex].secondaryView->setActive(false); m_viewTab[m_tabIndex].secondaryView->show(); - } else if (m_activeViewContainer == m_viewTab[m_tabIndex].primaryView) { + + setActiveViewContainer(m_viewTab[m_tabIndex].secondaryView); + } else if (m_activeViewContainer == m_viewTab[m_tabIndex].secondaryView) { // remove secondary view m_viewTab[m_tabIndex].secondaryView->close(); m_viewTab[m_tabIndex].secondaryView->deleteLater(); m_viewTab[m_tabIndex].secondaryView = 0; + + setActiveViewContainer(m_viewTab[m_tabIndex].primaryView); } else { - // The secondary view is active, hence from a users point of view + // The primary view is active and should be closed. Hence from a users point of view // the content of the secondary view should be moved to the primary view. // From an implementation point of view it is more efficient to close // the primary view and exchange the internal pointers afterwards. @@ -515,9 +511,10 @@ void DolphinMainWindow::toggleSplitView() m_viewTab[m_tabIndex].primaryView->deleteLater(); m_viewTab[m_tabIndex].primaryView = m_viewTab[m_tabIndex].secondaryView; m_viewTab[m_tabIndex].secondaryView = 0; + + setActiveViewContainer(m_viewTab[m_tabIndex].primaryView); } - setActiveViewContainer(m_viewTab[m_tabIndex].primaryView); updateViewActions(); } @@ -557,13 +554,6 @@ void DolphinMainWindow::editLocation() lineEdit->setSelection(0, text.length()); } -void DolphinMainWindow::adjustViewProperties() -{ - clearStatusBar(); - ViewPropertiesDialog dlg(m_activeViewContainer->view()); - dlg.exec(); -} - void DolphinMainWindow::goBack() { clearStatusBar(); @@ -588,11 +578,6 @@ void DolphinMainWindow::goHome() m_activeViewContainer->urlNavigator()->goHome(); } -void DolphinMainWindow::findFile() -{ - KRun::run("kfind", m_activeViewContainer->url(), this); -} - void DolphinMainWindow::compareFiles() { // The method is only invoked if exactly 2 files have @@ -647,6 +632,18 @@ void DolphinMainWindow::compareFiles() KRun::runCommand(command, "Kompare", "kompare", this); } +void DolphinMainWindow::quickView() +{ + const KUrl::List urls = activeViewContainer()->view()->selectedUrls(); + Q_ASSERT(urls.count() > 0); + + QDBusMessage msg = QDBusMessage::createMethodCall("org.kde.plasma", "/Previewer", "", "openFile"); + foreach (const KUrl& url, urls) { + msg.setArguments(QList() << url.prettyUrl()); + QDBusConnection::sessionBus().send(msg); + } +} + void DolphinMainWindow::toggleShowMenuBar() { const bool visible = menuBar()->isVisible(); @@ -705,7 +702,7 @@ void DolphinMainWindow::closeTab(int index) if (index == m_tabIndex) { // The tab that should be closed is the active tab. Activate the // previous tab before closing the tab. - setActiveTab((index > 0) ? index - 1 : 1); + m_tabBar->setCurrentIndex((index > 0) ? index - 1 : 1); } // delete tab @@ -728,6 +725,7 @@ void DolphinMainWindow::closeTab(int index) // closing the last tab is not possible if (m_viewTab.count() == 1) { m_tabBar->removeTab(0); + actionCollection()->action("close_tab")->setEnabled(false); } else { m_tabBar->blockSignals(false); } @@ -740,7 +738,7 @@ void DolphinMainWindow::openTabContextMenu(int index, const QPoint& pos) QAction* newTabAction = menu.addAction(KIcon("tab-new"), i18nc("@action:inmenu", "New Tab")); newTabAction->setShortcut(actionCollection()->action("new_tab")->shortcut()); - QAction* closeOtherTabsAction = menu.addAction(KIcon("tab-close"), i18nc("@action:inmenu", "Close Other Tabs")); + QAction* closeOtherTabsAction = menu.addAction(KIcon("tab-close-other"), i18nc("@action:inmenu", "Close Other Tabs")); QAction* closeTabAction = menu.addAction(KIcon("tab-close"), i18nc("@action:inmenu", "Close Tab")); closeTabAction->setShortcut(actionCollection()->action("close_tab")->shortcut()); @@ -766,6 +764,21 @@ void DolphinMainWindow::openTabContextMenu(int index, const QPoint& pos) } } +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()); +} + void DolphinMainWindow::init() { DolphinSettings& settings = DolphinSettings::instance(); @@ -808,6 +821,10 @@ void DolphinMainWindow::init() this, SLOT(closeTab(int))); connect(m_tabBar, SIGNAL(contextMenu(int, const QPoint&)), this, SLOT(openTabContextMenu(int, const QPoint&))); + connect(m_tabBar, SIGNAL(newTabRequest()), + this, SLOT(openNewTab())); + connect(m_tabBar, SIGNAL(testCanDecode(const QDragMoveEvent*, bool&)), + this, SLOT(slotTestCanDecode(const QDragMoveEvent*, bool&))); m_tabBar->blockSignals(true); // signals get unblocked after at least 2 tabs are open QWidget* centralWidget = new QWidget(this); @@ -838,6 +855,9 @@ void DolphinMainWindow::init() } updateViewActions(); + QAction* showFilterBarAction = actionCollection()->action("show_filter_bar"); + showFilterBarAction->setChecked(generalSettings->filterBar()); + if (firstRun) { // assure a proper default size if Dolphin runs the first time resize(750, 500); @@ -900,19 +920,15 @@ void DolphinMainWindow::setupActions() KAction* newTab = actionCollection()->addAction("new_tab"); newTab->setIcon(KIcon("tab-new")); newTab->setText(i18nc("@action:inmenu File", "New Tab")); - newTab->setShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_N); + newTab->setShortcut(KShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_N, Qt::CTRL | Qt::Key_T)); connect(newTab, SIGNAL(triggered()), this, SLOT(openNewTab())); QAction* closeTab = new QAction(KIcon("tab-close"), i18nc("@action:inmenu File", "Close Tab"), this); closeTab->setShortcut(Qt::CTRL | Qt::Key_W); + closeTab->setEnabled(false); connect(closeTab, SIGNAL(triggered()), this, SLOT(closeTab())); actionCollection()->addAction("close_tab", closeTab); - KAction* properties = actionCollection()->addAction("properties"); - properties->setText(i18nc("@action:inmenu File", "Properties")); - properties->setShortcut(Qt::ALT | Qt::Key_Return); - connect(properties, SIGNAL(triggered()), this, SLOT(properties())); - KStandardAction::quit(this, SLOT(quit()), actionCollection()); // setup 'Edit' menu @@ -969,10 +985,6 @@ void DolphinMainWindow::setupActions() editLocation->setShortcut(Qt::Key_F6); connect(editLocation, SIGNAL(triggered()), this, SLOT(editLocation())); - KAction* adjustViewProps = actionCollection()->addAction("view_properties"); - adjustViewProps->setText(i18nc("@action:inmenu View", "Adjust View Properties...")); - connect(adjustViewProps, SIGNAL(triggered()), this, SLOT(adjustViewProperties())); - // setup 'Go' menu KAction* backAction = KStandardAction::back(this, SLOT(goBack()), actionCollection()); KShortcut backShortcut = backAction->shortcut(); @@ -984,12 +996,6 @@ void DolphinMainWindow::setupActions() KStandardAction::home(this, SLOT(goHome()), actionCollection()); // setup 'Tools' menu - QAction* findFile = actionCollection()->addAction("find_file"); - findFile->setText(i18nc("@action:inmenu Tools", "Find File...")); - findFile->setShortcut(Qt::CTRL | Qt::Key_F); - findFile->setIcon(KIcon("edit-find")); - connect(findFile, SIGNAL(triggered()), this, SLOT(findFile())); - KToggleAction* showFilterBar = actionCollection()->add("show_filter_bar"); showFilterBar->setText(i18nc("@action:inmenu Tools", "Show Filter Bar")); showFilterBar->setShortcut(Qt::CTRL | Qt::Key_I); @@ -1001,6 +1007,13 @@ void DolphinMainWindow::setupActions() compareFiles->setEnabled(false); connect(compareFiles, SIGNAL(triggered()), this, SLOT(compareFiles())); + KAction* quickView = actionCollection()->addAction("quick_view"); + quickView->setText(i18nc("@action:inmenu Tools", "Quick View")); + quickView->setIcon(KIcon("view-preview")); + quickView->setShortcut(Qt::Key_Space); + quickView->setEnabled(false); + connect(quickView, SIGNAL(triggered()), this, SLOT(quickView())); + // setup 'Settings' menu m_showMenuBar = KStandardAction::showMenubar(this, SLOT(toggleShowMenuBar()), actionCollection()); KStandardAction::preferences(this, SLOT(editSettings()), actionCollection()); @@ -1041,8 +1054,8 @@ void DolphinMainWindow::setupDockWidgets() addDockWidget(Qt::LeftDockWidgetArea, treeViewDock); connect(this, SIGNAL(urlChanged(KUrl)), treeWidget, SLOT(setUrl(KUrl))); - connect(treeWidget, SIGNAL(changeUrl(KUrl)), - this, SLOT(changeUrl(KUrl))); + connect(treeWidget, SIGNAL(changeUrl(KUrl, Qt::MouseButtons)), + this, SLOT(handlePlacesClick(KUrl, Qt::MouseButtons))); connect(treeWidget, SIGNAL(changeSelection(KFileItemList)), this, SLOT(changeSelection(KFileItemList))); connect(treeWidget, SIGNAL(urlsDropped(KUrl::List, KUrl)), @@ -1089,8 +1102,8 @@ void DolphinMainWindow::setupDockWidgets() actionCollection()->addAction("show_places_panel", placesDock->toggleViewAction()); addDockWidget(Qt::LeftDockWidgetArea, placesDock); - connect(placesView, SIGNAL(urlChanged(KUrl)), - this, SLOT(changeUrl(KUrl))); + connect(placesView, SIGNAL(urlChanged(KUrl, Qt::MouseButtons)), + this, SLOT(handlePlacesClick(KUrl, Qt::MouseButtons))); connect(this, SIGNAL(urlChanged(KUrl)), placesView, SLOT(setUrl(KUrl))); } @@ -1103,11 +1116,21 @@ void DolphinMainWindow::updateEditActions() } else { stateChanged("has_selection"); - FileItemCapabilities capabilities(list); - actionCollection()->action("rename")->setEnabled(capabilities.supportsMoving()); + KActionCollection* col = actionCollection(); + QAction* renameAction = col->action("rename"); + QAction* moveToTrashAction = col->action("move_to_trash"); + QAction* deleteAction = col->action("delete"); + QAction* cutAction = col->action(KStandardAction::name(KStandardAction::Cut)); + QAction* deleteWithTrashShortcut = col->action("delete_shortcut"); // see DolphinViewActionHandler + + KonqFileItemCapabilities capabilities(list); const bool enableMoveToTrash = capabilities.isLocal() && capabilities.supportsMoving(); - actionCollection()->action("move_to_trash")->setEnabled(enableMoveToTrash); - actionCollection()->action("delete")->setEnabled(capabilities.supportsDeleting()); + + renameAction->setEnabled(capabilities.supportsMoving()); + moveToTrashAction->setEnabled(enableMoveToTrash); + deleteAction->setEnabled(capabilities.supportsDeleting()); + deleteWithTrashShortcut->setEnabled(capabilities.supportsDeleting() && !enableMoveToTrash); + cutAction->setEnabled(capabilities.supportsMoving()); } updatePasteAction(); } @@ -1150,8 +1173,8 @@ void DolphinMainWindow::connectViewSignals(DolphinViewContainer* container) this, SLOT(slotRequestItemInfo(KFileItem))); connect(view, SIGNAL(activated()), this, SLOT(toggleActiveView())); - connect(view, SIGNAL(doingOperation(KonqFileUndoManager::CommandType)), - this, SLOT(slotDoingOperation(KonqFileUndoManager::CommandType))); + connect(view, SIGNAL(doingOperation(KIO::FileUndoManager::CommandType)), + this, SLOT(slotDoingOperation(KIO::FileUndoManager::CommandType))); connect(view, SIGNAL(tabRequested(const KUrl&)), this, SLOT(openNewTab(const KUrl&))); @@ -1168,7 +1191,7 @@ void DolphinMainWindow::updateSplitAction() { QAction* splitAction = actionCollection()->action("split_view"); if (m_viewTab[m_tabIndex].secondaryView != 0) { - if (m_activeViewContainer == m_viewTab[m_tabIndex].primaryView) { + if (m_activeViewContainer == m_viewTab[m_tabIndex].secondaryView) { splitAction->setText(i18nc("@action:intoolbar Close right view", "Close")); splitAction->setIcon(KIcon("view-right-close")); } else { @@ -1183,11 +1206,33 @@ void DolphinMainWindow::updateSplitAction() QString DolphinMainWindow::tabName(const KUrl& url) const { - return url.equals(KUrl("file:///")) ? "/" : url.fileName(); + QString name; + if (url.equals(KUrl("file:///"))) { + name = "/"; + } else { + name = url.fileName(); + if (name.isEmpty()) { + name = url.protocol(); + } + } + return name; +} + +bool DolphinMainWindow::isKompareInstalled() const +{ + static bool initialized = false; + static bool installed = false; + if (!initialized) { + // TODO: maybe replace this approach later by using a menu + // plugin like kdiff3plugin.cpp + installed = !KGlobal::dirs()->findExe("kompare").isEmpty(); + initialized = true; + } + return installed; } DolphinMainWindow::UndoUiInterface::UndoUiInterface() : - KonqFileUndoManager::UiInterface() + KIO::FileUndoManager::UiInterface() { } @@ -1202,7 +1247,7 @@ void DolphinMainWindow::UndoUiInterface::jobError(KIO::Job* job) DolphinStatusBar* statusBar = mainWin->activeViewContainer()->statusBar(); statusBar->setMessage(job->errorString(), DolphinStatusBar::Error); } else { - KonqFileUndoManager::UiInterface::jobError(job); + KIO::FileUndoManager::UiInterface::jobError(job); } }