diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2017-01-14 10:52:54 +0100 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2017-01-14 10:52:54 +0100 |
commit | 7b9f2d9929d0e8516d42379962533df823c7c550 (patch) | |
tree | b7901c8146209506889d18f6bb01d65f7a8c7a07 /tools | |
parent | 6c512b88c22cb9615a03deb000447e97c20c7080 (diff) |
Finish renaming *Frame GUI classes to *Rect
ReferenceFrame had been overlooked, and the cpp files still used the old
names. Also ripgrep'ed it all to find some forgotten references.
Diffstat (limited to 'tools')
-rw-r--r-- | tools/editor/animation_editor.h | 2 | ||||
-rw-r--r-- | tools/editor/editor_file_dialog.h | 2 | ||||
-rw-r--r-- | tools/editor/editor_log.h | 2 | ||||
-rw-r--r-- | tools/editor/editor_profiler.h | 2 | ||||
-rw-r--r-- | tools/editor/icons/2x/icon_patch_9_rect.png (renamed from tools/editor/icons/2x/icon_patch_9_frame.png) | bin | 162 -> 162 bytes | |||
-rw-r--r-- | tools/editor/icons/2x/icon_reference_rect.png (renamed from tools/editor/icons/2x/icon_reference_frame.png) | bin | 160 -> 160 bytes | |||
-rw-r--r-- | tools/editor/icons/2x/icon_texture_rect.png (renamed from tools/editor/icons/2x/icon_texture_frame.png) | bin | 201 -> 201 bytes | |||
-rw-r--r-- | tools/editor/icons/icon_patch_9_rect.png (renamed from tools/editor/icons/icon_patch_9_frame.png) | bin | 128 -> 128 bytes | |||
-rw-r--r-- | tools/editor/icons/icon_reference_rect.png (renamed from tools/editor/icons/icon_reference_frame.png) | bin | 128 -> 128 bytes | |||
-rw-r--r-- | tools/editor/icons/icon_texture_rect.png (renamed from tools/editor/icons/icon_texture_frame.png) | bin | 158 -> 158 bytes | |||
-rw-r--r-- | tools/editor/icons/source/icon_patch_9_rect.svg (renamed from tools/editor/icons/source/icon_patch_9_frame.svg) | 2 | ||||
-rw-r--r-- | tools/editor/icons/source/icon_reference_rect.svg (renamed from tools/editor/icons/source/icon_reference_frame.svg) | 2 | ||||
-rw-r--r-- | tools/editor/icons/source/icon_texture_rect.svg (renamed from tools/editor/icons/source/icon_texture_frame.svg) | 2 | ||||
-rw-r--r-- | tools/editor/plugins/canvas_item_editor_plugin.cpp | 12 | ||||
-rw-r--r-- | tools/editor/plugins/style_box_editor_plugin.h | 2 | ||||
-rw-r--r-- | tools/editor/plugins/texture_region_editor_plugin.cpp | 2 | ||||
-rw-r--r-- | tools/editor/plugins/texture_region_editor_plugin.h | 2 | ||||
-rw-r--r-- | tools/editor/plugins/theme_editor_plugin.h | 2 | ||||
-rw-r--r-- | tools/editor/project_manager.cpp | 2 | ||||
-rw-r--r-- | tools/editor/property_editor.h | 2 |
20 files changed, 19 insertions, 19 deletions
diff --git a/tools/editor/animation_editor.h b/tools/editor/animation_editor.h index 8ae706dfa8..c4539cd763 100644 --- a/tools/editor/animation_editor.h +++ b/tools/editor/animation_editor.h @@ -33,7 +33,7 @@ #include "scene/gui/slider.h" #include "scene/gui/menu_button.h" #include "scene/gui/spin_box.h" -#include "scene/gui/texture_frame.h" +#include "scene/gui/texture_rect.h" #include "scene/gui/scroll_bar.h" #include "scene/gui/tool_button.h" #include "scene/gui/file_dialog.h" diff --git a/tools/editor/editor_file_dialog.h b/tools/editor/editor_file_dialog.h index 04ee0cc55f..193cbc513c 100644 --- a/tools/editor/editor_file_dialog.h +++ b/tools/editor/editor_file_dialog.h @@ -35,7 +35,7 @@ #include "scene/gui/option_button.h" #include "os/dir_access.h" #include "scene/gui/box_container.h" -#include "scene/gui/texture_frame.h" +#include "scene/gui/texture_rect.h" #include "scene/gui/tool_button.h" /** @author Juan Linietsky <reduzio@gmail.com> diff --git a/tools/editor/editor_log.h b/tools/editor/editor_log.h index e59b877ea0..914b5d0c57 100644 --- a/tools/editor/editor_log.h +++ b/tools/editor/editor_log.h @@ -36,7 +36,7 @@ //#include "scene/gui/empty_control.h" #include "scene/gui/box_container.h" #include "scene/gui/panel_container.h" -#include "scene/gui/texture_frame.h" +#include "scene/gui/texture_rect.h" #include "scene/gui/tool_button.h" #include "pane_drag.h" #include "os/thread.h" diff --git a/tools/editor/editor_profiler.h b/tools/editor/editor_profiler.h index ec1cd9fb5b..52b38cdae8 100644 --- a/tools/editor/editor_profiler.h +++ b/tools/editor/editor_profiler.h @@ -3,7 +3,7 @@ #include "scene/gui/box_container.h" -#include "scene/gui/texture_frame.h" +#include "scene/gui/texture_rect.h" #include "scene/gui/button.h" #include "scene/gui/label.h" #include "scene/gui/tree.h" diff --git a/tools/editor/icons/2x/icon_patch_9_frame.png b/tools/editor/icons/2x/icon_patch_9_rect.png Binary files differindex 5762a0392e..5762a0392e 100644 --- a/tools/editor/icons/2x/icon_patch_9_frame.png +++ b/tools/editor/icons/2x/icon_patch_9_rect.png diff --git a/tools/editor/icons/2x/icon_reference_frame.png b/tools/editor/icons/2x/icon_reference_rect.png Binary files differindex 63fe559fa7..63fe559fa7 100644 --- a/tools/editor/icons/2x/icon_reference_frame.png +++ b/tools/editor/icons/2x/icon_reference_rect.png diff --git a/tools/editor/icons/2x/icon_texture_frame.png b/tools/editor/icons/2x/icon_texture_rect.png Binary files differindex 50d715dd09..50d715dd09 100644 --- a/tools/editor/icons/2x/icon_texture_frame.png +++ b/tools/editor/icons/2x/icon_texture_rect.png diff --git a/tools/editor/icons/icon_patch_9_frame.png b/tools/editor/icons/icon_patch_9_rect.png Binary files differindex bdd1467144..bdd1467144 100644 --- a/tools/editor/icons/icon_patch_9_frame.png +++ b/tools/editor/icons/icon_patch_9_rect.png diff --git a/tools/editor/icons/icon_reference_frame.png b/tools/editor/icons/icon_reference_rect.png Binary files differindex b253af477f..b253af477f 100644 --- a/tools/editor/icons/icon_reference_frame.png +++ b/tools/editor/icons/icon_reference_rect.png diff --git a/tools/editor/icons/icon_texture_frame.png b/tools/editor/icons/icon_texture_rect.png Binary files differindex 84e4a90bfb..84e4a90bfb 100644 --- a/tools/editor/icons/icon_texture_frame.png +++ b/tools/editor/icons/icon_texture_rect.png diff --git a/tools/editor/icons/source/icon_patch_9_frame.svg b/tools/editor/icons/source/icon_patch_9_rect.svg index f12789c19e..c5a09603a6 100644 --- a/tools/editor/icons/source/icon_patch_9_frame.svg +++ b/tools/editor/icons/source/icon_patch_9_rect.svg @@ -18,7 +18,7 @@ inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_center_container.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" - sodipodi:docname="icon_patch_9_frame.svg"> + sodipodi:docname="icon_patch_9_rect.svg"> <defs id="defs4" /> <sodipodi:namedview diff --git a/tools/editor/icons/source/icon_reference_frame.svg b/tools/editor/icons/source/icon_reference_rect.svg index 76c3247f1b..cee814360d 100644 --- a/tools/editor/icons/source/icon_reference_frame.svg +++ b/tools/editor/icons/source/icon_reference_rect.svg @@ -18,7 +18,7 @@ inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_center_container.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" - sodipodi:docname="icon_reference_frame.svg"> + sodipodi:docname="icon_reference_rect.svg"> <defs id="defs4" /> <sodipodi:namedview diff --git a/tools/editor/icons/source/icon_texture_frame.svg b/tools/editor/icons/source/icon_texture_rect.svg index afab41de41..88d9b4081f 100644 --- a/tools/editor/icons/source/icon_texture_frame.svg +++ b/tools/editor/icons/source/icon_texture_rect.svg @@ -18,7 +18,7 @@ inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_center_container.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" - sodipodi:docname="icon_texture_frame.svg"> + sodipodi:docname="icon_texture_rect.svg"> <defs id="defs4" /> <sodipodi:namedview diff --git a/tools/editor/plugins/canvas_item_editor_plugin.cpp b/tools/editor/plugins/canvas_item_editor_plugin.cpp index 45f97383a3..65fdababbd 100644 --- a/tools/editor/plugins/canvas_item_editor_plugin.cpp +++ b/tools/editor/plugins/canvas_item_editor_plugin.cpp @@ -41,7 +41,7 @@ #include "os/input.h" #include "tools/editor/editor_settings.h" #include "scene/gui/grid_container.h" -#include "scene/gui/patch_9_frame.h" +#include "scene/gui/patch_9_rect.h" #include "tools/editor/animation_editor.h" #include "tools/editor/plugins/animation_player_editor_plugin.h" #include "tools/editor/script_editor_debugger.h" @@ -3767,7 +3767,7 @@ void CanvasItemEditorViewport::_create_nodes(Node* parent, Node* child, String& editor_data->get_undo_redo().add_do_property(child,property,texture); // make visible for certain node type - if (default_type=="Patch9Frame") { + if (default_type=="Patch9Rect") { editor_data->get_undo_redo().add_do_property(child,"rect/size",texture_size); } else if (default_type=="Polygon2D") { PoolVector<Vector2> list; @@ -3785,7 +3785,7 @@ void CanvasItemEditorViewport::_create_nodes(Node* parent, Node* child, String& } Transform2D trans=canvas->get_canvas_transform(); Point2 target_pos = (p_point-trans.get_origin())/trans.get_scale().x-pos; - if (default_type=="Polygon2D" || default_type=="TouchScreenButton" || default_type=="TextureRect" || default_type=="Patch9Frame") { + if (default_type=="Polygon2D" || default_type=="TouchScreenButton" || default_type=="TextureRect" || default_type=="Patch9Rect") { target_pos -= texture_size/2; } editor_data->get_undo_redo().add_do_method(child,"set_pos",target_pos); @@ -3857,8 +3857,8 @@ void CanvasItemEditorViewport::_perform_drop_data(){ else if (default_type=="Particles2D") child=memnew(Particles2D); else if (default_type=="Polygon2D") child=memnew(Polygon2D); else if (default_type=="TouchScreenButton") child=memnew(TouchScreenButton); - else if (default_type=="TextureRect") child=memnew(TextureRect); - else if (default_type=="Patch9Frame") child=memnew(NinePatchRect); + else if (default_type=="TextureRect") child=memnew(TextureRect); + else if (default_type=="Patch9Rect") child=memnew(NinePatchRect); else child=memnew(Sprite); // default _create_nodes(target_node, child, path, drop_pos); @@ -3993,7 +3993,7 @@ CanvasItemEditorViewport::CanvasItemEditorViewport(EditorNode *p_node, CanvasIte types.push_back("TouchScreenButton"); // Control types.push_back("TextureRect"); - types.push_back("Patch9Frame"); + types.push_back("Patch9Rect"); target_node=NULL; editor=p_node; diff --git a/tools/editor/plugins/style_box_editor_plugin.h b/tools/editor/plugins/style_box_editor_plugin.h index b2288b8e74..29e98efd8b 100644 --- a/tools/editor/plugins/style_box_editor_plugin.h +++ b/tools/editor/plugins/style_box_editor_plugin.h @@ -30,7 +30,7 @@ #define STYLE_BOX_EDITOR_PLUGIN_H #include "scene/resources/style_box.h" -#include "scene/gui/texture_frame.h" +#include "scene/gui/texture_rect.h" #include "scene/gui/option_button.h" #include "tools/editor/editor_node.h" diff --git a/tools/editor/plugins/texture_region_editor_plugin.cpp b/tools/editor/plugins/texture_region_editor_plugin.cpp index ca49684063..1ad880c4d6 100644 --- a/tools/editor/plugins/texture_region_editor_plugin.cpp +++ b/tools/editor/plugins/texture_region_editor_plugin.cpp @@ -935,7 +935,7 @@ void TextureRegionEditorPlugin::edit(Object *p_node) bool TextureRegionEditorPlugin::handles(Object *p_obj) const { - return p_obj->is_class("Sprite") || p_obj->is_class("Patch9Frame") || p_obj->is_class("StyleBoxTexture") || p_obj->is_class("AtlasTexture"); + return p_obj->is_class("Sprite") || p_obj->is_class("Patch9Rect") || p_obj->is_class("StyleBoxTexture") || p_obj->is_class("AtlasTexture"); } void TextureRegionEditorPlugin::make_visible(bool p_visible) diff --git a/tools/editor/plugins/texture_region_editor_plugin.h b/tools/editor/plugins/texture_region_editor_plugin.h index c529e54dd1..35c0f18efa 100644 --- a/tools/editor/plugins/texture_region_editor_plugin.h +++ b/tools/editor/plugins/texture_region_editor_plugin.h @@ -36,7 +36,7 @@ #include "tools/editor/editor_plugin.h" #include "tools/editor/editor_node.h" #include "scene/2d/sprite.h" -#include "scene/gui/patch_9_frame.h" +#include "scene/gui/patch_9_rect.h" #include "scene/resources/style_box.h" #include "scene/resources/texture.h" diff --git a/tools/editor/plugins/theme_editor_plugin.h b/tools/editor/plugins/theme_editor_plugin.h index 0af9128bf2..9251da8e07 100644 --- a/tools/editor/plugins/theme_editor_plugin.h +++ b/tools/editor/plugins/theme_editor_plugin.h @@ -30,7 +30,7 @@ #define THEME_EDITOR_PLUGIN_H #include "scene/resources/theme.h" -#include "scene/gui/texture_frame.h" +#include "scene/gui/texture_rect.h" #include "scene/gui/option_button.h" #include "scene/gui/file_dialog.h" #include "scene/gui/check_box.h" diff --git a/tools/editor/project_manager.cpp b/tools/editor/project_manager.cpp index da12e8d671..01dca396c8 100644 --- a/tools/editor/project_manager.cpp +++ b/tools/editor/project_manager.cpp @@ -42,7 +42,7 @@ #include "scene/gui/center_container.h" #include "io/stream_peer_ssl.h" -#include "scene/gui/texture_frame.h" +#include "scene/gui/texture_rect.h" #include "scene/gui/margin_container.h" #include "io/resource_saver.h" diff --git a/tools/editor/property_editor.h b/tools/editor/property_editor.h index 305da055a4..900d06497f 100644 --- a/tools/editor/property_editor.h +++ b/tools/editor/property_editor.h @@ -37,7 +37,7 @@ #include "scene/gui/dialogs.h" #include "scene/gui/color_picker.h" #include "scene/gui/menu_button.h" -#include "scene/gui/texture_frame.h" +#include "scene/gui/texture_rect.h" #include "scene/gui/text_edit.h" #include "scene/gui/check_button.h" #include "scene/gui/split_container.h" |