Differential D28301 Diff 78533 krusader/GUI/mediabutton.cpp

Changeset View

Standalone View

View Options

krusader/GUI/mediabutton.cpp

Context not available.
169 mountCheckerTimer.start(1000); 169​ mountCheckerTimer.start(1000);
170} 170​}
171 171​
172​bool isMountPointHidden(KConfigGroup *_config, const QString &mountPoint) {
173​ printf("isMountPointHidden is called for '%s'\n", mountPoint.toStdString().c_str());
yurchorUnsubmitted
Not Done

Can it be some kind of

qDebug() << "isMountPointHidden is called for " << mountPoint;

?
Thanks in advance for your answer.

yurchor: Can it be some kind of ``` qDebug() << "isMountPointHidden is called for " << mountPoint; ``` ?
S-traceAuthorUnsubmitted
Not Done

Oh, of course.
Forgot to remove this line.
How do you think, do we need this line in any form?

S-trace: Oh, of course. Forgot to remove this line. How do you think, do we need this line in any form?
yurchorUnsubmitted
Not Done

I'm not sure. I'm just a documentation maintainer of the project. Let's see what our developers think... ;)

yurchor: I'm not sure. I'm just a documentation maintainer of the project. Let's see what our developers…
asensiUnsubmitted
Not Done

I also think that this line can be removed, developers can always add it when they need it.

While we are at it, we can remove the isMountPointHidden() function, and substitute

if (isMountPointHidden(&cfg, path)) {
    return false;
}

with

if (cfg.readEntry("Hidden Mountpoints", QStringList()).contains(path)) {
    return false;
}
asensi: I also think that this line can be removed, developers can always add it when they need it.
174​ QStringList defaultHiddenMountpoints; // Empty list
175​ QStringList hiddenMountPoints = _config->readEntry("Hidden Mountpoints", defaultHiddenMountpoints);
176​ for (auto &listEntry : hiddenMountPoints) {
177​ if (mountPoint == listEntry) {
178​ return true;
179​ }
180​ }
181​ return false;
182​}
183​
172bool MediaButton::getNameAndIcon(Solid::Device & device, QString &name, QIcon &iconOut) 184​bool MediaButton::getNameAndIcon(Solid::Device & device, QString &name, QIcon &iconOut)
173{ 185​{
174 auto *access = device.as<Solid::StorageAccess>(); 186​ auto *access = device.as<Solid::StorageAccess>();
Context not available.
216 228​
217 KConfigGroup cfg(KSharedConfig::openConfig(), QStringLiteral("MediaMenu")); 229​ KConfigGroup cfg(KSharedConfig::openConfig(), QStringLiteral("MediaMenu"));
218 230​
231​ if (fstype == "squashfs" && cfg.readEntry("HideSquashFS", false)) {
232​ return false;
233​ }
234​
235​ if (isMountPointHidden(&cfg, path)) {
236​ return false;
237​ }
238​
219 if (printSize) { 239​ if (printSize) {
220 QString showSizeSetting = cfg.readEntry("ShowSize", "Always"); 240​ QString showSizeSetting = cfg.readEntry("ShowSize", "Always");
221 if (showSizeSetting == "WhenNoLabel") 241​ if (showSizeSetting == "WhenNoLabel")
Context not available.