From 38fb3257c8ffdf11ca2ce7a8f949af7a3f79df9c Mon Sep 17 00:00:00 2001 From: Maciej Date: Sat, 29 Oct 2022 21:50:15 +0200 Subject: [PATCH] NetworkSettings: Add command line option for opening a specific adapter --- .../NetworkSettings/NetworkSettingsWidget.cpp | 6 ++++++ .../NetworkSettings/NetworkSettingsWidget.h | 1 + Userland/Applications/NetworkSettings/main.cpp | 12 +++++++++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Userland/Applications/NetworkSettings/NetworkSettingsWidget.cpp b/Userland/Applications/NetworkSettings/NetworkSettingsWidget.cpp index 264edec5ac..33b96b9ccf 100644 --- a/Userland/Applications/NetworkSettings/NetworkSettingsWidget.cpp +++ b/Userland/Applications/NetworkSettings/NetworkSettingsWidget.cpp @@ -158,4 +158,10 @@ void NetworkSettingsWidget::apply_settings() GUI::Process::spawn_or_show_error(window(), "/bin/NetworkServer"sv); } +void NetworkSettingsWidget::switch_adapter(String const& adapter) +{ + m_adapters_combobox->set_text(adapter, GUI::AllowCallback::No); + on_switch_adapter(adapter); +} + } diff --git a/Userland/Applications/NetworkSettings/NetworkSettingsWidget.h b/Userland/Applications/NetworkSettings/NetworkSettingsWidget.h index decf4c13b3..6f7f949313 100644 --- a/Userland/Applications/NetworkSettings/NetworkSettingsWidget.h +++ b/Userland/Applications/NetworkSettings/NetworkSettingsWidget.h @@ -17,6 +17,7 @@ class NetworkSettingsWidget : public GUI::SettingsWindow::Tab { public: virtual void apply_settings() override; + void switch_adapter(String const& adapter); private: NetworkSettingsWidget(); diff --git a/Userland/Applications/NetworkSettings/main.cpp b/Userland/Applications/NetworkSettings/main.cpp index 01c4d48507..d23906cd2d 100644 --- a/Userland/Applications/NetworkSettings/main.cpp +++ b/Userland/Applications/NetworkSettings/main.cpp @@ -5,6 +5,7 @@ */ #include "NetworkSettingsWidget.h" +#include #include #include @@ -28,6 +29,12 @@ ErrorOr serenity_main(Main::Arguments args) TRY(Core::System::unveil("/tmp/portal/window", "rw")); TRY(Core::System::unveil(nullptr, nullptr)); + String adapter; + + Core::ArgsParser parser; + parser.add_positional_argument(adapter, "Adapter to display settings for", "adapter", Core::ArgsParser::Required::No); + parser.parse(args); + auto app = TRY(GUI::Application::try_create(args)); if (getuid() != 0) { @@ -39,7 +46,10 @@ ErrorOr serenity_main(Main::Arguments args) auto app_icon = GUI::Icon::default_icon("network"sv); auto window = TRY(GUI::SettingsWindow::create("Network Settings", GUI::SettingsWindow::ShowDefaultsButton::No)); - (void)TRY(window->add_tab("Network"sv, "network"sv)); + auto network_settings_widget = TRY(window->add_tab("Network"sv, "network"sv)); + if (!adapter.is_null()) { + network_settings_widget->switch_adapter(adapter); + } window->set_icon(app_icon.bitmap_for_size(16)); window->show();