fix: properly sort monitor intervals in monitors tab (fix #2926)

Bionus · Mar 2, 2023 · f268117 · f268117
1 parent 3caca98
commit f268117
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/src/gui/src/download-group-table-model.cpp b/src/gui/src/download-group-table-model.cpp
@@ -89,8 +89,8 @@ QVariant DownloadGroupTableModel::data(const QModelIndex &index, int role) const
 	{
 		case 1: return download.query.toString();
 		case 2: return download.site->url();
-		case 3: return QString::number(download.page);
-		case 4: return QString::number(download.perpage);
+		case 3: return download.page;
+		case 4: return download.perpage;
 		case 5: return download.total == -1 ? "all" : QString::number(download.total);
 		case 6: return download.filename;
 		case 7: return download.path;

diff --git a/src/gui/src/download-image-table-model.cpp b/src/gui/src/download-image-table-model.cpp
@@ -61,7 +61,7 @@ QVariant DownloadImageTableModel::data(const QModelIndex &index, int role) const
 		return index.row();
 	}
 
-	if (role != Qt::DisplayRole) {
+	if (role != Qt::DisplayRole && role != Qt::UserRole) {
 		return {};
 	}
 
@@ -72,14 +72,17 @@ QVariant DownloadImageTableModel::data(const QModelIndex &index, int role) const
 		case 2: return img->token<QString>("rating");
 		case 3: return img->tagsString().join(' ');
 		case 4: return img->fileUrl().toString();
-		case 5: return img->createdAt().toString(Qt::ISODate);
+		case 5: return img->createdAt();
 		case 6: return img->search().join(' ');
 		case 7: return download.site->url();
 		case 8: return download.filename;
 		case 9: return download.path;
 
 		case 10: {
 			double size = img->fileSize();
+			if (role == Qt::UserRole) {
+				return size;
+			}
 			const QString unit = getUnit(&size);
 			return size > 0
 				? QStringLiteral("%1 %2").arg(size).arg(unit)

diff --git a/src/gui/src/monitor-table-model.cpp b/src/gui/src/monitor-table-model.cpp
@@ -119,7 +119,7 @@ QVariant MonitorTableModel::data(const QModelIndex &index, int role) const
 		return {};
 	}
 
-	if (role != Qt::DisplayRole) {
+	if (role != Qt::DisplayRole && role != Qt::UserRole) {
 		return {};
 	}
 
@@ -138,6 +138,9 @@ QVariant MonitorTableModel::data(const QModelIndex &index, int role) const
 		}
 
 		case 3:
+			if (role == Qt::UserRole) {
+				return monitor.interval();
+			}
 			return timeToString(monitor.interval());
 
 		case 4:
@@ -168,6 +171,9 @@ QVariant MonitorTableModel::data(const QModelIndex &index, int role) const
 			if (monitor.lastState().isEmpty()) {
 				return {};
 			}
+			if (role == Qt::UserRole) {
+				return monitor.lastStateCount();
+			}
 			return tr("%n time(s)", "", monitor.lastStateCount());
 
 		case 10:

diff --git a/src/gui/src/tabs/monitors-tab.cpp b/src/gui/src/tabs/monitors-tab.cpp
@@ -25,6 +25,7 @@ MonitorsTab::MonitorsTab(Profile *profile, MonitorManager *monitorManager, Monit
 
 	auto monitorTableModel = new MonitorTableModel(m_monitorManager, this);
 	m_monitorTableModel = new QSortFilterProxyModel(this);
+	m_monitorTableModel->setSortRole(Qt::UserRole);
 	m_monitorTableModel->setSourceModel(monitorTableModel);
 	ui->tableMonitors->setModel(m_monitorTableModel);
 	connect(m_monitoringCenter, &MonitoringCenter::statusChanged, monitorTableModel, &MonitorTableModel::setStatus);