Skip to content

Commit 6fee534

Browse files
committed
ubuntu screens
1 parent ead16b6 commit 6fee534

11 files changed

Lines changed: 90 additions & 9 deletions

File tree

‎README.md‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,17 @@
22

33
A Linux Task Manager alternative built with Qt6, inspired by the Windows Task Manager but designed to go further - providing deep visibility into system processes, performance metrics, users, and services.
44

5-
## Memory view
6-
![Screenshot](screenshots/readme.png)
7-
## CPU view
8-
![Screenshot](screenshots/cpu.png)
9-
## GPU view
10-
![Screenshot](screenshots/gpu.png)
5+
## Screenshots
6+
7+
| CPU | Memory |
8+
| --- | --- |
9+
| <img src="screenshots/ubuntu/cpu.png" alt="CPU view" width="420"> | <img src="screenshots/ubuntu/mem.png" alt="Memory view" width="420"> |
10+
| Disk | Swap |
11+
| <img src="screenshots/ubuntu/disk.png" alt="Disk view" width="420"> | <img src="screenshots/ubuntu/swap.png" alt="Swap view" width="420"> |
12+
| Processes | Process tree |
13+
| <img src="screenshots/ubuntu/process.png" alt="Processes view" width="420"> | <img src="screenshots/ubuntu/process_tree.png" alt="Process tree view" width="420"> |
14+
| Users | Services |
15+
| <img src="screenshots/ubuntu/user.png" alt="Users view" width="420"> | <img src="screenshots/ubuntu/systemctl.png" alt="Services view" width="420"> |
1116

1217
## Installing
1318

‎screenshots/ubuntu/cpu.png‎

159 KB
Loading

‎screenshots/ubuntu/disk.png‎

107 KB
Loading

‎screenshots/ubuntu/mem.png‎

82.1 KB
Loading

‎screenshots/ubuntu/process.png‎

151 KB
Loading
208 KB
Loading

‎screenshots/ubuntu/swap.png‎

69.4 KB
Loading

‎screenshots/ubuntu/systemctl.png‎

124 KB
Loading

‎screenshots/ubuntu/user.png‎

33.4 KB
Loading

‎src/userswidget.cpp‎

Lines changed: 76 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,22 @@ UsersWidget::UsersWidget(QWidget *parent) : QWidget(parent), ui(new Ui::UsersWid
8989
this->ui->treeWidget->setContextMenuPolicy(Qt::CustomContextMenu);
9090

9191
QHeaderView *hv = this->ui->treeWidget->header();
92+
hv->setSectionsClickable(true);
93+
hv->setSortIndicatorShown(true);
9294
hv->setSectionResizeMode(0, QHeaderView::Stretch);
9395
hv->setSectionResizeMode(1, QHeaderView::ResizeToContents);
9496
hv->setSectionResizeMode(2, QHeaderView::ResizeToContents);
97+
hv->setSortIndicator(this->m_sortColumn, this->m_sortOrder);
9598

9699
connect(this->m_refreshTimer, &QTimer::timeout, this, &UsersWidget::onTimerTick);
97100
connect(this->ui->treeWidget, &QTreeWidget::customContextMenuRequested, this, &UsersWidget::onContextMenu);
101+
connect(hv, &QHeaderView::sortIndicatorChanged, this, [this](int column, Qt::SortOrder order)
102+
{
103+
this->m_sortColumn = column;
104+
this->m_sortOrder = order;
105+
if (this->m_active && !CFG->RefreshPaused)
106+
this->onTimerTick();
107+
});
98108
}
99109

100110
UsersWidget::~UsersWidget()
@@ -222,7 +232,39 @@ void UsersWidget::rebuildTree(const QList<OS::Process> &allProcs)
222232
QList<uid_t> uids = agg.keys();
223233
std::sort(uids.begin(), uids.end(), [&](uid_t a, uid_t b)
224234
{
225-
return agg.value(a).cpuPct > agg.value(b).cpuPct;
235+
const UserAgg &left = agg[a];
236+
const UserAgg &right = agg[b];
237+
238+
auto compare = [&](auto lhs, auto rhs)
239+
{
240+
if (lhs == rhs)
241+
return false;
242+
return (this->m_sortOrder == Qt::AscendingOrder) ? (lhs < rhs) : (lhs > rhs);
243+
};
244+
245+
switch (this->m_sortColumn)
246+
{
247+
case 0:
248+
if (left.name != right.name)
249+
return compare(left.name, right.name);
250+
break;
251+
case 1:
252+
if (!qFuzzyCompare(left.cpuPct + 1.0, right.cpuPct + 1.0))
253+
return compare(left.cpuPct, right.cpuPct);
254+
break;
255+
case 2:
256+
if (left.memKb != right.memKb)
257+
return compare(left.memKb, right.memKb);
258+
break;
259+
default:
260+
break;
261+
}
262+
263+
if (!qFuzzyCompare(left.cpuPct + 1.0, right.cpuPct + 1.0))
264+
return left.cpuPct > right.cpuPct;
265+
if (left.memKb != right.memKb)
266+
return left.memKb > right.memKb;
267+
return left.name.localeAwareCompare(right.name) < 0;
226268
});
227269

228270
for (int userIndex = 0; userIndex < uids.size(); ++userIndex)
@@ -256,9 +298,40 @@ void UsersWidget::rebuildTree(const QList<OS::Process> &allProcs)
256298
}
257299

258300
QList<OS::Process> procs = a.procs;
259-
std::sort(procs.begin(), procs.end(), [](const OS::Process &x, const OS::Process &y)
301+
std::sort(procs.begin(), procs.end(), [&](const OS::Process &x, const OS::Process &y)
260302
{
261-
return x.CPUPercent > y.CPUPercent;
303+
auto compare = [&](auto lhs, auto rhs)
304+
{
305+
if (lhs == rhs)
306+
return false;
307+
return (this->m_sortOrder == Qt::AscendingOrder) ? (lhs < rhs) : (lhs > rhs);
308+
};
309+
310+
switch (this->m_sortColumn)
311+
{
312+
case 0:
313+
if (x.Name != y.Name)
314+
return compare(x.Name, y.Name);
315+
break;
316+
case 1:
317+
if (!qFuzzyCompare(x.CPUPercent + 1.0, y.CPUPercent + 1.0))
318+
return compare(x.CPUPercent, y.CPUPercent);
319+
break;
320+
case 2:
321+
if (x.VMRssKb != y.VMRssKb)
322+
return compare(x.VMRssKb, y.VMRssKb);
323+
break;
324+
default:
325+
break;
326+
}
327+
328+
if (!qFuzzyCompare(x.CPUPercent + 1.0, y.CPUPercent + 1.0))
329+
return x.CPUPercent > y.CPUPercent;
330+
if (x.VMRssKb != y.VMRssKb)
331+
return x.VMRssKb > y.VMRssKb;
332+
if (x.Name != y.Name)
333+
return x.Name.localeAwareCompare(y.Name) < 0;
334+
return x.PID < y.PID;
262335
});
263336

264337
for (int processIndex = 0; processIndex < procs.size(); ++processIndex)

0 commit comments

Comments
 (0)