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

Merge #1314: gui settings: display fingerprint if no alias

Browse Source 
55de4d95a0769bdbf4a63986e56467699026e0db gui settings: display fingerprint if no alias (edouardparis)

Pull request description:

  close #1310

ACKs for top commit:
  edouardparis:
    Self-ACK 55de4d95a0769bdbf4a63986e56467699026e0db

Tree-SHA512: 34bb0cf699f227663395d3822ddf442dc16e960e8cec8f96d44e9e00c20608805dca90b14d4727e0e10d1256a2a7ad66660e31cf8253f1893c0fdd4211f625d3
This commit is contained in:
edouardparis 2024-09-10 16:55:55 +02:00
commit f7aec15f9a
No known key found for this signature in database
GPG Key ID: E65F7A089C20DC8F
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gui/src/app/view/settings.rs
View File

@ -1029,7 +1029,7 @@ fn display_policy(
.fold(Row::new().spacing(5), |row, (i, k)| {
let content = if let Some(alias) = keys_aliases
.iter()
.find(|(fg, _)| fg == k)
.find(|(fg, a)| fg == k && !a.value.is_empty())
.map(|(_, f)| &f.value)
{
Container::new(
@ -1041,9 +1041,7 @@ fn display_policy(
.style(theme::Container::Card(theme::Card::Simple)),
)
} else {
Container::new(text(k.to_string()))
.padding(10)
.style(theme::Container::Pill(theme::Pill::Simple))
Container::new(text(format!("[{}]", k)).bold())
};
if primary_keys.len() == 1 || i == primary_keys.len() - 1 {
row.push(content)
@ -1084,7 +1082,7 @@ fn display_policy(
|row, (i, k)| {
let content = if let Some(alias) = keys_aliases
.iter()
.find(|(fg, _)| fg == k)
.find(|(fg, a)| fg == k && !a.value.is_empty())
.map(|(_, f)| &f.value)
{
Container::new(
@ -1096,9 +1094,7 @@ fn display_policy(
.style(theme::Container::Card(theme::Card::Simple)),
)
} else {
Container::new(text(k.to_string()))
.padding(10)
.style(theme::Container::Pill(theme::Pill::Simple))
Container::new(text(format!("[{}]", k)).bold())
};
if recovery_keys.len() == 1 || i == recovery_keys.len() - 1 {
row.push(content)

8
gui/src/installer/view.rs
View File

@ -1041,9 +1041,7 @@ fn display_policy(
.style(theme::Container::Card(theme::Card::Simple)),
)
} else {
Container::new(text(k.to_string()))
.padding(10)
.style(theme::Container::Pill(theme::Pill::Simple))
Container::new(text(format!("[{}]", k)).bold())
};
if primary_keys.len() == 1 || i == primary_keys.len() - 1 {
row.push(content)
@ -1087,9 +1085,7 @@ fn display_policy(
.style(theme::Container::Card(theme::Card::Simple)),
)
} else {
Container::new(text(k.to_string()))
.padding(10)
.style(theme::Container::Pill(theme::Pill::Simple))
Container::new(text(format!("[{}]", k)).bold())
};
if recovery_keys.len() == 1 || i == recovery_keys.len() - 1 {
row.push(content)