Project

General

Profile

Download (2.89 KB)

Feature #1852 » 1852.patch

John Robertson, 12/28/2025 05:46 AM

View differences:

client/gui-qt/cityrep.cpp
delete c_i_d;
delete list_model;
delete filter_model;
gui()->qt_settings.city_repo_sort_col = header()->sortIndicatorSection();
gui()->qt_settings.city_report_sort = header()->sortIndicatorOrder();
gui()->qt_settings.city_repo_columns = header()->saveState();
}
/***********************************************************************//**
......
{
layout = new QVBoxLayout;
city_wdg = new city_widget(this);
if (gui()->qt_settings.city_repo_sort_col != -1) {
city_wdg->sortByColumn(gui()->qt_settings.city_repo_sort_col,
gui()->qt_settings.city_report_sort);
if (!gui()->qt_settings.city_repo_columns.isEmpty()) {
city_wdg->header()->restoreState(gui()->qt_settings.city_repo_columns);
}
layout->addWidget(city_wdg);
setLayout(layout);
client/gui-qt/fc_client.cpp
qt_settings.battlelog_y = 0.0;
}
qt_settings.player_repo_sort_col = -1;
qt_settings.city_repo_sort_col = -1;
if (s.contains("city_repo_columns")) {
qt_settings.city_repo_columns = s.value("city_repo_columns").toByteArray();
} else {
qt_settings.city_repo_columns = QByteArray();
}
if (qt_settings.chat_fx_pos < 0 || qt_settings.chat_fx_pos >= 1) {
qt_settings.chat_fx_pos = 0.0;
......
s.setValue("battlelog_y", qt_settings.battlelog_y);
s.setValue("new_turn_text", qt_settings.show_new_turn_text);
s.setValue("show_battle_log", qt_settings.show_battle_log);
s.setValue("city_repo_columns", qt_settings.city_repo_columns);
write_shortcuts();
}
client/gui-qt/fc_client.h
bool show_new_turn_text;
bool show_battle_log;
Qt::SortOrder player_report_sort;
int city_repo_sort_col;
Qt::SortOrder city_report_sort;
QByteArray city_repo_columns;
QByteArray city_geometry;
QByteArray city_splitter1;
QByteArray city_splitter2;
(2-2/2)