summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Applications/SystemMonitor/GraphWidget.cpp (renamed from Applications/ProcessManager/GraphWidget.cpp)0
-rw-r--r--Applications/SystemMonitor/GraphWidget.h (renamed from Applications/ProcessManager/GraphWidget.h)0
-rw-r--r--Applications/SystemMonitor/Makefile (renamed from Applications/ProcessManager/Makefile)2
-rw-r--r--Applications/SystemMonitor/MemoryStatsWidget.cpp (renamed from Applications/ProcessManager/MemoryStatsWidget.cpp)0
-rw-r--r--Applications/SystemMonitor/MemoryStatsWidget.h (renamed from Applications/ProcessManager/MemoryStatsWidget.h)0
-rw-r--r--Applications/SystemMonitor/NetworkStatisticsWidget.cpp (renamed from Applications/ProcessManager/NetworkStatisticsWidget.cpp)0
-rw-r--r--Applications/SystemMonitor/NetworkStatisticsWidget.h (renamed from Applications/ProcessManager/NetworkStatisticsWidget.h)0
-rw-r--r--Applications/SystemMonitor/ProcessFileDescriptorMapWidget.cpp (renamed from Applications/ProcessManager/ProcessFileDescriptorMapWidget.cpp)0
-rw-r--r--Applications/SystemMonitor/ProcessFileDescriptorMapWidget.h (renamed from Applications/ProcessManager/ProcessFileDescriptorMapWidget.h)0
-rw-r--r--Applications/SystemMonitor/ProcessMemoryMapWidget.cpp (renamed from Applications/ProcessManager/ProcessMemoryMapWidget.cpp)0
-rw-r--r--Applications/SystemMonitor/ProcessMemoryMapWidget.h (renamed from Applications/ProcessManager/ProcessMemoryMapWidget.h)0
-rw-r--r--Applications/SystemMonitor/ProcessModel.cpp (renamed from Applications/ProcessManager/ProcessModel.cpp)0
-rw-r--r--Applications/SystemMonitor/ProcessModel.h (renamed from Applications/ProcessManager/ProcessModel.h)0
-rw-r--r--Applications/SystemMonitor/ProcessStacksWidget.cpp (renamed from Applications/ProcessManager/ProcessStacksWidget.cpp)0
-rw-r--r--Applications/SystemMonitor/ProcessStacksWidget.h (renamed from Applications/ProcessManager/ProcessStacksWidget.h)0
-rw-r--r--Applications/SystemMonitor/ProcessTableView.cpp (renamed from Applications/ProcessManager/ProcessTableView.cpp)0
-rw-r--r--Applications/SystemMonitor/ProcessTableView.h (renamed from Applications/ProcessManager/ProcessTableView.h)0
-rw-r--r--Applications/SystemMonitor/main.cpp (renamed from Applications/ProcessManager/main.cpp)6
-rw-r--r--Base/home/anon/Launcher.ini6
-rw-r--r--Base/res/icons/16x16/app-system-monitor.png (renamed from Base/res/icons/16x16/app-process-manager.png)bin162 -> 162 bytes
-rw-r--r--Base/res/icons/32x32/app-system-monitor.png (renamed from Base/res/icons/32x32/app-process-manager.png)bin475 -> 475 bytes
-rwxr-xr-xKernel/build-root-filesystem.sh2
-rwxr-xr-xKernel/makeall.sh2
23 files changed, 9 insertions, 9 deletions
diff --git a/Applications/ProcessManager/GraphWidget.cpp b/Applications/SystemMonitor/GraphWidget.cpp
index 3266e5526d..3266e5526d 100644
--- a/Applications/ProcessManager/GraphWidget.cpp
+++ b/Applications/SystemMonitor/GraphWidget.cpp
diff --git a/Applications/ProcessManager/GraphWidget.h b/Applications/SystemMonitor/GraphWidget.h
index 1d39beb1f1..1d39beb1f1 100644
--- a/Applications/ProcessManager/GraphWidget.h
+++ b/Applications/SystemMonitor/GraphWidget.h
diff --git a/Applications/ProcessManager/Makefile b/Applications/SystemMonitor/Makefile
index e91f1d3a69..9c760c378b 100644
--- a/Applications/ProcessManager/Makefile
+++ b/Applications/SystemMonitor/Makefile
@@ -11,6 +11,6 @@ OBJS = \
NetworkStatisticsWidget.o \
main.o
-APP = ProcessManager
+APP = SystemMonitor
include ../Makefile.common
diff --git a/Applications/ProcessManager/MemoryStatsWidget.cpp b/Applications/SystemMonitor/MemoryStatsWidget.cpp
index 6412dba161..6412dba161 100644
--- a/Applications/ProcessManager/MemoryStatsWidget.cpp
+++ b/Applications/SystemMonitor/MemoryStatsWidget.cpp
diff --git a/Applications/ProcessManager/MemoryStatsWidget.h b/Applications/SystemMonitor/MemoryStatsWidget.h
index e3912b9b94..e3912b9b94 100644
--- a/Applications/ProcessManager/MemoryStatsWidget.h
+++ b/Applications/SystemMonitor/MemoryStatsWidget.h
diff --git a/Applications/ProcessManager/NetworkStatisticsWidget.cpp b/Applications/SystemMonitor/NetworkStatisticsWidget.cpp
index 4820755d5e..4820755d5e 100644
--- a/Applications/ProcessManager/NetworkStatisticsWidget.cpp
+++ b/Applications/SystemMonitor/NetworkStatisticsWidget.cpp
diff --git a/Applications/ProcessManager/NetworkStatisticsWidget.h b/Applications/SystemMonitor/NetworkStatisticsWidget.h
index 502474bee1..502474bee1 100644
--- a/Applications/ProcessManager/NetworkStatisticsWidget.h
+++ b/Applications/SystemMonitor/NetworkStatisticsWidget.h
diff --git a/Applications/ProcessManager/ProcessFileDescriptorMapWidget.cpp b/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.cpp
index bcc461ede8..bcc461ede8 100644
--- a/Applications/ProcessManager/ProcessFileDescriptorMapWidget.cpp
+++ b/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.cpp
diff --git a/Applications/ProcessManager/ProcessFileDescriptorMapWidget.h b/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.h
index a858281b6d..a858281b6d 100644
--- a/Applications/ProcessManager/ProcessFileDescriptorMapWidget.h
+++ b/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.h
diff --git a/Applications/ProcessManager/ProcessMemoryMapWidget.cpp b/Applications/SystemMonitor/ProcessMemoryMapWidget.cpp
index 938f8f5237..938f8f5237 100644
--- a/Applications/ProcessManager/ProcessMemoryMapWidget.cpp
+++ b/Applications/SystemMonitor/ProcessMemoryMapWidget.cpp
diff --git a/Applications/ProcessManager/ProcessMemoryMapWidget.h b/Applications/SystemMonitor/ProcessMemoryMapWidget.h
index fa1091286e..fa1091286e 100644
--- a/Applications/ProcessManager/ProcessMemoryMapWidget.h
+++ b/Applications/SystemMonitor/ProcessMemoryMapWidget.h
diff --git a/Applications/ProcessManager/ProcessModel.cpp b/Applications/SystemMonitor/ProcessModel.cpp
index b2f78245c8..b2f78245c8 100644
--- a/Applications/ProcessManager/ProcessModel.cpp
+++ b/Applications/SystemMonitor/ProcessModel.cpp
diff --git a/Applications/ProcessManager/ProcessModel.h b/Applications/SystemMonitor/ProcessModel.h
index 883da5d5cb..883da5d5cb 100644
--- a/Applications/ProcessManager/ProcessModel.h
+++ b/Applications/SystemMonitor/ProcessModel.h
diff --git a/Applications/ProcessManager/ProcessStacksWidget.cpp b/Applications/SystemMonitor/ProcessStacksWidget.cpp
index d7e4a822da..d7e4a822da 100644
--- a/Applications/ProcessManager/ProcessStacksWidget.cpp
+++ b/Applications/SystemMonitor/ProcessStacksWidget.cpp
diff --git a/Applications/ProcessManager/ProcessStacksWidget.h b/Applications/SystemMonitor/ProcessStacksWidget.h
index 9b0c6ac8f0..9b0c6ac8f0 100644
--- a/Applications/ProcessManager/ProcessStacksWidget.h
+++ b/Applications/SystemMonitor/ProcessStacksWidget.h
diff --git a/Applications/ProcessManager/ProcessTableView.cpp b/Applications/SystemMonitor/ProcessTableView.cpp
index 2871018182..2871018182 100644
--- a/Applications/ProcessManager/ProcessTableView.cpp
+++ b/Applications/SystemMonitor/ProcessTableView.cpp
diff --git a/Applications/ProcessManager/ProcessTableView.h b/Applications/SystemMonitor/ProcessTableView.h
index 98d3f3edb1..98d3f3edb1 100644
--- a/Applications/ProcessManager/ProcessTableView.h
+++ b/Applications/SystemMonitor/ProcessTableView.h
diff --git a/Applications/ProcessManager/main.cpp b/Applications/SystemMonitor/main.cpp
index 6361f342b6..de3de2f8db 100644
--- a/Applications/ProcessManager/main.cpp
+++ b/Applications/SystemMonitor/main.cpp
@@ -129,7 +129,7 @@ int main(int argc, char** argv)
toolbar->add_action(continue_action);
auto menubar = make<GMenuBar>();
- auto app_menu = make<GMenu>("Process Manager");
+ auto app_menu = make<GMenu>("System Monitor");
app_menu->add_action(GAction::create("Quit", { Mod_Alt, Key_F4 }, [](const GAction&) {
GApplication::the().quit(0);
return;
@@ -195,13 +195,13 @@ int main(int argc, char** argv)
};
auto* window = new GWindow;
- window->set_title("Process Manager");
+ window->set_title("System Monitor");
window->set_rect(20, 200, 680, 400);
window->set_main_widget(keeper);
window->show();
- window->set_icon(load_png("/res/icons/16x16/app-process-manager.png"));
+ window->set_icon(load_png("/res/icons/16x16/app-system-monitor.png"));
return app.exec();
}
diff --git a/Base/home/anon/Launcher.ini b/Base/home/anon/Launcher.ini
index dba5a9a6a8..c57fd34ec0 100644
--- a/Base/home/anon/Launcher.ini
+++ b/Base/home/anon/Launcher.ini
@@ -29,9 +29,9 @@ Icon=/res/icons/32x32/app-minesweeper.png
Path=/bin/Snake
Icon=/res/icons/32x32/app-snake.png
-[ProcessManager]
-Path=/bin/ProcessManager
-Icon=/res/icons/32x32/app-process-manager.png
+[SystemMonitor]
+Path=/bin/SystemMonitor
+Icon=/res/icons/32x32/app-system-monitor.png
[PaintBrush]
Path=/bin/PaintBrush
diff --git a/Base/res/icons/16x16/app-process-manager.png b/Base/res/icons/16x16/app-system-monitor.png
index c004ef2502..c004ef2502 100644
--- a/Base/res/icons/16x16/app-process-manager.png
+++ b/Base/res/icons/16x16/app-system-monitor.png
Binary files differ
diff --git a/Base/res/icons/32x32/app-process-manager.png b/Base/res/icons/32x32/app-system-monitor.png
index efad523052..efad523052 100644
--- a/Base/res/icons/32x32/app-process-manager.png
+++ b/Base/res/icons/32x32/app-system-monitor.png
Binary files differ
diff --git a/Kernel/build-root-filesystem.sh b/Kernel/build-root-filesystem.sh
index 38921ec207..903231b569 100755
--- a/Kernel/build-root-filesystem.sh
+++ b/Kernel/build-root-filesystem.sh
@@ -75,7 +75,7 @@ cp ../Applications/FileManager/FileManager mnt/bin/FileManager
cp ../Applications/FontEditor/FontEditor mnt/bin/FontEditor
cp ../Applications/IRCClient/IRCClient mnt/bin/IRCClient
cp ../Applications/Launcher/Launcher mnt/bin/Launcher
-cp ../Applications/ProcessManager/ProcessManager mnt/bin/ProcessManager
+cp ../Applications/SystemMonitor/SystemMonitor mnt/bin/SystemMonitor
cp ../Applications/Taskbar/Taskbar mnt/bin/Taskbar
cp ../Applications/Terminal/Terminal mnt/bin/Terminal
cp ../Applications/TextEditor/TextEditor mnt/bin/TextEditor
diff --git a/Kernel/makeall.sh b/Kernel/makeall.sh
index 07fc9d97c9..58ef6ef58d 100755
--- a/Kernel/makeall.sh
+++ b/Kernel/makeall.sh
@@ -36,7 +36,7 @@ build_targets="$build_targets ../Applications/Terminal"
build_targets="$build_targets ../Applications/FontEditor"
build_targets="$build_targets ../Applications/Launcher"
build_targets="$build_targets ../Applications/FileManager"
-build_targets="$build_targets ../Applications/ProcessManager"
+build_targets="$build_targets ../Applications/SystemMonitor"
build_targets="$build_targets ../Applications/TextEditor"
build_targets="$build_targets ../Applications/About"
build_targets="$build_targets ../Applications/IRCClient"