Differential D11012 Diff 29238 src/trash/dolphintrash.cpp

Changeset View

Standalone View

View Options

src/trash/dolphintrash.cpp

  • This file was added.
1​/***************************************************************************
2​ * Copyright (C) 2012 by Peter Penz <peter.penz19@gmail.com> *
3​ * Copyright (C) 2018 by Roman Inflianskas <infroma@gmail.com> *
elvisangelaccioUnsubmitted
Done

Please also add

Copyright (C) 2012 by Peter Penz <peter.penz19@gmail.com>

who is the original author of a part of this code.

elvisangelaccio: Please also add Copyright (C) 2012 by Peter Penz <peter.penz19@gmail.com> who is the…
4​ * *
5​ * This program is free software; you can redistribute it and/or modify *
6​ * it under the terms of the GNU General Public License as published by *
7​ * the Free Software Foundation; either version 2 of the License, or *
8​ * (at your option) any later version. *
9​ * *
10​ * This program is distributed in the hope that it will be useful, *
11​ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
12​ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
13​ * GNU General Public License for more details. *
14​ * *
15​ * You should have received a copy of the GNU General Public License *
16​ * along with this program; if not, write to the *
17​ * Free Software Foundation, Inc., *
18​ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
19​ ***************************************************************************/
20​
21​#include "dolphintrash.h"
22​
23​#include <KIO/JobUiDelegate>
24​#include <KJobWidgets>
25​#include <QList>
26​#include <KNotification>
27​#include <KConfig>
28​#include <KConfigGroup>
29​
30​
31​Trash::Trash()
32​ : m_trashDirLister(new KDirLister())
markgUnsubmitted
Done

Now you still need to fix the indentation ;)
Sorry, nitpicking...

the semicolon should be on the line below and indentation should be 4 spaces.

markg: Now you still need to fix the indentation ;) Sorry, nitpicking... the semicolon should be on…
rominfAuthorUnsubmitted
Done

OK, but... It's the same as in files "informationpanelcontent.cpp", "filemetadataconfigurationdialog.cpp", "trashsettingspage.cpp", etc.

Is it worth to make semicolon consistent in another patch?

rominf: OK, but... It's the same as in files "informationpanelcontent.cpp"…
33​{
34​ // The trash icon must always be updated dependent on whether
35​ // the trash is empty or not. We use a KDirLister that automatically
36​ // watches for changes if the number of items has been changed.
37​ m_trashDirLister->setAutoErrorHandlingEnabled(false, nullptr);
38​ m_trashDirLister->setDelayedMimeTypes(true);
39​ auto trashDirContentChanged = [this]() {
40​ bool isTrashEmpty = m_trashDirLister->items().isEmpty();
41​ emit emptinessChanged(isTrashEmpty);
42​ };
43​ connect(m_trashDirLister, static_cast<void(KDirLister::*)()>(&KDirLister::completed), trashDirContentChanged);
44​ m_trashDirLister->openUrl(QStringLiteral("trash:/"));
45​}
46​
47​Trash::~Trash()
48​{
49​ delete m_trashDirLister;
50​}
51​
52​Trash &Trash::instance()
53​{
54​ static Trash result;
55​ return result;
56​}
57​
58​KIO::Job *Trash::empty(QWidget *window)
59​{
60​ KIO::JobUiDelegate uiDelegate;
61​ uiDelegate.setWindow(window);
62​ bool confirmed = uiDelegate.askDeleteConfirmation(QList<QUrl>(), KIO::JobUiDelegate::EmptyTrash, KIO::JobUiDelegate::DefaultConfirmation);
63​ if (confirmed) {
64​ KIO::Job* job = KIO::emptyTrash();
65​ KJobWidgets::setWindow(job, window);
66​ job->uiDelegate()->setAutoErrorHandlingEnabled(true);
67​ // as long as KIO doesn't do this, do it ourselves
68​ connect(job, &KIO::Job::result, [](){
markgUnsubmitted
Done

I know i said this before, but i now think that i'm wrong in that assumption.
The completed signal is a response to a request (give me a list of all the entries for example). When that request is completed, it emits the completed signal. That is how you know that there is nothing more to come.

The itemsDeleted (and itemsAdded) signal is a response to a change in a folder where you created the KDirLister job on and havent destroyed it yet. To be honest, i didn't know (till a dayago) that KDirLister was internally watching a dir for changes till you kill the object. It's basically a KDirWarch within KDirLister hidden away in a few signals. Kinda neat really :)

So it's not a bug. It just smelled like it :)
I think it's safe to remove the comment (or explain what's really going on) and keep this logic.

markg: I know i said this before, but i now think that i'm wrong in that assumption. The completed…
69​ KNotification::event(QStringLiteral("Trash: emptied"), QString(), QPixmap(), nullptr, KNotification::DefaultEvent);
markgUnsubmitted
Done

This is slightly odd.
You made it in a separate function probably to keep the constructor clean, but this is all just constructor stuff.

Also, the m_trashDirLister should be initialized in the constructor like so:

Trash::Trash()
  : m_trashDirLister(new KDirLister())
{
  // ..
}

In my opinion it's fine to move everything in the constructor.

markg: This is slightly odd. You made it in a separate function probably to keep the constructor clean…
70​ });
71​ return job;
72​ }
73​ return nullptr;
74​}
75​
76​bool Trash::isEmpty()
77​{
78​ KConfig trashConfig(QStringLiteral("trashrc"), KConfig::SimpleConfig);
79​ return (trashConfig.group("Status").readEntry("Empty", true));
80​}
81​