X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/9a4a17dd4d7f3d195ab4393e057e8eb90b0a3422..a0cf8456fe171bd221025b3ff3677db4675390b5:/src/dolphinview.cpp diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp index e60f6f655..fd6b1409e 100644 --- a/src/dolphinview.cpp +++ b/src/dolphinview.cpp @@ -15,76 +15,83 @@ * 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 - +#include -#include -//Added by qt3to4: -#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 "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(DolphinMainWindow *mainWindow, - QWidget *parent, +DolphinView::DolphinView(DolphinMainWindow* mainWindow, + QWidget* parent, const KUrl& url, Mode mode, bool showHiddenFiles) : QWidget(parent), - m_mainWindow(mainWindow), - m_refreshing(false), m_showProgress(false), m_mode(mode), - 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_filterBar(0), + m_statusBar(0), + m_dirModel(0), + m_dirLister(0), + m_proxyModel(0) { + hide(); setFocusPolicy(Qt::StrongFocus); - m_topLayout = new Q3VBoxLayout(this); + m_topLayout = new QVBoxLayout(this); + m_topLayout->setSpacing(0); + m_topLayout->setMargin(0); - connect(this, SIGNAL(signalModeChanged()), - mainWindow, SLOT(slotViewModeChanged())); - connect(this, SIGNAL(signalShowHiddenFilesChanged()), - mainWindow, SLOT(slotShowHiddenFilesChanged())); - connect(this, SIGNAL(signalSortingChanged(DolphinView::Sorting)), - mainWindow, SLOT(slotSortingChanged(DolphinView::Sorting))); - connect(this, SIGNAL(signalSortOrderChanged(Qt::SortOrder)), - mainWindow, 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&))); - connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)), - mainWindow, SLOT(slotUrlChanged(const KUrl&))); - connect(m_urlNavigator, SIGNAL(historyChanged()), - mainWindow, 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); @@ -92,44 +99,63 @@ DolphinView::DolphinView(DolphinMainWindow *mainWindow, 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(slotCompleted())); + this, SLOT(updateItemCount())); + 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&))); - - m_iconsView = new DolphinIconsView(this); - connect(m_iconsView, SIGNAL(clicked(const QModelIndex&)), + 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 QPoint&)), + this, SLOT(dropUrls(const KUrl::List&, const QPoint&))); + 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&))); - applyModeToView(); + connect(m_controller, SIGNAL(selectionChanged()), + this, SLOT(emitSelectionChangedSignal())); + connect(m_controller, SIGNAL(activated()), + this, SLOT(requestActivation())); - KDirModel* model = new KDirModel(); - model->setDirLister(m_dirLister); - m_iconsView->setModel(model); - - m_dirLister->setDelayedMimeTypes(true); - new KMimeTypeResolver( m_iconsView, model ); + createView(); m_iconSize = K3Icon::SizeMedium; - m_filterBar = new FilterBar(mainWindow, this); + m_filterBar = new FilterBar(this); m_filterBar->hide(); - 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(m_iconsView); + m_topLayout->addWidget(itemView()); m_topLayout->addWidget(m_filterBar); m_topLayout->addWidget(m_statusBar); - startDirLister(m_urlNavigator->url()); + loadDirectory(m_urlNavigator->url()); } DolphinView::~DolphinView() @@ -141,6 +167,7 @@ DolphinView::~DolphinView() void DolphinView::setUrl(const KUrl& url) { m_urlNavigator->setUrl(url); + m_controller->setUrl(url); } const KUrl& DolphinView::url() const @@ -148,20 +175,15 @@ const KUrl& DolphinView::url() const return m_urlNavigator->url(); } -void DolphinView::requestActivation() -{ - mainWindow()->setActiveView(this); -} - bool DolphinView::isActive() const { - return (mainWindow()->activeView() == this); + return m_mainWindow->activeView() == this; } void DolphinView::setMode(Mode mode) { if (mode == m_mode) { - return; // the wished mode is already set + return; // the wished mode is already set } m_mode = mode; @@ -169,10 +191,10 @@ void DolphinView::setMode(Mode mode) ViewProperties props(m_urlNavigator->url()); props.setViewMode(m_mode); - applyModeToView(); + createView(); startDirLister(m_urlNavigator->url()); - emit signalModeChanged(); + emit modeChanged(); } DolphinView::Mode DolphinView::mode() const @@ -180,36 +202,44 @@ 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); - 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(); @@ -228,25 +258,25 @@ void DolphinView::renameSelectedItems() 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(mainWindow(), - 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()); @@ -254,8 +284,6 @@ 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).",name), DolphinStatusBar::Error); break; @@ -263,17 +291,13 @@ void DolphinView::renameSelectedItems() 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 { @@ -306,12 +330,12 @@ void DolphinView::renameSelectedItems() void DolphinView::selectAll() { - //fileView()->selectAll(); + selectAll(QItemSelectionModel::Select); } void DolphinView::invertSelection() { - //fileView()->invertSelection(); + selectAll(QItemSelectionModel::Toggle); } DolphinStatusBar* DolphinView::statusBar() const @@ -322,12 +346,12 @@ DolphinStatusBar* DolphinView::statusBar() const int DolphinView::contentsX() const { - return 0; //scrollView()->contentsX(); + return itemView()->horizontalScrollBar()->value(); } int DolphinView::contentsY() const { - return 0; //scrollView()->contentsY(); + return itemView()->verticalScrollBar()->value(); } void DolphinView::refreshSettings() @@ -335,32 +359,14 @@ void DolphinView::refreshSettings() 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 @@ -370,82 +376,46 @@ bool DolphinView::isUrlEditable() const void DolphinView::zoomIn() { - //itemEffectsManager()->zoomIn(); + m_controller->triggerZoomIn(); } void DolphinView::zoomOut() { - //itemEffectsManager()->zoomOut(); + m_controller->triggerZoomOut(); } bool DolphinView::isZoomInPossible() const { - return false; //itemEffectsManager()->isZoomInPossible(); + return m_controller->isZoomInPossible(); } bool DolphinView::isZoomOutPossible() const { - return false; //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); - - ViewProperties props(url()); - props.setSortOrder(order); - - view->setSorting(static_cast(sorting)); - - emit signalSortOrderChanged(order);*/ + updateSortOrder(order); } } Qt::SortOrder DolphinView::sortOrder() const { - //return fileView()->isReversed() ? Qt::Descending : Qt::Ascending; - return Qt::Descending; + return m_proxyModel->sortOrder(); } void DolphinView::goBack() @@ -473,49 +443,61 @@ void DolphinView::setUrlEditable(bool 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 0; //fileView()->selectedItems(); + 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 = fileView()->selectedItems(); - if (list != 0) { - KFileItemList::const_iterator it = list->begin(); - const KFileItemList::const_iterator end = list->end(); - while (it != end) { - KFileItem* item = *it; - urls.append(item->url()); - ++it; - } - }*/ + 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; } -const KFileItem* DolphinView::currentFileItem() const +KFileItem* DolphinView::fileItem(const QModelIndex index) const { - return 0; // fileView()->currentFileItem(); -} - -void DolphinView::openContextMenu(KFileItem* fileInfo, const QPoint& pos) -{ - 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) @@ -535,11 +517,11 @@ void DolphinView::rename(const KUrl& source, const QString& newName) 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 @@ -565,15 +547,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'.",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.",source.fileName(), dest.fileName()), + m_statusBar->setMessage(i18n("Renaming of file '%1' to '%2' failed.",source.fileName(), destFileName), DolphinStatusBar::Error); reload(); } @@ -584,27 +566,6 @@ void DolphinView::reload() startDirLister(m_urlNavigator->url(), true); } -void DolphinView::slotUrlListDropped(QDropEvent* /* event */, - const KUrl::List& urls, - const KUrl& url) -{ - 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(); - } - } - - mainWindow()->dropUrls(urls, destination); -} - void DolphinView::mouseReleaseEvent(QMouseEvent* event) { QWidget::mouseReleaseEvent(event); @@ -616,62 +577,67 @@ DolphinMainWindow* DolphinView::mainWindow() const 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); - - setSorting(props.sorting()); - setSortOrder(props.sortOrder()); + const Mode mode = props.viewMode(); + if (m_mode != mode) { + m_mode = mode; + createView(); + emit modeChanged(); + } - startDirLister(url); + const bool showHiddenFiles = props.showHiddenFiles(); + if (showHiddenFiles != m_dirLister->showingDotFiles()) { + m_dirLister->setShowingDotFiles(showHiddenFiles); + emit showHiddenFilesChanged(); + } - // 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. - mainWindow()->slotSelectionChanged(); + const DolphinView::Sorting sorting = props.sorting(); + if (sorting != m_proxyModel->sorting()) { + m_proxyModel->setSorting(sorting); + emit sortingChanged(sorting); + } - emit signalUrlChanged(url); -} + const Qt::SortOrder sortOrder = props.sortOrder(); + if (sortOrder != m_proxyModel->sortOrder()) { + m_proxyModel->setSortOrder(sortOrder); + emit sortOrderChanged(sortOrder); + } -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())); - mainWindow()->setActiveView(this); + 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) { - KDirModel* dirModel = static_cast(m_iconsView->model()); - KFileItem* item = dirModel->itemForIndex(index); + 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 (item->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 + // 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). - //m_dirLister->stop(); - //m_dirLister->openUrl(item->url()); - //return; - const QString localPath(item->localPath()); if (localPath.isEmpty()) { setUrl(item->url()); @@ -685,72 +651,17 @@ void DolphinView::triggerItem(const QModelIndex& index) } } -void DolphinView::updateUrl() -{ - //KFileView* fileView = (m_iconsView != 0) ? static_cast(m_iconsView) : - // static_cast(m_iconsView); - - KFileItem* fileItem = 0; // TODO: fileView->currentFileItem(); - if (fileItem == 0) { - return; - } - - 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 { - setUrl(KUrl(localPath)); - } - } - else { - fileItem->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_iconsView != 0) { - m_iconsView->beginItemUpdates(); - }*/ - if (m_showProgress) { - m_statusBar->setProgressText(QString::null); + m_statusBar->setProgressText(QString()); m_statusBar->setProgress(100); m_showProgress = false; } @@ -764,7 +675,6 @@ void DolphinView::slotCompleted() while (it != end) { KFileItem* item = *it; - //view->insertItem(item); if (item->isDir()) { ++m_folderCount; } @@ -776,59 +686,61 @@ 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_iconsView != 0) { - m_iconsView->endItemUpdates(); - m_refreshing = false; - }*/ + QTimer::singleShot(0, this, SLOT(restoreContentsPos())); } -void DolphinView::slotInfoMessage(const QString& msg) +void DolphinView::generatePreviews(const KFileItemList& items) { - m_statusBar->setMessage(msg, DolphinStatusBar::Information); + 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&))); + } } -void DolphinView::slotErrorMessage(const QString& msg) +void DolphinView::showPreview(const KFileItem* item, const QPixmap& pixmap) { - m_statusBar->setMessage(msg, DolphinStatusBar::Error); + Q_ASSERT(item != 0); + const QModelIndex idx = m_dirModel->indexForItem(*item); + if (idx.isValid() && (idx.column() == 0)) { + m_dirModel->setData(idx, pixmap, Qt::DecorationRole); + } } -void DolphinView::slotGrabActivation() +void DolphinView::restoreContentsPos() { - mainWindow()->setActiveView(this); + 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::slotContentsMoving(int x, int y) +void DolphinView::showInfoMessage(const QString& msg) { - 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); - } + m_statusBar->setMessage(msg, DolphinStatusBar::Information); } -/*KFileView* DolphinView::fileView() const +void DolphinView::showErrorMessage(const QString& msg) { - return (m_mode == DetailsView) ? static_cast(m_iconsView) : - static_cast(m_iconsView); -}*/ + m_statusBar->setMessage(msg, DolphinStatusBar::Error); +} -Q3ScrollView* DolphinView::scrollView() const +void DolphinView::emitSelectionChangedSignal() { - return 0; //(m_mode == DetailsView) ? static_cast(m_iconsView) : - // static_cast(m_iconsView); + emit selectionChanged(); } -ItemEffectsManager* DolphinView::itemEffectsManager() const +void DolphinView::closeFilterBar() { - return 0; + m_filterBar->hide(); + emit showFilterBarChanged(false); } void DolphinView::startDirLister(const KUrl& url, bool reload) @@ -856,61 +768,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",itemCount); - } - - text += " ("; - - if (m_folderCount == 1) { - text += i18n("1 Folder"); - } - else { - text += i18n("%1 Folders",m_folderCount); - } - - text += ", "; - - if (m_fileCount == 1) { - text += i18n("1 File"); - } - else { - text += i18n("%1 Files",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()) { @@ -923,48 +807,22 @@ QString DolphinView::selectionStatusBarText() const ++it; } - if (folderCount == 1) { - text = i18n("1 Folder selected"); - } - else if (folderCount > 1) { - text = i18n("%1 Folders selected",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)",sizeText); - } - else if (fileCount > 1) { - text += i18n("%1 Files selected (%1)",fileCount,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 -{ - // 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; - } - str.reserve(chrCount); - - const int insertCount = chrCount - str.length(); - for (int i = 0; i < insertCount; ++i) { - str.insert(0, '0'); - } - return str; -} - -void DolphinView::slotShowFilterBar(bool show) +void DolphinView::showFilterBar(bool show) { assert(m_filterBar != 0); if (show) { @@ -975,12 +833,35 @@ void DolphinView::slotShowFilterBar(bool show) } } -void DolphinView::declareViewActive() +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() { - mainWindow()->setActiveView( this ); + m_mainWindow->setActiveView(this); } -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 @@ -991,47 +872,151 @@ 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 (index.isValid()) { + item = fileItem(index); + } - // 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); + DolphinContextMenu contextMenu(this, item); + contextMenu.open(); +} + +void DolphinView::dropUrls(const KUrl::List& urls, + const QPoint& pos) +{ + KFileItem* directory = 0; + const QModelIndex index = itemView()->indexAt(pos); + if (index.isValid()) { + KFileItem* item = fileItem(index); + assert(item != 0); + if (item->isDir()) { + // the URLs are dropped above a directory + directory = item; } - }*/ + } + + const KUrl& destination = (directory == 0) ? url() : + directory->url(); + 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::applyModeToView() + +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() { - // TODO: the following code just tries to test some QListView capabilities + // delete current view + QAbstractItemView* view = itemView(); + if (view != 0) { + m_topLayout->removeWidget(view); + view->close(); + view->deleteLater(); + m_iconsView = 0; + m_detailsView = 0; + } + + assert(m_iconsView == 0); + assert(m_detailsView == 0); + + // ... and recreate it representing the current mode switch (m_mode) { case IconsView: - m_iconsView->setViewMode(QListView::IconMode); - m_iconsView->setGridSize(QSize(128, 64)); + m_iconsView = new DolphinIconsView(this, m_controller); + view = m_iconsView; break; case DetailsView: - m_iconsView->setViewMode(QListView::ListMode); - m_iconsView->setGridSize(QSize(256, 24)); + m_detailsView = new DolphinDetailsView(this, m_controller); + view = m_detailsView; break; + } - case PreviewsView: - m_iconsView->setViewMode(QListView::IconMode); - m_iconsView->setGridSize(QSize(128, 128)); - break; + 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; } #include "dolphinview.moc"