Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
System
Dolphin
Commits
fd2203bb
Commit
fd2203bb
authored
Aug 04, 2021
by
Zren (Chris Holland)
Committed by
Zren (Chris Holland)
Aug 05, 2021
Browse files
Disable Hidden Files Last sort by default
parent
50149d6a
Pipeline
#73506
passed with stage
in 5 minutes
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/kitemviews/kfileitemmodel.cpp
View file @
fd2203bb
...
...
@@ -34,7 +34,7 @@ KFileItemModel::KFileItemModel(QObject* parent) :
KItemModelBase
(
"text"
,
parent
),
m_dirLister
(
nullptr
),
m_sortDirsFirst
(
true
),
m_sortHiddenLast
(
tru
e
),
m_sortHiddenLast
(
fals
e
),
m_sortRole
(
NameRole
),
m_sortingProgressPercent
(
-
1
),
m_roles
(),
...
...
src/settings/dolphin_directoryviewpropertysettings.kcfg
View file @
fd2203bb
...
...
@@ -59,7 +59,7 @@
<entry
name=
"SortHiddenLast"
type=
"Bool"
>
<label
context=
"@label"
>
Show hidden files and folders last
</label>
<default>
tru
e
</default>
<default>
fals
e
</default>
</entry>
<entry
name=
"VisibleRoles"
type=
"StringList"
>
...
...
src/tests/kfileitemmodeltest.cpp
View file @
fd2203bb
...
...
@@ -814,16 +814,16 @@ void KFileItemModelTest::testSorting()
{
// testDir structure is as follows
// ./
// ├─ .g/
// ├─ a
// ├─ b
// ├─ c/
// │ ├─ c-2/
// │ │ ├─ c-3
// │ ├─ c-1
// ├─ .f
// ├─ d
// ├─ e
// ├─ .f
// ├─ .g/
QSignalSpy
itemsInsertedSpy
(
m_model
,
&
KFileItemModel
::
itemsInserted
);
QSignalSpy
itemsMovedSpy
(
m_model
,
&
KFileItemModel
::
itemsMoved
);
...
...
@@ -968,10 +968,20 @@ void KFileItemModelTest::testSorting()
// 'Show Hidden Files' enabled
m_model
->
setShowHiddenFiles
(
true
);
QVERIFY
(
m_model
->
showHiddenFiles
());
QCOMPARE
(
itemsInModel
(),
QStringList
()
<<
"c"
<<
"c-2"
<<
"c-3"
<<
"c-1"
<<
"d"
<<
"e"
<<
"b"
<<
"a"
<<
".g"
<<
".f"
);
QVERIFY
(
!
m_model
->
sortHiddenLast
());
QCOMPARE
(
itemsInModel
(),
QStringList
()
<<
"c"
<<
"c-2"
<<
"c-3"
<<
"c-1"
<<
".g"
<<
"d"
<<
"e"
<<
"b"
<<
"a"
<<
".f"
);
QCOMPARE
(
itemsMovedSpy
.
count
(),
0
);
QCOMPARE
(
itemsInsertedSpy
.
count
(),
1
);
QCOMPARE
(
itemsInsertedSpy
.
takeFirst
().
at
(
0
).
value
<
KItemRangeList
>
(),
KItemRangeList
()
<<
KItemRange
(
8
,
2
));
QCOMPARE
(
itemsInsertedSpy
.
takeFirst
().
at
(
0
).
value
<
KItemRangeList
>
(),
KItemRangeList
()
<<
KItemRange
(
4
,
1
)
<<
KItemRange
(
8
,
1
));
// 'Sort Hidden Files Last' enabled
m_model
->
setSortHiddenLast
(
true
);
QVERIFY
(
m_model
->
sortHiddenLast
());
QCOMPARE
(
itemsInModel
(),
QStringList
()
<<
"c"
<<
"c-2"
<<
"c-3"
<<
"c-1"
<<
"d"
<<
"e"
<<
"b"
<<
"a"
<<
".g"
<<
".f"
);
QCOMPARE
(
itemsMovedSpy
.
count
(),
1
);
QCOMPARE
(
itemsInsertedSpy
.
count
(),
0
);
QCOMPARE
(
itemsMovedSpy
.
first
().
at
(
0
).
value
<
KItemRange
>
(),
KItemRange
(
4
,
5
));
QCOMPARE
(
itemsMovedSpy
.
takeFirst
().
at
(
1
).
value
<
QList
<
int
>
>
(),
QList
<
int
>
()
<<
8
<<
4
<<
5
<<
6
<<
7
);
// Sort by Name
m_model
->
setSortRole
(
"text"
);
...
...
@@ -1151,7 +1161,7 @@ void KFileItemModelTest::testRemoveHiddenItems()
m_model
->
setShowHiddenFiles
(
true
);
m_model
->
loadDirectory
(
m_testDir
->
url
());
QVERIFY
(
itemsInsertedSpy
.
wait
());
QCOMPARE
(
itemsInModel
(),
QStringList
()
<<
"
c
"
<<
"
d
"
<<
"
h
"
<<
"
i
"
<<
".
a
"
<<
".
b
"
<<
".f
"
<<
"
.g
"
);
QCOMPARE
(
itemsInModel
(),
QStringList
()
<<
"
.a
"
<<
"
.b
"
<<
"
c
"
<<
"
d
"
<<
".
f
"
<<
".
g
"
<<
"h
"
<<
"
i
"
);
QCOMPARE
(
itemsInsertedSpy
.
count
(),
1
);
QCOMPARE
(
itemsRemovedSpy
.
count
(),
0
);
KItemRangeList
itemRangeList
=
itemsInsertedSpy
.
takeFirst
().
at
(
0
).
value
<
KItemRangeList
>
();
...
...
@@ -1162,14 +1172,14 @@ void KFileItemModelTest::testRemoveHiddenItems()
QCOMPARE
(
itemsInsertedSpy
.
count
(),
0
);
QCOMPARE
(
itemsRemovedSpy
.
count
(),
1
);
itemRangeList
=
itemsRemovedSpy
.
takeFirst
().
at
(
0
).
value
<
KItemRangeList
>
();
QCOMPARE
(
itemRangeList
,
KItemRangeList
()
<<
KItemRange
(
4
,
4
));
QCOMPARE
(
itemRangeList
,
KItemRangeList
()
<<
KItemRange
(
0
,
2
)
<<
KItemRange
(
4
,
2
));
m_model
->
setShowHiddenFiles
(
true
);
QCOMPARE
(
itemsInModel
(),
QStringList
()
<<
"
c
"
<<
"
d
"
<<
"
h
"
<<
"
i
"
<<
".
a
"
<<
".
b
"
<<
".f
"
<<
"
.g
"
);
QCOMPARE
(
itemsInModel
(),
QStringList
()
<<
"
.a
"
<<
"
.b
"
<<
"
c
"
<<
"
d
"
<<
".
f
"
<<
".
g
"
<<
"h
"
<<
"
i
"
);
QCOMPARE
(
itemsInsertedSpy
.
count
(),
1
);
QCOMPARE
(
itemsRemovedSpy
.
count
(),
0
);
itemRangeList
=
itemsInsertedSpy
.
takeFirst
().
at
(
0
).
value
<
KItemRangeList
>
();
QCOMPARE
(
itemRangeList
,
KItemRangeList
()
<<
KItemRange
(
4
,
4
));
QCOMPARE
(
itemRangeList
,
KItemRangeList
()
<<
KItemRange
(
0
,
2
)
<<
KItemRange
(
2
,
2
));
m_model
->
clear
();
QCOMPARE
(
itemsInModel
(),
QStringList
());
...
...
Heiko Becker
@heikobecker
mentioned in commit
272aa65b
·
Aug 05, 2021
mentioned in commit
272aa65b
mentioned in commit 272aa65bb55dd31f58e8a8e24ea7bc8bd2712daa
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment