nik/liana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #1660: export: add a cross button to the modal

Browse Source 
a50fa04519160169ecae9fb56b047ab76303f712 export: remove stop button from the modal (pythcoiner)
968c36fcf6ec4cbad4fa13e9b05c759c1be05752 export: add a cross button to the modal (pythcoiner)

Pull request description:

  This PR add a cross button to the export modal for consistency w/ other modals.

  ![image](https://github.com/user-attachments/assets/07284af0-31e1-4507-adde-e9aa344ff958)

ACKs for top commit:
  edouardparis:
    utACK a50fa04519160169ecae9fb56b047ab76303f712

Tree-SHA512: afbff780a052d6b34275c62bbb7713e49300680752287a822be187d118560404eea252878120c53fbb1147a9b86f55e0f043f1802660e0bf3cbf2a6dc3062af3
This commit is contained in:
edouardparis 2025-04-18 14:42:36 +02:00
commit 254c5f4a92
No known key found for this signature in database
GPG Key ID: E65F7A089C20DC8F
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
liana-gui/src/app/state/export.rs
View File

@ -232,7 +232,7 @@ impl ExportModal {
pub fn view<'a, M>(&'a self, content: Element<'a, M>) -> Element<M>
where
M: 'a + Close + Clone + From<export::ImportExportMessage>,
M: 'a + Close + Clone + From<export::ImportExportMessage> + 'static,
{
let modal = Modal::new(
content,

35
liana-gui/src/app/view/export.rs
View File

@ -1,5 +1,5 @@
use iced::{
alignment::Horizontal,
alignment::{self, Horizontal},
widget::{progress_bar, Column, Container, Row, Space},
Length,
};
@ -8,6 +8,7 @@ use liana_ui::{
button, card,
text::{h4_bold, text},
},
icon,
widget::Element,
};
@ -15,23 +16,30 @@ use crate::export::ImportExportState;
use crate::export::{Error, ImportExportMessage, ImportExportType};
/// Return the modal view for an export task
pub fn export_modal<'a, Message: From<ImportExportMessage> + Clone + 'a>(
pub fn export_modal<'a, Message: From<ImportExportMessage> + Clone + 'static>(
state: &ImportExportState,
error: Option<&'a Error>,
title: &str,
import_export_type: &ImportExportType,
) -> Element<'a, Message> {
let cancel_close = match state {
let cancel = match state {
ImportExportState::Started | ImportExportState::Progress(_) => {
Some(button::secondary(None, "Cancel").on_press(ImportExportMessage::UserStop.into()))
}
ImportExportState::Ended | ImportExportState::TimedOut | ImportExportState::Aborted => {
Some(button::secondary(None, "Close").on_press(ImportExportMessage::Close.into()))
}
_ => None,
}
.map(Container::new);
let cross = match state {
ImportExportState::Ended | ImportExportState::TimedOut | ImportExportState::Aborted => {
Some(
button::transparent(Some(icon::cross_icon().size(30)), "")
.on_press(ImportExportMessage::Close.into()),
)
}
_ => None,
};
let msg = if let Some(error) = error {
format!("{}", error)
} else {
@ -82,9 +90,9 @@ pub fn export_modal<'a, Message: From<ImportExportMessage> + Clone + 'a>(
(Some(_), _) => labels_btn,
(_, Some(_)) => aliases_btn,
_ => (msg, cancel_close),
_ => (msg, cancel),
},
_ => (msg, cancel_close),
_ => (msg, cancel),
};
let button = button.map(|b| {
Container::new(b)
@ -114,7 +122,14 @@ pub fn export_modal<'a, Message: From<ImportExportMessage> + Clone + 'a>(
card::simple(
Column::new()
.spacing(10)
.push(Container::new(h4_bold(title)).width(Length::Fill))
.push(
Row::new()
.push(Space::with_width(20))
.push(h4_bold(title))
.push(Space::with_width(Length::Fill))
.push_maybe(cross)
.align_y(alignment::Vertical::Center),
)
.push(Space::with_height(Length::Fill))
.push(progress_bar_row)
.push(Space::with_height(Length::Fill))
@ -124,6 +139,6 @@ pub fn export_modal<'a, Message: From<ImportExportMessage> + Clone + 'a>(
.push(Space::with_height(5)),
)
.width(Length::Fixed(500.0))
.height(Length::Fixed(250.0))
.height(Length::Fixed(300.0))
.into()
}