From 5fe847f61438c5535fc1f0143e80583a5f7012bd Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Sun, 21 Sep 2008 20:19:31 +0000 Subject: * documentation updates * don't trigger an assertion if no icon size is spezified by the view, just don't generate a preview in this case svn path=/trunk/KDE/kdebase/apps/; revision=863328 --- src/kfilepreviewgenerator.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src/kfilepreviewgenerator.cpp') diff --git a/src/kfilepreviewgenerator.cpp b/src/kfilepreviewgenerator.cpp index e81f66980..b55f60516 100644 --- a/src/kfilepreviewgenerator.cpp +++ b/src/kfilepreviewgenerator.cpp @@ -82,7 +82,7 @@ private: KFilePreviewGenerator::KFilePreviewGenerator(QAbstractItemView* parent, KDirSortFilterProxyModel* model) : QObject(parent), - m_showPreview(false), + m_showPreview(true), m_clearItemQueues(true), m_hasCutSelection(false), m_pendingVisiblePreviews(0), @@ -98,7 +98,9 @@ KFilePreviewGenerator::KFilePreviewGenerator(QAbstractItemView* parent, KDirSort m_pendingItems(), m_dispatchedItems() { - Q_ASSERT(m_view->iconSize().isValid()); // each view must provide its current icon size + if (!m_view->iconSize().isValid()) { + m_showPreview = false; + } m_dirModel = static_cast(m_proxyModel->sourceModel()); connect(m_dirModel->dirLister(), SIGNAL(newItems(const KFileItemList&)), @@ -140,6 +142,12 @@ KFilePreviewGenerator::~KFilePreviewGenerator() void KFilePreviewGenerator::setShowPreview(bool show) { + if (show && !m_view->iconSize().isValid()) { + // the view must provide an icon size, otherwise the showing + // off previews will get ignored + return; + } + if (m_showPreview != show) { m_showPreview = show; m_cutItemsCache.clear(); -- cgit v1.3