KeksNino/Linux-WallpaperEngineGUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "added kill button, now actually usable"

Browse Source 
This reverts commit e377b0308d.
This commit is contained in:
KeksNino
2025-08-05 16:55:06 +02:00
parent e377b0308d
commit d629d414fd
1 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.rs
+5 -21
View File
@@ -54,20 +54,9 @@ fn build_ui(app: &Application) {
wrapper_box.set_hexpand(true); wrapper_box.set_hexpand(true);
wrapper_box.set_vexpand(true); wrapper_box.set_vexpand(true);
// Kill Process Button
let button2 = Button::with_label("Kill Wallpaper Engine Process");
// FILE CHOOSER BUTTON // FILE CHOOSER BUTTON
let button = Button::with_label("Select Workshop Folder"); let button = Button::with_label("Select Workshop Folder");
wrapper_box.append(&button); wrapper_box.append(&button);
wrapper_box.append(&button2);
button2.connect_clicked(|_| {
let killcommand = Command::new("/usr/bin/pkill")
.arg("-9")
.arg("linux-wallpaper")
.spawn();
});
// SCROLLED WINDOW FOR IMAGES // SCROLLED WINDOW FOR IMAGES
let scrolled_window = ScrolledWindow::builder() let scrolled_window = ScrolledWindow::builder()
@@ -157,9 +146,7 @@ fn load_images(
.filter_map(Result::ok) .filter_map(Result::ok)
{ {
let path = entry.path().to_path_buf(); let path = entry.path().to_path_buf();
if path.file_name().is_some_and(|name| { if path.file_name().is_some_and(|name| name == "preview.jpg") {
name == "preview.jpg" || name == "preview.gif" || name == "preview.png"
}) {
let image = Image::from_file(&path); let image = Image::from_file(&path);
image.set_pixel_size(150); image.set_pixel_size(150);
@@ -168,17 +155,13 @@ fn load_images(
let app_state_clone = app_state.clone(); let app_state_clone = app_state.clone();
button.connect_clicked(move |_| { button.connect_clicked(move |_| {
let command_path = path_clone let command_path = path_clone.to_string_lossy().replace("/preview.jpg", "");
.to_string_lossy()
.replace("/preview.jpg", "")
.replace("/preview.gif", "")
.replace("/preview.png", "");
let mut state = app_state_clone.lock().unwrap(); let mut state = app_state_clone.lock().unwrap();
if let Some(mut child) = state.current_process.take() { if let Some(mut child) = state.current_process.take() {
println!("Terminating previous wallpaper process"); println!("Terminating previous wallpaper process");
let _ = child.kill(); let _ = child.kill();
} }
let command = Command::new("linux-wallpaperengine") let child = Command::new("linux-wallpaperengine")
.arg("--use-angle=GL") .arg("--use-angle=GL")
.arg("--screen-root=DP-2") .arg("--screen-root=DP-2")
.arg("--screen-root=DP-1") .arg("--screen-root=DP-1")
@@ -186,7 +169,8 @@ fn load_images(
.arg("--silent") .arg("--silent")
.arg(&command_path) .arg(&command_path)
.spawn(); .spawn();
match command { //let status = child.wait().expect("Failed to wait on child process");
match child {
Ok(child_process) => { Ok(child_process) => {
println!("Started wallpaper engine with: {}", command_path); println!("Started wallpaper engine with: {}", command_path);
state.current_process = Some(child_process); state.current_process = Some(child_process);