From 216c28aa5e51c2c13028a81a68c8b5f4d4db8623 Mon Sep 17 00:00:00 2001
From: Petr Mironychev <9195189+Palm1r@users.noreply.github.com>
Date: Sun, 8 Sep 2024 01:42:23 +0200
Subject: [PATCH] Fix names, icon and tips

---
 settings/ContextSettings.cpp      |  2 ++
 settings/CustomPromptSettings.cpp | 12 +++++++++++-
 settings/CustomPromptSettings.hpp |  1 +
 settings/GeneralSettings.cpp      |  8 ++++----
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/settings/ContextSettings.cpp b/settings/ContextSettings.cpp
index 1f2ae76..f9af061 100644
--- a/settings/ContextSettings.cpp
+++ b/settings/ContextSettings.cpp
@@ -137,6 +137,8 @@ public:
         setId(Constants::QODE_ASSIST_CONTEXT_SETTINGS_PAGE_ID);
         setDisplayName(Tr::tr("Context"));
         setCategory(Constants::QODE_ASSIST_GENERAL_OPTIONS_CATEGORY);
+        setDisplayCategory(Constants::QODE_ASSIST_GENERAL_OPTIONS_DISPLAY_CATEGORY);
+        setCategoryIconPath(":/resources/images/qoderassist-icon.png");
         setSettingsProvider([] { return &contextSettings(); });
     }
 };
diff --git a/settings/CustomPromptSettings.cpp b/settings/CustomPromptSettings.cpp
index 1c98b67..c938a2f 100644
--- a/settings/CustomPromptSettings.cpp
+++ b/settings/CustomPromptSettings.cpp
@@ -46,8 +46,15 @@ CustomPromptSettings::CustomPromptSettings()
     customJsonLabel.setLabelText("Custom JSON Template:");
     customJsonLabel.setDisplayStyle(Utils::StringAspect::LabelDisplay);
 
+    customJsonLegend.setLabelText(Tr::tr(R"(Prompt components:
+- {{QODE_INSTRUCTIONS}}: Placeholder for specific instructions or context.
+- {{QODE_PREFIX}}: Will be replaced with the actual code before the cursor.
+- {{QODE_SUFFIX}}: Will be replaced with the actual code after the cursor.
+)"));
+
     customJsonTemplate.setSettingsKey(Constants::CUSTOM_JSON_TEMPLATE);
     customJsonTemplate.setDisplayStyle(Utils::StringAspect::TextEditDisplay);
+
     customJsonTemplate.setDefaultValue(R"({
   "prompt": "{{QODE_INSTRUCTIONS}}<fim_prefix>{{QODE_PREFIX}}<fim_suffix>{{QODE_SUFFIX}}<fim_middle>",
   "options": {
@@ -79,7 +86,10 @@ CustomPromptSettings::CustomPromptSettings()
         using namespace Layouting;
         return Column{Row{customJsonLabel, Stretch{1}, resetToDefaults},
                       Row{customJsonTemplate,
-                          Column{saveCustomTemplateButton, loadCustomTemplateButton, Stretch{1}}}};
+                          Column{saveCustomTemplateButton,
+                                 loadCustomTemplateButton,
+                                 customJsonLegend,
+                                 Stretch{1}}}};
     });
 }
 
diff --git a/settings/CustomPromptSettings.hpp b/settings/CustomPromptSettings.hpp
index 0c83bda..7ff0515 100644
--- a/settings/CustomPromptSettings.hpp
+++ b/settings/CustomPromptSettings.hpp
@@ -31,6 +31,7 @@ public:
 
     Utils::StringAspect customJsonLabel{this};
     Utils::StringAspect customJsonTemplate{this};
+    Utils::StringAspect customJsonLegend{this};
     ButtonAspect saveCustomTemplateButton{this};
     ButtonAspect loadCustomTemplateButton{this};
     ButtonAspect resetToDefaults{this};
diff --git a/settings/GeneralSettings.cpp b/settings/GeneralSettings.cpp
index 6b7167a..8b4eff0 100644
--- a/settings/GeneralSettings.cpp
+++ b/settings/GeneralSettings.cpp
@@ -67,7 +67,7 @@ GeneralSettings::GeneralSettings()
     startSuggestionTimer.setDefaultValue(500);
 
     llmProviders.setSettingsKey(Constants::LLM_PROVIDERS);
-    llmProviders.setDisplayName(Tr::tr("LLM Providers:"));
+    llmProviders.setDisplayName(Tr::tr("FIM Provider:"));
     llmProviders.setDisplayStyle(Utils::SelectionAspect::DisplayStyle::ComboBox);
     llmProviders.setDefaultValue(0);
 
@@ -76,16 +76,16 @@ GeneralSettings::GeneralSettings()
     url.setDisplayStyle(Utils::StringAspect::LineEditDisplay);
 
     endPoint.setSettingsKey(Constants::END_POINT);
-    endPoint.setLabelText(Tr::tr("Endpoint:"));
+    endPoint.setLabelText(Tr::tr("FIM Endpoint:"));
     endPoint.setDisplayStyle(Utils::StringAspect::LineEditDisplay);
 
     modelName.setSettingsKey(Constants::MODEL_NAME);
     modelName.setLabelText(Tr::tr("LLM Name:"));
     modelName.setDisplayStyle(Utils::StringAspect::LineEditDisplay);
 
-    selectModels.m_buttonText = Tr::tr("Select Model");
+    selectModels.m_buttonText = Tr::tr("Select Fill-In-the-Middle Model");
 
-    fimPrompts.setDisplayName(Tr::tr("Fill-In-Middle Prompt"));
+    fimPrompts.setDisplayName(Tr::tr("Fill-In-the-Middle Prompt"));
     fimPrompts.setSettingsKey(Constants::FIM_PROMPTS);
     fimPrompts.setDefaultValue(0);
     fimPrompts.setDisplayStyle(Utils::SelectionAspect::DisplayStyle::ComboBox);