From 5ad33187785c7c5002dd2e33c4f37048194a0604 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Wed, 27 Nov 2024 19:42:58 +0300 Subject: [PATCH] 2.0.3 --- .github/release-nest-v3 | 2 +- Cargo.lock | 2 +- Cargo.toml | 2 +- debian/changelog | 6 ++++++ locales/en_US.json | 3 ++- main.sh | 2 +- src/drive_mount_row/imp.rs | 14 +++++++++----- src/manual_partitioning_page/func.rs | 2 +- 8 files changed, 22 insertions(+), 11 deletions(-) diff --git a/.github/release-nest-v3 b/.github/release-nest-v3 index 56a6051..d8263ee 100644 --- a/.github/release-nest-v3 +++ b/.github/release-nest-v3 @@ -1 +1 @@ -1 \ No newline at end of file +2 \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index 24cebc2..fc833f3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1323,7 +1323,7 @@ dependencies = [ [[package]] name = "pika-installer-gtk4" -version = "2.0.1" +version = "2.0.3" dependencies = [ "async-channel", "chrono", diff --git a/Cargo.toml b/Cargo.toml index bfe792c..70953c9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pika-installer-gtk4" -version = "2.0.1" +version = "2.0.3" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/debian/changelog b/debian/changelog index f9ca461..60b2007 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pika-installer-gtk4 (2.0.3-101pika1) pika; urgency=low + + * Refine UI Again + + -- Ward Nakchbandi Thu, 20 Sep 2022 22:01:00 +0000 + pika-installer-gtk4 (2.0.2-101pika2) pika; urgency=low * Refine UI Moar diff --git a/locales/en_US.json b/locales/en_US.json index ce870f2..17f4306 100644 --- a/locales/en_US.json +++ b/locales/en_US.json @@ -144,5 +144,6 @@ "drive_mount_row_title_custom": "Custom User Filesystem Entry (ID: {ID})", "drive_mount_row_subtitle_custom": "A Custom Filesystem Entry Added by You", "manual_partitioning_help_dialog_label": "OK", - "manual_partitioning_help_button_label": "Need Help?" + "manual_partitioning_help_button_label": "Need Help?", + "partition_row_delete_button_label": "Delete Filesystem Entry" } diff --git a/main.sh b/main.sh index 963c64a..71337eb 100755 --- a/main.sh +++ b/main.sh @@ -2,7 +2,7 @@ set -e -VERSION="2.0.2" +VERSION="2.0.3" source ./pika-build-config.sh diff --git a/src/drive_mount_row/imp.rs b/src/drive_mount_row/imp.rs index 04d2f7b..07cffd4 100644 --- a/src/drive_mount_row/imp.rs +++ b/src/drive_mount_row/imp.rs @@ -2,7 +2,7 @@ use std::{cell::RefCell, rc::Rc, sync::OnceLock}; use adw::{prelude::*, subclass::prelude::*, *}; use glib::{clone, subclass::Signal, Properties}; -use gtk::{glib}; +use gtk::glib; // ANCHOR: custom_button // Object holding the state @@ -139,12 +139,13 @@ impl ObjectImpl for DriveMountRow { .margin_top(5) .margin_start(5) .margin_end(5) - .halign(gtk::Align::Center) - .valign(gtk::Align::Center) - .icon_name("user-trash") + .halign(gtk::Align::End) + //.valign(gtk::Align::Center) + .label(t!("partition_row_delete_button_label")) .build(); + partition_row_delete_button.add_css_class("destructive-action"); - obj.bind_property("deletable", &partition_row_delete_button, "visible") + obj.bind_property("deletable", &partition_row_delete_button, "sensitive") .sync_create() .bidirectional() .build(); @@ -284,6 +285,8 @@ impl ObjectImpl for DriveMountRow { mountopts_entry_row, #[weak] partition_button_row_dialog, + #[weak] + partition_row_delete_button, #[strong] is_selected, move |_| { @@ -316,6 +319,7 @@ impl ObjectImpl for DriveMountRow { "devices_selection_button_row_dialog_ok", &t!("devices_selection_button_row_dialog_ok_label"), ); + partition_row_delete_button.set_label(&t!("partition_row_delete_button_label")); } )); } diff --git a/src/manual_partitioning_page/func.rs b/src/manual_partitioning_page/func.rs index 3b5ed00..07a5946 100644 --- a/src/manual_partitioning_page/func.rs +++ b/src/manual_partitioning_page/func.rs @@ -3,7 +3,7 @@ use crate::{ config::{MINIMUM_BOOT_BYTE_SIZE, MINIMUM_EFI_BYTE_SIZE, MINIMUM_ROOT_BYTE_SIZE}, drive_mount_row::DriveMountRow, }; -use adw::{prelude::*}; +use adw::prelude::*; use glib::{clone, closure_local}; use gtk::{gio, glib}; use std::{cell::RefCell, rc::Rc};