X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/f37ecd6ecfab9bc1d2929504b4f6e4363f8137b9..eb4e1dc66efcd4832cb9b2363f282d7a2b12314d:/src/dolphinmainwindow.cpp diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index a91584b8e..bfdf8dafd 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -28,6 +28,7 @@ #include "dolphinnewmenu.h" #include "settings/dolphinsettings.h" #include "settings/dolphinsettingsdialog.h" +#include "dolphinsearchbox.h" #include "dolphinstatusbar.h" #include "dolphinviewcontainer.h" #include "panels/folders/folderspanel.h" @@ -53,6 +54,8 @@ #include #include #include +#include +#include #include #include #include @@ -83,6 +86,19 @@ #include #include +/* + * Remembers the tab configuration if a tab has been closed. + * Each closed tab can be restored by the menu + * "Go -> Recently Closed Tabs". + */ +struct ClosedTab +{ + KUrl primaryUrl; + KUrl secondaryUrl; + bool isSplit; +}; +Q_DECLARE_METATYPE(ClosedTab) + DolphinMainWindow::DolphinMainWindow(int id) : KXmlGuiWindow(0), m_newMenu(0), @@ -90,6 +106,7 @@ DolphinMainWindow::DolphinMainWindow(int id) : m_tabBar(0), m_activeViewContainer(0), m_centralWidgetLayout(0), + m_searchBox(0), m_id(id), m_tabIndex(0), m_viewTab(), @@ -252,16 +269,20 @@ void DolphinMainWindow::slotSelectionChanged(const KFileItemList& selection) compareFilesAction->setEnabled(false); } -#if defined(QUICK_VIEW) - const bool activeViewHasSelection = (activeViewContainer()->view()->selectedItemsCount() > 0); - actionCollection()->action("quick_view")->setEnabled(activeViewHasSelection); -#endif - m_activeViewContainer->updateStatusBar(); emit selectionChanged(selection); } +void DolphinMainWindow::slotWheelMoved(int wheelDelta) +{ + if (wheelDelta > 0) { + activatePrevTab(); + } else { + activateNextTab(); + } +} + void DolphinMainWindow::slotRequestItemInfo(const KFileItem& item) { emit requestItemInfo(item); @@ -341,7 +362,7 @@ void DolphinMainWindow::openNewTab(const KUrl& url) void DolphinMainWindow::activateNextTab() { - if (m_viewTab.count() == 1 || m_tabBar->count() < 2) { + if ((m_viewTab.count() == 1) || (m_tabBar->count() < 2)) { return; } @@ -351,7 +372,7 @@ void DolphinMainWindow::activateNextTab() void DolphinMainWindow::activatePrevTab() { - if (m_viewTab.count() == 1 || m_tabBar->count() < 2) { + if ((m_viewTab.count() == 1) || (m_tabBar->count() < 2)) { return; } @@ -477,6 +498,35 @@ void DolphinMainWindow::slotUndoAvailable(bool available) } } +void DolphinMainWindow::restoreClosedTab(QAction* action) +{ + if (action->data().toBool()) { + // clear all actions except the "Empty Recently Closed Tabs" + // action and the separator + QList actions = m_recentTabsMenu->menu()->actions(); + const int count = actions.size(); + for (int i = 2; i < count; i++) { + m_recentTabsMenu->menu()->removeAction(actions.at(i)); + } + } else { + const ClosedTab closedTab = action->data().value(); + openNewTab(closedTab.primaryUrl); + m_tabBar->setCurrentIndex(m_viewTab.count() - 1); + + if (closedTab.isSplit) { + // create secondary view + toggleSplitView(); + m_viewTab[m_tabIndex].secondaryView->setUrl(closedTab.secondaryUrl); + } + + m_recentTabsMenu->removeAction(action); + } + + if (m_recentTabsMenu->menu()->actions().count() == 2) { + m_recentTabsMenu->setEnabled(false); + } +} + void DolphinMainWindow::slotUndoTextChanged(const QString& text) { QAction* undoAction = actionCollection()->action(KStandardAction::name(KStandardAction::Undo)); @@ -682,18 +732,6 @@ 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(); @@ -703,7 +741,8 @@ void DolphinMainWindow::toggleShowMenuBar() void DolphinMainWindow::editSettings() { if (m_settingsDialog == 0) { - m_settingsDialog = new DolphinSettingsDialog(this); + const KUrl& url = activeViewContainer()->url(); + m_settingsDialog = new DolphinSettingsDialog(url, this); m_settingsDialog->setAttribute(Qt::WA_DeleteOnClose); m_settingsDialog->show(); } else { @@ -755,7 +794,7 @@ void DolphinMainWindow::closeTab(int index) Q_ASSERT(index >= 0); Q_ASSERT(index < m_viewTab.count()); if (m_viewTab.count() == 1) { - // the last tab may never get closed + // the last tab may never get closed return; } @@ -764,6 +803,7 @@ void DolphinMainWindow::closeTab(int index) // previous tab before closing the tab. m_tabBar->setCurrentIndex((index > 0) ? index - 1 : 1); } + rememberClosedTab(index); // delete tab m_viewTab[index].primaryView->deleteLater(); @@ -839,6 +879,11 @@ void DolphinMainWindow::slotTestCanDecode(const QDragMoveEvent* event, bool& can canDecode = KUrl::List::canDecode(event->mimeData()); } +void DolphinMainWindow::searchItems(const KUrl& url) +{ + m_activeViewContainer->setUrl(url); +} + void DolphinMainWindow::init() { DolphinSettings& settings = DolphinSettings::instance(); @@ -874,10 +919,11 @@ void DolphinMainWindow::init() m_actionHandler->setCurrentView(view); m_tabBar = new KTabBar(this); - m_tabBar->setCloseButtonEnabled(true); + m_tabBar->setMovable(true); + m_tabBar->setTabsClosable(true); connect(m_tabBar, SIGNAL(currentChanged(int)), this, SLOT(setActiveTab(int))); - connect(m_tabBar, SIGNAL(closeRequest(int)), + connect(m_tabBar, SIGNAL(tabCloseRequested(int)), this, SLOT(closeTab(int))); connect(m_tabBar, SIGNAL(contextMenu(int, const QPoint&)), this, SLOT(openTabContextMenu(int, const QPoint&))); @@ -885,6 +931,11 @@ void DolphinMainWindow::init() this, SLOT(openNewTab())); connect(m_tabBar, SIGNAL(testCanDecode(const QDragMoveEvent*, bool&)), this, SLOT(slotTestCanDecode(const QDragMoveEvent*, bool&))); + connect(m_tabBar, SIGNAL(wheelDelta(int)), + this, SLOT(slotWheelMoved(int))); + connect(m_tabBar, SIGNAL(mouseMiddleClick(int)), + this, SLOT(closeTab(int))); + m_tabBar->blockSignals(true); // signals get unblocked after at least 2 tabs are open QWidget* centralWidget = new QWidget(this); @@ -900,6 +951,9 @@ void DolphinMainWindow::init() setupGUI(Keys | Save | Create | ToolBar); + m_searchBox->setParent(toolBar("searchToolBar")); + m_searchBox->show(); + stateChanged("new_file"); QClipboard* clipboard = QApplication::clipboard(); @@ -978,10 +1032,10 @@ void DolphinMainWindow::setupActions() KAction* newTab = actionCollection()->addAction("new_tab"); newTab->setIcon(KIcon("tab-new")); newTab->setText(i18nc("@action:inmenu File", "New Tab")); - newTab->setShortcut(KShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_N, Qt::CTRL | Qt::Key_T)); + newTab->setShortcut(KShortcut(Qt::CTRL | Qt::Key_T, Qt::CTRL | Qt::SHIFT | Qt::Key_N)); connect(newTab, SIGNAL(triggered()), this, SLOT(openNewTab())); - QAction* closeTab = actionCollection()->addAction("close_tab"); + KAction* closeTab = actionCollection()->addAction("close_tab"); closeTab->setIcon(KIcon("tab-close")); closeTab->setText(i18nc("@action:inmenu File", "Close Tab")); closeTab->setShortcut(Qt::CTRL | Qt::Key_W); @@ -1049,11 +1103,29 @@ void DolphinMainWindow::setupActions() backShortcut.setAlternate(Qt::Key_Backspace); backAction->setShortcut(backShortcut); + m_recentTabsMenu = new KActionMenu(i18n("&Recently Closed Tabs"), this); + m_recentTabsMenu->setIcon(KIcon("edit-undo")); + actionCollection()->addAction("closed_tabs", m_recentTabsMenu); + connect(m_recentTabsMenu->menu(), SIGNAL(triggered(QAction *)), + this, SLOT(restoreClosedTab(QAction *))); + + QAction* action = new QAction("&Empty Recently Closed Tabs", m_recentTabsMenu); + action->setIcon(KIcon("edit-clear-list")); + action->setData(QVariant::fromValue(true)); + m_recentTabsMenu->addAction(action); + m_recentTabsMenu->addSeparator(); + m_recentTabsMenu->setEnabled(false); + KStandardAction::forward(this, SLOT(goForward()), actionCollection()); KStandardAction::up(this, SLOT(goUp()), actionCollection()); KStandardAction::home(this, SLOT(goHome()), actionCollection()); // setup 'Tools' menu + KToggleAction* showSearchBar = actionCollection()->add("show_search_bar"); + showSearchBar->setText(i18nc("@action:inmenu Tools", "Show Search Bar")); + showSearchBar->setShortcut(Qt::CTRL | Qt::Key_S); + connect(showSearchBar, SIGNAL(triggered(bool)), this, SLOT(toggleFilterBarVisibility(bool))); + KToggleAction* showFilterBar = actionCollection()->add("show_filter_bar"); showFilterBar->setText(i18nc("@action:inmenu Tools", "Show Filter Bar")); showFilterBar->setShortcut(Qt::CTRL | Qt::Key_I); @@ -1065,16 +1137,6 @@ void DolphinMainWindow::setupActions() compareFiles->setEnabled(false); connect(compareFiles, SIGNAL(triggered()), this, SLOT(compareFiles())); - // disabled Quick View -#if defined(QUICK_VIEW) - KAction* quickView = actionCollection()->addAction("quick_view"); - quickView->setText(i18nc("@action:inmenu Tools", "Quick View")); - quickView->setIcon(KIcon("view-preview")); - quickView->setShortcut(Qt::CTRL + Qt::Key_Return); - quickView->setEnabled(false); - connect(quickView, SIGNAL(triggered()), this, SLOT(quickView())); -#endif - // setup 'Settings' menu m_showMenuBar = KStandardAction::showMenubar(this, SLOT(toggleShowMenuBar()), actionCollection()); KStandardAction::preferences(this, SLOT(editSettings()), actionCollection()); @@ -1102,6 +1164,16 @@ void DolphinMainWindow::setupActions() openInNewWindow->setText(i18nc("@action:inmenu", "Open in New Window")); openInNewWindow->setIcon(KIcon("window-new")); connect(openInNewWindow, SIGNAL(triggered()), this, SLOT(openInNewWindow())); + + // 'Search' toolbar + m_searchBox = new DolphinSearchBox(this); + connect(m_searchBox, SIGNAL(search(KUrl)), this, SLOT(searchItems(KUrl))); + + KAction* search = new KAction(this); + actionCollection()->addAction("search_bar", search); + search->setText(i18nc("@action:inmenu", "Search Bar")); + search->setDefaultWidget(m_searchBox); + search->setShortcutConfigurable(false); } void DolphinMainWindow::setupDockWidgets() @@ -1113,8 +1185,10 @@ void DolphinMainWindow::setupDockWidgets() Panel* infoPanel = new InformationPanel(infoDock); infoDock->setWidget(infoPanel); - infoDock->toggleViewAction()->setText(i18nc("@title:window", "Information")); - infoDock->toggleViewAction()->setShortcut(Qt::Key_F11); + QAction* infoAction = infoDock->toggleViewAction(); + infoAction->setText(i18nc("@title:window", "Information")); + infoAction->setShortcut(Qt::Key_F11); + infoAction->setIcon(KIcon("dialog-information")); actionCollection()->addAction("show_info_panel", infoDock->toggleViewAction()); addDockWidget(Qt::RightDockWidgetArea, infoDock); @@ -1125,15 +1199,17 @@ void DolphinMainWindow::setupDockWidgets() connect(this, SIGNAL(requestItemInfo(KFileItem)), infoPanel, SLOT(requestDelayedItemInfo(KFileItem))); - // setup "Tree View" + // setup "Folders" QDockWidget* foldersDock = new QDockWidget(i18nc("@title:window", "Folders")); foldersDock->setObjectName("foldersDock"); foldersDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); FoldersPanel* foldersPanel = new FoldersPanel(foldersDock); foldersDock->setWidget(foldersPanel); - foldersDock->toggleViewAction()->setText(i18nc("@title:window", "Folders")); - foldersDock->toggleViewAction()->setShortcut(Qt::Key_F7); + QAction* foldersAction = foldersDock->toggleViewAction(); + foldersAction->setText(i18nc("@title:window", "Folders")); + foldersAction->setShortcut(Qt::Key_F7); + foldersAction->setIcon(KIcon("folder")); actionCollection()->addAction("show_folders_panel", foldersDock->toggleViewAction()); addDockWidget(Qt::LeftDockWidgetArea, foldersDock); @@ -1154,8 +1230,10 @@ void DolphinMainWindow::setupDockWidgets() connect(terminalPanel, SIGNAL(hideTerminalPanel()), terminalDock, SLOT(hide())); - terminalDock->toggleViewAction()->setText(i18nc("@title:window Shell terminal", "Terminal")); - terminalDock->toggleViewAction()->setShortcut(Qt::Key_F4); + QAction* terminalAction = terminalDock->toggleViewAction(); + terminalAction->setText(i18nc("@title:window Shell terminal", "Terminal")); + terminalAction->setShortcut(Qt::Key_F4); + terminalAction->setIcon(KIcon("terminal")); actionCollection()->addAction("show_terminal_panel", terminalDock->toggleViewAction()); addDockWidget(Qt::BottomDockWidgetArea, terminalDock); @@ -1180,8 +1258,10 @@ void DolphinMainWindow::setupDockWidgets() placesPanel->setModel(DolphinSettings::instance().placesModel()); placesPanel->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - placesDock->toggleViewAction()->setText(i18nc("@title:window", "Places")); - placesDock->toggleViewAction()->setShortcut(Qt::Key_F9); + QAction* placesAction = placesDock->toggleViewAction(); + placesAction->setText(i18nc("@title:window", "Places")); + placesAction->setShortcut(Qt::Key_F9); + placesAction->setIcon(KIcon("bookmarks")); actionCollection()->addAction("show_places_panel", placesDock->toggleViewAction()); addDockWidget(Qt::LeftDockWidgetArea, placesDock); @@ -1239,6 +1319,38 @@ void DolphinMainWindow::updateGoActions() goUpAction->setEnabled(currentUrl.upUrl() != currentUrl); } +void DolphinMainWindow::rememberClosedTab(int index) +{ + KMenu* tabsMenu = m_recentTabsMenu->menu(); + + const QString primaryPath = m_viewTab[index].primaryView->url().path(); + const QString iconName = KMimeType::iconNameForUrl(primaryPath); + + QAction* action = new QAction(primaryPath, tabsMenu); + + ClosedTab closedTab; + closedTab.primaryUrl = m_viewTab[index].primaryView->url(); + + if (m_viewTab[index].secondaryView != 0) { + closedTab.secondaryUrl = m_viewTab[index].secondaryView->url(); + closedTab.isSplit = true; + } else { + closedTab.isSplit = false; + } + + action->setData(QVariant::fromValue(closedTab)); + action->setIcon(KIcon(iconName)); + + // add the closed tab menu entry after the separator and + // "Empty Recently Closed Tabs" entry + if (tabsMenu->actions().size() == 2) { + tabsMenu->addAction(action); + } else { + tabsMenu->insertAction(tabsMenu->actions().at(2), action); + } + actionCollection()->action("closed_tabs")->setEnabled(true); +} + void DolphinMainWindow::clearStatusBar() { m_activeViewContainer->statusBar()->clear(); @@ -1294,6 +1406,10 @@ QString DolphinMainWindow::tabName(const KUrl& url) const name = url.fileName(); if (name.isEmpty()) { name = url.protocol(); + } else { + // Make sure that a '&' inside the directory name is displayed correctly + // and not misinterpreted as a keyboard shortcut in QTabBar::setTabText() + name.replace('&', "&&"); } } return name;