leyoda/cosmic-files
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add nav bar

Browse source
This commit is contained in:
Jeremy Soller 2024-01-09 15:34:48 -07:00
parent 63d8e63304
commit b354a7d9e2
No known key found for this signature in database
GPG key ID: DCFCA852D3906975
3 changed files with 137 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

117
src/main.rs
View file

@ -173,6 +173,7 @@ impl ContextPage {
/// The [`App`] stores application-specific state.
pub struct App {
core: Core,
nav_model: segmented_button::SingleSelectModel,
tab_model: segmented_button::Model<segmented_button::SingleSelect>,
config_handler: Option<cosmic_config::Config>,
config: Config,
@ -308,8 +309,40 @@ impl Application for App {
fn init(core: Core, flags: Self::Flags) -> (Self, Command<Self::Message>) {
let app_themes = vec![fl!("match-desktop"), fl!("dark"), fl!("light")];
let mut nav_model = segmented_button::ModelBuilder::default();
//TODO: Sort by name?
for dir_opt in &[
dirs::home_dir(),
dirs::document_dir(),
dirs::download_dir(),
dirs::audio_dir(),
dirs::picture_dir(),
dirs::video_dir(),
] {
if let Some(dir) = dir_opt {
if let Some(file_name) = dir.file_name().and_then(|x| x.to_str()) {
nav_model = nav_model.insert(move |b| {
b.text(file_name.to_string())
.icon(widget::icon::icon(tab::folder_icon_symbolic(&dir, 16)).size(16))
.data(Location::Path(dir.clone()))
});
}
}
}
nav_model = nav_model.insert(|b| {
b.text(fl!("trash"))
.icon(
//TODO: dynamic empty/full icon
widget::icon::from_name("user-trash-full-symbolic")
.size(16)
.icon(),
)
.data(Location::Trash)
});
let mut app = App {
core,
nav_model: nav_model.build(),
tab_model: segmented_button::ModelBuilder::default().build(),
config_handler: flags.config_handler,
config: flags.config,
@ -337,6 +370,24 @@ impl Application for App {
(app, Command::batch(commands))
}
fn nav_model(&self) -> Option<&segmented_button::SingleSelectModel> {
Some(&self.nav_model)
}
fn on_nav_select(&mut self, entity: segmented_button::Entity) -> Command<Self::Message> {
let location_opt = self.nav_model.data::<Location>(entity).clone();
if let Some(location) = location_opt {
let message = Message::TabMessage(
self.tab_model.active(),
tab::Message::Location(location.clone()),
);
return self.update(message);
}
Command::none()
}
/// Handle application events here.
fn update(&mut self, message: Self::Message) -> Command<Self::Message> {
match message {
@ -498,6 +549,26 @@ impl Application for App {
fn header_start(&self) -> Vec<Element<Self::Message>> {
let cosmic_theme::Spacing { space_xxs, .. } = self.core().system_theme().cosmic().spacing;
let active = self.tab_model.active();
//TODO: dynamically show items
vec![row![
widget::button(widget::icon::from_name("list-add-symbolic").size(16).icon())
.on_press(Message::TabNew)
.padding(space_xxs)
.style(style::Button::Icon),
widget::button(widget::icon::from_name("go-up-symbolic").size(16).icon())
.on_press(Message::TabMessage(active, tab::Message::Parent))
.padding(space_xxs)
.style(style::Button::Icon),
]
.align_items(Alignment::Center)
.into()]
}
fn header_end(&self) -> Vec<Element<Self::Message>> {
let cosmic_theme::Spacing { space_xxs, .. } = self.core().system_theme().cosmic().spacing;
let active = self.tab_model.active();
let current_view = if let Some(tab) = self.tab_model.data::<Tab>(active) {
tab.view
@ -509,52 +580,24 @@ impl Application for App {
tab::View::List => (tab::View::Grid, "view-grid-symbolic"),
};
//TODO: use nav bar instead, dynamically show items
vec![row![
widget::button(widget::icon::from_name("list-add-symbolic").size(16).icon())
.on_press(Message::TabNew)
.padding(space_xxs)
.style(style::Button::Icon),
widget::button(widget::icon::from_name("go-home-symbolic").size(16).icon())
.on_press(Message::TabMessage(active, tab::Message::Home))
.padding(space_xxs)
.style(style::Button::Icon),
widget::button(widget::icon::from_name("go-up-symbolic").size(16).icon())
.on_press(Message::TabMessage(active, tab::Message::Parent))
.padding(space_xxs)
.style(style::Button::Icon),
widget::button(
widget::icon::from_name("user-trash-full-symbolic")
.size(16)
.icon()
)
.on_press(Message::TabMessage(active, tab::Message::Trash))
.padding(space_xxs)
.style(style::Button::Icon),
widget::button(widget::icon::from_name(view_icon).size(16).icon())
.on_press(Message::TabMessage(active, tab::Message::View(view)))
.padding(space_xxs)
.style(style::Button::Icon)
.style(style::Button::Icon),
widget::button(
widget::icon::from_name("preferences-system-symbolic")
.size(16)
.icon()
)
.on_press(Message::ToggleContextPage(ContextPage::Settings))
.padding(space_xxs)
.style(style::Button::Icon)
]
.align_items(Alignment::Center)
.into()]
}
fn header_end(&self) -> Vec<Element<Self::Message>> {
let cosmic_theme::Spacing { space_xxs, .. } = self.core().system_theme().cosmic().spacing;
vec![row![widget::button(
widget::icon::from_name("preferences-system-symbolic")
.size(16)
.icon()
)
.on_press(Message::ToggleContextPage(ContextPage::Settings))
.padding(space_xxs)
.style(style::Button::Icon)]
.align_items(Alignment::Center)
.into()]
}
/// Creates a view after each update.
fn view(&self) -> Element<Self::Message> {
let cosmic_theme::Spacing { space_xxs, .. } = self.core().system_theme().cosmic().spacing;

36
src/tab.rs
View file

@ -86,12 +86,21 @@ fn button_style(selected: bool) -> theme::Button {
}
}
fn folder_icon(path: &PathBuf, icon_size: u16) -> widget::icon::Handle {
pub fn folder_icon(path: &PathBuf, icon_size: u16) -> widget::icon::Handle {
widget::icon::from_name(SPECIAL_DIRS.get(path).map_or("folder", |x| *x))
.size(icon_size)
.handle()
}
pub fn folder_icon_symbolic(path: &PathBuf, icon_size: u16) -> widget::icon::Handle {
widget::icon::from_name(format!(
"{}-symbolic",
SPECIAL_DIRS.get(path).map_or("folder", |x| *x)
))
.size(icon_size)
.handle()
}
//TODO: translate, add more levels?
fn format_size(size: u64) -> String {
const KIB: u64 = 1024;
@ -337,12 +346,11 @@ impl Location {
}
}
#[derive(Clone, Copy, Debug)]
#[derive(Clone, Debug)]
pub enum Message {
Click(Option<usize>),
Home,
Location(Location),
Parent,
Trash,
View(View),
}
@ -431,7 +439,7 @@ impl Item {
));
}
}
ItemMetadata::Trash(metadata) => {
ItemMetadata::Trash(_metadata) => {
//TODO: trash metadata
}
}
@ -525,8 +533,8 @@ impl Tab {
}
self.context_menu = None;
}
Message::Home => {
cd = Some(Location::Path(crate::home_dir()));
Message::Location(location) => {
cd = Some(location);
}
Message::Parent => {
if let Location::Path(path) = &self.location {
@ -535,9 +543,6 @@ impl Tab {
}
}
}
Message::Trash => {
cd = Some(Location::Trash);
}
Message::View(view) => {
self.view = view;
}
@ -676,13 +681,12 @@ impl Tab {
format_size(metadata.len())
}
}
ItemMetadata::Trash(metadata) => {
if metadata.is_dir {
format!("{} items", metadata.size)
} else {
format_size(metadata.size)
ItemMetadata::Trash(metadata) => match metadata.size {
trash::TrashItemSize::Entries(entries) => {
format!("{} items", entries)
}
}
trash::TrashItemSize::Bytes(bytes) => format_size(bytes),
},
})
.into(),
// Hack to make room for scroll bar