From e7a2e255fc667fbc5d4a02172f067bcf00e0a734 Mon Sep 17 00:00:00 2001 From: Jacob L <52282566+lawson85@users.noreply.github.com> Date: Mon, 6 Apr 2026 23:53:04 +0100 Subject: [PATCH 01/11] Added ability to copy package names Double click them and use CTRL+C to copy Ran cargo fmt --- src/gui/views/list.rs | 6 ++++-- src/gui/widgets/package_row.rs | 11 +++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/gui/views/list.rs b/src/gui/views/list.rs index 3402fc70..b263c3b6 100644 --- a/src/gui/views/list.rs +++ b/src/gui/views/list.rs @@ -7,11 +7,12 @@ use crate::core::uad_lists::{ }; use crate::core::utils::{EXPORT_FILE_NAME, NAME, export_selection, fetch_packages, open_url}; use crate::gui::style; +use crate::gui::views::settings::Settings; +use crate::gui::widgets::modal::Modal; use crate::gui::widgets::navigation_menu::ICONS; +use crate::gui::widgets::package_row::Message as PackageRowMessage; use std::path::PathBuf; -use crate::gui::views::settings::Settings; -use crate::gui::widgets::modal::Modal; use crate::gui::widgets::package_row::{Message as RowMessage, PackageRow}; use crate::gui::widgets::text; use iced::widget::scrollable::{Direction, Scrollbar}; @@ -952,6 +953,7 @@ impl List { let package = &mut self.phone_packages[i_user][i_package]; match *row_message { + PackageRowMessage::Noop => Task::none(), RowMessage::ToggleSelection(toggle) => { if package.removal == Removal::Unsafe && !settings.general.expert_mode { package.selected = false; diff --git a/src/gui/widgets/package_row.rs b/src/gui/widgets/package_row.rs index 7d43bb28..e9218c2b 100644 --- a/src/gui/widgets/package_row.rs +++ b/src/gui/widgets/package_row.rs @@ -4,7 +4,7 @@ use crate::core::uad_lists::{PackageState, Removal, UadList}; use crate::gui::style; use crate::gui::views::settings::Settings; use crate::gui::widgets::text; - +use iced::widget::text_input; use iced::widget::{Space, button, checkbox, row}; use iced::{Alignment, Element, Length, Renderer, Task, alignment}; @@ -24,6 +24,7 @@ pub enum Message { PackagePressed, ActionPressed, ToggleSelection(bool), + Noop, } impl PackageRow { @@ -123,7 +124,13 @@ impl PackageRow { button( row![ selection_checkbox, - text(&self.name).width(Length::FillPortion(8)), + // + text_input("", &self.name) + .on_input(|_| Message::Noop) + .padding(0) + .size(14) + .width(Length::FillPortion(8)), + // action_btn.style(button_style) ] .spacing(8) From a264a540529b258ca57ea77325b60b30ad1f024e Mon Sep 17 00:00:00 2001 From: Jacob L <52282566+lawson85@users.noreply.github.com> Date: Tue, 7 Apr 2026 00:09:33 +0100 Subject: [PATCH 02/11] Update package_row.rs --- src/gui/widgets/package_row.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/gui/widgets/package_row.rs b/src/gui/widgets/package_row.rs index e9218c2b..dbb1e7cc 100644 --- a/src/gui/widgets/package_row.rs +++ b/src/gui/widgets/package_row.rs @@ -124,13 +124,10 @@ impl PackageRow { button( row![ selection_checkbox, - // text_input("", &self.name) .on_input(|_| Message::Noop) .padding(0) - .size(14) - .width(Length::FillPortion(8)), - // + .size(16), action_btn.style(button_style) ] .spacing(8) From a07a7857819536855eeb68f28a611d8c931c1e82 Mon Sep 17 00:00:00 2001 From: Jacob L <52282566+lawson85@users.noreply.github.com> Date: Tue, 7 Apr 2026 00:15:14 +0100 Subject: [PATCH 03/11] Cleanup --- src/gui/views/list.rs | 2 +- src/gui/widgets/package_row.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/views/list.rs b/src/gui/views/list.rs index b263c3b6..1877c658 100644 --- a/src/gui/views/list.rs +++ b/src/gui/views/list.rs @@ -975,7 +975,7 @@ impl List { } if !toggle { self.selected_packages.retain(|&x| x.1 != i_package); - } + }// } else { package.selected = toggle; if toggle { diff --git a/src/gui/widgets/package_row.rs b/src/gui/widgets/package_row.rs index dbb1e7cc..db686139 100644 --- a/src/gui/widgets/package_row.rs +++ b/src/gui/widgets/package_row.rs @@ -129,7 +129,7 @@ impl PackageRow { .padding(0) .size(16), action_btn.style(button_style) - ] + ]// .spacing(8) .align_y(Alignment::Center) ) From 6654f2042e69c4fb7da8a88f75c1c854fcb15b03 Mon Sep 17 00:00:00 2001 From: Jacob L <52282566+lawson85@users.noreply.github.com> Date: Tue, 7 Apr 2026 00:15:59 +0100 Subject: [PATCH 04/11] Cargo fmt --- src/gui/views/list.rs | 2 +- src/gui/widgets/package_row.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/views/list.rs b/src/gui/views/list.rs index 1877c658..b263c3b6 100644 --- a/src/gui/views/list.rs +++ b/src/gui/views/list.rs @@ -975,7 +975,7 @@ impl List { } if !toggle { self.selected_packages.retain(|&x| x.1 != i_package); - }// + } } else { package.selected = toggle; if toggle { diff --git a/src/gui/widgets/package_row.rs b/src/gui/widgets/package_row.rs index db686139..dbb1e7cc 100644 --- a/src/gui/widgets/package_row.rs +++ b/src/gui/widgets/package_row.rs @@ -129,7 +129,7 @@ impl PackageRow { .padding(0) .size(16), action_btn.style(button_style) - ]// + ] .spacing(8) .align_y(Alignment::Center) ) From 56e245e5b950cfe93fcaf40e9b9f27467986b2aa Mon Sep 17 00:00:00 2001 From: Jacob L <52282566+lawson85@users.noreply.github.com> Date: Tue, 7 Apr 2026 10:36:25 +0100 Subject: [PATCH 05/11] Comment --- src/gui/views/list.rs | 7 +++---- src/gui/widgets/package_row.rs | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/views/list.rs b/src/gui/views/list.rs index b263c3b6..e1051def 100644 --- a/src/gui/views/list.rs +++ b/src/gui/views/list.rs @@ -342,10 +342,9 @@ impl List { .height(Length::FillPortion(6)) .style(style::Scrollable::Packages); - let description_scroll = - scrollable(text_editor(&self.description_content).on_action(Message::DescriptionEdit)) - .style(style::Scrollable::Description); - +let description_scroll = + scrollable(text(&self.description_content).selectable(true)) + .style(style::Scrollable::Description); let description_panel = container(description_scroll) .padding(6) .height(Length::FillPortion(2)) diff --git a/src/gui/widgets/package_row.rs b/src/gui/widgets/package_row.rs index dbb1e7cc..f4de3025 100644 --- a/src/gui/widgets/package_row.rs +++ b/src/gui/widgets/package_row.rs @@ -124,6 +124,7 @@ impl PackageRow { button( row![ selection_checkbox, + // Allows the packagename text to be copyable text_input("", &self.name) .on_input(|_| Message::Noop) .padding(0) From 0092b4ff2e69ae9db2e81c1e5e63f4309f878553 Mon Sep 17 00:00:00 2001 From: Jacob L <52282566+lawson85@users.noreply.github.com> Date: Tue, 7 Apr 2026 10:37:07 +0100 Subject: [PATCH 06/11] Cargo fmt --- src/gui/views/list.rs | 5 ++--- src/gui/widgets/package_row.rs | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/gui/views/list.rs b/src/gui/views/list.rs index e1051def..fad467f4 100644 --- a/src/gui/views/list.rs +++ b/src/gui/views/list.rs @@ -342,9 +342,8 @@ impl List { .height(Length::FillPortion(6)) .style(style::Scrollable::Packages); -let description_scroll = - scrollable(text(&self.description_content).selectable(true)) - .style(style::Scrollable::Description); + let description_scroll = scrollable(text(&self.description_content).selectable(true)) + .style(style::Scrollable::Description); let description_panel = container(description_scroll) .padding(6) .height(Length::FillPortion(2)) diff --git a/src/gui/widgets/package_row.rs b/src/gui/widgets/package_row.rs index f4de3025..ea0c767f 100644 --- a/src/gui/widgets/package_row.rs +++ b/src/gui/widgets/package_row.rs @@ -124,7 +124,7 @@ impl PackageRow { button( row![ selection_checkbox, - // Allows the packagename text to be copyable + // Allows the packagename text to be copyable text_input("", &self.name) .on_input(|_| Message::Noop) .padding(0) From 7202a4d66b0fd6afe049c7fb44b2c6d7f7eb663a Mon Sep 17 00:00:00 2001 From: Jacob L <52282566+lawson85@users.noreply.github.com> Date: Tue, 7 Apr 2026 10:58:12 +0100 Subject: [PATCH 07/11] Cargo fmt --- src/gui/views/list.rs | 4 ++-- src/gui/widgets/package_row.rs | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/gui/views/list.rs b/src/gui/views/list.rs index fad467f4..1f6b4e40 100644 --- a/src/gui/views/list.rs +++ b/src/gui/views/list.rs @@ -342,8 +342,8 @@ impl List { .height(Length::FillPortion(6)) .style(style::Scrollable::Packages); - let description_scroll = scrollable(text(&self.description_content).selectable(true)) - .style(style::Scrollable::Description); + let description_scroll = + scrollable(text(self.description_content.text())).style(style::Scrollable::Description); let description_panel = container(description_scroll) .padding(6) .height(Length::FillPortion(2)) diff --git a/src/gui/widgets/package_row.rs b/src/gui/widgets/package_row.rs index ea0c767f..6b9d54e9 100644 --- a/src/gui/widgets/package_row.rs +++ b/src/gui/widgets/package_row.rs @@ -128,7 +128,9 @@ impl PackageRow { text_input("", &self.name) .on_input(|_| Message::Noop) .padding(0) - .size(16), + .size(14) + .width(Length::FillPortion(8)), + // action_btn.style(button_style) ] .spacing(8) From c65f46beba72058e60fae89a96338d9c81170c27 Mon Sep 17 00:00:00 2001 From: Jacob L <52282566+lawson85@users.noreply.github.com> Date: Tue, 7 Apr 2026 11:16:53 +0100 Subject: [PATCH 08/11] Restore some changes that broke things --- src/gui/views/list.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gui/views/list.rs b/src/gui/views/list.rs index 1f6b4e40..1c8d666c 100644 --- a/src/gui/views/list.rs +++ b/src/gui/views/list.rs @@ -343,7 +343,9 @@ impl List { .style(style::Scrollable::Packages); let description_scroll = - scrollable(text(self.description_content.text())).style(style::Scrollable::Description); + scrollable(text_editor(&self.description_content).on_action(Message::DescriptionEdit)) + .style(style::Scrollable::Description); + let description_panel = container(description_scroll) .padding(6) .height(Length::FillPortion(2)) @@ -1569,3 +1571,4 @@ fn recap<'a>(settings: &Settings, recap: &SummaryEntry) -> Element<'a, Message, .style(style::Container::Frame) .into() } + From f84ae546e7b365cfedc33a48b1c63f9862af26c7 Mon Sep 17 00:00:00 2001 From: Jacob L <52282566+lawson85@users.noreply.github.com> Date: Tue, 7 Apr 2026 11:18:59 +0100 Subject: [PATCH 09/11] Cargo fmt --- src/gui/views/list.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/gui/views/list.rs b/src/gui/views/list.rs index 1c8d666c..b263c3b6 100644 --- a/src/gui/views/list.rs +++ b/src/gui/views/list.rs @@ -1571,4 +1571,3 @@ fn recap<'a>(settings: &Settings, recap: &SummaryEntry) -> Element<'a, Message, .style(style::Container::Frame) .into() } - From c3d8ddb1085e17d8287cf68e27698286a88f5ac0 Mon Sep 17 00:00:00 2001 From: Jacob L <52282566+lawson85@users.noreply.github.com> Date: Tue, 7 Apr 2026 11:20:44 +0100 Subject: [PATCH 10/11] deleted // and cargo fmt --- src/gui/widgets/package_row.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/gui/widgets/package_row.rs b/src/gui/widgets/package_row.rs index 6b9d54e9..7a55bde1 100644 --- a/src/gui/widgets/package_row.rs +++ b/src/gui/widgets/package_row.rs @@ -130,7 +130,6 @@ impl PackageRow { .padding(0) .size(14) .width(Length::FillPortion(8)), - // action_btn.style(button_style) ] .spacing(8) From 7ff19e71572a196947b95787e5af3e930272422b Mon Sep 17 00:00:00 2001 From: Jacob L <52282566+lawson85@users.noreply.github.com> Date: Tue, 7 Apr 2026 23:57:27 +0100 Subject: [PATCH 11/11] Update src/gui/widgets/package_row.rs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- src/gui/widgets/package_row.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/widgets/package_row.rs b/src/gui/widgets/package_row.rs index 7a55bde1..a1a93658 100644 --- a/src/gui/widgets/package_row.rs +++ b/src/gui/widgets/package_row.rs @@ -124,7 +124,7 @@ impl PackageRow { button( row![ selection_checkbox, - // Allows the packagename text to be copyable + // Allows the package name text to be copyable text_input("", &self.name) .on_input(|_| Message::Noop) .padding(0)