From 7adbcaa2d9466d17de57b1a503a8163e8d2d1ec3 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Sat, 7 Sep 2024 11:44:57 +0300 Subject: [PATCH] make sure commit isn't sensitive if there's nothing --- Makefile | 17 ++++++++++++++++- src/bin/gui/apt_update_page/mod.rs | 2 ++ src/bin/gui/flatpak_update_page/mod.rs | 2 ++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 39968ce..1652e1a 100644 --- a/Makefile +++ b/Makefile @@ -17,5 +17,20 @@ install: cp -vf data/*.gschema.xml $(DESTDIR)/usr/share/glib-2.0/schemas/ #cp -vf data/com.github.pikaos-linux.pikagnomelayouts.desktop $(DESTDIR)/usr/share/applications/ #cp -vfr data/polkit-1 $(DESTDIR)/usr/share/ - chmod 755 $(DESTDIR)/usr/bin/pika-pikman-update-manager + chmod 755 $(DESTDIR)/usr/bin/pika/pikman-update-manager + chmod 755 $(DESTDIR)/usr/lib/pika/pikman-update-manager/scripts/* + +install_no_build_debug: + mkdir -p $(DESTDIR)/usr/bin/ + mkdir -p $(DESTDIR)/usr/lib/pika/pikman-update-manager/scripts/ + mkdir -p $(DESTDIR)/usr/share/glib-2.0/schemas/ + mkdir -p $(DESTDIR)/usr/share/applications + mkdir -p $(DESTDIR)/usr/share/icons/hicolor/scalable/apps + cp -vf target/debug/pikman-update-manager $(DESTDIR)/usr/bin/ + cp -vf target/debug/apt_update $(DESTDIR)/usr/lib/pika/pikman-update-manager/scripts/ + cp -vf target/debug/apt_full_upgrade $(DESTDIR)/usr/lib/pika/pikman-update-manager/scripts/ + cp -vf data/*.gschema.xml $(DESTDIR)/usr/share/glib-2.0/schemas/ + #cp -vf data/com.github.pikaos-linux.pikagnomelayouts.desktop $(DESTDIR)/usr/share/applications/ + #cp -vfr data/polkit-1 $(DESTDIR)/usr/share/ + chmod 755 $(DESTDIR)/usr/bin/pikman-update-manager chmod 755 $(DESTDIR)/usr/lib/pika/pikman-update-manager/scripts/* \ No newline at end of file diff --git a/src/bin/gui/apt_update_page/mod.rs b/src/bin/gui/apt_update_page/mod.rs index b1ec2bb..7d358b7 100644 --- a/src/bin/gui/apt_update_page/mod.rs +++ b/src/bin/gui/apt_update_page/mod.rs @@ -209,6 +209,7 @@ pub fn apt_update_page( .halign(Align::End) .valign(Align::Center) .hexpand(false) + .sensitive(false) .margin_start(10) .margin_end(30) .margin_bottom(15) @@ -355,6 +356,7 @@ pub fn apt_update_page( async move { while let Ok(state) = get_upgradable_receiver.recv().await { viewport_bin.set_child(Some(&packages_viewport)); + update_button.set_sensitive(true); let apt_row = AptPackageRow::new(state.clone()); apt_row.connect_closure( "checkbutton-toggled", diff --git a/src/bin/gui/flatpak_update_page/mod.rs b/src/bin/gui/flatpak_update_page/mod.rs index e34e430..1f30102 100644 --- a/src/bin/gui/flatpak_update_page/mod.rs +++ b/src/bin/gui/flatpak_update_page/mod.rs @@ -275,6 +275,7 @@ pub fn flatpak_update_page( let update_button = Button::builder() .halign(Align::End) .valign(Align::Center) + .sensitive(false) .hexpand(false) .margin_start(10) .margin_end(30) @@ -376,6 +377,7 @@ pub fn flatpak_update_page( let mut user_last_triggered = false; // if !flatpak_system_updates.is_empty() || !flatpak_user_updates.is_empty() { + update_button.set_sensitive(true); viewport_bin.set_child(Some(&packages_viewport)); } //