From 3c11dc5bd3c4bb824621a0cca2dbd0458f20ea06 Mon Sep 17 00:00:00 2001 From: electrikmilk Date: Tue, 8 Feb 2022 21:49:58 -0500 Subject: [PATCH] Base+HackStudio: Add or insert missing icons Insert or add icons where they are missing. --- Base/res/icons/hackstudio/add-editor.png | Bin 0 -> 1970 bytes Base/res/icons/hackstudio/add-terminal.png | Bin 0 -> 2015 bytes Base/res/icons/hackstudio/remove-editor.png | Bin 0 -> 1735 bytes Base/res/icons/hackstudio/remove-terminal.png | Bin 0 -> 1988 bytes .../DevTools/HackStudio/HackStudioWidget.cpp | 12 +++++++----- Userland/Libraries/LibGUI/TextEditor.cpp | 2 +- 6 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 Base/res/icons/hackstudio/add-editor.png create mode 100644 Base/res/icons/hackstudio/add-terminal.png create mode 100644 Base/res/icons/hackstudio/remove-editor.png create mode 100644 Base/res/icons/hackstudio/remove-terminal.png diff --git a/Base/res/icons/hackstudio/add-editor.png b/Base/res/icons/hackstudio/add-editor.png new file mode 100644 index 0000000000000000000000000000000000000000..ebffece26ffd5c35adabac0ee385bce41197dad8 GIT binary patch literal 1970 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_rjo%#etZ2wxwokg&dz0$52&wylyQ$U=n(-v9;Y{GwC^b3H@dWCH^O1#?Ti)RaV{B;&NiWE}+~ z10zFyLqmN-b6rDoDGe1uOWMX1cerbuV zk`mO|irfOYv3bSNkV?+a)vrh_&^OdG0Qm~+-IQdwx`NW89I)jn$@-}|sky0nCB^!N zdWLYd1sVAz`NbLeIE;o%qgYUpTj1*pw*#wNa&zHU6qmS`mEc!h98y`3svneEoL^d$ zoa$PZnpdI>@^*ohb5UwyNq$jCetr%tt^#0ARxmQwGgQ#*k;Yy8k4UBXR%tH)}tqjbq42@Bg zrj{h8B$gx+RGgA*m6l(Wn^-Dsl_-GBZ=G%*_l;jZBgabdwTOOmt0BQ%rP|%uFqG&CF8`(k#== z%n}VPVESG1lS@Hy3)7#HnPO#_XklTJYLcRBW?^iqYm%B~rkiM*W~7^FYHn&~nrxV2 zZjcDm?_ZReo|%`JL$*0~3N{EI!c1|@OHM5=$uBB~<`AdEbSNt)(+-j$Q}UBDQ>+kL zjS|fbEK&_pbW==>4Rp;w&bLT5Hr7o^GfqiKwKOm`G&i-;2W5_&OgjY#3u3H3!Vqls zgOjY4M<&QUl~7j%rxrq4IhhLJRBDx&49b1BO39#Pmztsk70$#GKg5ME#MttT)I7Y2 z5u&U(Kdq!Zu_)CsJvFa{h~%!1%lXBLW%wOWT;hVb3hsDZ*#n}CRL4VuHaR0PFFiHI zR!Lt8VJj%rN zg!;300@gHbmn%O$KPRoc?AiVN&5>t#j34)(G1|Q9MR(mVCg#m&a=w|Y?%8K=ppkP; z_ziCq%ce70kF$1aUHNZp5&G8P;klSbwV3NtEv~7)y_~PkNDE$hsnVn&si=GW>fws{ z+O@}$nIF_#asSMms@$Z}$^YDPzr9bMkIO7U2fy@7%Z0!Hv5_kf?$3Ym=dRX$gIRIR3QBwQ&G-`7 Y_jW%_Ibpcb1yrkgy85}Sb4q9e07oE=#{d8T literal 0 HcmV?d00001 diff --git a/Base/res/icons/hackstudio/add-terminal.png b/Base/res/icons/hackstudio/add-terminal.png new file mode 100644 index 0000000000000000000000000000000000000000..e64e4f959dcae07ee0070ebd4d3fa7936f8c3faa GIT binary patch literal 2015 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 HackStudioWidget::create_project_tree_view_context_menu for (auto& new_file_action : m_new_file_actions) { new_file_submenu.add_action(new_file_action); } + new_file_submenu.set_icon(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/new.png").release_value_but_fixme_should_propagate_errors()); new_file_submenu.add_action(*m_new_plain_file_action); new_file_submenu.add_separator(); new_file_submenu.add_action(*m_new_directory_action); @@ -500,6 +501,7 @@ NonnullRefPtr HackStudioWidget::create_open_selected_action() for (auto& file : files) open_file(file); }); + open_selected_action->set_icon(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/open.png").release_value_but_fixme_should_propagate_errors()); open_selected_action->set_enabled(true); return open_selected_action; } @@ -653,7 +655,7 @@ NonnullRefPtr HackStudioWidget::create_switch_to_previous_editor_ac NonnullRefPtr HackStudioWidget::create_remove_current_editor_action() { - return GUI::Action::create("&Remove Current Editor", { Mod_Alt | Mod_Shift, Key_E }, [this](auto&) { + return GUI::Action::create("&Remove Current Editor", { Mod_Alt | Mod_Shift, Key_E }, Gfx::Bitmap::try_load_from_file("/res/icons/hackstudio/remove-editor.png").release_value_but_fixme_should_propagate_errors(), [this](auto&) { if (m_all_editor_wrappers.size() <= 1) return; auto wrapper = m_current_editor_wrapper; @@ -741,7 +743,7 @@ NonnullRefPtr HackStudioWidget::create_save_as_action() NonnullRefPtr HackStudioWidget::create_remove_current_terminal_action() { - return GUI::Action::create("Remove &Current Terminal", { Mod_Alt | Mod_Shift, Key_T }, [this](auto&) { + return GUI::Action::create("Remove &Current Terminal", { Mod_Alt | Mod_Shift, Key_T }, Gfx::Bitmap::try_load_from_file("/res/icons/hackstudio/remove-terminal.png").release_value_but_fixme_should_propagate_errors(), [this](auto&) { auto widget = m_action_tab_widget->active_widget(); if (!widget) return; @@ -758,7 +760,7 @@ NonnullRefPtr HackStudioWidget::create_remove_current_terminal_acti NonnullRefPtr HackStudioWidget::create_add_editor_action() { return GUI::Action::create("Add New &Editor", { Mod_Ctrl | Mod_Alt, Key_E }, - Gfx::Bitmap::try_load_from_file("/res/icons/16x16/app-text-editor.png").release_value_but_fixme_should_propagate_errors(), + Gfx::Bitmap::try_load_from_file("/res/icons/hackstudio/add-editor.png").release_value_but_fixme_should_propagate_errors(), [this](auto&) { add_new_editor(*m_editors_splitter); update_actions(); @@ -768,7 +770,7 @@ NonnullRefPtr HackStudioWidget::create_add_editor_action() NonnullRefPtr HackStudioWidget::create_add_terminal_action() { return GUI::Action::create("Add New &Terminal", { Mod_Ctrl | Mod_Alt, Key_T }, - Gfx::Bitmap::try_load_from_file("/res/icons/16x16/app-terminal.png").release_value_but_fixme_should_propagate_errors(), + Gfx::Bitmap::try_load_from_file("/res/icons/hackstudio/add-terminal.png").release_value_but_fixme_should_propagate_errors(), [this](auto&) { auto& terminal_wrapper = m_action_tab_widget->add_tab("Terminal"); reveal_action_tab(terminal_wrapper); @@ -1158,7 +1160,7 @@ void HackStudioWidget::create_project_menu(GUI::Window& window) for (auto& new_file_action : m_new_file_actions) { new_submenu.add_action(new_file_action); } - + new_submenu.set_icon(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/new.png").release_value_but_fixme_should_propagate_errors()); new_submenu.add_action(*m_new_plain_file_action); new_submenu.add_separator(); new_submenu.add_action(*m_new_directory_action); diff --git a/Userland/Libraries/LibGUI/TextEditor.cpp b/Userland/Libraries/LibGUI/TextEditor.cpp index ca30ca3dee..615f5fc88a 100644 --- a/Userland/Libraries/LibGUI/TextEditor.cpp +++ b/Userland/Libraries/LibGUI/TextEditor.cpp @@ -88,7 +88,7 @@ void TextEditor::create_actions() m_paste_action->set_enabled(is_editable() && Clipboard::the().fetch_mime_type().starts_with("text/")); if (is_multi_line()) { m_go_to_line_action = Action::create( - "Go to line...", { Mod_Ctrl, Key_L }, Gfx::Bitmap::try_load_from_file("/res/icons/16x16/go-forward.png").release_value_but_fixme_should_propagate_errors(), [this](auto&) { + "Go to line...", { Mod_Ctrl, Key_L }, Gfx::Bitmap::try_load_from_file("/res/icons/16x16/go-to.png").release_value_but_fixme_should_propagate_errors(), [this](auto&) { String value; if (InputBox::show(window(), value, "Line:", "Go to line") == InputBox::ExecOK) { auto line_target = value.to_uint();