leyoda/cosmic-applets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add a loading overlay for while the mode is being changed

Browse source
This commit is contained in:
Lucy 2022-02-15 18:24:24 -05:00
parent 5af3abeb93
commit 83d2cb249f
No known key found for this signature in database
GPG key ID: EBC517FAD666BBF1
2 changed files with 118 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

162
applets/cosmic-applet-graphics/src/main.rs
View file

@ -11,7 +11,14 @@ pub mod mode_box;
pub mod profile; pub mod profile;
use self::{dbus::PowerDaemonProxy, graphics::Graphics, mode_box::ModeSelection}; use self::{dbus::PowerDaemonProxy, graphics::Graphics, mode_box::ModeSelection};
use gtk4::{gio::ApplicationFlags, prelude::*, Label, ListBox, ListBoxRow, Orientation, Separator}; use gtk4::{
gdk::Display,
gio::ApplicationFlags,
glib::{self, clone, MainContext, PRIORITY_DEFAULT},
prelude::*,
Align, CssProvider, Label, ListBox, ListBoxRow, Orientation, Overlay, Separator, Spinner,
StyleContext, STYLE_PROVIDER_PRIORITY_APPLICATION,
};
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use tokio::runtime::Runtime; use tokio::runtime::Runtime;
@ -47,6 +54,14 @@ fn row_clicked(_: &ListBox, row: &ListBoxRow) {
} }
fn build_ui(application: &gtk4::Application) { fn build_ui(application: &gtk4::Application) {
let provider = CssProvider::new();
provider.load_from_data(include_bytes!("style.css"));
StyleContext::add_provider_for_display(
&Display::default().expect("Could not connect to a display."),
&provider,
STYLE_PROVIDER_PRIORITY_APPLICATION,
);
let window = gtk4::ApplicationWindow::builder() let window = gtk4::ApplicationWindow::builder()
.application(application) .application(application)
.title("COSMIC Graphics Applet") .title("COSMIC Graphics Applet")
@ -56,60 +71,111 @@ fn build_ui(application: &gtk4::Application) {
let current_graphics = RT let current_graphics = RT
.block_on(get_current_graphics()) .block_on(get_current_graphics())
.expect("failed to connect to system76-power"); .expect("failed to connect to system76-power");
let (tx, rx) = MainContext::channel::<bool>(PRIORITY_DEFAULT);
view! { view! {
main_box = gtk4::Box { main_overlay = Overlay {
set_orientation: Orientation::Vertical, add_overlay: loading_box = &gtk4::Box {
set_spacing: 10, append: loading_explain_box = &gtk4::Box {
set_margin_top: 20, set_orientation: Orientation::Vertical,
set_margin_bottom: 20, set_halign: Align::Center,
set_margin_start: 24, set_valign: Align::Center,
set_margin_end: 24, append: loading_spinner = &Spinner {
append: mode_label = &Label { set_halign: Align::Center,
set_text: "Graphics Mode" },
append: loading_explain = &Label {
set_label: "Please wait while your graphics mode is set...",
set_halign: Align::Center,
},
},
set_halign: Align::Center,
set_valign: Align::Center,
set_hexpand: true,
set_vexpand: true,
set_visible: false,
add_css_class: "loading-overlay",
}, },
append: separator = &Separator { set_child: main_box = Some(&gtk4::Box) {
set_orientation: Orientation::Horizontal set_orientation: Orientation::Vertical,
}, set_spacing: 10,
append: graphics_modes_list = &ListBox { set_margin_top: 20,
connect_row_activated: row_clicked, set_margin_bottom: 20,
append: integrated_selector = &ModeSelection { set_margin_start: 24,
set_title: "Integrated Graphics", set_margin_end: 24,
set_description: "Disables external displays. Requires Restart.", append: mode_label = &Label {
set_active: (current_graphics == Graphics::Integrated), set_text: "Graphics Mode"
connect_toggled: |_| {
RT.block_on(set_graphics(Graphics::Integrated)).expect("failed to set graphics");
}
}, },
append: nvidia_selector = &ModeSelection { append: separator = &Separator {
set_title: "NVIDIA Graphics", set_orientation: Orientation::Horizontal
set_group: Some(&integrated_selector),
set_active: (current_graphics == Graphics::Nvidia),
connect_toggled: |_| {
RT.block_on(set_graphics(Graphics::Nvidia)).expect("failed to set graphics");
}
},
append: hybrid_selector = &ModeSelection {
set_title: "Hybrid Graphics",
set_description: "Requires Restart.",
set_group: Some(&integrated_selector),
set_active: (current_graphics == Graphics::Hybrid),
connect_toggled: |_| {
RT.block_on(set_graphics(Graphics::Hybrid)).expect("failed to set graphics");
}
},
append: compute_selector = &ModeSelection {
set_title: "Compute Graphics",
set_description: "Disables external displays. Requires Restart.",
set_group: Some(&integrated_selector),
set_active: (current_graphics == Graphics::Compute),
connect_toggled: |_| {
RT.block_on(set_graphics(Graphics::Compute)).expect("failed to set graphics");
}
}, },
append: graphics_modes_list = &ListBox {
connect_row_activated: row_clicked,
append: integrated_selector = &ModeSelection {
set_title: "Integrated Graphics",
set_description: "Disables external displays. Requires Restart.",
set_active: (current_graphics == Graphics::Integrated),
connect_toggled: clone!(@strong tx => move |_| {
tx.send(true).expect("failed to send to main context");
let tx = tx.clone();
RT.spawn(async move {
set_graphics(Graphics::Integrated).await.expect("failed to set graphics mode");
tx.send(false).expect("failed to send to main context");
});
})
},
append: nvidia_selector = &ModeSelection {
set_title: "NVIDIA Graphics",
set_group: Some(&integrated_selector),
set_active: (current_graphics == Graphics::Nvidia),
connect_toggled: clone!(@strong tx => move |_| {
tx.send(true).expect("failed to send to main context");
let tx = tx.clone();
RT.spawn(async move {
set_graphics(Graphics::Nvidia).await.expect("failed to set graphics mode");
tx.send(false).expect("failed to send to main context");
});
})
},
append: hybrid_selector = &ModeSelection {
set_title: "Hybrid Graphics",
set_description: "Requires Restart.",
set_group: Some(&integrated_selector),
set_active: (current_graphics == Graphics::Hybrid),
connect_toggled: clone!(@strong tx => move |_| {
tx.send(true).expect("failed to send to main context");
let tx = tx.clone();
RT.spawn(async move {
set_graphics(Graphics::Hybrid).await.expect("failed to set graphics mode");
tx.send(false).expect("failed to send to main context");
});
})
},
append: compute_selector = &ModeSelection {
set_title: "Compute Graphics",
set_description: "Disables external displays. Requires Restart.",
set_group: Some(&integrated_selector),
set_active: (current_graphics == Graphics::Compute),
connect_toggled: clone!(@strong tx => move |_| {
tx.send(true).expect("failed to send to main context");
let tx = tx.clone();
RT.spawn(async move {
set_graphics(Graphics::Compute).await.expect("failed to set graphics mode");
tx.send(false).expect("failed to send to main context");
});
})
},
}
} }
} }
} }
window.set_child(Some(&main_box)); rx.attach(
None,
clone!(@weak loading_box, @weak loading_spinner => @default-return Continue(true), move |val| {
loading_box.set_visible(val);
loading_spinner.set_spinning(val);
Continue(true)
}),
);
window.set_child(Some(&main_overlay));
window.show(); window.show();
} }

4
applets/cosmic-applet-graphics/src/style.css Normal file
View file

@ -0,0 +1,4 @@
.loading-overlay {
background-color: #2f2f2f;
opacity: 0.85;
}