X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/9d4250e10ada4e2410722951dbd406263b61041c..629ec98952bcf38bc99f2b11bc37bdc2ec7aabcc:/src/dolphinview.cpp diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp index 12d6be0d2..783131c32 100644 --- a/src/dolphinview.cpp +++ b/src/dolphinview.cpp @@ -41,6 +41,7 @@ #include #include #include +#include #include #include #include @@ -70,6 +71,7 @@ DolphinView::DolphinView(QWidget* parent, m_showPreview(false), m_loadingDirectory(false), m_storedCategorizedSorting(false), + m_tabsForFiles(false), m_isContextMenuOpen(false), m_mode(DolphinView::IconsView), m_topLayout(0), @@ -82,9 +84,11 @@ DolphinView::DolphinView(QWidget* parent, m_dolphinModel(dolphinModel), m_dirLister(dirLister), m_proxyModel(proxyModel), - m_iconManager(0) + m_iconManager(0), + m_toolTipManager(0), + m_rootUrl(), + m_currentItemUrl() { - setFocusPolicy(Qt::StrongFocus); m_topLayout = new QVBoxLayout(this); m_topLayout->setSpacing(0); m_topLayout->setMargin(0); @@ -92,14 +96,10 @@ DolphinView::DolphinView(QWidget* parent, m_controller = new DolphinController(this); m_controller->setUrl(url); - // Receiver of the DolphinView signal 'urlChanged()' don't need - // to care whether the internal controller changed the URL already or whether - // the controller just requested an URL change and will be updated later. - // In both cases the URL has been changed: connect(m_controller, SIGNAL(urlChanged(const KUrl&)), this, SIGNAL(urlChanged(const KUrl&))); connect(m_controller, SIGNAL(requestUrlChange(const KUrl&)), - this, SIGNAL(urlChanged(const KUrl&))); + this, SLOT(slotRequestUrlChange(const KUrl&))); connect(m_controller, SIGNAL(requestContextMenu(const QPoint&)), this, SLOT(openContextMenu(const QPoint&))); @@ -113,6 +113,8 @@ DolphinView::DolphinView(QWidget* parent, this, SLOT(updateAdditionalInfo(const KFileItemDelegate::InformationList&))); connect(m_controller, SIGNAL(itemTriggered(const KFileItem&)), this, SLOT(triggerItem(const KFileItem&))); + connect(m_controller, SIGNAL(tabRequested(const KUrl&)), + this, SIGNAL(tabRequested(const KUrl&))); connect(m_controller, SIGNAL(activated()), this, SLOT(activate())); connect(m_controller, SIGNAL(itemEntered(const KFileItem&)), @@ -120,6 +122,11 @@ DolphinView::DolphinView(QWidget* parent, connect(m_controller, SIGNAL(viewportEntered()), this, SLOT(clearHoverInformation())); + connect(m_dirLister, SIGNAL(redirection(KUrl, KUrl)), + this, SLOT(slotRedirection(KUrl, KUrl))); + connect(m_dirLister, SIGNAL(completed()), + this, SLOT(restoreCurrentItem())); + applyViewProperties(url); m_topLayout->addWidget(itemView()); } @@ -145,7 +152,6 @@ void DolphinView::setActive(bool active) } m_active = active; - m_selectionModel->clearSelection(); QColor color = KColorScheme(QPalette::Active, KColorScheme::View).background().color(); if (active) { @@ -166,6 +172,7 @@ void DolphinView::setActive(bool active) update(); if (active) { + itemView()->setFocus(); emit activated(); } @@ -298,7 +305,7 @@ KFileItemList DolphinView::selectedItems() const KFileItemList itemList; const QModelIndexList indexList = selection.indexes(); - foreach (QModelIndex index, indexList) { + foreach (const QModelIndex &index, indexList) { KFileItem item = m_dolphinModel->itemForIndex(index); if (!item.isNull()) { itemList.append(item); @@ -312,7 +319,7 @@ KUrl::List DolphinView::selectedUrls() const { KUrl::List urls; const KFileItemList list = selectedItems(); - foreach (KFileItem item, list) { + foreach (const KFileItem &item, list) { urls.append(item.url()); } return urls; @@ -465,7 +472,7 @@ void DolphinView::setNameFilter(const QString& nameFilter) void DolphinView::calculateItemCount(int& fileCount, int& folderCount) { - foreach (KFileItem item, m_dirLister->items()) { + foreach (const KFileItem &item, m_dirLister->items()) { if (item.isDir()) { ++folderCount; } else { @@ -476,6 +483,8 @@ void DolphinView::calculateItemCount(int& fileCount, int& folderCount) void DolphinView::setUrl(const KUrl& url) { + // remember current item candidate (see restoreCurrentItem()) + m_currentItemUrl = url; updateView(url, KUrl()); } @@ -515,13 +524,13 @@ void DolphinView::renameSelectedItems() if (newName.isEmpty()) { emit errorMessage(dialog.errorString()); } else { - // TODO: check how this can be integrated into KonqFileUndoManager/KonqOperations + // TODO: check how this can be integrated into KIO::FileUndoManager/KonqOperations // as one operation instead of n rename operations like it is done now... Q_ASSERT(newName.contains('#')); // iterate through all selected items and rename them... int index = 1; - foreach (KFileItem item, items) { + foreach (const KFileItem &item, items) { const KUrl& oldUrl = item.url(); QString number; number.setNum(index++); @@ -533,7 +542,7 @@ void DolphinView::renameSelectedItems() KUrl newUrl = oldUrl; newUrl.setFileName(name); KonqOperations::rename(this, oldUrl, newUrl); - emit doingOperation(KonqFileUndoManager::RENAME); + emit doingOperation(KIO::FileUndoManager::Rename); } } } @@ -563,14 +572,14 @@ void DolphinView::renameSelectedItems() KUrl newUrl = oldUrl; newUrl.setFileName(newName); KonqOperations::rename(this, oldUrl, newUrl); - emit doingOperation(KonqFileUndoManager::RENAME); + emit doingOperation(KIO::FileUndoManager::Rename); } } } void DolphinView::trashSelectedItems() { - emit doingOperation(KonqFileUndoManager::TRASH); + emit doingOperation(KIO::FileUndoManager::Trash); KonqOperations::del(this, KonqOperations::TRASH, selectedUrls()); } @@ -745,11 +754,14 @@ void DolphinView::triggerItem(const KFileItem& item) return; } - // TODO: the m_isContextMenuOpen check is a workaround for Qt-issue xxxxxx + // TODO: the m_isContextMenuOpen check is a workaround for Qt-issue 207192 if (item.isNull() || m_isContextMenuOpen) { return; } + if (m_toolTipManager != 0) { + m_toolTipManager->hideTip(); + } emit itemTriggered(item); // caught by DolphinViewContainer or DolphinPart } @@ -767,7 +779,11 @@ void DolphinView::openContextMenu(const QPoint& pos) item = fileItem(index); } - m_isContextMenuOpen = true; // TODO: workaround for Qt-issue xxxxxx + if (m_toolTipManager != 0) { + m_toolTipManager->hideTip(); + } + + m_isContextMenuOpen = true; // TODO: workaround for Qt-issue 207192 emit requestContextMenu(item, url()); m_isContextMenuOpen = false; } @@ -790,8 +806,8 @@ void DolphinView::dropUrls(const KUrl::List& urls, { DolphinDropController dropController(this); // forward doingOperation signal up to the mainwindow - connect(&dropController, SIGNAL(doingOperation(KonqFileUndoManager::CommandType)), - this, SIGNAL(doingOperation(KonqFileUndoManager::CommandType))); + connect(&dropController, SIGNAL(doingOperation(KIO::FileUndoManager::CommandType)), + this, SIGNAL(doingOperation(KIO::FileUndoManager::CommandType))); dropController.dropUrls(urls, destination); } @@ -886,7 +902,10 @@ QPair DolphinView::pasteInfo() const KUrl::List urls = KUrl::List::fromMimeData(mimeData); if (!urls.isEmpty()) { - ret.first = true; + // disable the paste action if no writing is supported + KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url()); + ret.first = KonqFileItemCapabilities(KFileItemList() << item).supportsWriting(); + if (urls.count() == 1) { const KFileItem item(KFileItem::Unknown, KFileItem::Unknown, urls.first(), true); ret.second = item.isDir() ? i18nc("@action:inmenu", "Paste One Folder") : @@ -903,6 +922,16 @@ QPair DolphinView::pasteInfo() const return ret; } +void DolphinView::setTabsForFilesEnabled(bool tabsForFiles) +{ + m_tabsForFiles = tabsForFiles; +} + +bool DolphinView::isTabsForFilesEnabled() const +{ + return m_tabsForFiles; +} + void DolphinView::emitContentsMoved() { // only emit the contents moved signal if: @@ -935,6 +964,21 @@ void DolphinView::slotDeleteFileFinished(KJob* job) } } + +void DolphinView::restoreCurrentItem() +{ + const QModelIndex dirIndex = m_dolphinModel->indexForUrl(m_currentItemUrl); + if (dirIndex.isValid()) { + const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex); + QAbstractItemView* view = itemView(); + const bool clearSelection = !hasSelection(); + view->setCurrentIndex(proxyIndex); + if (clearSelection) { + view->clearSelection(); + } + } +} + void DolphinView::loadDirectory(const KUrl& url, bool reload) { if (!url.isValid()) { @@ -1081,12 +1125,11 @@ void DolphinView::createView() view->setSelectionMode(QAbstractItemView::ExtendedSelection); - new KMimeTypeResolver(view, m_dolphinModel); m_iconManager = new IconManager(view, m_proxyModel); m_iconManager->setShowPreview(m_showPreview); if (DolphinSettings::instance().generalSettings()->showToolTips()) { - new ToolTipManager(view, m_proxyModel); + m_toolTipManager = new ToolTipManager(view, m_proxyModel); } m_topLayout->insertWidget(1, view); @@ -1112,6 +1155,7 @@ void DolphinView::deleteView() m_columnView = 0; m_fileItemDelegate = 0; m_iconManager = 0; + m_toolTipManager = 0; } } @@ -1152,11 +1196,24 @@ void DolphinView::pasteToUrl(const KUrl& url) const KUrl::List sourceUrls = KUrl::List::fromMimeData(mimeData); if (KonqMimeData::decodeIsCutSelection(mimeData)) { KonqOperations::copy(this, KonqOperations::MOVE, sourceUrls, url); - emit doingOperation(KonqFileUndoManager::MOVE); + emit doingOperation(KIO::FileUndoManager::Move); clipboard->clear(); } else { KonqOperations::copy(this, KonqOperations::COPY, sourceUrls, url); - emit doingOperation(KonqFileUndoManager::COPY); + emit doingOperation(KIO::FileUndoManager::Copy); + } +} + +void DolphinView::slotRequestUrlChange(const KUrl& url) +{ + emit requestUrlChange(url); + m_controller->setUrl(url); +} + +void DolphinView::slotRedirection(const KUrl& oldUrl, const KUrl& newUrl) +{ + if (oldUrl == m_controller->url()) { + m_controller->setUrl(newUrl); } }