Skip to content

Commit

Permalink
Refactoring: rename tools/editor/ to editor/
Browse files Browse the repository at this point in the history
The other subfolders of tools/ had already been moved to either
editor/, misc/ or thirdparty/, so the hiding the editor code that
deep was no longer meaningful.
  • Loading branch information
akien-mga committed Mar 5, 2017
1 parent 532f6d4 commit 49c065d
Show file tree
Hide file tree
Showing 2,029 changed files with 305 additions and 305 deletions.
12 changes: 6 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ core/method_bind_ext.inc
core/script_encryption_key.cpp
core/global_defaults.cpp
drivers/unix/os_unix_global_settings_path.cpp
tools/editor/register_exporters.cpp
tools/editor/doc_data_compressed.h
tools/editor/certs_compressed.h
tools/editor/editor_icons.cpp
tools/editor/translations.h
tools/editor/builtin_fonts.h
editor/register_exporters.cpp
editor/doc_data_compressed.h
editor/certs_compressed.h
editor/editor_icons.cpp
editor/translations.h
editor/builtin_fonts.h
.fscache
make.bat
log.txt
Expand Down
4 changes: 2 additions & 2 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ Help(opts.GenerateHelpText(env_base)) # generate help

# add default include paths

env_base.Append(CPPPATH=['#core', '#core/math', '#tools', '#drivers', '#'])
env_base.Append(CPPPATH=['#core', '#core/math', '#editor', '#drivers', '#'])

# configure ENV for platform
env_base.platform_exporters = platform_exporters
Expand Down Expand Up @@ -358,7 +358,7 @@ if selected_platform in platform_list:
SConscript("core/SCsub")
SConscript("servers/SCsub")
SConscript("scene/SCsub")
SConscript("tools/editor/SCsub")
SConscript("editor/SCsub")
SConscript("drivers/SCsub")

SConscript("modules/SCsub")
Expand Down
22 changes: 11 additions & 11 deletions tools/editor/SCsub → editor/SCsub
Original file line number Diff line number Diff line change
Expand Up @@ -159,34 +159,34 @@ if (env["tools"] == "yes"):

# API documentation
docs = ["#doc/base/classes.xml"]
moduledir = os.path.join(os.getcwd(), "..", "..", "modules")
moduledir = os.path.join(os.getcwd(), "..", "modules")
for m in os.listdir(moduledir):
curmodle = os.path.join(moduledir, m)
docfile = os.path.join(curmodle, "classes.xml")
if os.path.isdir(curmodle) and os.path.isfile(docfile):
docs.append(docfile)
env.Depends("#tools/editor/doc_data_compressed.h", docs)
env.Command("#tools/editor/doc_data_compressed.h", docs, make_doc_header)
env.Depends("#editor/doc_data_compressed.h", docs)
env.Command("#editor/doc_data_compressed.h", docs, make_doc_header)

# Certificates
env.Depends("#tools/editor/certs_compressed.h", "#thirdparty/certs/ca-certificates.crt")
env.Command("#tools/editor/certs_compressed.h", "#thirdparty/certs/ca-certificates.crt", make_certs_header)
env.Depends("#editor/certs_compressed.h", "#thirdparty/certs/ca-certificates.crt")
env.Command("#editor/certs_compressed.h", "#thirdparty/certs/ca-certificates.crt", make_certs_header)

import glob
path = env.Dir('.').abspath

# Translations
tlist = glob.glob(path + "/translations/*.po")
print("translations: ", tlist)
env.Depends('#tools/editor/translations.h', tlist)
env.Command('#tools/editor/translations.h', tlist, make_translations_header)
env.Depends('#editor/translations.h', tlist)
env.Command('#editor/translations.h', tlist, make_translations_header)

# Fonts
flist = glob.glob(path + "/../../thirdparty/fonts/*.ttf")
flist.append(glob.glob(path + "/../../thirdparty/fonts/*.otf"))
flist = glob.glob(path + "/../thirdparty/fonts/*.ttf")
flist.append(glob.glob(path + "/../thirdparty/fonts/*.otf"))
print("fonts: ", flist)
env.Depends('#tools/editor/builtin_fonts.h', flist)
env.Command('#tools/editor/builtin_fonts.h', flist, make_fonts_header)
env.Depends('#editor/builtin_fonts.h', flist)
env.Command('#editor/builtin_fonts.h', flist, make_fonts_header)


env.add_source_files(env.editor_sources, "*.cpp")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#include "pair.h"
#include "scene/gui/separator.h"
#include "editor_node.h"
#include "tools/editor/plugins/animation_player_editor_plugin.h"
#include "editor/plugins/animation_player_editor_plugin.h"
#include "scene/main/viewport.h"
/* Missing to fix:
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion tools/editor/call_dialog.h → editor/call_dialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include "scene/gui/tree.h"
#include "scene/gui/label.h"
#include "scene/gui/line_edit.h"
#include "tools/editor/property_editor.h"
#include "editor/property_editor.h"
/**
@author Juan Linietsky <reduzio@gmail.com>
*/
Expand Down
2 changes: 1 addition & 1 deletion tools/editor/code_editor.cpp → editor/code_editor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include "scene/gui/separator.h"
#include "scene/resources/dynamic_font.h"
#include "os/keyboard.h"
#include "tools/editor/editor_scale.h"
#include "editor/editor_scale.h"

void GotoLineDialog::popup_find_line(TextEdit *p_edit) {

Expand Down
2 changes: 1 addition & 1 deletion tools/editor/code_editor.h → editor/code_editor.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#ifndef CODE_EDITOR_H
#define CODE_EDITOR_H

#include "tools/editor/editor_plugin.h"
#include "editor/editor_plugin.h"
#include "scene/gui/text_edit.h"
#include "scene/gui/dialogs.h"
#include "scene/main/timer.h"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
#include "scene/gui/dialogs.h"
#include "scene/gui/menu_button.h"
#include "scene/gui/line_edit.h"
#include "tools/editor/scene_tree_editor.h"
#include "tools/editor/property_editor.h"
#include "editor/scene_tree_editor.h"
#include "editor/property_editor.h"
#include "undo_redo.h"

/**
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "scene/gui/tree.h"
#include "scene/gui/option_button.h"
#include "scene/gui/panel.h"
#include "tools/editor/editor_file_dialog.h"
#include "editor/editor_file_dialog.h"
#include "editor_plugin.h"

class EditorAudioBuses;
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion tools/editor/editor_data.h → editor/editor_data.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#ifndef EDITOR_DATA_H
#define EDITOR_DATA_H

#include "tools/editor/editor_plugin.h"
#include "editor/editor_plugin.h"
#include "scene/resources/texture.h"
#include "list.h"
#include "undo_redo.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@

#include "os/os.h"
#include "os/keyboard.h"
#include "tools/editor/editor_settings.h"
#include "tools/editor/editor_file_system.h"
#include "editor/editor_settings.h"
#include "editor/editor_file_system.h"


void EditorDirDialog::_update_dir(TreeItem* p_item) {
Expand Down
File renamed without changes.
8 changes: 4 additions & 4 deletions tools/editor/editor_export.cpp → editor/editor_export.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@
#include "global_config.h"
#include "os/file_access.h"
#include "os/dir_access.h"
#include "tools/editor/editor_file_system.h"
#include "editor/editor_file_system.h"
#include "io/resource_loader.h"
#include "editor_node.h"
#include "editor_settings.h"
#include "io/config_file.h"
#include "io/resource_saver.h"
#include "io/md5.h"
#include "tools/editor/plugins/script_editor_plugin.h"
#include "editor/plugins/script_editor_plugin.h"
#include "io/zip_io.h"

static int _get_pad(int p_alignment, int p_n) {
Expand Down Expand Up @@ -959,15 +959,15 @@ EditorExportPlatformPC::EditorExportPlatformPC() {
#include "global_config.h"
#include "os/file_access.h"
#include "os/dir_access.h"
#include "tools/editor/editor_file_system.h"
#include "editor/editor_file_system.h"
#include "io/resource_loader.h"
#include "editor_node.h"
#include "editor_settings.h"
#include "io/config_file.h"
#include "io/resource_saver.h"
#include "io/md5.h"
#include "io_plugins/editor_texture_import_plugin.h"
#include "tools/editor/plugins/script_editor_plugin.h"
#include "editor/plugins/script_editor_plugin.h"
#include "io/zip_io.h"


Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion tools/editor/editor_help.cpp → editor/editor_help.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#include "editor_settings.h"
#include "os/keyboard.h"
#include "doc_data_compressed.h"
#include "tools/editor/plugins/script_editor_plugin.h"
#include "editor/plugins/script_editor_plugin.h"

void EditorHelpSearch::popup() {
popup_centered_ratio(0.6);
Expand Down
6 changes: 3 additions & 3 deletions tools/editor/editor_help.h → editor/editor_help.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#ifndef EDITOR_HELP_H
#define EDITOR_HELP_H

#include "tools/editor/editor_plugin.h"
#include "editor/editor_plugin.h"
#include "scene/gui/tab_container.h"
#include "scene/gui/text_edit.h"
#include "scene/gui/split_container.h"
Expand All @@ -39,8 +39,8 @@
#include "scene/gui/tree.h"

#include "scene/main/timer.h"
#include "tools/editor/code_editor.h"
#include "tools/editor/doc/doc_data.h"
#include "editor/code_editor.h"
#include "editor/doc/doc_data.h"


class EditorNode;
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
64 changes: 32 additions & 32 deletions tools/editor/editor_node.h → editor/editor_node.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,41 +42,41 @@
#include "scene/gui/split_container.h"
#include "scene/gui/center_container.h"
#include "scene/gui/texture_progress.h"
#include "tools/editor/filesystem_dock.h"
#include "tools/editor/scene_tree_editor.h"
#include "tools/editor/property_editor.h"
#include "tools/editor/create_dialog.h"
#include "tools/editor/call_dialog.h"
#include "tools/editor/reparent_dialog.h"
#include "tools/editor/connections_dialog.h"
#include "tools/editor/node_dock.h"
#include "tools/editor/import_dock.h"
#include "tools/editor/settings_config_dialog.h"
#include "tools/editor/groups_editor.h"
#include "tools/editor/editor_data.h"
#include "tools/editor/editor_path.h"
#include "tools/editor/editor_run.h"

#include "tools/editor/pane_drag.h"

#include "tools/editor/script_create_dialog.h"
#include "tools/editor/run_settings_dialog.h"
#include "tools/editor/project_settings.h"
#include "tools/editor/project_export.h"
#include "tools/editor/editor_log.h"
#include "tools/editor/scene_tree_dock.h"
#include "tools/editor/resources_dock.h"
#include "tools/editor/editor_run_script.h"

#include "tools/editor/editor_run_native.h"
#include "editor/filesystem_dock.h"
#include "editor/scene_tree_editor.h"
#include "editor/property_editor.h"
#include "editor/create_dialog.h"
#include "editor/call_dialog.h"
#include "editor/reparent_dialog.h"
#include "editor/connections_dialog.h"
#include "editor/node_dock.h"
#include "editor/import_dock.h"
#include "editor/settings_config_dialog.h"
#include "editor/groups_editor.h"
#include "editor/editor_data.h"
#include "editor/editor_path.h"
#include "editor/editor_run.h"

#include "editor/pane_drag.h"

#include "editor/script_create_dialog.h"
#include "editor/run_settings_dialog.h"
#include "editor/project_settings.h"
#include "editor/project_export.h"
#include "editor/editor_log.h"
#include "editor/scene_tree_dock.h"
#include "editor/resources_dock.h"
#include "editor/editor_run_script.h"

#include "editor/editor_run_native.h"
#include "scene/gui/tabs.h"
#include "tools/editor/quick_open.h"
#include "tools/editor/project_export.h"
#include "tools/editor/editor_sub_scene.h"
#include "editor/quick_open.h"
#include "editor/project_export.h"
#include "editor/editor_sub_scene.h"
#include "editor_export.h"
#include "editor_reimport_dialog.h"
#include "tools/editor/editor_plugin.h"
#include "tools/editor/editor_name_dialog.h"
#include "editor/editor_plugin.h"
#include "editor/editor_name_dialog.h"

#include "fileserver/editor_file_server.h"
#include "editor_resource_preview.h"
Expand Down
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions tools/editor/editor_plugin.cpp → editor/editor_plugin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
#include "scene/3d/camera.h"
#include "plugins/canvas_item_editor_plugin.h"
#include "plugins/spatial_editor_plugin.h"
#include "tools/editor/editor_node.h"
#include "tools/editor/editor_settings.h"
#include "editor/editor_node.h"
#include "editor/editor_settings.h"
#include "editor_resource_preview.h"

void EditorPlugin::add_custom_type(const String& p_type, const String& p_base,const Ref<Script>& p_script, const Ref<Texture>& p_icon) {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

#include "scene/gui/dialogs.h"
#include "scene/gui/tree.h"
#include "tools/editor/editor_file_dialog.h"
#include "editor/editor_file_dialog.h"

class EditorSubScene : public ConfirmationDialog {

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Loading

0 comments on commit 49c065d

Please sign in to comment.