summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUndefine <cqundefine@gmail.com>2021-11-09 13:17:57 +0100
committerBrian Gianforcaro <b.gianfo@gmail.com>2021-12-11 15:09:54 -0800
commit312bac19673f58cecf79a1383693cac35ede1162 (patch)
treef8567686d41172e498ca1fc0047ba46838b80716
parentbccfa205d3de4af42ba6b328509abeb5e9be7a45 (diff)
downloadserenity-312bac19673f58cecf79a1383693cac35ede1162.zip
Mail: Ask the user if they want to see the mail settings
-rw-r--r--Userland/Applications/Mail/MailWidget.cpp5
-rw-r--r--Userland/Applications/Mail/main.cpp7
2 files changed, 11 insertions, 1 deletions
diff --git a/Userland/Applications/Mail/MailWidget.cpp b/Userland/Applications/Mail/MailWidget.cpp
index 3a5d9636f4..996246d652 100644
--- a/Userland/Applications/Mail/MailWidget.cpp
+++ b/Userland/Applications/Mail/MailWidget.cpp
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2021, Luke Wilde <lukew@serenityos.org>
+ * Copyright (c) 2021, Undefine <cqundefine@gmail.com>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
@@ -103,7 +104,9 @@ bool MailWidget::connect_and_login()
auto server = Config::read_string("Mail", "Connection", "Server", {});
if (server.is_empty()) {
- GUI::MessageBox::show_error(window(), "Mail has no servers configured. Refer to the Mail(1) man page for more information.");
+ int result = GUI::MessageBox::show(window(), "Mail has no servers configured. Do you want configure them now?", "Error", GUI::MessageBox::Type::Error, GUI::MessageBox::InputType::YesNo);
+ if (result == GUI::MessageBox::ExecResult::ExecYes)
+ Desktop::Launcher::open(URL::create_with_file_protocol("/bin/MailSettings"), "/bin/MailSettings");
return false;
}
diff --git a/Userland/Applications/Mail/main.cpp b/Userland/Applications/Mail/main.cpp
index 9611491040..9638bf3233 100644
--- a/Userland/Applications/Mail/main.cpp
+++ b/Userland/Applications/Mail/main.cpp
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2021, Luke Wilde <lukew@serenityos.org>
+ * Copyright (c) 2021, Undefine <cqundefine@gmail.com>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
@@ -7,6 +8,7 @@
#include "MailWidget.h"
#include <LibConfig/Client.h>
#include <LibCore/System.h>
+#include <LibDesktop/Launcher.h>
#include <LibGUI/Application.h>
#include <LibGUI/Icon.h>
#include <LibGUI/Menu.h>
@@ -26,8 +28,13 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
TRY(Core::System::unveil("/etc", "r"));
TRY(Core::System::unveil("/tmp/portal/webcontent", "rw"));
TRY(Core::System::unveil("/tmp/portal/lookup", "rw"));
+ TRY(Core::System::unveil("/tmp/portal/launch", "rw"));
TRY(Core::System::unveil(nullptr, nullptr));
+ TRY(Desktop::Launcher::add_allowed_url(URL::create_with_file_protocol("/bin/MailSettings")));
+ TRY(Desktop::Launcher::add_allowed_handler_with_any_url("/bin/MailSettings"));
+ TRY(Desktop::Launcher::seal_allowlist());
+
auto window = GUI::Window::construct();
auto app_icon = GUI::Icon::default_icon("app-mail");