Merge pull request from djrm/Icons

Added some missing icons, fixed search button as zoom in some ui elem…
This commit is contained in:
Rémi Verschelde 2017-07-13 11:50:28 +02:00 committed by GitHub
commit 5cd4fdfda5
182 changed files with 2162 additions and 3240 deletions
editor
editor_audio_buses.cppeditor_node.cppfilesystem_dock.cpp
icons
2x
icon_animation_tree.pngicon_animation_tree_player.pngicon_audio_stream_player.pngicon_audio_stream_player_2_d.pngicon_audio_stream_sample.pngicon_bit_map.pngicon_button.pngicon_button_group.pngicon_capsule_mesh.pngicon_color_rect.pngicon_confirmation_dialog.pngicon_cube_mesh.pngicon_curve.pngicon_cylinder_mesh.pngicon_debug.pngicon_environment.pngicon_file_big.pngicon_file_dialog.pngicon_g_d_native_library.pngicon_godot.pngicon_gradient.pngicon_grid_map.pngicon_h_button_array.pngicon_h_scroll_bar.pngicon_h_slider.pngicon_line_edit.pngicon_load.pngicon_multi_script.pngicon_nine_patch_rect.pngicon_open.pngicon_option_button.pngicon_panorama_sky.pngicon_plane_mesh.pngicon_prism_mesh.pngicon_procedural_sky.pngicon_quad_mesh.pngicon_reference_rect.pngicon_remote_transform.pngicon_remote_transform_2d.pngicon_slider_joint.pngicon_sphere_mesh.pngicon_texture_rect.pngicon_timer.pngicon_tool_button.pngicon_tools.png

View File

@ -47,6 +47,10 @@ void EditorAudioBus::_notification(int p_what) {
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;
update_bus();
set_process(true);
@ -630,24 +634,24 @@ EditorAudioBus::EditorAudioBus(EditorAudioBuses *p_buses) {
vb->add_child(hbc);
hbc->add_spacer();
solo = memnew(ToolButton);
solo->set_text("S");
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_hover", Color(0.6, 0.9, 0.6));
solo->set_focus_mode(FOCUS_NONE);
solo->connect("pressed", this, "_solo_toggled");
hbc->add_child(solo);
mute = memnew(ToolButton);
mute->set_text("M");
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_hover", Color(0.9, 0.6, 0.6));
mute->set_focus_mode(FOCUS_NONE);
mute->connect("pressed", this, "_mute_toggled");
hbc->add_child(mute);
bypass = memnew(ToolButton);
bypass->set_text("B");
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_hover", Color(0.9, 0.9, 0.6));
bypass->set_focus_mode(FOCUS_NONE);

View File

@ -5899,7 +5899,7 @@ EditorNode::EditorNode() {
search_button = memnew(ToolButton);
search_button->set_toggle_mode(true);
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);
search_button->connect("toggled", this, "_toggle_search_bar");

View File

@ -153,7 +153,7 @@ void FileSystemDock::_notification(int p_what) {
files->connect("item_activated", this, "_select_file");
button_hist_next->connect("pressed", this, "_fw_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_prev->set_icon(get_icon("Back", "EditorIcons"));

Binary file not shown.

Before

(image error) Size: 421 B

After

(image error) Size: 264 B

Binary file not shown.

Before

(image error) Size: 421 B

After

(image error) Size: 264 B

View File

Before

(image error) Size: 769 B

After

(image error) Size: 769 B

Binary file not shown.

After

(image error) Size: 782 B

Binary file not shown.

After

(image error) Size: 712 B

Binary file not shown.

Before

(image error) Size: 148 B

After

(image error) Size: 152 B

Binary file not shown.

Before

(image error) Size: 186 B

After

(image error) Size: 456 B

Binary file not shown.

Before

(image error) Size: 251 B

After

(image error) Size: 529 B

Binary file not shown.

After

(image error) Size: 767 B

Binary file not shown.

Before

(image error) Size: 289 B

After

(image error) Size: 285 B

Binary file not shown.

Before

(image error) Size: 694 B

After

(image error) Size: 614 B

Binary file not shown.

After

(image error) Size: 681 B

Binary file not shown.

After

(image error) Size: 607 B

Binary file not shown.

After

(image error) Size: 650 B

Binary file not shown.

Before

(image error) Size: 1018 B

After

(image error) Size: 900 B

Binary file not shown.

Before

(image error) Size: 1.2 KiB

After

(image error) Size: 1.2 KiB

Binary file not shown.

Before

(image error) Size: 505 B

After

(image error) Size: 934 B

Binary file not shown.

Before

(image error) Size: 342 B

After

(image error) Size: 397 B

Binary file not shown.

After

(image error) Size: 677 B

Binary file not shown.

After

(image error) Size: 1.7 KiB

Binary file not shown.

After

(image error) Size: 249 B

Binary file not shown.

Before

(image error) Size: 138 B

After

(image error) Size: 378 B

Binary file not shown.

Before

(image error) Size: 224 B

After

(image error) Size: 470 B

Binary file not shown.

Before

(image error) Size: 324 B

After

(image error) Size: 688 B

Binary file not shown.

Before

(image error) Size: 360 B

After

(image error) Size: 424 B

Binary file not shown.

Before

(image error) Size: 323 B

After

(image error) Size: 223 B

Binary file not shown.

Before

(image error) Size: 228 B

After

(image error) Size: 523 B

Binary file not shown.

After

(image error) Size: 586 B

Binary file not shown.

Before

(image error) Size: 162 B

After

(image error) Size: 163 B

Binary file not shown.

Before

(image error) Size: 228 B

After

(image error) Size: 523 B

Binary file not shown.

Before

(image error) Size: 366 B

After

(image error) Size: 527 B

Binary file not shown.

After

(image error) Size: 661 B

Binary file not shown.

After

(image error) Size: 535 B

Binary file not shown.

After

(image error) Size: 612 B

Binary file not shown.

After

(image error) Size: 639 B

Binary file not shown.

After

(image error) Size: 291 B

Binary file not shown.

Before

(image error) Size: 160 B

After

(image error) Size: 151 B

Binary file not shown.

Before

(image error) Size: 1.1 KiB

After

(image error) Size: 1003 B

Binary file not shown.

Before

(image error) Size: 1.2 KiB

After

(image error) Size: 1.0 KiB

Binary file not shown.

Before

(image error) Size: 180 B

After

(image error) Size: 393 B

Binary file not shown.

After

(image error) Size: 979 B

Binary file not shown.

Before

(image error) Size: 201 B

After

(image error) Size: 203 B

Binary file not shown.

Before

(image error) Size: 909 B

After

(image error) Size: 765 B

Binary file not shown.

Before

(image error) Size: 425 B

After

(image error) Size: 753 B

Binary file not shown.

Before

(image error) Size: 759 B

After

(image error) Size: 544 B

Binary file not shown.

Before

(image error) Size: 417 B

After

(image error) Size: 211 B

Binary file not shown.

Before

(image error) Size: 231 B

After

(image error) Size: 461 B

Binary file not shown.

Before

(image error) Size: 328 B

After

(image error) Size: 791 B

Binary file not shown.

Before

(image error) Size: 391 B

After

(image error) Size: 442 B

Binary file not shown.

Before

(image error) Size: 501 B

After

(image error) Size: 380 B

Binary file not shown.

Before

(image error) Size: 707 B

After

(image error) Size: 728 B

Binary file not shown.

Before

(image error) Size: 1.3 KiB

After

(image error) Size: 1.3 KiB

Binary file not shown.

Before

(image error) Size: 291 B

After

(image error) Size: 218 B

Binary file not shown.

Before

(image error) Size: 291 B

After

(image error) Size: 218 B

Binary file not shown.

After

(image error) Size: 443 B

Binary file not shown.

After

(image error) Size: 445 B

Binary file not shown.

After

(image error) Size: 425 B

Binary file not shown.

Before

(image error) Size: 113 B

After

(image error) Size: 119 B

Binary file not shown.

Before

(image error) Size: 163 B

After

(image error) Size: 274 B

Binary file not shown.

Before

(image error) Size: 165 B

After

(image error) Size: 283 B

Binary file not shown.

After

(image error) Size: 408 B

Binary file not shown.

Before

(image error) Size: 214 B

After

(image error) Size: 232 B

Binary file not shown.

Before

(image error) Size: 330 B

After

(image error) Size: 343 B

Binary file not shown.

After

(image error) Size: 447 B

Binary file not shown.

Before

(image error) Size: 315 B

After

(image error) Size: 339 B

Binary file not shown.

After

(image error) Size: 364 B

Binary file not shown.

Before

(image error) Size: 492 B

After

(image error) Size: 455 B

Binary file not shown.

Before

(image error) Size: 588 B

After

(image error) Size: 506 B

Binary file not shown.

Before

(image error) Size: 317 B

After

(image error) Size: 509 B

Binary file not shown.

Before

(image error) Size: 220 B

After

(image error) Size: 241 B

Binary file not shown.

After

(image error) Size: 360 B

BIN
editor/icons/icon_godot.png Normal file

Binary file not shown.

After

(image error) Size: 739 B

Binary file not shown.

After

(image error) Size: 180 B

Binary file not shown.

Before

(image error) Size: 122 B

After

(image error) Size: 268 B

Binary file not shown.

After

(image error) Size: 298 B

Binary file not shown.

Before

(image error) Size: 205 B

After

(image error) Size: 381 B

Binary file not shown.

Before

(image error) Size: 204 B

After

(image error) Size: 224 B

Binary file not shown.

Before

(image error) Size: 201 B

After

(image error) Size: 152 B

Binary file not shown.

Before

(image error) Size: 170 B

After

(image error) Size: 271 B

Binary file not shown.

After

(image error) Size: 318 B

Binary file not shown.

Before

(image error) Size: 128 B

After

(image error) Size: 142 B

Binary file not shown.

Before

(image error) Size: 170 B

After

(image error) Size: 271 B

Binary file not shown.

Before

(image error) Size: 218 B

After

(image error) Size: 324 B

Binary file not shown.

After

(image error) Size: 354 B

Binary file not shown.

After

(image error) Size: 328 B

Binary file not shown.

After

(image error) Size: 448 B

Binary file not shown.

After

(image error) Size: 339 B

Binary file not shown.

After

(image error) Size: 244 B

Binary file not shown.

Before

(image error) Size: 128 B

After

(image error) Size: 141 B

Binary file not shown.

Before

(image error) Size: 530 B

After

(image error) Size: 506 B

Binary file not shown.

Before

(image error) Size: 552 B

After

(image error) Size: 542 B

Binary file not shown.

Before

(image error) Size: 150 B

After

(image error) Size: 247 B

Binary file not shown.

After

(image error) Size: 495 B

Binary file not shown.

Before

(image error) Size: 158 B

After

(image error) Size: 166 B

Binary file not shown.

Before

(image error) Size: 447 B

After

(image error) Size: 378 B

Binary file not shown.

Before

(image error) Size: 263 B

After

(image error) Size: 400 B

Binary file not shown.

Before

(image error) Size: 392 B

After

(image error) Size: 298 B

Some files were not shown because too many files have changed in this diff Show More