Rename GUITextLabel to GUILabelgui-text-label

2 files changed, 69 insertions, 69 deletions

diff --git a/game/src/Game/GameSession/NationManagementScreen/BudgetMenu.gd b/game/src/Game/GameSession/NationManagementScreen/BudgetMenu.gd
index 90df650..20eb198 100644
--- a/game/src/Game/GameSession/NationManagementScreen/BudgetMenu.gd
+++ b/game/src/Game/GameSession/NationManagementScreen/BudgetMenu.gd
@@ -4,36 +4,36 @@ var _active : bool = false
 var _incVal : int = 0 # incremental value to see the UI update, replace later by real values
 
 # income
-var _lower_class_label : GUITextLabel
-var _middle_class_label : GUITextLabel
-var _upper_class_label : GUITextLabel
-var _gold_label : GUITextLabel
-var _total_inc_label : GUITextLabel
+var _lower_class_label : GUILabel
+var _middle_class_label : GUILabel
+var _upper_class_label : GUILabel
+var _gold_label : GUILabel
+var _total_inc_label : GUILabel
 
 # debt
-var _national_bank_label : GUITextLabel
-var _total_funds_label : GUITextLabel
-var _debt_val_label : GUITextLabel
-var _interest_val_label : GUITextLabel
+var _national_bank_label : GUILabel
+var _total_funds_label : GUILabel
+var _debt_val_label : GUILabel
+var _interest_val_label : GUILabel
 
 # costs
-var _nat_stock_val_label : GUITextLabel
-var _nat_stock_exp_label : GUITextLabel
-var _mil_cost_val_label : GUITextLabel
-var _overseas_cost_val_label : GUITextLabel
-var _ind_sub_val_label : GUITextLabel
-var _admin_efficiency_label : GUITextLabel
-var _education_exp_label : GUITextLabel
-var _administration_exp_label : GUITextLabel
-var _social_exp_label : GUITextLabel
-var _military_exp_label : GUITextLabel
-var _total_exp_label : GUITextLabel
+var _nat_stock_val_label : GUILabel
+var _nat_stock_exp_label : GUILabel
+var _mil_cost_val_label : GUILabel
+var _overseas_cost_val_label : GUILabel
+var _ind_sub_val_label : GUILabel
+var _admin_efficiency_label : GUILabel
+var _education_exp_label : GUILabel
+var _administration_exp_label : GUILabel
+var _social_exp_label : GUILabel
+var _military_exp_label : GUILabel
+var _total_exp_label : GUILabel
 
 # others
-var _tariffs_percent_label : GUITextLabel
-var _tariff_val_label : GUITextLabel
-var _diplomatic_balance_label : GUITextLabel
-var _balance_label : GUITextLabel
+var _tariffs_percent_label : GUILabel
+var _tariff_val_label : GUILabel
+var _diplomatic_balance_label : GUILabel
+var _balance_label : GUILabel
 
 var _lower_class_chart : GFXPieChartTexture
 var _middle_class_chart : GFXPieChartTexture
@@ -55,33 +55,33 @@ func _ready() -> void:
 
 	# labels
 	# income
-	_lower_class_label = get_gui_text_label_from_nodepath(^"./country_budget/tax_0_inc")
-	_middle_class_label = get_gui_text_label_from_nodepath(^"./country_budget/tax_1_inc")
-	_upper_class_label = get_gui_text_label_from_nodepath(^"./country_budget/tax_2_inc")
-	_gold_label = get_gui_text_label_from_nodepath(^"./country_budget/gold_inc")
-	_total_inc_label = get_gui_text_label_from_nodepath(^"./country_budget/total_inc")
+	_lower_class_label = get_gui_label_from_nodepath(^"./country_budget/tax_0_inc")
+	_middle_class_label = get_gui_label_from_nodepath(^"./country_budget/tax_1_inc")
+	_upper_class_label = get_gui_label_from_nodepath(^"./country_budget/tax_2_inc")
+	_gold_label = get_gui_label_from_nodepath(^"./country_budget/gold_inc")
+	_total_inc_label = get_gui_label_from_nodepath(^"./country_budget/total_inc")
 	# debt
-	_national_bank_label = get_gui_text_label_from_nodepath(^"./country_budget/national_bank_val")
-	_total_funds_label = get_gui_text_label_from_nodepath(^"./country_budget/total_funds_val")
-	_debt_val_label = get_gui_text_label_from_nodepath(^"./country_budget/debt_val")
-	_interest_val_label = get_gui_text_label_from_nodepath(^"./country_budget/interest_val")
+	_national_bank_label = get_gui_label_from_nodepath(^"./country_budget/national_bank_val")
+	_total_funds_label = get_gui_label_from_nodepath(^"./country_budget/total_funds_val")
+	_debt_val_label = get_gui_label_from_nodepath(^"./country_budget/debt_val")
+	_interest_val_label = get_gui_label_from_nodepath(^"./country_budget/interest_val")
 	# costs
-	_nat_stock_val_label = get_gui_text_label_from_nodepath(^"./country_budget/nat_stock_val")
-	_nat_stock_exp_label = get_gui_text_label_from_nodepath(^"./country_budget/nat_stock_est")
-	_mil_cost_val_label = get_gui_text_label_from_nodepath(^"./country_budget/mil_cost_val")
-	_overseas_cost_val_label = get_gui_text_label_from_nodepath(^"./country_budget/overseas_cost_val")
-	_ind_sub_val_label = get_gui_text_label_from_nodepath(^"./country_budget/ind_sub_val")
-	_admin_efficiency_label = get_gui_text_label_from_nodepath(^"./country_budget/admin_efficiency")
-	_education_exp_label = get_gui_text_label_from_nodepath(^"./country_budget/exp_val_0")
-	_administration_exp_label = get_gui_text_label_from_nodepath(^"./country_budget/exp_val_1")
-	_social_exp_label = get_gui_text_label_from_nodepath(^"./country_budget/exp_val_2")
-	_military_exp_label = get_gui_text_label_from_nodepath(^"./country_budget/exp_val_3")
-	_total_exp_label = get_gui_text_label_from_nodepath(^"./country_budget/total_exp")
+	_nat_stock_val_label = get_gui_label_from_nodepath(^"./country_budget/nat_stock_val")
+	_nat_stock_exp_label = get_gui_label_from_nodepath(^"./country_budget/nat_stock_est")
+	_mil_cost_val_label = get_gui_label_from_nodepath(^"./country_budget/mil_cost_val")
+	_overseas_cost_val_label = get_gui_label_from_nodepath(^"./country_budget/overseas_cost_val")
+	_ind_sub_val_label = get_gui_label_from_nodepath(^"./country_budget/ind_sub_val")
+	_admin_efficiency_label = get_gui_label_from_nodepath(^"./country_budget/admin_efficiency")
+	_education_exp_label = get_gui_label_from_nodepath(^"./country_budget/exp_val_0")
+	_administration_exp_label = get_gui_label_from_nodepath(^"./country_budget/exp_val_1")
+	_social_exp_label = get_gui_label_from_nodepath(^"./country_budget/exp_val_2")
+	_military_exp_label = get_gui_label_from_nodepath(^"./country_budget/exp_val_3")
+	_total_exp_label = get_gui_label_from_nodepath(^"./country_budget/total_exp")
 	# others
-	_tariffs_percent_label = get_gui_text_label_from_nodepath(^"./country_budget/tariffs_percent")
-	_tariff_val_label = get_gui_text_label_from_nodepath(^"./country_budget/tariff_val")
-	_diplomatic_balance_label = get_gui_text_label_from_nodepath(^"./country_budget/diplomatic_balance")
-	_balance_label = get_gui_text_label_from_nodepath(^"./country_budget/balance")
+	_tariffs_percent_label = get_gui_label_from_nodepath(^"./country_budget/tariffs_percent")
+	_tariff_val_label = get_gui_label_from_nodepath(^"./country_budget/tariff_val")
+	_diplomatic_balance_label = get_gui_label_from_nodepath(^"./country_budget/diplomatic_balance")
+	_balance_label = get_gui_label_from_nodepath(^"./country_budget/balance")
 
 	# sliders
 	# income
diff --git a/game/src/Game/GameSession/NationManagementScreen/PopulationMenu.gd b/game/src/Game/GameSession/NationManagementScreen/PopulationMenu.gd
index 92ae6e2..e078934 100644
--- a/game/src/Game/GameSession/NationManagementScreen/PopulationMenu.gd
+++ b/game/src/Game/GameSession/NationManagementScreen/PopulationMenu.gd
@@ -14,8 +14,8 @@ var _province_list_types : Array[MenuSingleton.ProvinceListEntry]
 var _province_list_indices : PackedInt32Array
 var _province_list_panels : Array[Panel]
 var _province_list_button_icons : Array[GFXSpriteTexture]
-var _province_list_name_labels : Array[GUITextLabel]
-var _province_list_size_labels : Array[GUITextLabel]
+var _province_list_name_labels : Array[GUILabel]
+var _province_list_size_labels : Array[GUILabel]
 var _province_list_growth_icons : Array[GFXSpriteTexture]
 var _province_list_colony_buttons : Array[Button]
 var _province_list_national_focus_icons : Array[GFXSpriteTexture]
@@ -33,19 +33,19 @@ var _pop_list_scrollbar : GUIScrollbar
 var _pop_list_scroll_index : int = 0
 
 var _pop_list_rows : Array[Panel]
-var _pop_list_size_labels : Array[GUITextLabel]
+var _pop_list_size_labels : Array[GUILabel]
 var _pop_list_type_buttons : Array[Button]
 var _pop_list_type_icons : Array[GFXSpriteTexture]
 var _pop_list_producing_icons : Array[GFXSpriteTexture]
-var _pop_list_culture_labels : Array[GUITextLabel]
+var _pop_list_culture_labels : Array[GUILabel]
 var _pop_list_religion_icons : Array[GFXSpriteTexture]
-var _pop_list_location_labels : Array[GUITextLabel]
-var _pop_list_militancy_labels : Array[GUITextLabel]
-var _pop_list_consciousness_labels : Array[GUITextLabel]
+var _pop_list_location_labels : Array[GUILabel]
+var _pop_list_militancy_labels : Array[GUILabel]
+var _pop_list_consciousness_labels : Array[GUILabel]
 var _pop_list_ideology_charts : Array[GFXPieChartTexture]
 var _pop_list_issues_charts : Array[GFXPieChartTexture]
 var _pop_list_unemployment_progressbars : Array[TextureProgressBar]
-var _pop_list_cash_labels : Array[GUITextLabel]
+var _pop_list_cash_labels : Array[GUILabel]
 var _pop_list_life_needs_progressbars : Array[TextureProgressBar]
 var _pop_list_everyday_needs_progressbars : Array[TextureProgressBar]
 var _pop_list_luxury_needs_progressbars : Array[TextureProgressBar]
@@ -58,7 +58,7 @@ var _pop_list_political_movement_icons : Array[GFXSpriteTexture]
 var _pop_list_national_movement_texture_rects : Array[TextureRect]
 var _pop_list_national_movement_flags : Array[GFXMaskedFlagTexture]
 var _pop_list_size_change_icons : Array[GFXSpriteTexture]
-var _pop_list_literacy_labels : Array[GUITextLabel]
+var _pop_list_literacy_labels : Array[GUILabel]
 
 func _ready() -> void:
 	GameSingleton.gamestate_updated.connect(_update_info)
@@ -142,9 +142,9 @@ func _generate_province_list_row(index : int, type : MenuSingleton.ProvinceListE
 		)
 		_province_list_button_icons[index] = GUINode.get_gfx_sprite_texture_from_node(base_button)
 
-	_province_list_name_labels[index] = GUINode.get_gui_text_label_from_node(entry_panel.get_node(^"./poplist_name"))
+	_province_list_name_labels[index] = GUINode.get_gui_label_from_node(entry_panel.get_node(^"./poplist_name"))
 
-	_province_list_size_labels[index] = GUINode.get_gui_text_label_from_node(entry_panel.get_node(^"./poplist_numpops"))
+	_province_list_size_labels[index] = GUINode.get_gui_label_from_node(entry_panel.get_node(^"./poplist_numpops"))
 
 	_province_list_growth_icons[index] = GUINode.get_gfx_sprite_texture_from_node(entry_panel.get_node(^"./growth_indicator"))
 
@@ -273,7 +273,7 @@ func _setup_distribution_windows() -> void:
 			_pop_screen_panel.add_child(distribution_panel)
 			distribution_panel.set_position(distribution_start + distribution_step * Vector2(index % columns, index / columns))
 
-			var name_label : GUITextLabel = GUINode.get_gui_text_label_from_node(distribution_panel.get_node(^"./item_name"))
+			var name_label : GUILabel = GUINode.get_gui_label_from_node(distribution_panel.get_node(^"./item_name"))
 			if name_label:
 				name_label.set_text(distribution_names[index])
 
@@ -318,7 +318,7 @@ func _setup_pop_list() -> void:
 		height += pop_row_panel.size.y
 		_pop_list_rows.push_back(pop_row_panel)
 
-		_pop_list_size_labels.push_back(GUINode.get_gui_text_label_from_node(pop_row_panel.get_node(^"./pop_size")))
+		_pop_list_size_labels.push_back(GUINode.get_gui_label_from_node(pop_row_panel.get_node(^"./pop_size")))
 
 		var pop_type_button : Button = GUINode.get_button_from_node(pop_row_panel.get_node(^"./pop_type"))
 		# TODO - open pop details menu on pop type button press
@@ -328,17 +328,17 @@ func _setup_pop_list() -> void:
 
 		_pop_list_producing_icons.push_back(GUINode.get_gfx_sprite_texture_from_node(pop_row_panel.get_node(^"./pop_producing_icon")))
 
-		var culture_label : GUITextLabel = GUINode.get_gui_text_label_from_node(pop_row_panel.get_node(^"./pop_nation"))
+		var culture_label : GUILabel = GUINode.get_gui_label_from_node(pop_row_panel.get_node(^"./pop_nation"))
 		_pop_list_culture_labels.push_back(culture_label)
 
 		_pop_list_religion_icons.push_back(GUINode.get_gfx_sprite_texture_from_node(pop_row_panel.get_node(^"./pop_religion")))
 
-		var location_label : GUITextLabel = GUINode.get_gui_text_label_from_node(pop_row_panel.get_node(^"./pop_location"))
+		var location_label : GUILabel = GUINode.get_gui_label_from_node(pop_row_panel.get_node(^"./pop_location"))
 		_pop_list_location_labels.push_back(location_label)
 
-		_pop_list_militancy_labels.push_back(GUINode.get_gui_text_label_from_node(pop_row_panel.get_node(^"./pop_mil")))
+		_pop_list_militancy_labels.push_back(GUINode.get_gui_label_from_node(pop_row_panel.get_node(^"./pop_mil")))
 
-		_pop_list_consciousness_labels.push_back(GUINode.get_gui_text_label_from_node(pop_row_panel.get_node(^"./pop_con")))
+		_pop_list_consciousness_labels.push_back(GUINode.get_gui_label_from_node(pop_row_panel.get_node(^"./pop_con")))
 
 		_pop_list_ideology_charts.push_back(GUINode.get_gfx_pie_chart_texture_from_node(pop_row_panel.get_node(^"./pop_ideology")))
 
@@ -346,7 +346,7 @@ func _setup_pop_list() -> void:
 
 		_pop_list_unemployment_progressbars.push_back(GUINode.get_progress_bar_from_node(pop_row_panel.get_node(^"./pop_unemployment_bar")))
 
-		_pop_list_cash_labels.push_back(GUINode.get_gui_text_label_from_node(pop_row_panel.get_node(^"./pop_cash")))
+		_pop_list_cash_labels.push_back(GUINode.get_gui_label_from_node(pop_row_panel.get_node(^"./pop_cash")))
 
 		var pop_list_life_needs_progressbar : TextureProgressBar = GUINode.get_progress_bar_from_node(pop_row_panel.get_node(^"./lifeneed_progress"))
 		if pop_list_life_needs_progressbar:
@@ -390,7 +390,7 @@ func _setup_pop_list() -> void:
 
 		_pop_list_size_change_icons.push_back(GUINode.get_gfx_sprite_texture_from_node(pop_row_panel.get_node(^"./growth_indicator")))
 
-		_pop_list_literacy_labels.push_back(GUINode.get_gui_text_label_from_node(pop_row_panel.get_node(^"./pop_literacy")))
+		_pop_list_literacy_labels.push_back(GUINode.get_gui_label_from_node(pop_row_panel.get_node(^"./pop_literacy")))
 
 func _notification(what : int) -> void:
 	match what:
@@ -546,11 +546,11 @@ func _update_distributions():
 				if colour_icon_rect:
 					colour_icon_rect.set_modulate(distribution_row[slice_colour_key])
 
-				var identifier_label : GUITextLabel = GUINode.get_gui_text_label_from_node(child.get_node(^"./legend_title"))
+				var identifier_label : GUILabel = GUINode.get_gui_label_from_node(child.get_node(^"./legend_title"))
 				if identifier_label:
 					identifier_label.set_text(distribution_row[slice_identifier_key])
 
-				var weight_label : GUITextLabel = GUINode.get_gui_text_label_from_node(child.get_node(^"./legend_value"))
+				var weight_label : GUILabel = GUINode.get_gui_label_from_node(child.get_node(^"./legend_value"))
 				if weight_label:
 					weight_label.set_text("%s%%" % GUINode.float_to_string_dp(distribution_row[slice_weight_key] * 100.0, 1))