NetworkSettings: Add command line option for opening a specific adapter

cubiclove · Nov 2, 2022 · 38fb325 · 38fb325
1 parent f4a5cd6
commit 38fb325
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git 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
@@ -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
@@ -5,6 +5,7 @@
  */
 
 #include "NetworkSettingsWidget.h"
+#include <LibCore/ArgsParser.h>
 #include <LibGUI/MessageBox.h>
 #include <unistd.h>
 
@@ -28,6 +29,12 @@ ErrorOr<int> 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<int> 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<NetworkSettings::NetworkSettingsWidget>("Network"sv, "network"sv));
+ auto network_settings_widget = TRY(window->add_tab<NetworkSettings::NetworkSettingsWidget>("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();