FreshRSS
/
rssguard
mirror of https://github.com/martinrotter/rssguard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Activate multicolumn on CTRL.

This commit is contained in:
martinrotter 2017-05-09 11:24:24 +02:00
parent 4abdc1738c
commit 21fc8b087a
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/messagesmodel.cpp
View File

@ -83,7 +83,7 @@ QString MessagesModel::orderByClause() const {
else {
QStringList sorts;
for (int i = m_sortColumn.size() - 1; i >= 0; i--) {
for (int i = 0; i < m_sortColumn.size(); i++) {
QString field_name(m_fieldNames[m_sortColumn[i]]);
sorts.append(field_name + (m_sortOrder[i] == Qt::AscendingOrder ? QSL(" ASC") : QSL(" DESC")));
@ -109,6 +109,7 @@ void MessagesModel::fetchAllData() {
void MessagesModel::addSortState(int column, Qt::SortOrder order) {
int existing = m_sortColumn.indexOf(column);
bool is_ctrl_pressed = (QApplication::queryKeyboardModifiers() & Qt::ControlModifier) == Qt::ControlModifier;
if (existing >= 0) {
m_sortColumn.removeAt(existing);
@ -122,8 +123,15 @@ void MessagesModel::addSortState(int column, Qt::SortOrder order) {
m_sortOrder.removeAt(0);
}
m_sortColumn.append(column);
m_sortOrder.append(order);
if (is_ctrl_pressed) {
// User is activating the multicolumn sort mode.
m_sortColumn.append(column);
m_sortOrder.append(order);
}
else {
m_sortColumn.prepend(column);
m_sortOrder.prepend(order);
}
qDebug("Added sort state, select statement is now:\n'%s'", qPrintable(selectStatement()));
}

2
src/core/messagesmodel.h
View File

@ -108,7 +108,7 @@ class MessagesModel : public QSqlRelationalTableModel {
// NOTE: These two lists contain data for multicolumn sorting.
// They are always same length. Most important sort column/order
// are located in the end of these lists.
// are located at the start of lists;
QMap<int,QString> m_fieldNames;
QList<int> m_sortColumn;
QList<Qt::SortOrder> m_sortOrder;