From 575c085f7a36797ccde633909a04e278f9fb3772 Mon Sep 17 00:00:00 2001
From: gxalpha <beckmann.sebastian@outlook.de>
Date: Sun, 11 Jun 2023 02:20:57 +0200
Subject: [PATCH] text-freetype2: Improve text/file properties UX

---
 plugins/text-freetype2/data/locale/en-US.ini |  7 ++--
 plugins/text-freetype2/text-freetype2.c      | 38 ++++++++++++++++----
 2 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/plugins/text-freetype2/data/locale/en-US.ini b/plugins/text-freetype2/data/locale/en-US.ini
index b7fd9d61e..35573b938 100644
--- a/plugins/text-freetype2/data/locale/en-US.ini
+++ b/plugins/text-freetype2/data/locale/en-US.ini
@@ -1,7 +1,11 @@
 TextFreetype2="Text (FreeType 2)"
 Font="Font"
 Text="Text"
-TextFile="Text File (UTF-8 or UTF-16)"
+TextFile="Text File"
+TextFile.Encoding="UTF-8 or UTF-16"
+TextInputMode="Text input mode"
+TextInputMode.Manual="Manual"
+TextInputMode.FromFile="From file"
 TextFileFilter="Text Files (*.txt);;"
 ChatLogMode="Chat log mode"
 ChatLogLines="Chat log lines"
@@ -9,7 +13,6 @@ Color1="Color 1"
 Color2="Color 2"
 Outline="Outline"
 DropShadow="Drop Shadow"
-ReadFromFile="Read from file"
 CustomWidth="Custom text width"
 WordWrap="Word Wrap"
 Antialiasing="Enable Antialiasing"
diff --git a/plugins/text-freetype2/text-freetype2.c b/plugins/text-freetype2/text-freetype2.c
index 31bd8f53a..a471c8a05 100644
--- a/plugins/text-freetype2/text-freetype2.c
+++ b/plugins/text-freetype2/text-freetype2.c
@@ -138,6 +138,22 @@ static uint32_t ft2_source_get_height(void *data)
 	return srcdata->cy + srcdata->outline_width;
 }
 
+static bool from_file_modified(obs_properties_t *props, obs_property_t *prop,
+			       obs_data_t *settings)
+{
+	UNUSED_PARAMETER(prop);
+
+	bool from_file = obs_data_get_bool(settings, "from_file");
+
+	obs_property_t *text = obs_properties_get(props, "text");
+	obs_property_t *text_file = obs_properties_get(props, "text_file");
+
+	obs_property_set_visible(text, !from_file);
+	obs_property_set_visible(text_file, from_file);
+
+	return true;
+}
+
 static obs_properties_t *ft2_source_properties(void *unused)
 {
 	UNUSED_PARAMETER(unused);
@@ -153,12 +169,24 @@ static obs_properties_t *ft2_source_properties(void *unused)
 
 	obs_properties_add_font(props, "font", obs_module_text("Font"));
 
+	obs_property_t *from_file = obs_properties_add_list(
+		props, "from_file", obs_module_text("TextInputMode"),
+		OBS_COMBO_TYPE_RADIO, OBS_COMBO_FORMAT_BOOL);
+	obs_property_list_add_bool(
+		from_file, obs_module_text("TextInputMode.Manual"), false);
+	obs_property_list_add_bool(
+		from_file, obs_module_text("TextInputMode.FromFile"), true);
+	obs_property_set_modified_callback(from_file, from_file_modified);
+
+	obs_property_t *text_file = obs_properties_add_path(
+		props, "text_file", obs_module_text("TextFile"), OBS_PATH_FILE,
+		obs_module_text("TextFileFilter"), NULL);
+	obs_property_set_long_description(text_file,
+					  obs_module_text("TextFile.Encoding"));
+
 	obs_properties_add_text(props, "text", obs_module_text("Text"),
 				OBS_TEXT_MULTILINE);
 
-	obs_properties_add_bool(props, "from_file",
-				obs_module_text("ReadFromFile"));
-
 	obs_properties_add_bool(props, "antialiasing",
 				obs_module_text("Antialiasing"));
 
@@ -168,10 +196,6 @@ static obs_properties_t *ft2_source_properties(void *unused)
 	obs_properties_add_int(props, "log_lines",
 			       obs_module_text("ChatLogLines"), 1, 1000, 1);
 
-	obs_properties_add_path(props, "text_file", obs_module_text("TextFile"),
-				OBS_PATH_FILE,
-				obs_module_text("TextFileFilter"), NULL);
-
 	obs_properties_add_color_alpha(props, "color1",
 				       obs_module_text("Color1"));