Label Settings: formatting cleanup

src/gui/dialogs/label_settings.cpp

@@ -13,27 +13,29 @@
 
 #define GETTEXT_DOMAIN "wesnoth-lib"
 
+
 #include "gui/dialogs/label_settings.hpp"
 
-#include <vector>
-#include "utils/functional.hpp"
-#include "gettext.hpp"
 #include "display.hpp"
 #include "font/text_formatting.hpp"
-#include "map/label.hpp"
+#include "formula/string_utils.hpp"
+#include "gettext.hpp"
 #include "gui/auxiliary/find_widget.hpp"
-#include "gui/widgets/styled_widget.hpp"
+#include "gui/widgets/label.hpp"
 #ifdef GUI2_EXPERIMENTAL_LISTBOX
 #include "gui/widgets/list.hpp"
 #else
 #include "gui/widgets/listbox.hpp"
 #endif
-#include "gui/widgets/window.hpp"
 #include "gui/widgets/settings.hpp"
+#include "gui/widgets/styled_widget.hpp"
 #include "gui/widgets/toggle_button.hpp"
-#include "gui/widgets/label.hpp"
-#include "formula/string_utils.hpp"
+#include "gui/widgets/window.hpp"
+#include "map/label.hpp"
 #include "team.hpp"
+#include "utils/functional.hpp"
+
+#include <vector>
 
 namespace gui2
 {
@@ -41,57 +43,73 @@ namespace dialogs
 {
 REGISTER_DIALOG(label_settings)
 
-label_settings::label_settings(display_context& dc) : viewer(dc) {
+label_settings::label_settings(display_context& dc)
+	: viewer(dc)
+{
 	const std::vector<std::string>& all_categories = display::get_singleton()->labels().all_categories();
 	const std::vector<std::string>& hidden_categories = viewer.hidden_label_categories();
 
 	for(std::size_t i = 0; i < all_categories.size(); i++) {
 		all_labels[all_categories[i]] = true;
-		if(all_categories[i].substr(0,4) == "cat:")
+
+		if(all_categories[i].substr(0, 4) == "cat:") {
 			labels_display[all_categories[i]] = all_categories[i].substr(4);
-		else if(all_categories[i] == "team")
+		} else if(all_categories[i] == "team") {
 			labels_display[all_categories[i]] = _("Team Labels");
+		}
+
 		// TODO: Translatable names for categories?
 	}
+
 	for(std::size_t i = 0; i < hidden_categories.size(); i++) {
 		all_labels[hidden_categories[i]] = false;
 	}
+
 	for(std::size_t i = 0; i < dc.teams().size(); i++) {
 		const team& team = dc.teams()[i];
 		const std::string label_cat_key = "side:" + std::to_string(i + 1);
+
 		if(team.hidden()) {
 			labels_display[label_cat_key] = "";
 			continue;
 		}
+
 		std::string team_name = team.side_name();
 		if(team_name.empty()) {
 			team_name = team.user_team_name();
 		}
+
 		if(team_name.empty()) {
 			team_name = _("Unknown");
 		}
+
 		string_map subst;
 		subst["side_number"] = std::to_string(i + 1);
 		subst["name"] = team_name;
+
 		labels_display[label_cat_key] = VGETTEXT("Side $side_number ($name)", subst);
 	}
 }
 
-void label_settings::pre_show(window& window) {
+void label_settings::pre_show(window& window)
+{
 	std::map<std::string, string_map> list_data;
 	listbox& cats_listbox = find_widget<listbox>(&window, "label_types", false);
-	for(const auto & label_entry : all_labels) {
+
+	for(const auto& label_entry : all_labels) {
 		const std::string& category = label_entry.first;
 		const bool& visible = label_entry.second;
 
 		std::string name = labels_display[category];
-		if(category.substr(0,5) == "side:") {
+		if(category.substr(0, 5) == "side:") {
+			// This means it's a hidden side, so don't show it.
 			if(name.empty()) {
-				// This means it's a hidden side, so don't show it.
 				continue;
 			}
+		
 			int team = std::stoi(category.substr(5)) - 1;
 			color_t which_color = game_config::tc_info(viewer.teams()[team].color())[0];
+
 			std::ostringstream sout;
 			sout << font::span_color(which_color) << name << "</span>";
 			name = sout.str();
@@ -105,27 +123,33 @@ void label_settings::pre_show(window& window) {
 
 		connect_signal_notify_modified(status, std::bind(&label_settings::toggle_category, this, _1, category));
 
-		if(category.substr(0,5) == "side:") {
+		if(category.substr(0, 5) == "side:") {
 			label& cat_name = find_widget<label>(grid, "cat_name", false);
 			cat_name.set_use_markup(true);
 		}
 	}
 }
 
-bool label_settings::execute(display_context& dc) {
+bool label_settings::execute(display_context& dc)
+{
 	label_settings window(dc);
-	if(!window.show()) return false;
+	if(!window.show()) {
+		return false;
+	}
+
 	std::vector<std::string> hidden_categories;
 	for(auto lbl : window.all_labels) {
 		if(lbl.second == false) {
 			hidden_categories.push_back(lbl.first);
 		}
 	}
+
 	dc.hidden_label_categories_ref().swap(hidden_categories);
 	return true;
 }
 
-void label_settings::toggle_category(widget& box, std::string category) {
+void label_settings::toggle_category(widget& box, std::string category)
+{
 	all_labels[category] = (static_cast<toggle_button&>(box).get_value() != 0);
 }
 } // namespace dialogs

src/gui/dialogs/label_settings.hpp

@@ -13,17 +13,18 @@
 
 #pragma once
 
-#include "gui/dialogs/modal_dialog.hpp"
-#include <map>
 #include "display_context.hpp"
+#include "gui/dialogs/modal_dialog.hpp"
 #include "tstring.hpp"
 
+#include <map>
+
 namespace gui2
 {
 namespace dialogs
 {
-
-class label_settings : public modal_dialog {
+class label_settings : public modal_dialog
+{
 public:
 	label_settings(display_context& dc);
 
@@ -33,11 +34,8 @@ public:
 	 * See @ref modal_dialog for more information.
 	 */
 	static bool execute(display_context& dc);
-private:
-	std::map<std::string, bool> all_labels;
-	std::map<std::string, t_string> labels_display;
-	display_context& viewer;
 
+private:
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
 	virtual const std::string& window_id() const override;
 
@@ -46,6 +44,12 @@ private:
 
 	/** Callback for toggling a checkbox state. */
 	void toggle_category(widget& box, std::string category);
+
+	std::map<std::string, bool> all_labels;
+	std::map<std::string, t_string> labels_display;
+
+	display_context& viewer;
 };
+
 } // namespace dialogs
 } // namespace gui2