summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Kling <kling@serenityos.org>2020-07-04 19:41:43 +0200
committerAndreas Kling <kling@serenityos.org>2020-07-04 19:44:27 +0200
commitbc1ec588f087269b45da932d9efc1e25f487a96f (patch)
tree2e3b60b727eea0fa604fbeb6037377f78b3cd58d
parent14edd67bccc1288cef0f68283bf4b9ce5d83ab18 (diff)
downloadserenity-bc1ec588f087269b45da932d9efc1e25f487a96f.zip
TextEditor: Tweak 16x16 icon
In keeping with the slightly-higher-contrast theme.
-rw-r--r--Applications/FileManager/main.cpp2
-rw-r--r--Applications/TextEditor/TextEditorWidget.cpp2
-rw-r--r--Applications/TextEditor/main.cpp2
-rw-r--r--Base/res/apps/TextEditor.af4
-rw-r--r--Base/res/icons/16x16/app-text-editor.pngbin0 -> 160 bytes
-rw-r--r--Base/res/icons/32x32/app-text-editor.png (renamed from Base/res/icons/32x32/app-texteditor.png)bin371 -> 371 bytes
-rw-r--r--Base/res/icons/TextEditor.pngbin454 -> 0 bytes
-rw-r--r--Base/res/icons/TextEditor16.pngbin276 -> 0 bytes
-rw-r--r--DevTools/HackStudio/main.cpp2
9 files changed, 6 insertions, 6 deletions
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<Core::ConfigFile> 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 0000000000..31b1865188
--- /dev/null
+++ b/Base/res/icons/16x16/app-text-editor.png
Binary files differ
diff --git a/Base/res/icons/32x32/app-texteditor.png b/Base/res/icons/32x32/app-text-editor.png
index 93e6db3330..93e6db3330 100644
--- a/Base/res/icons/32x32/app-texteditor.png
+++ b/Base/res/icons/32x32/app-text-editor.png
Binary files differ
diff --git a/Base/res/icons/TextEditor.png b/Base/res/icons/TextEditor.png
deleted file mode 100644
index 86ad985a78..0000000000
--- a/Base/res/icons/TextEditor.png
+++ /dev/null
Binary files differ
diff --git a/Base/res/icons/TextEditor16.png b/Base/res/icons/TextEditor16.png
deleted file mode 100644
index 3454203fe7..0000000000
--- a/Base/res/icons/TextEditor16.png
+++ /dev/null
Binary files differ
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();