From b46a8d73355a3da6dcd0005eb82e3280559215b2 Mon Sep 17 00:00:00 2001 From: Linus Groh Date: Fri, 10 Apr 2020 22:24:59 +0100 Subject: [PATCH] MenuApplets: Rename CPUGraph to ResourceGraph The plan is to extend what currently is known as "CPUGraph" and let the SystemServer spawn multiple instances of it - which then can show memory or network usages as well :^) Simply renaming the applet is the first step. --- Base/etc/SystemServer.ini | 2 +- Base/etc/WindowServer/WindowServer.ini | 2 +- Kernel/build-root-filesystem.sh | 2 +- MenuApplets/CPUGraph/.gitignore | 1 - MenuApplets/ResourceGraph/.gitignore | 1 + MenuApplets/{CPUGraph => ResourceGraph}/Makefile | 2 +- MenuApplets/{CPUGraph => ResourceGraph}/main.cpp | 2 +- 7 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 MenuApplets/CPUGraph/.gitignore create mode 100644 MenuApplets/ResourceGraph/.gitignore rename MenuApplets/{CPUGraph => ResourceGraph}/Makefile (72%) rename MenuApplets/{CPUGraph => ResourceGraph}/main.cpp (99%) diff --git a/Base/etc/SystemServer.ini b/Base/etc/SystemServer.ini index 142d0681627d64..5fb700fc4e6410 100644 --- a/Base/etc/SystemServer.ini +++ b/Base/etc/SystemServer.ini @@ -48,7 +48,7 @@ User=anon KeepAlive=1 User=anon -[CPUGraph.MenuApplet] +[ResourceGraph.MenuApplet] KeepAlive=1 User=anon diff --git a/Base/etc/WindowServer/WindowServer.ini b/Base/etc/WindowServer/WindowServer.ini index 040070b1f2d7a7..248bbcb9c25e0e 100644 --- a/Base/etc/WindowServer/WindowServer.ini +++ b/Base/etc/WindowServer/WindowServer.ini @@ -24,4 +24,4 @@ DoubleClickSpeed=250 Mode=scaled [Applet] -Order=Clock,Audio,CPUGraph,UserName +Order=Clock,Audio,ResourceGraph,UserName diff --git a/Kernel/build-root-filesystem.sh b/Kernel/build-root-filesystem.sh index ab354603a5408f..19f6bb3a13f693 100755 --- a/Kernel/build-root-filesystem.sh +++ b/Kernel/build-root-filesystem.sh @@ -166,7 +166,7 @@ cp ../Servers/NotificationServer/NotificationServer mnt/bin/NotificationServer cp ../Servers/WebServer/WebServer mnt/bin/WebServer cp ../Shell/Shell mnt/bin/Shell cp ../MenuApplets/Audio/Audio.MenuApplet mnt/bin/ -cp ../MenuApplets/CPUGraph/CPUGraph.MenuApplet mnt/bin/ +cp ../MenuApplets/ResourceGraph/ResourceGraph.MenuApplet mnt/bin/ cp ../MenuApplets/Clock/Clock.MenuApplet mnt/bin/ cp ../MenuApplets/UserName/UserName.MenuApplet mnt/bin echo "done" diff --git a/MenuApplets/CPUGraph/.gitignore b/MenuApplets/CPUGraph/.gitignore deleted file mode 100644 index 699bfb17aa564f..00000000000000 --- a/MenuApplets/CPUGraph/.gitignore +++ /dev/null @@ -1 +0,0 @@ -CPUGraph.MenuApplet diff --git a/MenuApplets/ResourceGraph/.gitignore b/MenuApplets/ResourceGraph/.gitignore new file mode 100644 index 00000000000000..e36878d05957ce --- /dev/null +++ b/MenuApplets/ResourceGraph/.gitignore @@ -0,0 +1 @@ +ResourceGraph.MenuApplet diff --git a/MenuApplets/CPUGraph/Makefile b/MenuApplets/ResourceGraph/Makefile similarity index 72% rename from MenuApplets/CPUGraph/Makefile rename to MenuApplets/ResourceGraph/Makefile index 6c144c4a55b610..8dab3d142c9280 100755 --- a/MenuApplets/CPUGraph/Makefile +++ b/MenuApplets/ResourceGraph/Makefile @@ -1,6 +1,6 @@ OBJS = main.o -PROGRAM = CPUGraph.MenuApplet +PROGRAM = ResourceGraph.MenuApplet LIB_DEPS = GUI IPC Gfx Thread Pthread Core diff --git a/MenuApplets/CPUGraph/main.cpp b/MenuApplets/ResourceGraph/main.cpp similarity index 99% rename from MenuApplets/CPUGraph/main.cpp rename to MenuApplets/ResourceGraph/main.cpp index d61339fae59427..db3db459fb16b1 100644 --- a/MenuApplets/CPUGraph/main.cpp +++ b/MenuApplets/ResourceGraph/main.cpp @@ -124,7 +124,7 @@ int main(int argc, char** argv) } auto window = GUI::Window::construct(); - window->set_title("CPUGraph"); + window->set_title("ResourceGraph"); window->set_window_type(GUI::WindowType::MenuApplet); window->resize(30, 16);