1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
|
diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp
index 12b8e2a98..eb1b9e869 100644
--- a/src/kitemviews/kfileitemmodel.cpp
+++ b/src/kitemviews/kfileitemmodel.cpp
@@ -1920,7 +1920,14 @@ QHash<QByteArray, QVariant> KFileItemModel::retrieveData(const KFileItem &item,
}
if (m_requestRole[NameRole]) {
- data.insert(sharedValue("text"), item.text());
+ QString displayName = item.text();
+ if (ContentDisplaySettings::hideFileExtensions() && !isDir) {
+ const int dotIndex = displayName.lastIndexOf(QLatin1Char('.'));
+ if (dotIndex > 0) {
+ displayName = displayName.left(dotIndex);
+ }
+ }
+ data.insert(sharedValue("text"), displayName);
}
if (m_requestRole[ExtensionRole] && !isDir) {
diff --git a/src/kitemviews/private/kpixmapmodifier.cpp b/src/kitemviews/private/kpixmapmodifier.cpp
index bf316b880..96aea26d4 100644
--- a/src/kitemviews/private/kpixmapmodifier.cpp
+++ b/src/kitemviews/private/kpixmapmodifier.cpp
@@ -15,6 +15,8 @@
#include "kpixmapmodifier.h"
+#include "dolphin_iconsmodesettings.h"
+
#include <QGuiApplication>
#include <QImage>
#include <QPainter>
@@ -281,7 +283,10 @@ void KPixmapModifier::scale(QPixmap &pixmap, const QSize &scaledSize)
return;
}
qreal dpr = pixmap.devicePixelRatio();
- pixmap = pixmap.scaled(scaledSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+ const Qt::TransformationMode mode = IconsModeSettings::usePixelatedScaling()
+ ? Qt::FastTransformation
+ : Qt::SmoothTransformation;
+ pixmap = pixmap.scaled(scaledSize, Qt::KeepAspectRatio, mode);
pixmap.setDevicePixelRatio(dpr);
}
diff --git a/src/settings/dolphin_contentdisplaysettings.kcfg b/src/settings/dolphin_contentdisplaysettings.kcfg
index 6e8f8e9d5..dd10d09e8 100644
--- a/src/settings/dolphin_contentdisplaysettings.kcfg
+++ b/src/settings/dolphin_contentdisplaysettings.kcfg
@@ -46,5 +46,9 @@
</choices>
<default>Middle</default>
</entry>
+ <entry name="HideFileExtensions" type="Bool">
+ <label>Hide file name extensions</label>
+ <default>false</default>
+ </entry>
</group>
</kcfg>
diff --git a/src/settings/dolphin_iconsmodesettings.kcfg b/src/settings/dolphin_iconsmodesettings.kcfg
index 7948af75d..d4e3ca8d5 100644
--- a/src/settings/dolphin_iconsmodesettings.kcfg
+++ b/src/settings/dolphin_iconsmodesettings.kcfg
@@ -31,5 +31,9 @@
<label>Maximum textlines (0 means unlimited)</label>
<default>3</default>
</entry>
+ <entry name="UsePixelatedScaling" type="Bool">
+ <label>Use nearest-neighbor scaling for icons (better for pixel art)</label>
+ <default>false</default>
+ </entry>
</group>
</kcfg>
diff --git a/src/settings/viewmodes/contentdisplaytab.cpp b/src/settings/viewmodes/contentdisplaytab.cpp
index 747c3ff20..7b854182e 100644
--- a/src/settings/viewmodes/contentdisplaytab.cpp
+++ b/src/settings/viewmodes/contentdisplaytab.cpp
@@ -10,6 +10,7 @@
#include <KLocalizedString>
#include <QButtonGroup>
+#include <QCheckBox>
#include <QFormLayout>
#include <QHBoxLayout>
#include <QRadioButton>
@@ -31,6 +32,7 @@ ContentDisplayTab::ContentDisplayTab(QWidget *parent)
, m_useCombinedPermissions(nullptr)
, m_elideMiddle(nullptr)
, m_elideEnding(nullptr)
+ , m_hideFileExtensions(nullptr)
{
QFormLayout *topLayout = new QFormLayout(this);
topLayout->setFormAlignment(Qt::AlignHCenter);
@@ -114,6 +116,9 @@ ContentDisplayTab::ContentDisplayTab(QWidget *parent)
elidingModeGroup->addButton(m_elideMiddle);
elidingModeGroup->addButton(m_elideEnding);
+ m_hideFileExtensions = new QCheckBox(i18nc("@option:check", "Hide file name extensions"));
+ topLayout->addRow(QString(), m_hideFileExtensions);
+
#ifndef Q_OS_WIN
connect(m_recursiveDirectorySizeLimit, &QSpinBox::valueChanged, this, &SettingsPageBase::changed);
connect(m_numberOfItems, &QRadioButton::toggled, this, &SettingsPageBase::changed);
@@ -133,6 +138,7 @@ ContentDisplayTab::ContentDisplayTab(QWidget *parent)
connect(m_caseSensitiveSorting, &QRadioButton::toggled, this, &SettingsPageBase::changed);
connect(m_elideMiddle, &QRadioButton::toggled, this, &SettingsPageBase::changed);
connect(m_elideEnding, &QRadioButton::toggled, this, &SettingsPageBase::changed);
+ connect(m_hideFileExtensions, &QCheckBox::toggled, this, &SettingsPageBase::changed);
loadSettings();
}
@@ -166,6 +172,7 @@ void ContentDisplayTab::applySettings()
} else if (m_elideEnding->isChecked()) {
settings->setElidingMode(ContentDisplaySettings::ElidingMode::Right);
}
+ settings->setHideFileExtensions(m_hideFileExtensions->isChecked());
settings->save();
GeneralSettings::self()->save();
@@ -188,6 +195,7 @@ void ContentDisplayTab::loadSettings()
loadSortingChoiceSettings();
m_elideMiddle->setChecked(settings->elidingMode() == ContentDisplaySettings::ElidingMode::Middle);
m_elideEnding->setChecked(settings->elidingMode() == ContentDisplaySettings::ElidingMode::Right);
+ m_hideFileExtensions->setChecked(settings->hideFileExtensions());
}
void ContentDisplayTab::setSortingChoiceValue()
diff --git a/src/settings/viewmodes/contentdisplaytab.h b/src/settings/viewmodes/contentdisplaytab.h
index 2bae5a87c..6d673b0f6 100644
--- a/src/settings/viewmodes/contentdisplaytab.h
+++ b/src/settings/viewmodes/contentdisplaytab.h
@@ -10,6 +10,7 @@
#include "dolphin_generalsettings.h"
#include "settings/settingspagebase.h"
+class QCheckBox;
class QRadioButton;
class QSpinBox;
@@ -45,6 +46,7 @@ private:
QRadioButton *m_useCombinedPermissions;
QRadioButton *m_elideMiddle;
QRadioButton *m_elideEnding;
+ QCheckBox *m_hideFileExtensions;
};
#endif // GENERALTAB_H
diff --git a/src/settings/viewmodes/viewsettingstab.cpp b/src/settings/viewmodes/viewsettingstab.cpp
index 3593f23dd..12a8c11cb 100644
--- a/src/settings/viewmodes/viewsettingstab.cpp
+++ b/src/settings/viewmodes/viewsettingstab.cpp
@@ -37,6 +37,7 @@ ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget *parent)
, m_widthBox(nullptr)
, m_maxLinesBox(nullptr)
, m_expandableFolders(nullptr)
+ , m_pixelatedScaling(nullptr)
{
QFormLayout *topLayout = new QFormLayout(this);
topLayout->setFormAlignment(Qt::AlignHCenter);
@@ -93,6 +94,9 @@ ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget *parent)
m_maxLinesBox->addItem(i18nc("@item:inlistbox Maximum lines", "4"));
m_maxLinesBox->addItem(i18nc("@item:inlistbox Maximum lines", "5"));
topLayout->addRow(i18nc("@label:listbox", "Maximum lines:"), m_maxLinesBox);
+
+ m_pixelatedScaling = new QCheckBox(i18nc("@option:check", "Use pixelated thumbnail scaling"));
+ topLayout->addRow(QString(), m_pixelatedScaling);
break;
}
case CompactMode: {
@@ -135,6 +139,7 @@ ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget *parent)
case IconsMode:
connect(m_widthBox, &QComboBox::currentIndexChanged, this, &ViewSettingsTab::changed);
connect(m_maxLinesBox, &QComboBox::currentIndexChanged, this, &ViewSettingsTab::changed);
+ connect(m_pixelatedScaling, &QCheckBox::toggled, this, &ViewSettingsTab::changed);
break;
case CompactMode:
connect(m_widthBox, &QComboBox::currentIndexChanged, this, &ViewSettingsTab::changed);
@@ -173,6 +178,7 @@ void ViewSettingsTab::applySettings()
case IconsMode:
IconsModeSettings::setTextWidthIndex(m_widthBox->currentIndex());
IconsModeSettings::setMaximumTextLines(m_maxLinesBox->currentIndex());
+ IconsModeSettings::setUsePixelatedScaling(m_pixelatedScaling->isChecked());
IconsModeSettings::self()->save();
break;
case CompactMode:
@@ -235,6 +241,7 @@ void ViewSettingsTab::loadSettings()
case IconsMode:
m_widthBox->setCurrentIndex(IconsModeSettings::textWidthIndex());
m_maxLinesBox->setCurrentIndex(IconsModeSettings::maximumTextLines());
+ m_pixelatedScaling->setChecked(IconsModeSettings::usePixelatedScaling());
break;
case CompactMode:
m_widthBox->setCurrentIndex(CompactModeSettings::maximumTextWidthIndex());
diff --git a/src/settings/viewmodes/viewsettingstab.h b/src/settings/viewmodes/viewsettingstab.h
index 6ea7a3bf3..2f2e75180 100644
--- a/src/settings/viewmodes/viewsettingstab.h
+++ b/src/settings/viewmodes/viewsettingstab.h
@@ -55,6 +55,7 @@ private:
QRadioButton *m_iconAndNameOnly;
QCheckBox *m_expandableFolders;
QLabel *m_fontWarningLabel;
+ QCheckBox *m_pixelatedScaling;
};
#endif
\ No newline at end of file
|
