dawy_go/vnote
1
0
Fork 0
mirror of https://gitee.com/vnotex/vnote.git synced 2025-07-05 22:09:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

support sorting items by clicking the column header

Browse Source
This commit is contained in:
Le Tan 2018-03-16 21:37:56 +08:00
parent 407658bead
commit 47b4cc88aa
5 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/dialog/vsortdialog.cpp
View File

@ -117,6 +117,9 @@ void VSortDialog::treeUpdated()
QTreeWidgetItem *item = m_treeWidget->topLevelItem(i); QTreeWidgetItem *item = m_treeWidget->topLevelItem(i);
item->setFlags(item->flags() & ~Qt::ItemIsDropEnabled); item->setFlags(item->flags() & ~Qt::ItemIsDropEnabled);
} }
m_treeWidget->sortByColumn(-1);
m_treeWidget->setSortingEnabled(true);
} }
void VSortDialog::handleMoveOperation(MoveOperation p_op) void VSortDialog::handleMoveOperation(MoveOperation p_op)

9
src/utils/vutils.cpp
View File

@ -1119,10 +1119,13 @@ QVector<VElementRegion> VUtils::fetchImageRegionsUsingParser(const QString &p_co
return regs; return regs;
} }
QString VUtils::displayDateTime(const QDateTime &p_dateTime) QString VUtils::displayDateTime(const QDateTime &p_dateTime,
bool p_uniformNum)
{ {
QString res = p_dateTime.date().toString(Qt::DefaultLocaleLongDate); QString res = p_dateTime.date().toString(p_uniformNum ? Qt::ISODate
res += " " + p_dateTime.time().toString(); : Qt::DefaultLocaleLongDate);
res += " " + p_dateTime.time().toString(p_uniformNum ? Qt::ISODate
: Qt::TextDate);
return res; return res;
} }

4
src/utils/vutils.h
View File

@ -261,7 +261,9 @@ public:
// Delete file specified by @p_path. // Delete file specified by @p_path.
static bool deleteFile(const QString &p_path); static bool deleteFile(const QString &p_path);
static QString displayDateTime(const QDateTime &p_dateTime); // @p_uniformNum: if true, we use YYYY/MM/DD HH:mm:ss form, which is good for
// sorting.
static QString displayDateTime(const QDateTime &p_dateTime, bool p_uniformNum = false);
// Check if file @p_name exists in @p_dir. // Check if file @p_name exists in @p_dir.
// @p_forceCaseInsensitive: if true, will check the name ignoring the case. // @p_forceCaseInsensitive: if true, will check the name ignoring the case.

2
src/vdirectorytree.cpp
View File

@ -1166,7 +1166,7 @@ void VDirectoryTree::sortItems(VDirectory *p_dir)
for (int i = 0; i < dirs.size(); ++i) { for (int i = 0; i < dirs.size(); ++i) {
const VDirectory *dir = dirs[i]; const VDirectory *dir = dirs[i];
Q_ASSERT(dir->isOpened()); Q_ASSERT(dir->isOpened());
QString createdTime = VUtils::displayDateTime(dir->getCreatedTimeUtc().toLocalTime()); QString createdTime = VUtils::displayDateTime(dir->getCreatedTimeUtc().toLocalTime(), true);
QStringList cols; QStringList cols;
cols << dir->getName() << createdTime; cols << dir->getName() << createdTime;
QTreeWidgetItem *item = new QTreeWidgetItem(tree, cols); QTreeWidgetItem *item = new QTreeWidgetItem(tree, cols);

4
src/vfilelist.cpp
View File

@ -1041,8 +1041,8 @@ void VFileList::sortItems()
for (int i = 0; i < files.size(); ++i) { for (int i = 0; i < files.size(); ++i) {
const VNoteFile *file = files[i]; const VNoteFile *file = files[i];
QString createdTime = VUtils::displayDateTime(file->getCreatedTimeUtc().toLocalTime()); QString createdTime = VUtils::displayDateTime(file->getCreatedTimeUtc().toLocalTime(), true);
QString modifiedTime = VUtils::displayDateTime(file->getModifiedTimeUtc().toLocalTime()); QString modifiedTime = VUtils::displayDateTime(file->getModifiedTimeUtc().toLocalTime(), true);
QStringList cols; QStringList cols;
cols << file->getName() << createdTime << modifiedTime; cols << file->getName() << createdTime << modifiedTime;
QTreeWidgetItem *item = new QTreeWidgetItem(tree, cols); QTreeWidgetItem *item = new QTreeWidgetItem(tree, cols);