1 files changed, 41 insertions, 105 deletions

diff --git a/editor/localization_editor.cpp b/editor/localization_editor.cpp
index 0e68af06f0..7458f617c3 100644
--- a/editor/localization_editor.cpp
+++ b/editor/localization_editor.cpp
@@ -37,39 +37,21 @@
 #include "scene/gui/control.h"
 
 void LocalizationEditor::_notification(int p_what) {
-	if (p_what == NOTIFICATION_TEXT_SERVER_CHANGED) {
-		ts_name->set_text(TTR("Text server: ") + TS->get_name());
-
-		FileAccessRef file_check = FileAccess::create(FileAccess::ACCESS_RESOURCES);
-		if (TS->has_feature(TextServer::FEATURE_USE_SUPPORT_DATA)) {
-			if (file_check->file_exists("res://" + TS->get_support_data_filename())) {
-				ts_data_status->set_text(TTR("Support data: ") + TTR("Installed"));
-				ts_install->set_disabled(true);
-			} else {
-				ts_data_status->set_text(TTR("Support data: ") + TTR("Not installed"));
-				ts_install->set_disabled(false);
-			}
-		} else {
-			ts_data_status->set_text(TTR("Support data: ") + TTR("Not supported"));
-			ts_install->set_disabled(false);
-		}
-		ts_data_info->set_text(TTR("Info: ") + TS->get_support_data_info());
-	}
 	if (p_what == NOTIFICATION_ENTER_TREE) {
 		translation_list->connect("button_pressed", callable_mp(this, &LocalizationEditor::_translation_delete));
 		translation_pot_list->connect("button_pressed", callable_mp(this, &LocalizationEditor::_pot_delete));
 
 		List<String> tfn;
 		ResourceLoader::get_recognized_extensions_for_type("Translation", &tfn);
-		for (List<String>::Element *E = tfn.front(); E; E = E->next()) {
-			translation_file_open->add_filter("*." + E->get());
+		for (const String &E : tfn) {
+			translation_file_open->add_filter("*." + E);
 		}
 
 		List<String> rfn;
 		ResourceLoader::get_recognized_extensions_for_type("Resource", &rfn);
-		for (List<String>::Element *E = rfn.front(); E; E = E->next()) {
-			translation_res_file_open_dialog->add_filter("*." + E->get());
-			translation_res_option_file_open_dialog->add_filter("*." + E->get());
+		for (const String &E : rfn) {
+			translation_res_file_open_dialog->add_filter("*." + E);
+			translation_res_option_file_open_dialog->add_filter("*." + E);
 		}
 
 		_update_pot_file_extensions();
@@ -116,7 +98,7 @@ void LocalizationEditor::_translation_delete(Object *p_item, int p_column, int p
 
 	ERR_FAIL_INDEX(idx, translations.size());
 
-	translations.remove(idx);
+	translations.remove_at(idx);
 
 	undo_redo->create_action(TTR("Remove Translation"));
 	undo_redo->add_do_property(ProjectSettings::get_singleton(), "internationalization/locale/translations", translations);
@@ -194,7 +176,7 @@ void LocalizationEditor::_translation_res_select() {
 		return;
 	}
 
-	call_deferred("update_translations");
+	call_deferred(SNAME("update_translations"));
 }
 
 void LocalizationEditor::_translation_res_option_changed() {
@@ -294,7 +276,7 @@ void LocalizationEditor::_translation_res_option_delete(Object *p_item, int p_co
 	ERR_FAIL_COND(!remaps.has(key));
 	PackedStringArray r = remaps[key];
 	ERR_FAIL_INDEX(idx, r.size());
-	r.remove(idx);
+	r.remove_at(idx);
 	remaps[key] = r;
 
 	undo_redo->create_action(TTR("Remove Resource Remap Option"));
@@ -339,7 +321,7 @@ void LocalizationEditor::_translation_filter_option_changed() {
 		}
 	} else {
 		if (l_idx != -1) {
-			f_locales.remove(l_idx);
+			f_locales.remove_at(l_idx);
 		}
 	}
 
@@ -389,15 +371,10 @@ void LocalizationEditor::_translation_filter_mode_changed(int p_mode) {
 
 void LocalizationEditor::_pot_add(const PackedStringArray &p_paths) {
 	PackedStringArray pot_translations = ProjectSettings::get_singleton()->get("internationalization/locale/translations_pot_files");
-
 	for (int i = 0; i < p_paths.size(); i++) {
-		for (int j = 0; j < pot_translations.size(); j++) {
-			if (pot_translations[j] == p_paths[i]) {
-				continue; //exists
-			}
+		if (!pot_translations.has(p_paths[i])) {
+			pot_translations.push_back(p_paths[i]);
 		}
-
-		pot_translations.push_back(p_paths[i]);
 	}
 
 	undo_redo->create_action(vformat(TTR("Add %d file(s) for POT generation"), p_paths.size()));
@@ -420,7 +397,7 @@ void LocalizationEditor::_pot_delete(Object *p_item, int p_column, int p_button)
 
 	ERR_FAIL_INDEX(idx, pot_translations.size());
 
-	pot_translations.remove(idx);
+	pot_translations.remove_at(idx);
 
 	undo_redo->create_action(TTR("Remove file from POT generation"));
 	undo_redo->add_do_property(ProjectSettings::get_singleton(), "internationalization/locale/translations_pot_files", pot_translations);
@@ -448,8 +425,8 @@ void LocalizationEditor::_update_pot_file_extensions() {
 	pot_file_open_dialog->clear_filters();
 	List<String> translation_parse_file_extensions;
 	EditorTranslationParser::get_singleton()->get_recognized_extensions(&translation_parse_file_extensions);
-	for (List<String>::Element *E = translation_parse_file_extensions.front(); E; E = E->next()) {
-		pot_file_open_dialog->add_filter("*." + E->get());
+	for (const String &E : translation_parse_file_extensions) {
+		pot_file_open_dialog->add_filter("*." + E);
 	}
 }
 
@@ -471,7 +448,7 @@ void LocalizationEditor::update_translations() {
 			t->set_text(0, translations[i].replace_first("res://", ""));
 			t->set_tooltip(0, translations[i]);
 			t->set_metadata(0, i);
-			t->add_button(0, get_theme_icon("Remove", "EditorIcons"), 0, false, TTR("Remove"));
+			t->add_button(0, get_theme_icon(SNAME("Remove"), SNAME("EditorIcons")), 0, false, TTR("Remove"));
 		}
 	}
 
@@ -520,7 +497,7 @@ void LocalizationEditor::update_translations() {
 
 			TreeItem *t = translation_filter->create_item(root);
 			t->set_cell_mode(0, TreeItem::CELL_MODE_CHECK);
-			t->set_text(0, n);
+			t->set_text(0, vformat("[%s] %s", l, n));
 			t->set_editable(0, true);
 			t->set_tooltip(0, l);
 			t->set_checked(0, is_checked);
@@ -560,7 +537,7 @@ void LocalizationEditor::update_translations() {
 					if (langnames.length() > 0) {
 						langnames += ",";
 					}
-					langnames += names[i];
+					langnames += vformat("[%s] %s", langs[i], names[i]);
 					translation_locales_idxs_remap.write[l_idx] = i;
 					l_idx++;
 				}
@@ -569,7 +546,7 @@ void LocalizationEditor::update_translations() {
 			if (i > 0) {
 				langnames += ",";
 			}
-			langnames += names[i];
+			langnames += vformat("[%s] %s", langs[i], names[i]);
 		}
 	}
 
@@ -578,8 +555,8 @@ void LocalizationEditor::update_translations() {
 		List<Variant> rk;
 		remaps.get_key_list(&rk);
 		Vector<String> keys;
-		for (List<Variant>::Element *E = rk.front(); E; E = E->next()) {
-			keys.push_back(E->get());
+		for (const Variant &E : rk) {
+			keys.push_back(E);
 		}
 		keys.sort();
 
@@ -589,7 +566,7 @@ void LocalizationEditor::update_translations() {
 			t->set_text(0, keys[i].replace_first("res://", ""));
 			t->set_tooltip(0, keys[i]);
 			t->set_metadata(0, keys[i]);
-			t->add_button(0, get_theme_icon("Remove", "EditorIcons"), 0, false, TTR("Remove"));
+			t->add_button(0, get_theme_icon(SNAME("Remove"), SNAME("EditorIcons")), 0, false, TTR("Remove"));
 			if (keys[i] == remap_selected) {
 				t->select(0);
 				translation_res_option_add_button->set_disabled(false);
@@ -606,7 +583,7 @@ void LocalizationEditor::update_translations() {
 					t2->set_text(0, path.replace_first("res://", ""));
 					t2->set_tooltip(0, path);
 					t2->set_metadata(0, j);
-					t2->add_button(0, get_theme_icon("Remove", "EditorIcons"), 0, false, TTR("Remove"));
+					t2->add_button(0, get_theme_icon(SNAME("Remove"), SNAME("EditorIcons")), 0, false, TTR("Remove"));
 					t2->set_cell_mode(1, TreeItem::CELL_MODE_RANGE);
 					t2->set_text(1, langnames);
 					t2->set_editable(1, true);
@@ -639,7 +616,7 @@ void LocalizationEditor::update_translations() {
 			t->set_text(0, pot_translations[i].replace_first("res://", ""));
 			t->set_tooltip(0, pot_translations[i]);
 			t->set_metadata(0, i);
-			t->add_button(0, get_theme_icon("Remove", "EditorIcons"), 0, false, TTR("Remove"));
+			t->add_button(0, get_theme_icon(SNAME("Remove"), SNAME("EditorIcons")), 0, false, TTR("Remove"));
 		}
 	}
 
@@ -649,26 +626,6 @@ void LocalizationEditor::update_translations() {
 	updating_translations = false;
 }
 
-void LocalizationEditor::_install_ts_data() {
-	if (TS->has_feature(TextServer::FEATURE_USE_SUPPORT_DATA)) {
-		TS->save_support_data("res://" + TS->get_support_data_filename());
-	}
-
-	FileAccessRef file_check = FileAccess::create(FileAccess::ACCESS_RESOURCES);
-	if (TS->has_feature(TextServer::FEATURE_USE_SUPPORT_DATA)) {
-		if (file_check->file_exists("res://" + TS->get_support_data_filename())) {
-			ts_data_status->set_text(TTR("Support data: ") + TTR("Installed"));
-			ts_install->set_disabled(true);
-		} else {
-			ts_data_status->set_text(TTR("Support data: ") + TTR("Not installed"));
-			ts_install->set_disabled(false);
-		}
-	} else {
-		ts_data_status->set_text(TTR("Support data: ") + TTR("Not supported"));
-		ts_install->set_disabled(false);
-	}
-}
-
 void LocalizationEditor::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("update_translations"), &LocalizationEditor::update_translations);
 
@@ -694,7 +651,9 @@ LocalizationEditor::LocalizationEditor() {
 		translations->add_child(tvb);
 
 		HBoxContainer *thb = memnew(HBoxContainer);
-		thb->add_child(memnew(Label(TTR("Translations:"))));
+		Label *l = memnew(Label(TTR("Translations:")));
+		l->set_theme_type_variation("HeaderSmall");
+		thb->add_child(l);
 		thb->add_spacer();
 		tvb->add_child(thb);
 
@@ -722,7 +681,9 @@ LocalizationEditor::LocalizationEditor() {
 		translations->add_child(tvb);
 
 		HBoxContainer *thb = memnew(HBoxContainer);
-		thb->add_child(memnew(Label(TTR("Resources:"))));
+		Label *l = memnew(Label(TTR("Resources:")));
+		l->set_theme_type_variation("HeaderSmall");
+		thb->add_child(l);
 		thb->add_spacer();
 		tvb->add_child(thb);
 
@@ -746,7 +707,9 @@ LocalizationEditor::LocalizationEditor() {
 		add_child(translation_res_file_open_dialog);
 
 		thb = memnew(HBoxContainer);
-		thb->add_child(memnew(Label(TTR("Remaps by Locale:"))));
+		l = memnew(Label(TTR("Remaps by Locale:")));
+		l->set_theme_type_variation("HeaderSmall");
+		thb->add_child(l);
 		thb->add_spacer();
 		tvb->add_child(thb);
 
@@ -766,8 +729,10 @@ LocalizationEditor::LocalizationEditor() {
 		translation_remap_options->set_column_title(1, TTR("Locale"));
 		translation_remap_options->set_column_titles_visible(true);
 		translation_remap_options->set_column_expand(0, true);
+		translation_remap_options->set_column_clip_content(0, true);
 		translation_remap_options->set_column_expand(1, false);
-		translation_remap_options->set_column_min_width(1, 200);
+		translation_remap_options->set_column_clip_content(1, true);
+		translation_remap_options->set_column_custom_minimum_width(1, 200);
 		translation_remap_options->connect("item_edited", callable_mp(this, &LocalizationEditor::_translation_res_option_changed));
 		translation_remap_options->connect("button_pressed", callable_mp(this, &LocalizationEditor::_translation_res_option_delete));
 		tmc->add_child(translation_remap_options);
@@ -794,7 +759,9 @@ LocalizationEditor::LocalizationEditor() {
 		translation_locale_filter_mode->connect("item_selected", callable_mp(this, &LocalizationEditor::_translation_filter_mode_changed));
 		tmc->add_margin_child(TTR("Filter mode:"), translation_locale_filter_mode);
 
-		tmc->add_child(memnew(Label(TTR("Locales:"))));
+		Label *l = memnew(Label(TTR("Locales:")));
+		l->set_theme_type_variation("HeaderSmall");
+		tmc->add_child(l);
 		translation_filter = memnew(Tree);
 		translation_filter->set_v_size_flags(Control::SIZE_EXPAND_FILL);
 		translation_filter->set_columns(1);
@@ -808,7 +775,9 @@ LocalizationEditor::LocalizationEditor() {
 		translations->add_child(tvb);
 
 		HBoxContainer *thb = memnew(HBoxContainer);
-		thb->add_child(memnew(Label(TTR("Files with translation strings:"))));
+		Label *l = memnew(Label(TTR("Files with translation strings:")));
+		l->set_theme_type_variation("HeaderSmall");
+		thb->add_child(l);
 		thb->add_spacer();
 		tvb->add_child(thb);
 
@@ -838,37 +807,4 @@ LocalizationEditor::LocalizationEditor() {
 		pot_file_open_dialog->connect("files_selected", callable_mp(this, &LocalizationEditor::_pot_add));
 		add_child(pot_file_open_dialog);
 	}
-
-	{
-		VBoxContainer *tvb = memnew(VBoxContainer);
-		tvb->set_name(TTR("Text Server Data"));
-		translations->add_child(tvb);
-
-		ts_name = memnew(Label(TTR("Text server: ") + TS->get_name()));
-		tvb->add_child(ts_name);
-
-		ts_data_status = memnew(Label(TTR("Support data: ")));
-		tvb->add_child(ts_data_status);
-
-		ts_data_info = memnew(Label(TTR("Info: ") + TS->get_support_data_info()));
-		tvb->add_child(ts_data_info);
-
-		ts_install = memnew(Button(TTR("Install support data...")));
-		ts_install->connect("pressed", callable_mp(this, &LocalizationEditor::_install_ts_data));
-		tvb->add_child(ts_install);
-
-		FileAccessRef file_check = FileAccess::create(FileAccess::ACCESS_RESOURCES);
-		if (TS->has_feature(TextServer::FEATURE_USE_SUPPORT_DATA)) {
-			if (file_check->file_exists("res://" + TS->get_support_data_filename())) {
-				ts_data_status->set_text(TTR("Support data: ") + TTR("Installed"));
-				ts_install->set_disabled(true);
-			} else {
-				ts_data_status->set_text(TTR("Support data: ") + TTR("Not installed"));
-				ts_install->set_disabled(false);
-			}
-		} else {
-			ts_data_status->set_text(TTR("Support data: ") + TTR("Not supported"));
-			ts_install->set_disabled(false);
-		}
-	}
 }