Merge pull request #9621 from djrm/Icons
Added some missing icons, fixed search button as zoom in some ui elem…
@ -47,6 +47,10 @@ void EditorAudioBus::_notification(int p_what) {
|
|||||||
|
|
||||||
disabled_vu = get_icon("BusVuFrozen", "EditorIcons");
|
disabled_vu = get_icon("BusVuFrozen", "EditorIcons");
|
||||||
|
|
||||||
|
solo->set_icon(get_icon("AudioBusSolo", "EditorIcons"));
|
||||||
|
mute->set_icon(get_icon("AudioBusMute", "EditorIcons"));
|
||||||
|
bypass->set_icon(get_icon("AudioBusBypass", "EditorIcons"));
|
||||||
|
|
||||||
prev_active = true;
|
prev_active = true;
|
||||||
update_bus();
|
update_bus();
|
||||||
set_process(true);
|
set_process(true);
|
||||||
@ -630,24 +634,24 @@ EditorAudioBus::EditorAudioBus(EditorAudioBuses *p_buses) {
|
|||||||
vb->add_child(hbc);
|
vb->add_child(hbc);
|
||||||
hbc->add_spacer();
|
hbc->add_spacer();
|
||||||
solo = memnew(ToolButton);
|
solo = memnew(ToolButton);
|
||||||
solo->set_text("S");
|
|
||||||
solo->set_toggle_mode(true);
|
solo->set_toggle_mode(true);
|
||||||
|
solo->set_tooltip(TTR("Solo"));
|
||||||
solo->add_color_override("font_color_pressed", Color(0.2, 0.9, 0.2));
|
solo->add_color_override("font_color_pressed", Color(0.2, 0.9, 0.2));
|
||||||
solo->add_color_override("font_color_hover", Color(0.6, 0.9, 0.6));
|
solo->add_color_override("font_color_hover", Color(0.6, 0.9, 0.6));
|
||||||
solo->set_focus_mode(FOCUS_NONE);
|
solo->set_focus_mode(FOCUS_NONE);
|
||||||
solo->connect("pressed", this, "_solo_toggled");
|
solo->connect("pressed", this, "_solo_toggled");
|
||||||
hbc->add_child(solo);
|
hbc->add_child(solo);
|
||||||
mute = memnew(ToolButton);
|
mute = memnew(ToolButton);
|
||||||
mute->set_text("M");
|
|
||||||
mute->set_toggle_mode(true);
|
mute->set_toggle_mode(true);
|
||||||
|
mute->set_tooltip(TTR("Mute"));
|
||||||
mute->add_color_override("font_color_pressed", Color(0.9, 0.2, 0.2));
|
mute->add_color_override("font_color_pressed", Color(0.9, 0.2, 0.2));
|
||||||
mute->add_color_override("font_color_hover", Color(0.9, 0.6, 0.6));
|
mute->add_color_override("font_color_hover", Color(0.9, 0.6, 0.6));
|
||||||
mute->set_focus_mode(FOCUS_NONE);
|
mute->set_focus_mode(FOCUS_NONE);
|
||||||
mute->connect("pressed", this, "_mute_toggled");
|
mute->connect("pressed", this, "_mute_toggled");
|
||||||
hbc->add_child(mute);
|
hbc->add_child(mute);
|
||||||
bypass = memnew(ToolButton);
|
bypass = memnew(ToolButton);
|
||||||
bypass->set_text("B");
|
|
||||||
bypass->set_toggle_mode(true);
|
bypass->set_toggle_mode(true);
|
||||||
|
bypass->set_tooltip(TTR("Bypass"));
|
||||||
bypass->add_color_override("font_color_pressed", Color(0.9, 0.9, 0.2));
|
bypass->add_color_override("font_color_pressed", Color(0.9, 0.9, 0.2));
|
||||||
bypass->add_color_override("font_color_hover", Color(0.9, 0.9, 0.6));
|
bypass->add_color_override("font_color_hover", Color(0.9, 0.9, 0.6));
|
||||||
bypass->set_focus_mode(FOCUS_NONE);
|
bypass->set_focus_mode(FOCUS_NONE);
|
||||||
|
@ -5899,7 +5899,7 @@ EditorNode::EditorNode() {
|
|||||||
search_button = memnew(ToolButton);
|
search_button = memnew(ToolButton);
|
||||||
search_button->set_toggle_mode(true);
|
search_button->set_toggle_mode(true);
|
||||||
search_button->set_pressed(false);
|
search_button->set_pressed(false);
|
||||||
search_button->set_icon(gui_base->get_icon("Zoom", "EditorIcons"));
|
search_button->set_icon(gui_base->get_icon("Search", "EditorIcons"));
|
||||||
prop_editor_hb->add_child(search_button);
|
prop_editor_hb->add_child(search_button);
|
||||||
search_button->connect("toggled", this, "_toggle_search_bar");
|
search_button->connect("toggled", this, "_toggle_search_bar");
|
||||||
|
|
||||||
|
@ -153,7 +153,7 @@ void FileSystemDock::_notification(int p_what) {
|
|||||||
files->connect("item_activated", this, "_select_file");
|
files->connect("item_activated", this, "_select_file");
|
||||||
button_hist_next->connect("pressed", this, "_fw_history");
|
button_hist_next->connect("pressed", this, "_fw_history");
|
||||||
button_hist_prev->connect("pressed", this, "_bw_history");
|
button_hist_prev->connect("pressed", this, "_bw_history");
|
||||||
search_icon->set_texture(get_icon("Zoom", "EditorIcons"));
|
search_icon->set_texture(get_icon("Search", "EditorIcons"));
|
||||||
|
|
||||||
button_hist_next->set_icon(get_icon("Forward", "EditorIcons"));
|
button_hist_next->set_icon(get_icon("Forward", "EditorIcons"));
|
||||||
button_hist_prev->set_icon(get_icon("Back", "EditorIcons"));
|
button_hist_prev->set_icon(get_icon("Back", "EditorIcons"));
|
||||||
|
Before Width: | Height: | Size: 421 B After Width: | Height: | Size: 264 B |
Before Width: | Height: | Size: 421 B After Width: | Height: | Size: 264 B |
Before Width: | Height: | Size: 769 B After Width: | Height: | Size: 769 B |
BIN
editor/icons/2x/icon_audio_stream_player_2_d.png
Normal file
After Width: | Height: | Size: 782 B |
BIN
editor/icons/2x/icon_audio_stream_sample.png
Normal file
After Width: | Height: | Size: 712 B |
Before Width: | Height: | Size: 148 B After Width: | Height: | Size: 152 B |
Before Width: | Height: | Size: 186 B After Width: | Height: | Size: 456 B |
Before Width: | Height: | Size: 251 B After Width: | Height: | Size: 529 B |
BIN
editor/icons/2x/icon_capsule_mesh.png
Normal file
After Width: | Height: | Size: 767 B |
Before Width: | Height: | Size: 289 B After Width: | Height: | Size: 285 B |
Before Width: | Height: | Size: 694 B After Width: | Height: | Size: 614 B |
BIN
editor/icons/2x/icon_cube_mesh.png
Normal file
After Width: | Height: | Size: 681 B |
BIN
editor/icons/2x/icon_curve.png
Normal file
After Width: | Height: | Size: 607 B |
BIN
editor/icons/2x/icon_cylinder_mesh.png
Normal file
After Width: | Height: | Size: 650 B |
Before Width: | Height: | Size: 1018 B After Width: | Height: | Size: 900 B |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 505 B After Width: | Height: | Size: 934 B |
Before Width: | Height: | Size: 342 B After Width: | Height: | Size: 397 B |
BIN
editor/icons/2x/icon_g_d_native_library.png
Normal file
After Width: | Height: | Size: 677 B |
BIN
editor/icons/2x/icon_godot.png
Normal file
After Width: | Height: | Size: 1.7 KiB |
BIN
editor/icons/2x/icon_gradient.png
Normal file
After Width: | Height: | Size: 249 B |
Before Width: | Height: | Size: 138 B After Width: | Height: | Size: 378 B |
Before Width: | Height: | Size: 224 B After Width: | Height: | Size: 470 B |
Before Width: | Height: | Size: 324 B After Width: | Height: | Size: 688 B |
Before Width: | Height: | Size: 360 B After Width: | Height: | Size: 424 B |
Before Width: | Height: | Size: 323 B After Width: | Height: | Size: 223 B |
Before Width: | Height: | Size: 228 B After Width: | Height: | Size: 523 B |
BIN
editor/icons/2x/icon_multi_script.png
Normal file
After Width: | Height: | Size: 586 B |
Before Width: | Height: | Size: 162 B After Width: | Height: | Size: 163 B |
Before Width: | Height: | Size: 228 B After Width: | Height: | Size: 523 B |
Before Width: | Height: | Size: 366 B After Width: | Height: | Size: 527 B |
BIN
editor/icons/2x/icon_panorama_sky.png
Normal file
After Width: | Height: | Size: 661 B |
BIN
editor/icons/2x/icon_plane_mesh.png
Normal file
After Width: | Height: | Size: 535 B |
BIN
editor/icons/2x/icon_prism_mesh.png
Normal file
After Width: | Height: | Size: 612 B |
BIN
editor/icons/2x/icon_procedural_sky.png
Normal file
After Width: | Height: | Size: 639 B |
BIN
editor/icons/2x/icon_quad_mesh.png
Normal file
After Width: | Height: | Size: 291 B |
Before Width: | Height: | Size: 160 B After Width: | Height: | Size: 151 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1003 B |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.0 KiB |
Before Width: | Height: | Size: 180 B After Width: | Height: | Size: 393 B |
BIN
editor/icons/2x/icon_sphere_mesh.png
Normal file
After Width: | Height: | Size: 979 B |
Before Width: | Height: | Size: 201 B After Width: | Height: | Size: 203 B |
Before Width: | Height: | Size: 909 B After Width: | Height: | Size: 765 B |
Before Width: | Height: | Size: 425 B After Width: | Height: | Size: 753 B |
Before Width: | Height: | Size: 759 B After Width: | Height: | Size: 544 B |
Before Width: | Height: | Size: 417 B After Width: | Height: | Size: 211 B |
Before Width: | Height: | Size: 231 B After Width: | Height: | Size: 461 B |
Before Width: | Height: | Size: 328 B After Width: | Height: | Size: 791 B |
Before Width: | Height: | Size: 391 B After Width: | Height: | Size: 442 B |
Before Width: | Height: | Size: 501 B After Width: | Height: | Size: 380 B |
Before Width: | Height: | Size: 707 B After Width: | Height: | Size: 728 B |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 291 B After Width: | Height: | Size: 218 B |
Before Width: | Height: | Size: 291 B After Width: | Height: | Size: 218 B |
BIN
editor/icons/icon_audio_stream_player.png
Normal file
After Width: | Height: | Size: 443 B |
BIN
editor/icons/icon_audio_stream_player_2_d.png
Normal file
After Width: | Height: | Size: 445 B |
BIN
editor/icons/icon_audio_stream_sample.png
Normal file
After Width: | Height: | Size: 425 B |
Before Width: | Height: | Size: 113 B After Width: | Height: | Size: 119 B |
Before Width: | Height: | Size: 163 B After Width: | Height: | Size: 274 B |
Before Width: | Height: | Size: 165 B After Width: | Height: | Size: 283 B |
BIN
editor/icons/icon_capsule_mesh.png
Normal file
After Width: | Height: | Size: 408 B |
Before Width: | Height: | Size: 214 B After Width: | Height: | Size: 232 B |
Before Width: | Height: | Size: 330 B After Width: | Height: | Size: 343 B |
BIN
editor/icons/icon_cube_mesh.png
Normal file
After Width: | Height: | Size: 447 B |
Before Width: | Height: | Size: 315 B After Width: | Height: | Size: 339 B |
BIN
editor/icons/icon_cylinder_mesh.png
Normal file
After Width: | Height: | Size: 364 B |
Before Width: | Height: | Size: 492 B After Width: | Height: | Size: 455 B |
Before Width: | Height: | Size: 588 B After Width: | Height: | Size: 506 B |
Before Width: | Height: | Size: 317 B After Width: | Height: | Size: 509 B |
Before Width: | Height: | Size: 220 B After Width: | Height: | Size: 241 B |
BIN
editor/icons/icon_g_d_native_library.png
Normal file
After Width: | Height: | Size: 360 B |
BIN
editor/icons/icon_godot.png
Normal file
After Width: | Height: | Size: 739 B |
BIN
editor/icons/icon_gradient.png
Normal file
After Width: | Height: | Size: 180 B |
Before Width: | Height: | Size: 122 B After Width: | Height: | Size: 268 B |
BIN
editor/icons/icon_h_button_array.png
Normal file
After Width: | Height: | Size: 298 B |
Before Width: | Height: | Size: 205 B After Width: | Height: | Size: 381 B |
Before Width: | Height: | Size: 204 B After Width: | Height: | Size: 224 B |
Before Width: | Height: | Size: 201 B After Width: | Height: | Size: 152 B |
Before Width: | Height: | Size: 170 B After Width: | Height: | Size: 271 B |
BIN
editor/icons/icon_multi_script.png
Normal file
After Width: | Height: | Size: 318 B |
Before Width: | Height: | Size: 128 B After Width: | Height: | Size: 142 B |
Before Width: | Height: | Size: 170 B After Width: | Height: | Size: 271 B |
Before Width: | Height: | Size: 218 B After Width: | Height: | Size: 324 B |
BIN
editor/icons/icon_panorama_sky.png
Normal file
After Width: | Height: | Size: 354 B |
BIN
editor/icons/icon_plane_mesh.png
Normal file
After Width: | Height: | Size: 328 B |
BIN
editor/icons/icon_prism_mesh.png
Normal file
After Width: | Height: | Size: 448 B |
BIN
editor/icons/icon_procedural_sky.png
Normal file
After Width: | Height: | Size: 339 B |
BIN
editor/icons/icon_quad_mesh.png
Normal file
After Width: | Height: | Size: 244 B |
Before Width: | Height: | Size: 128 B After Width: | Height: | Size: 141 B |
Before Width: | Height: | Size: 530 B After Width: | Height: | Size: 506 B |
Before Width: | Height: | Size: 552 B After Width: | Height: | Size: 542 B |
Before Width: | Height: | Size: 150 B After Width: | Height: | Size: 247 B |
BIN
editor/icons/icon_sphere_mesh.png
Normal file
After Width: | Height: | Size: 495 B |
Before Width: | Height: | Size: 158 B After Width: | Height: | Size: 166 B |
Before Width: | Height: | Size: 447 B After Width: | Height: | Size: 378 B |
Before Width: | Height: | Size: 263 B After Width: | Height: | Size: 400 B |
Before Width: | Height: | Size: 392 B After Width: | Height: | Size: 298 B |