Browse Source

SystemMonitor: Only show the most important process stats by default

You can still enable additional columns via the context menu, and this
gives us a much more focused default interface.
Andreas Kling 4 years ago
parent
commit
6902adbb84

+ 1 - 1
Userland/Applications/SystemMonitor/ProcessModel.cpp

@@ -99,7 +99,7 @@ String ProcessModel::column_name(int column) const
     case Column::Physical:
         return "Physical";
     case Column::DirtyPrivate:
-        return "DirtyP";
+        return "Private";
     case Column::CleanInode:
         return "CleanI";
     case Column::PurgeableVolatile:

+ 9 - 9
Userland/Applications/SystemMonitor/ProcessModel.h

@@ -39,25 +39,25 @@ class ProcessModel final : public GUI::Model {
 public:
     enum Column {
         Icon = 0,
+        PID,
         Name,
         CPU,
-        Processor,
         State,
-        Priority,
         User,
-        PID,
-        TID,
-        PPID,
-        PGID,
-        SID,
         Virtual,
-        Physical,
         DirtyPrivate,
+        Pledge,
+        Physical,
         CleanInode,
         PurgeableVolatile,
         PurgeableNonvolatile,
         Veil,
-        Pledge,
+        Processor,
+        Priority,
+        TID,
+        PPID,
+        PGID,
+        SID,
         Syscalls,
         InodeFaults,
         ZeroFaults,

+ 11 - 1
Userland/Applications/SystemMonitor/main.cpp

@@ -174,7 +174,7 @@ int main(int argc, char** argv)
 
     auto window = GUI::Window::construct();
     window->set_title("System Monitor");
-    window->resize(680, 430);
+    window->resize(560, 430);
 
     auto& main_widget = window->set_main_widget<GUI::Widget>();
     main_widget.set_layout<GUI::VerticalBoxLayout>();
@@ -227,6 +227,16 @@ int main(int argc, char** argv)
     auto& process_table_view = process_table_container.add<GUI::TableView>();
     process_table_view.set_column_headers_visible(true);
     process_table_view.set_model(GUI::SortingProxyModel::create(process_model));
+    for (auto column = 0; column < ProcessModel::Column::__Count; ++column)
+        process_table_view.set_column_visible(column, false);
+    process_table_view.set_column_visible(ProcessModel::Column::Icon, true);
+    process_table_view.set_column_visible(ProcessModel::Column::PID, true);
+    process_table_view.set_column_visible(ProcessModel::Column::Name, true);
+    process_table_view.set_column_visible(ProcessModel::Column::CPU, true);
+    process_table_view.set_column_visible(ProcessModel::Column::User, true);
+    process_table_view.set_column_visible(ProcessModel::Column::Virtual, true);
+    process_table_view.set_column_visible(ProcessModel::Column::DirtyPrivate, true);
+
     process_table_view.set_key_column_and_sort_order(ProcessModel::Column::CPU, GUI::SortOrder::Descending);
     process_table_view.model()->update();