Differential D20838 Diff 58000 src/filewidgets/kdiroperator.cpp

Changeset View

Standalone View

View Options

src/filewidgets/kdiroperator.cpp

Show All 22 Lines
23#include <kiconloader.h> 23​#include <kiconloader.h>
24#include "kdirmodel.h" 24​#include "kdirmodel.h"
25#include "kdiroperatordetailview_p.h" 25​#include "kdiroperatordetailview_p.h"
26#include "kdirsortfilterproxymodel.h" 26​#include "kdirsortfilterproxymodel.h"
27#include "kfileitem.h" 27​#include "kfileitem.h"
28#include "kfilemetapreview_p.h" 28​#include "kfilemetapreview_p.h"
29#include "kpreviewwidgetbase.h" 29​#include "kpreviewwidgetbase.h"
30#include "knewfilemenu.h" 30​#include "knewfilemenu.h"
31​#include <kurlmimedata.h>
31#include "../pathhelpers_p.h" 32​#include "../pathhelpers_p.h"
32 33​
33#include <config-kiofilewidgets.h> 34​#include <config-kiofilewidgets.h>
34#include <defaults-kfile.h> // ConfigGroup, DefaultShowHidden, DefaultDirsFirst, DefaultSortReversed 35​#include <defaults-kfile.h> // ConfigGroup, DefaultShowHidden, DefaultDirsFirst, DefaultSortReversed
35 36​
36#include <QApplication> 37​#include <QApplication>
37#include <QHeaderView> 38​#include <QHeaderView>
38#include <QListView> 39​#include <QListView>
▲ Show 20 Lines • Show All 150 Lines • ▼ Show 20 Line(s)175public:
189 Qt::SortOrder sortOrder() const; 190​ Qt::SortOrder sortOrder() const;
190 void updateSorting(QDir::SortFlags sort); 191​ void updateSorting(QDir::SortFlags sort);
191 192​
192 static bool isReadable(const QUrl &url); 193​ static bool isReadable(const QUrl &url);
193 bool isSchemeSupported(const QString &scheme) const; 194​ bool isSchemeSupported(const QString &scheme) const;
194 195​
195 KFile::FileView allViews(); 196​ KFile::FileView allViews();
196 197​
198​ QMetaObject::Connection m_connection;
199​
197 // private slots 200​ // private slots
198 void _k_slotDetailedView(); 201​ void _k_slotDetailedView();
199 void _k_slotSimpleView(); 202​ void _k_slotSimpleView();
200 void _k_slotTreeView(); 203​ void _k_slotTreeView();
201 void _k_slotDetailedTreeView(); 204​ void _k_slotDetailedTreeView();
202 void _k_slotToggleHidden(bool); 205​ void _k_slotToggleHidden(bool);
203 void _k_togglePreview(bool); 206​ void _k_togglePreview(bool);
204 void _k_toggleInlinePreviews(bool); 207​ void _k_toggleInlinePreviews(bool);
▲ Show 20 Lines • Show All 204 Lines • ▼ Show 20 Line(s)363{
409 // action stuff 412​ // action stuff
410 setupActions(); 413​ setupActions();
411 setupMenu(); 414​ setupMenu();
412 415​
413 d->sorting = QDir::NoSort; //so updateSorting() doesn't think nothing has changed 416​ d->sorting = QDir::NoSort; //so updateSorting() doesn't think nothing has changed
414 d->updateSorting(QDir::Name | QDir::DirsFirst); 417​ d->updateSorting(QDir::Name | QDir::DirsFirst);
415 418​
416 setFocusPolicy(Qt::WheelFocus); 419​ setFocusPolicy(Qt::WheelFocus);
420​ setAcceptDrops(true);
apolUnsubmitted
Done

This default change should be documented.

apol: This default change should be documented.
mevenAuthorUnsubmitted
Done

Not sure I have done this correctly.

meven: Not sure I have done this correctly.
ngrahamUnsubmitted
Done

Yep, I'd say so now.

ngraham: Yep, I'd say so now.
mevenAuthorUnsubmitted
Done

Any idea where I should add this information ?
An example would suffice.

meven: Any idea where I should add this information ? An example would suffice.
ngrahamUnsubmitted
Done

You already did, in the inline function documentation in src/filewidgets/kdiroperator.h

ngraham: You already did, in the inline function documentation in `src/filewidgets/kdiroperator.h`
417} 421​}
418 422​
419KDirOperator::~KDirOperator() 423​KDirOperator::~KDirOperator()
420{ 424​{
421 resetCursor(); 425​ resetCursor();
422 disconnect(d->dirLister, nullptr, this, nullptr); 426​ disconnect(d->dirLister, nullptr, this, nullptr);
423 delete d; 427​ delete d;
424} 428​}
▲ Show 20 Lines • Show All 949 Lines • ▼ Show 20 Line(s)1377 if (evt->delta() > 0) {
1374 setIconsZoom(d->iconsZoom + 10); 1378​ setIconsZoom(d->iconsZoom + 10);
1375 } else { 1379​ } else {
1376 setIconsZoom(d->iconsZoom - 10); 1380​ setIconsZoom(d->iconsZoom - 10);
1377 } 1381​ }
1378 return true; 1382​ return true;
1379 } 1383​ }
1380 } 1384​ }
1381 break; 1385​ break;
1386​ case QEvent::DragEnter: {
1387​ // Accepts drops of one file or folder only
1388​ QDragEnterEvent *evt = static_cast<QDragEnterEvent *>(event);
1389​ const QList<QUrl> urls = KUrlMimeData::urlsFromMimeData(evt->mimeData(), KUrlMimeData::DecodeOptions::PreferLocalUrls);
1390​
1391​ // only one file/folder can be dropped at the moment
1392​ if (urls.size() != 1) {
1393​ evt->ignore();
1394​
1395​ } else {
1396​ // mimetype filtering
1397​ bool mimeFilterPass = true;
1398​ const QStringList mimeFilters = d->dirLister->mimeFilters();
1399​
1400​ if (mimeFilters.size() > 1) {
1401​ mimeFilterPass = false;
1402​ const QUrl url = urls.constFirst();
1403​
apolUnsubmitted
Done

.constFirst() maybe reads better?

apol: .constFirst() maybe reads better?
1404​ QMimeDatabase mimeDataBase;
ngrahamUnsubmitted
Done

this-> not needed

ngraham: `this->` not needed
1405​ QMimeType fileMimeType = mimeDataBase.mimeTypeForUrl(url);
elvisangelaccioUnsubmitted
Done

Please use descriptive variable names also here.

elvisangelaccio: Please use descriptive variable names also here.
1406​
1407​ QRegularExpression regex;
elvisangelaccioUnsubmitted
Done

QRegExp should be avoid in new code, can you try to use QRegularExpression instead?

elvisangelaccio: QRegExp should be avoid in new code, can you try to use QRegularExpression instead?
1408​ for (const auto& mimeFilter : mimeFilters) {
1409​ regex.setPattern(mimeFilter);
1410​ if (regex.match(fileMimeType.name()).hasMatch()) { // matches!
1411​ mimeFilterPass = true;
1412​ break;
ngrahamUnsubmitted
Done

Comment seems unnecessary; the code is clear enough

ngraham: Comment seems unnecessary; the code is clear enough
1413​ }
1414​ }
1415​ }
1416​
1417​ event->setAccepted(mimeFilterPass);
1418​ }
ngrahamUnsubmitted
Done

this-> not needed

ngraham: `this->` not needed
1419​
1420​ return true;
1421​ }
apolUnsubmitted
Done

maybe call the function urlSetter?

apol: maybe call the function urlSetter?
1422​ case QEvent::Drop: {
1423​ QDropEvent *evt = static_cast<QDropEvent *>(event);
ngrahamUnsubmitted
Done

this-> not needed

ngraham: `this->` not needed
1424​ const QList<QUrl> urls = KUrlMimeData::urlsFromMimeData(evt->mimeData(), KUrlMimeData::DecodeOptions::PreferLocalUrls);
1425​
1426​ const QUrl url = urls.constFirst();
1427​
1428​ // stat the url to get details
1429​ KIO::StatJob *job = KIO::stat(url, KIO::HideProgressInfo);
1430​ job->exec();
1431​
1432​ setFocus();
1433​
1434​ KIO::UDSEntry entry = job->statResult();
1435​
1436​ if (entry.isDir()) {
1437​ // if this was a directory
1438​ setUrl(url, false);
1439​ } else {
1440​ // if the current url is not known
1441​ if (d->dirLister->findByUrl(url).isNull()) {
1442​ setUrl(url.adjusted(QUrl::RemoveFilename), false);
1443​
1444​ // Will set the current item once loading has finished
1445​ auto urlSetterClosure = [this, url](){
1446​ setCurrentItem(url);
1447​ QObject::disconnect(d->m_connection);
1448​ };
1449​ d->m_connection = connect(this, &KDirOperator::finishedLoading, this, urlSetterClosure);
1450​ } else {
1451​ setCurrentItem(url);
1452​ }
1453​ }
1454​ evt->accept();
1455​ return true;
1456​ }
1382 default: 1457​ default:
1383 break; 1458​ break;
1384 } 1459​ }
1385 1460​
1386 return QWidget::eventFilter(watched, event); 1461​ return QWidget::eventFilter(watched, event);
1387} 1462​}
1388 1463​
1389bool KDirOperator::Private::checkPreviewInternal() const 1464​bool KDirOperator::Private::checkPreviewInternal() const
▲ Show 20 Lines • Show All 66 Lines • ▼ Show 20 Line(s)1528 if (KFile::isDetailView(viewKind) || KFile::isTreeView(viewKind) || KFile::isDetailTreeView(viewKind)) {
1456 itemView = detailView; 1531​ itemView = detailView;
1457 } else { 1532​ } else {
1458 itemView = new KDirOperatorIconView(this, parent); 1533​ itemView = new KDirOperatorIconView(this, parent);
1459 } 1534​ }
1460 1535​
1461 return itemView; 1536​ return itemView;
1462} 1537​}
1463 1538​
1464void KDirOperator::setAcceptDrops(bool b) 1539​void KDirOperator::setAcceptDrops(bool acceptsDrops)
1465{ 1540​{
1466 // TODO: 1541​ QWidget::setAcceptDrops(acceptsDrops);
1467 //if (d->fileView) 1542​ if (view()) {
1468 // d->fileView->widget()->setAcceptDrops(b); 1543​ view()->setAcceptDrops(acceptsDrops);
1469 QWidget::setAcceptDrops(b); 1544​ if (acceptsDrops) {
1545​ view()->installEventFilter(this);
apolUnsubmitted
Done

Initial this-> isn't necessary, just view().

apol: Initial this-> isn't necessary, just `view()`.
1546​ } else {
1547​ view()->removeEventFilter(this);
1548​ }
1549​ }
1470} 1550​}
1471 1551​
1472void KDirOperator::setDropOptions(int options) 1552​void KDirOperator::setDropOptions(int options)
1473{ 1553​{
1474 d->dropOptions = options; 1554​ d->dropOptions = options;
1475 // TODO: 1555​ // TODO:
1476 //if (d->fileView) 1556​ //if (d->fileView)
1477 // d->fileView->setDropOptions(options); 1557​ // d->fileView->setDropOptions(options);
Show All 20 Lines1561{
1498 } 1578​ }
1499 1579​
1500 d->viewKind = static_cast<int>(viewKind); 1580​ d->viewKind = static_cast<int>(viewKind);
1501 viewKind = static_cast<KFile::FileView>(d->viewKind); 1581​ viewKind = static_cast<KFile::FileView>(d->viewKind);
1502 1582​
1503 QAbstractItemView *newView = createView(this, viewKind); 1583​ QAbstractItemView *newView = createView(this, viewKind);
1504 setView(newView); 1584​ setView(newView);
1505 1585​
1586​ if (acceptDrops()) {
ngrahamUnsubmitted
Done

this-> not needed

ngraham: `this->` not needed
1587​ newView->setAcceptDrops(true);
1588​ newView->installEventFilter(this);
1589​ }
1590​
1506 d->_k_togglePreview(preview); 1591​ d->_k_togglePreview(preview);
1507} 1592​}
1508 1593​
1509KFile::FileView KDirOperator::viewMode() const 1594​KFile::FileView KDirOperator::viewMode() const
1510{ 1595​{
1511 return static_cast<KFile::FileView>(d->viewKind); 1596​ return static_cast<KFile::FileView>(d->viewKind);
1512} 1597​}
1513 1598​
▲ Show 20 Lines • Show All 1171 Lines • Show Last 20 Lines