Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-20 03:48:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make Gxs categories not sortable, item sort by value and possibility for

Browse source 
null to be always at end.
This commit is contained in:
Phenom 2021-02-15 16:27:18 +01:00
parent 861feb113c
commit d3a0ed7690
4 changed files with 156 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

143
retroshare-gui/src/gui/common/RSTreeWidgetItem.cpp
View file

@ -20,18 +20,26 @@
#include "RSTreeWidgetItem.h"
#include <QHeaderView>
RSTreeWidgetItemCompareRole::RSTreeWidgetItemCompareRole()
{
}
void RSTreeWidgetItemCompareRole::setRole(int column, int role)
RSTreeWidgetItemCompareRole::RSTreeWidgetItemCompareRole(QMap<int, QList<int>> map)
: QMap<int, QList<int>>(map)
{
}
void RSTreeWidgetItemCompareRole::setRole(const int column, const int role)
{
QList<int> roles;
roles.push_back(role);
insert(column, roles);
}
void RSTreeWidgetItemCompareRole::addRole(int column, int role)
void RSTreeWidgetItemCompareRole::addRole(const int column, const int role)
{
RSTreeWidgetItemCompareRole::iterator it = find(column);
if (it == end()) {
@ -54,49 +62,51 @@ void RSTreeWidgetItemCompareRole::findRoles(const int column, QList<int> &roles)
roles = it.value();
}
RSTreeWidgetItem::RSTreeWidgetItem(const RSTreeWidgetItemCompareRole *compareRole, int type) : QTreeWidgetItem(type)
RSTreeWidgetItem::RSTreeWidgetItem(const RSTreeWidgetItemCompareRole *compareRole, int type)
: QTreeWidgetItem(type), m_compareRole(compareRole), m_noOrder(false), m_useRoleWhenNoOrder(Qt::UserRole), m_noDataAsLast(false)
{
m_compareRole = compareRole;
}
RSTreeWidgetItem::RSTreeWidgetItem(const RSTreeWidgetItemCompareRole *compareRole, const QStringList &strings, int type) : QTreeWidgetItem(strings, type)
RSTreeWidgetItem::RSTreeWidgetItem(const RSTreeWidgetItemCompareRole *compareRole, const QStringList &strings, int type)
: QTreeWidgetItem(strings, type), m_compareRole(compareRole), m_noOrder(false), m_useRoleWhenNoOrder(Qt::UserRole), m_noDataAsLast(false)
{
m_compareRole = compareRole;
}
RSTreeWidgetItem::RSTreeWidgetItem(const RSTreeWidgetItemCompareRole *compareRole, QTreeWidget *view, int type) : QTreeWidgetItem(view, type)
RSTreeWidgetItem::RSTreeWidgetItem(const RSTreeWidgetItemCompareRole *compareRole, QTreeWidget *view, int type)
: QTreeWidgetItem(view, type), m_compareRole(compareRole), m_noOrder(false), m_useRoleWhenNoOrder(Qt::UserRole), m_noDataAsLast(false)
{
m_compareRole = compareRole;
}
RSTreeWidgetItem::RSTreeWidgetItem(const RSTreeWidgetItemCompareRole *compareRole, QTreeWidget *view, const QStringList &strings, int type) : QTreeWidgetItem(view, strings, type)
RSTreeWidgetItem::RSTreeWidgetItem(const RSTreeWidgetItemCompareRole *compareRole, QTreeWidget *view, const QStringList &strings, int type)
: QTreeWidgetItem(view, strings, type), m_compareRole(compareRole), m_noOrder(false), m_useRoleWhenNoOrder(Qt::UserRole), m_noDataAsLast(false)
{
m_compareRole = compareRole;
}
RSTreeWidgetItem::RSTreeWidgetItem(const RSTreeWidgetItemCompareRole *compareRole, QTreeWidget *view, QTreeWidgetItem *after, int type) : QTreeWidgetItem(view, after, type)
RSTreeWidgetItem::RSTreeWidgetItem(const RSTreeWidgetItemCompareRole *compareRole, QTreeWidget *view, QTreeWidgetItem *after, int type)
: QTreeWidgetItem(view, after, type), m_compareRole(compareRole), m_noOrder(false), m_useRoleWhenNoOrder(Qt::UserRole), m_noDataAsLast(false)
{
m_compareRole = compareRole;
}
RSTreeWidgetItem::RSTreeWidgetItem(const RSTreeWidgetItemCompareRole *compareRole, QTreeWidgetItem *parent, int type) : QTreeWidgetItem(parent, type)
RSTreeWidgetItem::RSTreeWidgetItem(const RSTreeWidgetItemCompareRole *compareRole, QTreeWidgetItem *parent, int type)
: QTreeWidgetItem(parent, type), m_compareRole(compareRole), m_noOrder(false), m_useRoleWhenNoOrder(Qt::UserRole), m_noDataAsLast(false)
{
m_compareRole = compareRole;
}
RSTreeWidgetItem::RSTreeWidgetItem(const RSTreeWidgetItemCompareRole *compareRole, QTreeWidgetItem *parent, const QStringList &strings, int type) : QTreeWidgetItem(parent, strings, type)
RSTreeWidgetItem::RSTreeWidgetItem(const RSTreeWidgetItemCompareRole *compareRole, QTreeWidgetItem *parent, const QStringList &strings, int type)
: QTreeWidgetItem(parent, strings, type), m_compareRole(compareRole), m_noOrder(false), m_useRoleWhenNoOrder(Qt::UserRole), m_noDataAsLast(false)
{
m_compareRole = compareRole;
}
RSTreeWidgetItem::RSTreeWidgetItem(const RSTreeWidgetItemCompareRole *compareRole, QTreeWidgetItem *parent, QTreeWidgetItem *after, int type) : QTreeWidgetItem(parent, after, type)
RSTreeWidgetItem::RSTreeWidgetItem(const RSTreeWidgetItemCompareRole *compareRole, QTreeWidgetItem *parent, QTreeWidgetItem *after, int type)
: QTreeWidgetItem(parent, after, type), m_compareRole(compareRole), m_noOrder(false), m_useRoleWhenNoOrder(Qt::UserRole), m_noDataAsLast(false)
{
m_compareRole = compareRole;
}
RSTreeWidgetItem::RSTreeWidgetItem(const RSTreeWidgetItemCompareRole *compareRole, const QTreeWidgetItem &other) : QTreeWidgetItem(other)
RSTreeWidgetItem::RSTreeWidgetItem(const RSTreeWidgetItemCompareRole *compareRole, const QTreeWidgetItem &other)
: QTreeWidgetItem(other), m_compareRole(compareRole), m_noOrder(false), m_useRoleWhenNoOrder(Qt::UserRole), m_noDataAsLast(false)
{
m_compareRole = compareRole;
}
static uint typeOfVariant(const QVariant &value)
@ -125,56 +135,57 @@ static uint typeOfVariant(const QVariant &value)
bool RSTreeWidgetItem::operator<(const QTreeWidgetItem &other) const
{
int column = treeWidget()->sortColumn();
QList<int> roles;
Qt::SortOrder sortOrder = treeWidget() ? treeWidget()->header()->sortIndicatorOrder() : Qt::AscendingOrder;
if (m_noOrder)
{
const QVariant v1 = data(0, m_useRoleWhenNoOrder);
const QVariant v2 = other.data(0, m_useRoleWhenNoOrder);
if (sortOrder == Qt::AscendingOrder)
return v1.toLongLong() < v2.toLongLong();
else
return v1.toLongLong() >= v2.toLongLong();
}
/* Own role for sort defined ? */
if (m_compareRole) {
m_compareRole->findRoles(column, roles);
}
int column = treeWidget() ? treeWidget()->header()->sortIndicatorSection() : 0;
QList<int>::iterator role;
for (role = roles.begin(); role != roles.end(); ++role) {
// taken from "bool QTreeWidgetItem::operator<(const QTreeWidgetItem &other) const"
const QVariant v1 = data(column, *role);
const QVariant v2 = other.data(column, *role);
QList<int> roles;
/* Own role for sort defined ? */
if (m_compareRole) {
m_compareRole->findRoles(column, roles);
}
// taken from "bool QAbstractItemModelPrivate::variantLessThan(const QVariant &v1, const QVariant &v2)"
switch(qMax(typeOfVariant(v1), typeOfVariant(v2)))
{
case 0: //integer type
{
qlonglong value1 = v1.toLongLong();
qlonglong value2 = v2.toLongLong();
for (auto& role : roles)
{
// taken from "bool QTreeWidgetItem::operator<(const QTreeWidgetItem &other) const"
const QVariant v1 = data(column, role);
const QVariant v2 = other.data(column, role);
if (m_noDataAsLast && !v1.isValid() && v2.isValid())
return sortOrder != Qt::AscendingOrder;
if (m_noDataAsLast && v1.isValid() && !v2.isValid())
return sortOrder == Qt::AscendingOrder;
if (value1 != value2) {
return value1 < value2;
}
}
break;
case 1: //floating point
{
double value1 = v1.toDouble();
double value2 = v2.toDouble();
// taken from "bool QAbstractItemModelPrivate::variantLessThan(const QVariant &v1, const QVariant &v2)"
// but using multi roles to sort
switch(qMax(typeOfVariant(v1), typeOfVariant(v2)))
{
case 0: //integer type
if (v1.toLongLong() != v2.toLongLong())
return v1.toLongLong() < v2.toLongLong();
//Fall through
case 1: //floating point
if (v1.toReal() != v2.toReal())
return v1.toReal() < v2.toReal();
//Fall through
default:
if (v1.toString().localeAwareCompare(v2.toString()) != 0)//Need Qt::CaseInsensitive ?
return v1.toString().localeAwareCompare(v2.toString()) < 0;
}
}
// If all roles are equals for this column, compare as string
if (value1 != value2) {
return value1 < value2;
}
}
break;
default:
{
int compare = v1.toString().compare (v2.toString(), Qt::CaseInsensitive);
if (compare) {
return (compare < 0);
}
}
}
}
/* Compare DisplayRole */
const QVariant v1 = data(column, Qt::DisplayRole);
const QVariant v2 = other.data(column, Qt::DisplayRole);
/* Compare DisplayRole */
const QVariant v1 = data(column, Qt::DisplayRole);
const QVariant v2 = other.data(column, Qt::DisplayRole);
return (v1.toString().compare (v2.toString(), Qt::CaseInsensitive) < 0);
return (v1.toString().compare (v2.toString(), Qt::CaseInsensitive) < 0);
}