mirrors/fort
1
0
Fork 0
mirror of https://github.com/tnodir/fort synced 2024-11-15 07:38:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: AppListModel: Simplify sqlOrderColumn()

Browse Source
This commit is contained in:
Nodir Temirkhodjaev 2024-01-28 12:28:31 +03:00
parent 9d14522523
commit ac9a59c1cf
1 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/ui/model/applistmodel.cpp
View File

@ -287,23 +287,21 @@ QVariant AppListModel::dataDecoration(const QModelIndex &index) const
{ {
const int column = index.column(); const int column = index.column();
if (column == 0 || column == 1 || column == 3 || column == 4) { const int row = index.row();
const int row = index.row();
const auto appRow = appRowAt(row); const auto appRow = appRowAt(row);
if (appRow.isNull()) if (appRow.isNull())
return QVariant(); return QVariant();
switch (column) { switch (column) {
case 0: case 0:
return appIcon(appRow); return appIcon(appRow);
case 1: case 1:
return appStateIcon(appRow); return appStateIcon(appRow);
case 3: case 3:
return appParkedIcon(appRow); return appParkedIcon(appRow);
case 4: case 4:
return appScheduledIcon(appRow); return appScheduledIcon(appRow);
}
} }
return QVariant(); return QVariant();
@ -482,13 +480,10 @@ QString AppListModel::sqlWhere() const
QString AppListModel::sqlOrderColumn() const QString AppListModel::sqlOrderColumn() const
{ {
QString columnsStr; QString columnsStr;
bool orderApplied = false;
switch (sortColumn()) { switch (sortColumn()) {
case 0: // Name case 0: // Name
columnsStr = "t.name" + sqlOrderAsc() + ", t.path"; return "t.name" + sqlOrderAsc() + ", t.path";
orderApplied = true;
break;
case 1: // Action case 1: // Action
columnsStr = "alerted DESC, t.kill_process, t.blocked"; columnsStr = "alerted DESC, t.kill_process, t.blocked";
break; break;
@ -509,9 +504,5 @@ QString AppListModel::sqlOrderColumn() const
break; break;
} }
if (!orderApplied) { return columnsStr + sqlOrderAsc() + ", t.name";
columnsStr += sqlOrderAsc() + ", t.name";
}
return columnsStr;
} }