Skip to content

refactor(nmrs-gui): elide use of WiredDevicesContext and just use NetworksContext instead #265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cachebag merged 1 commit into from
Feb 28, 2026
Merged

refactor(nmrs-gui): elide use of WiredDevicesContext and just use NetworksContext instead #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 2 additions & 21 deletions nmrs-gui/src/ui/header.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,18 +278,8 @@ pub async fn refresh_networks(
wired_header.set_margin_start(12);
list_container.append(&wired_header);

// Create a wired devices context
let wired_ctx = wired_devices::WiredDevicesContext {
nm: ctx.nm.clone(),
on_success: ctx.on_success.clone(),
status: ctx.status.clone(),
stack: ctx.stack.clone(),
parent_window: ctx.parent_window.clone(),
};
let wired_ctx = Rc::new(wired_ctx);

let wired_list = wired_devices::wired_devices_view(
wired_ctx,
ctx.clone(),
&available_devices,
ctx.wired_details_page.clone(),
);
Expand Down Expand Up @@ -442,17 +432,8 @@ pub async fn refresh_networks_no_scan(
wired_header.set_margin_start(12);
list_container.append(&wired_header);

let wired_ctx = wired_devices::WiredDevicesContext {
nm: ctx.nm.clone(),
on_success: ctx.on_success.clone(),
status: ctx.status.clone(),
stack: ctx.stack.clone(),
parent_window: ctx.parent_window.clone(),
};
let wired_ctx = Rc::new(wired_ctx);

let wired_list = wired_devices::wired_devices_view(
wired_ctx,
ctx.clone(),
&available_devices,
ctx.wired_details_page.clone(),
);
Expand Down
17 changes: 5 additions & 12 deletions nmrs-gui/src/ui/wired_devices.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,25 @@ use gtk::prelude::*;
use gtk::Align;
use gtk::GestureClick;
use gtk::{Box, Image, Label, ListBox, ListBoxRow, Orientation};
use nmrs::{models, NetworkManager};
use nmrs::models;
use std::rc::Rc;

use crate::ui::networks::NetworksContext;
use crate::ui::wired_page::WiredPage;

pub struct WiredDeviceRowController {
pub row: gtk::ListBoxRow,
pub arrow: gtk::Image,
pub ctx: Rc<WiredDevicesContext>,
pub ctx: Rc<NetworksContext>,
pub device: models::Device,
pub details_page: Rc<WiredPage>,
}

pub struct WiredDevicesContext {
pub nm: Rc<NetworkManager>,
pub on_success: Rc<dyn Fn()>,
pub status: Label,
pub stack: gtk::Stack,
pub parent_window: gtk::ApplicationWindow,
}

impl WiredDeviceRowController {
pub fn new(
row: gtk::ListBoxRow,
arrow: gtk::Image,
ctx: Rc<WiredDevicesContext>,
ctx: Rc<NetworksContext>,
device: models::Device,
details_page: Rc<WiredPage>,
) -> Self {
Expand Down Expand Up @@ -108,7 +101,7 @@ impl WiredDeviceRowController {
}

pub fn wired_devices_view(
ctx: Rc<WiredDevicesContext>,
ctx: Rc<NetworksContext>,
devices: &[models::Device],
details_page: Rc<WiredPage>,
) -> ListBox {
Expand Down
Loading