diff --git a/CMakeLists.txt b/CMakeLists.txt index 253473f901e..f898b259c36 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -150,5 +150,4 @@ add_subdirectory(Services) add_subdirectory(Applications) add_subdirectory(Games) add_subdirectory(DevTools) -add_subdirectory(MenuApplets) add_subdirectory(Userland) diff --git a/Userland/CMakeLists.txt b/Userland/CMakeLists.txt index 6e8e1c90ea9..e4a736e08a3 100644 --- a/Userland/CMakeLists.txt +++ b/Userland/CMakeLists.txt @@ -1,5 +1,6 @@ add_subdirectory(Demos) add_subdirectory(DynamicLoader) +add_subdirectory(MenuApplets) add_subdirectory(Shell) add_subdirectory(Tests) add_subdirectory(Utilities) diff --git a/MenuApplets/Audio/.gitignore b/Userland/MenuApplets/Audio/.gitignore similarity index 100% rename from MenuApplets/Audio/.gitignore rename to Userland/MenuApplets/Audio/.gitignore diff --git a/MenuApplets/Audio/CMakeLists.txt b/Userland/MenuApplets/Audio/CMakeLists.txt similarity index 100% rename from MenuApplets/Audio/CMakeLists.txt rename to Userland/MenuApplets/Audio/CMakeLists.txt diff --git a/MenuApplets/Audio/main.cpp b/Userland/MenuApplets/Audio/main.cpp similarity index 100% rename from MenuApplets/Audio/main.cpp rename to Userland/MenuApplets/Audio/main.cpp diff --git a/MenuApplets/CMakeLists.txt b/Userland/MenuApplets/CMakeLists.txt similarity index 100% rename from MenuApplets/CMakeLists.txt rename to Userland/MenuApplets/CMakeLists.txt diff --git a/MenuApplets/ClipboardHistory/CMakeLists.txt b/Userland/MenuApplets/ClipboardHistory/CMakeLists.txt similarity index 100% rename from MenuApplets/ClipboardHistory/CMakeLists.txt rename to Userland/MenuApplets/ClipboardHistory/CMakeLists.txt diff --git a/MenuApplets/ClipboardHistory/ClipboardHistoryModel.cpp b/Userland/MenuApplets/ClipboardHistory/ClipboardHistoryModel.cpp similarity index 100% rename from MenuApplets/ClipboardHistory/ClipboardHistoryModel.cpp rename to Userland/MenuApplets/ClipboardHistory/ClipboardHistoryModel.cpp diff --git a/MenuApplets/ClipboardHistory/ClipboardHistoryModel.h b/Userland/MenuApplets/ClipboardHistory/ClipboardHistoryModel.h similarity index 100% rename from MenuApplets/ClipboardHistory/ClipboardHistoryModel.h rename to Userland/MenuApplets/ClipboardHistory/ClipboardHistoryModel.h diff --git a/MenuApplets/ClipboardHistory/main.cpp b/Userland/MenuApplets/ClipboardHistory/main.cpp similarity index 100% rename from MenuApplets/ClipboardHistory/main.cpp rename to Userland/MenuApplets/ClipboardHistory/main.cpp diff --git a/MenuApplets/Clock/.gitignore b/Userland/MenuApplets/Clock/.gitignore similarity index 100% rename from MenuApplets/Clock/.gitignore rename to Userland/MenuApplets/Clock/.gitignore diff --git a/MenuApplets/Clock/CMakeLists.txt b/Userland/MenuApplets/Clock/CMakeLists.txt similarity index 100% rename from MenuApplets/Clock/CMakeLists.txt rename to Userland/MenuApplets/Clock/CMakeLists.txt diff --git a/MenuApplets/Clock/main.cpp b/Userland/MenuApplets/Clock/main.cpp similarity index 100% rename from MenuApplets/Clock/main.cpp rename to Userland/MenuApplets/Clock/main.cpp diff --git a/MenuApplets/Network/CMakeLists.txt b/Userland/MenuApplets/Network/CMakeLists.txt similarity index 100% rename from MenuApplets/Network/CMakeLists.txt rename to Userland/MenuApplets/Network/CMakeLists.txt diff --git a/MenuApplets/Network/main.cpp b/Userland/MenuApplets/Network/main.cpp similarity index 100% rename from MenuApplets/Network/main.cpp rename to Userland/MenuApplets/Network/main.cpp diff --git a/MenuApplets/ResourceGraph/.gitignore b/Userland/MenuApplets/ResourceGraph/.gitignore similarity index 100% rename from MenuApplets/ResourceGraph/.gitignore rename to Userland/MenuApplets/ResourceGraph/.gitignore diff --git a/MenuApplets/ResourceGraph/CMakeLists.txt b/Userland/MenuApplets/ResourceGraph/CMakeLists.txt similarity index 100% rename from MenuApplets/ResourceGraph/CMakeLists.txt rename to Userland/MenuApplets/ResourceGraph/CMakeLists.txt diff --git a/MenuApplets/ResourceGraph/main.cpp b/Userland/MenuApplets/ResourceGraph/main.cpp similarity index 100% rename from MenuApplets/ResourceGraph/main.cpp rename to Userland/MenuApplets/ResourceGraph/main.cpp diff --git a/MenuApplets/UserName/.gitignore b/Userland/MenuApplets/UserName/.gitignore similarity index 100% rename from MenuApplets/UserName/.gitignore rename to Userland/MenuApplets/UserName/.gitignore diff --git a/MenuApplets/UserName/CMakeLists.txt b/Userland/MenuApplets/UserName/CMakeLists.txt similarity index 100% rename from MenuApplets/UserName/CMakeLists.txt rename to Userland/MenuApplets/UserName/CMakeLists.txt diff --git a/MenuApplets/UserName/main.cpp b/Userland/MenuApplets/UserName/main.cpp similarity index 100% rename from MenuApplets/UserName/main.cpp rename to Userland/MenuApplets/UserName/main.cpp