diff --git a/res/align-on-canvas.svg b/res/align-on-canvas.svg new file mode 100644 index 0000000..9666b8b --- /dev/null +++ b/res/align-on-canvas.svg @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file diff --git a/res/boundingbox_bottom.svg b/res/boundingbox_bottom.svg new file mode 100644 index 0000000..6eca718 --- /dev/null +++ b/res/boundingbox_bottom.svg @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/res/boundingbox_bottom_left.svg b/res/boundingbox_bottom_left.svg new file mode 100644 index 0000000..c23404b --- /dev/null +++ b/res/boundingbox_bottom_left.svg @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/res/boundingbox_bottom_right.svg b/res/boundingbox_bottom_right.svg new file mode 100644 index 0000000..9538f34 --- /dev/null +++ b/res/boundingbox_bottom_right.svg @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/res/boundingbox_center.svg b/res/boundingbox_center.svg new file mode 100644 index 0000000..f61f3ed --- /dev/null +++ b/res/boundingbox_center.svg @@ -0,0 +1,9 @@ + + + + + + + diff --git a/res/boundingbox_left.svg b/res/boundingbox_left.svg new file mode 100644 index 0000000..809beba --- /dev/null +++ b/res/boundingbox_left.svg @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/res/boundingbox_right.svg b/res/boundingbox_right.svg new file mode 100644 index 0000000..3ee6298 --- /dev/null +++ b/res/boundingbox_right.svg @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/res/boundingbox_top.svg b/res/boundingbox_top.svg new file mode 100644 index 0000000..42db38d --- /dev/null +++ b/res/boundingbox_top.svg @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/res/boundingbox_top_left.svg b/res/boundingbox_top_left.svg new file mode 100644 index 0000000..c810715 --- /dev/null +++ b/res/boundingbox_top_left.svg @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/res/boundingbox_top_right.svg b/res/boundingbox_top_right.svg new file mode 100644 index 0000000..2388214 --- /dev/null +++ b/res/boundingbox_top_right.svg @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/res/presentation-analytics.svg b/res/presentation-analytics.svg deleted file mode 100644 index 5361c01..0000000 --- a/res/presentation-analytics.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/main.rs b/src/main.rs index 37fb895..9fdecf8 100755 --- a/src/main.rs +++ b/src/main.rs @@ -490,7 +490,7 @@ impl cosmic::Application for App { &self.menu_keys, vec![menu::Item::Button( "Open Settings", - Some(icon::from_name("settings").symbolic(true).into()), + Some(icon::from_name("preferences-system-symbolic").into()), MenuAction::OpenSettings, )], ), @@ -591,8 +591,8 @@ impl cosmic::Application for App { } else if self.presentation_open { icon::from_name("window-close-symbolic").scale(3).icon() } else { - icon::from_path("./res/presentation-analytics.svg".into()) - .symbolic(true) + icon::from_name("x-office-presentation-symbolic") + .scale(3) .icon() }) .center_y(Length::Fill), @@ -724,8 +724,7 @@ impl cosmic::Application for App { column![title, subtitle].spacing(space_xxs), horizontal(), tooltip( - icon::from_path("./res/plus.svg".into()) - .symbolic(true) + icon::from_name("list-add-symbolic") .apply(button::icon) .icon_size(space_l) .on_press(Message::AppendServiceItemKind( @@ -735,8 +734,7 @@ impl cosmic::Application for App { tooltip::Position::FollowCursor ), tooltip( - icon::from_name("edit") - .symbolic(true) + icon::from_name("edit-symbolic") .apply(button::icon) .icon_size(space_l) .on_press(Message::OpenEditorKind(item.clone())), @@ -806,9 +804,7 @@ impl cosmic::Application for App { .select_on_focus(true) .on_input(Message::SetGeniusToken), ); - let close_button = icon::from_name("dialog-close") - .symbolic(true) - .prefer_svg(true) + let close_button = icon::from_name("window-close-symbolic") .apply(button::icon) .class(theme::Button::Icon) .icon_size(space_xl) diff --git a/src/ui/library.rs b/src/ui/library.rs index 36fcd24..e7b0862 100644 --- a/src/ui/library.rs +++ b/src/ui/library.rs @@ -759,7 +759,8 @@ impl<'a> Library { let library_toolbar = rowm!( text_input("Search...", ""), - button::icon(icon::from_path("./res/plus.svg".into()).symbolic(true)) + button::icon(icon::from_name("list-add-symbolic")) + .icon_size(theme::spacing().space_l) .on_press(Message::AddItem) ) .align_y(Vertical::Center); diff --git a/src/ui/song_editor.rs b/src/ui/song_editor.rs index d497b30..9fe0911 100755 --- a/src/ui/song_editor.rs +++ b/src/ui/song_editor.rs @@ -1489,7 +1489,7 @@ impl SongEditor { .gap(10); let bold_button = tooltip( - button::icon(icon::from_name("format-text-bold")) + button::icon(icon::from_name("format-text-bold-symbolic")) .selected(self.song.as_ref().is_some_and(|song| { song.font_weight .is_some_and(|font_weight| font_weight == Weight::Bold) @@ -1499,7 +1499,7 @@ impl SongEditor { tooltip::Position::Bottom, ); let italic_button = tooltip( - button::icon(icon::from_name("format-text-italic")) + button::icon(icon::from_name("format-text-italic-symbolic")) .selected(self.song.as_ref().is_some_and(|song| { song.font_style .is_some_and(|font_style| font_style == Style::Italic) @@ -1510,7 +1510,7 @@ impl SongEditor { ); let underline_button = tooltip( - button::icon(icon::from_name("format-text-underline")) + button::icon(icon::from_name("format-text-underline-symbolic")) .on_press(Message::None), "Underline", tooltip::Position::Bottom, @@ -1672,10 +1672,12 @@ impl SongEditor { shadow_tools_button = shadow_tools_button.popup(shadow_tools); } let text_alignment_popover = popover(tooltip( - button::icon(icon::from_name("align-on-canvas").symbolic(true)) - .label("Text Alignment") - .padding(space_s) - .on_press(Message::ToggleAlignmentTools), + button::icon( + icon::from_path("./res/align-on-canvas.svg".into()).symbolic(true), + ) + .label("Text Alignment") + .padding(space_s) + .on_press(Message::ToggleAlignmentTools), "Set where text should be on slide", tooltip::Position::Bottom, )) @@ -1689,80 +1691,93 @@ impl SongEditor { .row_spacing(space_s) .column_spacing(space_s) .push_with( - button::icon(icon::from_name("boundingbox_top_left")) - .class(theme::Button::Standard) - .padding(space_s) - .on_press(Message::SetTextAlignment(TextAlignment::TopLeft)), + button::icon( + icon::from_path("./res/boundingbox_top_left.svg".into()) + .symbolic(true), + ) + .class(theme::Button::Standard) + .padding(space_s) + .on_press(Message::SetTextAlignment(TextAlignment::TopLeft)), |a| a.column(0).row(0), ) .push_with( - button::icon(icon::from_name("boundingbox_top")) - .class(theme::Button::Standard) - .padding(space_s) - .on_press(Message::SetTextAlignment( - TextAlignment::TopCenter, - )), + button::icon( + icon::from_path("./res/boundingbox_top.svg".into()) + .symbolic(true), + ) + .class(theme::Button::Standard) + .padding(space_s) + .on_press(Message::SetTextAlignment(TextAlignment::TopCenter)), |a| a.column(1).row(0), ) .push_with( - button::icon(icon::from_name("boundingbox_top_right")) - .class(theme::Button::Standard) - .padding(space_s) - .on_press(Message::SetTextAlignment(TextAlignment::TopRight)), + button::icon( + icon::from_path("./res/boundingbox_top_right".into()) + .symbolic(true), + ) + .class(theme::Button::Standard) + .padding(space_s) + .on_press(Message::SetTextAlignment(TextAlignment::TopRight)), |a| a.column(2).row(0), ) .push_with( - button::icon(icon::from_name("boundingbox_left")) - .class(theme::Button::Standard) - .padding(space_s) - .on_press(Message::SetTextAlignment( - TextAlignment::MiddleLeft, - )), + button::icon( + icon::from_path("./res/boundingbox_left".into()) + .symbolic(true), + ) + .class(theme::Button::Standard) + .padding(space_s) + .on_press(Message::SetTextAlignment(TextAlignment::MiddleLeft)), |a| a.column(0).row(1), ) .push_with( - button::icon(icon::from_name("boundingbox_center")) - .class(theme::Button::Standard) - .padding(space_s) - .on_press(Message::SetTextAlignment( - TextAlignment::MiddleCenter, - )), + button::icon( + icon::from_path("./res/boundingbox_center".into()) + .symbolic(true), + ) + .class(theme::Button::Standard) + .padding(space_s) + .on_press(Message::SetTextAlignment(TextAlignment::MiddleCenter)), |a| a.column(1).row(1), ) .push_with( - button::icon(icon::from_name("boundingbox_right")) - .class(theme::Button::Standard) - .padding(space_s) - .on_press(Message::SetTextAlignment( - TextAlignment::MiddleRight, - )), + button::icon( + icon::from_path("./res/boundingbox_right".into()) + .symbolic(true), + ) + .class(theme::Button::Standard) + .padding(space_s) + .on_press(Message::SetTextAlignment(TextAlignment::MiddleRight)), |a| a.column(2).row(1), ) .push_with( - button::icon(icon::from_name("boundingbox_bottom_left")) - .class(theme::Button::Standard) - .padding(space_s) - .on_press(Message::SetTextAlignment( - TextAlignment::BottomLeft, - )), + button::icon( + icon::from_path("./res/boundingbox_bottom_left".into()) + .symbolic(true), + ) + .class(theme::Button::Standard) + .padding(space_s) + .on_press(Message::SetTextAlignment(TextAlignment::BottomLeft)), |a| a.column(0).row(2), ) .push_with( - button::icon(icon::from_name("boundingbox_bottom")) - .class(theme::Button::Standard) - .padding(space_s) - .on_press(Message::SetTextAlignment( - TextAlignment::BottomCenter, - )), + button::icon( + icon::from_path("./res/boundingbox_bottom".into()) + .symbolic(true), + ) + .class(theme::Button::Standard) + .padding(space_s) + .on_press(Message::SetTextAlignment(TextAlignment::BottomCenter)), |a| a.column(1).row(2), ) .push_with( - button::icon(icon::from_name("boundingbox_bottom_right")) - .class(theme::Button::Standard) - .padding(space_s) - .on_press(Message::SetTextAlignment( - TextAlignment::BottomRight, - )), + button::icon( + icon::from_path("./res/boundingbox_bottom_right".into()) + .symbolic(true), + ) + .class(theme::Button::Standard) + .padding(space_s) + .on_press(Message::SetTextAlignment(TextAlignment::BottomRight)), |a| a.column(2).row(2), ) .apply(container)