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
PIM
PIM Messagelib
Commits
94d48165
Commit
94d48165
authored
Oct 04, 2021
by
Laurent Montel
😁
Browse files
Fix sorting date
parent
c76eb9d4
Pipeline
#84870
passed with stage
in 44 minutes and 57 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
messageviewer/src/dkim-verify/dkimmanagerkeywidget.cpp
View file @
94d48165
...
...
@@ -101,18 +101,18 @@ void DKIMManagerKeyWidget::loadKeys()
{
const
QVector
<
MessageViewer
::
KeyInfo
>
lst
=
DKIMManagerKey
::
self
()
->
keys
();
for
(
const
MessageViewer
::
KeyInfo
&
key
:
lst
)
{
auto
item
=
new
Q
TreeWidgetItem
(
mTreeWidget
);
item
->
setText
(
0
,
key
.
domain
);
item
->
setText
(
1
,
key
.
selector
);
item
->
setText
(
2
,
key
.
keyValue
);
item
->
setText
(
3
,
key
.
storedAtDateTime
.
toString
());
item
->
setText
(
4
,
key
.
lastUsedDateTime
.
toString
());
item
->
setToolTip
(
2
,
key
.
keyValue
);
auto
item
=
new
DKIMManagerKey
TreeWidgetItem
(
mTreeWidget
);
item
->
setText
(
ManagerKeyTreeWidget
::
Domain
,
key
.
domain
);
item
->
setText
(
ManagerKeyTreeWidget
::
Selector
,
key
.
selector
);
item
->
setText
(
ManagerKeyTreeWidget
::
KeyValue
,
key
.
keyValue
);
item
->
setText
(
ManagerKeyTreeWidget
::
InsertDate
,
key
.
storedAtDateTime
.
toString
());
item
->
setText
(
ManagerKeyTreeWidget
::
LastUsedDate
,
key
.
lastUsedDateTime
.
toString
());
item
->
setToolTip
(
ManagerKeyTreeWidget
::
KeyValue
,
key
.
keyValue
);
}
mTreeWidget
->
setSortingEnabled
(
true
);
mTreeWidget
->
header
()
->
setSortIndicatorShown
(
true
);
mTreeWidget
->
header
()
->
setSectionsClickable
(
true
);
mTreeWidget
->
sortByColumn
(
0
,
Qt
::
AscendingOrder
);
mTreeWidget
->
sortByColumn
(
ManagerKeyTreeWidget
::
Domain
,
Qt
::
AscendingOrder
);
}
void
DKIMManagerKeyWidget
::
saveKeys
()
...
...
@@ -121,11 +121,11 @@ void DKIMManagerKeyWidget::saveKeys()
lst
.
reserve
(
mTreeWidget
->
topLevelItemCount
());
for
(
int
i
=
0
,
total
=
mTreeWidget
->
topLevelItemCount
();
i
<
total
;
++
i
)
{
QTreeWidgetItem
*
item
=
mTreeWidget
->
topLevelItem
(
i
);
const
MessageViewer
::
KeyInfo
info
{
item
->
text
(
2
),
item
->
text
(
1
),
item
->
text
(
0
),
QDateTime
::
fromString
(
item
->
text
(
3
)),
QDateTime
::
fromString
(
item
->
text
(
4
))};
const
MessageViewer
::
KeyInfo
info
{
item
->
text
(
ManagerKeyTreeWidget
::
KeyValue
),
item
->
text
(
ManagerKeyTreeWidget
::
Selector
),
item
->
text
(
ManagerKeyTreeWidget
::
Domain
),
QDateTime
::
fromString
(
item
->
text
(
ManagerKeyTreeWidget
::
InsertDate
)),
QDateTime
::
fromString
(
item
->
text
(
ManagerKeyTreeWidget
::
LastUsedDate
))};
lst
.
append
(
info
);
}
DKIMManagerKey
::
self
()
->
saveKeys
(
lst
);
...
...
@@ -136,3 +136,26 @@ void DKIMManagerKeyWidget::resetKeys()
mTreeWidget
->
clear
();
loadKeys
();
}
DKIMManagerKeyTreeWidgetItem
::
DKIMManagerKeyTreeWidgetItem
(
QTreeWidget
*
parent
)
:
QTreeWidgetItem
(
parent
)
{
}
DKIMManagerKeyTreeWidgetItem
::~
DKIMManagerKeyTreeWidgetItem
()
{
}
bool
DKIMManagerKeyTreeWidgetItem
::
operator
<
(
const
QTreeWidgetItem
&
other
)
const
{
const
int
column
=
treeWidget
()
->
sortColumn
();
if
(
column
==
DKIMManagerKeyWidget
::
ManagerKeyTreeWidget
::
InsertDate
)
{
return
QDateTime
::
fromString
(
text
(
DKIMManagerKeyWidget
::
ManagerKeyTreeWidget
::
InsertDate
))
<
QDateTime
::
fromString
(
other
.
text
(
DKIMManagerKeyWidget
::
ManagerKeyTreeWidget
::
InsertDate
));
}
if
(
column
==
DKIMManagerKeyWidget
::
ManagerKeyTreeWidget
::
LastUsedDate
)
{
return
QDateTime
::
fromString
(
text
(
DKIMManagerKeyWidget
::
ManagerKeyTreeWidget
::
LastUsedDate
))
<
QDateTime
::
fromString
(
other
.
text
(
DKIMManagerKeyWidget
::
ManagerKeyTreeWidget
::
LastUsedDate
));
}
return
QTreeWidgetItem
::
operator
<
(
other
);
}
messageviewer/src/dkim-verify/dkimmanagerkeywidget.h
View file @
94d48165
...
...
@@ -6,10 +6,19 @@
#pragma once
#include
"messageviewer_export.h"
#include
<QTreeWidgetItem>
#include
<QWidget>
class
QTreeWidget
;
namespace
MessageViewer
{
class
DKIMManagerKeyTreeWidgetItem
:
public
QTreeWidgetItem
{
public:
explicit
DKIMManagerKeyTreeWidgetItem
(
QTreeWidget
*
parent
=
nullptr
);
~
DKIMManagerKeyTreeWidgetItem
()
override
;
Q_REQUIRED_RESULT
bool
operator
<
(
const
QTreeWidgetItem
&
other
)
const
override
;
};
/**
* @brief The DKIMManagerKeyWidget class
* @author Laurent Montel <montel@kde.org>
...
...
@@ -18,6 +27,13 @@ class MESSAGEVIEWER_EXPORT DKIMManagerKeyWidget : public QWidget
{
Q_OBJECT
public:
enum
ManagerKeyTreeWidget
{
Domain
=
0
,
Selector
=
1
,
KeyValue
=
2
,
InsertDate
=
3
,
LastUsedDate
=
3
,
};
explicit
DKIMManagerKeyWidget
(
QWidget
*
parent
=
nullptr
);
~
DKIMManagerKeyWidget
()
override
;
...
...
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