summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Groh <mail@linusgroh.de>2020-04-10 22:24:59 +0100
committerAndreas Kling <kling@serenityos.org>2020-04-11 10:03:12 +0200
commitb46a8d73355a3da6dcd0005eb82e3280559215b2 (patch)
treee4ee4a574a63e8153fafcc64dcf18717c52b81d6
parentea585639700e7c365cfea108211ef4a7f8872a12 (diff)
downloadserenity-b46a8d73355a3da6dcd0005eb82e3280559215b2.zip
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.
-rw-r--r--Base/etc/SystemServer.ini2
-rw-r--r--Base/etc/WindowServer/WindowServer.ini2
-rwxr-xr-xKernel/build-root-filesystem.sh2
-rw-r--r--MenuApplets/CPUGraph/.gitignore1
-rw-r--r--MenuApplets/ResourceGraph/.gitignore1
-rwxr-xr-xMenuApplets/ResourceGraph/Makefile (renamed from MenuApplets/CPUGraph/Makefile)2
-rw-r--r--MenuApplets/ResourceGraph/main.cpp (renamed from MenuApplets/CPUGraph/main.cpp)2
7 files changed, 6 insertions, 6 deletions
diff --git a/Base/etc/SystemServer.ini b/Base/etc/SystemServer.ini
index 142d068162..5fb700fc4e 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 040070b1f2..248bbcb9c2 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 ab354603a5..19f6bb3a13 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 699bfb17aa..0000000000
--- 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 0000000000..e36878d059
--- /dev/null
+++ b/MenuApplets/ResourceGraph/.gitignore
@@ -0,0 +1 @@
+ResourceGraph.MenuApplet
diff --git a/MenuApplets/CPUGraph/Makefile b/MenuApplets/ResourceGraph/Makefile
index 6c144c4a55..8dab3d142c 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
index d61339fae5..db3db459fb 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);