Compare commits

...

3 commits

Author SHA1 Message Date
2925a5b69e update todo
Some checks are pending
/ test (push) Waiting to run
2025-09-30 15:12:07 -05:00
527bc32e23 use 2024 edition of rustfmt 2025-09-30 15:02:57 -05:00
0dc16e5d79 only grab ignored keybinds 2025-09-30 15:02:40 -05:00
3 changed files with 51 additions and 51 deletions

View file

@ -1,3 +1,3 @@
max_width = 70 max_width = 70
# style_edition = "2024" style_edition = "2024"
# version = "Two" # version = "Two"

View file

@ -602,55 +602,55 @@ impl cosmic::Application for App {
match status { match status {
event::Status::Ignored => { event::Status::Ignored => {
match event { match event {
iced::Event::Keyboard(event) => match event { iced::Event::Keyboard(event) => match event {
iced::keyboard::Event::KeyReleased { iced::keyboard::Event::KeyReleased {
key, key,
modifiers, modifiers,
.. ..
} => Some(Message::Key(key, modifiers)), } => Some(Message::Key(key, modifiers)),
iced::keyboard::Event::ModifiersChanged( iced::keyboard::Event::ModifiersChanged(
modifiers, modifiers,
) => Some(Message::ModifiersPressed(modifiers)), ) => Some(Message::ModifiersPressed(modifiers)),
_ => None, _ => None,
}, },
iced::Event::Mouse(_event) => None, iced::Event::Mouse(_event) => None,
iced::Event::Window(window_event) => { iced::Event::Window(window_event) => {
match window_event { match window_event {
window::Event::CloseRequested => { window::Event::CloseRequested => {
debug!("Closing window"); debug!("Closing window");
Some(Message::CloseWindow(Some(id))) Some(Message::CloseWindow(Some(id)))
}
window::Event::Opened { .. } => {
debug!(?window_event, ?id);
Some(Message::WindowOpened(id))
}
window::Event::Closed => {
debug!("Closed window");
Some(Message::WindowClosed(id))
}
window::Event::FileHovered(file) => {
debug!(?file);
None
}
window::Event::FileDropped(file) => {
debug!(?file);
None
}
_ => None,
}
} }
window::Event::Opened { .. } => { iced::Event::Touch(_touch) => None,
debug!(?window_event, ?id); iced::Event::A11y(_id, _action_request) => None,
Some(Message::WindowOpened(id)) iced::Event::Dnd(dnd_event) => {
} debug!(?dnd_event);
window::Event::Closed => {
debug!("Closed window");
Some(Message::WindowClosed(id))
}
window::Event::FileHovered(file) => {
debug!(?file);
None None
} }
window::Event::FileDropped(file) => { iced::Event::PlatformSpecific(_platform_specific) => {
debug!(?file); // debug!(?platform_specific);
None None
} }
_ => None,
} }
} }
iced::Event::Touch(_touch) => None,
iced::Event::A11y(_id, _action_request) => None,
iced::Event::Dnd(dnd_event) => {
debug!(?dnd_event);
None
}
iced::Event::PlatformSpecific(_platform_specific) => {
// debug!(?platform_specific);
None
}
}
}
event::Status::Captured => None, event::Status::Captured => None,
} }
}) })
@ -1631,9 +1631,9 @@ where
modifiers: Modifiers, modifiers: Modifiers,
) -> Task<Message> { ) -> Task<Message> {
// debug!(?key, ?modifiers); // debug!(?key, ?modifiers);
if self.editor_mode.is_some() { // if self.editor_mode.is_some() {
return Task::none(); // return Task::none();
} // }
if self.song_editor.editing() { if self.song_editor.editing() {
return Task::none(); return Task::none();
} }

View file

@ -4,7 +4,7 @@
* TODO Add OBS integration * TODO Add OBS integration
This will be based on each slide having the ability to activate an OBS scene when it is active. This will be based on each slide having the ability to activate an OBS scene when it is active.
* TODO Move text_generation function to be asynchronous so that UI doesn't lock up during song editing. * TODO Move text_generation function to be asynchronous so that UI doesn't lock up during song editing.
* TODO Build a presentation editor * DONE Build a presentation editor
* TODO [#A] Need to fix tests now that the basic app is working * TODO [#A] Need to fix tests now that the basic app is working
@ -27,13 +27,13 @@ The problem with this approach is that every change to a song's text or font met
* TODO [#C] Make the presenter more modular so things are easier to change. This is vague... * TODO [#C] Make the presenter more modular so things are easier to change. This is vague...
* TODO Build library to see all available songs, images, videos, presentations, and slides * DONE Build library to see all available songs, images, videos, presentations, and slides
** DONE Develop ui for libraries ** DONE Develop ui for libraries
I've got the library basic layer done, I need to develop a way to open the libraries accordion button and then show the list of items in the library I've got the library basic layer done, I need to develop a way to open the libraries accordion button and then show the list of items in the library
** TODO Need to do search and creation systems yet ** DONE Need to do search and creation systems yet
* TODO [#B] Build editors for each possible item * DONE [#B] Build editors for each possible item
** TODO Develop ui for editors ** DONE Develop ui for editors
* TODO [#B] Develop ui for settings * TODO [#B] Develop ui for settings