┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/dolphincolumnview.cpp4
-rw-r--r--src/dolphincolumnwidget.cpp3
-rw-r--r--src/dolphindetailsview.cpp1
-rw-r--r--src/dolphiniconsview.cpp1
-rw-r--r--src/dolphinview.cpp2
-rw-r--r--src/iconmanager.cpp47
-rw-r--r--src/iconmanager.h11
7 files changed, 56 insertions, 13 deletions
diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp
index 82d571724..7e74b7e34 100644
--- a/src/dolphincolumnview.cpp
+++ b/src/dolphincolumnview.cpp
@@ -370,11 +370,13 @@ void DolphinColumnView::updateDecorationSize()
{
ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
const int iconSize = settings->iconSize();
+ const QSize size(iconSize, iconSize);
+ setIconSize(size);
foreach (QObject* object, viewport()->children()) {
if (object->inherits("QListView")) {
DolphinColumnWidget* widget = static_cast<DolphinColumnWidget*>(object);
- widget->setDecorationSize(QSize(iconSize, iconSize));
+ widget->setDecorationSize(size);
}
}
diff --git a/src/dolphincolumnwidget.cpp b/src/dolphincolumnwidget.cpp
index 3bb1f36c2..ae5f32fcf 100644
--- a/src/dolphincolumnwidget.cpp
+++ b/src/dolphincolumnwidget.cpp
@@ -89,7 +89,7 @@ DolphinColumnWidget::DolphinColumnWidget(QWidget* parent,
m_font.setBold(settings->boldFont());
const int iconSize = settings->iconSize();
- m_decorationSize = QSize(iconSize, iconSize);
+ setDecorationSize(QSize(iconSize, iconSize));
KFileItemDelegate* delegate = new KFileItemDelegate(this);
setItemDelegate(delegate);
@@ -136,6 +136,7 @@ DolphinColumnWidget::~DolphinColumnWidget()
void DolphinColumnWidget::setDecorationSize(const QSize& size)
{
+ setIconSize(size);
m_decorationSize = size;
doItemsLayout();
}
diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index 7661ce88d..c5852fa68 100644
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -524,6 +524,7 @@ void DolphinDetailsView::updateDecorationSize()
{
DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
const int iconSize = settings->iconSize();
+ setIconSize(QSize(iconSize, iconSize));
m_decorationSize = QSize(iconSize, iconSize);
m_controller->setZoomInPossible(isZoomInPossible());
diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index 8f5992219..c867ce611 100644
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -451,6 +451,7 @@ void DolphinIconsView::updateGridSize(bool showPreview, int additionalInfoCount)
size = previewSize;
}
+ setIconSize(QSize(size, size));
Q_ASSERT(additionalInfoCount >= 0);
itemHeight += additionalInfoCount * m_font.pointSize() * 2;
diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index a2d56f474..a424bcbb5 100644
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -410,11 +410,13 @@ QPoint DolphinView::contentsPosition() const
void DolphinView::zoomIn()
{
m_controller->triggerZoomIn();
+ reload();
}
void DolphinView::zoomOut()
{
m_controller->triggerZoomOut();
+ reload();
}
bool DolphinView::isZoomInPossible() const
diff --git a/src/iconmanager.cpp b/src/iconmanager.cpp
index a5e72eabf..a1ab96307 100644
--- a/src/iconmanager.cpp
+++ b/src/iconmanager.cpp
@@ -31,6 +31,7 @@
#include <QApplication>
#include <QAbstractItemView>
#include <QClipboard>
+#include <QColor>
#include <QIcon>
IconManager::IconManager(QAbstractItemView* parent, DolphinSortFilterProxyModel* model) :
@@ -42,9 +43,11 @@ IconManager::IconManager(QAbstractItemView* parent, DolphinSortFilterProxyModel*
m_proxyModel(model),
m_cutItemsCache()
{
+ Q_ASSERT(m_view->iconSize().isValid()); // each view must provide its current icon size
+
m_dolphinModel = static_cast<DolphinModel*>(m_proxyModel->sourceModel());
connect(m_dolphinModel->dirLister(), SIGNAL(newItems(const KFileItemList&)),
- this, SLOT(generatePreviews(const KFileItemList&)));
+ this, SLOT(updateIcons(const KFileItemList&)));
QClipboard* clipboard = QApplication::clipboard();
connect(clipboard, SIGNAL(dataChanged()),
@@ -70,18 +73,30 @@ void IconManager::setShowPreview(bool show)
}
}
-void IconManager::generatePreviews(const KFileItemList& items)
+void IconManager::updateIcons(const KFileItemList& items)
{
+ // make the icons of all hidden files semitransparent
+ foreach (KFileItem item, items) {
+ if (item.name().startsWith('.')) {
+ applyHiddenItemEffect(item);
+ }
+ }
+
if (!m_showPreview) {
return;
}
+ // generate previews
const QRect visibleArea = m_view->viewport()->rect();
// Order the items in a way that the preview for the visible items
// is generated first, as this improves the feeled performance a lot.
KFileItemList orderedItems;
foreach (KFileItem item, items) {
+ if (item.name().startsWith('.')) {
+ applyHiddenItemEffect(item);
+ }
+
const QModelIndex dirIndex = m_dolphinModel->indexForItem(item);
const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex);
const QRect itemRect = m_view->visualRect(proxyIndex);
@@ -92,7 +107,8 @@ void IconManager::generatePreviews(const KFileItemList& items)
}
}
- KIO::PreviewJob* job = KIO::filePreview(orderedItems, 128);
+ const QSize size = m_view->iconSize();
+ KIO::PreviewJob* job = KIO::filePreview(orderedItems, size.width(), size.height());
connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)),
this, SLOT(replaceIcon(const KFileItem&, const QPixmap&)));
connect(job, SIGNAL(finished(KJob*)),
@@ -114,13 +130,18 @@ void IconManager::replaceIcon(const KFileItem& item, const QPixmap& pixmap)
const QModelIndex idx = m_dolphinModel->indexForItem(item);
if (idx.isValid() && (idx.column() == 0)) {
+ QPixmap newPixmap = pixmap;
+ if (item.name().startsWith('.')) {
+ KIconEffect::semiTransparent(newPixmap);
+ }
+
const QMimeData* mimeData = QApplication::clipboard()->mimeData();
if (KonqMimeData::decodeIsCutSelection(mimeData) && isCutItem(item)) {
KIconEffect iconEffect;
- const QPixmap cutPixmap = iconEffect.apply(pixmap, KIconLoader::Desktop, KIconLoader::DisabledState);
- m_dolphinModel->setData(idx, QIcon(cutPixmap), Qt::DecorationRole);
+ newPixmap = iconEffect.apply(newPixmap, KIconLoader::Desktop, KIconLoader::DisabledState);
+ m_dolphinModel->setData(idx, QIcon(newPixmap), Qt::DecorationRole);
} else {
- m_dolphinModel->setData(idx, QIcon(pixmap), Qt::DecorationRole);
+ m_dolphinModel->setData(idx, QIcon(newPixmap), Qt::DecorationRole);
}
}
}
@@ -176,7 +197,7 @@ void IconManager::applyCutItemEffect()
const QVariant value = m_dolphinModel->data(index, Qt::DecorationRole);
if (value.type() == QVariant::Icon) {
const QIcon icon(qvariant_cast<QIcon>(value));
- QPixmap pixmap = icon.pixmap(128, 128);
+ QPixmap pixmap = icon.pixmap(m_view->iconSize());
// remember current pixmap for the item to be able
// to restore it when other items get cut
@@ -194,4 +215,16 @@ void IconManager::applyCutItemEffect()
}
}
+void IconManager::applyHiddenItemEffect(const KFileItem& hiddenItem)
+{
+ const QModelIndex index = m_dolphinModel->indexForItem(hiddenItem);
+ const QVariant value = m_dolphinModel->data(index, Qt::DecorationRole);
+ if (value.type() == QVariant::Icon) {
+ const QIcon icon(qvariant_cast<QIcon>(value));
+ QPixmap pixmap = icon.pixmap(m_view->iconSize());
+ KIconEffect::semiTransparent(pixmap);
+ m_dolphinModel->setData(index, QIcon(pixmap), Qt::DecorationRole);
+ }
+}
+
#include "iconmanager.moc"
diff --git a/src/iconmanager.h b/src/iconmanager.h
index 2636c81c6..d6cf5332b 100644
--- a/src/iconmanager.h
+++ b/src/iconmanager.h
@@ -51,11 +51,11 @@ public:
private slots:
/**
- * Generates a preview image for each file item in \a items.
- * The current preview settings (maximum size, 'Show Preview' menu)
- * are respected.
+ * Updates the icons of for each item in \a items by making hidden
+ * items semitransparent and generating previews. The current preview
+ * settings (maximum size, 'Show Preview' menu) are respected.
*/
- void generatePreviews(const KFileItemList& items);
+ void updateIcons(const KFileItemList& items);
/**
* Replaces the icon of the item \a item by the preview pixmap
@@ -82,6 +82,9 @@ private:
/** Applies an item effect to all cut items. */
void applyCutItemEffect();
+ /** Applies an item effect to the hidden item \a hiddenItem. */
+ void applyHiddenItemEffect(const KFileItem& hiddenItem);
+
private:
/**
* Remembers the original pixmap for an item before
generated by cgit v1.3 (git 2.53.0) at 2026-04-18 15:01:37 +0000