X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/8a891082f498580a4e460d6a8a85fab0c99d30fe..8d189f44c4d1bf3bea71da43fef59cb772a348bc:/src/dolphinmainwindow.cpp diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 21ef3a984..e14cb1c2d 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -32,7 +32,6 @@ #include "dolphinsettingsdialog.h" #include "dolphinstatusbar.h" #include "dolphinviewcontainer.h" -#include "fileitemcapabilities.h" #include "infosidebarpage.h" #include "metadatawidget.h" #include "mainwindowadaptor.h" @@ -62,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 @@ -202,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); @@ -354,17 +356,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(); @@ -501,7 +492,7 @@ void DolphinMainWindow::toggleSplitView() m_viewTab[m_tabIndex].secondaryView->show(); setActiveViewContainer(m_viewTab[m_tabIndex].secondaryView); - } else if (m_activeViewContainer == m_viewTab[m_tabIndex].primaryView) { + } else if (m_activeViewContainer == m_viewTab[m_tabIndex].secondaryView) { // remove secondary view m_viewTab[m_tabIndex].secondaryView->close(); m_viewTab[m_tabIndex].secondaryView->deleteLater(); @@ -509,7 +500,7 @@ void DolphinMainWindow::toggleSplitView() 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. @@ -585,11 +576,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 @@ -644,6 +630,19 @@ 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) { + QList args; + msg.setArguments(QList() << url.prettyUrl()); + QDBusConnection::sessionBus().send(msg); + } +} + void DolphinMainWindow::toggleShowMenuBar() { const bool visible = menuBar()->isVisible(); @@ -909,7 +908,7 @@ 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); @@ -917,11 +916,6 @@ void DolphinMainWindow::setupActions() 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 @@ -989,12 +983,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); @@ -1006,6 +994,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()); @@ -1108,11 +1103,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(); } @@ -1173,7 +1178,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 { @@ -1188,7 +1193,29 @@ 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() :