From 51484bec825843df88ae29b9f99cd36e5d5c8632 Mon Sep 17 00:00:00 2001
From: Andreas Kling <kling@serenityos.org>
Date: Tue, 23 Nov 2021 15:15:43 +0100
Subject: [PATCH] Applets: Rename DesktopPicker => WorkspacePicker

This is consistent with the rest of the system.
---
 Base/etc/WindowServer.ini                           |  2 +-
 Base/home/anon/.config/SystemServer.ini             |  2 +-
 Userland/Applets/CMakeLists.txt                     |  2 +-
 Userland/Applets/DesktopPicker/CMakeLists.txt       | 13 -------------
 Userland/Applets/WorkspacePicker/CMakeLists.txt     | 13 +++++++++++++
 .../DesktopStatusWindow.cpp                         |  0
 .../DesktopStatusWindow.h                           |  0
 .../{DesktopPicker => WorkspacePicker}/main.cpp     |  2 +-
 8 files changed, 17 insertions(+), 17 deletions(-)
 delete mode 100644 Userland/Applets/DesktopPicker/CMakeLists.txt
 create mode 100644 Userland/Applets/WorkspacePicker/CMakeLists.txt
 rename Userland/Applets/{DesktopPicker => WorkspacePicker}/DesktopStatusWindow.cpp (100%)
 rename Userland/Applets/{DesktopPicker => WorkspacePicker}/DesktopStatusWindow.h (100%)
 rename Userland/Applets/{DesktopPicker => WorkspacePicker}/main.cpp (95%)

diff --git a/Base/etc/WindowServer.ini b/Base/etc/WindowServer.ini
index aad19480cdc..5afbb8517c4 100644
--- a/Base/etc/WindowServer.ini
+++ b/Base/etc/WindowServer.ini
@@ -32,7 +32,7 @@ DoubleClickSpeed=250
 Mode=stretch
 
 [Applet]
-Order=DesktopPicker,CPUGraph,MemoryGraph,Network,ClipboardHistory,Audio
+Order=WorkspacePicker,CPUGraph,MemoryGraph,Network,ClipboardHistory,Audio
 
 [Workspaces]
 Rows=2
diff --git a/Base/home/anon/.config/SystemServer.ini b/Base/home/anon/.config/SystemServer.ini
index 941f051c2c8..f9d6dc499e3 100644
--- a/Base/home/anon/.config/SystemServer.ini
+++ b/Base/home/anon/.config/SystemServer.ini
@@ -1,4 +1,4 @@
-[DesktopPicker.Applet]
+[WorkspacePicker.Applet]
 Priority=low
 KeepAlive=true
 
diff --git a/Userland/Applets/CMakeLists.txt b/Userland/Applets/CMakeLists.txt
index 6cef5c77939..af8611cd3f2 100644
--- a/Userland/Applets/CMakeLists.txt
+++ b/Userland/Applets/CMakeLists.txt
@@ -2,4 +2,4 @@ add_subdirectory(Audio)
 add_subdirectory(ClipboardHistory)
 add_subdirectory(Network)
 add_subdirectory(ResourceGraph)
-add_subdirectory(DesktopPicker)
+add_subdirectory(WorkspacePicker)
diff --git a/Userland/Applets/DesktopPicker/CMakeLists.txt b/Userland/Applets/DesktopPicker/CMakeLists.txt
deleted file mode 100644
index afe13c2ce45..00000000000
--- a/Userland/Applets/DesktopPicker/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-serenity_component(
-    DesktopPicker.Applet
-    REQUIRED
-    TARGETS DesktopPicker.Applet
-)
-
-set(SOURCES
-    DesktopStatusWindow.cpp
-    main.cpp
-)
-
-serenity_bin(DesktopPicker.Applet)
-target_link_libraries(DesktopPicker.Applet LibGUI LibCore LibGfx)
diff --git a/Userland/Applets/WorkspacePicker/CMakeLists.txt b/Userland/Applets/WorkspacePicker/CMakeLists.txt
new file mode 100644
index 00000000000..f848fee0375
--- /dev/null
+++ b/Userland/Applets/WorkspacePicker/CMakeLists.txt
@@ -0,0 +1,13 @@
+serenity_component(
+    WorkspacePicker.Applet
+    REQUIRED
+    TARGETS WorkspacePicker.Applet
+)
+
+set(SOURCES
+    DesktopStatusWindow.cpp
+    main.cpp
+)
+
+serenity_bin(WorkspacePicker.Applet)
+target_link_libraries(WorkspacePicker.Applet LibGUI LibCore LibGfx)
diff --git a/Userland/Applets/DesktopPicker/DesktopStatusWindow.cpp b/Userland/Applets/WorkspacePicker/DesktopStatusWindow.cpp
similarity index 100%
rename from Userland/Applets/DesktopPicker/DesktopStatusWindow.cpp
rename to Userland/Applets/WorkspacePicker/DesktopStatusWindow.cpp
diff --git a/Userland/Applets/DesktopPicker/DesktopStatusWindow.h b/Userland/Applets/WorkspacePicker/DesktopStatusWindow.h
similarity index 100%
rename from Userland/Applets/DesktopPicker/DesktopStatusWindow.h
rename to Userland/Applets/WorkspacePicker/DesktopStatusWindow.h
diff --git a/Userland/Applets/DesktopPicker/main.cpp b/Userland/Applets/WorkspacePicker/main.cpp
similarity index 95%
rename from Userland/Applets/DesktopPicker/main.cpp
rename to Userland/Applets/WorkspacePicker/main.cpp
index 57b203b3c60..1e9afb04e9c 100644
--- a/Userland/Applets/DesktopPicker/main.cpp
+++ b/Userland/Applets/WorkspacePicker/main.cpp
@@ -30,7 +30,7 @@ int main(int argc, char** argv)
     }
 
     auto window = DesktopStatusWindow::construct();
-    window->set_title("DesktopPicker");
+    window->set_title("WorkspacePicker");
     window->resize(28, 16);
     window->show();
     window->make_window_manager(WindowServer::WMEventMask::WorkspaceChanges);