From bc1ec588f087269b45da932d9efc1e25f487a96f Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sat, 4 Jul 2020 19:41:43 +0200 Subject: [PATCH] TextEditor: Tweak 16x16 icon In keeping with the slightly-higher-contrast theme. --- Applications/FileManager/main.cpp | 2 +- Applications/TextEditor/TextEditorWidget.cpp | 2 +- Applications/TextEditor/main.cpp | 2 +- Base/res/apps/TextEditor.af | 4 ++-- Base/res/icons/16x16/app-text-editor.png | Bin 0 -> 160 bytes .../{app-texteditor.png => app-text-editor.png} | Bin Base/res/icons/TextEditor.png | Bin 454 -> 0 bytes Base/res/icons/TextEditor16.png | Bin 276 -> 0 bytes DevTools/HackStudio/main.cpp | 2 +- 9 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 Base/res/icons/16x16/app-text-editor.png rename Base/res/icons/32x32/{app-texteditor.png => app-text-editor.png} (100%) delete mode 100644 Base/res/icons/TextEditor.png delete mode 100644 Base/res/icons/TextEditor16.png diff --git a/Applications/FileManager/main.cpp b/Applications/FileManager/main.cpp index b227bf51d5..5b8cbb03f6 100644 --- a/Applications/FileManager/main.cpp +++ b/Applications/FileManager/main.cpp @@ -719,7 +719,7 @@ int run_in_windowed_mode(RefPtr config, String initial_locatio copy_action->set_enabled(!selection.is_empty()); }; - auto open_in_text_editor_action = GUI::Action::create("Open in TextEditor...", Gfx::Bitmap::load_from_file("/res/icons/TextEditor16.png"), [&](auto&) { + auto open_in_text_editor_action = GUI::Action::create("Open in TextEditor...", Gfx::Bitmap::load_from_file("/res/icons/16x16/app-text-editor.png"), [&](auto&) { pid_t child; for (auto& path : selected_file_paths()) { const char* argv[] = { "TextEditor", path.characters(), nullptr }; diff --git a/Applications/TextEditor/TextEditorWidget.cpp b/Applications/TextEditor/TextEditorWidget.cpp index 307e280d6e..b47d2a9e58 100644 --- a/Applications/TextEditor/TextEditorWidget.cpp +++ b/Applications/TextEditor/TextEditorWidget.cpp @@ -452,7 +452,7 @@ TextEditorWidget::TextEditorWidget() auto& help_menu = menubar->add_menu("Help"); help_menu.add_action(GUI::Action::create("About", [&](auto&) { - GUI::AboutDialog::show("Text Editor", Gfx::Bitmap::load_from_file("/res/icons/32x32/app-texteditor.png"), window()); + GUI::AboutDialog::show("Text Editor", Gfx::Bitmap::load_from_file("/res/icons/32x32/app-text-editor.png"), window()); })); GUI::Application::the()->set_menubar(move(menubar)); diff --git a/Applications/TextEditor/main.cpp b/Applications/TextEditor/main.cpp index 5589692de0..c46bcef95f 100644 --- a/Applications/TextEditor/main.cpp +++ b/Applications/TextEditor/main.cpp @@ -60,7 +60,7 @@ int main(int argc, char** argv) text_widget.open_sesame(argv[1]); window->show(); - window->set_icon(Gfx::Bitmap::load_from_file("/res/icons/TextEditor16.png")); + window->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/app-text-editor.png")); return app->exec(); } diff --git a/Base/res/apps/TextEditor.af b/Base/res/apps/TextEditor.af index 8bf0ab827e..381d67293b 100644 --- a/Base/res/apps/TextEditor.af +++ b/Base/res/apps/TextEditor.af @@ -4,8 +4,8 @@ Executable=/bin/TextEditor Category=Utilities [Icons] -16x16=/res/icons/TextEditor16.png -32x32=/res/icons/32x32/app-texteditor.png +16x16=/res/icons/16x16/app-text-editor.png +32x32=/res/icons/32x32/app-text-editor.png [Launcher] FileTypes=txt,md,html,htm,js,json,ini diff --git a/Base/res/icons/16x16/app-text-editor.png b/Base/res/icons/16x16/app-text-editor.png new file mode 100644 index 0000000000000000000000000000000000000000..31b186518854f23af29d40d19b48285a9cc8d5c7 GIT binary patch literal 160 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7(mh=qLo7}wCmdk;|NsAw z|MK!@8`%H+|Nr>^|6g5IdrZQdC#ZH7Fy3KM<5BB(;dKaa@fE(Pr;uV1sJB3a$E|~V#q0@uG8PV-7+=W!^Iv7h(4toV>VQ({LIwr~ N22WQ%mvv4FO#mz*IdlL3 literal 0 HcmV?d00001 diff --git a/Base/res/icons/32x32/app-texteditor.png b/Base/res/icons/32x32/app-text-editor.png similarity index 100% rename from Base/res/icons/32x32/app-texteditor.png rename to Base/res/icons/32x32/app-text-editor.png diff --git a/Base/res/icons/TextEditor.png b/Base/res/icons/TextEditor.png deleted file mode 100644 index 86ad985a78c2c3fb6af68a6911cf0f5321650518..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 454 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}Y)RhkE)0Gk`1Qd=kW$V9 zkH}&M20djEW~^9hU&g?|z+U3%>&pI^nM26LYR{B2FBljYBuiW)N}Tg^b5rw57@Uhz z6H8K46v{J8G8EiBeFMT9`NSC*81+0|977@wzYX8m+hQOfBb{V4L8Dd3L&t@22U|va zhu90oj3%}d0zWJDE&b-Ov>kTab=~+PSLNQvl03T`*qk^vN$Sr(TTpuRu|?bSN)un< zoTE-0t6tB_`i(P!P#bOxGZ9lzZ*OBYo%nbd)rE^Ws?^ik? zG27E3eC6YJx+_+_x^gVYtC-29Mdx%`>YY=zlb+WVr~AJ9oqG@h|8F@E!5GZF=1-rm zjzQRi^Y@$PZ+VarT{n|8_jXdbQPe4or7>p9m)p5{X=*IJ@cpm*$HTrW*R8d?HBCRg wF_uH|gjm<21zT5E6dOfJulHSO{ZshLV0FMhJw4NZ$Nk>pEv^pLyf14V~EA+x084C9#G(M(GNV9z|^*rQ)5PB=Y$&v z4jV8AU$77jbXrn#`iW_J2n@INw<ylOZs-?)Hx{|@*k!tY$4nsM;iue8eUzqnd`&(3qJQaI<)_j|Ccux0;P3Fu87A$ZS U+FBXRz`(%Z>FVdQ&MBb@0KEEGP5=M^ diff --git a/DevTools/HackStudio/main.cpp b/DevTools/HackStudio/main.cpp index b4b99938c6..516e268df6 100644 --- a/DevTools/HackStudio/main.cpp +++ b/DevTools/HackStudio/main.cpp @@ -480,7 +480,7 @@ int main(int argc, char** argv) }); auto add_editor_action = GUI::Action::create("Add new editor", { Mod_Ctrl | Mod_Alt, Key_E }, - Gfx::Bitmap::load_from_file("/res/icons/TextEditor16.png"), + Gfx::Bitmap::load_from_file("/res/icons/16x16/app-text-editor.png"), [&](auto&) { add_new_editor(*g_text_inner_splitter); update_actions();