Always set sort direction to ascending when sorting a new column

When changing the sort column in the Browse Data tab we always toggled
the sort direction too. So when Field1 was sorted in ascending order,
clicking on Field2 would sort it in descending order. If Field1 was
sorted in descending order, clicking on Field2 would sort it in
ascending order. Now in both cases Field2 is sorted in ascending order
first.
This commit is contained in:
Martin Kleusberg
2019-03-01 10:34:55 +01:00
parent e52f2054f2
commit 00bc7db5c0

View File

@@ -2014,10 +2014,13 @@ void MainWindow::browseTableHeaderClicked(int logicalindex)
applyBrowseTableSettings(settings);
return;
}
int dummy;
int column;
Qt::SortOrder order;
fromSortOrderVector(settings.query.orderBy(), dummy, order);
order = order == Qt::AscendingOrder ? Qt::DescendingOrder : Qt::AscendingOrder;
fromSortOrderVector(settings.query.orderBy(), column, order);
if(column == logicalindex)
order = order == Qt::AscendingOrder ? Qt::DescendingOrder : Qt::AscendingOrder;
else
order = Qt::AscendingOrder;
settings.query.orderBy() = toSortOrderVector(logicalindex, order);
ui->dataTable->sortByColumn(logicalindex, order);