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

Simplify code a bit

Browse Source 
This removes some unnecessary complexity which was left over from an
experiment which did not quite work out as expected.
This commit is contained in:
Martin Kleusberg
2020-06-09 20:52:19 +02:00
parent 1e88dd8d59
commit 5748e14f9e
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/MainWindow.cpp
View File

@@ -2304,7 +2304,7 @@ static void loadBrowseDataTableSettings(BrowseDataTableSettings& settings, QXmlS
{
int index = xml.attributes().value("index").toInt();
int mode = xml.attributes().value("mode").toInt();
settings.query.orderBy().emplace_back(index, mode == Qt::AscendingOrder ? sqlb::Ascending : sqlb::Descending);
settings.sortColumns.emplace_back(index, mode == Qt::AscendingOrder ? sqlb::Ascending : sqlb::Descending);
xml.skipCurrentElement();
}
}
@@ -2653,7 +2653,7 @@ static void saveBrowseDataTableSettings(const BrowseDataTableSettings& object, Q
xml.writeAttribute("unlock_view_pk", object.unlockViewPk);
xml.writeStartElement("sort");
for(const auto& column : object.query.orderBy())
for(const auto& column : object.sortColumns)
{
xml.writeStartElement("column");
xml.writeAttribute("index", QString::number(column.column));

6
src/TableBrowser.cpp
View File

@@ -504,7 +504,7 @@ void TableBrowser::updateTable()
sqlb::Query query(tablename);
// Sorting
query.setOrderBy(storedData.query.orderBy());
query.setOrderBy(storedData.sortColumns);
// Filters
for(auto it=storedData.filterValues.cbegin();it!=storedData.filterValues.cend();++it)
@@ -1059,7 +1059,7 @@ void TableBrowser::headerClicked(int logicalindex)
ui->dataTable->verticalHeader()->setMinimumWidth(ui->dataTable->verticalHeader()->width());
// Get the current list of sort columns
auto& columns = settings.query.orderBy();
auto& columns = settings.sortColumns;
// Before sorting, first check if the Control key is pressed. If it is, we want to append this column to the list of sort columns. If it is not,
// we want to sort only by the new column.
@@ -1318,7 +1318,7 @@ void TableBrowser::on_actionClearFilters_triggered()
void TableBrowser::on_actionClearSorting_triggered()
{
// Get the current list of sort columns
auto& columns = m_settings[currentlyBrowsedTableName()].query.orderBy();
auto& columns = m_settings[currentlyBrowsedTableName()].sortColumns;
columns.clear();
// Set cleared vector of sort-by columns
m_model->sort(columns);

2
src/TableBrowser.h
View File

@@ -27,7 +27,7 @@ class TableBrowser;
struct BrowseDataTableSettings
{
using CondFormatMap = std::map<size_t, std::vector<CondFormat>>;
sqlb::Query query; // NOTE: We only store the sort order in here (for now)
std::vector<sqlb::SortedColumn> sortColumns;
std::map<int, int> columnWidths;
std::map<int, QString> filterValues;
CondFormatMap condFormats;