Skip to content

Commit

Permalink
Apply Rebel branding to editor
Browse files Browse the repository at this point in the history
  • Loading branch information
madmiraal committed Oct 19, 2024
1 parent 86465f7 commit c1f40a7
Show file tree
Hide file tree
Showing 20 changed files with 48 additions and 51 deletions.
4 changes: 2 additions & 2 deletions editor/editor_feature_profile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1225,15 +1225,15 @@ EditorFeatureProfileManager::EditorFeatureProfileManager() {
import_profiles = memnew(EditorFileDialog);
add_child(import_profiles);
import_profiles->set_mode(EditorFileDialog::MODE_OPEN_FILES);
import_profiles->add_filter("*.profile; " + TTR("Godot Feature Profile"));
import_profiles->add_filter("*.profile; " + TTR("Rebel Feature Profile"));
import_profiles->connect("files_selected", this, "_import_profiles");
import_profiles->set_title(TTR("Import Profile(s)"));
import_profiles->set_access(EditorFileDialog::ACCESS_FILESYSTEM);

export_profile = memnew(EditorFileDialog);
add_child(export_profile);
export_profile->set_mode(EditorFileDialog::MODE_SAVE_FILE);
export_profile->add_filter("*.profile; " + TTR("Godot Feature Profile"));
export_profile->add_filter("*.profile; " + TTR("Rebel Feature Profile"));
export_profile->connect("file_selected", this, "_export_profile");
export_profile->set_title(TTR("Export Profile"));
export_profile->set_access(EditorFileDialog::ACCESS_FILESYSTEM);
Expand Down
3 changes: 1 addition & 2 deletions editor/editor_file_dialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -578,8 +578,7 @@ void EditorFileDialog::_item_list_item_rmb_selected(
// Allow specific actions only on one item.
bool single_item_selected = item_list->get_selected_items().size() == 1;

// Disallow deleting the .import folder, Godot kills a cat if you do and it
// is possibly a senseless novice action.
// Disallow deleting the .import folder.
bool allow_delete = true;
for (int i = 0; i < item_list->get_item_count(); i++) {
if (!item_list->is_selected(i)) {
Expand Down
3 changes: 1 addition & 2 deletions editor/editor_file_system.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
#include "editor_settings.h"

EditorFileSystem* EditorFileSystem::singleton = nullptr;
// the name is the version, to keep compatibility with different versions of
// Godot
// The version, to keep compatibility with different versions of Rebel Engine.
#define CACHE_FILE_NAME "filesystem_cache6"

void EditorFileSystemDirectory::sort_files() {
Expand Down
2 changes: 1 addition & 1 deletion editor/editor_node.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6694,7 +6694,7 @@ bool EditorNode::call_build() {

for (int i = 0; i < build_callback_count && builds_successful; i++) {
if (!build_callbacks[i]()) {
ERR_PRINT("A Godot Engine build callback failed.");
ERR_PRINT("A Rebel Engine build callback failed.");
builds_successful = false;
}
}
Expand Down
8 changes: 4 additions & 4 deletions editor/editor_run.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ Error EditorRun::run(

if (p_custom_args != "") {
// Allow the user to specify a command to run, similar to Steam's launch
// options. In this case, Godot will no longer be run directly; it's up
// options. In this case, Rebel will no longer be run directly; it's up
// to the underlying command to run it. For instance, this can be used
// on Linux to force a running project to use Optimus using `prime-run`
// or similar. Example: `prime-run %command% --time-scale 0.5`
Expand All @@ -218,7 +218,7 @@ Error EditorRun::run(
exec = exec_args[0];
exec_args.remove(0);

// Append the Godot executable name before we append executable
// Append the Rebel executable name before we append executable
// arguments (since the order is reversed when using
// `push_front()`).
args.push_front(OS::get_singleton()->get_executable_path());
Expand All @@ -230,7 +230,7 @@ Error EditorRun::run(
args.push_front(exec_args[i].replace(" ", "%20"));
}

// Append Godot-specific custom arguments.
// Append Rebel-specific custom arguments.
custom_args =
p_custom_args
.substr(placeholder_pos + String("%command%").size())
Expand All @@ -239,7 +239,7 @@ Error EditorRun::run(
args.push_back(custom_args[i].replace(" ", "%20"));
}
} else {
// Append Godot-specific custom arguments.
// Append Rebel-specific custom arguments.
custom_args = p_custom_args.split(" ", false);
for (int i = 0; i < custom_args.size(); i++) {
args.push_back(custom_args[i].replace(" ", "%20"));
Expand Down
6 changes: 3 additions & 3 deletions editor/editor_settings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
String host_lang = OS::get_singleton()->get_locale();
host_lang = TranslationServer::standardize_locale(host_lang);

// Some locales are not properly supported currently in Godot due to
// Some locales are not properly supported currently in Rebel due to
// lack of font shaping (e.g. Arabic or Hindi), so even though we have
// work in progress translations for them, we skip them as they don't
// render properly. (GH-28577)
Expand Down Expand Up @@ -442,7 +442,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
Variant::STRING,
"interface/theme/preset",
PROPERTY_HINT_ENUM,
"Default,Alien,Arc,Godot 2,Grey,Light,Solarized (Dark),Solarized "
"Default,Alien,Arc,Rebel 2,Grey,Light,Solarized (Dark),Solarized "
"(Light),Custom",
PROPERTY_USAGE_DEFAULT
);
Expand Down Expand Up @@ -868,7 +868,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
Variant::INT,
"editors/3d/navigation/navigation_scheme",
PROPERTY_HINT_ENUM,
"Godot,Maya,Modo"
"Rebel,Maya,Modo"
);
_initial_set("editors/3d/navigation/zoom_style", 0);
hints["editors/3d/navigation/zoom_style"] = PropertyInfo(
Expand Down
2 changes: 1 addition & 1 deletion editor/editor_themes.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,7 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
preset_accent_color = Color(0.32, 0.58, 0.89);
preset_base_color = Color(0.22, 0.24, 0.29);
preset_contrast = 0.25;
} else if (preset == "Godot 2") {
} else if (preset == "Rebel 2") {
preset_accent_color = Color(0.53, 0.67, 0.89);
preset_base_color = Color(0.24, 0.23, 0.27);
preset_contrast = 0.25;
Expand Down
4 changes: 2 additions & 2 deletions editor/export_template_manager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ void ExportTemplateManager::_refresh_mirrors() {

String current_version = VERSION_FULL_CONFIG;
const String mirrors_metadata_url =
"https://godotengine.org/mirrorlist/" + current_version + ".json";
"https://rebeltoolbox.org/mirrorlist/" + current_version + ".json";
request_mirrors->request(mirrors_metadata_url);
}

Expand Down Expand Up @@ -1271,7 +1271,7 @@ ExportTemplateManager::ExportTemplateManager() {
install_file_dialog->set_title(TTR("Select Template File"));
install_file_dialog->set_access(FileDialog::ACCESS_FILESYSTEM);
install_file_dialog->set_mode(FileDialog::MODE_OPEN_FILE);
install_file_dialog->add_filter("*.tpz ; " + TTR("Godot Export Templates"));
install_file_dialog->add_filter("*.tpz ; " + TTR("Rebel Export Templates"));
install_file_dialog->connect(
"file_selected",
this,
Expand Down
6 changes: 3 additions & 3 deletions editor/icons/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Editor icons

This folder contains all the icons used by Godot editor (except for platform
icons which are located in their respective platform folder).
This folder contains all the icons used by Rebel Editor;
except for platform icons which are located in the platform folders.

See [Editor icons](https://docs.rebeltoolbox.com/en/latest/development/editor/creating_icons.html)
in the documentation for details on creating icons for the Godot editor.
for details on creating icons for the Rebel Editor.
2 changes: 1 addition & 1 deletion editor/import/resource_importer_layered_texture.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ void ResourceImporterLayeredTexture::_save_tex(
} else {
f->store_8('A');
}
f->store_8('T'); // godot streamable texture
f->store_8('T'); // Rebel streamable texture

f->store_32(p_images[0]->get_width());
f->store_32(p_images[0]->get_height());
Expand Down
2 changes: 1 addition & 1 deletion editor/import/resource_importer_texture.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ void ResourceImporterTexture::_save_stex(
f->store_8('G');
f->store_8('D');
f->store_8('S');
f->store_8('T'); // godot streamable texture
f->store_8('T'); // Rebel streamable texture

bool resize_to_po2 = false;

Expand Down
11 changes: 4 additions & 7 deletions editor/plugins/asset_library_editor_plugin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -717,8 +717,7 @@ void EditorAssetLibrary::_notification(int p_what) {

void EditorAssetLibrary::_update_repository_options() {
Dictionary default_urls;
default_urls["godotengine.org (Official)"] =
"https://godotengine.org/asset-library/api";
default_urls["Rebel Marketplace"] = "https://marketplace.rebeltoolbox.com";
Dictionary available_urls =
_EDITOR_DEF("asset_library/available_urls", default_urls, true);
repository->clear();
Expand Down Expand Up @@ -779,10 +778,8 @@ const char* EditorAssetLibrary::sort_text[SORT_MAX] = {
TTRC("Least Recently Updated"),
TTRC("Name (A-Z)"),
TTRC("Name (Z-A)"),
TTRC("License (A-Z)"
), // "cost" stores the SPDX license name in the Godot Asset Library.
TTRC("License (Z-A)"
), // "cost" stores the SPDX license name in the Godot Asset Library.
TTRC("License (A-Z)"),
TTRC("License (Z-A)"),
};

const char* EditorAssetLibrary::support_key[SUPPORT_MAX] = {
Expand Down Expand Up @@ -1129,7 +1126,7 @@ void EditorAssetLibrary::_search(int p_page) {

// We use the "branch" version, i.e. major.minor, as patch releases should
// be compatible
args += "&godot_version=" + String(VERSION_BRANCH);
args += "&rebel_version=" + String(VERSION_BRANCH);

String support_list;
for (int i = 0; i < SUPPORT_MAX; i++) {
Expand Down
2 changes: 1 addition & 1 deletion editor/plugins/baked_lightmap_editor_plugin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ void BakedLightmapEditorPlugin::_bake_select_file(const String& p_file) {
break;
case BakedLightmap::BAKE_ERROR_NO_LIGHTMAPPER:
EditorNode::get_singleton()->show_warning(
TTR("Godot editor was built without ray tracing support, "
TTR("Rebel Editor was built without ray tracing support, "
"lightmaps can't be baked.")
);
break;
Expand Down
2 changes: 1 addition & 1 deletion editor/plugins/script_editor_plugin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4221,7 +4221,7 @@ ScriptEditor::ScriptEditor(EditorNode* p_editor) {
site_search
->connect("pressed", this, "_menu_option", varray(SEARCH_WEBSITE));
menu_hb->add_child(site_search);
site_search->set_tooltip(TTR("Open Godot online documentation."));
site_search->set_tooltip(TTR("Open Rebel Documentation online."));

help_search = memnew(ToolButton);
help_search->set_text(TTR("Search Help"));
Expand Down
4 changes: 2 additions & 2 deletions editor/plugins/spatial_editor_plugin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2357,7 +2357,7 @@ void SpatialEditorViewport::_sinput(const Ref<InputEvent>& p_event) {

} else if (m->get_button_mask() & BUTTON_MASK_MIDDLE) {
const int mod = _get_key_modifier(m);
if (nav_scheme == NAVIGATION_GODOT) {
if (nav_scheme == NAVIGATION_REBEL) {
if (mod
== _get_key_modifier_setting(
"editors/3d/navigation/pan_modifier"
Expand Down Expand Up @@ -2446,7 +2446,7 @@ void SpatialEditorViewport::_sinput(const Ref<InputEvent>& p_event) {
operator int();
NavigationMode nav_mode = NAVIGATION_NONE;

if (nav_scheme == NAVIGATION_GODOT) {
if (nav_scheme == NAVIGATION_REBEL) {
const int mod = _get_key_modifier(pan_gesture);

if (mod
Expand Down
2 changes: 1 addition & 1 deletion editor/plugins/spatial_editor_plugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ class SpatialEditorViewport : public Control {
};

enum NavigationScheme {
NAVIGATION_GODOT,
NAVIGATION_REBEL,
NAVIGATION_MAYA,
NAVIGATION_MODO,
};
Expand Down
4 changes: 2 additions & 2 deletions editor/plugins/visual_shader_editor_plugin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6278,7 +6278,7 @@ VisualShaderEditor::VisualShaderEditor() {
"Special",
"",
"VisualShaderNodeExpression",
TTR("Custom Godot Shader Language expression, with custom amount of "
TTR("Custom Rebel Shader Language expression, with custom amount of "
"input and output ports. This is a direct injection of code into "
"the vertex/fragment/light function, do not use it to write the "
"function declarations inside.")
Expand All @@ -6298,7 +6298,7 @@ VisualShaderEditor::VisualShaderEditor() {
"Special",
"",
"VisualShaderNodeGlobalExpression",
TTR("Custom Godot Shader Language expression, which is placed on top "
TTR("Custom Rebel Shader Language expression, which is placed on top "
"of the resulted shader. You can place various function "
"definitions inside and call it later in the Expressions. You can "
"also declare varyings, uniforms and constants.")
Expand Down
2 changes: 1 addition & 1 deletion editor/project_export.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1383,7 +1383,7 @@ ProjectExportDialog::ProjectExportDialog() {

export_pck_zip = memnew(EditorFileDialog);
export_pck_zip->add_filter("*.zip ; " + TTR("ZIP File"));
export_pck_zip->add_filter("*.pck ; " + TTR("Godot Game Pack"));
export_pck_zip->add_filter("*.pck ; " + TTR("Rebel Game Pack"));
export_pck_zip->set_access(EditorFileDialog::ACCESS_FILESYSTEM);
export_pck_zip->set_mode(EditorFileDialog::MODE_SAVE_FILE);
add_child(export_pck_zip);
Expand Down
24 changes: 12 additions & 12 deletions editor/project_manager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ class ProjectDialog : public ConfirmationDialog {

} else if (valid_path.ends_with("zip")) {
set_message(
TTR("This directory already contains a Godot project."),
TTR("This directory already contains a Rebel project."),
MESSAGE_ERROR,
INSTALL_PATH
);
Expand Down Expand Up @@ -1358,7 +1358,7 @@ void ProjectList::load_project_data(
}

if (config_version > ProjectSettings::CONFIG_VERSION) {
// Comes from an incompatible (more recent) Godot version, grey it out
// It comes from an more recent, non-backward compatible version.
grayed = true;
}

Expand Down Expand Up @@ -1436,7 +1436,7 @@ void ProjectList::load_projects() {
for (List<PropertyInfo>::Element* E = properties.front(); E;
E = E->next()) {
// This is actually something like
// "projects/C:::Documents::Godot::Projects::MyGame"
// "projects/C:::Documents::Projects::MyGame"
String property_key = E->get().name;
if (!property_key.begins_with("projects/")) {
continue;
Expand Down Expand Up @@ -2324,11 +2324,11 @@ void ProjectManager::_open_selected_projects_ask() {
if (config_version == 0) {
ask_update_settings->set_text(vformat(
TTR("The following project settings file does not specify the "
"version of Godot through which it was created.\n\n%s\n\nIf "
"you proceed with opening it, it will be converted to Godot's "
"current configuration file format.\nWarning: You won't be "
"able to open the project with previous versions of the engine "
"anymore."),
"version of Rebel used to create it.\n\n%s\n\n"
"If you proceed with opening it, it will be converted to "
"Rebel's current configuration file format.\n"
"Warning: You won't be able to open the project with previous "
"versions of the engine anymore."),
conf
));
ask_update_settings->popup_centered_minsize();
Expand Down Expand Up @@ -2630,8 +2630,9 @@ void ProjectManager::_files_dropped(PoolStringArray p_files, int p_screen) {
varray(folders)
);
multi_scan_ask->set_text(vformat(
TTR("Are you sure to scan %s folders for existing Godot "
"projects?\nThis could take a while."),
TTR("Are you sure to scan %s folders for existing Rebel "
"projects?\n"
"This could take a while."),
folders.size()
));
multi_scan_ask->popup_centered_minsize();
Expand Down Expand Up @@ -2854,8 +2855,7 @@ ProjectManager::ProjectManager() {

String cp;
cp += 0xA9;
// TRANSLATORS: This refers to the application where users manage their
// Godot projects.
// TRANSLATORS: Project Manager is the application used to manage projects.
OS::get_singleton()->set_window_title(
VERSION_NAME + String(" - ") + TTR("Project Manager")
);
Expand Down
6 changes: 4 additions & 2 deletions editor/script_editor_debugger.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2617,7 +2617,8 @@ void ScriptEditorDebugger::_item_menu_id_pressed(int p_option) {
// Git commit hash information available; use it for greater
// accuracy, including for development versions.
OS::get_singleton()->shell_open(vformat(
"https://github.com/godotengine/godot/blob/%s/%s#L%d",
"https://github.com/RebelToolbox/RebelEngine/blob/%s/"
"%s#L%d",
VERSION_HASH,
file,
line_number
Expand All @@ -2626,7 +2627,8 @@ void ScriptEditorDebugger::_item_menu_id_pressed(int p_option) {
// Git commit hash information unavailable; fall back to tagged
// releases.
OS::get_singleton()->shell_open(vformat(
"https://github.com/godotengine/godot/blob/%s-stable/"
"https://github.com/RebelToolbox/RebelEngine/blob/"
"%s-stable/"
"%s#L%d",
VERSION_NUMBER,
file,
Expand Down

0 comments on commit c1f40a7

Please sign in to comment.