X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/20b58b6c03f6fa56d0cc1da90c13658664c153f1..75da26f8b0ad0835768c2d16fb7047e99f6b9705:/src/dolphinview.cpp diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp index fb75f1c67..6569530ce 100644 --- a/src/dolphinview.cpp +++ b/src/dolphinview.cpp @@ -15,74 +15,88 @@ * 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., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ #include "dolphinview.h" -#include -//Added by qt3to4: -#include +#include + +#include +#include #include +#include #include -#include -#include +#include + +#include +#include #include +#include #include -#include -#include +#include +#include +#include +#include +#include +#include -#include "urlnavigator.h" +#include "dolphincontroller.h" #include "dolphinstatusbar.h" -#include "dolphin.h" +#include "dolphinmainwindow.h" #include "dolphindirlister.h" -#include "viewproperties.h" +#include "dolphinsortfilterproxymodel.h" #include "dolphindetailsview.h" #include "dolphiniconsview.h" #include "dolphincontextmenu.h" -#include "undomanager.h" -#include "renamedialog.h" -#include "progressindicator.h" - #include "filterbar.h" +#include "renamedialog.h" +#include "urlnavigator.h" +#include "viewproperties.h" -DolphinView::DolphinView(QWidget *parent, +DolphinView::DolphinView(DolphinMainWindow* mainWindow, + QWidget* parent, const KUrl& url, Mode mode, bool showHiddenFiles) : QWidget(parent), - m_refreshing(false), m_showProgress(false), m_mode(mode), - m_iconsView(0), - m_detailsView(0), - m_statusBar(0), m_iconSize(0), m_folderCount(0), m_fileCount(0), - m_filterBar(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 Q3VBoxLayout(this); - - Dolphin& dolphin = Dolphin::mainWin(); + m_topLayout = new QVBoxLayout(this); + m_topLayout->setSpacing(0); + m_topLayout->setMargin(0); - connect(this, SIGNAL(signalModeChanged()), - &dolphin, SLOT(slotViewModeChanged())); - connect(this, SIGNAL(signalShowHiddenFilesChanged()), - &dolphin, SLOT(slotShowHiddenFilesChanged())); - connect(this, SIGNAL(signalSortingChanged(DolphinView::Sorting)), - &dolphin, SLOT(slotSortingChanged(DolphinView::Sorting))); - connect(this, SIGNAL(signalSortOrderChanged(Qt::SortOrder)), - &dolphin, SLOT(slotSortOrderChanged(Qt::SortOrder))); + connect(m_mainWindow, SIGNAL(activeViewChanged()), + this, SLOT(updateActivationState())); - m_urlNavigator = new URLNavigator(url, this); - connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)), - this, SLOT(slotURLChanged(const KUrl&))); + m_urlNavigator = new UrlNavigator(url, this); + m_urlNavigator->setShowHiddenFiles(showHiddenFiles); connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)), - &dolphin, SLOT(slotURLChanged(const KUrl&))); - connect(m_urlNavigator, SIGNAL(historyChanged()), - &dolphin, SLOT(slotHistoryChanged())); + 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); @@ -90,37 +104,65 @@ DolphinView::DolphinView(QWidget *parent, m_dirLister->setAutoUpdate(true); m_dirLister->setMainWindow(this); m_dirLister->setShowingDotFiles(showHiddenFiles); + m_dirLister->setDelayedMimeTypes(true); + connect(m_dirLister, SIGNAL(clear()), - this, SLOT(slotClear())); + this, SLOT(updateStatusBar())); connect(m_dirLister, SIGNAL(percent(int)), - this, SLOT(slotPercent(int))); + this, SLOT(updateProgress(int))); connect(m_dirLister, SIGNAL(deleteItem(KFileItem*)), - this, SLOT(slotDeleteItem(KFileItem*))); + this, SLOT(updateStatusBar())); + connect(m_dirLister, SIGNAL(completed()), + this, SLOT(updateItemCount())); connect(m_dirLister, SIGNAL(completed()), - this, SLOT(slotCompleted())); + this, SLOT(updateCutItems())); + connect(m_dirLister, SIGNAL(newItems(const KFileItemList&)), + this, SLOT(generatePreviews(const KFileItemList&))); connect(m_dirLister, SIGNAL(infoMessage(const QString&)), - this, SLOT(slotInfoMessage(const QString&))); + this, SLOT(showInfoMessage(const QString&))); connect(m_dirLister, SIGNAL(errorMessage(const QString&)), - this, SLOT(slotErrorMessage(const QString&))); - connect(m_dirLister, SIGNAL(refreshItems(const KFileItemList&)), - this, SLOT(slotRefreshItems(const KFileItemList&))); - connect(m_dirLister, SIGNAL(redirection(const KUrl&, const KUrl&)), - this, SIGNAL(redirection(const KUrl&, const KUrl&))); - connect(m_dirLister, SIGNAL(newItems(const KFileItemList&)), - this, SLOT(slotAddItems(const KFileItemList&))); - - m_iconSize = K3Icon::SizeMedium; + 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())); - m_topLayout->addWidget(m_urlNavigator); createView(); + m_iconSize = K3Icon::SizeMedium; + m_filterBar = new FilterBar(this); m_filterBar->hide(); - m_topLayout->addWidget(m_filterBar); - connect(m_filterBar, SIGNAL(signalFilterChanged(const QString&)), - this, SLOT(slotChangeNameFilter(const QString&))); + 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() @@ -129,9 +171,10 @@ DolphinView::~DolphinView() m_dirLister = 0; } -void DolphinView::setURL(const KUrl& url) +void DolphinView::setUrl(const KUrl& url) { - m_urlNavigator->setURL(url); + m_urlNavigator->setUrl(url); + m_controller->setUrl(url); } const KUrl& DolphinView::url() const @@ -139,40 +182,26 @@ const KUrl& DolphinView::url() const return m_urlNavigator->url(); } -void DolphinView::requestActivation() -{ - Dolphin::mainWin().setActiveView(this); -} - bool DolphinView::isActive() const { - return (Dolphin::mainWin().activeView() == this); + return m_mainWindow->activeView() == this; } void DolphinView::setMode(Mode mode) { if (mode == m_mode) { - return; // the wished mode is already set - } - - QWidget* view = (m_iconsView != 0) ? static_cast(m_iconsView) : - static_cast(m_detailsView); - if (view != 0) { - m_topLayout->remove(view); - view->close(); - view->deleteLater(); - m_iconsView = 0; - m_detailsView = 0; + return; // the wished mode is already set } m_mode = mode; - createView(); - ViewProperties props(m_urlNavigator->url()); props.setViewMode(m_mode); - emit signalModeChanged(); + createView(); + startDirLister(m_urlNavigator->url()); + + emit modeChanged(); } DolphinView::Mode DolphinView::mode() const @@ -180,39 +209,48 @@ DolphinView::Mode DolphinView::mode() const return m_mode; } -void DolphinView::setShowHiddenFilesEnabled(bool show) +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.setShowHiddenFilesEnabled(show); + props.setShowHiddenFiles(show); props.save(); m_dirLister->setShowingDotFiles(show); + m_urlNavigator->setShowHiddenFiles(show); - emit signalShowHiddenFilesChanged(); + emit showHiddenFilesChanged(); reload(); } -bool DolphinView::isShowHiddenFilesEnabled() const +bool DolphinView::showHiddenFiles() const { return m_dirLister->showingDotFiles(); } -void DolphinView::setViewProperties(const ViewProperties& props) -{ - setMode(props.viewMode()); - setSorting(props.sorting()); - setSortOrder(props.sortOrder()); - setShowHiddenFilesEnabled(props.isShowHiddenFilesEnabled()); -} - void DolphinView::renameSelectedItems() { - const KUrl::List urls = selectedURLs(); + 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. @@ -221,31 +259,32 @@ void DolphinView::renameSelectedItems() return; } - DolphinView* view = Dolphin::mainWin().activeView(); + DolphinView* view = mainWindow()->activeView(); const QString& newName = dialog.newName(); if (newName.isEmpty()) { view->statusBar()->setMessage(i18n("The new item name is invalid."), DolphinStatusBar::Error); } else { - UndoManager& undoMan = UndoManager::instance(); - undoMan.beginMacro(); + // TODO: check how this can be integrated into KonqUndoManager/KonqOperations + + //UndoManager& undoMan = UndoManager::instance(); + //undoMan.beginMacro(); assert(newName.contains('#')); const int urlsCount = urls.count(); - ProgressIndicator* progressIndicator = - new ProgressIndicator(i18n("Renaming items..."), - i18n("Renaming finished."), - urlsCount); // iterate through all selected items and rename them... - const int replaceIndex = newName.find('#'); + const int replaceIndex = newName.indexOf('#'); assert(replaceIndex >= 0); for (int i = 0; i < urlsCount; ++i) { const KUrl& source = urls[i]; + QString number; + number.setNum(i + 1); + QString name(newName); - name.replace(replaceIndex, 1, renameIndexPresentation(i + 1, urlsCount)); + name.replace(replaceIndex, 1, number); if (source.fileName() != name) { KUrl dest(source.upUrl()); @@ -253,37 +292,32 @@ void DolphinView::renameSelectedItems() const bool destExists = KIO::NetAccess::exists(dest, false, view); if (destExists) { - delete progressIndicator; - progressIndicator = 0; - view->statusBar()->setMessage(i18n("Renaming failed (item '%1' already exists).").arg(name), + 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); + //DolphinCommand command(DolphinCommand::Rename, source, dest); + //undoMan.addCommand(command); } } - - progressIndicator->execOperation(); } - delete progressIndicator; - progressIndicator = 0; - undoMan.endMacro(); + //undoMan.endMacro(); } } else { // Only one item has been selected for renaming. Use the custom // renaming mechanism from the views. assert(urls.count() == 1); - if (m_mode == DetailsView) { - Q3ListViewItem* item = m_detailsView->firstChild(); + // TODO: + /*if (m_mode == DetailsView) { + Q3ListViewItem* item = m_iconsView->firstChild(); while (item != 0) { if (item->isSelected()) { - m_detailsView->rename(item, DolphinDetailsView::NameColumn); + m_iconsView->rename(item, DolphinDetailsView::NameColumn); break; } item = item->nextSibling(); @@ -298,18 +332,18 @@ void DolphinView::renameSelectedItems() } item = static_cast(item->nextItem()); } - } + }*/ } } void DolphinView::selectAll() { - fileView()->selectAll(); + selectAll(QItemSelectionModel::Select); } void DolphinView::invertSelection() { - fileView()->invertSelection(); + selectAll(QItemSelectionModel::Toggle); } DolphinStatusBar* DolphinView::statusBar() const @@ -319,145 +353,93 @@ DolphinStatusBar* DolphinView::statusBar() const int DolphinView::contentsX() const { - return scrollView()->contentsX(); + + return itemView()->horizontalScrollBar()->value(); } int DolphinView::contentsY() const { - return scrollView()->contentsY(); + return itemView()->verticalScrollBar()->value(); } void DolphinView::refreshSettings() { - if (m_iconsView != 0) { - m_iconsView->refreshSettings(); - } - - if (m_detailsView != 0) { - // TODO: There is no usable interface in QListView/KFileDetailView - // to hide/show columns. The easiest approach is to delete - // the current instance and recreate a new one, which automatically - // refreshs the settings. If a proper interface is available in Qt4 - // m_detailsView->refreshSettings() would be enough. - m_topLayout->remove(m_detailsView); - m_detailsView->close(); - m_detailsView->deleteLater(); - m_detailsView = 0; - - createView(); - } + startDirLister(m_urlNavigator->url()); } -void DolphinView::updateStatusBar() +void DolphinView::emitRequestItemInfo(const KUrl& url) { - // 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); - } + emit requestItemInfo(url); } -void DolphinView::requestItemInfo(const KUrl& url) +bool DolphinView::isFilterBarVisible() const { - emit signalRequestItemInfo(url); + return m_filterBar->isVisible(); } -bool DolphinView::isURLEditable() const +bool DolphinView::isUrlEditable() const { - return m_urlNavigator->isURLEditable(); + return m_urlNavigator->isUrlEditable(); } void DolphinView::zoomIn() { - itemEffectsManager()->zoomIn(); + m_controller->triggerZoomIn(); } void DolphinView::zoomOut() { - itemEffectsManager()->zoomOut(); + m_controller->triggerZoomOut(); } bool DolphinView::isZoomInPossible() const { - return itemEffectsManager()->isZoomInPossible(); + return m_controller->isZoomInPossible(); } bool DolphinView::isZoomOutPossible() const { - return itemEffectsManager()->isZoomOutPossible(); + return m_controller->isZoomOutPossible(); } void DolphinView::setSorting(Sorting sorting) { if (sorting != this->sorting()) { - KFileView* view = fileView(); - int spec = view->sorting() & ~QDir::Name & ~QDir::Size & ~QDir::Time & ~QDir::Unsorted; - - switch (sorting) { - case SortByName: spec = spec | QDir::Name; break; - case SortBySize: spec = spec | QDir::Size; break; - case SortByDate: spec = spec | QDir::Time; break; - default: break; - } - - ViewProperties props(url()); - props.setSorting(sorting); - - view->setSorting(static_cast(spec)); - - emit signalSortingChanged(sorting); + updateSorting(sorting); } } DolphinView::Sorting DolphinView::sorting() const { - const QDir::SortFlags spec = fileView()->sorting(); - - if (spec & QDir::Time) { - return SortByDate; - } - - if (spec & QDir::Size) { - return SortBySize; - } - - return SortByName; + return m_proxyModel->sorting(); } void DolphinView::setSortOrder(Qt::SortOrder order) { if (sortOrder() != order) { - KFileView* view = fileView(); - int sorting = view->sorting(); - sorting = (order == Qt::Ascending) ? (sorting & ~QDir::Reversed) : - (sorting | QDir::Reversed); + updateSortOrder(order); + } +} + +Qt::SortOrder DolphinView::sortOrder() const +{ + return m_proxyModel->sortOrder(); +} - ViewProperties props(url()); - props.setSortOrder(order); +void DolphinView::setAdditionalInfo(KFileItemDelegate::AdditionalInformation info) +{ + ViewProperties props(m_urlNavigator->url()); + props.setAdditionalInfo(info); - view->setSorting(static_cast(sorting)); + m_fileItemDelegate->setAdditionalInformation(info); - emit signalSortOrderChanged(order); - } + emit additionalInfoChanged(info); + reload(); } -Qt::SortOrder DolphinView::sortOrder() const +KFileItemDelegate::AdditionalInformation DolphinView::additionalInfo() const { - return fileView()->isReversed() ? Qt::Descending : Qt::Ascending; + return m_fileItemDelegate->additionalInformation(); } void DolphinView::goBack() @@ -480,54 +462,66 @@ void DolphinView::goHome() m_urlNavigator->goHome(); } -void DolphinView::setURLEditable(bool editable) +void DolphinView::setUrlEditable(bool editable) { - m_urlNavigator->editURL(editable); + m_urlNavigator->editUrl(editable); } -const Q3ValueList DolphinView::urlHistory(int& index) const +const QLinkedList DolphinView::urlHistory(int& index) const { return m_urlNavigator->history(index); } bool DolphinView::hasSelection() const { - const KFileItemList* list = selectedItems(); - return (list != 0) && !list->isEmpty(); + return itemView()->selectionModel()->hasSelection(); } -const KFileItemList* DolphinView::selectedItems() const +KFileItemList DolphinView::selectedItems() const { - return fileView()->selectedItems(); -} + const QAbstractItemView* view = itemView(); -KUrl::List DolphinView::selectedURLs() const -{ - KUrl::List urls; + // 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 KFileItemList* list = fileView()->selectedItems(); - if (list != 0) { - KFileItemList::const_iterator it = list->begin(); - const KFileItemList::const_iterator end = list->end(); - KFileItem* item = 0; - while (it != end) { - urls.append(item->url()); - ++it; + 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 urls; + return itemList; } -const KFileItem* DolphinView::currentFileItem() const +KUrl::List DolphinView::selectedUrls() const { - return fileView()->currentFileItem(); + 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; } -void DolphinView::openContextMenu(KFileItem* fileInfo, const QPoint& pos) +KFileItem* DolphinView::fileItem(const QModelIndex index) const { - DolphinContextMenu contextMenu(this, fileInfo, pos); - contextMenu.open(); + const QModelIndex dirModelIndex = m_proxyModel->mapToSource(index); + return m_dirModel->itemForIndex(dirModelIndex); } void DolphinView::rename(const KUrl& source, const QString& newName) @@ -543,15 +537,15 @@ void DolphinView::rename(const KUrl& source, const QString& newName) const bool destExists = KIO::NetAccess::exists(dest, false, - Dolphin::mainWin().activeView()); + mainWindow()->activeView()); if (destExists) { // the destination already exists, hence ask the user // how to proceed... - KIO::RenameDlg renameDialog(this, - i18n("File Already Exists"), - source.path(), - dest.path(), - KIO::M_OVERWRITE); + 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 @@ -577,15 +571,15 @@ void DolphinView::rename(const KUrl& source, const QString& newName) ok = KIO::NetAccess::file_move(source, dest); } + const QString destFileName = dest.fileName(); if (ok) { - m_statusBar->setMessage(i18n("Renamed file '%1' to '%2'.").arg(source.fileName(), dest.fileName()), + m_statusBar->setMessage(i18n("Renamed file '%1' to '%2'.",source.fileName(), destFileName), DolphinStatusBar::OperationCompleted); - DolphinCommand command(DolphinCommand::Rename, source, dest); - UndoManager::instance().addCommand(command); + KonqOperations::rename(this, source, destFileName); } else { - m_statusBar->setMessage(i18n("Renaming of file '%1' to '%2' failed.").arg(source.fileName(), dest.fileName()), + m_statusBar->setMessage(i18n("Renaming of file '%1' to '%2' failed.",source.fileName(), destFileName), DolphinStatusBar::Error); reload(); } @@ -596,162 +590,135 @@ void DolphinView::reload() startDirLister(m_urlNavigator->url(), true); } -void DolphinView::slotURLListDropped(QDropEvent* /* event */, - const KUrl::List& urls, - const KUrl& url) +void DolphinView::mouseReleaseEvent(QMouseEvent* event) { - KUrl destination(url); - if (destination.isEmpty()) { - destination = m_urlNavigator->url(); - } - else { - // Check whether the destination URL is a directory. If this is not the - // case, use the navigator URL as destination (otherwise the destination, - // which represents a file, would be replaced by a copy- or move-operation). - KFileItem fileItem(KFileItem::Unknown, KFileItem::Unknown, destination); - if (!fileItem.isDir()) { - destination = m_urlNavigator->url(); - } - } - - Dolphin::mainWin().dropURLs(urls, destination); + QWidget::mouseReleaseEvent(event); + mainWindow()->setActiveView(this); } -void DolphinView::mouseReleaseEvent(QMouseEvent* event) +DolphinMainWindow* DolphinView::mainWindow() const { - QWidget::mouseReleaseEvent(event); - Dolphin::mainWin().setActiveView(this); + return m_mainWindow; } -void DolphinView::slotURLChanged(const KUrl& url) +void DolphinView::loadDirectory(const KUrl& url) { const ViewProperties props(url); - setMode(props.viewMode()); - const bool showHiddenFiles = props.isShowHiddenFilesEnabled(); - setShowHiddenFilesEnabled(showHiddenFiles); - m_dirLister->setShowingDotFiles(showHiddenFiles); + const Mode mode = props.viewMode(); + if (m_mode != mode) { + m_mode = mode; + createView(); + emit modeChanged(); + } - setSorting(props.sorting()); - setSortOrder(props.sortOrder()); + const bool showHiddenFiles = props.showHiddenFiles(); + if (showHiddenFiles != m_dirLister->showingDotFiles()) { + m_dirLister->setShowingDotFiles(showHiddenFiles); + emit showHiddenFilesChanged(); + } - startDirLister(url); + const DolphinView::Sorting sorting = props.sorting(); + if (sorting != m_proxyModel->sorting()) { + m_proxyModel->setSorting(sorting); + emit sortingChanged(sorting); + } - // The selectionChanged signal is not emitted when a new view object is - // created. The application does not care whether a view is represented by a - // different instance, hence inform the application that the selection might have - // changed so that it can update it's actions. - Dolphin::mainWin().slotSelectionChanged(); + const Qt::SortOrder sortOrder = props.sortOrder(); + if (sortOrder != m_proxyModel->sortOrder()) { + m_proxyModel->setSortOrder(sortOrder); + emit sortOrderChanged(sortOrder); + } - emit signalURLChanged(url); -} + KFileItemDelegate::AdditionalInformation info = props.additionalInfo(); + if (info != m_fileItemDelegate->additionalInformation()) { + m_fileItemDelegate->setAdditionalInformation(info); -void DolphinView::triggerIconsViewItem(Q3IconViewItem* item) -{ - /* KDE4-TODO: - const Qt::ButtonState keyboardState = KApplication::keyboardMouseState(); - const bool isSelectionActive = ((keyboardState & Qt::ShiftModifier) > 0) || - ((keyboardState & Qt::ControlModifier) > 0);*/ - const bool isSelectionActive = false; - if ((item != 0) && !isSelectionActive) { - // Updating the URL must be done outside the scope of this slot, - // as iconview items will get deleted. - QTimer::singleShot(0, this, SLOT(updateURL())); - Dolphin::mainWin().setActiveView(this); + 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::triggerDetailsViewItem(Q3ListViewItem* item, - const QPoint& pos, - int /* column */) +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; } - if (m_detailsView->isOnFilename(item, pos)) { - // Updating the URL must be done outside the scope of this slot, - // as listview items will get deleted. - QTimer::singleShot(0, this, SLOT(updateURL())); - Dolphin::mainWin().setActiveView(this); + // 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 { - m_detailsView->clearSelection(); + url = localPath; } -} - -void DolphinView::triggerDetailsViewItem(Q3ListViewItem* item) -{ - const QPoint pos(0, item->itemPos()); - triggerDetailsViewItem(item, pos, 0); -} - -void DolphinView::updateURL() -{ - KFileView* fileView = (m_iconsView != 0) ? static_cast(m_iconsView) : - static_cast(m_detailsView); - KFileItem* fileItem = fileView->currentFileItem(); - if (fileItem == 0) { - return; + if (item->isDir()) { + setUrl(url); } - - if (fileItem->isDir()) { - // 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(fileItem->localPath()); - if (localPath.isEmpty()) { - setURL(fileItem->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 { - setURL(KUrl(localPath)); + item->run(); } } else { - fileItem->run(); + item->run(); } } -void DolphinView::slotPercent(int percent) +void DolphinView::updateProgress(int percent) { if (m_showProgress) { m_statusBar->setProgress(percent); } } -void DolphinView::slotClear() -{ - fileView()->clearView(); - updateStatusBar(); -} - -void DolphinView::slotDeleteItem(KFileItem* item) +void DolphinView::updateItemCount() { - fileView()->removeItem(item); - updateStatusBar(); -} - -void DolphinView::slotCompleted() -{ - m_refreshing = true; - - KFileView* view = fileView(); - view->clearView(); - - // TODO: in Qt4 the code should get a lot - // simpler and nicer due to Interview... - if (m_iconsView != 0) { - m_iconsView->beginItemUpdates(); - } - if (m_detailsView != 0) { - m_detailsView->beginItemUpdates(); - } - if (m_showProgress) { - m_statusBar->setProgressText(QString::null); + m_statusBar->setProgressText(QString()); m_statusBar->setProgress(100); m_showProgress = false; } @@ -763,9 +730,8 @@ void DolphinView::slotCompleted() m_fileCount = 0; m_folderCount = 0; - KFileItem* item = 0; while (it != end) { - view->insertItem(item); + KFileItem* item = *it; if (item->isDir()) { ++m_folderCount; } @@ -777,134 +743,74 @@ void DolphinView::slotCompleted() updateStatusBar(); - if (m_iconsView != 0) { - // Prevent a flickering of the icon view widget by giving a small - // timeslot to swallow asynchronous update events. - m_iconsView->setUpdatesEnabled(false); - QTimer::singleShot(10, this, SLOT(slotDelayedUpdate())); - } - - if (m_detailsView != 0) { - m_detailsView->endItemUpdates(); - m_refreshing = false; - } + QTimer::singleShot(0, this, SLOT(restoreContentsPos())); } -void DolphinView::slotDelayedUpdate() +void DolphinView::generatePreviews(const KFileItemList& items) { - if (m_iconsView != 0) { - m_iconsView->setUpdatesEnabled(true); - m_iconsView->endItemUpdates(); + 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&))); } - m_refreshing = false; -} - -void DolphinView::slotInfoMessage(const QString& msg) -{ - m_statusBar->setMessage(msg, DolphinStatusBar::Information); -} - -void DolphinView::slotErrorMessage(const QString& msg) -{ - m_statusBar->setMessage(msg, DolphinStatusBar::Error); -} -void DolphinView::slotRefreshItems(const KFileItemList& /* list */) -{ - QTimer::singleShot(0, this, SLOT(reload())); + const QMimeData* mimeData = QApplication::clipboard()->mimeData(); + if (KonqMimeData::decodeIsCutSelection(mimeData)) { + QTimer::singleShot(0, this, SLOT(applyCutEffect())); + } } -void DolphinView::slotAddItems(const KFileItemList& list) +void DolphinView::showPreview(const KFileItem* item, const QPixmap& pixmap) { - fileView()->addItemList(list); - fileView()->updateView(); + 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::slotGrabActivation() +void DolphinView::restoreContentsPos() { - Dolphin::mainWin().setActiveView(this); -} + int index = 0; + const QLinkedList history = urlHistory(index); + if (!history.isEmpty()) { + QAbstractItemView* view = itemView(); + // TODO: view->setCurrentItem(history[index].currentFileName()); -void DolphinView::slotContentsMoving(int x, int y) -{ - if (!m_refreshing) { - // Only emit a 'contents moved' signal if the user - // moved the content by adjusting the sliders. Adjustments - // resulted by refreshing a directory should not be respected. - emit contentsMoved(x, y); + QLinkedList::const_iterator it = history.begin(); + it += index; + view->horizontalScrollBar()->setValue((*it).contentsX()); + view->verticalScrollBar()->setValue((*it).contentsY()); } } -void DolphinView::createView() +void DolphinView::showInfoMessage(const QString& msg) { - assert(m_iconsView == 0); - assert(m_detailsView == 0); - - switch (m_mode) { - case IconsView: - case PreviewsView: { - const DolphinIconsView::LayoutMode layoutMode = (m_mode == IconsView) ? - DolphinIconsView::Icons : - DolphinIconsView::Previews; - m_iconsView = new DolphinIconsView(this, layoutMode); - m_topLayout->insertWidget(1, m_iconsView); - setFocusProxy(m_iconsView); - - connect(m_iconsView, SIGNAL(executed(Q3IconViewItem*)), - this, SLOT(triggerIconsViewItem(Q3IconViewItem*))); - connect(m_iconsView, SIGNAL(returnPressed(Q3IconViewItem*)), - this, SLOT(triggerIconsViewItem(Q3IconViewItem*))); - connect(m_iconsView, SIGNAL(signalRequestActivation()), - this, SLOT(slotGrabActivation())); - - m_iconsView->endItemUpdates(); - m_iconsView->show(); - m_iconsView->setFocus(); - break; - } - - case DetailsView: { - m_detailsView = new DolphinDetailsView(this); - m_topLayout->insertWidget(1, m_detailsView); - setFocusProxy(m_detailsView); - - connect(m_detailsView, SIGNAL(executed(Q3ListViewItem*, const QPoint&, int)), - this, SLOT(triggerDetailsViewItem(Q3ListViewItem*, const QPoint&, int))); - connect(m_detailsView, SIGNAL(returnPressed(Q3ListViewItem*)), - this, SLOT(triggerDetailsViewItem(Q3ListViewItem*))); - connect(m_detailsView, SIGNAL(signalRequestActivation()), - this, SLOT(slotGrabActivation())); - m_detailsView->show(); - m_detailsView->setFocus(); - break; - } - - default: - break; - } - - connect(scrollView(), SIGNAL(contentsMoving(int, int)), - this, SLOT(slotContentsMoving(int, int))); - - startDirLister(m_urlNavigator->url()); + m_statusBar->setMessage(msg, DolphinStatusBar::Information); } -KFileView* DolphinView::fileView() const +void DolphinView::showErrorMessage(const QString& msg) { - return (m_mode == DetailsView) ? static_cast(m_detailsView) : - static_cast(m_iconsView); + m_statusBar->setMessage(msg, DolphinStatusBar::Error); } -Q3ScrollView* DolphinView::scrollView() const +void DolphinView::emitSelectionChangedSignal() { - return (m_mode == DetailsView) ? static_cast(m_detailsView) : - static_cast(m_iconsView); + emit selectionChanged(); } -ItemEffectsManager* DolphinView::itemEffectsManager() const +void DolphinView::closeFilterBar() { - return (m_mode == DetailsView) ? static_cast(m_detailsView) : - static_cast(m_iconsView); + m_filterBar->hide(); + emit showFilterBarChanged(false); } void DolphinView::startDirLister(const KUrl& url, bool reload) @@ -915,7 +821,7 @@ void DolphinView::startDirLister(const KUrl& url, bool reload) m_statusBar->setMessage(i18n("The location is empty."), DolphinStatusBar::Error); } else { - m_statusBar->setMessage(i18n("The location '%1' is invalid.").arg(location), + m_statusBar->setMessage(i18n("The location '%1' is invalid.",location), DolphinStatusBar::Error); } return; @@ -932,61 +838,33 @@ void DolphinView::startDirLister(const KUrl& url, bool reload) m_statusBar->setProgress(0); } - m_refreshing = true; m_dirLister->stop(); m_dirLister->openUrl(url, false, reload); } QString DolphinView::defaultStatusBarText() const { - // TODO: the following code is not suitable for languages where multiple forms - // of plurals are given (e. g. in Poland three forms of plurals exist). - const int itemCount = m_folderCount + m_fileCount; - - QString text; - if (itemCount == 1) { - text = i18n("1 Item"); - } - else { - text = i18n("%1 Items").arg(itemCount); - } - - text += " ("; - - if (m_folderCount == 1) { - text += i18n("1 Folder"); - } - else { - text += i18n("%1 Folders").arg(m_folderCount); - } - - text += ", "; - - if (m_fileCount == 1) { - text += i18n("1 File"); - } - else { - text += i18n("%1 Files").arg(m_fileCount); - } - - text += ")"; - - return text; + return KIO::itemsSummaryString(m_fileCount + m_folderCount, + m_fileCount, + m_folderCount, + 0, false); } QString DolphinView::selectionStatusBarText() const { - // TODO: the following code is not suitable for languages where multiple forms - // of plurals are given (e. g. in Poland three forms of plurals exist). QString text; - const KFileItemList* list = selectedItems(); - assert((list != 0) && !list->isEmpty()); + 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(); + KFileItemList::const_iterator it = list.begin(); + const KFileItemList::const_iterator end = list.end(); while (it != end){ KFileItem* item = *it; if (item->isDir()) { @@ -999,59 +877,86 @@ QString DolphinView::selectionStatusBarText() const ++it; } - if (folderCount == 1) { - text = i18n("1 Folder selected"); - } - else if (folderCount > 1) { - text = i18n("%1 Folders selected").arg(folderCount); - } - - if ((fileCount > 0) && (folderCount > 0)) { - text += ", "; + if (folderCount > 0) { + text = i18np("1 Folder selected", "%1 Folders selected", folderCount); + if (fileCount > 0) { + text += ", "; + } } - const QString sizeText(KIO::convertSize(byteSize)); - if (fileCount == 1) { - text += i18n("1 File selected (%1)").arg(sizeText); - } - else if (fileCount > 1) { - text += i18n("%1 Files selected (%1)").arg(fileCount).arg(sizeText); + if (fileCount > 0) { + const QString sizeText(KIO::convertSize(byteSize)); + text += i18np("1 File selected (%2)", "%1 Files selected (%2)", fileCount, sizeText); } return text; } -QString DolphinView::renameIndexPresentation(int index, int itemCount) const +void DolphinView::showFilterBar(bool show) { - // assure that the string reprentation for all indicess have the same - // number of characters based on the given number of items - QString str(QString::number(index)); - int chrCount = 1; - while (itemCount >= 10) { - ++chrCount; - itemCount /= 10; + assert(m_filterBar != 0); + if (show) { + m_filterBar->show(); } - str.reserve(chrCount); + 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); - const int insertCount = chrCount - str.length(); - for (int i = 0; i < insertCount; ++i) { - str.insert(0, '0'); + if (updateStatusBarMsg) { + m_statusBar->setMessage(text, DolphinStatusBar::Default); } - return str; } -void DolphinView::slotShowFilterBar(bool show) +void DolphinView::requestActivation() { - assert(m_filterBar != 0); - if (show) { - m_filterBar->show(); + m_mainWindow->setActiveView(this); +} + +void DolphinView::updateCutItems() +{ + const QMimeData* mimeData = QApplication::clipboard()->mimeData(); + if (!KonqMimeData::decodeIsCutSelection(mimeData)) { + return; } - else { - m_filterBar->hide(); + + 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::slotChangeNameFilter(const QString& nameFilter) +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 @@ -1062,26 +967,190 @@ void DolphinView::slotChangeNameFilter(const QString& 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(); +} - // TODO: this is a workaround for QIconView: the item position - // stay as they are by filtering, only an inserting of an item - // results to an automatic adjusting of the item position. In Qt4/KDE4 - // this workaround should get obsolete due to Interview. - KFileView* view = fileView(); - if (view == m_iconsView) { - KFileItem* first = view->firstFileItem(); - if (first != 0) { - view->removeItem(first); - view->insertItem(first); +void DolphinView::dropUrls(const KUrl::List& urls, + const QModelIndex& index, + QWidget* source) +{ + KFileItem* directory = 0; + if (isValidNameIndex(index)) { + KFileItem* item = fileItem(index); + 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); } -bool DolphinView::isFilterBarVisible() +void DolphinView::dropUrls(const KUrl::List& urls, + const KUrl& destination) { - return m_filterBar->isVisible(); + 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; + } + + assert(m_iconsView == 0); + 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; + } + + 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"