diff --git a/Base/etc/SystemServer.ini b/Base/etc/SystemServer.ini index b3b625f26b..eb6924c339 100644 --- a/Base/etc/SystemServer.ini +++ b/Base/etc/SystemServer.ini @@ -75,33 +75,33 @@ SocketPermissions=660 Priority=low User=clipboard -[CPUGraph.MenuApplet] -Executable=/bin/ResourceGraph.MenuApplet +[CPUGraph.Applet] +Executable=/bin/ResourceGraph.Applet Arguments=--cpu --name=CPUGraph --color=#00bb00 Priority=low KeepAlive=1 User=anon -[MemoryGraph.MenuApplet] -Executable=/bin/ResourceGraph.MenuApplet +[MemoryGraph.Applet] +Executable=/bin/ResourceGraph.Applet Arguments=--memory --name=MemoryGraph --color=#00bbbb Priority=low KeepAlive=1 User=anon -[Audio.MenuApplet] +[Audio.Applet] Priority=low KeepAlive=1 User=anon -[Network.MenuApplet] -Executable=/bin/Network.MenuApplet +[Network.Applet] +Executable=/bin/Network.Applet Arguments=--name=Network Priority=low KeepAlive=1 User=anon -[ClipboardHistory.MenuApplet] +[ClipboardHistory.Applet] Priority=low KeepAlive=1 User=anon diff --git a/Userland/Applets/Audio/CMakeLists.txt b/Userland/Applets/Audio/CMakeLists.txt new file mode 100644 index 0000000000..fb83e95fd2 --- /dev/null +++ b/Userland/Applets/Audio/CMakeLists.txt @@ -0,0 +1,6 @@ +set(SOURCES + main.cpp +) + +serenity_app(Audio.Applet ICON audio-volume-high) +target_link_libraries(Audio.Applet LibGUI LibGfx LibAudio) diff --git a/Userland/MenuApplets/Audio/main.cpp b/Userland/Applets/Audio/main.cpp similarity index 100% rename from Userland/MenuApplets/Audio/main.cpp rename to Userland/Applets/Audio/main.cpp diff --git a/Userland/MenuApplets/CMakeLists.txt b/Userland/Applets/CMakeLists.txt similarity index 100% rename from Userland/MenuApplets/CMakeLists.txt rename to Userland/Applets/CMakeLists.txt diff --git a/Userland/Applets/ClipboardHistory/CMakeLists.txt b/Userland/Applets/ClipboardHistory/CMakeLists.txt new file mode 100644 index 0000000000..23948bf178 --- /dev/null +++ b/Userland/Applets/ClipboardHistory/CMakeLists.txt @@ -0,0 +1,7 @@ +set(SOURCES + ClipboardHistoryModel.cpp + main.cpp +) + +serenity_app(ClipboardHistory.Applet ICON edit-copy) +target_link_libraries(ClipboardHistory.Applet LibGUI LibCore LibGfx) diff --git a/Userland/MenuApplets/ClipboardHistory/ClipboardHistoryModel.cpp b/Userland/Applets/ClipboardHistory/ClipboardHistoryModel.cpp similarity index 100% rename from Userland/MenuApplets/ClipboardHistory/ClipboardHistoryModel.cpp rename to Userland/Applets/ClipboardHistory/ClipboardHistoryModel.cpp diff --git a/Userland/MenuApplets/ClipboardHistory/ClipboardHistoryModel.h b/Userland/Applets/ClipboardHistory/ClipboardHistoryModel.h similarity index 100% rename from Userland/MenuApplets/ClipboardHistory/ClipboardHistoryModel.h rename to Userland/Applets/ClipboardHistory/ClipboardHistoryModel.h diff --git a/Userland/MenuApplets/ClipboardHistory/main.cpp b/Userland/Applets/ClipboardHistory/main.cpp similarity index 100% rename from Userland/MenuApplets/ClipboardHistory/main.cpp rename to Userland/Applets/ClipboardHistory/main.cpp diff --git a/Userland/Applets/Network/CMakeLists.txt b/Userland/Applets/Network/CMakeLists.txt new file mode 100644 index 0000000000..35a825317d --- /dev/null +++ b/Userland/Applets/Network/CMakeLists.txt @@ -0,0 +1,6 @@ +set(SOURCES + main.cpp +) + +serenity_app(Network.Applet ICON network) +target_link_libraries(Network.Applet LibGUI LibCore LibGfx) diff --git a/Userland/MenuApplets/Network/main.cpp b/Userland/Applets/Network/main.cpp similarity index 100% rename from Userland/MenuApplets/Network/main.cpp rename to Userland/Applets/Network/main.cpp diff --git a/Userland/Applets/ResourceGraph/CMakeLists.txt b/Userland/Applets/ResourceGraph/CMakeLists.txt new file mode 100644 index 0000000000..e13d6c8560 --- /dev/null +++ b/Userland/Applets/ResourceGraph/CMakeLists.txt @@ -0,0 +1,6 @@ +set(SOURCES + main.cpp +) + +serenity_bin(ResourceGraph.Applet) +target_link_libraries(ResourceGraph.Applet LibGUI LibCore LibGfx) diff --git a/Userland/MenuApplets/ResourceGraph/main.cpp b/Userland/Applets/ResourceGraph/main.cpp similarity index 100% rename from Userland/MenuApplets/ResourceGraph/main.cpp rename to Userland/Applets/ResourceGraph/main.cpp diff --git a/Userland/Applets/UserName/CMakeLists.txt b/Userland/Applets/UserName/CMakeLists.txt new file mode 100644 index 0000000000..7d6c23ffe2 --- /dev/null +++ b/Userland/Applets/UserName/CMakeLists.txt @@ -0,0 +1,6 @@ +set(SOURCES + main.cpp +) + +serenity_bin(UserName.Applet) +target_link_libraries(UserName.Applet LibGUI LibGfx) diff --git a/Userland/MenuApplets/UserName/main.cpp b/Userland/Applets/UserName/main.cpp similarity index 100% rename from Userland/MenuApplets/UserName/main.cpp rename to Userland/Applets/UserName/main.cpp diff --git a/Userland/CMakeLists.txt b/Userland/CMakeLists.txt index 27851b31d0..c156dff93e 100644 --- a/Userland/CMakeLists.txt +++ b/Userland/CMakeLists.txt @@ -6,7 +6,7 @@ add_subdirectory(DevTools) add_subdirectory(DynamicLoader) add_subdirectory(Games) add_subdirectory(Libraries) -add_subdirectory(MenuApplets) +add_subdirectory(Applets) add_subdirectory(Services) add_subdirectory(Shell) add_subdirectory(Tests) diff --git a/Userland/MenuApplets/Audio/CMakeLists.txt b/Userland/MenuApplets/Audio/CMakeLists.txt deleted file mode 100644 index f537b4adb0..0000000000 --- a/Userland/MenuApplets/Audio/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -set(SOURCES - main.cpp -) - -serenity_app(Audio.MenuApplet ICON audio-volume-high) -target_link_libraries(Audio.MenuApplet LibGUI LibGfx LibAudio) diff --git a/Userland/MenuApplets/ClipboardHistory/CMakeLists.txt b/Userland/MenuApplets/ClipboardHistory/CMakeLists.txt deleted file mode 100644 index e6ac9618d4..0000000000 --- a/Userland/MenuApplets/ClipboardHistory/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -set(SOURCES - ClipboardHistoryModel.cpp - main.cpp -) - -serenity_app(ClipboardHistory.MenuApplet ICON edit-copy) -target_link_libraries(ClipboardHistory.MenuApplet LibGUI LibCore LibGfx) diff --git a/Userland/MenuApplets/Network/CMakeLists.txt b/Userland/MenuApplets/Network/CMakeLists.txt deleted file mode 100644 index be006bdfd1..0000000000 --- a/Userland/MenuApplets/Network/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -set(SOURCES - main.cpp -) - -serenity_app(Network.MenuApplet ICON network) -target_link_libraries(Network.MenuApplet LibGUI LibCore LibGfx) diff --git a/Userland/MenuApplets/ResourceGraph/CMakeLists.txt b/Userland/MenuApplets/ResourceGraph/CMakeLists.txt deleted file mode 100644 index eea7190853..0000000000 --- a/Userland/MenuApplets/ResourceGraph/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -set(SOURCES - main.cpp -) - -serenity_bin(ResourceGraph.MenuApplet) -target_link_libraries(ResourceGraph.MenuApplet LibGUI LibCore LibGfx) diff --git a/Userland/MenuApplets/UserName/CMakeLists.txt b/Userland/MenuApplets/UserName/CMakeLists.txt deleted file mode 100644 index 1c4f1ee11a..0000000000 --- a/Userland/MenuApplets/UserName/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -set(SOURCES - main.cpp -) - -serenity_bin(UserName.MenuApplet) -target_link_libraries(UserName.MenuApplet LibGUI LibGfx)