feat: about section
- users can now specify information about their app and render it.
This commit is contained in:
parent
127ce17b85
commit
183005da53
5 changed files with 154 additions and 3 deletions
|
|
@ -97,6 +97,7 @@ image = { version = "0.25.1", optional = true }
|
||||||
lazy_static = "1.4.0"
|
lazy_static = "1.4.0"
|
||||||
libc = { version = "0.2.155", optional = true }
|
libc = { version = "0.2.155", optional = true }
|
||||||
mime = { version = "0.3.17", optional = true }
|
mime = { version = "0.3.17", optional = true }
|
||||||
|
open = "5.3.0"
|
||||||
palette = "0.7.3"
|
palette = "0.7.3"
|
||||||
rfd = { version = "0.14.0", optional = true }
|
rfd = { version = "0.14.0", optional = true }
|
||||||
rustix = { version = "0.38.34", features = [
|
rustix = { version = "0.38.34", features = [
|
||||||
|
|
|
||||||
|
|
@ -78,6 +78,7 @@ pub enum Message {
|
||||||
/// Tracks updates to window suggested size.
|
/// Tracks updates to window suggested size.
|
||||||
#[cfg(feature = "applet")]
|
#[cfg(feature = "applet")]
|
||||||
SuggestedBounds(Option<iced::Size>),
|
SuggestedBounds(Option<iced::Size>),
|
||||||
|
OpenUrl(String),
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Default)]
|
#[derive(Default)]
|
||||||
|
|
@ -661,6 +662,10 @@ impl<T: Application> Cosmic<T> {
|
||||||
let core = self.app.core_mut();
|
let core = self.app.core_mut();
|
||||||
core.applet.suggested_bounds = b;
|
core.applet.suggested_bounds = b;
|
||||||
}
|
}
|
||||||
|
Message::OpenUrl(url) => match open::that_detached(url) {
|
||||||
|
Ok(_) => (),
|
||||||
|
Err(err) => tracing::error!("{err}"),
|
||||||
|
},
|
||||||
_ => {}
|
_ => {}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
106
src/app/mod.rs
106
src/app/mod.rs
|
|
@ -52,13 +52,13 @@ use std::borrow::Cow;
|
||||||
pub use self::command::Task;
|
pub use self::command::Task;
|
||||||
pub use self::core::Core;
|
pub use self::core::Core;
|
||||||
pub use self::settings::Settings;
|
pub use self::settings::Settings;
|
||||||
use crate::prelude::*;
|
|
||||||
use crate::theme::THEME;
|
use crate::theme::THEME;
|
||||||
use crate::widget::{
|
use crate::widget::{
|
||||||
container, context_drawer, horizontal_space, id_container, menu, nav_bar, popover,
|
container, context_drawer, horizontal_space, id_container, menu, nav_bar, popover,
|
||||||
};
|
};
|
||||||
|
use crate::{prelude::*, widget};
|
||||||
use apply::Apply;
|
use apply::Apply;
|
||||||
use iced::window;
|
use iced::{window, Alignment};
|
||||||
use iced::{Length, Subscription};
|
use iced::{Length, Subscription};
|
||||||
pub use message::Message;
|
pub use message::Message;
|
||||||
use url::Url;
|
use url::Url;
|
||||||
|
|
@ -67,10 +67,14 @@ use {
|
||||||
iced_futures::futures::channel::mpsc::{Receiver, Sender},
|
iced_futures::futures::channel::mpsc::{Receiver, Sender},
|
||||||
iced_futures::futures::SinkExt,
|
iced_futures::futures::SinkExt,
|
||||||
std::any::TypeId,
|
std::any::TypeId,
|
||||||
std::collections::HashMap,
|
|
||||||
zbus::{interface, proxy, zvariant::Value},
|
zbus::{interface, proxy, zvariant::Value},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#[cfg(feature = "desktop")]
|
||||||
|
use crate::widget::About;
|
||||||
|
#[cfg(any(feature = "single-instance", feature = "desktop"))]
|
||||||
|
use std::collections::HashMap;
|
||||||
|
|
||||||
pub(crate) fn iced_settings<App: Application>(
|
pub(crate) fn iced_settings<App: Application>(
|
||||||
settings: Settings,
|
settings: Settings,
|
||||||
flags: App::Flags,
|
flags: App::Flags,
|
||||||
|
|
@ -591,6 +595,102 @@ where
|
||||||
panic!("no view for window {id:?}");
|
panic!("no view for window {id:?}");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(feature = "desktop")]
|
||||||
|
/// Provides information about the application.
|
||||||
|
fn about(&self) -> Option<About> {
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
|
fn about_view(&self) -> Element<crate::app::cosmic::Message> {
|
||||||
|
if let Some(about) = self.about() {
|
||||||
|
let spacing = crate::theme::active().cosmic().spacing;
|
||||||
|
|
||||||
|
let application_name = about.application_name.map(widget::text::title3);
|
||||||
|
let application_icon = about
|
||||||
|
.application_icon
|
||||||
|
.map(|icon| crate::desktop::IconSource::Name(icon).as_cosmic_icon());
|
||||||
|
|
||||||
|
let mut links: HashMap<String, String> = HashMap::new();
|
||||||
|
|
||||||
|
if let Some(website) = about.website {
|
||||||
|
links.insert("Website".into(), website);
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Some(repository_url) = about.repository_url {
|
||||||
|
links.insert("Repository".into(), repository_url);
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Some(support_url) = about.support_url {
|
||||||
|
links.insert("Support".into(), support_url);
|
||||||
|
}
|
||||||
|
|
||||||
|
let links_section = self.maintainer_section(links, "Links");
|
||||||
|
let developers_section = self.maintainer_section(about.developers, "Developers");
|
||||||
|
let designers_section = self.maintainer_section(about.designers, "Designers");
|
||||||
|
let artists_section = self.maintainer_section(about.artists, "Artists");
|
||||||
|
let translators_section = self.maintainer_section(about.translators, "Translators");
|
||||||
|
let documenters_section = self.maintainer_section(about.documenters, "Documenters");
|
||||||
|
|
||||||
|
let developer_name = about.developer_name.map(widget::text);
|
||||||
|
let version = about.version.map(widget::button::standard);
|
||||||
|
let license = about.license_type.map(widget::button::standard);
|
||||||
|
let copyright = about.copyright.map(widget::text::body);
|
||||||
|
let comments = about.comments.map(widget::text::body);
|
||||||
|
|
||||||
|
widget::column()
|
||||||
|
.push_maybe(application_icon)
|
||||||
|
.push_maybe(application_name)
|
||||||
|
.push_maybe(developer_name)
|
||||||
|
.push(
|
||||||
|
widget::row()
|
||||||
|
.push_maybe(version)
|
||||||
|
.push_maybe(license)
|
||||||
|
.spacing(spacing.space_xxs),
|
||||||
|
)
|
||||||
|
.push_maybe(links_section)
|
||||||
|
.push_maybe(developers_section)
|
||||||
|
.push_maybe(designers_section)
|
||||||
|
.push_maybe(artists_section)
|
||||||
|
.push_maybe(translators_section)
|
||||||
|
.push_maybe(documenters_section)
|
||||||
|
.push_maybe(comments)
|
||||||
|
.push_maybe(copyright)
|
||||||
|
.align_x(Alignment::Center)
|
||||||
|
.spacing(spacing.space_xxs)
|
||||||
|
.width(Length::Fill)
|
||||||
|
.into()
|
||||||
|
} else {
|
||||||
|
crate::widget::text("Test").into()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn maintainer_section<'a>(
|
||||||
|
&'a self,
|
||||||
|
list: HashMap<String, String>,
|
||||||
|
title: &'a str,
|
||||||
|
) -> Option<widget::settings::Section<'a, crate::app::cosmic::Message>> {
|
||||||
|
let developers_section = if list.is_empty() {
|
||||||
|
None
|
||||||
|
} else {
|
||||||
|
let developers: Vec<Element<crate::app::cosmic::Message>> = list
|
||||||
|
.into_iter()
|
||||||
|
.map(|(name, email)| {
|
||||||
|
widget::button::link(name)
|
||||||
|
.on_press(crate::app::cosmic::Message::OpenUrl(format!(
|
||||||
|
"mailto:{email}"
|
||||||
|
)))
|
||||||
|
.into()
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
let mut developers_section = widget::settings::section().title(title);
|
||||||
|
for developer in developers {
|
||||||
|
developers_section = developers_section.add(developer);
|
||||||
|
}
|
||||||
|
Some(developers_section)
|
||||||
|
};
|
||||||
|
developers_section
|
||||||
|
}
|
||||||
|
|
||||||
/// Overrides the default style for applications
|
/// Overrides the default style for applications
|
||||||
fn style(&self) -> Option<iced_runtime::Appearance> {
|
fn style(&self) -> Option<iced_runtime::Appearance> {
|
||||||
None
|
None
|
||||||
|
|
|
||||||
42
src/widget/about.rs
Normal file
42
src/widget/about.rs
Normal file
|
|
@ -0,0 +1,42 @@
|
||||||
|
use crate::{widget, Element};
|
||||||
|
|
||||||
|
#[cfg(feature = "desktop")]
|
||||||
|
use std::collections::HashMap;
|
||||||
|
|
||||||
|
#[cfg(feature = "desktop")]
|
||||||
|
#[derive(Debug, Default, Clone, derive_setters::Setters)]
|
||||||
|
#[setters(prefix = "set_", into, strip_option)]
|
||||||
|
pub struct About {
|
||||||
|
/// The application's name.
|
||||||
|
pub application_name: Option<String>,
|
||||||
|
/// The application's icon name.
|
||||||
|
pub application_icon: Option<String>,
|
||||||
|
/// Artists who contributed to the application.
|
||||||
|
pub artists: HashMap<String, String>,
|
||||||
|
/// Comments about the application.
|
||||||
|
pub comments: Option<String>,
|
||||||
|
/// The application's copyright.
|
||||||
|
pub copyright: Option<String>,
|
||||||
|
/// Designers who contributed to the application.
|
||||||
|
pub designers: HashMap<String, String>,
|
||||||
|
/// Name of the application's developer.
|
||||||
|
pub developer_name: Option<String>,
|
||||||
|
/// Developers who contributed to the application.
|
||||||
|
pub developers: HashMap<String, String>,
|
||||||
|
/// Documenters who contributed to the application.
|
||||||
|
pub documenters: HashMap<String, String>,
|
||||||
|
/// The license text.
|
||||||
|
pub license: Option<String>,
|
||||||
|
/// The license from a list of known licenses.
|
||||||
|
pub license_type: Option<String>,
|
||||||
|
/// The URL of the application’s support page.
|
||||||
|
pub support_url: Option<String>,
|
||||||
|
/// The URL of the application’s repository.
|
||||||
|
pub repository_url: Option<String>,
|
||||||
|
/// Translators who contributed to the application.
|
||||||
|
pub translators: HashMap<String, String>,
|
||||||
|
/// The application’s version.
|
||||||
|
pub version: Option<String>,
|
||||||
|
/// The application’s website.
|
||||||
|
pub website: Option<String>,
|
||||||
|
}
|
||||||
|
|
@ -361,3 +361,6 @@ pub mod tooltip {
|
||||||
pub mod warning;
|
pub mod warning;
|
||||||
#[doc(inline)]
|
#[doc(inline)]
|
||||||
pub use warning::*;
|
pub use warning::*;
|
||||||
|
|
||||||
|
pub mod about;
|
||||||
|
pub use about::*;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue