From c250b3f5054e499186ebd1dc381265eb4b4811f2 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Sun, 3 May 2026 14:04:48 -0500 Subject: [PATCH] [chore]: reorganize icons --- res/{ => icons}/align-on-canvas.svg | 0 res/{ => icons}/boundingbox_bottom.svg | 0 res/{ => icons}/boundingbox_bottom_left.svg | 0 res/{ => icons}/boundingbox_bottom_right.svg | 0 res/{ => icons}/boundingbox_center.svg | 0 res/{ => icons}/boundingbox_left.svg | 0 res/{ => icons}/boundingbox_right.svg | 0 res/{ => icons}/boundingbox_top.svg | 0 res/{ => icons}/boundingbox_top_left.svg | 0 res/{ => icons}/boundingbox_top_right.svg | 0 res/{ => icons}/caret-left.svg | 0 res/{ => icons}/caret-right.svg | 0 res/{ => icons}/carousel.svg | 0 res/{ => icons}/circle-plus.svg | 0 res/{ => icons}/edit.svg | 0 res/{ => icons}/horizontal-squares.svg | 0 res/{ => icons}/layout-grid.svg | 0 res/{ => icons}/list-add-above.svg | 0 res/{ => icons}/list-add-below.svg | 0 res/{ => icons}/plus.svg | 0 res/{ => icons}/search.svg | 0 res/{ => icons}/shadow.svg | 0 res/{ => icons}/slides.svg | 0 res/{ => icons}/split-above.svg | 0 res/{ => icons}/split-below.svg | 0 res/{ => icons}/text-outline.svg | 0 res/{ => icons}/text-shadow.svg | 0 res/{ => icons}/x.svg | 0 src/main.rs | 14 ++++++------ src/ui/library.rs | 2 +- src/ui/presentation_editor.rs | 4 ++-- src/ui/song_editor.rs | 24 ++++++++++---------- src/ui/widgets/verse_editor.rs | 2 +- 33 files changed, 23 insertions(+), 23 deletions(-) rename res/{ => icons}/align-on-canvas.svg (100%) rename res/{ => icons}/boundingbox_bottom.svg (100%) rename res/{ => icons}/boundingbox_bottom_left.svg (100%) rename res/{ => icons}/boundingbox_bottom_right.svg (100%) rename res/{ => icons}/boundingbox_center.svg (100%) rename res/{ => icons}/boundingbox_left.svg (100%) rename res/{ => icons}/boundingbox_right.svg (100%) rename res/{ => icons}/boundingbox_top.svg (100%) rename res/{ => icons}/boundingbox_top_left.svg (100%) rename res/{ => icons}/boundingbox_top_right.svg (100%) rename res/{ => icons}/caret-left.svg (100%) rename res/{ => icons}/caret-right.svg (100%) rename res/{ => icons}/carousel.svg (100%) rename res/{ => icons}/circle-plus.svg (100%) rename res/{ => icons}/edit.svg (100%) rename res/{ => icons}/horizontal-squares.svg (100%) rename res/{ => icons}/layout-grid.svg (100%) rename res/{ => icons}/list-add-above.svg (100%) rename res/{ => icons}/list-add-below.svg (100%) rename res/{ => icons}/plus.svg (100%) rename res/{ => icons}/search.svg (100%) rename res/{ => icons}/shadow.svg (100%) rename res/{ => icons}/slides.svg (100%) rename res/{ => icons}/split-above.svg (100%) rename res/{ => icons}/split-below.svg (100%) rename res/{ => icons}/text-outline.svg (100%) rename res/{ => icons}/text-shadow.svg (100%) rename res/{ => icons}/x.svg (100%) diff --git a/res/align-on-canvas.svg b/res/icons/align-on-canvas.svg similarity index 100% rename from res/align-on-canvas.svg rename to res/icons/align-on-canvas.svg diff --git a/res/boundingbox_bottom.svg b/res/icons/boundingbox_bottom.svg similarity index 100% rename from res/boundingbox_bottom.svg rename to res/icons/boundingbox_bottom.svg diff --git a/res/boundingbox_bottom_left.svg b/res/icons/boundingbox_bottom_left.svg similarity index 100% rename from res/boundingbox_bottom_left.svg rename to res/icons/boundingbox_bottom_left.svg diff --git a/res/boundingbox_bottom_right.svg b/res/icons/boundingbox_bottom_right.svg similarity index 100% rename from res/boundingbox_bottom_right.svg rename to res/icons/boundingbox_bottom_right.svg diff --git a/res/boundingbox_center.svg b/res/icons/boundingbox_center.svg similarity index 100% rename from res/boundingbox_center.svg rename to res/icons/boundingbox_center.svg diff --git a/res/boundingbox_left.svg b/res/icons/boundingbox_left.svg similarity index 100% rename from res/boundingbox_left.svg rename to res/icons/boundingbox_left.svg diff --git a/res/boundingbox_right.svg b/res/icons/boundingbox_right.svg similarity index 100% rename from res/boundingbox_right.svg rename to res/icons/boundingbox_right.svg diff --git a/res/boundingbox_top.svg b/res/icons/boundingbox_top.svg similarity index 100% rename from res/boundingbox_top.svg rename to res/icons/boundingbox_top.svg diff --git a/res/boundingbox_top_left.svg b/res/icons/boundingbox_top_left.svg similarity index 100% rename from res/boundingbox_top_left.svg rename to res/icons/boundingbox_top_left.svg diff --git a/res/boundingbox_top_right.svg b/res/icons/boundingbox_top_right.svg similarity index 100% rename from res/boundingbox_top_right.svg rename to res/icons/boundingbox_top_right.svg diff --git a/res/caret-left.svg b/res/icons/caret-left.svg similarity index 100% rename from res/caret-left.svg rename to res/icons/caret-left.svg diff --git a/res/caret-right.svg b/res/icons/caret-right.svg similarity index 100% rename from res/caret-right.svg rename to res/icons/caret-right.svg diff --git a/res/carousel.svg b/res/icons/carousel.svg similarity index 100% rename from res/carousel.svg rename to res/icons/carousel.svg diff --git a/res/circle-plus.svg b/res/icons/circle-plus.svg similarity index 100% rename from res/circle-plus.svg rename to res/icons/circle-plus.svg diff --git a/res/edit.svg b/res/icons/edit.svg similarity index 100% rename from res/edit.svg rename to res/icons/edit.svg diff --git a/res/horizontal-squares.svg b/res/icons/horizontal-squares.svg similarity index 100% rename from res/horizontal-squares.svg rename to res/icons/horizontal-squares.svg diff --git a/res/layout-grid.svg b/res/icons/layout-grid.svg similarity index 100% rename from res/layout-grid.svg rename to res/icons/layout-grid.svg diff --git a/res/list-add-above.svg b/res/icons/list-add-above.svg similarity index 100% rename from res/list-add-above.svg rename to res/icons/list-add-above.svg diff --git a/res/list-add-below.svg b/res/icons/list-add-below.svg similarity index 100% rename from res/list-add-below.svg rename to res/icons/list-add-below.svg diff --git a/res/plus.svg b/res/icons/plus.svg similarity index 100% rename from res/plus.svg rename to res/icons/plus.svg diff --git a/res/search.svg b/res/icons/search.svg similarity index 100% rename from res/search.svg rename to res/icons/search.svg diff --git a/res/shadow.svg b/res/icons/shadow.svg similarity index 100% rename from res/shadow.svg rename to res/icons/shadow.svg diff --git a/res/slides.svg b/res/icons/slides.svg similarity index 100% rename from res/slides.svg rename to res/icons/slides.svg diff --git a/res/split-above.svg b/res/icons/split-above.svg similarity index 100% rename from res/split-above.svg rename to res/icons/split-above.svg diff --git a/res/split-below.svg b/res/icons/split-below.svg similarity index 100% rename from res/split-below.svg rename to res/icons/split-below.svg diff --git a/res/text-outline.svg b/res/icons/text-outline.svg similarity index 100% rename from res/text-outline.svg rename to res/icons/text-outline.svg diff --git a/res/text-shadow.svg b/res/icons/text-shadow.svg similarity index 100% rename from res/text-shadow.svg rename to res/icons/text-shadow.svg diff --git a/res/x.svg b/res/icons/x.svg similarity index 100% rename from res/x.svg rename to res/icons/x.svg diff --git a/src/main.rs b/src/main.rs index 624e734..3fc4c4e 100755 --- a/src/main.rs +++ b/src/main.rs @@ -535,7 +535,7 @@ impl cosmic::Application for App { button::custom( row!( Container::new( - icon::from_path("./res/search.svg".into()) + icon::from_path("./res/icons/search.svg".into()) .symbolic(true) .icon() ) @@ -554,11 +554,11 @@ impl cosmic::Application for App { button::custom( row!( Container::new(if self.editor_mode.is_some() { - icon::from_path("./res/presentation-analytics.svg".into()) + icon::from_path("./res/icons/presentation-analytics.svg".into()) .symbolic(true) .icon() } else { - icon::from_path("./res/edit.svg".into()) + icon::from_path("./res/icons/edit.svg".into()) .symbolic(true) .icon() }) @@ -1657,7 +1657,7 @@ impl cosmic::Application for App { 64 }; - let icon_left = icon::from_path("./res/caret-left.svg".into()) + let icon_left = icon::from_path("./res/icons/caret-left.svg".into()) .symbolic(true) .icon() .size(icon_size) @@ -1669,7 +1669,7 @@ impl cosmic::Application for App { }), })); - let icon_right = icon::from_path("./res/caret-right.svg".into()) + let icon_right = icon::from_path("./res/icons/caret-right.svg".into()) .symbolic(true) .icon() .size(icon_size) @@ -1847,7 +1847,7 @@ impl cosmic::Application for App { let grid_button = button::standard("Grid") .on_press(Message::ViewModeSwitch(ViewMode::Grid)) .leading_icon( - icon::from_path("./res/layout-grid.svg".into()).symbolic(true), + icon::from_path("./res/icons/layout-grid.svg".into()).symbolic(true), ) .class(if self.view_mode == ViewMode::Grid { theme::Button::Standard @@ -1855,7 +1855,7 @@ impl cosmic::Application for App { theme::Button::HeaderBar }); let list_button = button::standard("Preview") - .leading_icon(icon::from_path("./res/carousel.svg".into()).symbolic(true)) + .leading_icon(icon::from_path("./res/icons/carousel.svg".into()).symbolic(true)) .on_press(Message::ViewModeSwitch(ViewMode::Row)) .class(if self.view_mode == ViewMode::Row { theme::Button::Standard diff --git a/src/ui/library.rs b/src/ui/library.rs index e7b0862..7afd18e 100644 --- a/src/ui/library.rs +++ b/src/ui/library.rs @@ -826,7 +826,7 @@ impl<'a> Library { let texts = column([text.into(), subtext.into()]); let add_button = - button::icon(icon::from_path("./res/caret-right.svg".into()).symbolic(true)) + button::icon(icon::from_path("./res/icons/caret-right.svg".into()).symbolic(true)) .on_press(Message::ToService(( model.kind, index.try_into().expect("Shouldn't have issues"), diff --git a/src/ui/presentation_editor.rs b/src/ui/presentation_editor.rs index 60180ff..8e11757 100644 --- a/src/ui/presentation_editor.rs +++ b/src/ui/presentation_editor.rs @@ -411,9 +411,9 @@ impl PresentationEditor { fn context_menu<'b>(&self, items: Element<'b, Message>) -> Element<'b, Message> { if self.context_menu_id.is_some() { let before_icon = - icon::from_path("./res/split-above.svg".into()).symbolic(true); + icon::from_path("./res/icons/split-above.svg".into()).symbolic(true); let after_icon = - icon::from_path("./res/split-below.svg".into()).symbolic(true); + icon::from_path("./res/icons/split-below.svg".into()).symbolic(true); let menu_items = vec![ menu::Item::Button( "Spit Before", diff --git a/src/ui/song_editor.rs b/src/ui/song_editor.rs index 980ad6a..0eceeb7 100755 --- a/src/ui/song_editor.rs +++ b/src/ui/song_editor.rs @@ -1530,7 +1530,7 @@ impl SongEditor { ); let mut stroke_tools_button = popover(tooltip( - button::icon(icon::from_path("./res/text-outline.svg".into()).symbolic(true)) + button::icon(icon::from_path("./res/icons/text-outline.svg".into()).symbolic(true)) .label("Text Stroke") .on_press(Message::ToggleStrokeTools), "Outline of the text", @@ -1592,7 +1592,7 @@ impl SongEditor { } let mut shadow_tools_button = popover(tooltip( - button::icon(icon::from_path("./res/shadow.svg".into()).symbolic(true)) + button::icon(icon::from_path("./res/icons/shadow.svg".into()).symbolic(true)) .label("Text Shadow") .padding(space_s) .on_press(Message::ToggleShadowTools), @@ -1686,7 +1686,7 @@ impl SongEditor { } let text_alignment_popover = popover(tooltip( button::icon( - icon::from_path("./res/align-on-canvas.svg".into()).symbolic(true), + icon::from_path("./res/icons/align-on-canvas.svg".into()).symbolic(true), ) .label("Text Alignment") .padding(space_s) @@ -1705,7 +1705,7 @@ impl SongEditor { .column_spacing(space_s) .push_with( button::icon( - icon::from_path("./res/boundingbox_top_left.svg".into()) + icon::from_path("./res/icons/boundingbox_top_left.svg".into()) .symbolic(true), ) .class(theme::Button::Standard) @@ -1715,7 +1715,7 @@ impl SongEditor { ) .push_with( button::icon( - icon::from_path("./res/boundingbox_top.svg".into()) + icon::from_path("./res/icons/boundingbox_top.svg".into()) .symbolic(true), ) .class(theme::Button::Standard) @@ -1725,7 +1725,7 @@ impl SongEditor { ) .push_with( button::icon( - icon::from_path("./res/boundingbox_top_right.svg".into()) + icon::from_path("./res/icons/boundingbox_top_right.svg".into()) .symbolic(true), ) .class(theme::Button::Standard) @@ -1735,7 +1735,7 @@ impl SongEditor { ) .push_with( button::icon( - icon::from_path("./res/boundingbox_left.svg".into()) + icon::from_path("./res/icons/boundingbox_left.svg".into()) .symbolic(true), ) .class(theme::Button::Standard) @@ -1745,7 +1745,7 @@ impl SongEditor { ) .push_with( button::icon( - icon::from_path("./res/boundingbox_center.svg".into()) + icon::from_path("./res/icons/boundingbox_center.svg".into()) .symbolic(true), ) .class(theme::Button::Standard) @@ -1755,7 +1755,7 @@ impl SongEditor { ) .push_with( button::icon( - icon::from_path("./res/boundingbox_right.svg".into()) + icon::from_path("./res/icons/boundingbox_right.svg".into()) .symbolic(true), ) .class(theme::Button::Standard) @@ -1765,7 +1765,7 @@ impl SongEditor { ) .push_with( button::icon( - icon::from_path("./res/boundingbox_bottom_left.svg".into()) + icon::from_path("./res/icons/boundingbox_bottom_left.svg".into()) .symbolic(true), ) .class(theme::Button::Standard) @@ -1775,7 +1775,7 @@ impl SongEditor { ) .push_with( button::icon( - icon::from_path("./res/boundingbox_bottom.svg".into()) + icon::from_path("./res/icons/boundingbox_bottom.svg".into()) .symbolic(true), ) .class(theme::Button::Standard) @@ -1785,7 +1785,7 @@ impl SongEditor { ) .push_with( button::icon( - icon::from_path("./res/boundingbox_bottom_right.svg".into()) + icon::from_path("./res/icons/boundingbox_bottom_right.svg".into()) .symbolic(true), ) .class(theme::Button::Standard) diff --git a/src/ui/widgets/verse_editor.rs b/src/ui/widgets/verse_editor.rs index 5969ce1..d59759b 100644 --- a/src/ui/widgets/verse_editor.rs +++ b/src/ui/widgets/verse_editor.rs @@ -87,7 +87,7 @@ impl VerseEditor { } = theme::spacing(); let delete_button = button::text("Delete") - .trailing_icon(icon::from_path("./res/x.svg".into()).symbolic(true)) + .trailing_icon(icon::from_path("./res/icons/x.svg".into()).symbolic(true)) .class(theme::Button::Destructive) .on_press(Message::DeleteVerse(self.verse_name)); let combo = combo_box(