You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-08 12:40:44 +00:00
Add EditorStringNames singleton
This commit is contained in:
@@ -40,6 +40,7 @@
|
||||
#include "editor/editor_paths.h"
|
||||
#include "editor/editor_scale.h"
|
||||
#include "editor/editor_settings.h"
|
||||
#include "editor/editor_string_names.h"
|
||||
#include "editor/plugins/script_editor_plugin.h"
|
||||
#include "scene/gui/line_edit.h"
|
||||
|
||||
@@ -143,17 +144,17 @@ void EditorHelp::_update_theme_item_cache() {
|
||||
theme_cache.qualifier_color = get_theme_color(SNAME("qualifier_color"), SNAME("EditorHelp"));
|
||||
theme_cache.type_color = get_theme_color(SNAME("type_color"), SNAME("EditorHelp"));
|
||||
|
||||
theme_cache.doc_font = get_theme_font(SNAME("doc"), SNAME("EditorFonts"));
|
||||
theme_cache.doc_bold_font = get_theme_font(SNAME("doc_bold"), SNAME("EditorFonts"));
|
||||
theme_cache.doc_italic_font = get_theme_font(SNAME("doc_italic"), SNAME("EditorFonts"));
|
||||
theme_cache.doc_title_font = get_theme_font(SNAME("doc_title"), SNAME("EditorFonts"));
|
||||
theme_cache.doc_code_font = get_theme_font(SNAME("doc_source"), SNAME("EditorFonts"));
|
||||
theme_cache.doc_kbd_font = get_theme_font(SNAME("doc_keyboard"), SNAME("EditorFonts"));
|
||||
theme_cache.doc_font = get_theme_font(SNAME("doc"), EditorStringName(EditorFonts));
|
||||
theme_cache.doc_bold_font = get_theme_font(SNAME("doc_bold"), EditorStringName(EditorFonts));
|
||||
theme_cache.doc_italic_font = get_theme_font(SNAME("doc_italic"), EditorStringName(EditorFonts));
|
||||
theme_cache.doc_title_font = get_theme_font(SNAME("doc_title"), EditorStringName(EditorFonts));
|
||||
theme_cache.doc_code_font = get_theme_font(SNAME("doc_source"), EditorStringName(EditorFonts));
|
||||
theme_cache.doc_kbd_font = get_theme_font(SNAME("doc_keyboard"), EditorStringName(EditorFonts));
|
||||
|
||||
theme_cache.doc_font_size = get_theme_font_size(SNAME("doc_size"), SNAME("EditorFonts"));
|
||||
theme_cache.doc_title_font_size = get_theme_font_size(SNAME("doc_title_size"), SNAME("EditorFonts"));
|
||||
theme_cache.doc_code_font_size = get_theme_font_size(SNAME("doc_source_size"), SNAME("EditorFonts"));
|
||||
theme_cache.doc_kbd_font_size = get_theme_font_size(SNAME("doc_keyboard_size"), SNAME("EditorFonts"));
|
||||
theme_cache.doc_font_size = get_theme_font_size(SNAME("doc_size"), EditorStringName(EditorFonts));
|
||||
theme_cache.doc_title_font_size = get_theme_font_size(SNAME("doc_title_size"), EditorStringName(EditorFonts));
|
||||
theme_cache.doc_code_font_size = get_theme_font_size(SNAME("doc_source_size"), EditorStringName(EditorFonts));
|
||||
theme_cache.doc_kbd_font_size = get_theme_font_size(SNAME("doc_keyboard_size"), EditorStringName(EditorFonts));
|
||||
|
||||
theme_cache.background_style = get_theme_stylebox(SNAME("background"), SNAME("EditorHelp"));
|
||||
|
||||
@@ -393,17 +394,17 @@ String EditorHelp::_fix_constant(const String &p_constant) const {
|
||||
}
|
||||
|
||||
// Macros for assigning the deprecation/experimental information to class members
|
||||
#define DEPRECATED_DOC_TAG \
|
||||
class_desc->push_color(get_theme_color(SNAME("error_color"), SNAME("Editor"))); \
|
||||
Ref<Texture2D> error_icon = get_theme_icon(SNAME("StatusError"), SNAME("EditorIcons")); \
|
||||
class_desc->add_text(" "); \
|
||||
class_desc->add_image(error_icon, error_icon->get_width(), error_icon->get_height()); \
|
||||
class_desc->add_text(" (" + TTR("Deprecated") + ")"); \
|
||||
#define DEPRECATED_DOC_TAG \
|
||||
class_desc->push_color(get_theme_color(SNAME("error_color"), EditorStringName(Editor))); \
|
||||
Ref<Texture2D> error_icon = get_editor_theme_icon(SNAME("StatusError")); \
|
||||
class_desc->add_text(" "); \
|
||||
class_desc->add_image(error_icon, error_icon->get_width(), error_icon->get_height()); \
|
||||
class_desc->add_text(" (" + TTR("Deprecated") + ")"); \
|
||||
class_desc->pop();
|
||||
|
||||
#define EXPERIMENTAL_DOC_TAG \
|
||||
class_desc->push_color(get_theme_color(SNAME("warning_color"), SNAME("Editor"))); \
|
||||
Ref<Texture2D> warning_icon = get_theme_icon(SNAME("NodeWarning"), SNAME("EditorIcons")); \
|
||||
class_desc->push_color(get_theme_color(SNAME("warning_color"), EditorStringName(Editor))); \
|
||||
Ref<Texture2D> warning_icon = get_editor_theme_icon(SNAME("NodeWarning")); \
|
||||
class_desc->add_text(" "); \
|
||||
class_desc->add_image(warning_icon, warning_icon->get_width(), warning_icon->get_height()); \
|
||||
class_desc->add_text(" (" + TTR("Experimental") + ")"); \
|
||||
@@ -696,7 +697,7 @@ void EditorHelp::_update_method_descriptions(const DocData::ClassDoc p_classdoc,
|
||||
if (!methods_filtered[i].description.strip_edges().is_empty()) {
|
||||
_add_text(DTR(methods_filtered[i].description));
|
||||
} else {
|
||||
class_desc->add_image(get_theme_icon(SNAME("Error"), SNAME("EditorIcons")));
|
||||
class_desc->add_image(get_editor_theme_icon(SNAME("Error")));
|
||||
class_desc->add_text(" ");
|
||||
class_desc->push_color(theme_cache.comment_color);
|
||||
if (p_classdoc.is_script_doc) {
|
||||
@@ -746,12 +747,12 @@ void EditorHelp::_update_doc() {
|
||||
|
||||
if (cd.is_deprecated) {
|
||||
class_desc->add_text(" ");
|
||||
Ref<Texture2D> error_icon = get_theme_icon(SNAME("StatusError"), SNAME("EditorIcons"));
|
||||
Ref<Texture2D> error_icon = get_editor_theme_icon(SNAME("StatusError"));
|
||||
class_desc->add_image(error_icon, error_icon->get_width(), error_icon->get_height());
|
||||
}
|
||||
if (cd.is_experimental) {
|
||||
class_desc->add_text(" ");
|
||||
Ref<Texture2D> warning_icon = get_theme_icon(SNAME("NodeWarning"), SNAME("EditorIcons"));
|
||||
Ref<Texture2D> warning_icon = get_editor_theme_icon(SNAME("NodeWarning"));
|
||||
class_desc->add_image(warning_icon, warning_icon->get_width(), warning_icon->get_height());
|
||||
}
|
||||
class_desc->add_newline();
|
||||
@@ -818,8 +819,8 @@ void EditorHelp::_update_doc() {
|
||||
|
||||
// Note if deprecated.
|
||||
if (cd.is_deprecated) {
|
||||
Ref<Texture2D> error_icon = get_theme_icon(SNAME("StatusError"), SNAME("EditorIcons"));
|
||||
class_desc->push_color(get_theme_color(SNAME("error_color"), SNAME("Editor")));
|
||||
Ref<Texture2D> error_icon = get_editor_theme_icon(SNAME("StatusError"));
|
||||
class_desc->push_color(get_theme_color(SNAME("error_color"), EditorStringName(Editor)));
|
||||
class_desc->add_image(error_icon, error_icon->get_width(), error_icon->get_height());
|
||||
class_desc->add_text(String(" ") + TTR("This class is marked as deprecated. It will be removed in future versions."));
|
||||
class_desc->pop();
|
||||
@@ -828,8 +829,8 @@ void EditorHelp::_update_doc() {
|
||||
|
||||
// Note if experimental.
|
||||
if (cd.is_experimental) {
|
||||
Ref<Texture2D> warning_icon = get_theme_icon(SNAME("NodeWarning"), SNAME("EditorIcons"));
|
||||
class_desc->push_color(get_theme_color(SNAME("warning_color"), SNAME("Editor")));
|
||||
Ref<Texture2D> warning_icon = get_editor_theme_icon(SNAME("NodeWarning"));
|
||||
class_desc->push_color(get_theme_color(SNAME("warning_color"), EditorStringName(Editor)));
|
||||
class_desc->add_image(warning_icon, warning_icon->get_width(), warning_icon->get_height());
|
||||
class_desc->add_text(String(" ") + TTR("This class is marked as experimental. It is subject to likely change or possible removal in future versions. Use at your own discretion."));
|
||||
class_desc->pop();
|
||||
@@ -884,7 +885,7 @@ void EditorHelp::_update_doc() {
|
||||
}
|
||||
|
||||
if (!has_description) {
|
||||
class_desc->add_image(get_theme_icon(SNAME("Error"), SNAME("EditorIcons")));
|
||||
class_desc->add_image(get_editor_theme_icon(SNAME("Error")));
|
||||
class_desc->add_text(" ");
|
||||
class_desc->push_color(theme_cache.comment_color);
|
||||
|
||||
@@ -1633,7 +1634,7 @@ void EditorHelp::_update_doc() {
|
||||
class_desc->pop(); // color
|
||||
} else {
|
||||
class_desc->push_indent(1);
|
||||
class_desc->add_image(get_theme_icon(SNAME("Error"), SNAME("EditorIcons")));
|
||||
class_desc->add_image(get_editor_theme_icon(SNAME("Error")));
|
||||
class_desc->add_text(" ");
|
||||
class_desc->push_color(theme_cache.comment_color);
|
||||
if (cd.is_script_doc) {
|
||||
@@ -1815,7 +1816,7 @@ void EditorHelp::_update_doc() {
|
||||
if (!cd.properties[i].description.strip_edges().is_empty()) {
|
||||
_add_text(DTR(cd.properties[i].description));
|
||||
} else {
|
||||
class_desc->add_image(get_theme_icon(SNAME("Error"), SNAME("EditorIcons")));
|
||||
class_desc->add_image(get_editor_theme_icon(SNAME("Error")));
|
||||
class_desc->add_text(" ");
|
||||
class_desc->push_color(theme_cache.comment_color);
|
||||
if (cd.is_script_doc) {
|
||||
@@ -1949,14 +1950,14 @@ static void _add_text_to_rt(const String &p_bbcode, RichTextLabel *p_rt, Control
|
||||
DocTools *doc = EditorHelp::get_doc_data();
|
||||
String base_path;
|
||||
|
||||
Ref<Font> doc_font = p_owner_node->get_theme_font(SNAME("doc"), SNAME("EditorFonts"));
|
||||
Ref<Font> doc_bold_font = p_owner_node->get_theme_font(SNAME("doc_bold"), SNAME("EditorFonts"));
|
||||
Ref<Font> doc_italic_font = p_owner_node->get_theme_font(SNAME("doc_italic"), SNAME("EditorFonts"));
|
||||
Ref<Font> doc_code_font = p_owner_node->get_theme_font(SNAME("doc_source"), SNAME("EditorFonts"));
|
||||
Ref<Font> doc_kbd_font = p_owner_node->get_theme_font(SNAME("doc_keyboard"), SNAME("EditorFonts"));
|
||||
Ref<Font> doc_font = p_owner_node->get_theme_font(SNAME("doc"), EditorStringName(EditorFonts));
|
||||
Ref<Font> doc_bold_font = p_owner_node->get_theme_font(SNAME("doc_bold"), EditorStringName(EditorFonts));
|
||||
Ref<Font> doc_italic_font = p_owner_node->get_theme_font(SNAME("doc_italic"), EditorStringName(EditorFonts));
|
||||
Ref<Font> doc_code_font = p_owner_node->get_theme_font(SNAME("doc_source"), EditorStringName(EditorFonts));
|
||||
Ref<Font> doc_kbd_font = p_owner_node->get_theme_font(SNAME("doc_keyboard"), EditorStringName(EditorFonts));
|
||||
|
||||
int doc_code_font_size = p_owner_node->get_theme_font_size(SNAME("doc_source_size"), SNAME("EditorFonts"));
|
||||
int doc_kbd_font_size = p_owner_node->get_theme_font_size(SNAME("doc_keyboard_size"), SNAME("EditorFonts"));
|
||||
int doc_code_font_size = p_owner_node->get_theme_font_size(SNAME("doc_source_size"), EditorStringName(EditorFonts));
|
||||
int doc_kbd_font_size = p_owner_node->get_theme_font_size(SNAME("doc_keyboard_size"), EditorStringName(EditorFonts));
|
||||
|
||||
const Color type_color = p_owner_node->get_theme_color(SNAME("type_color"), SNAME("EditorHelp"));
|
||||
const Color code_color = p_owner_node->get_theme_color(SNAME("code_color"), SNAME("EditorHelp"));
|
||||
@@ -1964,9 +1965,9 @@ static void _add_text_to_rt(const String &p_bbcode, RichTextLabel *p_rt, Control
|
||||
const Color code_dark_color = Color(code_color, 0.8);
|
||||
|
||||
const Color link_color = p_owner_node->get_theme_color(SNAME("link_color"), SNAME("EditorHelp"));
|
||||
const Color link_method_color = p_owner_node->get_theme_color(SNAME("accent_color"), SNAME("Editor"));
|
||||
const Color link_property_color = link_color.lerp(p_owner_node->get_theme_color(SNAME("accent_color"), SNAME("Editor")), 0.25);
|
||||
const Color link_annotation_color = link_color.lerp(p_owner_node->get_theme_color(SNAME("accent_color"), SNAME("Editor")), 0.5);
|
||||
const Color link_method_color = p_owner_node->get_theme_color(SNAME("accent_color"), EditorStringName(Editor));
|
||||
const Color link_property_color = link_color.lerp(p_owner_node->get_theme_color(SNAME("accent_color"), EditorStringName(Editor)), 0.25);
|
||||
const Color link_annotation_color = link_color.lerp(p_owner_node->get_theme_color(SNAME("accent_color"), EditorStringName(Editor)), 0.5);
|
||||
|
||||
const Color code_bg_color = p_owner_node->get_theme_color(SNAME("code_bg_color"), SNAME("EditorHelp"));
|
||||
const Color kbd_bg_color = p_owner_node->get_theme_color(SNAME("kbd_bg_color"), SNAME("EditorHelp"));
|
||||
@@ -2187,7 +2188,7 @@ static void _add_text_to_rt(const String &p_bbcode, RichTextLabel *p_rt, Control
|
||||
p_rt->push_font(doc_code_font);
|
||||
p_rt->push_font_size(doc_code_font_size);
|
||||
p_rt->push_bgcolor(code_bg_color);
|
||||
p_rt->push_color(code_color.lerp(p_owner_node->get_theme_color(SNAME("error_color"), SNAME("Editor")), 0.6));
|
||||
p_rt->push_color(code_color.lerp(p_owner_node->get_theme_color(SNAME("error_color"), EditorStringName(Editor)), 0.6));
|
||||
|
||||
code_tag = true;
|
||||
pos = brk_end + 1;
|
||||
@@ -2486,9 +2487,9 @@ void EditorHelp::set_scroll(int p_scroll) {
|
||||
|
||||
void EditorHelp::update_toggle_scripts_button() {
|
||||
if (is_layout_rtl()) {
|
||||
toggle_scripts_button->set_icon(get_theme_icon(ScriptEditor::get_singleton()->is_scripts_panel_toggled() ? SNAME("Forward") : SNAME("Back"), SNAME("EditorIcons")));
|
||||
toggle_scripts_button->set_icon(get_editor_theme_icon(ScriptEditor::get_singleton()->is_scripts_panel_toggled() ? SNAME("Forward") : SNAME("Back")));
|
||||
} else {
|
||||
toggle_scripts_button->set_icon(get_theme_icon(ScriptEditor::get_singleton()->is_scripts_panel_toggled() ? SNAME("Back") : SNAME("Forward"), SNAME("EditorIcons")));
|
||||
toggle_scripts_button->set_icon(get_editor_theme_icon(ScriptEditor::get_singleton()->is_scripts_panel_toggled() ? SNAME("Back") : SNAME("Forward")));
|
||||
}
|
||||
toggle_scripts_button->set_tooltip_text(vformat("%s (%s)", TTR("Toggle Scripts Panel"), ED_GET_SHORTCUT("script_editor/toggle_scripts_panel")->get_as_text()));
|
||||
}
|
||||
@@ -2668,13 +2669,13 @@ void FindBar::popup_search() {
|
||||
void FindBar::_notification(int p_what) {
|
||||
switch (p_what) {
|
||||
case NOTIFICATION_THEME_CHANGED: {
|
||||
find_prev->set_icon(get_theme_icon(SNAME("MoveUp"), SNAME("EditorIcons")));
|
||||
find_next->set_icon(get_theme_icon(SNAME("MoveDown"), SNAME("EditorIcons")));
|
||||
hide_button->set_texture_normal(get_theme_icon(SNAME("Close"), SNAME("EditorIcons")));
|
||||
hide_button->set_texture_hover(get_theme_icon(SNAME("Close"), SNAME("EditorIcons")));
|
||||
hide_button->set_texture_pressed(get_theme_icon(SNAME("Close"), SNAME("EditorIcons")));
|
||||
find_prev->set_icon(get_editor_theme_icon(SNAME("MoveUp")));
|
||||
find_next->set_icon(get_editor_theme_icon(SNAME("MoveDown")));
|
||||
hide_button->set_texture_normal(get_editor_theme_icon(SNAME("Close")));
|
||||
hide_button->set_texture_hover(get_editor_theme_icon(SNAME("Close")));
|
||||
hide_button->set_texture_pressed(get_editor_theme_icon(SNAME("Close")));
|
||||
hide_button->set_custom_minimum_size(hide_button->get_texture_normal()->get_size());
|
||||
matches_label->add_theme_color_override("font_color", results_count > 0 ? get_theme_color(SNAME("font_color"), SNAME("Label")) : get_theme_color(SNAME("error_color"), SNAME("Editor")));
|
||||
matches_label->add_theme_color_override("font_color", results_count > 0 ? get_theme_color(SNAME("font_color"), SNAME("Label")) : get_theme_color(SNAME("error_color"), EditorStringName(Editor)));
|
||||
} break;
|
||||
|
||||
case NOTIFICATION_VISIBILITY_CHANGED: {
|
||||
@@ -2742,7 +2743,7 @@ void FindBar::_update_matches_label() {
|
||||
} else {
|
||||
matches_label->show();
|
||||
|
||||
matches_label->add_theme_color_override("font_color", results_count > 0 ? get_theme_color(SNAME("font_color"), SNAME("Label")) : get_theme_color(SNAME("error_color"), SNAME("Editor")));
|
||||
matches_label->add_theme_color_override("font_color", results_count > 0 ? get_theme_color(SNAME("font_color"), SNAME("Label")) : get_theme_color(SNAME("error_color"), EditorStringName(Editor)));
|
||||
matches_label->set_text(vformat(results_count == 1 ? TTR("%d match.") : TTR("%d matches."), results_count));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user