From ebba297b42a54211ba501fd254b629a15ecf5028 Mon Sep 17 00:00:00 2001 From: thankyouverycool <66646555+thankyouverycool@users.noreply.github.com> Date: Mon, 24 Aug 2020 07:02:03 -0400 Subject: [PATCH] Base: Move 16x16 common icons to /res/icons/16x16/ Drops the '16' suffix from filenames. Resizes inconsistent audio-volume icons to intended size. --- Applications/SystemMonitor/ProcessModel.cpp | 8 ++++---- Applications/SystemMonitor/main.cpp | 6 +++--- Applications/Terminal/main.cpp | 2 +- Base/res/icons/16x16/audio-volume-high.png | Bin 0 -> 190 bytes Base/res/icons/16x16/audio-volume-low.png | Bin 0 -> 183 bytes Base/res/icons/16x16/audio-volume-medium.png | Bin 0 -> 194 bytes Base/res/icons/16x16/audio-volume-muted.png | Bin 0 -> 232 bytes Base/res/icons/16x16/audio-volume-zero.png | Bin 0 -> 165 bytes Base/res/icons/{ => 16x16}/breakpoint.png | Bin Base/res/icons/{ => 16x16}/clipboard.png | Bin .../icons/{continue16.png => 16x16/continue.png} | Bin Base/res/icons/{gear16.png => 16x16/gear.png} | Bin .../highpriority.png} | Bin Base/res/icons/{kill16.png => 16x16/kill.png} | Bin .../{lowpriority16.png => 16x16/lowpriority.png} | Bin .../normalpriority.png} | Bin Base/res/icons/{paste16.png => 16x16/paste.png} | Bin .../res/icons/{stop16.png => 16x16/stop-hand.png} | Bin Base/res/icons/SystemMenu.ini | 2 +- Base/res/icons/audio-volume-high.png | Bin 196 -> 0 bytes Base/res/icons/audio-volume-low.png | Bin 180 -> 0 bytes Base/res/icons/audio-volume-medium.png | Bin 192 -> 0 bytes Base/res/icons/audio-volume-muted.png | Bin 230 -> 0 bytes Base/res/icons/audio-volume-zero.png | Bin 163 -> 0 bytes Base/res/welcome.txt | 2 +- Demos/WidgetGallery/main.cpp | 4 ++-- DevTools/HackStudio/Editor.cpp | 2 +- Libraries/LibGUI/Action.cpp | 2 +- Libraries/LibVT/TerminalWidget.cpp | 2 +- MenuApplets/Audio/main.cpp | 10 +++++----- MenuApplets/ClipboardHistory/main.cpp | 2 +- 31 files changed, 21 insertions(+), 21 deletions(-) create mode 100644 Base/res/icons/16x16/audio-volume-high.png create mode 100644 Base/res/icons/16x16/audio-volume-low.png create mode 100644 Base/res/icons/16x16/audio-volume-medium.png create mode 100644 Base/res/icons/16x16/audio-volume-muted.png create mode 100644 Base/res/icons/16x16/audio-volume-zero.png rename Base/res/icons/{ => 16x16}/breakpoint.png (100%) rename Base/res/icons/{ => 16x16}/clipboard.png (100%) rename Base/res/icons/{continue16.png => 16x16/continue.png} (100%) rename Base/res/icons/{gear16.png => 16x16/gear.png} (100%) rename Base/res/icons/{highpriority16.png => 16x16/highpriority.png} (100%) rename Base/res/icons/{kill16.png => 16x16/kill.png} (100%) rename Base/res/icons/{lowpriority16.png => 16x16/lowpriority.png} (100%) rename Base/res/icons/{normalpriority16.png => 16x16/normalpriority.png} (100%) rename Base/res/icons/{paste16.png => 16x16/paste.png} (100%) rename Base/res/icons/{stop16.png => 16x16/stop-hand.png} (100%) delete mode 100644 Base/res/icons/audio-volume-high.png delete mode 100644 Base/res/icons/audio-volume-low.png delete mode 100644 Base/res/icons/audio-volume-medium.png delete mode 100644 Base/res/icons/audio-volume-muted.png delete mode 100644 Base/res/icons/audio-volume-zero.png diff --git a/Applications/SystemMonitor/ProcessModel.cpp b/Applications/SystemMonitor/ProcessModel.cpp index 4360a9b077..d1c7901f0d 100644 --- a/Applications/SystemMonitor/ProcessModel.cpp +++ b/Applications/SystemMonitor/ProcessModel.cpp @@ -47,10 +47,10 @@ ProcessModel::ProcessModel() { ASSERT(!s_the); s_the = this; - m_generic_process_icon = Gfx::Bitmap::load_from_file("/res/icons/gear16.png"); - m_high_priority_icon = Gfx::Bitmap::load_from_file("/res/icons/highpriority16.png"); - m_low_priority_icon = Gfx::Bitmap::load_from_file("/res/icons/lowpriority16.png"); - m_normal_priority_icon = Gfx::Bitmap::load_from_file("/res/icons/normalpriority16.png"); + m_generic_process_icon = Gfx::Bitmap::load_from_file("/res/icons/16x16/gear.png"); + m_high_priority_icon = Gfx::Bitmap::load_from_file("/res/icons/16x16/highpriority.png"); + m_low_priority_icon = Gfx::Bitmap::load_from_file("/res/icons/16x16/lowpriority.png"); + m_normal_priority_icon = Gfx::Bitmap::load_from_file("/res/icons/16x16/normalpriority.png"); auto file = Core::File::construct("/proc/cpuinfo"); if (file->open(Core::IODevice::ReadOnly)) { diff --git a/Applications/SystemMonitor/main.cpp b/Applications/SystemMonitor/main.cpp index a9c6771d09..8428fa8876 100644 --- a/Applications/SystemMonitor/main.cpp +++ b/Applications/SystemMonitor/main.cpp @@ -199,19 +199,19 @@ int main(int argc, char** argv) return pid_index.data().to_i32(); }; - auto kill_action = GUI::Action::create("Kill process", { Mod_Ctrl, Key_K }, Gfx::Bitmap::load_from_file("/res/icons/kill16.png"), [&](const GUI::Action&) { + auto kill_action = GUI::Action::create("Kill process", { Mod_Ctrl, Key_K }, Gfx::Bitmap::load_from_file("/res/icons/16x16/kill.png"), [&](const GUI::Action&) { pid_t pid = selected_id(ProcessModel::Column::PID); if (pid != -1) kill(pid, SIGKILL); }); - auto stop_action = GUI::Action::create("Stop process", { Mod_Ctrl, Key_S }, Gfx::Bitmap::load_from_file("/res/icons/stop16.png"), [&](const GUI::Action&) { + auto stop_action = GUI::Action::create("Stop process", { Mod_Ctrl, Key_S }, Gfx::Bitmap::load_from_file("/res/icons/16x16/stop-hand.png"), [&](const GUI::Action&) { pid_t pid = selected_id(ProcessModel::Column::PID); if (pid != -1) kill(pid, SIGSTOP); }); - auto continue_action = GUI::Action::create("Continue process", { Mod_Ctrl, Key_C }, Gfx::Bitmap::load_from_file("/res/icons/continue16.png"), [&](const GUI::Action&) { + auto continue_action = GUI::Action::create("Continue process", { Mod_Ctrl, Key_C }, Gfx::Bitmap::load_from_file("/res/icons/16x16/continue.png"), [&](const GUI::Action&) { pid_t pid = selected_id(ProcessModel::Column::PID); if (pid != -1) kill(pid, SIGCONT); diff --git a/Applications/Terminal/main.cpp b/Applications/Terminal/main.cpp index 73e3da7e1a..abd4be317e 100644 --- a/Applications/Terminal/main.cpp +++ b/Applications/Terminal/main.cpp @@ -280,7 +280,7 @@ int main(int argc, char** argv) perror("disown"); } })); - app_menu.add_action(GUI::Action::create("Settings...", Gfx::Bitmap::load_from_file("/res/icons/gear16.png"), + app_menu.add_action(GUI::Action::create("Settings...", Gfx::Bitmap::load_from_file("/res/icons/16x16/gear.png"), [&](const GUI::Action&) { if (!settings_window) { settings_window = create_settings_window(terminal); diff --git a/Base/res/icons/16x16/audio-volume-high.png b/Base/res/icons/16x16/audio-volume-high.png new file mode 100644 index 0000000000000000000000000000000000000000..2ef602a4bb8a937a3e54b878a740b4a31a1d0ffc GIT binary patch literal 190 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7T0LDHLo7}wCrF%mU_UYG zhUs(7qCdwM3LX_u%b9gulyyP3p;D$x+G2?h@@gM{Kljf$mv-bCtBAOcUt!vb;3o+` zzJ3H~L{@hrv)#xBPF3#BgZaoEFXFuVTm57)9i|I-r^e%yb&u2rV@#v*}i s9Rnvr8=VP95@$)QoHrq3+LV{<49|3J6RMUOfZWC4>FVdQ&MBb@08X?@SO5S3 literal 0 HcmV?d00001 diff --git a/Base/res/icons/16x16/audio-volume-low.png b/Base/res/icons/16x16/audio-volume-low.png new file mode 100644 index 0000000000000000000000000000000000000000..b93e4a66175a062dccaf4632ad2cbd5c601b86dd GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7>O5T>Lo7}wCrF%mU~kwp zqagEK@RJ0E>ka>3cQJL8sR_@T{NLEXz~IlnpOZ7zFW8Y#*k$ZIPl^5T`uY1Ov`T)I zY)U$yzv65Ln}9sq{)JK(_c-ifG?-og_lIlQp8x3y2|w;XUia1Bf8t~Nm5nDjj(*tS nAf$fR)I)DUZjf9B1H+SB2HAf$iZ5YcU|{fc^>bP0l+XkKAlOQg literal 0 HcmV?d00001 diff --git a/Base/res/icons/16x16/audio-volume-medium.png b/Base/res/icons/16x16/audio-volume-medium.png new file mode 100644 index 0000000000000000000000000000000000000000..53fadc34ff41f0da6d0154891b2f6428804de346 GIT binary patch literal 194 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7Iz3$+Lo7}wCrF%mU~kwp zqagEK@Dqho203hh;=@H6^p16$7Em*Z{%34pVDRVPPvO~bBX}JP4?Yq}Z?kdbYm2w9 z7fiKoW8A;MY_X(6jl#dSESJwrAK4D%{QLS?{N~4h^BWr<*7xte_TR>}?|;N1fqVrc xCqo;Z2}crVNp_a;PU7zHo0_8fw2__Rw6$5r%}4C-85kHCJYD@<);T3K0RY~IOD+Ha literal 0 HcmV?d00001 diff --git a/Base/res/icons/16x16/audio-volume-muted.png b/Base/res/icons/16x16/audio-volume-muted.png new file mode 100644 index 0000000000000000000000000000000000000000..bd0d79bc078c0a261b3197de7d7b3634690fe064 GIT binary patch literal 232 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7)_b}*hFF|VPLMeBz}~QH zMnUGe;3o+RCmX&WWHgZezh0Xw;eb-#{f7MW^A3sr|MydP-Ot;bmsi9d=y>yH`Lty` zF+rDjqFL;Xf9!dl`s3Rh&E_v3FZZ~#ALJ7)Ys)`BPiU>=;fDM6^@atWp2juR-=;Kr zd(CQm62b9b`{;+aH-p=@F4`Y>sO3gPgXQdp*U!iE%+=QuPUY~@Iq>HXw-ooKka>3cQJL8sd1aB|Nr-Mat3oi%m$02GZp3}+XAwPavm==OAR4AD5BoFI|$VZMi9 zOUgW@WbMeH?~+D zovG+QvH9Wk^YJ@!5)WMX!kxuDOKlCqx|il5hO<6@$Zop%;q`I-Nspe|GczClFITSn zMB%vDmk$?`TatF%pKv5mNEaloaXvXgLgRz{ zbQWQ=qm^AUJV&yA>|dwBu>Pu#hu@F$2M!$g@cX&{9>3<>8!V2_RP>+N{P6nu_!FOc zUd(zRRp;pIcDdm;|Nezs7w5D@GoN`9Z(k=U`|iJ_gv7t^JF@?t4}S8)|HS2<0G{vM mlPnT%PsmwdlX*dofnlPQLAKoC+HeL21_n=8KbLh*2~7YNgGo*R diff --git a/Base/res/icons/audio-volume-medium.png b/Base/res/icons/audio-volume-medium.png deleted file mode 100644 index d1906915787b4cf9e51f134e62eb6d1913d33dd6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 192 zcmeAS@N?(olHy`uVBq!ia0vp@3=9kc9Bd2>3}+XAwPavmX!mq+4AD5BoFI|$L4Ll9 zuo-Vb z_iS5`@r!jUqp$G4h9A74JvazH3JUZD w@O+n^WZ}cC92Y$?M`?zY#EC$UXa3}+XAwPavmSnKKH7@~1LIYA=hgZz9I zVKd&!E*Tyc)4lwB4Kx4L#|ARQ2zkl`U*4YX|B$Qh{~yllAKu;!USno>D5oMT^V9)V z)w3I1KNvTkua0ZWKR?gNL*D*u$8~?}kQ3}+XAwPavm$ntb?4AD5BoFI|$L4Ll9 zuo-VfLX*4V_j<_)Q^Y7>WO|u@D>G~C>od|xC@Z;-e@sG3W9CH;sFXyjF znly)f^TX@?@hV48*R!#;{kMG=_5ZVoWk;8~n?~F3-X~WaPN;2~B>0zsp-@IAKh5&j Rb_NCp22WQ%mvv4FO#m%-KuQ1r diff --git a/Base/res/welcome.txt b/Base/res/welcome.txt index 8e4a900055..ea8605ea7b 100644 --- a/Base/res/welcome.txt +++ b/Base/res/welcome.txt @@ -55,7 +55,7 @@ This is all possibly by using HackStudio, Visual Builder, Terminal, and the (optional) GNU tools. * Multimedia -$ /res/icons/audio-volume-medium.png +$ /res/icons/16x16/audio-volume-medium.png > Draw while playing your favorite songs! Serenity includes the Piano, which allows you to create your own tunes by simply pressing keys on the keyboard. You can pick the wavetype, octave, and diff --git a/Demos/WidgetGallery/main.cpp b/Demos/WidgetGallery/main.cpp index 71a1fc6630..26d8605cac 100644 --- a/Demos/WidgetGallery/main.cpp +++ b/Demos/WidgetGallery/main.cpp @@ -195,9 +195,9 @@ int main(int argc, char** argv) button_vert2_container.set_layout(); auto& button1 = button_vert1_container.add("Button 1"); - button1.set_icon(Gfx::Bitmap::load_from_file("/res/icons/kill16.png")); + button1.set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/kill.png")); auto& button2 = button_vert1_container.add("Button 2"); - button2.set_icon(Gfx::Bitmap::load_from_file("/res/icons/kill16.png")); + button2.set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/kill.png")); button2.set_enabled(false); auto& button3 = button_vert2_container.add("\xF0\x9F\x98\x88 Button 3"); (void)button3; diff --git a/DevTools/HackStudio/Editor.cpp b/DevTools/HackStudio/Editor.cpp index 1374bd35e3..322ba6220c 100644 --- a/DevTools/HackStudio/Editor.cpp +++ b/DevTools/HackStudio/Editor.cpp @@ -392,7 +392,7 @@ void Editor::clear_execution_position() const Gfx::Bitmap& Editor::breakpoint_icon_bitmap() { - static auto bitmap = Gfx::Bitmap::load_from_file("/res/icons/breakpoint.png"); + static auto bitmap = Gfx::Bitmap::load_from_file("/res/icons/16x16/breakpoint.png"); return *bitmap; } diff --git a/Libraries/LibGUI/Action.cpp b/Libraries/LibGUI/Action.cpp index 34ea0c4037..fc98dce345 100644 --- a/Libraries/LibGUI/Action.cpp +++ b/Libraries/LibGUI/Action.cpp @@ -87,7 +87,7 @@ NonnullRefPtr make_copy_action(Function callback, Core::O NonnullRefPtr make_paste_action(Function callback, Core::Object* parent) { - return Action::create("Paste", { Mod_Ctrl, Key_V }, Gfx::Bitmap::load_from_file("/res/icons/paste16.png"), move(callback), parent); + return Action::create("Paste", { Mod_Ctrl, Key_V }, Gfx::Bitmap::load_from_file("/res/icons/16x16/paste.png"), move(callback), parent); } NonnullRefPtr make_fullscreen_action(Function callback, Core::Object* parent) diff --git a/Libraries/LibVT/TerminalWidget.cpp b/Libraries/LibVT/TerminalWidget.cpp index f9365075c9..71aaa0b57f 100644 --- a/Libraries/LibVT/TerminalWidget.cpp +++ b/Libraries/LibVT/TerminalWidget.cpp @@ -129,7 +129,7 @@ TerminalWidget::TerminalWidget(int ptm_fd, bool automatic_size_policy, RefPtr(window()); m_slider_window->set_frameless(true); diff --git a/MenuApplets/ClipboardHistory/main.cpp b/MenuApplets/ClipboardHistory/main.cpp index ff53f13df8..17400eb97c 100644 --- a/MenuApplets/ClipboardHistory/main.cpp +++ b/MenuApplets/ClipboardHistory/main.cpp @@ -77,7 +77,7 @@ int main(int argc, char* argv[]) applet_window->set_title("ClipboardHistory"); applet_window->set_window_type(GUI::WindowType::MenuApplet); auto& icon = applet_window->set_main_widget(); - icon.load_from_file("/res/icons/clipboard.png"); + icon.load_from_file("/res/icons/16x16/clipboard.png"); icon.set_fill_with_background_color(true); icon.on_click = [& main_window = *main_window] { main_window.show();