QWidget(parent),
m_active(true),
m_showPreview(false),
- m_loadingDirectory(false),
m_storedCategorizedSorting(false),
m_tabsForFiles(false),
m_isContextMenuOpen(false),
connect(m_controller, SIGNAL(urlChanged(const KUrl&)),
this, SIGNAL(urlChanged(const KUrl&)));
- connect(m_controller, SIGNAL(requestUrlChange(const KUrl&)),
- this, SLOT(slotRequestUrlChange(const KUrl&)));
connect(m_controller, SIGNAL(requestContextMenu(const QPoint&, const QList<QAction*>&)),
this, SLOT(openContextMenu(const QPoint&, const QList<QAction*>&)));
return m_viewAccessor.itemView()->selectionModel();
}
-void DolphinView::setContentsPosition(int x, int y)
-{
- QAbstractItemView* view = m_viewAccessor.itemView();
- Q_ASSERT(view != 0);
- view->horizontalScrollBar()->setValue(x);
- view->verticalScrollBar()->setValue(y);
-
- m_loadingDirectory = false;
-}
-
-void DolphinView::setRestoredContentsPosition(const QPoint& pos)
-{
- // TODO: This function is called by DolphinViewContainer.
- // If it makes use of DolphinView::restoreState(...) to restore the
- // view state in KDE 4.5, this function can be removed.
- m_restoredContentsPosition = pos;
-}
-
-QPoint DolphinView::contentsPosition() const
-{
- // TODO: If DolphinViewContainer uses DolphinView::saveState(...) to save the
- // view state in KDE 4.5, this code can be moved to DolphinView::saveState.
- QAbstractItemView* view = m_viewAccessor.itemView();
- Q_ASSERT(view != 0);
- const int x = view->horizontalScrollBar()->value();
- const int y = view->verticalScrollBar()->value();
- return QPoint(x, y);
-}
-
void DolphinView::setZoomLevel(int level)
{
if (level < ZoomLevelInfo::minimumLevel()) {
updateZoomLevel(oldZoomLevel);
}
-void DolphinView::updateView(const KUrl& url, const KUrl& rootUrl)
-{
- Q_UNUSED(rootUrl); // TODO: remove after columnview-cleanup has been finished
-
- if (m_controller->url() == url) {
- return;
- }
-
- m_controller->setUrl(url); // emits urlChanged, which we forward
- m_viewAccessor.prepareUrlChange(url);
- applyViewProperties();
- loadDirectory(url);
-
- // When changing the URL there is no need to keep the version
- // data of the previous URL.
- m_viewAccessor.dirModel()->clearVersionData();
-
- emit startedPathLoading(url);
-}
-
void DolphinView::setNameFilter(const QString& nameFilter)
{
m_controller->setNameFilter(nameFilter);
if (folderCount + fileCount == 1) {
// if only one item is selected, show the filename
- const QString name = list.first().name();
+ const QString name = list.first().text();
text = (folderCount == 1) ? i18nc("@info:status", "<filename>%1</filename> selected", name) :
i18nc("@info:status", "<filename>%1</filename> selected (%2)",
name, KIO::convertSize(totalFileSize));
void DolphinView::setUrl(const KUrl& url)
{
- m_newFileNames.clear();
- updateView(url, KUrl());
+ if (m_controller->url() != url) {
+ m_newFileNames.clear();
+
+ m_controller->setUrl(url); // emits urlChanged, which we forward
+ m_viewAccessor.prepareUrlChange(url);
+ applyViewProperties();
+ loadDirectory(url);
+
+ // When changing the URL there is no need to keep the version
+ // data of the previous URL.
+ m_viewAccessor.dirModel()->clearVersionData();
+
+ emit startedPathLoading(url);
+ }
+
+ // the selection model might have changed in the case of a column view
+ QItemSelectionModel* selectionModel = m_viewAccessor.itemView()->selectionModel();
+ if (m_selectionModel != selectionModel) {
+ disconnect(m_selectionModel, SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
+ this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection)));
+ m_selectionModel = selectionModel;
+ connect(m_selectionModel, SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
+ this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection)));
+ }
}
void DolphinView::selectAll()
}
}
break;
-
+
default:
break;
}
return m_tabsForFiles;
}
-void DolphinView::activateItem(const KUrl& url)
-{
- // TODO: If DolphinViewContainer uses DolphinView::restoreState(...) to restore the
- // view state in KDE 4.5, this function can be removed.
- m_activeItemUrl = url;
-}
-
bool DolphinView::itemsExpandable() const
{
return m_viewAccessor.itemsExpandable();
}
-void DolphinView::restoreState(QDataStream &stream)
+void DolphinView::restoreState(QDataStream& stream)
{
- // current item
+ // current item
stream >> m_activeItemUrl;
// view position
QSet<KUrl> urlsToExpand;
stream >> urlsToExpand;
const DolphinDetailsViewExpander* expander = m_viewAccessor.setExpandedUrls(urlsToExpand);
-
- if (expander) {
+ if (expander != 0) {
m_expanderActive = true;
connect (expander, SIGNAL(completed()), this, SLOT(slotLoadingCompleted()));
}
}
}
-void DolphinView::saveState(QDataStream &stream)
+void DolphinView::saveState(QDataStream& stream)
{
// current item
KFileItem currentItem;
const QAbstractItemView* view = m_viewAccessor.itemView();
- if(view) {
+ if (view != 0) {
const QModelIndex proxyIndex = view->currentIndex();
const QModelIndex dirModelIndex = m_viewAccessor.proxyModel()->mapToSource(proxyIndex);
currentItem = m_viewAccessor.dirModel()->itemForIndex(dirModelIndex);
}
KUrl currentUrl;
- if (!currentItem.isNull())
+ if (!currentItem.isNull()) {
currentUrl = currentItem.url();
+ }
stream << currentUrl;
// view position
- stream << contentsPosition();
+ const int x = view->horizontalScrollBar()->value();
+ const int y = view->verticalScrollBar()->value();
+ stream << QPoint(x, y);
// expanded folders (only relevant for the details view - the set will be empty in other view modes)
stream << m_viewAccessor.expandedUrls();
m_createdItemUrl = KUrl();
}
-void DolphinView::emitContentsMoved()
-{
- // TODO: If DolphinViewContainer uses DolphinView::saveState(...) to save the
- // view state in KDE 4.5, the contentsMoved signal might not be needed anymore,
- // depending on how the implementation is done.
- // In that case, the code in contentsPosition() can be moved to saveState().
-
- // only emit the contents moved signal if no directory loading is ongoing
- // (this would reset the contents position always to (0, 0))
- if (!m_loadingDirectory) {
- const QPoint pos(contentsPosition());
- emit contentsMoved(pos.x(), pos.y());
- }
-}
-
void DolphinView::showHoverInformation(const KFileItem& item)
{
emit requestItemInfo(item);
}
}
-void DolphinView::slotRequestUrlChange(const KUrl& url)
-{
- emit requestUrlChange(url);
- m_controller->setUrl(url);
-}
-
void DolphinView::slotDirListerCompleted()
{
if (!m_expanderActive) {
void DolphinView::slotLoadingCompleted()
{
m_expanderActive = false;
- m_loadingDirectory = false;
if (!m_activeItemUrl.isEmpty()) {
// assure that the current item remains visible
return;
}
- m_loadingDirectory = true;
- m_expanderActive = false;
-
- m_viewAccessor.dirLister()->openUrl(url, reload ? KDirLister::Reload : KDirLister::NoFlags);
+ KDirLister* dirLister = m_viewAccessor.dirLister();
+ dirLister->openUrl(url, reload ? KDirLister::Reload : KDirLister::NoFlags);
}
void DolphinView::applyViewProperties()
m_selectionModel = view->selectionModel();
}
m_selectionModel->setParent(this);
- connect(view->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)),
- this, SLOT(slotSelectionChanged(const QItemSelection&, const QItemSelection&)));
-
- connect(view->verticalScrollBar(), SIGNAL(valueChanged(int)),
- this, SLOT(emitContentsMoved()));
- connect(view->horizontalScrollBar(), SIGNAL(valueChanged(int)),
- this, SLOT(emitContentsMoved()));
+ connect(m_selectionModel, SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
+ this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection)));
setFocusProxy(m_viewAccessor.layoutTarget());
m_topLayout->insertWidget(1, m_viewAccessor.layoutTarget());
disconnect(view);
m_controller->disconnect(view);
view->disconnect();
- disconnect(view->verticalScrollBar(), SIGNAL(valueChanged(int)),
- this, SLOT(emitContentsMoved()));
- disconnect(view->horizontalScrollBar(), SIGNAL(valueChanged(int)),
- this, SLOT(emitContentsMoved()));
m_viewAccessor.deleteView();
}
if (m_columnsContainer != 0) {
m_columnsContainer->showColumn(url);
}
-
- if(!m_detailsViewExpander.isNull()) {
- // Stop expanding items in the current folder
- m_detailsViewExpander->stop();
- }
}
QAbstractItemView* DolphinView::ViewAccessor::itemView() const
QSet<KUrl> DolphinView::ViewAccessor::expandedUrls() const
{
- if(m_detailsView != 0) {
+ if (m_detailsView != 0) {
return m_detailsView->expandedUrls();
}
- else {
- return QSet<KUrl>();
- }
+
+ return QSet<KUrl>();
}
const DolphinDetailsViewExpander* DolphinView::ViewAccessor::setExpandedUrls(const QSet<KUrl>& urlsToExpand)
{
- if((m_detailsView != 0) && m_detailsView->itemsExpandable() && !urlsToExpand.isEmpty()) {
+ if ((m_detailsView != 0) && m_detailsView->itemsExpandable() && !urlsToExpand.isEmpty()) {
+ // Check if another expander is already active and stop it if necessary.
+ if(!m_detailsViewExpander.isNull()) {
+ m_detailsViewExpander->stop();
+ }
+
m_detailsViewExpander = new DolphinDetailsViewExpander(m_detailsView, urlsToExpand);
return m_detailsViewExpander;
}
void DolphinView::restoreContentsPosition()
{
if (!m_restoredContentsPosition.isNull()) {
- setContentsPosition(m_restoredContentsPosition.x(), m_restoredContentsPosition.y());
+ const int x = m_restoredContentsPosition.x();
+ const int y = m_restoredContentsPosition.y();
m_restoredContentsPosition = QPoint();
+
+ QAbstractItemView* view = m_viewAccessor.itemView();
+ Q_ASSERT(view != 0);
+ view->horizontalScrollBar()->setValue(x);
+ view->verticalScrollBar()->setValue(y);
}
}
projects / dolphin.git / blobdiff