mirror/sqlitebrowser
1
0
Fork 0
mirror of https://github.com/sqlitebrowser/sqlitebrowser.git synced 2026-01-29 15:29:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash in f3a54e4c71

Browse Source 
Also add a new helper function which makes the code a bit easier
understand.
This commit is contained in:
Martin Kleusberg
2019-03-01 16:26:29 +01:00
parent f3a54e4c71
commit 85cdb59e08
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/MainWindow.cpp
View File

@@ -764,7 +764,7 @@ void MainWindow::populateTable()
sqlb::Query query(tablename);
// Sorting
query.orderBy() = storedData.query.orderBy();
query.setOrderBy(storedData.query.orderBy());
// Filters
for(auto it=storedData.filterValues.constBegin();it!=storedData.filterValues.constEnd();++it)
@@ -848,9 +848,12 @@ void MainWindow::applyBrowseTableSettings(BrowseDataTableSettings storedData, bo
// Sorting
// For now just use the first sort column for the sort indicator
ui->dataTable->filterHeader()->setSortIndicator(
storedData.query.orderBy().front().column,
storedData.query.orderBy().front().direction == sqlb::Ascending ? Qt::AscendingOrder : Qt::DescendingOrder);
if(storedData.query.orderBy().size())
{
ui->dataTable->filterHeader()->setSortIndicator(
storedData.query.orderBy().front().column,
storedData.query.orderBy().front().direction == sqlb::Ascending ? Qt::AscendingOrder : Qt::DescendingOrder);
}
// Filters
if(!skipFilters)
@@ -2581,7 +2584,7 @@ static void loadBrowseDataTableSettings(BrowseDataTableSettings& settings, QXmlS
{
int sortOrderIndex = xml.attributes().value("sort_order_index").toInt();
Qt::SortOrder sortOrderMode = static_cast<Qt::SortOrder>(xml.attributes().value("sort_order_mode").toInt());
settings.query.orderBy() = toSortOrderVector(sortOrderIndex, sortOrderMode);
settings.query.setOrderBy(toSortOrderVector(sortOrderIndex, sortOrderMode));
}
settings.showRowid = xml.attributes().value("show_row_id").toInt();

1
src/sql/Query.h
View File

@@ -73,6 +73,7 @@ public:
const std::vector<SortedColumn>& orderBy() const { return m_sort; }
std::vector<SortedColumn>& orderBy() { return m_sort; }
void setOrderBy(const std::vector<SortedColumn>& columns) { m_sort = columns; }
private:
std::vector<std::string> m_column_names;