From 322f49caece344889919061b365700f989e8c338 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Thu, 28 Feb 2019 21:04:26 +0100 Subject: [PATCH] ProcessManager: Use icons for the process priorities. --- .../ProcessManager/ProcessTableModel.cpp | 17 +++++++++++++---- .../ProcessManager/ProcessTableModel.h | 3 +++ Base/res/icons/highpriority16.png | Bin 0 -> 207 bytes Base/res/icons/highpriority16.rgb | Bin 0 -> 1024 bytes Base/res/icons/lowpriority16.png | Bin 0 -> 201 bytes Base/res/icons/lowpriority16.rgb | Bin 0 -> 1024 bytes Base/res/icons/normalpriority16.png | Bin 0 -> 172 bytes Base/res/icons/normalpriority16.rgb | Bin 0 -> 1024 bytes 8 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 Base/res/icons/highpriority16.png create mode 100644 Base/res/icons/highpriority16.rgb create mode 100644 Base/res/icons/lowpriority16.png create mode 100644 Base/res/icons/lowpriority16.rgb create mode 100644 Base/res/icons/normalpriority16.png create mode 100644 Base/res/icons/normalpriority16.rgb diff --git a/Applications/ProcessManager/ProcessTableModel.cpp b/Applications/ProcessManager/ProcessTableModel.cpp index a5bd507abc..a2aa5ff29a 100644 --- a/Applications/ProcessManager/ProcessTableModel.cpp +++ b/Applications/ProcessManager/ProcessTableModel.cpp @@ -24,7 +24,9 @@ ProcessTableModel::ProcessTableModel() endpwent(); m_generic_process_icon = GraphicsBitmap::load_from_file(GraphicsBitmap::Format::RGBA32, "/res/icons/gear16.rgb", { 16, 16 }); - ASSERT(m_generic_process_icon); + m_high_priority_icon = GraphicsBitmap::load_from_file(GraphicsBitmap::Format::RGBA32, "/res/icons/highpriority16.rgb", { 16, 16 }); + m_low_priority_icon = GraphicsBitmap::load_from_file(GraphicsBitmap::Format::RGBA32, "/res/icons/lowpriority16.rgb", { 16, 16 }); + m_normal_priority_icon = GraphicsBitmap::load_from_file(GraphicsBitmap::Format::RGBA32, "/res/icons/normalpriority16.rgb", { 16, 16 }); } ProcessTableModel::~ProcessTableModel() @@ -48,7 +50,7 @@ String ProcessTableModel::column_name(int column) const case Column::PID: return "PID"; case Column::State: return "State"; case Column::User: return "User"; - case Column::Priority: return "Priority"; + case Column::Priority: return "Pr"; case Column::Linear: return "Linear"; case Column::Physical: return "Physical"; case Column::CPU: return "CPU"; @@ -63,7 +65,7 @@ GTableModel::ColumnMetadata ProcessTableModel::column_metadata(int column) const case Column::Icon: return { 16, TextAlignment::CenterLeft }; case Column::PID: return { 25, TextAlignment::CenterRight }; case Column::State: return { 75, TextAlignment::CenterLeft }; - case Column::Priority: return { 65, TextAlignment::CenterLeft }; + case Column::Priority: return { 16, TextAlignment::CenterLeft }; case Column::User: return { 50, TextAlignment::CenterLeft }; case Column::Linear: return { 65, TextAlignment::CenterRight }; case Column::Physical: return { 65, TextAlignment::CenterRight }; @@ -103,7 +105,14 @@ GVariant ProcessTableModel::data(int row, int column) const case Column::PID: return process.current_state.pid; case Column::State: return process.current_state.state; case Column::User: return process.current_state.user; - case Column::Priority: return process.current_state.priority; + case Column::Priority: + if (process.current_state.priority == "High") + return *m_high_priority_icon; + if (process.current_state.priority == "Low") + return *m_low_priority_icon; + if (process.current_state.priority == "Normal") + return *m_normal_priority_icon; + return process.current_state.priority; case Column::Linear: return pretty_byte_size(process.current_state.linear); case Column::Physical: return pretty_byte_size(process.current_state.physical); case Column::CPU: return process.current_state.cpu_percent; diff --git a/Applications/ProcessManager/ProcessTableModel.h b/Applications/ProcessManager/ProcessTableModel.h index 0246f521ed..41185cc67f 100644 --- a/Applications/ProcessManager/ProcessTableModel.h +++ b/Applications/ProcessManager/ProcessTableModel.h @@ -45,4 +45,7 @@ private: Vector m_pids; int m_selected_row { -1 }; RetainPtr m_generic_process_icon; + RetainPtr m_high_priority_icon; + RetainPtr m_low_priority_icon; + RetainPtr m_normal_priority_icon; }; diff --git a/Base/res/icons/highpriority16.png b/Base/res/icons/highpriority16.png new file mode 100644 index 0000000000000000000000000000000000000000..c44c15c4346b44670d7163729cbaded4e9a71a3c GIT binary patch literal 207 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7*pj^6T^KAF${CIP?u{eC|@&xlIGugTe~ HDWM4f@fbt- literal 0 HcmV?d00001 diff --git a/Base/res/icons/highpriority16.rgb b/Base/res/icons/highpriority16.rgb new file mode 100644 index 0000000000000000000000000000000000000000..e7ec3be362c1984e3b92eb46fd444ae4cdb6efd1 GIT binary patch literal 1024 zcmZP=#(;&v@jnQY<3*4@c81dbAPi!YVg^V(NFOo=i4kK4NFB01WHv~SkQpE~FbvZR f6O!K|jb3Fifn!hnhM7tuR4* literal 0 HcmV?d00001 diff --git a/Base/res/icons/lowpriority16.png b/Base/res/icons/lowpriority16.png new file mode 100644 index 0000000000000000000000000000000000000000..7e8c024cf318eff554b1b542fe58cc3d4261bc4e GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7*pj^6T^KAF${CIKJ@#P#(Wrd7eomrM4FiMKY_V4PJJpp83=9mOu6{1-oD!MO)os(g(uGV#AFM00%2UdjJ3c literal 0 HcmV?d00001 diff --git a/Base/res/icons/normalpriority16.png b/Base/res/icons/normalpriority16.png new file mode 100644 index 0000000000000000000000000000000000000000..43dc5231b37c7193f1f8e1fbe34fc30f862294cf GIT binary patch literal 172 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7*pj^6T^KAF${CICi9Tl`1HATeUi0I5aR3u1%BhKhcWJ3;P6#vrj#O#Ki5 E0OBJ?;Q#;t literal 0 HcmV?d00001