mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-07-25 07:25:36 -04:00
Add RsTreeWidget Sort Contect Menu
Now Header sort when visible or In context menu is hidden.
This commit is contained in:
parent
36b64696a1
commit
861feb113c
7 changed files with 135 additions and 240 deletions
|
@ -31,23 +31,21 @@
|
||||||
#include "util/QtVersion.h"
|
#include "util/QtVersion.h"
|
||||||
#include "util/DateTime.h"
|
#include "util/DateTime.h"
|
||||||
|
|
||||||
|
#include <QDesktopWidget>
|
||||||
#include <QMenu>
|
#include <QMenu>
|
||||||
|
#include <QToolButton>
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
|
Q_GUI_EXPORT int qt_defaultDpi();
|
||||||
|
|
||||||
#define ROLE_ID Qt::UserRole
|
#define ROLE_ID Qt::UserRole
|
||||||
#define ROLE_NAME Qt::UserRole + 1
|
#define ROLE_NAME Qt::UserRole + 1
|
||||||
#define ROLE_DESCRIPTION Qt::UserRole + 2
|
#define ROLE_DESCRIPTION Qt::UserRole + 2
|
||||||
#define ROLE_POPULARITY Qt::UserRole + 3
|
#define ROLE_POPULARITY Qt::UserRole + 3
|
||||||
#define ROLE_LASTPOST Qt::UserRole + 4
|
#define ROLE_SUBSCRIBE_FLAGS Qt::UserRole + 4
|
||||||
#define ROLE_POSTS Qt::UserRole + 5
|
#define ROLE_COLOR Qt::UserRole + 5
|
||||||
#define ROLE_UNREAD Qt::UserRole + 6
|
#define ROLE_REQUEST_ID Qt::UserRole + 6
|
||||||
#define ROLE_SEARCH_SCORE Qt::UserRole + 7
|
|
||||||
#define ROLE_SUBSCRIBE_FLAGS Qt::UserRole + 8
|
|
||||||
#define ROLE_COLOR Qt::UserRole + 9
|
|
||||||
#define ROLE_SAVED_ICON Qt::UserRole + 10
|
|
||||||
#define ROLE_SEARCH_STRING Qt::UserRole + 11
|
|
||||||
#define ROLE_REQUEST_ID Qt::UserRole + 12
|
|
||||||
|
|
||||||
#define FILTER_NAME_INDEX 0
|
#define FILTER_NAME_INDEX 0
|
||||||
#define FILTER_DESC_INDEX 1
|
#define FILTER_DESC_INDEX 1
|
||||||
|
@ -57,18 +55,6 @@ GroupTreeWidget::GroupTreeWidget(QWidget *parent) :
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|
||||||
displayMenu = NULL;
|
|
||||||
actionSortAscending = NULL;
|
|
||||||
// actionSortDescending = NULL;
|
|
||||||
actionSortByName = NULL;
|
|
||||||
actionSortByPopularity = NULL;
|
|
||||||
actionSortByLastPost = NULL;
|
|
||||||
actionSortByPosts = NULL;
|
|
||||||
actionSortByUnread = NULL;
|
|
||||||
|
|
||||||
compareRole = new RSTreeWidgetItemCompareRole;
|
|
||||||
compareRole->setRole(GTW_COLUMN_DATA, ROLE_NAME);
|
|
||||||
|
|
||||||
/* Connect signals */
|
/* Connect signals */
|
||||||
connect(ui->filterLineEdit, SIGNAL(textChanged(QString)), this, SLOT(filterChanged()));
|
connect(ui->filterLineEdit, SIGNAL(textChanged(QString)), this, SLOT(filterChanged()));
|
||||||
connect(ui->filterLineEdit, SIGNAL(filterChanged(int)), this, SLOT(filterChanged()));
|
connect(ui->filterLineEdit, SIGNAL(filterChanged(int)), this, SLOT(filterChanged()));
|
||||||
|
@ -88,6 +74,8 @@ GroupTreeWidget::GroupTreeWidget(QWidget *parent) :
|
||||||
|
|
||||||
/* Initialize tree widget */
|
/* Initialize tree widget */
|
||||||
ui->treeWidget->setColumnCount(GTW_COLUMN_COUNT);
|
ui->treeWidget->setColumnCount(GTW_COLUMN_COUNT);
|
||||||
|
ui->treeWidget->setSortingEnabled(true);
|
||||||
|
ui->treeWidget->header()->setSortIndicator(GTW_COLUMN_NAME,Qt::AscendingOrder);
|
||||||
ui->treeWidget->enableColumnCustomize(true);
|
ui->treeWidget->enableColumnCustomize(true);
|
||||||
ui->treeWidget->setColumnCustomizable(GTW_COLUMN_NAME, false);
|
ui->treeWidget->setColumnCustomizable(GTW_COLUMN_NAME, false);
|
||||||
|
|
||||||
|
@ -101,11 +89,20 @@ GroupTreeWidget::GroupTreeWidget(QWidget *parent) :
|
||||||
headerItem->setText(GTW_COLUMN_POSTS, "");
|
headerItem->setText(GTW_COLUMN_POSTS, "");
|
||||||
headerItem->setText(GTW_COLUMN_POPULARITY, "");
|
headerItem->setText(GTW_COLUMN_POPULARITY, "");
|
||||||
headerItem->setText(GTW_COLUMN_LAST_POST, "");
|
headerItem->setText(GTW_COLUMN_LAST_POST, "");
|
||||||
headerItem->setToolTip(GTW_COLUMN_NAME, tr("Group Name"));
|
headerItem->setText(GTW_COLUMN_SEARCH_SCORE, "");
|
||||||
|
headerItem->setText(GTW_COLUMN_DESCRIPTION, tr("Description"));
|
||||||
|
headerItem->setToolTip(GTW_COLUMN_NAME, tr("Name"));
|
||||||
headerItem->setToolTip(GTW_COLUMN_UNREAD, tr("Number of Unread message"));
|
headerItem->setToolTip(GTW_COLUMN_UNREAD, tr("Number of Unread message"));
|
||||||
headerItem->setToolTip(GTW_COLUMN_POSTS, tr("Friend's Posts"));
|
headerItem->setToolTip(GTW_COLUMN_POSTS, tr("Friend's Posts"));
|
||||||
headerItem->setToolTip(GTW_COLUMN_POPULARITY, tr("Popularity"));
|
headerItem->setToolTip(GTW_COLUMN_POPULARITY, tr("Popularity"));
|
||||||
headerItem->setToolTip(GTW_COLUMN_LAST_POST, tr("Last Post"));
|
headerItem->setToolTip(GTW_COLUMN_LAST_POST, tr("Last Post"));
|
||||||
|
headerItem->setToolTip(GTW_COLUMN_SEARCH_SCORE, tr("Search Score"));
|
||||||
|
headerItem->setToolTip(GTW_COLUMN_DESCRIPTION, tr("Description"));
|
||||||
|
headerItem->setIcon(GTW_COLUMN_UNREAD, FilesDefs::getIconFromQtResourcePath(":/images/message-state-header.png"));
|
||||||
|
headerItem->setIcon(GTW_COLUMN_POSTS, FilesDefs::getIconFromQtResourcePath(":/images/filetype-association.png"));
|
||||||
|
headerItem->setIcon(GTW_COLUMN_POPULARITY, FilesDefs::getIconFromQtResourcePath(":/images/hot_5.png"));
|
||||||
|
headerItem->setIcon(GTW_COLUMN_LAST_POST, FilesDefs::getIconFromQtResourcePath(":/images/kalarm.png"));
|
||||||
|
headerItem->setIcon(GTW_COLUMN_SEARCH_SCORE, FilesDefs::getIconFromQtResourcePath(":/images/find.png"));
|
||||||
|
|
||||||
/* Set header resize modes and initial section sizes */
|
/* Set header resize modes and initial section sizes */
|
||||||
QHeaderView *header = ui->treeWidget->header ();
|
QHeaderView *header = ui->treeWidget->header ();
|
||||||
|
@ -122,6 +119,12 @@ GroupTreeWidget::GroupTreeWidget(QWidget *parent) :
|
||||||
QHeaderView_setSectionResizeModeColumn(header, GTW_COLUMN_LAST_POST, QHeaderView::Interactive);
|
QHeaderView_setSectionResizeModeColumn(header, GTW_COLUMN_LAST_POST, QHeaderView::Interactive);
|
||||||
header->resizeSection(GTW_COLUMN_LAST_POST, D+4) ;
|
header->resizeSection(GTW_COLUMN_LAST_POST, D+4) ;
|
||||||
header->setSectionHidden(GTW_COLUMN_LAST_POST, true);
|
header->setSectionHidden(GTW_COLUMN_LAST_POST, true);
|
||||||
|
QHeaderView_setSectionResizeModeColumn(header, GTW_COLUMN_SEARCH_SCORE, QHeaderView::Interactive);
|
||||||
|
header->resizeSection(GTW_COLUMN_SEARCH_SCORE, 3*W+4) ;
|
||||||
|
header->setSectionHidden(GTW_COLUMN_SEARCH_SCORE, true);
|
||||||
|
QHeaderView_setSectionResizeModeColumn(header, GTW_COLUMN_DESCRIPTION, QHeaderView::Interactive);
|
||||||
|
header->resizeSection(GTW_COLUMN_DESCRIPTION, 40*W+4) ;
|
||||||
|
header->setSectionHidden(GTW_COLUMN_DESCRIPTION, true);
|
||||||
|
|
||||||
/* add filter actions */
|
/* add filter actions */
|
||||||
ui->filterLineEdit->addFilter(QIcon(), tr("Title"), FILTER_NAME_INDEX , tr("Search Title"));
|
ui->filterLineEdit->addFilter(QIcon(), tr("Title"), FILTER_NAME_INDEX , tr("Search Title"));
|
||||||
|
@ -132,9 +135,6 @@ GroupTreeWidget::GroupTreeWidget(QWidget *parent) :
|
||||||
|
|
||||||
connect(ui->distantSearchLineEdit,SIGNAL(returnPressed()),this,SLOT(distantSearch())) ;
|
connect(ui->distantSearchLineEdit,SIGNAL(returnPressed()),this,SLOT(distantSearch())) ;
|
||||||
|
|
||||||
/* Initialize display button */
|
|
||||||
initDisplayMenu(ui->displayButton);
|
|
||||||
|
|
||||||
ui->treeWidget->setIconSize(QSize(S*1.8,S*1.8));
|
ui->treeWidget->setIconSize(QSize(S*1.8,S*1.8));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -166,9 +166,13 @@ void GroupTreeWidget::addToolButton(QToolButton *toolButton)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Initialize button */
|
/* Initialize button */
|
||||||
|
int i = qt_defaultDpi();
|
||||||
|
auto desktopWidget = QApplication::desktop();
|
||||||
|
auto y = desktopWidget->logicalDpiY();
|
||||||
|
|
||||||
toolButton->setAutoRaise(true);
|
toolButton->setAutoRaise(true);
|
||||||
toolButton->setIconSize(ui->displayButton->iconSize());
|
toolButton->setIconSize(QSize(24*y/i,24*y/i));
|
||||||
toolButton->setFocusPolicy(ui->displayButton->focusPolicy());
|
toolButton->setFocusPolicy(Qt::NoFocus);
|
||||||
|
|
||||||
ui->toolBarFrame->layout()->addWidget(toolButton);
|
ui->toolBarFrame->layout()->addWidget(toolButton);
|
||||||
}
|
}
|
||||||
|
@ -180,113 +184,8 @@ void GroupTreeWidget::processSettings(bool load)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const int SORTBY_NAME = 1;
|
ui->treeWidget->setSettingsVersion(2);//Change it when modifing column properties
|
||||||
const int SORTBY_POPULARITY = 2;
|
|
||||||
const int SORTBY_LASTPOST = 3;
|
|
||||||
const int SORTBY_POSTS = 4;
|
|
||||||
const int SORTBY_UNREAD = 5;
|
|
||||||
|
|
||||||
ui->treeWidget->setSettingsVersion(1);//Change it when modifing column properties
|
|
||||||
ui->treeWidget->processSettings(load);
|
ui->treeWidget->processSettings(load);
|
||||||
|
|
||||||
if (load) {
|
|
||||||
// load Settings
|
|
||||||
|
|
||||||
// state of order
|
|
||||||
bool ascSort = Settings->value("GroupAscSort", true).toBool();
|
|
||||||
actionSortAscending->setChecked(ascSort);
|
|
||||||
actionSortDescending->setChecked(!ascSort);
|
|
||||||
|
|
||||||
// state of sort
|
|
||||||
int sortby = Settings->value("GroupSortBy").toInt();
|
|
||||||
switch (sortby) {
|
|
||||||
case SORTBY_NAME:
|
|
||||||
if (actionSortByName) {
|
|
||||||
actionSortByName->setChecked(true);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case SORTBY_POPULARITY:
|
|
||||||
if (actionSortByPopularity) {
|
|
||||||
actionSortByPopularity->setChecked(true);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case SORTBY_LASTPOST:
|
|
||||||
if (actionSortByLastPost) {
|
|
||||||
actionSortByLastPost->setChecked(true);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case SORTBY_POSTS:
|
|
||||||
if (actionSortByPosts) {
|
|
||||||
actionSortByPosts->setChecked(true);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case SORTBY_UNREAD:
|
|
||||||
if (actionSortByUnread) {
|
|
||||||
actionSortByUnread->setChecked(true);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// save Settings
|
|
||||||
|
|
||||||
// state of order
|
|
||||||
Settings->setValue("GroupAscSort", !(actionSortDescending && actionSortDescending->isChecked())); //True by default
|
|
||||||
|
|
||||||
// state of sort
|
|
||||||
int sortby = SORTBY_NAME;
|
|
||||||
if (actionSortByName && actionSortByName->isChecked()) {
|
|
||||||
sortby = SORTBY_NAME;
|
|
||||||
} else if (actionSortByPopularity && actionSortByPopularity->isChecked()) {
|
|
||||||
sortby = SORTBY_POPULARITY;
|
|
||||||
} else if (actionSortByLastPost && actionSortByLastPost->isChecked()) {
|
|
||||||
sortby = SORTBY_LASTPOST;
|
|
||||||
} else if (actionSortByPosts && actionSortByPosts->isChecked()) {
|
|
||||||
sortby = SORTBY_POSTS;
|
|
||||||
} else if (actionSortByUnread && actionSortByUnread->isChecked()) {
|
|
||||||
sortby = SORTBY_UNREAD;
|
|
||||||
}
|
|
||||||
Settings->setValue("GroupSortBy", sortby);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void GroupTreeWidget::initDisplayMenu(QToolButton *toolButton)
|
|
||||||
{
|
|
||||||
displayMenu = new QMenu();
|
|
||||||
QActionGroup *actionGroupAsc = new QActionGroup(displayMenu);
|
|
||||||
|
|
||||||
actionSortDescending = displayMenu->addAction(FilesDefs::getIconFromQtResourcePath(":/images/sort_decrease.png"), tr("Sort Descending Order"), this, SLOT(sort()));
|
|
||||||
actionSortDescending->setCheckable(true);
|
|
||||||
actionSortDescending->setActionGroup(actionGroupAsc);
|
|
||||||
|
|
||||||
actionSortAscending = displayMenu->addAction(FilesDefs::getIconFromQtResourcePath(":/images/sort_incr.png"), tr("Sort Ascending Order"), this, SLOT(sort()));
|
|
||||||
actionSortAscending->setCheckable(true);
|
|
||||||
actionSortAscending->setActionGroup(actionGroupAsc);
|
|
||||||
|
|
||||||
displayMenu->addSeparator();
|
|
||||||
|
|
||||||
QActionGroup *actionGroup = new QActionGroup(displayMenu);
|
|
||||||
actionSortByName = displayMenu->addAction(QIcon(), tr("Sort by Name"), this, SLOT(sort()));
|
|
||||||
actionSortByName->setCheckable(true);
|
|
||||||
actionSortByName->setChecked(true); // set standard to sort by name
|
|
||||||
actionSortByName->setActionGroup(actionGroup);
|
|
||||||
|
|
||||||
actionSortByPopularity = displayMenu->addAction(QIcon(), tr("Sort by Popularity"), this, SLOT(sort()));
|
|
||||||
actionSortByPopularity->setCheckable(true);
|
|
||||||
actionSortByPopularity->setActionGroup(actionGroup);
|
|
||||||
|
|
||||||
actionSortByLastPost = displayMenu->addAction(QIcon(), tr("Sort by Last Post"), this, SLOT(sort()));
|
|
||||||
actionSortByLastPost->setCheckable(true);
|
|
||||||
actionSortByLastPost->setActionGroup(actionGroup);
|
|
||||||
|
|
||||||
actionSortByPosts = displayMenu->addAction(QIcon(), tr("Sort by Number of Friend's Posts"), this, SLOT(sort()));
|
|
||||||
actionSortByPosts->setCheckable(true);
|
|
||||||
actionSortByPosts->setActionGroup(actionGroup);
|
|
||||||
|
|
||||||
actionSortByUnread = displayMenu->addAction(QIcon(), tr("Sort by Unread"), this, SLOT(sort()));
|
|
||||||
actionSortByUnread->setCheckable(true);
|
|
||||||
actionSortByUnread->setActionGroup(actionGroup);
|
|
||||||
|
|
||||||
toolButton->setMenu(displayMenu);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void GroupTreeWidget::updateColors()
|
void GroupTreeWidget::updateColors()
|
||||||
|
@ -373,7 +272,6 @@ QTreeWidgetItem *GroupTreeWidget::addSearchItem(const QString& search_string, ui
|
||||||
{
|
{
|
||||||
QTreeWidgetItem *item = addCategoryItem(search_string,icon,true);
|
QTreeWidgetItem *item = addCategoryItem(search_string,icon,true);
|
||||||
|
|
||||||
item->setData(GTW_COLUMN_DATA,ROLE_SEARCH_STRING,search_string) ;
|
|
||||||
item->setData(GTW_COLUMN_DATA,ROLE_REQUEST_ID ,id) ;
|
item->setData(GTW_COLUMN_DATA,ROLE_REQUEST_ID ,id) ;
|
||||||
|
|
||||||
return item;
|
return item;
|
||||||
|
@ -471,13 +369,14 @@ void GroupTreeWidget::fillGroupItems(QTreeWidgetItem *categoryItem, const QList<
|
||||||
}
|
}
|
||||||
|
|
||||||
if (item == NULL) {
|
if (item == NULL) {
|
||||||
item = new RSTreeWidgetItem(compareRole);
|
item = new RSTreeWidgetItem();
|
||||||
item->setData(GTW_COLUMN_DATA, ROLE_ID, itemInfo.id);
|
item->setData(GTW_COLUMN_DATA, ROLE_ID, itemInfo.id);
|
||||||
categoryItem->addChild(item);
|
categoryItem->addChild(item);
|
||||||
}
|
}
|
||||||
|
|
||||||
item->setText(GTW_COLUMN_NAME, itemInfo.name);
|
item->setText(GTW_COLUMN_NAME, itemInfo.name);
|
||||||
item->setData(GTW_COLUMN_DATA, ROLE_NAME, itemInfo.name);
|
item->setData(GTW_COLUMN_DATA, ROLE_NAME, itemInfo.name);
|
||||||
|
item->setText(GTW_COLUMN_DESCRIPTION, itemInfo.description);
|
||||||
item->setData(GTW_COLUMN_DATA, ROLE_DESCRIPTION, itemInfo.description);
|
item->setData(GTW_COLUMN_DATA, ROLE_DESCRIPTION, itemInfo.description);
|
||||||
|
|
||||||
// Add children for context strings. This happens in the search.
|
// Add children for context strings. This happens in the search.
|
||||||
|
@ -492,8 +391,6 @@ void GroupTreeWidget::fillGroupItems(QTreeWidgetItem *categoryItem, const QList<
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Set last post */
|
/* Set last post */
|
||||||
qlonglong lastPost = itemInfo.lastpost.toTime_t();
|
|
||||||
item->setData(GTW_COLUMN_DATA, ROLE_LASTPOST, -lastPost); // negative for correct sorting
|
|
||||||
if(itemInfo.lastpost == QDateTime::fromTime_t(0))
|
if(itemInfo.lastpost == QDateTime::fromTime_t(0))
|
||||||
item->setText(GTW_COLUMN_LAST_POST, tr("Never"));
|
item->setText(GTW_COLUMN_LAST_POST, tr("Never"));
|
||||||
else
|
else
|
||||||
|
@ -502,7 +399,6 @@ void GroupTreeWidget::fillGroupItems(QTreeWidgetItem *categoryItem, const QList<
|
||||||
|
|
||||||
/* Set visible posts */
|
/* Set visible posts */
|
||||||
item->setText(GTW_COLUMN_POSTS, QString::number(itemInfo.max_visible_posts));
|
item->setText(GTW_COLUMN_POSTS, QString::number(itemInfo.max_visible_posts));
|
||||||
item->setData(GTW_COLUMN_DATA, ROLE_POSTS, -itemInfo.max_visible_posts);// negative for correct sorting
|
|
||||||
|
|
||||||
/* Set icon */
|
/* Set icon */
|
||||||
item->setIcon(GTW_COLUMN_NAME, itemInfo.icon);
|
item->setIcon(GTW_COLUMN_NAME, itemInfo.icon);
|
||||||
|
@ -580,8 +476,6 @@ void GroupTreeWidget::fillGroupItems(QTreeWidgetItem *categoryItem, const QList<
|
||||||
++child;
|
++child;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
resort(categoryItem);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void GroupTreeWidget::setUnreadCount(QTreeWidgetItem *item, int unreadCount)
|
void GroupTreeWidget::setUnreadCount(QTreeWidgetItem *item, int unreadCount)
|
||||||
|
@ -593,7 +487,6 @@ void GroupTreeWidget::setUnreadCount(QTreeWidgetItem *item, int unreadCount)
|
||||||
QFont font = item->font(GTW_COLUMN_NAME);
|
QFont font = item->font(GTW_COLUMN_NAME);
|
||||||
|
|
||||||
if (unreadCount) {
|
if (unreadCount) {
|
||||||
item->setData(GTW_COLUMN_DATA, ROLE_UNREAD, unreadCount);
|
|
||||||
item->setText(GTW_COLUMN_UNREAD, QString::number(unreadCount));
|
item->setText(GTW_COLUMN_UNREAD, QString::number(unreadCount));
|
||||||
font.setBold(true);
|
font.setBold(true);
|
||||||
} else {
|
} else {
|
||||||
|
@ -707,7 +600,7 @@ void GroupTreeWidget::calculateScore(QTreeWidgetItem *item, const QString &filte
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
item->setData(GTW_COLUMN_DATA, ROLE_SEARCH_SCORE, -score); // negative for correct sorting
|
item->setText(GTW_COLUMN_SEARCH_SCORE, QString::number(score));
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -730,38 +623,8 @@ void GroupTreeWidget::filterChanged()
|
||||||
{
|
{
|
||||||
/* Recalculate score */
|
/* Recalculate score */
|
||||||
calculateScore(NULL, ui->filterLineEdit->text());
|
calculateScore(NULL, ui->filterLineEdit->text());
|
||||||
|
|
||||||
resort(NULL);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void GroupTreeWidget::resort(QTreeWidgetItem *categoryItem)
|
|
||||||
{
|
|
||||||
Qt::SortOrder order = (actionSortAscending == NULL || actionSortAscending->isChecked()) ? Qt::AscendingOrder : Qt::DescendingOrder;
|
|
||||||
|
|
||||||
if (ui->filterLineEdit->text().isEmpty() == false) {
|
|
||||||
compareRole->setRole(GTW_COLUMN_DATA, ROLE_SEARCH_SCORE);
|
|
||||||
compareRole->addRole(GTW_COLUMN_DATA, ROLE_LASTPOST);
|
|
||||||
} else if (actionSortByName && actionSortByName->isChecked()) {
|
|
||||||
compareRole->setRole(GTW_COLUMN_DATA, ROLE_NAME);
|
|
||||||
} else if (actionSortByPopularity && actionSortByPopularity->isChecked()) {
|
|
||||||
compareRole->setRole(GTW_COLUMN_DATA, ROLE_POPULARITY);
|
|
||||||
} else if (actionSortByLastPost && actionSortByLastPost->isChecked()) {
|
|
||||||
compareRole->setRole(GTW_COLUMN_DATA, ROLE_LASTPOST);
|
|
||||||
} else if (actionSortByPosts && actionSortByPosts->isChecked()) {
|
|
||||||
compareRole->setRole(GTW_COLUMN_DATA, ROLE_POSTS);
|
|
||||||
} else if (actionSortByUnread && actionSortByUnread->isChecked()) {
|
|
||||||
compareRole->setRole(GTW_COLUMN_DATA, ROLE_UNREAD);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (categoryItem) {
|
|
||||||
categoryItem->sortChildren(GTW_COLUMN_DATA, order);
|
|
||||||
} else {
|
|
||||||
int count = ui->treeWidget->topLevelItemCount();
|
|
||||||
for (int child = 0; child < count; ++child) {
|
|
||||||
ui->treeWidget->topLevelItem(child)->sortChildren(GTW_COLUMN_DATA, order);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void GroupTreeWidget::distantSearch()
|
void GroupTreeWidget::distantSearch()
|
||||||
{
|
{
|
||||||
|
@ -772,5 +635,5 @@ void GroupTreeWidget::distantSearch()
|
||||||
|
|
||||||
void GroupTreeWidget::sort()
|
void GroupTreeWidget::sort()
|
||||||
{
|
{
|
||||||
resort(NULL);
|
ui->treeWidget->resort();
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,7 +41,9 @@ class RSTreeWidget;
|
||||||
#define GTW_COLUMN_POSTS 2
|
#define GTW_COLUMN_POSTS 2
|
||||||
#define GTW_COLUMN_POPULARITY 3
|
#define GTW_COLUMN_POPULARITY 3
|
||||||
#define GTW_COLUMN_LAST_POST 4
|
#define GTW_COLUMN_LAST_POST 4
|
||||||
#define GTW_COLUMN_COUNT 5
|
#define GTW_COLUMN_SEARCH_SCORE 5
|
||||||
|
#define GTW_COLUMN_DESCRIPTION 6
|
||||||
|
#define GTW_COLUMN_COUNT 7
|
||||||
#define GTW_COLUMN_DATA GTW_COLUMN_NAME
|
#define GTW_COLUMN_DATA GTW_COLUMN_NAME
|
||||||
|
|
||||||
namespace Ui {
|
namespace Ui {
|
||||||
|
@ -143,23 +145,10 @@ private slots:
|
||||||
void sort();
|
void sort();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
// Initialize the display menu for sorting
|
|
||||||
void initDisplayMenu(QToolButton *toolButton);
|
|
||||||
void calculateScore(QTreeWidgetItem *item, const QString &filterText);
|
void calculateScore(QTreeWidgetItem *item, const QString &filterText);
|
||||||
void resort(QTreeWidgetItem *categoryItem);
|
|
||||||
void updateColors();
|
void updateColors();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QMenu *displayMenu;
|
|
||||||
QAction *actionSortAscending;
|
|
||||||
QAction *actionSortDescending;
|
|
||||||
QAction *actionSortByName;
|
|
||||||
QAction *actionSortByPopularity;
|
|
||||||
QAction *actionSortByLastPost;
|
|
||||||
QAction *actionSortByPosts;
|
|
||||||
QAction *actionSortByUnread;
|
|
||||||
|
|
||||||
RSTreeWidgetItemCompareRole *compareRole;
|
|
||||||
|
|
||||||
/* Color definitions (for standard see qss.default) */
|
/* Color definitions (for standard see qss.default) */
|
||||||
QColor mTextColor[GROUPTREEWIDGET_COLOR_COUNT];
|
QColor mTextColor[GROUPTREEWIDGET_COLOR_COUNT];
|
||||||
|
|
|
@ -56,32 +56,6 @@
|
||||||
<item>
|
<item>
|
||||||
<widget class="LineEditClear" name="filterLineEdit"/>
|
<widget class="LineEditClear" name="filterLineEdit"/>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
|
||||||
<widget class="QToolButton" name="displayButton">
|
|
||||||
<property name="focusPolicy">
|
|
||||||
<enum>Qt::NoFocus</enum>
|
|
||||||
</property>
|
|
||||||
<property name="toolTip">
|
|
||||||
<string>Display</string>
|
|
||||||
</property>
|
|
||||||
<property name="icon">
|
|
||||||
<iconset resource="../icons.qrc">
|
|
||||||
<normaloff>:/icons/svg/display_options.svg</normaloff>:/icons/svg/display_options.svg</iconset>
|
|
||||||
</property>
|
|
||||||
<property name="iconSize">
|
|
||||||
<size>
|
|
||||||
<width>24</width>
|
|
||||||
<height>24</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
<property name="popupMode">
|
|
||||||
<enum>QToolButton::InstantPopup</enum>
|
|
||||||
</property>
|
|
||||||
<property name="autoRaise">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
@ -111,12 +85,6 @@
|
||||||
<property name="allColumnsShowFocus">
|
<property name="allColumnsShowFocus">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
</property>
|
</property>
|
||||||
<attribute name="headerVisible">
|
|
||||||
<bool>false</bool>
|
|
||||||
</attribute>
|
|
||||||
<attribute name="headerStretchLastSection">
|
|
||||||
<bool>false</bool>
|
|
||||||
</attribute>
|
|
||||||
<column>
|
<column>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string notr="true">1</string>
|
<string notr="true">1</string>
|
||||||
|
@ -145,8 +113,6 @@
|
||||||
<header>gui/common/RSTreeWidget.h</header>
|
<header>gui/common/RSTreeWidget.h</header>
|
||||||
</customwidget>
|
</customwidget>
|
||||||
</customwidgets>
|
</customwidgets>
|
||||||
<resources>
|
<resources/>
|
||||||
<include location="../icons.qrc"/>
|
|
||||||
</resources>
|
|
||||||
<connections/>
|
<connections/>
|
||||||
</ui>
|
</ui>
|
||||||
|
|
|
@ -206,11 +206,13 @@ void RSTreeWidget::processSettings(bool load)
|
||||||
// Compare version, because Qt can crash in restoreState after column changes
|
// Compare version, because Qt can crash in restoreState after column changes
|
||||||
header()->restoreState(Settings->value(objectName()).toByteArray());
|
header()->restoreState(Settings->value(objectName()).toByteArray());
|
||||||
}
|
}
|
||||||
|
header()->setHidden(Settings->value(objectName()+"HiddenHeader", false).toBool());
|
||||||
} else {
|
} else {
|
||||||
// Save settings
|
// Save settings
|
||||||
|
|
||||||
// state of tree widget
|
// state of tree widget
|
||||||
Settings->setValue(objectName(), header()->saveState());
|
Settings->setValue(objectName(), header()->saveState());
|
||||||
|
Settings->setValue(objectName()+"HiddenHeader", header()->isHidden());
|
||||||
|
|
||||||
// Save version
|
// Save version
|
||||||
if (mSettingsVersion) {
|
if (mSettingsVersion) {
|
||||||
|
@ -283,13 +285,57 @@ QMenu *RSTreeWidget::createStandardContextMenu(QMenu *contextMenu)
|
||||||
actShowHeader->setCheckable(true);
|
actShowHeader->setCheckable(true);
|
||||||
actShowHeader->setChecked(!isHeaderHidden());
|
actShowHeader->setChecked(!isHeaderHidden());
|
||||||
|
|
||||||
QMenu *headerMenu = contextMenu->addMenu(QIcon(),tr("Show column..."));
|
|
||||||
|
|
||||||
QTreeWidgetItem *item = headerItem();
|
QTreeWidgetItem *item = headerItem();
|
||||||
int columnCount = item->columnCount();
|
int columnCount = item->columnCount();
|
||||||
|
|
||||||
|
if (isSortingEnabled() && isHeaderHidden())
|
||||||
|
{
|
||||||
|
QMenu *headerMenuSort = contextMenu->addMenu(QIcon(),tr("Sort by column …"));
|
||||||
|
|
||||||
|
QActionGroup *actionGroupAsc = new QActionGroup(headerMenuSort);
|
||||||
|
|
||||||
|
QAction *actionSortDescending = headerMenuSort->addAction(FilesDefs::getIconFromQtResourcePath(":/images/sort_decrease.png")
|
||||||
|
, tr("Sort Descending Order"), this, SLOT(changeSortOrder()));
|
||||||
|
actionSortDescending->setData("SortDesc");
|
||||||
|
actionSortDescending->setCheckable(true);
|
||||||
|
actionSortDescending->setChecked(header()->sortIndicatorOrder()==Qt::DescendingOrder);
|
||||||
|
actionSortDescending->setActionGroup(actionGroupAsc);
|
||||||
|
|
||||||
|
QAction *actionSortAscending = headerMenuSort->addAction(FilesDefs::getIconFromQtResourcePath(":/images/sort_incr.png")
|
||||||
|
, tr("Sort Ascending Order"), this, SLOT(changeSortOrder()));
|
||||||
|
actionSortAscending->setData("SortAsc");
|
||||||
|
actionSortAscending->setCheckable(true);
|
||||||
|
actionSortAscending->setChecked(header()->sortIndicatorOrder()==Qt::AscendingOrder);
|
||||||
|
actionSortAscending->setActionGroup(actionGroupAsc);
|
||||||
|
|
||||||
|
headerMenuSort->addSeparator();
|
||||||
|
|
||||||
|
QActionGroup *actionGroupSort = new QActionGroup(headerMenuSort);
|
||||||
|
|
||||||
for (int column = 0; column < columnCount; ++column)
|
for (int column = 0; column < columnCount; ++column)
|
||||||
{
|
{
|
||||||
QMap<int, bool>::const_iterator it = mColumnCustomizable.find(column);
|
QString txt = item->text(column) ;
|
||||||
|
if(txt == "")
|
||||||
|
txt = item->data(column,Qt::UserRole).toString() ;
|
||||||
|
if(txt == "")
|
||||||
|
txt = item->data(column,Qt::ToolTipRole).toString() ;
|
||||||
|
|
||||||
|
if(txt=="")
|
||||||
|
txt = QString::number(column) + tr(" [no title]") ;
|
||||||
|
|
||||||
|
QAction *action = headerMenuSort->addAction(QIcon(), txt, this, SLOT(changeSortColumn()));
|
||||||
|
action->setData(column);
|
||||||
|
action->setCheckable(true);
|
||||||
|
action->setChecked(header()->sortIndicatorSection() == column);
|
||||||
|
action->setActionGroup(actionGroupSort);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
QMenu *headerMenuShowCol = contextMenu->addMenu(QIcon(),tr("Show column …"));
|
||||||
|
|
||||||
|
for (int column = 0; column < columnCount; ++column)
|
||||||
|
{
|
||||||
|
QMap<int, bool>::iterator it = mColumnCustomizable.find(column);
|
||||||
if (it != mColumnCustomizable.end() && *it == false) {
|
if (it != mColumnCustomizable.end() && *it == false) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -300,9 +346,9 @@ QMenu *RSTreeWidget::createStandardContextMenu(QMenu *contextMenu)
|
||||||
txt = item->data(column,Qt::ToolTipRole).toString() ;
|
txt = item->data(column,Qt::ToolTipRole).toString() ;
|
||||||
|
|
||||||
if(txt=="")
|
if(txt=="")
|
||||||
txt = tr("[no title]") ;
|
txt = QString::number(column) + tr(" [no title]") ;
|
||||||
|
|
||||||
QAction *action = headerMenu->addAction(QIcon(), txt, this, SLOT(columnVisible()));
|
QAction *action = headerMenuShowCol->addAction(QIcon(), txt, this, SLOT(columnVisible()));
|
||||||
action->setCheckable(true);
|
action->setCheckable(true);
|
||||||
action->setData(column);
|
action->setData(column);
|
||||||
action->setChecked(!isColumnHidden(column));
|
action->setChecked(!isColumnHidden(column));
|
||||||
|
@ -382,3 +428,32 @@ void RSTreeWidget::resort()
|
||||||
sortItems(header()->sortIndicatorSection(), header()->sortIndicatorOrder());
|
sortItems(header()->sortIndicatorSection(), header()->sortIndicatorOrder());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void RSTreeWidget::changeSortColumn()
|
||||||
|
{
|
||||||
|
QAction *action = dynamic_cast<QAction*>(sender());
|
||||||
|
if (!action) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (action->data().canConvert<int>())
|
||||||
|
{
|
||||||
|
header()->setSortIndicator(action->data().toInt(),header()->sortIndicatorOrder());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void RSTreeWidget::changeSortOrder()
|
||||||
|
{
|
||||||
|
QAction *action = dynamic_cast<QAction*>(sender());
|
||||||
|
if (!action) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (action->data().canConvert<QString>())
|
||||||
|
{
|
||||||
|
if (action->data().toString() == "SortDesc")
|
||||||
|
header()->setSortIndicator(header()->sortIndicatorSection(),Qt::DescendingOrder);
|
||||||
|
else
|
||||||
|
header()->setSortIndicator(header()->sortIndicatorSection(),Qt::AscendingOrder);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -69,6 +69,8 @@ private slots:
|
||||||
void headerContextMenuRequested(const QPoint &pos);
|
void headerContextMenuRequested(const QPoint &pos);
|
||||||
void headerVisible();
|
void headerVisible();
|
||||||
void columnVisible();
|
void columnVisible();
|
||||||
|
void changeSortColumn();
|
||||||
|
void changeSortOrder();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void paintEvent(QPaintEvent *event);
|
void paintEvent(QPaintEvent *event);
|
||||||
|
|
|
@ -1019,7 +1019,7 @@ void GxsGroupFrameDialog::insertGroupsData(const std::list<RsGxsGenericGroupData
|
||||||
ui->groupTreeWidget->fillGroupItems(mYourGroups, adminList);
|
ui->groupTreeWidget->fillGroupItems(mYourGroups, adminList);
|
||||||
mYourGroups->setText(GTW_COLUMN_POPULARITY, QString::number(mYourGroups->childCount()));
|
mYourGroups->setText(GTW_COLUMN_POPULARITY, QString::number(mYourGroups->childCount()));
|
||||||
ui->groupTreeWidget->fillGroupItems(mSubscribedGroups, subList);
|
ui->groupTreeWidget->fillGroupItems(mSubscribedGroups, subList);
|
||||||
mSubscribedGroups->setText(GTW_COLUMN_POPULARITY, QString::number(mSubscribedGroups->childCount())); // 1 COLUMN_UNREAD 2 COLUMN_POPULARITY
|
mSubscribedGroups->setText(GTW_COLUMN_POPULARITY, QString::number(mSubscribedGroups->childCount()));
|
||||||
ui->groupTreeWidget->fillGroupItems(mPopularGroups, popList);
|
ui->groupTreeWidget->fillGroupItems(mPopularGroups, popList);
|
||||||
mPopularGroups->setText(GTW_COLUMN_POPULARITY, QString::number(mPopularGroups->childCount()));
|
mPopularGroups->setText(GTW_COLUMN_POPULARITY, QString::number(mPopularGroups->childCount()));
|
||||||
ui->groupTreeWidget->fillGroupItems(mOtherGroups, otherList);
|
ui->groupTreeWidget->fillGroupItems(mOtherGroups, otherList);
|
||||||
|
|
|
@ -329,7 +329,7 @@ GxsForumThreadWidget::GxsForumThreadWidget(const RsGxsGroupId &forumId, QWidget
|
||||||
ttheader->resizeSection (RsGxsForumModel::COLUMN_THREAD_AUTHOR, 150*f);
|
ttheader->resizeSection (RsGxsForumModel::COLUMN_THREAD_AUTHOR, 150*f);
|
||||||
|
|
||||||
ui->threadTreeWidget->resizeColumnToContents(RsGxsForumModel::COLUMN_THREAD_DISTRIBUTION);
|
ui->threadTreeWidget->resizeColumnToContents(RsGxsForumModel::COLUMN_THREAD_DISTRIBUTION);
|
||||||
ui->threadTreeWidget->resizeColumnToContents(RsGxsForumModel::COLUMN_THREAD_READ);
|
//ui->threadTreeWidget->resizeColumnToContents(RsGxsForumModel::COLUMN_THREAD_READ);
|
||||||
|
|
||||||
QHeaderView_setSectionResizeModeColumn(ttheader, RsGxsForumModel::COLUMN_THREAD_TITLE, QHeaderView::Interactive);
|
QHeaderView_setSectionResizeModeColumn(ttheader, RsGxsForumModel::COLUMN_THREAD_TITLE, QHeaderView::Interactive);
|
||||||
QHeaderView_setSectionResizeModeColumn(ttheader, RsGxsForumModel::COLUMN_THREAD_DATE, QHeaderView::Interactive);
|
QHeaderView_setSectionResizeModeColumn(ttheader, RsGxsForumModel::COLUMN_THREAD_DATE, QHeaderView::Interactive);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue