diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp index 3602d1563..da8aa3c82 100644 --- a/src/dolphinview.cpp +++ b/src/dolphinview.cpp @@ -1,1152 +1,1139 @@ /*************************************************************************** * Copyright (C) 2006 by Peter Penz * * Copyright (C) 2006 by Gregor Kališnik * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ #include "dolphinview.h" #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include "dolphincontroller.h" #include "dolphinstatusbar.h" #include "dolphinmainwindow.h" #include "dolphindirlister.h" #include "dolphinsortfilterproxymodel.h" #include "dolphindetailsview.h" #include "dolphiniconsview.h" #include "dolphincontextmenu.h" #include "filterbar.h" #include "renamedialog.h" #include "urlnavigator.h" #include "viewproperties.h" DolphinView::DolphinView(DolphinMainWindow* mainWindow, QWidget* parent, const KUrl& url, Mode mode, bool showHiddenFiles) : QWidget(parent), m_showProgress(false), m_mode(mode), m_iconSize(0), m_folderCount(0), m_fileCount(0), m_mainWindow(mainWindow), m_topLayout(0), m_urlNavigator(0), m_controller(0), m_iconsView(0), m_detailsView(0), m_fileItemDelegate(0), m_filterBar(0), m_statusBar(0), m_dirModel(0), m_dirLister(0), m_proxyModel(0) { hide(); setFocusPolicy(Qt::StrongFocus); m_topLayout = new QVBoxLayout(this); m_topLayout->setSpacing(0); m_topLayout->setMargin(0); connect(m_mainWindow, SIGNAL(activeViewChanged()), this, SLOT(updateActivationState())); m_urlNavigator = new UrlNavigator(url, this); m_urlNavigator->setShowHiddenFiles(showHiddenFiles); connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)), this, SLOT(loadDirectory(const KUrl&))); connect(m_urlNavigator, SIGNAL(urlsDropped(const KUrl::List&, const KUrl&)), this, SLOT(dropUrls(const KUrl::List&, const KUrl&))); connect(m_urlNavigator, SIGNAL(activated()), this, SLOT(requestActivation())); connect(this, SIGNAL(contentsMoved(int, int)), m_urlNavigator, SLOT(storeContentsPosition(int, int))); m_statusBar = new DolphinStatusBar(this); m_dirLister = new DolphinDirLister(); m_dirLister->setAutoUpdate(true); m_dirLister->setMainWindow(this); m_dirLister->setShowingDotFiles(showHiddenFiles); m_dirLister->setDelayedMimeTypes(true); connect(m_dirLister, SIGNAL(clear()), this, SLOT(updateStatusBar())); connect(m_dirLister, SIGNAL(percent(int)), this, SLOT(updateProgress(int))); connect(m_dirLister, SIGNAL(deleteItem(KFileItem*)), this, SLOT(updateStatusBar())); connect(m_dirLister, SIGNAL(completed()), this, SLOT(updateItemCount())); connect(m_dirLister, SIGNAL(completed()), this, SLOT(updateCutItems())); connect(m_dirLister, SIGNAL(newItems(const KFileItemList&)), this, SLOT(generatePreviews(const KFileItemList&))); connect(m_dirLister, SIGNAL(infoMessage(const QString&)), this, SLOT(showInfoMessage(const QString&))); connect(m_dirLister, SIGNAL(errorMessage(const QString&)), this, SLOT(showErrorMessage(const QString&))); m_dirModel = new KDirModel(); m_dirModel->setDirLister(m_dirLister); m_dirModel->setDropsAllowed(KDirModel::DropOnDirectory); m_proxyModel = new DolphinSortFilterProxyModel(this); m_proxyModel->setSourceModel(m_dirModel); m_controller = new DolphinController(this); connect(m_controller, SIGNAL(requestContextMenu(const QPoint&)), this, SLOT(openContextMenu(const QPoint&))); connect(m_controller, SIGNAL(urlsDropped(const KUrl::List&, const QModelIndex&, QWidget*)), this, SLOT(dropUrls(const KUrl::List&, const QModelIndex&, QWidget*))); connect(m_controller, SIGNAL(sortingChanged(DolphinView::Sorting)), this, SLOT(updateSorting(DolphinView::Sorting))); connect(m_controller, SIGNAL(sortOrderChanged(Qt::SortOrder)), this, SLOT(updateSortOrder(Qt::SortOrder))); connect(m_controller, SIGNAL(itemTriggered(const QModelIndex&)), this, SLOT(triggerItem(const QModelIndex&))); connect(m_controller, SIGNAL(selectionChanged()), this, SLOT(emitSelectionChangedSignal())); connect(m_controller, SIGNAL(activated()), this, SLOT(requestActivation())); createView(); m_iconSize = K3Icon::SizeMedium; m_filterBar = new FilterBar(this); m_filterBar->hide(); connect(m_filterBar, SIGNAL(filterChanged(const QString&)), this, SLOT(changeNameFilter(const QString&))); connect(m_filterBar, SIGNAL(closeRequest()), this, SLOT(closeFilterBar())); m_topLayout->addWidget(m_urlNavigator); m_topLayout->addWidget(itemView()); m_topLayout->addWidget(m_filterBar); m_topLayout->addWidget(m_statusBar); loadDirectory(m_urlNavigator->url()); } DolphinView::~DolphinView() { delete m_dirLister; m_dirLister = 0; } void DolphinView::setUrl(const KUrl& url) { m_urlNavigator->setUrl(url); m_controller->setUrl(url); } const KUrl& DolphinView::url() const { return m_urlNavigator->url(); } bool DolphinView::isActive() const { return m_mainWindow->activeView() == this; } void DolphinView::setMode(Mode mode) { if (mode == m_mode) { return; // the wished mode is already set } m_mode = mode; ViewProperties props(m_urlNavigator->url()); props.setViewMode(m_mode); createView(); startDirLister(m_urlNavigator->url()); emit modeChanged(); } DolphinView::Mode DolphinView::mode() const { return m_mode; } void DolphinView::setShowPreview(bool show) { ViewProperties props(m_urlNavigator->url()); props.setShowPreview(show); m_controller->setShowPreview(show); emit showPreviewChanged(); reload(); } bool DolphinView::showPreview() const { return m_controller->showPreview(); } void DolphinView::setShowHiddenFiles(bool show) { if (m_dirLister->showingDotFiles() == show) { return; } ViewProperties props(m_urlNavigator->url()); props.setShowHiddenFiles(show); props.save(); m_dirLister->setShowingDotFiles(show); m_urlNavigator->setShowHiddenFiles(show); emit showHiddenFilesChanged(); reload(); } bool DolphinView::showHiddenFiles() const { return m_dirLister->showingDotFiles(); } void DolphinView::renameSelectedItems() { DolphinView* view = mainWindow()->activeView(); const KUrl::List urls = selectedUrls(); if (urls.count() > 1) { // More than one item has been selected for renaming. Open // a rename dialog and rename all items afterwards. RenameDialog dialog(urls); if (dialog.exec() == QDialog::Rejected) { return; } const QString& newName = dialog.newName(); if (newName.isEmpty()) { view->statusBar()->setMessage(dialog.errorString(), DolphinStatusBar::Error); } else { // TODO: check how this can be integrated into KonqUndoManager/KonqOperations - - //UndoManager& undoMan = UndoManager::instance(); - //undoMan.beginMacro(); - + // as one operation instead of n rename operations like it is done now... Q_ASSERT(newName.contains('#')); - const int urlsCount = urls.count(); - // iterate through all selected items and rename them... const int replaceIndex = newName.indexOf('#'); Q_ASSERT(replaceIndex >= 0); - for (int i = 0; i < urlsCount; ++i) { - const KUrl& source = urls[i]; + int index = 1; + + KUrl::List::const_iterator it = urls.begin(); + KUrl::List::const_iterator end = urls.end(); + while (it != end) { + const KUrl& oldUrl = *it; QString number; - number.setNum(i + 1); + number.setNum(index++); QString name(newName); name.replace(replaceIndex, 1, number); - if (source.fileName() != name) { - KUrl dest(source.upUrl()); - dest.addPath(name); - - const bool destExists = KIO::NetAccess::exists(dest, false, view); - if (destExists) { - view->statusBar()->setMessage(i18n("Renaming failed (item '%1' already exists).",name), - DolphinStatusBar::Error); - break; - } - else if (KIO::NetAccess::file_move(source, dest)) { - // TODO: From the users point of view he executed one 'rename n files' operation, - // but internally we store it as n 'rename 1 file' operations for the undo mechanism. - //DolphinCommand command(DolphinCommand::Rename, source, dest); - //undoMan.addCommand(command); - } + if (oldUrl.fileName() != name) { + KUrl newUrl(oldUrl.upUrl()); + newUrl.addPath(name); + m_mainWindow->rename(oldUrl, newUrl); } + ++it; } - - //undoMan.endMacro(); } } else { // Only one item has been selected for renaming. Use the custom // renaming mechanism from the views. Q_ASSERT(urls.count() == 1); - // TODO: until KFileItemDelegate supports editing, use the the Dolphin - // rename dialog as temporary workaround: + // TODO: Think about using KFileItemDelegate as soon as it supports editing. + // Currently the RenameDialog is used, but I'm not sure whether inline renaming + // is a benefit for the user at all -> let's wait for some input first... RenameDialog dialog(urls); if (dialog.exec() == QDialog::Rejected) { return; } const QString& newName = dialog.newName(); if (newName.isEmpty()) { view->statusBar()->setMessage(dialog.errorString(), DolphinStatusBar::Error); } else { const KUrl& oldUrl = urls.first(); KUrl newUrl = oldUrl.upUrl(); newUrl.addPath(newName); m_mainWindow->rename(oldUrl, newUrl); } } } void DolphinView::selectAll() { selectAll(QItemSelectionModel::Select); } void DolphinView::invertSelection() { selectAll(QItemSelectionModel::Toggle); } DolphinStatusBar* DolphinView::statusBar() const { return m_statusBar; } int DolphinView::contentsX() const { return itemView()->horizontalScrollBar()->value(); } int DolphinView::contentsY() const { return itemView()->verticalScrollBar()->value(); } void DolphinView::refreshSettings() { startDirLister(m_urlNavigator->url()); } void DolphinView::emitRequestItemInfo(const KUrl& url) { emit requestItemInfo(url); } bool DolphinView::isFilterBarVisible() const { return m_filterBar->isVisible(); } bool DolphinView::isUrlEditable() const { return m_urlNavigator->isUrlEditable(); } void DolphinView::zoomIn() { m_controller->triggerZoomIn(); } void DolphinView::zoomOut() { m_controller->triggerZoomOut(); } bool DolphinView::isZoomInPossible() const { return m_controller->isZoomInPossible(); } bool DolphinView::isZoomOutPossible() const { return m_controller->isZoomOutPossible(); } void DolphinView::setSorting(Sorting sorting) { if (sorting != this->sorting()) { updateSorting(sorting); } } DolphinView::Sorting DolphinView::sorting() const { return m_proxyModel->sorting(); } void DolphinView::setSortOrder(Qt::SortOrder order) { if (sortOrder() != order) { updateSortOrder(order); } } Qt::SortOrder DolphinView::sortOrder() const { return m_proxyModel->sortOrder(); } void DolphinView::setAdditionalInfo(KFileItemDelegate::AdditionalInformation info) { ViewProperties props(m_urlNavigator->url()); props.setAdditionalInfo(info); m_fileItemDelegate->setAdditionalInformation(info); emit additionalInfoChanged(info); reload(); } KFileItemDelegate::AdditionalInformation DolphinView::additionalInfo() const { return m_fileItemDelegate->additionalInformation(); } void DolphinView::goBack() { m_urlNavigator->goBack(); } void DolphinView::goForward() { m_urlNavigator->goForward(); } void DolphinView::goUp() { m_urlNavigator->goUp(); } void DolphinView::goHome() { m_urlNavigator->goHome(); } void DolphinView::setUrlEditable(bool editable) { m_urlNavigator->editUrl(editable); } const QLinkedList DolphinView::urlHistory(int& index) const { return m_urlNavigator->history(index); } bool DolphinView::hasSelection() const { return itemView()->selectionModel()->hasSelection(); } KFileItemList DolphinView::selectedItems() const { const QAbstractItemView* view = itemView(); // Our view has a selection, we will map them back to the DirModel // and then fill the KFileItemList. Q_ASSERT((view != 0) && (view->selectionModel() != 0)); const QItemSelection selection = m_proxyModel->mapSelectionToSource(view->selectionModel()->selection()); KFileItemList itemList; const QModelIndexList indexList = selection.indexes(); QModelIndexList::const_iterator end = indexList.end(); for (QModelIndexList::const_iterator it = indexList.begin(); it != end; ++it) { Q_ASSERT((*it).isValid()); KFileItem* item = m_dirModel->itemForIndex(*it); if (item != 0) { itemList.append(item); } } return itemList; } KUrl::List DolphinView::selectedUrls() const { KUrl::List urls; const KFileItemList list = selectedItems(); KFileItemList::const_iterator it = list.begin(); const KFileItemList::const_iterator end = list.end(); while (it != end) { KFileItem* item = *it; urls.append(item->url()); ++it; } return urls; } KFileItem* DolphinView::fileItem(const QModelIndex index) const { const QModelIndex dirModelIndex = m_proxyModel->mapToSource(index); return m_dirModel->itemForIndex(dirModelIndex); } void DolphinView::rename(const KUrl& source, const QString& newName) { bool ok = false; if (newName.isEmpty() || (source.fileName() == newName)) { return; } KUrl dest(source.upUrl()); dest.addPath(newName); const bool destExists = KIO::NetAccess::exists(dest, false, mainWindow()->activeView()); if (destExists) { // the destination already exists, hence ask the user // how to proceed... KIO::RenameDialog renameDialog(this, i18n("File Already Exists"), source.path(), dest.path(), KIO::M_OVERWRITE); switch (renameDialog.exec()) { case KIO::R_OVERWRITE: // the destination should be overwritten ok = KIO::NetAccess::file_move(source, dest, -1, true); break; case KIO::R_RENAME: { // a new name for the destination has been used KUrl newDest(renameDialog.newDestUrl()); ok = KIO::NetAccess::file_move(source, newDest); break; } default: // the renaming operation has been canceled reload(); return; } } else { // no destination exists, hence just move the file to // do the renaming ok = KIO::NetAccess::file_move(source, dest); } const QString destFileName = dest.fileName(); if (ok) { m_statusBar->setMessage(i18n("Renamed file '%1' to '%2'.",source.fileName(), destFileName), DolphinStatusBar::OperationCompleted); KonqOperations::rename(this, source, destFileName); } else { m_statusBar->setMessage(i18n("Renaming of file '%1' to '%2' failed.",source.fileName(), destFileName), DolphinStatusBar::Error); reload(); } } void DolphinView::reload() { startDirLister(m_urlNavigator->url(), true); } void DolphinView::mouseReleaseEvent(QMouseEvent* event) { QWidget::mouseReleaseEvent(event); mainWindow()->setActiveView(this); } DolphinMainWindow* DolphinView::mainWindow() const { return m_mainWindow; } void DolphinView::loadDirectory(const KUrl& url) { const ViewProperties props(url); const Mode mode = props.viewMode(); if (m_mode != mode) { m_mode = mode; createView(); emit modeChanged(); } const bool showHiddenFiles = props.showHiddenFiles(); if (showHiddenFiles != m_dirLister->showingDotFiles()) { m_dirLister->setShowingDotFiles(showHiddenFiles); emit showHiddenFilesChanged(); } const DolphinView::Sorting sorting = props.sorting(); if (sorting != m_proxyModel->sorting()) { m_proxyModel->setSorting(sorting); emit sortingChanged(sorting); } const Qt::SortOrder sortOrder = props.sortOrder(); if (sortOrder != m_proxyModel->sortOrder()) { m_proxyModel->setSortOrder(sortOrder); emit sortOrderChanged(sortOrder); } KFileItemDelegate::AdditionalInformation info = props.additionalInfo(); if (info != m_fileItemDelegate->additionalInformation()) { m_fileItemDelegate->setAdditionalInformation(info); emit additionalInfoChanged(info); } const bool showPreview = props.showPreview(); if (showPreview != m_controller->showPreview()) { m_controller->setShowPreview(showPreview); emit showPreviewChanged(); } startDirLister(url); emit urlChanged(url); m_statusBar->clear(); } void DolphinView::triggerItem(const QModelIndex& index) { if (!isValidNameIndex(index)) { return; } const Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers(); if ((modifier & Qt::ShiftModifier) || (modifier & Qt::ControlModifier)) { // items are selected by the user, hence don't trigger the // item specified by 'index' return; } KFileItem* item = m_dirModel->itemForIndex(m_proxyModel->mapToSource(index)); if (item == 0) { return; } // Prefer the local path over the URL. This assures that the // volume space information is correct. Assuming that the URL is media:/sda1, // and the local path is /windows/C: For the URL the space info is related // to the root partition (and hence wrong) and for the local path the space // info is related to the windows partition (-> correct). const QString localPath(item->localPath()); KUrl url; if (localPath.isEmpty()) { url = item->url(); } else { url = localPath; } if (item->isDir()) { setUrl(url); } else if (item->isFile()) { // allow to browse through ZIP and tar files KMimeType::Ptr mime = item->mimeTypePtr(); if (mime->is("application/x-zip")) { url.setProtocol("zip"); setUrl(url); } else if (mime->is("application/x-tar") || mime->is("application/x-tarz") || mime->is("application/x-tbz") || mime->is("application/x-tgz") || mime->is("application/x-tzo")) { url.setProtocol("tar"); setUrl(url); } else { item->run(); } } else { item->run(); } } void DolphinView::updateProgress(int percent) { if (m_showProgress) { m_statusBar->setProgress(percent); } } void DolphinView::updateItemCount() { if (m_showProgress) { m_statusBar->setProgressText(QString()); m_statusBar->setProgress(100); m_showProgress = false; } KFileItemList items(m_dirLister->items()); KFileItemList::const_iterator it = items.begin(); const KFileItemList::const_iterator end = items.end(); m_fileCount = 0; m_folderCount = 0; while (it != end) { KFileItem* item = *it; if (item->isDir()) { ++m_folderCount; } else { ++m_fileCount; } ++it; } updateStatusBar(); QTimer::singleShot(0, this, SLOT(restoreContentsPos())); } void DolphinView::generatePreviews(const KFileItemList& items) { if (m_controller->showPreview()) { KIO::PreviewJob* job = KIO::filePreview(items, 128); connect(job, SIGNAL(gotPreview(const KFileItem*, const QPixmap&)), this, SLOT(showPreview(const KFileItem*, const QPixmap&))); } const QMimeData* mimeData = QApplication::clipboard()->mimeData(); if (KonqMimeData::decodeIsCutSelection(mimeData)) { QTimer::singleShot(0, this, SLOT(applyCutEffect())); } } void DolphinView::showPreview(const KFileItem* item, const QPixmap& pixmap) { Q_ASSERT(item != 0); const QModelIndex idx = m_dirModel->indexForItem(*item); if (idx.isValid() && (idx.column() == 0)) { const QMimeData* mimeData = QApplication::clipboard()->mimeData(); if (KonqMimeData::decodeIsCutSelection(mimeData) && isCutItem(*item)) { KIconEffect iconEffect; QPixmap cutPixmap = iconEffect.apply(pixmap, K3Icon::Desktop, K3Icon::DisabledState); m_dirModel->setData(idx, cutPixmap, Qt::DecorationRole); } else { m_dirModel->setData(idx, pixmap, Qt::DecorationRole); } } } void DolphinView::restoreContentsPos() { int index = 0; const QLinkedList history = urlHistory(index); if (!history.isEmpty()) { QAbstractItemView* view = itemView(); // TODO: view->setCurrentItem(history[index].currentFileName()); QLinkedList::const_iterator it = history.begin(); it += index; view->horizontalScrollBar()->setValue((*it).contentsX()); view->verticalScrollBar()->setValue((*it).contentsY()); } } void DolphinView::showInfoMessage(const QString& msg) { m_statusBar->setMessage(msg, DolphinStatusBar::Information); } void DolphinView::showErrorMessage(const QString& msg) { m_statusBar->setMessage(msg, DolphinStatusBar::Error); } void DolphinView::emitSelectionChangedSignal() { emit selectionChanged(); } void DolphinView::closeFilterBar() { m_filterBar->hide(); emit showFilterBarChanged(false); } void DolphinView::startDirLister(const KUrl& url, bool reload) { if (!url.isValid()) { const QString location(url.pathOrUrl()); if (location.isEmpty()) { m_statusBar->setMessage(i18n("The location is empty."), DolphinStatusBar::Error); } else { m_statusBar->setMessage(i18n("The location '%1' is invalid.",location), DolphinStatusBar::Error); } return; } // Only show the directory loading progress if the status bar does // not contain another progress information. This means that // the directory loading progress information has the lowest priority. const QString progressText(m_statusBar->progressText()); m_showProgress = progressText.isEmpty() || (progressText == i18n("Loading directory...")); if (m_showProgress) { m_statusBar->setProgressText(i18n("Loading directory...")); m_statusBar->setProgress(0); } m_dirLister->stop(); m_dirLister->openUrl(url, false, reload); } QString DolphinView::defaultStatusBarText() const { return KIO::itemsSummaryString(m_fileCount + m_folderCount, m_fileCount, m_folderCount, 0, false); } QString DolphinView::selectionStatusBarText() const { QString text; const KFileItemList list = 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){ KFileItem* item = *it; if (item->isDir()) { ++folderCount; } else { ++fileCount; byteSize += item->size(); } ++it; } if (folderCount > 0) { text = i18np("1 Folder selected", "%1 Folders selected", folderCount); if (fileCount > 0) { text += ", "; } } if (fileCount > 0) { const QString sizeText(KIO::convertSize(byteSize)); text += i18np("1 File selected (%2)", "%1 Files selected (%2)", fileCount, sizeText); } return text; } void DolphinView::showFilterBar(bool show) { Q_ASSERT(m_filterBar != 0); if (show) { m_filterBar->show(); } else { m_filterBar->hide(); } } void DolphinView::updateStatusBar() { // As the item count information is less important // in comparison with other messages, it should only // be shown if: // - the status bar is empty or // - shows already the item count information or // - shows only a not very important information // - if any progress is given don't show the item count info at all const QString msg(m_statusBar->message()); const bool updateStatusBarMsg = (msg.isEmpty() || (msg == m_statusBar->defaultText()) || (m_statusBar->type() == DolphinStatusBar::Information)) && (m_statusBar->progress() == 100); const QString text(hasSelection() ? selectionStatusBarText() : defaultStatusBarText()); m_statusBar->setDefaultText(text); if (updateStatusBarMsg) { m_statusBar->setMessage(text, DolphinStatusBar::Default); } } void DolphinView::requestActivation() { m_mainWindow->setActiveView(this); } void DolphinView::updateCutItems() { const QMimeData* mimeData = QApplication::clipboard()->mimeData(); if (!KonqMimeData::decodeIsCutSelection(mimeData)) { return; } KFileItemList items(m_dirLister->items()); KFileItemList::const_iterator it = items.begin(); const KFileItemList::const_iterator end = items.end(); while (it != end) { KFileItem* item = *it; if (isCutItem(*item)) { QPixmap pixmap = item->pixmap(0); KIconEffect iconEffect; pixmap = iconEffect.apply(pixmap, K3Icon::Desktop, K3Icon::DisabledState); const QModelIndex idx = m_dirModel->indexForItem(*item); if (idx.isValid()) { m_dirModel->setData(idx, pixmap, Qt::DecorationRole); } } ++it; } } void DolphinView::changeNameFilter(const QString& nameFilter) { // The name filter of KDirLister does a 'hard' filtering, which // means that only the items are shown where the names match // exactly the filter. This is non-transparent for the user, which // just wants to have a 'soft' filtering: does the name contain // the filter string? QString adjustedFilter(nameFilter); adjustedFilter.insert(0, '*'); adjustedFilter.append('*'); // Use the ProxyModel to filter: // This code is #ifdefed as setNameFilter behaves // slightly different than the QSortFilterProxyModel // as it will not remove directories. I will ask // our beloved usability experts for input // -- z. #if 0 m_dirLister->setNameFilter(adjustedFilter); m_dirLister->emitChanges(); #else m_proxyModel->setFilterRegExp( nameFilter ); #endif } void DolphinView::openContextMenu(const QPoint& pos) { KFileItem* item = 0; const QModelIndex index = itemView()->indexAt(pos); if (isValidNameIndex(index)) { item = fileItem(index); } DolphinContextMenu contextMenu(this, item); contextMenu.open(); } void DolphinView::dropUrls(const KUrl::List& urls, const QModelIndex& index, QWidget* source) { KFileItem* directory = 0; if (isValidNameIndex(index)) { KFileItem* item = fileItem(index); Q_ASSERT(item != 0); if (item->isDir()) { // the URLs are dropped above a directory directory = item; } } if ((directory == 0) && (source == itemView())) { // The dropping is done into the same viewport where // the dragging has been started. Just ignore this... return; } const KUrl& destination = (directory == 0) ? url() : directory->url(); kDebug() << "DolphinView::dropUrls() - destination: " << destination.prettyUrl() << endl; dropUrls(urls, destination); } void DolphinView::dropUrls(const KUrl::List& urls, const KUrl& destination) { m_mainWindow->dropUrls(urls, destination); } void DolphinView::updateSorting(DolphinView::Sorting sorting) { ViewProperties props(url()); props.setSorting(sorting); m_proxyModel->setSorting(sorting); emit sortingChanged(sorting); } void DolphinView::updateSortOrder(Qt::SortOrder order) { ViewProperties props(url()); props.setSortOrder(order); m_proxyModel->setSortOrder(order); emit sortOrderChanged(order); } void DolphinView::emitContentsMoved() { emit contentsMoved(contentsX(), contentsY()); } void DolphinView::updateActivationState() { m_urlNavigator->setActive(isActive()); } void DolphinView::createView() { // delete current view QAbstractItemView* view = itemView(); if (view != 0) { m_topLayout->removeWidget(view); view->close(); view->deleteLater(); view = 0; m_iconsView = 0; m_detailsView = 0; m_fileItemDelegate = 0; } Q_ASSERT(m_iconsView == 0); Q_ASSERT(m_detailsView == 0); // ... and recreate it representing the current mode switch (m_mode) { case IconsView: m_iconsView = new DolphinIconsView(this, m_controller); view = m_iconsView; break; case DetailsView: m_detailsView = new DolphinDetailsView(this, m_controller); view = m_detailsView; break; } Q_ASSERT(view != 0); m_fileItemDelegate = new KFileItemDelegate(view); view->setItemDelegate(m_fileItemDelegate); view->setModel(m_proxyModel); view->setSelectionMode(QAbstractItemView::ExtendedSelection); new KMimeTypeResolver(view, m_dirModel); m_topLayout->insertWidget(1, view); connect(view->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)), m_controller, SLOT(indicateSelectionChange())); connect(view->verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(emitContentsMoved())); connect(view->horizontalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(emitContentsMoved())); } void DolphinView::selectAll(QItemSelectionModel::SelectionFlags flags) { QItemSelectionModel* selectionModel = itemView()->selectionModel(); const QAbstractItemModel* itemModel = selectionModel->model(); const QModelIndex topLeft = itemModel->index(0, 0); const QModelIndex bottomRight = itemModel->index(itemModel->rowCount() - 1, itemModel->columnCount() - 1); QItemSelection selection(topLeft, bottomRight); selectionModel->select(selection, flags); } QAbstractItemView* DolphinView::itemView() const { Q_ASSERT((m_iconsView == 0) || (m_detailsView == 0)); if (m_detailsView != 0) { return m_detailsView; } return m_iconsView; } bool DolphinView::isValidNameIndex(const QModelIndex& index) const { return index.isValid() && (index.column() == KDirModel::Name); } bool DolphinView::isCutItem(const KFileItem& item) const { const QMimeData* mimeData = QApplication::clipboard()->mimeData(); const KUrl::List cutUrls = KUrl::List::fromMimeData(mimeData); const KUrl& itemUrl = item.url(); KUrl::List::const_iterator it = cutUrls.begin(); const KUrl::List::const_iterator end = cutUrls.end(); while (it != end){ if (*it == itemUrl) { return true; } ++it; } return false; } #include "dolphinview.moc" diff --git a/src/renamedialog.cpp b/src/renamedialog.cpp index e68feff8d..4055b32a6 100644 --- a/src/renamedialog.cpp +++ b/src/renamedialog.cpp @@ -1,104 +1,121 @@ /*************************************************************************** * Copyright (C) 2006 by Peter Penz (peter.penz@gmx.at) * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ #include "renamedialog.h" #include #include #include #include RenameDialog::RenameDialog(const KUrl::List& items) : - KDialog() + KDialog(), + m_renameOneItem(false) { - setCaption(i18n("Rename Items")); + const QSize minSize = minimumSize(); + setMinimumSize(QSize(320, minSize.height())); + + const int itemCount = items.count(); + Q_ASSERT(itemCount >= 1); + m_renameOneItem = (itemCount == 1); + + setCaption(m_renameOneItem ? i18n("Rename Item") : i18n("Rename Items")); setButtons(Ok|Cancel); setDefaultButton(Ok); setButtonGuiItem(Ok, KGuiItem(i18n("Rename"), "dialog-apply")); QWidget* page = new QWidget(this); setMainWidget(page); QVBoxLayout* topLayout = new QVBoxLayout(page); topLayout->setMargin(KDialog::marginHint()); - const int itemCount = items.count(); - QLabel* editLabel = new QLabel(i18n("Rename the %1 selected items to:", itemCount), - page); + QLabel* editLabel = 0; + if (m_renameOneItem) { + const KUrl& url = items.first(); + editLabel = new QLabel(i18n("Rename the item '%1' to:", url.fileName()), + page); + } + else { + editLabel = new QLabel(i18n("Rename the %1 selected items to:", itemCount), + page); + } m_lineEdit = new KLineEdit(page); - m_newName = i18n("New name #"); - - // TODO: reactivate assertion as soon as KFileItemDelegate supports renaming of - // single items - //Q_ASSERT(itemCount > 1); + m_newName = m_renameOneItem ? i18n("New name") : i18n("New name #"); QString postfix(items[0].prettyUrl().section('.',1)); if (postfix.length() > 0) { // The first item seems to have a postfix (e. g. 'jpg' or 'txt'). Now // check whether all other items have the same postfix. If this is the // case, add this postfix to the name suggestion. postfix.insert(0, '.'); for (int i = 1; i < itemCount; ++i) { if (!items[i].prettyUrl().contains(postfix)) { // at least one item does not have the same postfix postfix.truncate(0); break; } } } - const int selectionLength = m_newName.length(); + int selectionLength = m_newName.length(); + if (!m_renameOneItem) { + --selectionLength; // don't select the # character + } + if (postfix.length() > 0) { m_newName.append(postfix); } m_lineEdit->setText(m_newName); - m_lineEdit->setSelection(0, selectionLength - 1); + m_lineEdit->setSelection(0, selectionLength); m_lineEdit->setFocus(); - QLabel* infoLabel = new QLabel(i18n("(# will be replaced by ascending numbers)"), page); - topLayout->addWidget(editLabel); topLayout->addWidget(m_lineEdit); - topLayout->addWidget(infoLabel); + + if (!m_renameOneItem) { + QLabel* infoLabel = new QLabel(i18n("(# will be replaced by ascending numbers)"), page); + topLayout->addWidget(infoLabel); + } } RenameDialog::~RenameDialog() { } void RenameDialog::slotButtonClicked(int button) { - if (button==Ok) { + if (button == Ok) { m_newName = m_lineEdit->text(); if (m_newName.isEmpty()) { m_errorString = i18n("The new name is empty. A name with at least one character must be entered."); } - else if (m_newName.contains('#') != 1) { + else if (!m_renameOneItem && m_newName.contains('#') != 1) { m_newName.truncate(0); m_errorString = i18n("The name must contain exactly one # character."); } } KDialog::slotButtonClicked(button); } #include "renamedialog.moc" diff --git a/src/renamedialog.h b/src/renamedialog.h index c08856f8c..220b8b803 100644 --- a/src/renamedialog.h +++ b/src/renamedialog.h @@ -1,78 +1,82 @@ /*************************************************************************** * Copyright (C) 2006 by Peter Penz (peter.penz@gmx.at) * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ #ifndef RENAMEDIALOG_H #define RENAMEDIALOG_H #include #include #include class KLineEdit; /** * @brief Dialog for renaming a variable number of files. * * The renaming is not done by the dialog, the invoker * must do this itself: * \code * RenameDialog dialog(...); * if (dialog.exec() == QDialog::Accepted) { * const QString& newName = dialog.newName(); * if (newName.isEmpty()) { * // an invalid name has been chosen, use * // dialog.errorString() to tell the user about this * } * else { * // rename items corresponding to the new name * } * } * \endcode */ class RenameDialog : public KDialog { Q_OBJECT public: explicit RenameDialog(const KUrl::List& items); virtual ~RenameDialog(); /** - * Returns the new name of the items. If the returned string is not empty, - * then it is assured that the string contains exactly one character #, - * which should be replaced by ascending numbers. An empty string indicates - * that the user has removed the # character. + * Returns the new name of the items. If more than one + * item should be renamed, then it is assured that the # character + * is part of the returned string. If the returned string is empty, + * then RenameDialog::errorString() should be used to show the reason + * of having an empty string (e. g. if the # character has + * been deleted by the user, although more then one item should be + * renamed). */ const QString& newName() const { return m_newName; } /** * Returns the error string, if Dialog::newName() returned an empty string. */ const QString& errorString() const { return m_errorString; } protected slots: virtual void slotButtonClicked(int button); private: + bool m_renameOneItem; KLineEdit* m_lineEdit; QString m_newName; QString m_errorString; }; #endif diff --git a/src/viewpropsprogressinfo.cpp b/src/viewpropsprogressinfo.cpp index 36aac51e9..61f6423c4 100644 --- a/src/viewpropsprogressinfo.cpp +++ b/src/viewpropsprogressinfo.cpp @@ -1,144 +1,147 @@ /*************************************************************************** * Copyright (C) 2006 by Peter Penz * * peter.penz@gmx.at * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ #include "viewpropsprogressinfo.h" #include "applyviewpropsjob.h" #include "viewproperties.h" #include #include #include #include #include #include #include #include ViewPropsProgressInfo::ViewPropsProgressInfo(QWidget* parent, const KUrl& dir, const ViewProperties& viewProps) : KDialog(parent), m_dir(dir), m_viewProps(0), m_label(0), m_progressBar(0), m_dirSizeJob(0), m_applyViewPropsJob(0), m_timer(0) { - setCaption(i18n("Applying view properties")); + const QSize minSize = minimumSize(); + setMinimumSize(QSize(320, minSize.height())); + + setCaption(i18n("Applying View Properties")); setButtons(KDialog::Cancel); m_viewProps = new ViewProperties(dir); m_viewProps->setDirProperties(viewProps); // the view properties are stored by the ViewPropsApplierJob, so prevent // that the view properties are saved twice: m_viewProps->setAutoSaveEnabled(false); QWidget* main = new QWidget(); QVBoxLayout* topLayout = new QVBoxLayout(); m_label = new QLabel(i18n("Counting folders: %1", 0), main); m_progressBar = new QProgressBar(main); m_progressBar->setMinimum(0); m_progressBar->setMaximum(0); m_progressBar->setValue(0); topLayout->addWidget(m_label); topLayout->addWidget(m_progressBar); main->setLayout(topLayout); setMainWidget(main); // Use the directory size job to count the number of directories first. This // allows to give a progress indication for the user when applying the view // properties later. m_dirSizeJob = KIO::directorySize(dir); connect(m_dirSizeJob, SIGNAL(result(KJob*)), this, SLOT(applyViewProperties())); // The directory size job cannot emit any progress signal, as it is not aware // about the total number of directories. Therefor a timer is triggered, which // periodically updates the current directory count. m_timer = new QTimer(this); connect(m_timer, SIGNAL(timeout()), this, SLOT(updateProgress())); m_timer->start(300); connect(this, SIGNAL(cancelClicked()), this, SLOT(cancelApplying())); } ViewPropsProgressInfo::~ViewPropsProgressInfo() { delete m_viewProps; m_viewProps = 0; } void ViewPropsProgressInfo::closeEvent(QCloseEvent* event) { m_timer->stop(); m_applyViewPropsJob = 0; KDialog::closeEvent(event); } void ViewPropsProgressInfo::updateProgress() { if (m_dirSizeJob != 0) { const int subdirs = m_dirSizeJob->totalSubdirs(); m_label->setText(i18n("Counting folders: %1", subdirs)); } if (m_applyViewPropsJob != 0) { const int progress = m_applyViewPropsJob->progress(); m_progressBar->setValue(progress); } } void ViewPropsProgressInfo::applyViewProperties() { if (m_dirSizeJob->error()) { return; } const int subdirs = m_dirSizeJob->totalSubdirs(); m_label->setText(i18n("Folders: %1", subdirs)); m_progressBar->setMaximum(subdirs); m_dirSizeJob = 0; m_applyViewPropsJob = new ApplyViewPropsJob(m_dir, *m_viewProps); connect(m_applyViewPropsJob, SIGNAL(result(KJob*)), this, SLOT(close())); } void ViewPropsProgressInfo::cancelApplying() { if (m_dirSizeJob != 0) { m_dirSizeJob->doKill(); } if (m_applyViewPropsJob != 0) { m_applyViewPropsJob->doKill(); } } #include "viewpropsprogressinfo.moc"