X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/54dfdc930a5511eae2b15f3e87e5d1cd425bdbe4..a124f2ada3bc3f36862dd2e207ceb68672610929:/src/dolphinviewcontainer.cpp diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index 99c76bee2..342aa08c7 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -18,6 +18,7 @@ ***************************************************************************/ #include "dolphinviewcontainer.h" +#include #include #include @@ -34,14 +35,18 @@ #include #include #include +#include #include +#include #include +#include #include #include #include "dolphinmodel.h" #include "dolphincolumnview.h" #include "dolphincontroller.h" +#include "dolphindropcontroller.h" #include "dolphinstatusbar.h" #include "dolphinmainwindow.h" #include "dolphindirlister.h" @@ -70,24 +75,25 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow, m_proxyModel(0) { hide(); - setFocusPolicy(Qt::StrongFocus); + m_topLayout = new QVBoxLayout(this); m_topLayout->setSpacing(0); m_topLayout->setMargin(0); m_urlNavigator = new KUrlNavigator(DolphinSettings::instance().placesModel(), url, this); - connect(m_urlNavigator, SIGNAL(urlsDropped(const KUrl::List&, const KUrl&)), - m_mainWindow, SLOT(dropUrls(const KUrl::List&, const KUrl&))); + connect(m_urlNavigator, SIGNAL(urlsDropped(const KUrl&, QDropEvent*)), + this, SLOT(dropUrls(const KUrl&, QDropEvent*))); connect(m_urlNavigator, SIGNAL(activated()), this, SLOT(activate())); const GeneralSettings* settings = DolphinSettings::instance().generalSettings(); m_urlNavigator->setUrlEditable(settings->editableUrl()); + m_urlNavigator->setShowFullPath(settings->showFullPath()); m_urlNavigator->setHomeUrl(settings->homeUrl()); m_dirLister = new DolphinDirLister(); m_dirLister->setAutoUpdate(true); - m_dirLister->setMainWindow(this); + m_dirLister->setMainWindow(window()); m_dirLister->setDelayedMimeTypes(true); m_dolphinModel = new DolphinModel(this); @@ -96,6 +102,7 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow, m_proxyModel = new DolphinSortFilterProxyModel(this); m_proxyModel->setSourceModel(m_dolphinModel); + m_proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive); connect(m_dirLister, SIGNAL(clear()), this, SLOT(updateStatusBar())); @@ -119,8 +126,6 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow, m_urlNavigator, SLOT(setUrl(const KUrl&))); connect(m_view, SIGNAL(requestContextMenu(KFileItem, const KUrl&)), this, SLOT(openContextMenu(KFileItem, const KUrl&))); - connect(m_view, SIGNAL(urlsDropped(const KUrl::List&, const KUrl&)), - m_mainWindow, SLOT(dropUrls(const KUrl::List&, const KUrl&))); connect(m_view, SIGNAL(contentsMoved(int, int)), this, SLOT(saveContentsPos(int, int))); connect(m_view, SIGNAL(requestItemInfo(KFileItem)), @@ -139,9 +144,7 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow, connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)), this, SLOT(restoreView(const KUrl&))); - m_statusBar = new DolphinStatusBar(this, url); - connect(m_view, SIGNAL(urlChanged(const KUrl&)), - m_statusBar, SLOT(updateSpaceInfoContent(const KUrl&))); + m_statusBar = new DolphinStatusBar(this, m_view); m_filterBar = new FilterBar(this); m_filterBar->setVisible(settings->filterBar()); @@ -158,14 +161,23 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow, DolphinViewContainer::~DolphinViewContainer() { + m_dirLister->disconnect(); + + delete m_proxyModel; + m_proxyModel = 0; delete m_dolphinModel; m_dolphinModel = 0; m_dirLister = 0; // deleted by m_dolphinModel } -void DolphinViewContainer::setUrl(const KUrl& url) +void DolphinViewContainer::setUrl(const KUrl& newUrl) { - m_urlNavigator->setUrl(url); + m_urlNavigator->setUrl(newUrl); + + // Temporary disable the 'File'->'Create New...' menu until + // the write permissions can be checked in a fast way at + // DolphinViewContainer::slotDirListerCompleted(). + m_mainWindow->newMenu()->menu()->setEnabled(false); } const KUrl& DolphinViewContainer::url() const @@ -195,12 +207,6 @@ bool DolphinViewContainer::isUrlEditable() const return m_urlNavigator->isUrlEditable(); } -KFileItem DolphinViewContainer::fileItem(const QModelIndex& index) const -{ - const QModelIndex dolphinModelIndex = m_proxyModel->mapToSource(index); - return m_dolphinModel->itemForIndex(dolphinModelIndex); -} - void DolphinViewContainer::updateProgress(int percent) { if (!m_showProgress) { @@ -230,8 +236,19 @@ void DolphinViewContainer::slotDirListerCompleted() } updateStatusBar(); - QTimer::singleShot(100, this, SLOT(restoreContentsPos())); + + // Enable the 'File'->'Create New...' menu only if the directory + // supports writing. + KMenu* createNew = m_mainWindow->newMenu()->menu(); + KFileItem item = m_dirLister->rootItem(); + if (item.isNull()) { + // it is unclear whether writing is supported + createNew->setEnabled(true); + } else { + KonqFileItemCapabilities capabilities(KFileItemList() << item); + createNew->setEnabled(capabilities.supportsWriting()); + } } void DolphinViewContainer::showItemInfo(const KFileItem& item) @@ -261,61 +278,10 @@ void DolphinViewContainer::showOperationCompletedMessage(const QString& msg) void DolphinViewContainer::closeFilterBar() { m_filterBar->hide(); + m_filterBar->clear(); emit showFilterBarChanged(false); } -QString DolphinViewContainer::defaultStatusBarText() const -{ - int folderCount = 0; - int fileCount = 0; - m_view->calculateItemCount(fileCount, folderCount); - return KIO::itemsSummaryString(fileCount + folderCount, - fileCount, - folderCount, - 0, false); -} - -QString DolphinViewContainer::selectionStatusBarText() const -{ - QString text; - const KFileItemList list = m_view->selectedItems(); - if (list.isEmpty()) { - // when an item is triggered, it is temporary selected but selectedItems() - // will return an empty list - return QString(); - } - - int fileCount = 0; - int folderCount = 0; - KIO::filesize_t byteSize = 0; - KFileItemList::const_iterator it = list.begin(); - const KFileItemList::const_iterator end = list.end(); - while (it != end) { - const KFileItem& item = *it; - if (item.isDir()) { - ++folderCount; - } else { - ++fileCount; - byteSize += item.size(); - } - ++it; - } - - if (folderCount > 0) { - text = i18ncp("@info:status", "1 Folder selected", "%1 Folders selected", folderCount); - if (fileCount > 0) { - text += ", "; - } - } - - if (fileCount > 0) { - const QString sizeText(KIO::convertSize(byteSize)); - text += i18ncp("@info:status", "1 File selected (%2)", "%1 Files selected (%2)", fileCount, sizeText); - } - - return text; -} - void DolphinViewContainer::showFilterBar(bool show) { Q_ASSERT(m_filterBar != 0); @@ -337,7 +303,7 @@ void DolphinViewContainer::updateStatusBar() (m_statusBar->type() == DolphinStatusBar::Information)) && (m_statusBar->progress() == 100); - const QString text(m_view->hasSelection() ? selectionStatusBarText() : defaultStatusBarText()); + const QString text(m_view->statusBarText()); m_statusBar->setDefaultText(text); if (updateStatusBarMsg) { @@ -387,33 +353,37 @@ void DolphinViewContainer::saveRootUrl(const KUrl& url) m_urlNavigator->saveRootUrl(m_view->rootUrl()); } +void DolphinViewContainer::dropUrls(const KUrl& destination, QDropEvent* event) +{ + DolphinDropController::dropUrls(KFileItem(), destination, event, this); +} + void DolphinViewContainer::slotItemTriggered(const KFileItem& item) { - // Prefer the local path over the URL. - bool isLocal; - KUrl url = item.mostLocalUrl(isLocal); + KUrl url = item.targetUrl(); if (item.isDir()) { m_view->setUrl(url); - } else if (item.isFile()) { - // allow to browse through ZIP and tar files - KMimeType::Ptr mime = item.mimeTypePtr(); - if (mime->is("application/zip")) { - url.setProtocol("zip"); - m_view->setUrl(url); - } else if (mime->is("application/x-tar") || - mime->is("application/x-tarz") || - mime->is("application/x-bzip-compressed-tar") || - mime->is("application/x-compressed-tar") || - mime->is("application/x-tzo")) { - url.setProtocol("tar"); + return; + } + + const GeneralSettings* settings = DolphinSettings::instance().generalSettings(); + const bool browseThroughArchives = settings->browseThroughArchives(); + if (browseThroughArchives && item.isFile() && url.isLocalFile()) { + // Generic mechanism for redirecting to tar:// when clicking on a tar file, + // zip:// when clicking on a zip file, etc. + // The .protocol file specifies the mimetype that the kioslave handles. + // Note that we don't use mimetype inheritance since we don't want to + // open OpenDocument files as zip folders... + const QString protocol = KProtocolManager::protocolForArchiveMimetype(item.mimetype()); + if (!protocol.isEmpty()) { + url.setProtocol(protocol); m_view->setUrl(url); - } else { - item.run(); + return; } - } else { - item.run(); } + + item.run(); } #include "dolphinviewcontainer.moc"