X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/3c1c185400a55103cea3ed567de167df87b59945..c8a2db7d4e79422ee3301e855ac5f6bb0a09e710:/src/dolphinmainwindow.cpp diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index a7cbc527a..7c9001b68 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006 by Peter Penz * + * Copyright (C) 2006 by Peter Penz * * Copyright (C) 2006 by Stefan Monov * * Copyright (C) 2006 by Cvetoslav Ludmiloff * * * @@ -21,205 +21,320 @@ #include "dolphinmainwindow.h" -#include - #include "dolphinapplication.h" -#include "dolphinnewmenu.h" -#include "dolphinsettings.h" -#include "dolphinsettingsdialog.h" -#include "dolphinstatusbar.h" +#include "dolphindockwidget.h" +#include "dolphincontextmenu.h" +#include "dolphinnewfilemenu.h" #include "dolphinviewcontainer.h" -#include "infosidebarpage.h" -#include "metadatawidget.h" -#include "mainwindowadaptor.h" -#include "terminalsidebarpage.h" -#include "treeviewsidebarpage.h" -#include "kurlnavigator.h" -#include "viewpropertiesdialog.h" -#include "viewproperties.h" -#include "kfileplacesmodel.h" -#include "kfileplacesview.h" +#include "panels/folders/folderspanel.h" +#include "panels/places/placespanel.h" +#include "panels/information/informationpanel.h" +#include "settings/dolphinsettingsdialog.h" +#include "statusbar/dolphinstatusbar.h" +#include "views/dolphinviewactionhandler.h" +#include "views/dolphinremoteencoding.h" +#include "views/draganddrophelper.h" +#include "views/viewproperties.h" +#include "views/dolphinnewfilemenuobserver.h" + +#ifndef Q_OS_WIN +#include "panels/terminal/terminalpanel.h" +#endif #include "dolphin_generalsettings.h" -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include -#include - -#include -#include -#include -#include - -DolphinMainWindow::DolphinMainWindow(int id) : +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +namespace { + // Used for GeneralSettings::version() to determine whether + // an updated version of Dolphin is running. + const int CurrentDolphinVersion = 200; +}; + +/* + * 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() : KXmlGuiWindow(0), - m_newMenu(0), - m_splitter(0), + m_newFileMenu(0), + m_tabBar(0), m_activeViewContainer(0), - m_id(id) -{ - setObjectName("Dolphin"); - m_viewContainer[PrimaryView] = 0; - m_viewContainer[SecondaryView] = 0; + m_centralWidgetLayout(0), + m_tabIndex(0), + m_viewTab(), + m_actionHandler(0), + m_remoteEncoding(0), + m_settingsDialog(), + m_controlButton(0), + m_updateToolBarTimer(0), + m_lastHandleUrlStatJob(0) +{ + setObjectName("Dolphin#"); + + m_viewTab.append(ViewTab()); + ViewTab& viewTab = m_viewTab[m_tabIndex]; + viewTab.wasActive = true; // The first opened tab is automatically active + + connect(&DolphinNewFileMenuObserver::instance(), &DolphinNewFileMenuObserver::errorMessage, + this, &DolphinMainWindow::showErrorMessage); + + KIO::FileUndoManager* undoManager = KIO::FileUndoManager::self(); + undoManager->setUiInterface(new UndoUiInterface()); + + connect(undoManager, static_cast(&KIO::FileUndoManager::undoAvailable), + this, &DolphinMainWindow::slotUndoAvailable); + connect(undoManager, &KIO::FileUndoManager::undoTextChanged, + this, &DolphinMainWindow::slotUndoTextChanged); + connect(undoManager, &KIO::FileUndoManager::jobRecordingStarted, + this, &DolphinMainWindow::clearStatusBar); + connect(undoManager, &KIO::FileUndoManager::jobRecordingFinished, + this, &DolphinMainWindow::showCommand); + + GeneralSettings* generalSettings = GeneralSettings::self(); + const bool firstRun = (generalSettings->version() < 200); + if (firstRun) { + generalSettings->setViewPropsTimestamp(QDateTime::currentDateTime()); + } + + setAcceptDrops(true); - new MainWindowAdaptor(this); - QDBusConnection::sessionBus().registerObject(QString("/dolphin/MainWindow%1").arg(m_id), this); + viewTab.splitter = new QSplitter(this); + viewTab.splitter->setChildrenCollapsible(false); - KonqUndoManager::incRef(); + setupActions(); + + const KUrl homeUrl(generalSettings->homeUrl()); + setUrlAsCaption(homeUrl); + m_actionHandler = new DolphinViewActionHandler(actionCollection(), this); + connect(m_actionHandler, &DolphinViewActionHandler::actionBeingHandled, this, &DolphinMainWindow::clearStatusBar); + connect(m_actionHandler, &DolphinViewActionHandler::createDirectory, this, &DolphinMainWindow::createDirectory); + + viewTab.primaryView = createViewContainer(homeUrl, viewTab.splitter); + + m_activeViewContainer = viewTab.primaryView; + connectViewSignals(m_activeViewContainer); + DolphinView* view = m_activeViewContainer->view(); + m_activeViewContainer->show(); + m_actionHandler->setCurrentView(view); + + m_remoteEncoding = new DolphinRemoteEncoding(this, m_actionHandler); + connect(this, &DolphinMainWindow::urlChanged, + m_remoteEncoding, &DolphinRemoteEncoding::slotAboutToOpenUrl); + + m_tabBar = new KTabBar(this); + m_tabBar->setMovable(true); + m_tabBar->setTabsClosable(true); + connect(m_tabBar, &KTabBar::currentChanged, + this, &DolphinMainWindow::setActiveTab); + connect(m_tabBar, &KTabBar::tabCloseRequested, + this, static_cast(&DolphinMainWindow::closeTab)); + connect(m_tabBar, &KTabBar::contextMenu, + this, &DolphinMainWindow::openTabContextMenu); + connect(m_tabBar, &KTabBar::newTabRequest, + this, static_cast(&DolphinMainWindow::openNewTab)); + connect(m_tabBar, &KTabBar::testCanDecode, + this, &DolphinMainWindow::slotTestCanDecode); + connect(m_tabBar, &KTabBar::mouseMiddleClick, + this, static_cast(&DolphinMainWindow::closeTab)); + connect(m_tabBar, &KTabBar::tabMoved, + this, &DolphinMainWindow::slotTabMoved); + connect(m_tabBar, &KTabBar::receivedDropEvent, + this, &DolphinMainWindow::tabDropEvent); + + m_tabBar->blockSignals(true); // signals get unblocked after at least 2 tabs are open + + QWidget* centralWidget = new QWidget(this); + m_centralWidgetLayout = new QVBoxLayout(centralWidget); + m_centralWidgetLayout->setSpacing(0); + m_centralWidgetLayout->setMargin(0); + m_centralWidgetLayout->addWidget(m_tabBar); + m_centralWidgetLayout->addWidget(viewTab.splitter, 1); + + setCentralWidget(centralWidget); + setupDockWidgets(); + emit urlChanged(homeUrl); - KonqUndoManager* undoManager = KonqUndoManager::self(); - undoManager->setUiInterface(new UndoUiInterface(this)); + setupGUI(Keys | Save | Create | ToolBar); + stateChanged("new_file"); - connect(undoManager, SIGNAL(undoAvailable(bool)), - this, SLOT(slotUndoAvailable(bool))); - connect(undoManager, SIGNAL(undoTextChanged(const QString&)), - this, SLOT(slotUndoTextChanged(const QString&))); - connect(DolphinSettings::instance().placesModel(), SIGNAL(errorMessage(const QString&)), - this, SLOT(slotHandlePlacesError(const QString&))); + QClipboard* clipboard = QApplication::clipboard(); + connect(clipboard, &QClipboard::dataChanged, + this, &DolphinMainWindow::updatePasteAction); + + if (generalSettings->splitView()) { + toggleSplitView(); + } + updateEditActions(); + updatePasteAction(); + updateViewActions(); + updateGoActions(); + + QAction* showFilterBarAction = actionCollection()->action("show_filter_bar"); + showFilterBarAction->setChecked(generalSettings->filterBar()); + + if (firstRun) { + menuBar()->setVisible(false); + // Assure a proper default size if Dolphin runs the first time + resize(750, 500); + } + + const bool showMenu = !menuBar()->isHidden(); + QAction* showMenuBarAction = actionCollection()->action(KStandardAction::name(KStandardAction::ShowMenubar)); + showMenuBarAction->setChecked(showMenu); // workaround for bug #171080 + if (!showMenu) { + createControlButton(); + } } DolphinMainWindow::~DolphinMainWindow() { - KonqUndoManager::decRef(); - DolphinApplication::app()->removeMainWindow(this); } -void DolphinMainWindow::toggleViews() +void DolphinMainWindow::openDirectories(const QList& dirs) { - if (m_viewContainer[SecondaryView] == 0) { + if (dirs.isEmpty()) { return; } - // move secondary view from the last position of the splitter - // to the first position - m_splitter->insertWidget(0, m_viewContainer[SecondaryView]); - - DolphinViewContainer* container = m_viewContainer[PrimaryView]; - m_viewContainer[PrimaryView] = m_viewContainer[SecondaryView]; - m_viewContainer[SecondaryView] = container; -} + if (dirs.count() == 1) { + m_activeViewContainer->setUrl(dirs.first()); + return; + } -void DolphinMainWindow::rename(const KUrl& oldUrl, const KUrl& newUrl) -{ - clearStatusBar(); - KonqOperations::rename(this, oldUrl, newUrl); - m_undoCommandTypes.append(KonqUndoManager::RENAME); -} + const int oldOpenTabsCount = m_viewTab.count(); -void DolphinMainWindow::refreshViews() -{ - Q_ASSERT(m_viewContainer[PrimaryView] != 0); + const bool hasSplitView = GeneralSettings::splitView(); - // remember the current active view, as because of - // the refreshing the active view might change to - // the secondary view - DolphinViewContainer* activeViewContainer = m_activeViewContainer; + // Open each directory inside a new tab. If the "split view" option has been enabled, + // always show two directories within one tab. + QList::const_iterator it = dirs.constBegin(); + while (it != dirs.constEnd()) { + openNewTab(*it); + ++it; - m_viewContainer[PrimaryView]->view()->refresh(); - if (m_viewContainer[SecondaryView] != 0) { - m_viewContainer[SecondaryView]->view()->refresh(); + if (hasSplitView && (it != dirs.constEnd())) { + const int tabIndex = m_viewTab.count() - 1; + m_viewTab[tabIndex].secondaryView->setUrl(*it); + ++it; + } } - setActiveViewContainer(activeViewContainer); + // Remove the previously opened tabs + for (int i = 0; i < oldOpenTabsCount; ++i) { + closeTab(0); + } } -void DolphinMainWindow::dropUrls(const KUrl::List& urls, - const KUrl& destination) +void DolphinMainWindow::openFiles(const QList& files) { - kDebug() << "Source" << urls; - kDebug() << "Destination:" << destination; + if (files.isEmpty()) { + return; + } - Qt::DropAction action = Qt::CopyAction; + // Get all distinct directories from 'files' and open a tab + // for each directory. If the "split view" option is enabled, two + // directories are shown inside one tab (see openDirectories()). + QList dirs; + foreach (const KUrl& url, files) { + const KUrl dir(url.directory()); + if (!dirs.contains(dir)) { + dirs.append(dir); + } + } - Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers(); - const bool shiftPressed = modifier & Qt::ShiftModifier; - const bool controlPressed = modifier & Qt::ControlModifier; - if (shiftPressed && controlPressed) { - // shortcut for 'Link Here' is used - action = Qt::LinkAction; - } else if (shiftPressed) { - // shortcut for 'Move Here' is used - action = Qt::MoveAction; - } else if (controlPressed) { - // shortcut for 'Copy Here' is used - action = Qt::CopyAction; - } else { - // open a context menu which offers the following actions: - // - Move Here - // - Copy Here - // - Link Here - // - Cancel - - KMenu popup(this); - - QString seq = QKeySequence(Qt::ShiftModifier).toString(); - seq.chop(1); // chop superfluous '+' - QAction* moveAction = popup.addAction(KIcon("goto-page"), - i18nc("@action:inmenu", - "&Move Here\t%1", seq)); - - seq = QKeySequence(Qt::ControlModifier).toString(); - seq.chop(1); - QAction* copyAction = popup.addAction(KIcon("edit-copy"), - i18nc("@action:inmenu", - "&Copy Here\t%1", seq)); - - seq = QKeySequence(Qt::ControlModifier + Qt::ShiftModifier).toString(); - seq.chop(1); - QAction* linkAction = popup.addAction(KIcon("www"), - i18nc("@action:inmenu", - "&Link Here\t%1", seq)); - - popup.addSeparator(); - popup.addAction(KIcon("process-stop"), i18nc("@action:inmenu", "Cancel")); - - QAction* activatedAction = popup.exec(QCursor::pos()); - if (activatedAction == moveAction) { - action = Qt::MoveAction; - } else if (activatedAction == copyAction) { - action = Qt::CopyAction; - } else if (activatedAction == linkAction) { - action = Qt::LinkAction; - } else { - return; + openDirectories(dirs); + + // Select the files. Although the files can be split between several + // tabs, there is no need to split 'files' accordingly, as + // the DolphinView will just ignore invalid selections. + const int tabCount = m_viewTab.count(); + for (int i = 0; i < tabCount; ++i) { + m_viewTab[i].primaryView->view()->markUrlsAsSelected(files); + m_viewTab[i].primaryView->view()->markUrlAsCurrent(files.at(0)); + if (m_viewTab[i].secondaryView) { + m_viewTab[i].secondaryView->view()->markUrlsAsSelected(files); + m_viewTab[i].secondaryView->view()->markUrlAsCurrent(files.at(0)); } } +} - switch (action) { - case Qt::MoveAction: - moveUrls(urls, destination); +void DolphinMainWindow::showCommand(CommandType command) +{ + DolphinStatusBar* statusBar = m_activeViewContainer->statusBar(); + switch (command) { + case KIO::FileUndoManager::Copy: + statusBar->setText(i18nc("@info:status", "Successfully copied.")); break; - - case Qt::CopyAction: - copyUrls(urls, destination); + case KIO::FileUndoManager::Move: + statusBar->setText(i18nc("@info:status", "Successfully moved.")); + break; + case KIO::FileUndoManager::Link: + statusBar->setText(i18nc("@info:status", "Successfully linked.")); + break; + case KIO::FileUndoManager::Trash: + statusBar->setText(i18nc("@info:status", "Successfully moved to trash.")); + break; + case KIO::FileUndoManager::Rename: + statusBar->setText(i18nc("@info:status", "Successfully renamed.")); break; - case Qt::LinkAction: - linkUrls(urls, destination); + case KIO::FileUndoManager::Mkdir: + statusBar->setText(i18nc("@info:status", "Created folder.")); break; default: @@ -227,361 +342,440 @@ void DolphinMainWindow::dropUrls(const KUrl::List& urls, } } +void DolphinMainWindow::pasteIntoFolder() +{ + m_activeViewContainer->view()->pasteIntoFolder(); +} + void DolphinMainWindow::changeUrl(const KUrl& url) { + if (!KProtocolManager::supportsListing(url)) { + // The URL navigator only checks for validity, not + // if the URL can be listed. An error message is + // shown due to DolphinViewContainer::restoreView(). + return; + } + DolphinViewContainer* view = activeViewContainer(); - if (view != 0) { + if (view) { view->setUrl(url); updateEditActions(); + updatePasteAction(); updateViewActions(); updateGoActions(); - setCaption(url.fileName()); + setUrlAsCaption(url); + if (m_viewTab.count() > 1) { + m_tabBar->setTabText(m_tabIndex, squeezedText(tabName(m_activeViewContainer->url()))); + } + const QString iconName = KIO::iconNameForUrl(url); + m_tabBar->setTabIcon(m_tabIndex, QIcon::fromTheme(iconName)); emit urlChanged(url); } } -void DolphinMainWindow::changeSelection(const KFileItemList& selection) +void DolphinMainWindow::slotTerminalDirectoryChanged(const KUrl& url) { - activeViewContainer()->view()->changeSelection(selection); + m_activeViewContainer->setAutoGrabFocus(false); + changeUrl(url); + m_activeViewContainer->setAutoGrabFocus(true); } -void DolphinMainWindow::slotViewModeChanged() +void DolphinMainWindow::slotEditableStateChanged(bool editable) { - updateViewActions(); + KToggleAction* editableLocationAction = + static_cast(actionCollection()->action("editable_location")); + editableLocationAction->setChecked(editable); } -void DolphinMainWindow::slotShowPreviewChanged() +void DolphinMainWindow::slotSelectionChanged(const KFileItemList& selection) { - // It is not enough to update the 'Show Preview' action, also - // the 'Zoom In' and 'Zoom Out' actions must be adapted. - updateViewActions(); -} + updateEditActions(); -void DolphinMainWindow::slotShowHiddenFilesChanged() -{ - KToggleAction* showHiddenFilesAction = - static_cast(actionCollection()->action("show_hidden_files")); - const DolphinView* view = m_activeViewContainer->view(); - showHiddenFilesAction->setChecked(view->showHiddenFiles()); + Q_ASSERT(m_viewTab[m_tabIndex].primaryView); + int selectedUrlsCount = m_viewTab[m_tabIndex].primaryView->view()->selectedItemsCount(); + if (m_viewTab[m_tabIndex].secondaryView) { + selectedUrlsCount += m_viewTab[m_tabIndex].secondaryView->view()->selectedItemsCount(); + } + + QAction* compareFilesAction = actionCollection()->action("compare_files"); + if (selectedUrlsCount == 2) { + compareFilesAction->setEnabled(isKompareInstalled()); + } else { + compareFilesAction->setEnabled(false); + } + + emit selectionChanged(selection); } -void DolphinMainWindow::slotCategorizedSortingChanged() +void DolphinMainWindow::slotRequestItemInfo(const KFileItem& item) { - KToggleAction* showInGroupsAction = - static_cast(actionCollection()->action("show_in_groups")); - const DolphinView* view = m_activeViewContainer->view(); - showInGroupsAction->setChecked(view->categorizedSorting()); - showInGroupsAction->setEnabled(view->supportsCategorizedSorting()); + emit requestItemInfo(item); } -void DolphinMainWindow::slotSortingChanged(DolphinView::Sorting sorting) +void DolphinMainWindow::updateHistory() { - QAction* action = 0; - switch (sorting) { - case DolphinView::SortByName: - action = actionCollection()->action("sort_by_name"); - break; - case DolphinView::SortBySize: - action = actionCollection()->action("sort_by_size"); - break; - case DolphinView::SortByDate: - action = actionCollection()->action("sort_by_date"); - break; - case DolphinView::SortByPermissions: - action = actionCollection()->action("sort_by_permissions"); - break; - case DolphinView::SortByOwner: - action = actionCollection()->action("sort_by_owner"); - break; - case DolphinView::SortByGroup: - action = actionCollection()->action("sort_by_group"); - break; - case DolphinView::SortByType: - action = actionCollection()->action("sort_by_type"); - break; -#ifdef HAVE_NEPOMUK - case DolphinView::SortByRating: - action = actionCollection()->action("sort_by_rating"); - break; - case DolphinView::SortByTags: - action = actionCollection()->action("sort_by_tags"); - break; -#endif - default: - break; + const KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator(); + const int index = urlNavigator->historyIndex(); + + QAction* backAction = actionCollection()->action("go_back"); + if (backAction) { + backAction->setToolTip(i18nc("@info", "Go back")); + backAction->setEnabled(index < urlNavigator->historySize() - 1); } - if (action != 0) { - KToggleAction* toggleAction = static_cast(action); - toggleAction->setChecked(true); + QAction* forwardAction = actionCollection()->action("go_forward"); + if (forwardAction) { + forwardAction->setToolTip(i18nc("@info", "Go forward")); + forwardAction->setEnabled(index > 0); } } -void DolphinMainWindow::slotSortOrderChanged(Qt::SortOrder order) +void DolphinMainWindow::updateFilterBarAction(bool show) { - KToggleAction* descending = static_cast(actionCollection()->action("descending")); - const bool sortDescending = (order == Qt::DescendingOrder); - descending->setChecked(sortDescending); + QAction* showFilterBarAction = actionCollection()->action("show_filter_bar"); + showFilterBarAction->setChecked(show); } -void DolphinMainWindow::slotAdditionalInfoChanged(KFileItemDelegate::InformationList list) +void DolphinMainWindow::openNewMainWindow() { - QAction* showMimeInfo = actionCollection()->action("show_mime_info"); - QAction* showSizeInfo = actionCollection()->action("show_size_info"); - QAction* showDateInfo = actionCollection()->action("show_date_info"); + KRun::run("dolphin %u", KUrl::List(), this); +} - showMimeInfo->setChecked(false); - showSizeInfo->setChecked(false); - showDateInfo->setChecked(false); +void DolphinMainWindow::openNewTab() +{ + const bool isUrlEditable = m_activeViewContainer->urlNavigator()->isUrlEditable(); - const DolphinView* view = m_activeViewContainer->view(); - // currently only the icons view supports additional information - const bool enable = (view->mode() == DolphinView::IconsView); - showMimeInfo->setEnabled(enable); - showSizeInfo->setEnabled(enable); - showDateInfo->setEnabled(enable); + openNewTab(m_activeViewContainer->url()); + m_tabBar->setCurrentIndex(m_viewTab.count() - 1); - foreach (KFileItemDelegate::Information info, list) { - switch (info) { - case KFileItemDelegate::FriendlyMimeType: - showMimeInfo->setChecked(true); - break; - case KFileItemDelegate::Size: - showSizeInfo->setChecked(true); - break; - case KFileItemDelegate::ModificationTime: - showDateInfo->setChecked(true); - break; - default: - break; - } + // The URL navigator of the new tab should have the same editable state + // as the current tab + KUrlNavigator* navigator = m_activeViewContainer->urlNavigator(); + navigator->setUrlEditable(isUrlEditable); + + if (isUrlEditable) { + // If a new tab is opened and the URL is editable, assure that + // the user can edit the URL without manually setting the focus + navigator->setFocus(); } } -void DolphinMainWindow::slotSelectionChanged(const KFileItemList& selection) +void DolphinMainWindow::openNewTab(const KUrl& url) { - updateEditActions(); + QWidget* focusWidget = QApplication::focusWidget(); - Q_ASSERT(m_viewContainer[PrimaryView] != 0); - int selectedUrlsCount = m_viewContainer[PrimaryView]->view()->selectedUrls().count(); - if (m_viewContainer[SecondaryView] != 0) { - selectedUrlsCount += m_viewContainer[SecondaryView]->view()->selectedUrls().count(); + if (m_viewTab.count() == 1) { + // Only one view is open currently and hence no tab is shown at + // all. Before creating a tab for 'url', provide a tab for the current URL. + const KUrl currentUrl = m_activeViewContainer->url(); + m_tabBar->addTab(QIcon::fromTheme(KIO::iconNameForUrl(currentUrl)), + squeezedText(tabName(currentUrl))); + m_tabBar->blockSignals(false); } - QAction* compareFilesAction = actionCollection()->action("compare_files"); - compareFilesAction->setEnabled(selectedUrlsCount == 2); + m_tabBar->addTab(QIcon::fromTheme(KIO::iconNameForUrl(url)), + squeezedText(tabName(url))); - m_activeViewContainer->updateStatusBar(); + ViewTab viewTab; + viewTab.splitter = new QSplitter(this); + viewTab.splitter->setChildrenCollapsible(false); + viewTab.primaryView = createViewContainer(url, viewTab.splitter); + viewTab.primaryView->setActive(false); + connectViewSignals(viewTab.primaryView); - emit selectionChanged(selection); + m_viewTab.append(viewTab); + + actionCollection()->action("close_tab")->setEnabled(true); + actionCollection()->action("activate_prev_tab")->setEnabled(true); + actionCollection()->action("activate_next_tab")->setEnabled(true); + + // Provide a split view, if the startup settings are set this way + if (GeneralSettings::splitView()) { + const int newTabIndex = m_viewTab.count() - 1; + createSecondaryView(newTabIndex); + m_viewTab[newTabIndex].secondaryView->setActive(true); + m_viewTab[newTabIndex].isPrimaryViewActive = false; + } + + if (focusWidget) { + // The DolphinViewContainer grabbed the keyboard focus. As the tab is opened + // in background, assure that the previous focused widget gets the focus back. + focusWidget->setFocus(); + } } -void DolphinMainWindow::slotRequestItemInfo(const KFileItem& item) +void DolphinMainWindow::openNewActivatedTab(const KUrl& url) { - emit requestItemInfo(item); + openNewTab(url); + m_tabBar->setCurrentIndex(m_viewTab.count() - 1); } -void DolphinMainWindow::slotHistoryChanged() +void DolphinMainWindow::activateNextTab() { - updateHistory(); + if (m_viewTab.count() >= 2) { + const int tabIndex = (m_tabBar->currentIndex() + 1) % m_tabBar->count(); + m_tabBar->setCurrentIndex(tabIndex); + } } -void DolphinMainWindow::updateFilterBarAction(bool show) +void DolphinMainWindow::activatePrevTab() { - KToggleAction* showFilterBarAction = - static_cast(actionCollection()->action("show_filter_bar")); - showFilterBarAction->setChecked(show); + if (m_viewTab.count() >= 2) { + int tabIndex = m_tabBar->currentIndex() - 1; + if (tabIndex == -1) { + tabIndex = m_tabBar->count() - 1; + } + m_tabBar->setCurrentIndex(tabIndex); + } } -void DolphinMainWindow::openNewMainWindow() +void DolphinMainWindow::openInNewTab() +{ + const KFileItemList& list = m_activeViewContainer->view()->selectedItems(); + if (list.isEmpty()) { + openNewTab(m_activeViewContainer->url()); + } else { + foreach (const KFileItem& item, list) { + const KUrl& url = DolphinView::openItemAsFolderUrl(item); + if (!url.isEmpty()) { + openNewTab(url); + } + } + } +} + +void DolphinMainWindow::openInNewWindow() { - DolphinApplication::app()->createMainWindow()->show(); + KUrl newWindowUrl; + + const KFileItemList list = m_activeViewContainer->view()->selectedItems(); + if (list.isEmpty()) { + newWindowUrl = m_activeViewContainer->url(); + } else if (list.count() == 1) { + const KFileItem& item = list.first(); + newWindowUrl = DolphinView::openItemAsFolderUrl(item); + } + + if (!newWindowUrl.isEmpty()) { + KRun::run("dolphin %u", QList() << newWindowUrl, this); + } } void DolphinMainWindow::toggleActiveView() { - if (m_viewContainer[SecondaryView] == 0) { + if (!m_viewTab[m_tabIndex].secondaryView) { // only one view is available return; } - Q_ASSERT(m_activeViewContainer != 0); - Q_ASSERT(m_viewContainer[PrimaryView] != 0); + Q_ASSERT(m_activeViewContainer); + Q_ASSERT(m_viewTab[m_tabIndex].primaryView); - DolphinViewContainer* left = m_viewContainer[PrimaryView]; - DolphinViewContainer* right = m_viewContainer[SecondaryView]; + DolphinViewContainer* left = m_viewTab[m_tabIndex].primaryView; + DolphinViewContainer* right = m_viewTab[m_tabIndex].secondaryView; setActiveViewContainer(m_activeViewContainer == right ? left : right); } -void DolphinMainWindow::closeEvent(QCloseEvent* event) +void DolphinMainWindow::showEvent(QShowEvent* event) { - DolphinSettings& settings = DolphinSettings::instance(); - GeneralSettings* generalSettings = settings.generalSettings(); - generalSettings->setFirstRun(false); - - settings.save(); - - KXmlGuiWindow::closeEvent(event); + KXmlGuiWindow::showEvent(event); + if (!event->spontaneous()) { + m_activeViewContainer->view()->setFocus(); + } } -void DolphinMainWindow::saveProperties(KConfig* config) +void DolphinMainWindow::closeEvent(QCloseEvent* event) { - KConfigGroup primaryView = config->group("Primary view"); - primaryView.writeEntry("Url", m_viewContainer[PrimaryView]->url().url()); - primaryView.writeEntry("Editable Url", m_viewContainer[PrimaryView]->isUrlEditable()); - if (m_viewContainer[SecondaryView] != 0) { - KConfigGroup secondaryView = config->group("Secondary view"); - secondaryView.writeEntry("Url", m_viewContainer[SecondaryView]->url().url()); - secondaryView.writeEntry("Editable Url", m_viewContainer[SecondaryView]->isUrlEditable()); + // Find out if Dolphin is closed directly by the user or + // by the session manager because the session is closed + bool closedByUser = true; + DolphinApplication *application = qobject_cast(qApp); + if (application && application->sessionSaving()) { + closedByUser = false; } -} -void DolphinMainWindow::readProperties(KConfig* config) -{ - const KConfigGroup primaryViewGroup = config->group("Primary view"); - m_viewContainer[PrimaryView]->setUrl(primaryViewGroup.readEntry("Url")); - bool editable = primaryViewGroup.readEntry("Editable Url", false); - m_viewContainer[PrimaryView]->urlNavigator()->setUrlEditable(editable); + if (m_viewTab.count() > 1 && GeneralSettings::confirmClosingMultipleTabs() && closedByUser) { + // Ask the user if he really wants to quit and close all tabs. + // Open a confirmation dialog with 3 buttons: + // KDialog::Yes -> Quit + // KDialog::No -> Close only the current tab + // KDialog::Cancel -> do nothing + QDialog *dialog = new QDialog(this, Qt::Dialog); + dialog->setWindowTitle(i18nc("@title:window", "Confirmation")); + dialog->setModal(true); + QDialogButtonBox* buttons = new QDialogButtonBox(QDialogButtonBox::Yes | QDialogButtonBox::No | QDialogButtonBox::Cancel); + KGuiItem::assign(buttons->button(QDialogButtonBox::Yes), KStandardGuiItem::quit()); + KGuiItem::assign(buttons->button(QDialogButtonBox::No), KGuiItem(i18n("C&lose Current Tab"), QIcon::fromTheme("tab-close"))); + KGuiItem::assign(buttons->button(QDialogButtonBox::Cancel), KStandardGuiItem::cancel()); + buttons->button(QDialogButtonBox::Yes)->setDefault(true); + + bool doNotAskAgainCheckboxResult = false; + + const int result = KMessageBox::createKMessageBox(dialog, + buttons, + QMessageBox::Warning, + i18n("You have multiple tabs open in this window, are you sure you want to quit?"), + QStringList(), + i18n("Do not ask again"), + &doNotAskAgainCheckboxResult, + KMessageBox::Notify); + + if (doNotAskAgainCheckboxResult) { + GeneralSettings::setConfirmClosingMultipleTabs(false); + } - if (config->hasGroup("Secondary view")) { - const KConfigGroup secondaryViewGroup = config->group("Secondary view"); - if (m_viewContainer[PrimaryView] == 0) { - toggleSplitView(); + switch (result) { + case QDialogButtonBox::Yes: + // Quit + break; + case QDialogButtonBox::No: + // Close only the current tab + closeTab(); + default: + event->ignore(); + return; } - m_viewContainer[PrimaryView]->setUrl(secondaryViewGroup.readEntry("Url")); - editable = secondaryViewGroup.readEntry("Editable Url", false); - m_viewContainer[PrimaryView]->urlNavigator()->setUrlEditable(editable); - } else if (m_viewContainer[SecondaryView] != 0) { - toggleSplitView(); } -} - -void DolphinMainWindow::updateNewMenu() -{ - m_newMenu->slotCheckUpToDate(); - m_newMenu->setPopupFiles(activeViewContainer()->url()); -} -void DolphinMainWindow::rename() -{ - clearStatusBar(); - m_activeViewContainer->renameSelectedItems(); -} + GeneralSettings::setVersion(CurrentDolphinVersion); + GeneralSettings::self()->writeConfig(); -void DolphinMainWindow::moveToTrash() -{ - clearStatusBar(); - const KUrl::List selectedUrls = m_activeViewContainer->view()->selectedUrls(); - KonqOperations::del(this, KonqOperations::TRASH, selectedUrls); - m_undoCommandTypes.append(KonqUndoManager::TRASH); + KXmlGuiWindow::closeEvent(event); } -void DolphinMainWindow::deleteItems() +void DolphinMainWindow::saveProperties(KConfigGroup& group) { - clearStatusBar(); + const int tabCount = m_viewTab.count(); + group.writeEntry("Tab Count", tabCount); + group.writeEntry("Active Tab Index", m_tabBar->currentIndex()); - const KUrl::List list = m_activeViewContainer->view()->selectedUrls(); - const bool del = KonqOperations::askDeleteConfirmation(list, - KonqOperations::DEL, - KonqOperations::DEFAULT_CONFIRMATION, - this); + for (int i = 0; i < tabCount; ++i) { + const DolphinViewContainer* cont = m_viewTab[i].primaryView; + group.writeEntry(tabProperty("Primary URL", i), cont->url().url()); + group.writeEntry(tabProperty("Primary Editable", i), + cont->urlNavigator()->isUrlEditable()); - if (del) { - KIO::Job* job = KIO::del(list); - connect(job, SIGNAL(result(KJob*)), - this, SLOT(slotHandleJobError(KJob*))); - connect(job, SIGNAL(result(KJob*)), - this, SLOT(slotDeleteFileFinished(KJob*))); + cont = m_viewTab[i].secondaryView; + if (cont) { + group.writeEntry(tabProperty("Secondary URL", i), cont->url().url()); + group.writeEntry(tabProperty("Secondary Editable", i), + cont->urlNavigator()->isUrlEditable()); + } } } -void DolphinMainWindow::properties() +void DolphinMainWindow::readProperties(const KConfigGroup& group) { - const KFileItemList list = m_activeViewContainer->view()->selectedItems(); + const int tabCount = group.readEntry("Tab Count", 1); + for (int i = 0; i < tabCount; ++i) { + DolphinViewContainer* cont = m_viewTab[i].primaryView; - KPropertiesDialog dialog(list, this); - dialog.exec(); + cont->setUrl(group.readEntry(tabProperty("Primary URL", i))); + const bool editable = group.readEntry(tabProperty("Primary Editable", i), false); + cont->urlNavigator()->setUrlEditable(editable); + + cont = m_viewTab[i].secondaryView; + const QString secondaryUrl = group.readEntry(tabProperty("Secondary URL", i)); + if (!secondaryUrl.isEmpty()) { + if (!cont) { + // a secondary view should be shown, but no one is available + // currently -> create a new view + toggleSplitView(); + cont = m_viewTab[i].secondaryView; + Q_ASSERT(cont); + } + + // The right view must be activated before the URL is set. Changing + // the URL in the right view will emit the right URL navigator's + // urlChanged(KUrl) signal, which is connected to the changeUrl(KUrl) + // slot. That slot will change the URL in the left view if it is still + // active. See https://bugs.kde.org/show_bug.cgi?id=330047. + setActiveViewContainer(cont); + + cont->setUrl(secondaryUrl); + const bool editable = group.readEntry(tabProperty("Secondary Editable", i), false); + cont->urlNavigator()->setUrlEditable(editable); + } else if (cont) { + // no secondary view should be shown, but the default setting shows + // one already -> close the view + toggleSplitView(); + } + + // openNewTab() needs to be called only tabCount - 1 times + if (i != tabCount - 1) { + openNewTab(); + } + } + + const int index = group.readEntry("Active Tab Index", 0); + m_tabBar->setCurrentIndex(index); } -void DolphinMainWindow::quit() +void DolphinMainWindow::updateNewMenu() { - close(); + m_newFileMenu->setViewShowsHiddenFiles(activeViewContainer()->view()->hiddenFilesShown()); + m_newFileMenu->checkUpToDate(); + m_newFileMenu->setPopupFiles(activeViewContainer()->url()); } -void DolphinMainWindow::slotHandlePlacesError(const QString &message) +void DolphinMainWindow::createDirectory() { - if (!message.isEmpty()) { - DolphinStatusBar* statusBar = m_activeViewContainer->statusBar(); - statusBar->setMessage(message, DolphinStatusBar::Error); - } + m_newFileMenu->setViewShowsHiddenFiles(activeViewContainer()->view()->hiddenFilesShown()); + m_newFileMenu->setPopupFiles(activeViewContainer()->url()); + m_newFileMenu->createDirectory(); } -void DolphinMainWindow::slotHandleJobError(KJob* job) +void DolphinMainWindow::quit() { - if (job->error() != 0) { - DolphinStatusBar* statusBar = m_activeViewContainer->statusBar(); - statusBar->setMessage(job->errorString(), - DolphinStatusBar::Error); - } + close(); } -void DolphinMainWindow::slotDeleteFileFinished(KJob* job) +void DolphinMainWindow::showErrorMessage(const QString& message) { - if (job->error() == 0) { - DolphinStatusBar* statusBar = m_activeViewContainer->statusBar(); - statusBar->setMessage(i18nc("@info:status", "Delete operation completed."), - DolphinStatusBar::OperationCompleted); - } + m_activeViewContainer->showMessage(message, DolphinViewContainer::Error); } void DolphinMainWindow::slotUndoAvailable(bool available) { - QAction* undoAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::Undo)); - if (undoAction != 0) { + QAction* undoAction = actionCollection()->action(KStandardAction::name(KStandardAction::Undo)); + if (undoAction) { undoAction->setEnabled(available); } +} - if (available && (m_undoCommandTypes.count() > 0)) { - const KonqUndoManager::CommandType command = m_undoCommandTypes.takeFirst(); - DolphinStatusBar* statusBar = m_activeViewContainer->statusBar(); - switch (command) { - case KonqUndoManager::COPY: - statusBar->setMessage(i18nc("@info:status", "Copy operation completed."), - DolphinStatusBar::OperationCompleted); - break; - case KonqUndoManager::MOVE: - statusBar->setMessage(i18nc("@info:status", "Move operation completed."), - DolphinStatusBar::OperationCompleted); - break; - case KonqUndoManager::LINK: - statusBar->setMessage(i18nc("@info:status", "Link operation completed."), - DolphinStatusBar::OperationCompleted); - break; - case KonqUndoManager::TRASH: - statusBar->setMessage(i18nc("@info:status", "Move to trash operation completed."), - DolphinStatusBar::OperationCompleted); - break; - case KonqUndoManager::RENAME: - statusBar->setMessage(i18nc("@info:status", "Renaming operation completed."), - DolphinStatusBar::OperationCompleted); - break; - - case KonqUndoManager::MKDIR: - statusBar->setMessage(i18nc("@info:status", "Created folder."), - DolphinStatusBar::OperationCompleted); - break; - - default: - break; +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::stdName(KStandardAction::Undo)); - if (undoAction != 0) { + QAction* undoAction = actionCollection()->action(KStandardAction::name(KStandardAction::Undo)); + if (undoAction) { undoAction->setText(text); } } @@ -589,535 +783,740 @@ void DolphinMainWindow::slotUndoTextChanged(const QString& text) void DolphinMainWindow::undo() { clearStatusBar(); - KonqUndoManager::self()->undo(); + KIO::FileUndoManager::self()->uiInterface()->setParentWidget(this); + KIO::FileUndoManager::self()->undo(); } void DolphinMainWindow::cut() { - QMimeData* mimeData = new QMimeData(); - const KUrl::List kdeUrls = m_activeViewContainer->view()->selectedUrls(); - const KUrl::List mostLocalUrls; - KonqMimeData::populateMimeData(mimeData, kdeUrls, mostLocalUrls, true); - QApplication::clipboard()->setMimeData(mimeData); + m_activeViewContainer->view()->cutSelectedItems(); } void DolphinMainWindow::copy() { - QMimeData* mimeData = new QMimeData(); - const KUrl::List kdeUrls = m_activeViewContainer->view()->selectedUrls(); - const KUrl::List mostLocalUrls; - KonqMimeData::populateMimeData(mimeData, kdeUrls, mostLocalUrls, false); - - QApplication::clipboard()->setMimeData(mimeData); + m_activeViewContainer->view()->copySelectedItems(); } void DolphinMainWindow::paste() { - QClipboard* clipboard = QApplication::clipboard(); - const QMimeData* mimeData = clipboard->mimeData(); + m_activeViewContainer->view()->paste(); +} + +void DolphinMainWindow::find() +{ + m_activeViewContainer->setSearchModeEnabled(true); +} + +void DolphinMainWindow::updatePasteAction() +{ + QAction* pasteAction = actionCollection()->action(KStandardAction::name(KStandardAction::Paste)); + QPair pasteInfo = m_activeViewContainer->view()->pasteInfo(); + pasteAction->setEnabled(pasteInfo.first); + pasteAction->setText(pasteInfo.second); +} +void DolphinMainWindow::selectAll() +{ clearStatusBar(); - const KUrl::List sourceUrls = KUrl::List::fromMimeData(mimeData); - - // per default the pasting is done into the current Url of the view - KUrl destUrl(m_activeViewContainer->url()); - - // check whether the pasting should be done into a selected directory - KUrl::List selectedUrls = m_activeViewContainer->view()->selectedUrls(); - if (selectedUrls.count() == 1) { - const KFileItem fileItem(S_IFDIR, - KFileItem::Unknown, - selectedUrls.first(), - true); - if (fileItem.isDir()) { - // only one item is selected which is a directory, hence paste - // into this directory - destUrl = selectedUrls.first(); - } - } + // if the URL navigator is editable and focused, select the whole + // URL instead of all items of the view - if (KonqMimeData::decodeIsCutSelection(mimeData)) { - moveUrls(sourceUrls, destUrl); - clipboard->clear(); + KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator(); + QLineEdit* lineEdit = urlNavigator->editor()->lineEdit(); // krazy:exclude=qclasses + const bool selectUrl = urlNavigator->isUrlEditable() && + lineEdit->hasFocus(); + if (selectUrl) { + lineEdit->selectAll(); } else { - copyUrls(sourceUrls, destUrl); + m_activeViewContainer->view()->selectAll(); } } -void DolphinMainWindow::updatePasteAction() +void DolphinMainWindow::invertSelection() { - QAction* pasteAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::Paste)); - if (pasteAction == 0) { - return; - } - - QString text(i18nc("@action:inmenu", "Paste")); - QClipboard* clipboard = QApplication::clipboard(); - const QMimeData* mimeData = clipboard->mimeData(); + clearStatusBar(); + m_activeViewContainer->view()->invertSelection(); +} - KUrl::List urls = KUrl::List::fromMimeData(mimeData); - if (!urls.isEmpty()) { - pasteAction->setEnabled(true); +void DolphinMainWindow::toggleSplitView() +{ + if (!m_viewTab[m_tabIndex].secondaryView) { + createSecondaryView(m_tabIndex); + 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; - pasteAction->setText(i18ncp("@action:inmenu", "Paste One File", "Paste %1 Files", urls.count())); + setActiveViewContainer(m_viewTab[m_tabIndex].primaryView); } else { - pasteAction->setEnabled(false); - pasteAction->setText(i18nc("@action:inmenu", "Paste")); - } - - if (pasteAction->isEnabled()) { - KUrl::List urls = m_activeViewContainer->view()->selectedUrls(); - const uint count = urls.count(); - if (count > 1) { - // pasting should not be allowed when more than one file - // is selected - pasteAction->setEnabled(false); - } else if (count == 1) { - // Only one file is selected. Pasting is only allowed if this - // file is a directory. - // TODO: this doesn't work with remote protocols; instead we need a - // m_activeViewContainer->selectedFileItems() to get the real KFileItems - const KFileItem fileItem(S_IFDIR, - KFileItem::Unknown, - urls.first(), - true); - pasteAction->setEnabled(fileItem.isDir()); - } + // 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. + + m_viewTab[m_tabIndex].primaryView->close(); + 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); } + + updateViewActions(); } -void DolphinMainWindow::selectAll() +void DolphinMainWindow::reloadView() { clearStatusBar(); - m_activeViewContainer->view()->selectAll(); + m_activeViewContainer->view()->reload(); } -void DolphinMainWindow::invertSelection() +void DolphinMainWindow::stopLoading() +{ + m_activeViewContainer->view()->stopLoading(); +} + +void DolphinMainWindow::enableStopAction() +{ + actionCollection()->action("stop")->setEnabled(true); +} + +void DolphinMainWindow::disableStopAction() +{ + actionCollection()->action("stop")->setEnabled(false); +} + +void DolphinMainWindow::showFilterBar() +{ + m_activeViewContainer->setFilterBarVisible(true); +} + +void DolphinMainWindow::toggleEditLocation() { clearStatusBar(); - m_activeViewContainer->view()->invertSelection(); + + QAction* action = actionCollection()->action("editable_location"); + KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator(); + urlNavigator->setUrlEditable(action->isChecked()); } -void DolphinMainWindow::setIconsView() + +void DolphinMainWindow::replaceLocation() { - m_activeViewContainer->view()->setMode(DolphinView::IconsView); + KUrlNavigator* navigator = m_activeViewContainer->urlNavigator(); + navigator->setUrlEditable(true); + navigator->setFocus(); + + // select the whole text of the combo box editor + QLineEdit* lineEdit = navigator->editor()->lineEdit(); // krazy:exclude=qclasses + lineEdit->selectAll(); } -void DolphinMainWindow::setDetailsView() +void DolphinMainWindow::togglePanelLockState() { - m_activeViewContainer->view()->setMode(DolphinView::DetailsView); + const bool newLockState = !GeneralSettings::lockPanels(); + foreach (QObject* child, children()) { + DolphinDockWidget* dock = qobject_cast(child); + if (dock) { + dock->setLocked(newLockState); + } + } + + GeneralSettings::setLockPanels(newLockState); } -void DolphinMainWindow::setColumnView() +void DolphinMainWindow::slotPlacesPanelVisibilityChanged(bool visible) { - m_activeViewContainer->view()->setMode(DolphinView::ColumnView); + const int tabCount = m_viewTab.count(); + for (int i = 0; i < tabCount; ++i) { + ViewTab& tab = m_viewTab[i]; + Q_ASSERT(tab.primaryView); + tab.primaryView->urlNavigator()->setPlacesSelectorVisible(!visible); + if (tab.secondaryView) { + tab.secondaryView->urlNavigator()->setPlacesSelectorVisible(!visible); + } + } } -void DolphinMainWindow::sortByName() +void DolphinMainWindow::goBack() { - m_activeViewContainer->view()->setSorting(DolphinView::SortByName); + KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator(); + urlNavigator->goBack(); + + if (urlNavigator->locationState().isEmpty()) { + // An empty location state indicates a redirection URL, + // which must be skipped too + urlNavigator->goBack(); + } } -void DolphinMainWindow::sortBySize() +void DolphinMainWindow::goForward() { - m_activeViewContainer->view()->setSorting(DolphinView::SortBySize); + m_activeViewContainer->urlNavigator()->goForward(); } -void DolphinMainWindow::sortByDate() +void DolphinMainWindow::goUp() { - m_activeViewContainer->view()->setSorting(DolphinView::SortByDate); + m_activeViewContainer->urlNavigator()->goUp(); } -void DolphinMainWindow::sortByPermissions() +void DolphinMainWindow::goHome() { - m_activeViewContainer->view()->setSorting(DolphinView::SortByPermissions); + m_activeViewContainer->urlNavigator()->goHome(); } -void DolphinMainWindow::sortByOwner() +void DolphinMainWindow::goBack(Qt::MouseButtons buttons) { - m_activeViewContainer->view()->setSorting(DolphinView::SortByOwner); + // The default case (left button pressed) is handled in goBack(). + if (buttons == Qt::MidButton) { + KUrlNavigator* urlNavigator = activeViewContainer()->urlNavigator(); + const int index = urlNavigator->historyIndex() + 1; + openNewTab(urlNavigator->locationUrl(index)); + } } -void DolphinMainWindow::sortByGroup() +void DolphinMainWindow::goForward(Qt::MouseButtons buttons) { - m_activeViewContainer->view()->setSorting(DolphinView::SortByGroup); + // The default case (left button pressed) is handled in goForward(). + if (buttons == Qt::MidButton) { + KUrlNavigator* urlNavigator = activeViewContainer()->urlNavigator(); + const int index = urlNavigator->historyIndex() - 1; + openNewTab(urlNavigator->locationUrl(index)); + } } -void DolphinMainWindow::sortByType() +void DolphinMainWindow::goUp(Qt::MouseButtons buttons) { - m_activeViewContainer->view()->setSorting(DolphinView::SortByType); + // The default case (left button pressed) is handled in goUp(). + if (buttons == Qt::MidButton) { + openNewTab(activeViewContainer()->url().upUrl()); + } } -void DolphinMainWindow::sortByRating() +void DolphinMainWindow::goHome(Qt::MouseButtons buttons) { -#ifdef HAVE_NEPOMUK - m_activeViewContainer->view()->setSorting(DolphinView::SortByRating); -#endif + // The default case (left button pressed) is handled in goHome(). + if (buttons == Qt::MidButton) { + openNewTab(GeneralSettings::self()->homeUrl()); + } } -void DolphinMainWindow::sortByTags() +void DolphinMainWindow::compareFiles() { -#ifdef HAVE_NEPOMUK - m_activeViewContainer->view()->setSorting(DolphinView::SortByTags); -#endif + const DolphinViewContainer* primaryViewContainer = m_viewTab[m_tabIndex].primaryView; + Q_ASSERT(primaryViewContainer); + KFileItemList items = primaryViewContainer->view()->selectedItems(); + + const DolphinViewContainer* secondaryViewContainer = m_viewTab[m_tabIndex].secondaryView; + if (secondaryViewContainer) { + items.append(secondaryViewContainer->view()->selectedItems()); + } + + if (items.count() != 2) { + // The action is disabled in this case, but it could have been triggered + // via D-Bus, see https://bugs.kde.org/show_bug.cgi?id=325517 + return; + } + + KUrl urlA = items.at(0).url(); + KUrl urlB = items.at(1).url(); + + QString command("kompare -c \""); + command.append(urlA.pathOrUrl()); + command.append("\" \""); + command.append(urlB.pathOrUrl()); + command.append('\"'); + KRun::runCommand(command, "Kompare", "kompare", this); } -void DolphinMainWindow::toggleSortOrder() +void DolphinMainWindow::toggleShowMenuBar() { - DolphinView* view = m_activeViewContainer->view(); - const Qt::SortOrder order = (view->sortOrder() == Qt::AscendingOrder) ? - Qt::DescendingOrder : - Qt::AscendingOrder; - view->setSortOrder(order); + const bool visible = menuBar()->isVisible(); + menuBar()->setVisible(!visible); + if (visible) { + createControlButton(); + } else { + deleteControlButton(); + } } -void DolphinMainWindow::toggleSortCategorization() +void DolphinMainWindow::openTerminal() { - DolphinView* view = m_activeViewContainer->view(); - const bool categorizedSorting = view->categorizedSorting(); - view->setCategorizedSorting(!categorizedSorting); + QString dir(QDir::homePath()); + + // If the given directory is not local, it can still be the URL of an + // ioslave using UDS_LOCAL_PATH which to be converted first. + KUrl url = KIO::NetAccess::mostLocalUrl(m_activeViewContainer->url(), this); + + //If the URL is local after the above conversion, set the directory. + if (url.isLocalFile()) { + dir = url.toLocalFile(); + } + + KToolInvocation::invokeTerminal(QString(), dir); } -void DolphinMainWindow::toggleMimeInfo() +void DolphinMainWindow::editSettings() { - toggleAdditionalInfo("show_mime_info", KFileItemDelegate::FriendlyMimeType); + if (!m_settingsDialog) { + DolphinViewContainer* container = activeViewContainer(); + container->view()->writeSettings(); + + const KUrl url = container->url(); + DolphinSettingsDialog* settingsDialog = new DolphinSettingsDialog(url, this); + connect(settingsDialog, &DolphinSettingsDialog::settingsChanged, this, &DolphinMainWindow::refreshViews); + settingsDialog->setAttribute(Qt::WA_DeleteOnClose); + settingsDialog->show(); + m_settingsDialog = settingsDialog; + } else { + m_settingsDialog.data()->raise(); + } } -void DolphinMainWindow::toggleSizeInfo() +void DolphinMainWindow::setActiveTab(int index) { - toggleAdditionalInfo("show_size_info", KFileItemDelegate::Size); + Q_ASSERT(index >= 0); + Q_ASSERT(index < m_viewTab.count()); + if (index == m_tabIndex) { + return; + } + + // hide current tab content + ViewTab& hiddenTab = m_viewTab[m_tabIndex]; + hiddenTab.isPrimaryViewActive = hiddenTab.primaryView->isActive(); + hiddenTab.primaryView->setActive(false); + if (hiddenTab.secondaryView) { + hiddenTab.secondaryView->setActive(false); + } + QSplitter* splitter = m_viewTab[m_tabIndex].splitter; + splitter->hide(); + m_centralWidgetLayout->removeWidget(splitter); + + // show active tab content + m_tabIndex = index; + + ViewTab& viewTab = m_viewTab[index]; + m_centralWidgetLayout->addWidget(viewTab.splitter, 1); + viewTab.primaryView->show(); + if (viewTab.secondaryView) { + viewTab.secondaryView->show(); + } + viewTab.splitter->show(); + + if (!viewTab.wasActive) { + viewTab.wasActive = true; + + // If the tab has not been activated yet the size of the KItemListView is + // undefined and results in an unwanted animation. To prevent this a + // reloading of the directory gets triggered. + viewTab.primaryView->view()->reload(); + if (viewTab.secondaryView) { + viewTab.secondaryView->view()->reload(); + } + } + + setActiveViewContainer(viewTab.isPrimaryViewActive ? viewTab.primaryView : + viewTab.secondaryView); } -void DolphinMainWindow::toggleDateInfo() +void DolphinMainWindow::closeTab() { - toggleAdditionalInfo("show_date_info", KFileItemDelegate::ModificationTime); + closeTab(m_tabBar->currentIndex()); } -void DolphinMainWindow::toggleSplitView() +void DolphinMainWindow::closeTab(int index) { - if (m_viewContainer[SecondaryView] == 0) { - // create a secondary view - const int newWidth = (m_viewContainer[PrimaryView]->width() - m_splitter->handleWidth()) / 2; - - const DolphinView* view = m_viewContainer[PrimaryView]->view(); - m_viewContainer[SecondaryView] = new DolphinViewContainer(this, 0, view->rootUrl()); - connectViewSignals(SecondaryView); - m_splitter->addWidget(m_viewContainer[SecondaryView]); - m_splitter->setSizes(QList() << newWidth << newWidth); - m_viewContainer[SecondaryView]->view()->reload(); - m_viewContainer[SecondaryView]->setActive(false); - m_viewContainer[SecondaryView]->show(); - } else if (m_activeViewContainer == m_viewContainer[PrimaryView]) { - // remove secondary view - m_viewContainer[SecondaryView]->close(); - m_viewContainer[SecondaryView]->deleteLater(); - m_viewContainer[SecondaryView] = 0; - } else { - // The secondary view is active, 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. - m_viewContainer[PrimaryView]->close(); - m_viewContainer[PrimaryView]->deleteLater(); - m_viewContainer[PrimaryView] = m_viewContainer[SecondaryView]; - m_viewContainer[SecondaryView] = 0; + Q_ASSERT(index >= 0); + Q_ASSERT(index < m_viewTab.count()); + if (m_viewTab.count() == 1) { + // the last tab may never get closed + return; } - setActiveViewContainer(m_viewContainer[PrimaryView]); - updateViewActions(); - emit activeViewChanged(); -} + if (index == m_tabIndex) { + // The tab that should be closed is the active tab. Activate the + // previous tab before closing the tab. + m_tabBar->setCurrentIndex((index > 0) ? index - 1 : 1); + } + rememberClosedTab(index); -void DolphinMainWindow::reloadView() -{ - clearStatusBar(); - m_activeViewContainer->view()->reload(); -} + // delete tab + m_viewTab[index].primaryView->deleteLater(); + if (m_viewTab[index].secondaryView) { + m_viewTab[index].secondaryView->deleteLater(); + } + m_viewTab[index].splitter->deleteLater(); + m_viewTab.erase(m_viewTab.begin() + index); -void DolphinMainWindow::stopLoading() -{ -} + m_tabBar->blockSignals(true); + m_tabBar->removeTab(index); -void DolphinMainWindow::togglePreview() -{ - clearStatusBar(); + if (m_tabIndex > index) { + m_tabIndex--; + Q_ASSERT(m_tabIndex >= 0); + } - const KToggleAction* showPreviewAction = - static_cast(actionCollection()->action("show_preview")); - const bool show = showPreviewAction->isChecked(); - m_activeViewContainer->view()->setShowPreview(show); + // if only one tab is left, also remove the tab entry so that + // closing the last tab is not possible + if (m_viewTab.count() == 1) { + m_tabBar->removeTab(0); + actionCollection()->action("close_tab")->setEnabled(false); + actionCollection()->action("activate_prev_tab")->setEnabled(false); + actionCollection()->action("activate_next_tab")->setEnabled(false); + } else { + m_tabBar->blockSignals(false); + } } -void DolphinMainWindow::toggleShowHiddenFiles() +void DolphinMainWindow::openTabContextMenu(int index, const QPoint& pos) { - clearStatusBar(); + KMenu menu(this); - const KToggleAction* showHiddenFilesAction = - static_cast(actionCollection()->action("show_hidden_files")); - const bool show = showHiddenFilesAction->isChecked(); - m_activeViewContainer->view()->setShowHiddenFiles(show); -} + QAction* newTabAction = menu.addAction(QIcon::fromTheme("tab-new"), i18nc("@action:inmenu", "New Tab")); + newTabAction->setShortcut(actionCollection()->action("new_tab")->shortcut()); -void DolphinMainWindow::toggleFilterBarVisibility() -{ - const KToggleAction* showFilterBarAction = - static_cast(actionCollection()->action("show_filter_bar")); - const bool show = showFilterBarAction->isChecked(); - m_activeViewContainer->showFilterBar(show); -} + QAction* detachTabAction = menu.addAction(QIcon::fromTheme("tab-detach"), i18nc("@action:inmenu", "Detach Tab")); -void DolphinMainWindow::zoomIn() -{ - m_activeViewContainer->view()->zoomIn(); - updateViewActions(); -} + QAction* closeOtherTabsAction = menu.addAction(QIcon::fromTheme("tab-close-other"), i18nc("@action:inmenu", "Close Other Tabs")); -void DolphinMainWindow::zoomOut() -{ - m_activeViewContainer->view()->zoomOut(); - updateViewActions(); -} + QAction* closeTabAction = menu.addAction(QIcon::fromTheme("tab-close"), i18nc("@action:inmenu", "Close Tab")); + closeTabAction->setShortcut(actionCollection()->action("close_tab")->shortcut()); + QAction* selectedAction = menu.exec(pos); + if (selectedAction == newTabAction) { + const ViewTab& tab = m_viewTab[index]; + Q_ASSERT(tab.primaryView); + const KUrl url = tab.secondaryView && tab.secondaryView->isActive() ? + tab.secondaryView->url() : tab.primaryView->url(); + openNewTab(url); + m_tabBar->setCurrentIndex(m_viewTab.count() - 1); + } else if (selectedAction == detachTabAction) { + const QString separator(QLatin1Char(' ')); + QString command = QLatin1String("dolphin"); -void DolphinMainWindow::toggleEditLocation() -{ - clearStatusBar(); + const ViewTab& tab = m_viewTab[index]; + Q_ASSERT(tab.primaryView); - KToggleAction* action = static_cast(actionCollection()->action("editable_location")); + command += separator + tab.primaryView->url().url(); + if (tab.secondaryView) { + command += separator + tab.secondaryView->url().url(); + command += separator + QLatin1String("-split"); + } - bool editOrBrowse = action->isChecked(); - KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator(); - urlNavigator->setUrlEditable(editOrBrowse); -} + KRun::runCommand(command, this); -void DolphinMainWindow::editLocation() -{ - m_activeViewContainer->urlNavigator()->setUrlEditable(true); + closeTab(index); + } else if (selectedAction == closeOtherTabsAction) { + const int count = m_tabBar->count(); + for (int i = 0; i < index; ++i) { + closeTab(0); + } + for (int i = index + 1; i < count; ++i) { + closeTab(1); + } + } else if (selectedAction == closeTabAction) { + closeTab(index); + } } -void DolphinMainWindow::adjustViewProperties() +void DolphinMainWindow::slotTabMoved(int from, int to) { - clearStatusBar(); - ViewPropertiesDialog dlg(m_activeViewContainer->view()); - dlg.exec(); + m_viewTab.move(from, to); + m_tabIndex = m_tabBar->currentIndex(); } -void DolphinMainWindow::goBack() +void DolphinMainWindow::slotTestCanDecode(const QDragMoveEvent* event, bool& canDecode) { - clearStatusBar(); - m_activeViewContainer->urlNavigator()->goBack(); + canDecode = KUrl::List::canDecode(event->mimeData()); } -void DolphinMainWindow::goForward() +void DolphinMainWindow::handleUrl(const KUrl& url) { - clearStatusBar(); - m_activeViewContainer->urlNavigator()->goForward(); + delete m_lastHandleUrlStatJob; + m_lastHandleUrlStatJob = 0; + + if (url.isLocalFile() && QFileInfo(url.toLocalFile()).isDir()) { + activeViewContainer()->setUrl(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()) { + KJobWidgets::setWindow(m_lastHandleUrlStatJob, this); + } + connect(m_lastHandleUrlStatJob, &KIO::Job::result, + this, &DolphinMainWindow::slotHandleUrlStatFinished); + + } else { + new KRun(url, this); // Automatically deletes itself after being finished + } } -void DolphinMainWindow::goUp() +void DolphinMainWindow::slotHandleUrlStatFinished(KJob* job) { - clearStatusBar(); - m_activeViewContainer->urlNavigator()->goUp(); + m_lastHandleUrlStatJob = 0; + const KIO::UDSEntry entry = static_cast(job)->statResult(); + const KUrl url = static_cast(job)->url(); + if (entry.isDir()) { + activeViewContainer()->setUrl(url); + } else { + new KRun(url, this); // Automatically deletes itself after being finished + } } -void DolphinMainWindow::goHome() +void DolphinMainWindow::tabDropEvent(int tab, QDropEvent* event) { - clearStatusBar(); - m_activeViewContainer->urlNavigator()->goHome(); + const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData()); + if (!urls.isEmpty() && tab != -1) { + const ViewTab& viewTab = m_viewTab[tab]; + const DolphinView* view = viewTab.isPrimaryViewActive ? viewTab.primaryView->view() + : viewTab.secondaryView->view(); + QString error; + DragAndDropHelper::dropUrls(view->rootItem(), view->url(), event, error); + if (!error.isEmpty()) { + activeViewContainer()->showMessage(error, DolphinViewContainer::Error); + } + } } -void DolphinMainWindow::findFile() +void DolphinMainWindow::slotWriteStateChanged(bool isFolderWritable) { - KRun::run("kfind", m_activeViewContainer->url(), this); + newFileMenu()->setEnabled(isFolderWritable); } -void DolphinMainWindow::compareFiles() +void DolphinMainWindow::openContextMenu(const QPoint& pos, + const KFileItem& item, + const KUrl& url, + const QList& customActions) { - // The method is only invoked if exactly 2 files have - // been selected. The selected files may be: - // - both in the primary view - // - both in the secondary view - // - one in the primary view and the other in the secondary - // view - Q_ASSERT(m_viewContainer[PrimaryView] != 0); - - KUrl urlA; - KUrl urlB; - KUrl::List urls = m_viewContainer[PrimaryView]->view()->selectedUrls(); - - switch (urls.count()) { - case 0: { - Q_ASSERT(m_viewContainer[SecondaryView] != 0); - urls = m_viewContainer[SecondaryView]->view()->selectedUrls(); - Q_ASSERT(urls.count() == 2); - urlA = urls[0]; - urlB = urls[1]; - break; - } + QWeakPointer contextMenu = new DolphinContextMenu(this, pos, item, url); + contextMenu.data()->setCustomActions(customActions); + const DolphinContextMenu::Command command = contextMenu.data()->open(); - case 1: { - urlA = urls[0]; - Q_ASSERT(m_viewContainer[SecondaryView] != 0); - urls = m_viewContainer[SecondaryView]->view()->selectedUrls(); - Q_ASSERT(urls.count() == 1); - urlB = urls[0]; + switch (command) { + case DolphinContextMenu::OpenParentFolderInNewWindow: { + + KRun::run("dolphin %u", QList() << KIO::upUrl(item.url()), this); break; } - case 2: { - urlA = urls[0]; - urlB = urls[1]; + case DolphinContextMenu::OpenParentFolderInNewTab: + openNewTab(KIO::upUrl(item.url())); break; - } - default: { - // may not happen: compareFiles may only get invoked if 2 - // files are selected - Q_ASSERT(false); - } + case DolphinContextMenu::None: + default: + break; } - QString command("kompare -c \""); - command.append(urlA.pathOrUrl()); - command.append("\" \""); - command.append(urlB.pathOrUrl()); - command.append('\"'); - KRun::runCommand(command, "Kompare", "kompare", this); - + delete contextMenu.data(); } -void DolphinMainWindow::editSettings() +void DolphinMainWindow::updateControlMenu() { - DolphinSettingsDialog dialog(this); - dialog.exec(); -} + KMenu* menu = qobject_cast(sender()); + Q_ASSERT(menu); -void DolphinMainWindow::init() -{ - // Check whether Dolphin runs the first time. If yes then - // a proper default window size is given at the end of DolphinMainWindow::init(). - GeneralSettings* generalSettings = DolphinSettings::instance().generalSettings(); - const bool firstRun = generalSettings->firstRun(); - if (firstRun) { - generalSettings->setViewPropsTimestamp(QDateTime::currentDateTime()); - } + // All actions get cleared by KMenu::clear(). The sub-menus are deleted + // by connecting to the aboutToHide() signal from the parent-menu. + menu->clear(); - setAcceptDrops(true); + KActionCollection* ac = actionCollection(); - m_splitter = new QSplitter(this); + // Add "Edit" actions + bool added = addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Undo)), menu) | + addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Find)), menu) | + addActionToMenu(ac->action("select_all"), menu) | + addActionToMenu(ac->action("invert_selection"), menu); - DolphinSettings& settings = DolphinSettings::instance(); + if (added) { + menu->addSeparator(); + } - setupActions(); + // Add "View" actions + if (!GeneralSettings::showZoomSlider()) { + addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ZoomIn)), menu); + addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ZoomOut)), menu); + menu->addSeparator(); + } - const KUrl& homeUrl = settings.generalSettings()->homeUrl(); - setCaption(homeUrl.fileName()); - ViewProperties props(homeUrl); - m_viewContainer[PrimaryView] = new DolphinViewContainer(this, - m_splitter, - homeUrl); + added = addActionToMenu(ac->action("view_mode"), menu) | + addActionToMenu(ac->action("sort"), menu) | + addActionToMenu(ac->action("additional_info"), menu) | + addActionToMenu(ac->action("show_preview"), menu) | + addActionToMenu(ac->action("show_in_groups"), menu) | + addActionToMenu(ac->action("show_hidden_files"), menu); - m_activeViewContainer = m_viewContainer[PrimaryView]; - connectViewSignals(PrimaryView); - m_viewContainer[PrimaryView]->view()->reload(); - m_viewContainer[PrimaryView]->show(); + if (added) { + menu->addSeparator(); + } - setCentralWidget(m_splitter); - setupDockWidgets(); + added = addActionToMenu(ac->action("split_view"), menu) | + addActionToMenu(ac->action("reload"), menu) | + addActionToMenu(ac->action("view_properties"), menu); + if (added) { + menu->addSeparator(); + } - setupGUI(Keys | Save | Create | ToolBar); - createGUI(); + addActionToMenu(ac->action("panels"), menu); + KMenu* locationBarMenu = new KMenu(i18nc("@action:inmenu", "Location Bar"), menu); + locationBarMenu->addAction(ac->action("editable_location")); + locationBarMenu->addAction(ac->action("replace_location")); + menu->addMenu(locationBarMenu); + + menu->addSeparator(); + + // Add "Go" menu + KMenu* goMenu = new KMenu(i18nc("@action:inmenu", "Go"), menu); + connect(menu, &KMenu::aboutToHide, goMenu, &KMenu::deleteLater); + goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Back))); + goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Forward))); + goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Up))); + goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Home))); + goMenu->addAction(ac->action("closed_tabs")); + menu->addMenu(goMenu); + + // Add "Tool" menu + KMenu* toolsMenu = new KMenu(i18nc("@action:inmenu", "Tools"), menu); + connect(menu, &KMenu::aboutToHide, toolsMenu, &KMenu::deleteLater); + toolsMenu->addAction(ac->action("show_filter_bar")); + toolsMenu->addAction(ac->action("compare_files")); + toolsMenu->addAction(ac->action("open_terminal")); + toolsMenu->addAction(ac->action("change_remote_encoding")); + menu->addMenu(toolsMenu); + + // Add "Settings" menu entries + addActionToMenu(ac->action(KStandardAction::name(KStandardAction::KeyBindings)), menu); + addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ConfigureToolbars)), menu); + addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Preferences)), menu); + + // Add "Help" menu + KMenu* helpMenu = new KMenu(i18nc("@action:inmenu", "Help"), menu); + connect(menu, &KMenu::aboutToHide, helpMenu, &KMenu::deleteLater); + helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::HelpContents))); + helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::WhatsThis))); + helpMenu->addSeparator(); + helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::ReportBug))); + helpMenu->addSeparator(); + helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::SwitchApplicationLanguage))); + helpMenu->addSeparator(); + helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::AboutApp))); + helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::AboutKDE))); + menu->addMenu(helpMenu); + + menu->addSeparator(); + addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ShowMenubar)), menu); +} + +void DolphinMainWindow::updateToolBar() +{ + if (!menuBar()->isVisible()) { + createControlButton(); + } +} - stateChanged("new_file"); - setAutoSaveSettings(); +void DolphinMainWindow::slotControlButtonDeleted() +{ + m_controlButton = 0; + m_updateToolBarTimer->start(); +} - QClipboard* clipboard = QApplication::clipboard(); - connect(clipboard, SIGNAL(dataChanged()), - this, SLOT(updatePasteAction())); - updatePasteAction(); - updateGoActions(); +void DolphinMainWindow::slotPanelErrorMessage(const QString& error) +{ + activeViewContainer()->showMessage(error, DolphinViewContainer::Error); +} - if (generalSettings->splitView()) { - toggleSplitView(); - } - updateViewActions(); +void DolphinMainWindow::slotPlaceActivated(const KUrl& url) +{ + DolphinViewContainer* view = activeViewContainer(); - if (firstRun) { - // assure a proper default size if Dolphin runs the first time - resize(700, 500); - } -#ifdef HAVE_NEPOMUK - if (!MetaDataWidget::metaDataAvailable()) { - DolphinStatusBar* statusBar = activeViewContainer()->statusBar(); - statusBar->setMessage(i18nc("@info:status", - "Failed to contact Nepomuk service, annotation and tagging are disabled."), - DolphinStatusBar::Error); + if (view->url() == url) { + // We can end up here if the user clicked a device in the Places Panel + // which had been unmounted earlier, see https://bugs.kde.org/show_bug.cgi?id=161385. + reloadView(); + } else { + changeUrl(url); } -#endif - - emit urlChanged(homeUrl); } -void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* view) +void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* viewContainer) { - Q_ASSERT(view != 0); - Q_ASSERT((view == m_viewContainer[PrimaryView]) || (view == m_viewContainer[SecondaryView])); - if (m_activeViewContainer == view) { + Q_ASSERT(viewContainer); + Q_ASSERT((viewContainer == m_viewTab[m_tabIndex].primaryView) || + (viewContainer == m_viewTab[m_tabIndex].secondaryView)); + if (m_activeViewContainer == viewContainer) { return; } m_activeViewContainer->setActive(false); - m_activeViewContainer = view; + m_activeViewContainer = viewContainer; + + // Activating the view container might trigger a recursive setActiveViewContainer() call + // inside DolphinMainWindow::toggleActiveView() when having a split view. Temporary + // disconnect the activated() signal in this case: + disconnect(m_activeViewContainer->view(), &DolphinView::activated, this, &DolphinMainWindow::toggleActiveView); m_activeViewContainer->setActive(true); + connect(m_activeViewContainer->view(), &DolphinView::activated, this, &DolphinMainWindow::toggleActiveView); + + m_actionHandler->setCurrentView(viewContainer->view()); updateHistory(); updateEditActions(); + updatePasteAction(); updateViewActions(); updateGoActions(); - const KUrl& url = m_activeViewContainer->url(); - setCaption(url.fileName()); + const KUrl url = m_activeViewContainer->url(); + setUrlAsCaption(url); + if (m_viewTab.count() > 1) { + m_tabBar->setTabText(m_tabIndex, tabName(url)); + m_tabBar->setTabIcon(m_tabIndex, QIcon::fromTheme(KIO::iconNameForUrl(url))); + } - emit activeViewChanged(); emit urlChanged(url); } +DolphinViewContainer* DolphinMainWindow::createViewContainer(const KUrl& url, QWidget* parent) +{ + DolphinViewContainer* container = new DolphinViewContainer(url, parent); + + // The places-selector from the URL navigator should only be shown + // if the places dock is invisible + QDockWidget* placesDock = findChild("placesDock"); + container->urlNavigator()->setPlacesSelectorVisible(!placesDock || !placesDock->isVisible()); + + return container; +} + void DolphinMainWindow::setupActions() { // setup 'File' menu - m_newMenu = new DolphinNewMenu(this); - KMenu* menu = m_newMenu->menu(); - menu->setTitle(i18nc("@title:menu", "Create New")); - menu->setIcon(KIcon("document-new")); - connect(menu, SIGNAL(aboutToShow()), - this, SLOT(updateNewMenu())); + m_newFileMenu = new DolphinNewFileMenu(actionCollection(), this); + QMenu* menu = m_newFileMenu->menu(); + menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New")); + menu->setIcon(QIcon::fromTheme("document-new")); + m_newFileMenu->setDelayed(false); + connect(menu, &QMenu::aboutToShow, + this, &DolphinMainWindow::updateNewMenu); QAction* newWindow = actionCollection()->addAction("new_window"); - newWindow->setIcon(KIcon("window-new")); + newWindow->setIcon(QIcon::fromTheme("window-new")); newWindow->setText(i18nc("@action:inmenu File", "New &Window")); newWindow->setShortcut(Qt::CTRL | Qt::Key_N); - connect(newWindow, SIGNAL(triggered()), this, SLOT(openNewMainWindow())); - - QAction* rename = actionCollection()->addAction("rename"); - rename->setText(i18nc("@action:inmenu File", "Rename...")); - rename->setShortcut(Qt::Key_F2); - connect(rename, SIGNAL(triggered()), this, SLOT(rename())); - - QAction* moveToTrash = actionCollection()->addAction("move_to_trash"); - moveToTrash->setText(i18nc("@action:inmenu File", "Move to Trash")); - moveToTrash->setIcon(KIcon("edit-trash")); - moveToTrash->setShortcut(QKeySequence::Delete); - connect(moveToTrash, SIGNAL(triggered()), this, SLOT(moveToTrash())); - - QAction* deleteAction = actionCollection()->addAction("delete"); - deleteAction->setText(i18nc("@action:inmenu File", "Delete")); - deleteAction->setShortcut(Qt::SHIFT | Qt::Key_Delete); - deleteAction->setIcon(KIcon("edit-delete")); - connect(deleteAction, SIGNAL(triggered()), this, SLOT(deleteItems())); - - QAction* 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())); + connect(newWindow, &QAction::triggered, this, &DolphinMainWindow::openNewMainWindow); + + QAction* newTab = actionCollection()->addAction("new_tab"); + newTab->setIcon(QIcon::fromTheme("tab-new")); + newTab->setText(i18nc("@action:inmenu File", "New Tab")); + newTab->setShortcuts(QList() << QKeySequence(Qt::CTRL | Qt::Key_T) << QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_N)); + connect(newTab, &QAction::triggered, this, static_cast(&DolphinMainWindow::openNewTab)); + + QAction* closeTab = actionCollection()->addAction("close_tab"); + closeTab->setIcon(QIcon::fromTheme("tab-close")); + closeTab->setText(i18nc("@action:inmenu File", "Close Tab")); + closeTab->setShortcut(Qt::CTRL | Qt::Key_W); + closeTab->setEnabled(false); + connect(closeTab, &QAction::triggered, this, static_cast(&DolphinMainWindow::closeTab)); KStandardAction::quit(this, SLOT(quit()), actionCollection()); @@ -1126,302 +1525,276 @@ void DolphinMainWindow::setupActions() SLOT(undo()), actionCollection()); - KStandardAction::cut(this, SLOT(cut()), actionCollection()); + // need to remove shift+del from cut action, else the shortcut for deletejob + // doesn't work + QAction* cut = KStandardAction::cut(this, SLOT(cut()), actionCollection()); + auto cutShortcuts = cut->shortcuts(); + cutShortcuts.removeAll(QKeySequence(Qt::SHIFT | Qt::Key_Delete)); + cut->setShortcuts(cutShortcuts); KStandardAction::copy(this, SLOT(copy()), actionCollection()); - KStandardAction::paste(this, SLOT(paste()), actionCollection()); + QAction* paste = KStandardAction::paste(this, SLOT(paste()), actionCollection()); + // The text of the paste-action is modified dynamically by Dolphin + // (e. g. to "Paste One Folder"). To prevent that the size of the toolbar changes + // due to the long text, the text "Paste" is used: + paste->setIconText(i18nc("@action:inmenu Edit", "Paste")); + + KStandardAction::find(this, SLOT(find()), actionCollection()); QAction* selectAll = actionCollection()->addAction("select_all"); selectAll->setText(i18nc("@action:inmenu Edit", "Select All")); - selectAll->setShortcut(Qt::CTRL + Qt::Key_A); - connect(selectAll, SIGNAL(triggered()), this, SLOT(selectAll())); + selectAll->setShortcut(Qt::CTRL | Qt::Key_A); + connect(selectAll, &QAction::triggered, this, &DolphinMainWindow::selectAll); QAction* invertSelection = actionCollection()->addAction("invert_selection"); invertSelection->setText(i18nc("@action:inmenu Edit", "Invert Selection")); invertSelection->setShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_A); - connect(invertSelection, SIGNAL(triggered()), this, SLOT(invertSelection())); + connect(invertSelection, &QAction::triggered, this, &DolphinMainWindow::invertSelection); // setup 'View' menu - KStandardAction::zoomIn(this, - SLOT(zoomIn()), - actionCollection()); - - KStandardAction::zoomOut(this, - SLOT(zoomOut()), - actionCollection()); - - KToggleAction* iconsView = actionCollection()->add("icons"); - iconsView->setText(i18nc("@action:inmenu View Mode", "Icons")); - iconsView->setShortcut(Qt::CTRL | Qt::Key_1); - iconsView->setIcon(KIcon("fileview-icon")); - connect(iconsView, SIGNAL(triggered()), this, SLOT(setIconsView())); - - KToggleAction* detailsView = actionCollection()->add("details"); - detailsView->setText(i18nc("@action:inmenu View Mode", "Details")); - detailsView->setShortcut(Qt::CTRL | Qt::Key_2); - detailsView->setIcon(KIcon("fileview-detailed")); - connect(detailsView, SIGNAL(triggered()), this, SLOT(setDetailsView())); - - KToggleAction* columnView = actionCollection()->add("columns"); - columnView->setText(i18nc("@action:inmenu View Mode", "Columns")); - columnView->setShortcut(Qt::CTRL | Qt::Key_3); - columnView->setIcon(KIcon("fileview-column")); - connect(columnView, SIGNAL(triggered()), this, SLOT(setColumnView())); - - QActionGroup* viewModeGroup = new QActionGroup(this); - viewModeGroup->addAction(iconsView); - viewModeGroup->addAction(detailsView); - viewModeGroup->addAction(columnView); - - KToggleAction* sortByName = actionCollection()->add("sort_by_name"); - sortByName->setText(i18nc("@action:inmenu Sort By", "Name")); - connect(sortByName, SIGNAL(triggered()), this, SLOT(sortByName())); - - KToggleAction* sortBySize = actionCollection()->add("sort_by_size"); - sortBySize->setText(i18nc("@action:inmenu Sort By", "Size")); - connect(sortBySize, SIGNAL(triggered()), this, SLOT(sortBySize())); - - KToggleAction* sortByDate = actionCollection()->add("sort_by_date"); - sortByDate->setText(i18nc("@action:inmenu Sort By", "Date")); - connect(sortByDate, SIGNAL(triggered()), this, SLOT(sortByDate())); - - KToggleAction* sortByPermissions = actionCollection()->add("sort_by_permissions"); - sortByPermissions->setText(i18nc("@action:inmenu Sort By", "Permissions")); - connect(sortByPermissions, SIGNAL(triggered()), this, SLOT(sortByPermissions())); - - KToggleAction* sortByOwner = actionCollection()->add("sort_by_owner"); - sortByOwner->setText(i18nc("@action:inmenu Sort By", "Owner")); - connect(sortByOwner, SIGNAL(triggered()), this, SLOT(sortByOwner())); - - KToggleAction* sortByGroup = actionCollection()->add("sort_by_group"); - sortByGroup->setText(i18nc("@action:inmenu Sort By", "Group")); - connect(sortByGroup, SIGNAL(triggered()), this, SLOT(sortByGroup())); - - KToggleAction* sortByType = actionCollection()->add("sort_by_type"); - sortByType->setText(i18nc("@action:inmenu Sort By", "Type")); - connect(sortByType, SIGNAL(triggered()), this, SLOT(sortByType())); - - KToggleAction* sortByRating = actionCollection()->add("sort_by_rating"); - sortByRating->setText(i18nc("@action:inmenu Sort By", "Rating")); - - KToggleAction* sortByTags = actionCollection()->add("sort_by_tags"); - sortByTags->setText(i18nc("@action:inmenu Sort By", "Tags")); - -#ifdef HAVE_NEPOMUK - if (MetaDataWidget::metaDataAvailable()) { - connect(sortByRating, SIGNAL(triggered()), this, SLOT(sortByRating())); - connect(sortByTags, SIGNAL(triggered()), this, SLOT(sortByTags())); - } - else { - sortByRating->setEnabled(false); - sortByTags->setEnabled(false); - } -#else - sortByRating->setEnabled(false); - sortByTags->setEnabled(false); -#endif - - QActionGroup* sortGroup = new QActionGroup(this); - sortGroup->addAction(sortByName); - sortGroup->addAction(sortBySize); - sortGroup->addAction(sortByDate); - sortGroup->addAction(sortByPermissions); - sortGroup->addAction(sortByOwner); - sortGroup->addAction(sortByGroup); - sortGroup->addAction(sortByType); - sortGroup->addAction(sortByRating); - sortGroup->addAction(sortByTags); - - KToggleAction* sortDescending = actionCollection()->add("descending"); - sortDescending->setText(i18nc("@action:inmenu Sort", "Descending")); - connect(sortDescending, SIGNAL(triggered()), this, SLOT(toggleSortOrder())); - - KToggleAction* showInGroups = actionCollection()->add("show_in_groups"); - showInGroups->setText(i18nc("@action:inmenu View", "Show in Groups")); - connect(showInGroups, SIGNAL(triggered()), this, SLOT(toggleSortCategorization())); - - KToggleAction* showMimeInfo = actionCollection()->add("show_mime_info"); - showMimeInfo->setText(i18nc("@action:inmenu Additional information", "Type")); - connect(showMimeInfo, SIGNAL(triggered()), this, SLOT(toggleMimeInfo())); - - KToggleAction* showSizeInfo = actionCollection()->add("show_size_info"); - showSizeInfo->setText(i18nc("@action:inmenu Additional information", "Size")); - connect(showSizeInfo, SIGNAL(triggered()), this, SLOT(toggleSizeInfo())); - - KToggleAction* showDateInfo = actionCollection()->add("show_date_info"); - showDateInfo->setText(i18nc("@action:inmenu Additional information", "Date")); - connect(showDateInfo, SIGNAL(triggered()), this, SLOT(toggleDateInfo())); - - KToggleAction* showPreview = actionCollection()->add("show_preview"); - showPreview->setText(i18nc("@action:intoolbar", "Preview")); - showPreview->setIcon(KIcon("fileview-preview")); - connect(showPreview, SIGNAL(triggered()), this, SLOT(togglePreview())); - - KToggleAction* showHiddenFiles = actionCollection()->add("show_hidden_files"); - showHiddenFiles->setText(i18nc("@action:inmenu View", "Show Hidden Files")); - showHiddenFiles->setShortcut(Qt::ALT | Qt::Key_Period); - connect(showHiddenFiles, SIGNAL(triggered()), this, SLOT(toggleShowHiddenFiles())); + // (note that most of it is set up in DolphinViewActionHandler) QAction* split = actionCollection()->addAction("split_view"); - split->setShortcut(Qt::Key_F10); + split->setShortcut(Qt::Key_F3); updateSplitAction(); - connect(split, SIGNAL(triggered()), this, SLOT(toggleSplitView())); + connect(split, &QAction::triggered, this, &DolphinMainWindow::toggleSplitView); QAction* reload = actionCollection()->addAction("reload"); reload->setText(i18nc("@action:inmenu View", "Reload")); reload->setShortcut(Qt::Key_F5); - reload->setIcon(KIcon("view-refresh")); - connect(reload, SIGNAL(triggered()), this, SLOT(reloadView())); + reload->setIcon(QIcon::fromTheme("view-refresh")); + connect(reload, &QAction::triggered, this, &DolphinMainWindow::reloadView); QAction* stop = actionCollection()->addAction("stop"); stop->setText(i18nc("@action:inmenu View", "Stop")); - stop->setIcon(KIcon("process-stop")); - connect(stop, SIGNAL(triggered()), this, SLOT(stopLoading())); - - // TODO: the URL navigator must emit a signal if the editable state has been - // changed, so that the corresponding showFullLocation action is updated. Also - // the naming "Show full Location" is currently confusing... - KToggleAction* showFullLocation = actionCollection()->add("editable_location"); - showFullLocation->setText(i18nc("@action:inmenu Navigation Bar", "Show Full Location")); - showFullLocation->setShortcut(Qt::CTRL | Qt::Key_L); - connect(showFullLocation, SIGNAL(triggered()), this, SLOT(toggleEditLocation())); - - QAction* editLocation = actionCollection()->addAction("edit_location"); - editLocation->setText(i18nc("@action:inmenu Navigation Bar", "Edit Location")); - editLocation->setShortcut(Qt::Key_F6); - connect(editLocation, SIGNAL(triggered()), this, SLOT(editLocation())); - - QAction* adjustViewProps = actionCollection()->addAction("view_properties"); - adjustViewProps->setText(i18nc("@action:inmenu View", "Adjust View Properties...")); - connect(adjustViewProps, SIGNAL(triggered()), this, SLOT(adjustViewProperties())); + stop->setToolTip(i18nc("@info", "Stop loading")); + stop->setIcon(QIcon::fromTheme("process-stop")); + connect(stop, &QAction::triggered, this, &DolphinMainWindow::stopLoading); + + KToggleAction* editableLocation = actionCollection()->add("editable_location"); + editableLocation->setText(i18nc("@action:inmenu Navigation Bar", "Editable Location")); + editableLocation->setShortcut(Qt::Key_F6); + connect(editableLocation, &KToggleAction::triggered, this, &DolphinMainWindow::toggleEditLocation); + + QAction* replaceLocation = actionCollection()->addAction("replace_location"); + replaceLocation->setText(i18nc("@action:inmenu Navigation Bar", "Replace Location")); + replaceLocation->setShortcut(Qt::CTRL | Qt::Key_L); + connect(replaceLocation, &QAction::triggered, this, &DolphinMainWindow::replaceLocation); // setup 'Go' menu - KAction* backAction = KStandardAction::back(this, SLOT(goBack()), actionCollection()); - KShortcut backShortcut = backAction->shortcut(); - backShortcut.setAlternate(Qt::Key_Backspace); - backAction->setShortcut(backShortcut); + QAction* backAction = KStandardAction::back(this, SLOT(goBack()), actionCollection()); + auto backShortcuts = backAction->shortcuts(); + backShortcuts.append(QKeySequence(Qt::Key_Backspace)); + backAction->setShortcuts(backShortcuts); + + m_recentTabsMenu = new KActionMenu(i18n("Recently Closed Tabs"), this); + m_recentTabsMenu->setIcon(QIcon::fromTheme("edit-undo")); + m_recentTabsMenu->setDelayed(false); + actionCollection()->addAction("closed_tabs", m_recentTabsMenu); + connect(m_recentTabsMenu->menu(), &QMenu::triggered, + this, &DolphinMainWindow::restoreClosedTab); + + QAction* action = new QAction(i18n("Empty Recently Closed Tabs"), m_recentTabsMenu); + action->setIcon(QIcon::fromTheme("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 - QAction* findFile = actionCollection()->addAction("find_file"); - findFile->setText(i18nc("@action:inmenu Tools", "Find File...")); - findFile->setShortcut(Qt::CTRL | Qt::Key_F); - findFile->setIcon(KIcon("file-find")); - connect(findFile, SIGNAL(triggered()), this, SLOT(findFile())); - - KToggleAction* showFilterBar = actionCollection()->add("show_filter_bar"); + QAction* showFilterBar = actionCollection()->addAction("show_filter_bar"); showFilterBar->setText(i18nc("@action:inmenu Tools", "Show Filter Bar")); + showFilterBar->setIcon(QIcon::fromTheme("view-filter")); showFilterBar->setShortcut(Qt::CTRL | Qt::Key_I); - connect(showFilterBar, SIGNAL(triggered()), this, SLOT(toggleFilterBarVisibility())); + connect(showFilterBar, &QAction::triggered, this, &DolphinMainWindow::showFilterBar); QAction* compareFiles = actionCollection()->addAction("compare_files"); compareFiles->setText(i18nc("@action:inmenu Tools", "Compare Files")); - compareFiles->setIcon(KIcon("kompare")); + compareFiles->setIcon(QIcon::fromTheme("kompare")); compareFiles->setEnabled(false); - connect(compareFiles, SIGNAL(triggered()), this, SLOT(compareFiles())); + connect(compareFiles, &QAction::triggered, this, &DolphinMainWindow::compareFiles); + + QAction* openTerminal = actionCollection()->addAction("open_terminal"); + openTerminal->setText(i18nc("@action:inmenu Tools", "Open Terminal")); + openTerminal->setIcon(QIcon::fromTheme("utilities-terminal")); + openTerminal->setShortcut(Qt::SHIFT | Qt::Key_F4); + connect(openTerminal, &QAction::triggered, this, &DolphinMainWindow::openTerminal); // setup 'Settings' menu + KToggleAction* showMenuBar = KStandardAction::showMenubar(0, 0, actionCollection()); + connect(showMenuBar, &KToggleAction::triggered, // Fixes #286822 + this, &DolphinMainWindow::toggleShowMenuBar, Qt::QueuedConnection); KStandardAction::preferences(this, SLOT(editSettings()), actionCollection()); + + // not in menu actions + QList nextTabKeys; + nextTabKeys.append(KStandardShortcut::tabNext().first()); //TODO: is this correct + nextTabKeys.append(QKeySequence(Qt::CTRL | Qt::Key_Tab)); + + QList prevTabKeys; + prevTabKeys.append(KStandardShortcut::tabPrev().first()); //TODO: is this correct + prevTabKeys.append(QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_Tab)); + + QAction* activateNextTab = actionCollection()->addAction("activate_next_tab"); + activateNextTab->setIconText(i18nc("@action:inmenu", "Next Tab")); + activateNextTab->setText(i18nc("@action:inmenu", "Activate Next Tab")); + activateNextTab->setEnabled(false); + connect(activateNextTab, &QAction::triggered, this, &DolphinMainWindow::activateNextTab); + activateNextTab->setShortcuts(QApplication::isRightToLeft() ? prevTabKeys : nextTabKeys); + + QAction* activatePrevTab = actionCollection()->addAction("activate_prev_tab"); + activatePrevTab->setIconText(i18nc("@action:inmenu", "Previous Tab")); + activatePrevTab->setText(i18nc("@action:inmenu", "Activate Previous Tab")); + activatePrevTab->setEnabled(false); + connect(activatePrevTab, &QAction::triggered, this, &DolphinMainWindow::activatePrevTab); + activatePrevTab->setShortcuts(QApplication::isRightToLeft() ? nextTabKeys : prevTabKeys); + + // for context menu + QAction* openInNewTab = actionCollection()->addAction("open_in_new_tab"); + openInNewTab->setText(i18nc("@action:inmenu", "Open in New Tab")); + openInNewTab->setIcon(QIcon::fromTheme("tab-new")); + connect(openInNewTab, &QAction::triggered, this, &DolphinMainWindow::openInNewTab); + + QAction* openInNewTabs = actionCollection()->addAction("open_in_new_tabs"); + openInNewTabs->setText(i18nc("@action:inmenu", "Open in New Tabs")); + openInNewTabs->setIcon(QIcon::fromTheme("tab-new")); + connect(openInNewTabs, &QAction::triggered, this, &DolphinMainWindow::openInNewTab); + + QAction* openInNewWindow = actionCollection()->addAction("open_in_new_window"); + openInNewWindow->setText(i18nc("@action:inmenu", "Open in New Window")); + openInNewWindow->setIcon(QIcon::fromTheme("window-new")); + connect(openInNewWindow, &QAction::triggered, this, &DolphinMainWindow::openInNewWindow); } void DolphinMainWindow::setupDockWidgets() { - // setup "Information" - QDockWidget* infoDock = new QDockWidget(i18nc("@title:window", "Information")); + const bool lock = GeneralSettings::lockPanels(); + + KDualAction* lockLayoutAction = actionCollection()->add("lock_panels"); + lockLayoutAction->setActiveText(i18nc("@action:inmenu Panels", "Unlock Panels")); + lockLayoutAction->setActiveIcon(QIcon::fromTheme("object-unlocked")); + lockLayoutAction->setInactiveText(i18nc("@action:inmenu Panels", "Lock Panels")); + lockLayoutAction->setInactiveIcon(QIcon::fromTheme("object-locked")); + lockLayoutAction->setActive(lock); + connect(lockLayoutAction, &KDualAction::triggered, this, &DolphinMainWindow::togglePanelLockState); + + // Setup "Information" + DolphinDockWidget* infoDock = new DolphinDockWidget(i18nc("@title:window", "Information")); + infoDock->setLocked(lock); infoDock->setObjectName("infoDock"); infoDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); - SidebarPage* infoWidget = new InfoSidebarPage(infoDock); - infoDock->setWidget(infoWidget); + InformationPanel* infoPanel = new InformationPanel(infoDock); + infoPanel->setCustomContextMenuActions(QList() << lockLayoutAction); + connect(infoPanel, &InformationPanel::urlActivated, this, &DolphinMainWindow::handleUrl); + infoDock->setWidget(infoPanel); - infoDock->toggleViewAction()->setText(i18nc("@title:window", "Information")); - infoDock->toggleViewAction()->setShortcut(Qt::Key_F11); - actionCollection()->addAction("show_info_panel", infoDock->toggleViewAction()); + QAction* infoAction = infoDock->toggleViewAction(); + createPanelAction(QIcon::fromTheme("dialog-information"), Qt::Key_F11, infoAction, "show_information_panel"); addDockWidget(Qt::RightDockWidgetArea, infoDock); - connect(this, SIGNAL(urlChanged(KUrl)), - infoWidget, SLOT(setUrl(KUrl))); - connect(this, SIGNAL(selectionChanged(KFileItemList)), - infoWidget, SLOT(setSelection(KFileItemList))); - connect(this, SIGNAL(requestItemInfo(KFileItem)), - infoWidget, SLOT(requestDelayedItemInfo(KFileItem))); - - // setup "Tree View" - QDockWidget* treeViewDock = new QDockWidget(i18nc("@title:window", "Folders")); - treeViewDock->setObjectName("treeViewDock"); - treeViewDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); - TreeViewSidebarPage* treeWidget = new TreeViewSidebarPage(treeViewDock); - treeViewDock->setWidget(treeWidget); - - treeViewDock->toggleViewAction()->setText(i18nc("@title:window", "Folders")); - treeViewDock->toggleViewAction()->setShortcut(Qt::Key_F7); - actionCollection()->addAction("show_folders_panel", treeViewDock->toggleViewAction()); - - 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(changeSelection(KFileItemList)), - this, SLOT(changeSelection(KFileItemList))); - connect(treeWidget, SIGNAL(urlsDropped(KUrl::List, KUrl)), - this, SLOT(dropUrls(KUrl::List, KUrl))); - - // setup "Terminal" - QDockWidget* terminalDock = new QDockWidget(i18nc("@title:window", "Terminal")); + connect(this, &DolphinMainWindow::urlChanged, + infoPanel, &InformationPanel::setUrl); + connect(this, &DolphinMainWindow::selectionChanged, + infoPanel, &InformationPanel::setSelection); + connect(this, &DolphinMainWindow::requestItemInfo, + infoPanel, &InformationPanel::requestDelayedItemInfo); + + // Setup "Folders" + DolphinDockWidget* foldersDock = new DolphinDockWidget(i18nc("@title:window", "Folders")); + foldersDock->setLocked(lock); + foldersDock->setObjectName("foldersDock"); + foldersDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); + FoldersPanel* foldersPanel = new FoldersPanel(foldersDock); + foldersPanel->setCustomContextMenuActions(QList() << lockLayoutAction); + foldersDock->setWidget(foldersPanel); + + QAction* foldersAction = foldersDock->toggleViewAction(); + createPanelAction(QIcon::fromTheme("folder"), Qt::Key_F7, foldersAction, "show_folders_panel"); + + addDockWidget(Qt::LeftDockWidgetArea, foldersDock); + connect(this, &DolphinMainWindow::urlChanged, + foldersPanel, &FoldersPanel::setUrl); + connect(foldersPanel, &FoldersPanel::folderActivated, + this, &DolphinMainWindow::changeUrl); + connect(foldersPanel, &FoldersPanel::folderMiddleClicked, + this, static_cast(&DolphinMainWindow::openNewTab)); + connect(foldersPanel, &FoldersPanel::errorMessage, + this, &DolphinMainWindow::slotPanelErrorMessage); + + // Setup "Terminal" +#ifndef Q_OS_WIN + DolphinDockWidget* terminalDock = new DolphinDockWidget(i18nc("@title:window Shell terminal", "Terminal")); + terminalDock->setLocked(lock); terminalDock->setObjectName("terminalDock"); terminalDock->setAllowedAreas(Qt::TopDockWidgetArea | Qt::BottomDockWidgetArea); - SidebarPage* terminalWidget = new TerminalSidebarPage(terminalDock); - terminalDock->setWidget(terminalWidget); + TerminalPanel* terminalPanel = new TerminalPanel(terminalDock); + terminalPanel->setCustomContextMenuActions(QList() << lockLayoutAction); + terminalDock->setWidget(terminalPanel); + + connect(terminalPanel, &TerminalPanel::hideTerminalPanel, terminalDock, &DolphinDockWidget::hide); + connect(terminalPanel, &TerminalPanel::changeUrl, this, &DolphinMainWindow::slotTerminalDirectoryChanged); + connect(terminalDock, &DolphinDockWidget::visibilityChanged, + terminalPanel, &TerminalPanel::dockVisibilityChanged); - terminalDock->toggleViewAction()->setText(i18nc("@title:window", "Terminal")); - terminalDock->toggleViewAction()->setShortcut(Qt::Key_F4); - actionCollection()->addAction("show_terminal_panel", terminalDock->toggleViewAction()); + QAction* terminalAction = terminalDock->toggleViewAction(); + createPanelAction(QIcon::fromTheme("utilities-terminal"), Qt::Key_F4, terminalAction, "show_terminal_panel"); addDockWidget(Qt::BottomDockWidgetArea, terminalDock); - connect(this, SIGNAL(urlChanged(KUrl)), - terminalWidget, SLOT(setUrl(KUrl))); + connect(this, &DolphinMainWindow::urlChanged, + terminalPanel, &TerminalPanel::setUrl); +#endif - const bool firstRun = DolphinSettings::instance().generalSettings()->firstRun(); - if (firstRun) { + if (GeneralSettings::version() < 200) { infoDock->hide(); - treeViewDock->hide(); + foldersDock->hide(); +#ifndef Q_OS_WIN terminalDock->hide(); +#endif } - QDockWidget *placesDock = new QDockWidget(i18nc("@title:window", "Places")); + // Setup "Places" + DolphinDockWidget* placesDock = new DolphinDockWidget(i18nc("@title:window", "Places")); + placesDock->setLocked(lock); placesDock->setObjectName("placesDock"); placesDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); - KFilePlacesView *listView = new KFilePlacesView(placesDock); - placesDock->setWidget(listView); - listView->setModel(DolphinSettings::instance().placesModel()); - - placesDock->toggleViewAction()->setText(i18nc("@title:window", "Places")); - placesDock->toggleViewAction()->setShortcut(Qt::Key_F9); - actionCollection()->addAction("show_places_panel", placesDock->toggleViewAction()); - - addDockWidget(Qt::LeftDockWidgetArea, placesDock); - connect(listView, SIGNAL(urlChanged(KUrl)), - this, SLOT(changeUrl(KUrl))); - connect(this, SIGNAL(urlChanged(KUrl)), - listView, SLOT(setUrl(KUrl))); -} -void DolphinMainWindow::updateHistory() -{ - const KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator(); - const int index = urlNavigator->historyIndex(); + PlacesPanel* placesPanel = new PlacesPanel(placesDock); + placesPanel->setCustomContextMenuActions(QList() << lockLayoutAction); + placesDock->setWidget(placesPanel); - QAction* backAction = actionCollection()->action("go_back"); - if (backAction != 0) { - backAction->setEnabled(index < urlNavigator->historySize() - 1); - } + QAction* placesAction = placesDock->toggleViewAction(); + createPanelAction(QIcon::fromTheme("bookmarks"), Qt::Key_F9, placesAction, "show_places_panel"); - QAction* forwardAction = actionCollection()->action("go_forward"); - if (forwardAction != 0) { - forwardAction->setEnabled(index > 0); - } + addDockWidget(Qt::LeftDockWidgetArea, placesDock); + connect(placesPanel, &PlacesPanel::placeActivated, + this, &DolphinMainWindow::slotPlaceActivated); + connect(placesPanel, &PlacesPanel::placeMiddleClicked, + this, static_cast(&DolphinMainWindow::openNewTab)); + connect(placesPanel, &PlacesPanel::errorMessage, + this, &DolphinMainWindow::slotPanelErrorMessage); + connect(this, &DolphinMainWindow::urlChanged, + placesPanel, &PlacesPanel::setUrl); + connect(placesDock, &DolphinDockWidget::visibilityChanged, + this, &DolphinMainWindow::slotPlacesPanelVisibilityChanged); + connect(this, &DolphinMainWindow::settingsChanged, + placesPanel, &PlacesPanel::readSettings); + + // Add actions into the "Panels" menu + KActionMenu* panelsMenu = new KActionMenu(i18nc("@action:inmenu View", "Panels"), this); + actionCollection()->addAction("panels", panelsMenu); + panelsMenu->setDelayed(false); + const KActionCollection* ac = actionCollection(); + panelsMenu->addAction(ac->action("show_places_panel")); + panelsMenu->addAction(ac->action("show_information_panel")); + panelsMenu->addAction(ac->action("show_folders_panel")); +#ifndef Q_OS_WIN + panelsMenu->addAction(ac->action("show_terminal_panel")); +#endif + panelsMenu->addSeparator(); + panelsMenu->addAction(lockLayoutAction); } void DolphinMainWindow::updateEditActions() @@ -1432,197 +1805,339 @@ void DolphinMainWindow::updateEditActions() } else { stateChanged("has_selection"); - QAction* renameAction = actionCollection()->action("rename"); - if (renameAction != 0) { - renameAction->setEnabled(list.count() >= 1); - } - - bool enableMoveToTrash = true; + 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 - KFileItemList::const_iterator it = list.begin(); - const KFileItemList::const_iterator end = list.end(); - while (it != end) { - const KUrl& url = (*it).url(); - // only enable the 'Move to Trash' action for local files - if (!url.isLocalFile()) { - enableMoveToTrash = false; - } - ++it; - } + KFileItemListProperties capabilities(list); + const bool enableMoveToTrash = capabilities.isLocal() && capabilities.supportsMoving(); - QAction* moveToTrashAction = actionCollection()->action("move_to_trash"); + renameAction->setEnabled(capabilities.supportsMoving()); moveToTrashAction->setEnabled(enableMoveToTrash); + deleteAction->setEnabled(capabilities.supportsDeleting()); + deleteWithTrashShortcut->setEnabled(capabilities.supportsDeleting() && !enableMoveToTrash); + cutAction->setEnabled(capabilities.supportsMoving()); } - updatePasteAction(); } void DolphinMainWindow::updateViewActions() { - const DolphinView* view = m_activeViewContainer->view(); - QAction* zoomInAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::ZoomIn)); - if (zoomInAction != 0) { - zoomInAction->setEnabled(view->isZoomInPossible()); - } - - QAction* zoomOutAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::ZoomOut)); - if (zoomOutAction != 0) { - zoomOutAction->setEnabled(view->isZoomOutPossible()); - } - - QAction* action = 0; - switch (view->mode()) { - case DolphinView::IconsView: - action = actionCollection()->action("icons"); - break; - case DolphinView::DetailsView: - action = actionCollection()->action("details"); - break; - case DolphinView::ColumnView: - action = actionCollection()->action("columns"); - break; - default: - break; - } - - if (action != 0) { - KToggleAction* toggleAction = static_cast(action); - toggleAction->setChecked(true); - } - - slotSortingChanged(view->sorting()); - slotSortOrderChanged(view->sortOrder()); - slotCategorizedSortingChanged(); - slotAdditionalInfoChanged(view->additionalInfo()); + m_actionHandler->updateViewActions(); - KToggleAction* showFilterBarAction = - static_cast(actionCollection()->action("show_filter_bar")); + QAction* showFilterBarAction = actionCollection()->action("show_filter_bar"); showFilterBarAction->setChecked(m_activeViewContainer->isFilterBarVisible()); - KToggleAction* showPreviewAction = - static_cast(actionCollection()->action("show_preview")); - showPreviewAction->setChecked(view->showPreview()); - - KToggleAction* showHiddenFilesAction = - static_cast(actionCollection()->action("show_hidden_files")); - showHiddenFilesAction->setChecked(view->showHiddenFiles()); - updateSplitAction(); - KToggleAction* editableLocactionAction = - static_cast(actionCollection()->action("editable_location")); + QAction* editableLocactionAction = actionCollection()->action("editable_location"); const KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator(); editableLocactionAction->setChecked(urlNavigator->isUrlEditable()); } void DolphinMainWindow::updateGoActions() { - QAction* goUpAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::Up)); - const KUrl& currentUrl = m_activeViewContainer->url(); + QAction* goUpAction = actionCollection()->action(KStandardAction::name(KStandardAction::Up)); + const KUrl currentUrl = m_activeViewContainer->url(); goUpAction->setEnabled(currentUrl.upUrl() != currentUrl); } -void DolphinMainWindow::copyUrls(const KUrl::List& source, const KUrl& dest) +void DolphinMainWindow::createControlButton() +{ + if (m_controlButton) { + return; + } + Q_ASSERT(!m_controlButton); + + m_controlButton = new QToolButton(this); + m_controlButton->setIcon(QIcon::fromTheme("applications-system")); + m_controlButton->setText(i18nc("@action", "Control")); + m_controlButton->setPopupMode(QToolButton::InstantPopup); + m_controlButton->setToolButtonStyle(toolBar()->toolButtonStyle()); + + KMenu* controlMenu = new KMenu(m_controlButton); + connect(controlMenu, &KMenu::aboutToShow, this, &DolphinMainWindow::updateControlMenu); + + m_controlButton->setMenu(controlMenu); + + toolBar()->addWidget(m_controlButton); + connect(toolBar(), &KToolBar::iconSizeChanged, + m_controlButton, &QToolButton::setIconSize); + connect(toolBar(), &KToolBar::toolButtonStyleChanged, + m_controlButton, &QToolButton::setToolButtonStyle); + + // The added widgets are owned by the toolbar and may get deleted when e.g. the toolbar + // gets edited. In this case we must add them again. The adding is done asynchronously by + // m_updateToolBarTimer. + connect(m_controlButton, &QToolButton::destroyed, this, &DolphinMainWindow::slotControlButtonDeleted); + m_updateToolBarTimer = new QTimer(this); + m_updateToolBarTimer->setInterval(500); + connect(m_updateToolBarTimer, &QTimer::timeout, this, &DolphinMainWindow::updateToolBar); +} + +void DolphinMainWindow::deleteControlButton() +{ + delete m_controlButton; + m_controlButton = 0; + + delete m_updateToolBarTimer; + m_updateToolBarTimer = 0; +} + +bool DolphinMainWindow::addActionToMenu(QAction* action, KMenu* menu) { - KonqOperations::copy(this, KonqOperations::COPY, source, dest); - m_undoCommandTypes.append(KonqUndoManager::COPY); + Q_ASSERT(action); + Q_ASSERT(menu); + + const KToolBar* toolBarWidget = toolBar(); + foreach (const QWidget* widget, action->associatedWidgets()) { + if (widget == toolBarWidget) { + return false; + } + } + + menu->addAction(action); + return true; } -void DolphinMainWindow::moveUrls(const KUrl::List& source, const KUrl& dest) +void DolphinMainWindow::rememberClosedTab(int index) { - KonqOperations::copy(this, KonqOperations::MOVE, source, dest); - m_undoCommandTypes.append(KonqUndoManager::MOVE); + QMenu* tabsMenu = m_recentTabsMenu->menu(); + + const QString primaryPath = m_viewTab[index].primaryView->url().path(); + const QString iconName = KIO::iconNameForUrl(primaryPath); + + QAction* action = new QAction(squeezedText(primaryPath), tabsMenu); + + ClosedTab closedTab; + closedTab.primaryUrl = m_viewTab[index].primaryView->url(); + + if (m_viewTab[index].secondaryView) { + closedTab.secondaryUrl = m_viewTab[index].secondaryView->url(); + closedTab.isSplit = true; + } else { + closedTab.isSplit = false; + } + + action->setData(QVariant::fromValue(closedTab)); + action->setIcon(QIcon::fromTheme(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); + } + + // assure that only up to 8 closed tabs are shown in the menu + if (tabsMenu->actions().size() > 8) { + tabsMenu->removeAction(tabsMenu->actions().last()); + } + actionCollection()->action("closed_tabs")->setEnabled(true); + KAcceleratorManager::manage(tabsMenu); } -void DolphinMainWindow::linkUrls(const KUrl::List& source, const KUrl& dest) +void DolphinMainWindow::refreshViews() { - KonqOperations::copy(this, KonqOperations::LINK, source, dest); - m_undoCommandTypes.append(KonqUndoManager::LINK); + Q_ASSERT(m_viewTab[m_tabIndex].primaryView); + + // remember the current active view, as because of + // the refreshing the active view might change to + // the secondary view + DolphinViewContainer* activeViewContainer = m_activeViewContainer; + + const int tabCount = m_viewTab.count(); + for (int i = 0; i < tabCount; ++i) { + m_viewTab[i].primaryView->readSettings(); + if (m_viewTab[i].secondaryView) { + m_viewTab[i].secondaryView->readSettings(); + } + } + + setActiveViewContainer(activeViewContainer); + + if (GeneralSettings::modifiedStartupSettings()) { + // The startup settings have been changed by the user (see bug #254947). + // Synchronize the split-view setting with the active view: + const bool splitView = GeneralSettings::splitView(); + const ViewTab& activeTab = m_viewTab[m_tabIndex]; + const bool toggle = ( splitView && !activeTab.secondaryView) + || (!splitView && activeTab.secondaryView); + if (toggle) { + toggleSplitView(); + } + } + + emit settingsChanged(); } void DolphinMainWindow::clearStatusBar() { - m_activeViewContainer->statusBar()->clear(); + m_activeViewContainer->statusBar()->resetToDefaultText(); } -void DolphinMainWindow::connectViewSignals(int viewIndex) +void DolphinMainWindow::connectViewSignals(DolphinViewContainer* container) { - DolphinViewContainer* container = m_viewContainer[viewIndex]; - connect(container, SIGNAL(showFilterBarChanged(bool)), - this, SLOT(updateFilterBarAction(bool))); + connect(container, &DolphinViewContainer::showFilterBarChanged, + this, &DolphinMainWindow::updateFilterBarAction); + connect(container, &DolphinViewContainer::writeStateChanged, + this, &DolphinMainWindow::slotWriteStateChanged); DolphinView* view = container->view(); - connect(view, SIGNAL(modeChanged()), - this, SLOT(slotViewModeChanged())); - connect(view, SIGNAL(showPreviewChanged()), - this, SLOT(slotShowPreviewChanged())); - connect(view, SIGNAL(showHiddenFilesChanged()), - this, SLOT(slotShowHiddenFilesChanged())); - connect(view, SIGNAL(categorizedSortingChanged()), - this, SLOT(slotCategorizedSortingChanged())); - connect(view, SIGNAL(sortingChanged(DolphinView::Sorting)), - this, SLOT(slotSortingChanged(DolphinView::Sorting))); - connect(view, SIGNAL(sortOrderChanged(Qt::SortOrder)), - this, SLOT(slotSortOrderChanged(Qt::SortOrder))); - connect(view, SIGNAL(additionalInfoChanged(KFileItemDelegate::InformationList)), - this, SLOT(slotAdditionalInfoChanged(KFileItemDelegate::InformationList))); - connect(view, SIGNAL(selectionChanged(KFileItemList)), - this, SLOT(slotSelectionChanged(KFileItemList))); - connect(view, SIGNAL(requestItemInfo(KFileItem)), - this, SLOT(slotRequestItemInfo(KFileItem))); - connect(view, SIGNAL(activated()), - this, SLOT(toggleActiveView())); + connect(view, &DolphinView::selectionChanged, + this, &DolphinMainWindow::slotSelectionChanged); + connect(view, &DolphinView::requestItemInfo, + this, &DolphinMainWindow::slotRequestItemInfo); + connect(view, &DolphinView::activated, + this, &DolphinMainWindow::toggleActiveView); + connect(view, &DolphinView::tabRequested, + this, static_cast(&DolphinMainWindow::openNewTab)); + connect(view, &DolphinView::requestContextMenu, + this, &DolphinMainWindow::openContextMenu); + connect(view, &DolphinView::directoryLoadingStarted, + this, &DolphinMainWindow::enableStopAction); + connect(view, &DolphinView::directoryLoadingCompleted, + this, &DolphinMainWindow::disableStopAction); + connect(view, &DolphinView::goBackRequested, + this, static_cast(&DolphinMainWindow::goBack)); + connect(view, &DolphinView::goForwardRequested, + this, static_cast(&DolphinMainWindow::goForward)); const KUrlNavigator* navigator = container->urlNavigator(); - connect(navigator, SIGNAL(urlChanged(const KUrl&)), - this, SLOT(changeUrl(const KUrl&))); - connect(navigator, SIGNAL(historyChanged()), - this, SLOT(slotHistoryChanged())); + connect(navigator, &KUrlNavigator::urlChanged, + this, &DolphinMainWindow::changeUrl); + connect(navigator, &KUrlNavigator::historyChanged, + this, &DolphinMainWindow::updateHistory); + connect(navigator, &KUrlNavigator::editableStateChanged, + this, &DolphinMainWindow::slotEditableStateChanged); + connect(navigator, &KUrlNavigator::tabRequested, + this, static_cast(&DolphinMainWindow::openNewTab)); } void DolphinMainWindow::updateSplitAction() { QAction* splitAction = actionCollection()->action("split_view"); - if (m_viewContainer[SecondaryView] != 0) { - if (m_activeViewContainer == m_viewContainer[PrimaryView]) { + if (m_viewTab[m_tabIndex].secondaryView) { + if (m_activeViewContainer == m_viewTab[m_tabIndex].secondaryView) { splitAction->setText(i18nc("@action:intoolbar Close right view", "Close")); - splitAction->setIcon(KIcon("fileview-close-right")); + splitAction->setToolTip(i18nc("@info", "Close right view")); + splitAction->setIcon(QIcon::fromTheme("view-right-close")); } else { splitAction->setText(i18nc("@action:intoolbar Close left view", "Close")); - splitAction->setIcon(KIcon("fileview-close-left")); + splitAction->setToolTip(i18nc("@info", "Close left view")); + splitAction->setIcon(QIcon::fromTheme("view-left-close")); } } else { splitAction->setText(i18nc("@action:intoolbar Split view", "Split")); - splitAction->setIcon(KIcon("fileview-split")); + splitAction->setToolTip(i18nc("@info", "Split view")); + splitAction->setIcon(QIcon::fromTheme("view-right-new")); } } -void DolphinMainWindow::toggleAdditionalInfo(const char* actionName, - KFileItemDelegate::Information info) +QString DolphinMainWindow::tabName(const KUrl& url) const { - clearStatusBar(); + QString name; + if (url.equals(KUrl("file:///"))) { + name = '/'; + } else { + 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; +} - DolphinView* view = m_activeViewContainer->view(); - KFileItemDelegate::InformationList list = view->additionalInfo(); +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; +} + +void DolphinMainWindow::createSecondaryView(int tabIndex) +{ + ViewTab& viewTab = m_viewTab[tabIndex]; + + QSplitter* splitter = viewTab.splitter; + const int newWidth = (viewTab.primaryView->width() - splitter->handleWidth()) / 2; + + const DolphinView* view = viewTab.primaryView->view(); + // 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); + + connectViewSignals(viewTab.secondaryView); + viewTab.secondaryView->setActive(false); + viewTab.secondaryView->resize(newWidth, viewTab.primaryView->height()); + viewTab.secondaryView->show(); +} - const bool show = actionCollection()->action(actionName)->isChecked(); +QString DolphinMainWindow::tabProperty(const QString& property, int tabIndex) const +{ + return "Tab " + QString::number(tabIndex) + ' ' + property; +} - const int index = list.indexOf(info); - const bool containsInfo = (index >= 0); - if (show && !containsInfo) { - list.append(info); - view->setAdditionalInfo(list); - } else if (!show && containsInfo) { - list.removeAt(index); - view->setAdditionalInfo(list); - Q_ASSERT(list.indexOf(info) < 0); +void DolphinMainWindow::setUrlAsCaption(const KUrl& url) +{ + QString caption; + if (!url.isLocalFile()) { + caption.append(url.protocol() + " - "); + if (url.hasHost()) { + caption.append(url.host() + " - "); + } } + + const QString fileName = url.fileName().isEmpty() ? "/" : url.fileName(); + caption.append(fileName); + + setCaption(caption); +} + +QString DolphinMainWindow::squeezedText(const QString& text) const +{ + const QFontMetrics fm = fontMetrics(); + return fm.elidedText(text, Qt::ElideMiddle, fm.maxWidth() * 10); +} + +void DolphinMainWindow::createPanelAction(const QIcon& icon, + const QKeySequence& shortcut, + QAction* dockAction, + const QString& actionName) +{ + QAction* panelAction = actionCollection()->addAction(actionName); + panelAction->setCheckable(true); + panelAction->setChecked(dockAction->isChecked()); + panelAction->setText(dockAction->text()); + panelAction->setIcon(icon); + panelAction->setShortcut(shortcut); + + connect(panelAction, &QAction::triggered, dockAction, &QAction::trigger); + connect(dockAction, &QAction::toggled, panelAction, &QAction::setChecked); } -DolphinMainWindow::UndoUiInterface::UndoUiInterface(DolphinMainWindow* mainWin) : - KonqUndoManager::UiInterface(mainWin), - m_mainWin(mainWin) +DolphinMainWindow::UndoUiInterface::UndoUiInterface() : + KIO::FileUndoManager::UiInterface() { - Q_ASSERT(m_mainWin != 0); } DolphinMainWindow::UndoUiInterface::~UndoUiInterface() @@ -1631,8 +2146,13 @@ DolphinMainWindow::UndoUiInterface::~UndoUiInterface() void DolphinMainWindow::UndoUiInterface::jobError(KIO::Job* job) { - DolphinStatusBar* statusBar = m_mainWin->activeViewContainer()->statusBar(); - statusBar->setMessage(job->errorString(), DolphinStatusBar::Error); + DolphinMainWindow* mainWin= qobject_cast(parentWidget()); + if (mainWin) { + DolphinViewContainer* container = mainWin->activeViewContainer(); + container->showMessage(job->errorString(), DolphinViewContainer::Error); + } else { + KIO::FileUndoManager::UiInterface::jobError(job); + } } #include "dolphinmainwindow.moc"