X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/7fbae445277374fb2bacfcd7c04e8d7fbb2c3f05..da88d222838ea0fa5788c3cac4b88efb53f5f8fc:/src/dolphinview.cpp diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp index bcf17a620..1efe33384 100644 --- a/src/dolphinview.cpp +++ b/src/dolphinview.cpp @@ -15,27 +15,31 @@ * 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 "urlnavigator.h" #include "dolphinstatusbar.h" -#include "dolphin.h" +#include "dolphinmainwindow.h" #include "dolphindirlister.h" +#include "dolphinsortfilterproxymodel.h" #include "viewproperties.h" #include "dolphindetailsview.h" #include "dolphiniconsview.h" @@ -43,10 +47,10 @@ #include "undomanager.h" #include "renamedialog.h" #include "progressindicator.h" - #include "filterbar.h" -DolphinView::DolphinView(QWidget *parent, +DolphinView::DolphinView(DolphinMainWindow *mainWindow, + QWidget *parent, const KUrl& url, Mode mode, bool showHiddenFiles) : @@ -54,35 +58,28 @@ DolphinView::DolphinView(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_iconsView(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(); - - 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))); + m_topLayout = new QVBoxLayout(this); + m_topLayout->setSpacing(0); + m_topLayout->setMargin(0); 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&)), - &dolphin, SLOT(slotUrlChanged(const KUrl&))); - connect(m_urlNavigator, SIGNAL(historyChanged()), - &dolphin, SLOT(slotHistoryChanged())); + this, SLOT(loadDirectory(const KUrl&))); m_statusBar = new DolphinStatusBar(this); @@ -102,25 +99,45 @@ DolphinView::DolphinView(QWidget *parent, this, SLOT(slotInfoMessage(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; + m_iconsView = new DolphinIconsView(this); + applyModeToView(); - m_topLayout->addWidget(m_urlNavigator); - createView(); + m_dirModel = new KDirModel(); + m_dirModel->setDirLister(m_dirLister); + + m_proxyModel = new DolphinSortFilterProxyModel(this); + m_proxyModel->setSourceModel(m_dirModel); + + m_iconsView->setModel(m_proxyModel); + + KFileItemDelegate* delegate = new KFileItemDelegate(this); + delegate->setAdditionalInformation(KFileItemDelegate::FriendlyMimeType); + m_iconsView->setItemDelegate(delegate); + + m_dirLister->setDelayedMimeTypes(true); + new KMimeTypeResolver(m_iconsView, m_dirModel); + + m_iconSize = K3Icon::SizeMedium; m_filterBar = new FilterBar(this); m_filterBar->hide(); - m_topLayout->addWidget(m_filterBar); - connect(m_filterBar, SIGNAL(signalFilterChanged(const QString&)), + connect(m_filterBar, SIGNAL(filterChanged(const QString&)), this, SLOT(slotChangeNameFilter(const QString&))); + connect(m_filterBar, SIGNAL(closed()), + this, SLOT(closeFilterBar())); + m_topLayout->addWidget(m_urlNavigator); + m_topLayout->addWidget(m_iconsView); + m_topLayout->addWidget(m_filterBar); m_topLayout->addWidget(m_statusBar); + + connect(m_iconsView, SIGNAL(clicked(const QModelIndex&)), + this, SLOT(triggerItem(const QModelIndex&))); + connect(m_iconsView->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)), + this, SLOT(emitSelectionChangedSignal())); + + startDirLister(m_urlNavigator->url()); } DolphinView::~DolphinView() @@ -141,12 +158,12 @@ const KUrl& DolphinView::url() const void DolphinView::requestActivation() { - Dolphin::mainWin().setActiveView(this); + mainWindow()->setActiveView(this); } bool DolphinView::isActive() const { - return (Dolphin::mainWin().activeView() == this); + return (mainWindow()->activeView() == this); } void DolphinView::setMode(Mode mode) @@ -155,24 +172,15 @@ void DolphinView::setMode(Mode 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; - } - m_mode = mode; - createView(); - ViewProperties props(m_urlNavigator->url()); props.setViewMode(m_mode); - emit signalModeChanged(); + applyModeToView(); + startDirLister(m_urlNavigator->url()); + + emit modeChanged(); } DolphinView::Mode DolphinView::mode() const @@ -180,36 +188,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); + + // TODO: wait until previews are possible with KFileItemDelegate + + emit showPreviewChanged(); +} + +bool DolphinView::showPreview() const +{ + // TODO: wait until previews are possible with KFileItemDelegate + return true; +} + +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(); @@ -221,7 +237,7 @@ 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."), @@ -235,12 +251,13 @@ void DolphinView::renameSelectedItems() const int urlsCount = urls.count(); ProgressIndicator* progressIndicator = - new ProgressIndicator(i18n("Renaming items..."), + 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]; @@ -279,11 +296,12 @@ void DolphinView::renameSelectedItems() // 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 +316,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,33 +337,18 @@ DolphinStatusBar* DolphinView::statusBar() const int DolphinView::contentsX() const { - return scrollView()->contentsX(); + + return 0; //scrollView()->contentsX(); } int DolphinView::contentsY() const { - return scrollView()->contentsY(); + return 0; //scrollView()->contentsY(); } 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() @@ -371,9 +374,14 @@ void DolphinView::updateStatusBar() } } -void DolphinView::requestItemInfo(const KUrl& url) +void DolphinView::emitRequestItemInfo(const KUrl& url) { - emit signalRequestItemInfo(url); + emit requestItemInfo(url); +} + +bool DolphinView::isFilterBarVisible() const +{ + return m_filterBar->isVisible(); } bool DolphinView::isUrlEditable() const @@ -383,81 +391,56 @@ bool DolphinView::isUrlEditable() const void DolphinView::zoomIn() { - itemEffectsManager()->zoomIn(); + //itemEffectsManager()->zoomIn(); } void DolphinView::zoomOut() { - itemEffectsManager()->zoomOut(); + //itemEffectsManager()->zoomOut(); } bool DolphinView::isZoomInPossible() const { - return itemEffectsManager()->isZoomInPossible(); + return false; //itemEffectsManager()->isZoomInPossible(); } bool DolphinView::isZoomOutPossible() const { - return itemEffectsManager()->isZoomOutPossible(); + return false; //itemEffectsManager()->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)); + m_proxyModel->setSorting(sorting); - emit signalSortingChanged(sorting); + emit sortingChanged(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)); + m_proxyModel->setSortOrder(order); - emit signalSortOrderChanged(order); + emit sortOrderChanged(order); } } Qt::SortOrder DolphinView::sortOrder() const { - return fileView()->isReversed() ? Qt::Descending : Qt::Ascending; + return m_proxyModel->sortOrder(); } void DolphinView::goBack() @@ -492,28 +475,45 @@ const Q3ValueList DolphinView::urlHistory(int& index) bool DolphinView::hasSelection() const { - const KFileItemList* list = selectedItems(); - return (list != 0) && !list->isEmpty(); + return m_iconsView->selectionModel()->hasSelection(); } -const KFileItemList* DolphinView::selectedItems() const +/* + * Our view has a selection, we will map them back to the DirModel + * and then fill the KFileItemList + */ +KFileItemList DolphinView::selectedItems() const { - return fileView()->selectedItems(); + assert( m_iconsView && m_iconsView->selectionModel() ); + + const QItemSelection selection = m_proxyModel->mapSelectionToSource( m_iconsView->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) { + 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; @@ -521,7 +521,7 @@ KUrl::List DolphinView::selectedUrls() const const KFileItem* DolphinView::currentFileItem() const { - return fileView()->currentFileItem(); + return 0; // fileView()->currentFileItem(); } void DolphinView::openContextMenu(KFileItem* fileInfo, const QPoint& pos) @@ -543,7 +543,7 @@ 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... @@ -614,104 +614,82 @@ void DolphinView::slotUrlListDropped(QDropEvent* /* event */, } } - Dolphin::mainWin().dropUrls(urls, destination); + mainWindow()->dropUrls(urls, destination); } void DolphinView::mouseReleaseEvent(QMouseEvent* event) { QWidget::mouseReleaseEvent(event); - Dolphin::mainWin().setActiveView(this); + mainWindow()->setActiveView(this); } -void DolphinView::slotUrlChanged(const KUrl& url) +DolphinMainWindow* DolphinView::mainWindow() const { - const ViewProperties props(url); - setMode(props.viewMode()); - - const bool showHiddenFiles = props.isShowHiddenFilesEnabled(); - setShowHiddenFilesEnabled(showHiddenFiles); - m_dirLister->setShowingDotFiles(showHiddenFiles); - - setSorting(props.sorting()); - setSortOrder(props.sortOrder()); - - startDirLister(url); - - // 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(); - - emit signalUrlChanged(url); + return m_mainWindow; } -void DolphinView::triggerIconsViewItem(Q3IconViewItem* item) +void DolphinView::loadDirectory(const KUrl& url) { - /* 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); + const ViewProperties props(url); + + const Mode mode = props.viewMode(); + if (m_mode != mode) { + m_mode = mode; + applyModeToView(); + emit modeChanged(); } -} -void DolphinView::triggerDetailsViewItem(Q3ListViewItem* item, - const QPoint& pos, - int /* column */) -{ - if (item == 0) { - return; + const bool showHiddenFiles = props.showHiddenFiles(); + if (showHiddenFiles != m_dirLister->showingDotFiles()) { + m_dirLister->setShowingDotFiles(showHiddenFiles); + emit showHiddenFilesChanged(); } - 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); + const DolphinView::Sorting sorting = props.sorting(); + if (sorting != m_proxyModel->sorting()) { + m_proxyModel->setSorting(sorting); + emit sortingChanged(sorting); } - else { - m_detailsView->clearSelection(); + + const Qt::SortOrder sortOrder = props.sortOrder(); + if (sortOrder != m_proxyModel->sortOrder()) { + m_proxyModel->setSortOrder(sortOrder); + emit sortOrderChanged(sortOrder); } -} -void DolphinView::triggerDetailsViewItem(Q3ListViewItem* item) -{ - const QPoint pos(0, item->itemPos()); - triggerDetailsViewItem(item, pos, 0); + // TODO: handle previews (props.showPreview()) + + startDirLister(url); + emit urlChanged(url); } -void DolphinView::updateUrl() +void DolphinView::triggerItem(const QModelIndex& index) { - KFileView* fileView = (m_iconsView != 0) ? static_cast(m_iconsView) : - static_cast(m_detailsView); - - KFileItem* fileItem = fileView->currentFileItem(); - if (fileItem == 0) { + KFileItem* item = m_dirModel->itemForIndex(m_proxyModel->mapToSource(index)); + if (item == 0) { return; } - if (fileItem->isDir()) { + 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 // 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()); + //m_dirLister->stop(); + //m_dirLister->openUrl(item->url()); + //return; + + const QString localPath(item->localPath()); if (localPath.isEmpty()) { - setUrl(fileItem->url()); + setUrl(item->url()); } else { setUrl(KUrl(localPath)); } } else { - fileItem->run(); + item->run(); } } @@ -724,13 +702,13 @@ void DolphinView::slotPercent(int percent) void DolphinView::slotClear() { - fileView()->clearView(); + //fileView()->clearView(); updateStatusBar(); } void DolphinView::slotDeleteItem(KFileItem* item) { - fileView()->removeItem(item); + //fileView()->removeItem(item); updateStatusBar(); } @@ -738,17 +716,17 @@ void DolphinView::slotCompleted() { m_refreshing = true; - KFileView* view = fileView(); - view->clearView(); + //KFileView* view = fileView(); + //view->clearView(); // TODO: in Qt4 the code should get a lot // simpler and nicer due to Interview... - if (m_iconsView != 0) { + /*if (m_iconsView != 0) { m_iconsView->beginItemUpdates(); } - if (m_detailsView != 0) { - m_detailsView->beginItemUpdates(); - } + if (m_iconsView != 0) { + m_iconsView->beginItemUpdates(); + }*/ if (m_showProgress) { m_statusBar->setProgressText(QString::null); @@ -765,7 +743,7 @@ void DolphinView::slotCompleted() while (it != end) { KFileItem* item = *it; - view->insertItem(item); + //view->insertItem(item); if (item->isDir()) { ++m_folderCount; } @@ -777,26 +755,17 @@ void DolphinView::slotCompleted() updateStatusBar(); - if (m_iconsView != 0) { + /*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; - } -} - -void DolphinView::slotDelayedUpdate() -{ if (m_iconsView != 0) { - m_iconsView->setUpdatesEnabled(true); m_iconsView->endItemUpdates(); - } - m_refreshing = false; + m_refreshing = false; + }*/ } void DolphinView::slotInfoMessage(const QString& msg) @@ -809,20 +778,20 @@ void DolphinView::slotErrorMessage(const QString& msg) m_statusBar->setMessage(msg, DolphinStatusBar::Error); } -void DolphinView::slotRefreshItems(const KFileItemList& /* list */) +void DolphinView::slotGrabActivation() { - QTimer::singleShot(0, this, SLOT(reload())); + mainWindow()->setActiveView(this); } -void DolphinView::slotAddItems(const KFileItemList& list) +void DolphinView::emitSelectionChangedSignal() { - fileView()->addItemList(list); - fileView()->updateView(); + emit selectionChanged(); } -void DolphinView::slotGrabActivation() +void DolphinView::closeFilterBar() { - Dolphin::mainWin().setActiveView(this); + m_filterBar->hide(); + emit showFilterBarChanged(false); } void DolphinView::slotContentsMoving(int x, int y) @@ -835,78 +804,6 @@ void DolphinView::slotContentsMoving(int x, int y) } } -void DolphinView::createView() -{ - 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()); -} - -KFileView* DolphinView::fileView() const -{ - return (m_mode == DetailsView) ? static_cast(m_detailsView) : - static_cast(m_iconsView); -} - -Q3ScrollView* DolphinView::scrollView() const -{ - return (m_mode == DetailsView) ? static_cast(m_detailsView) : - static_cast(m_iconsView); -} - -ItemEffectsManager* DolphinView::itemEffectsManager() const -{ - return (m_mode == DetailsView) ? static_cast(m_detailsView) : - static_cast(m_iconsView); -} - void DolphinView::startDirLister(const KUrl& url, bool reload) { if (!url.isValid()) { @@ -979,14 +876,18 @@ 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()) { + // TODO: assert(!list.isEmpty()) should be used, as this method is only invoked if + // DolphinView::hasSelection() is true. Inconsistent behavior? + 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()) { @@ -1051,6 +952,11 @@ void DolphinView::slotShowFilterBar(bool show) } } +void DolphinView::declareViewActive() +{ + mainWindow()->setActiveView( this ); +} + void DolphinView::slotChangeNameFilter(const QString& nameFilter) { // The name filter of KDirLister does a 'hard' filtering, which @@ -1064,24 +970,53 @@ void DolphinView::slotChangeNameFilter(const QString& nameFilter) m_dirLister->setNameFilter(adjustedFilter); m_dirLister->emitChanges(); +} - // 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::applyModeToView() +{ + m_iconsView->setSelectionMode(QAbstractItemView::ExtendedSelection); + + // TODO: the following code just tries to test some QListView capabilities + switch (m_mode) { + case IconsView: + m_iconsView->setViewMode(QListView::IconMode); + m_iconsView->setSpacing(32); + // m_iconsView->setAlternatingRowColors(false); + // m_iconsView->setGridSize(QSize(128, 64)); + break; + + case DetailsView: + m_iconsView->setViewMode(QListView::ListMode); + m_iconsView->setSpacing(0); + // m_iconsView->setAlternatingRowColors(true); + // m_iconsView->setGridSize(QSize(256, 24)); + break; } } -bool DolphinView::isFilterBarVisible() +int DolphinView::columnIndex(Sorting sorting) const { - return m_filterBar->isVisible(); + int index = 0; + switch (sorting) { + case SortByName: index = KDirModel::Name; break; + case SortBySize: index = KDirModel::Size; break; + case SortByDate: index = KDirModel::ModifiedTime; break; + default: assert(false); + } + return index; +} + +void DolphinView::selectAll(QItemSelectionModel::SelectionFlags flags) +{ + QItemSelectionModel* selectionModel = m_iconsView->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); } #include "dolphinview.moc"