From 81c669e982ad8491a1d29690409dd5b752c4aabf Mon Sep 17 00:00:00 2001
From: Natalie Clarius <natalie_clarius@yahoo.de>
Date: Mon, 24 Oct 2022 14:46:03 +0200
Subject: [PATCH 1/2] runners/sessions: simplify new session messagebox

---
 runners/sessions/sessionrunner.cpp | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/runners/sessions/sessionrunner.cpp b/runners/sessions/sessionrunner.cpp
index 107b2c7755..2d9532f390 100644
--- a/runners/sessions/sessionrunner.cpp
+++ b/runners/sessions/sessionrunner.cpp
@@ -223,21 +223,18 @@ void SessionRunner::run(const Plasma::RunnerContext &context, const Plasma::Quer
         return;
     }
 
-    // TODO: this message is too verbose and too technical.
-    int result = QMessageBox::warning(nullptr,
-                                      i18n("Warning - New Session"),
-                                      i18n("<p>You have chosen to open another desktop session.<br />"
-                                           "The current session will be hidden "
-                                           "and a new login screen will be displayed.<br />"
-                                           "An F-key is assigned to each session; "
-                                           "F%1 is usually assigned to the first session, "
-                                           "F%2 to the second session and so on. "
-                                           "You can switch between sessions by pressing "
-                                           "Ctrl, Alt and the appropriate F-key at the same time. "
-                                           "Additionally, the Plasma Panel and Desktop menus have "
-                                           "actions for switching between sessions.</p>",
-                                           7,
-                                           8));
+    int result = QMessageBox::information(nullptr,
+                                          i18n("New Session"),
+                                          i18n("<p>You are about to enter a new desktop session.</p>"
+                                               "<p>A login screen will be displayed and the current session will be hidden.</p>"
+                                               "<p>You can switch between desktop sessions using</p>"
+                                               "<ul>"
+                                               "<li>Ctrl+Alt+F{number of session}</li>"
+                                               "<li>Plasma search (type 'switch' or 'sessions')</li>"
+                                               "<li>Plasma widgets (such as the application launcher)</li>"
+                                               "</ul>"),
+                                          QMessageBox::Ok,
+                                          QMessageBox::Cancel);
 
     if (result == QMessageBox::Cancel) {
         return;
-- 
GitLab


From 0cea2e1c3574c42655d1f680a8e84315f2209b5d Mon Sep 17 00:00:00 2001
From: Nate Graham <nate@kde.org>
Date: Mon, 24 Oct 2022 21:57:29 +0000
Subject: [PATCH 2/2] Apply 1 suggestion(s) to 1 file(s)

---
 runners/sessions/sessionrunner.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runners/sessions/sessionrunner.cpp b/runners/sessions/sessionrunner.cpp
index 2d9532f390..87726deef2 100644
--- a/runners/sessions/sessionrunner.cpp
+++ b/runners/sessions/sessionrunner.cpp
@@ -227,7 +227,7 @@ void SessionRunner::run(const Plasma::RunnerContext &context, const Plasma::Quer
                                           i18n("New Session"),
                                           i18n("<p>You are about to enter a new desktop session.</p>"
                                                "<p>A login screen will be displayed and the current session will be hidden.</p>"
-                                               "<p>You can switch between desktop sessions using</p>"
+                                               "<p>You can switch between desktop sessions using:</p>"
                                                "<ul>"
                                                "<li>Ctrl+Alt+F{number of session}</li>"
                                                "<li>Plasma search (type 'switch' or 'sessions')</li>"
-- 
GitLab