Translation shows original language by default

* Add checkbox to disable this feature if so desired.
* Delete old optimization code; can get it back from git if needed.
* Enforce that there's at least one space character ' ' between
  committed segments.

4 files changed, 23 insertions, 0 deletions

diff --git a/GUI/GUI/GUI/Config.cpp b/GUI/GUI/GUI/Config.cpp
index 605b25a..2bf8750 100644
--- a/GUI/GUI/GUI/Config.cpp
+++ b/GUI/GUI/GUI/Config.cpp
@@ -72,6 +72,7 @@ AppConfig::AppConfig(wxTextCtrl* out)
 	compute_type("float16"),

 

 	enable_local_beep(true),

+	enable_orig_lang(true),

 	enable_browser_src(false),

 	browser_src_port(8097),

 	commit_fuzz_threshold(4),

@@ -122,6 +123,7 @@ bool AppConfig::Serialize(const std::filesystem::path& path) {
 	cm.Set("compute_type", compute_type);

 

 	cm.Set("enable_local_beep", enable_local_beep);

+	cm.Set("enable_orig_lang", enable_orig_lang);

 	cm.Set("enable_browser_src", enable_browser_src);

 	cm.Set("browser_src_port", browser_src_port);

 	cm.Set("commit_fuzz_threshold", commit_fuzz_threshold);

@@ -185,6 +187,7 @@ bool AppConfig::Deserialize(const std::filesystem::path& path) {
 	cm.Get("compute_type", c.compute_type);

 

 	cm.Get("enable_local_beep", c.enable_local_beep);

+	cm.Get("enable_orig_lang", c.enable_orig_lang);

 	cm.Get("enable_browser_src", c.enable_browser_src);

 	cm.Get("browser_src_port", c.browser_src_port);

 	cm.Get("commit_fuzz_threshold", c.commit_fuzz_threshold);

diff --git a/GUI/GUI/GUI/Config.h b/GUI/GUI/GUI/Config.h
index e75e4d5..48b49a2 100644
--- a/GUI/GUI/GUI/Config.h
+++ b/GUI/GUI/GUI/Config.h
@@ -58,6 +58,7 @@ public:
 	std::string compute_type;

 

 	bool enable_local_beep;

+	bool enable_orig_lang;

 	bool enable_browser_src;

 	int browser_src_port;

 	int commit_fuzz_threshold;

diff --git a/GUI/GUI/GUI/Frame.cpp b/GUI/GUI/GUI/Frame.cpp
index 9a69651..e3c1964 100644
--- a/GUI/GUI/GUI/Frame.cpp
+++ b/GUI/GUI/GUI/Frame.cpp
@@ -62,6 +62,7 @@ namespace {
         ID_PY_APP_COMPUTE_TYPE,

         ID_PY_APP_MODEL_PANEL,

         ID_PY_APP_ENABLE_LOCAL_BEEP,

+        ID_PY_APP_ENABLE_ORIG_LANG,

         ID_PY_APP_ENABLE_BROWSER_SRC,

         ID_PY_APP_USE_CPU,

         ID_PY_APP_USE_FLASH_ATTENTION,

@@ -985,6 +986,16 @@ Frame::Frame()
                 );

                 py_app_enable_local_beep_ = py_app_enable_local_beep;

 

+                auto* py_app_enable_orig_lang = new wxCheckBox(py_config_panel,

+                    ID_PY_APP_ENABLE_ORIG_LANG, "Translation shows original language");

+                py_app_enable_orig_lang->SetValue(app_c_->enable_orig_lang);

+                py_app_enable_orig_lang->SetToolTip(

+                    "When translation is enabled, this checkbox determines whether "

+                    "the original language is shown in parentheses after the "

+                    "translated text - c'est comme ça. ( like this)."

+                );

+                py_app_enable_orig_lang_ = py_app_enable_orig_lang;

+

                 auto* py_app_use_cpu = new wxCheckBox(py_config_panel,

                     ID_PY_APP_USE_CPU, "Use CPU");

                 py_app_use_cpu->SetValue(app_c_->use_cpu);

@@ -1121,6 +1132,8 @@ Frame::Frame()
                     /*flags=*/wxEXPAND);

                 sizer->Add(py_app_enable_local_beep, /*proportion=*/0,

                     /*flags=*/wxEXPAND);

+                sizer->Add(py_app_enable_orig_lang, /*proportion=*/0,

+                    /*flags=*/wxEXPAND);

                 sizer->Add(py_app_use_cpu, /*proportion=*/0,

                     /*flags=*/wxEXPAND);

                 sizer->Add(py_app_use_flash_attention, /*proportion=*/0,

@@ -1708,6 +1721,9 @@ void Frame::ApplyConfigToInputFields()
     auto* py_app_enable_local_beep = static_cast<wxCheckBox*>(FindWindowById(ID_PY_APP_ENABLE_LOCAL_BEEP));

     py_app_enable_local_beep->SetValue(app_c_->enable_local_beep);

 

+    auto* py_app_enable_orig_lang = static_cast<wxCheckBox*>(FindWindowById(ID_PY_APP_ENABLE_ORIG_LANG));

+    py_app_enable_orig_lang->SetValue(app_c_->enable_orig_lang);

+

     auto* py_app_enable_browser_src = static_cast<wxCheckBox*>(FindWindowById(ID_PY_APP_ENABLE_BROWSER_SRC));

     py_app_enable_browser_src->SetValue(app_c_->enable_browser_src);

 

@@ -2464,6 +2480,7 @@ void Frame::OnAppStart(wxCommandEvent& event) {
     }

 

     const bool enable_local_beep = py_app_enable_local_beep_->GetValue();

+    const bool enable_orig_lang = py_app_enable_orig_lang_->GetValue();

     const bool enable_browser_src = py_app_enable_browser_src_->GetValue();

     const bool use_cpu = py_app_use_cpu_->GetValue();

     const bool use_flash_attention = py_app_use_flash_attention_->GetValue();

@@ -2504,6 +2521,7 @@ void Frame::OnAppStart(wxCommandEvent& event) {
     app_c_->rows = rows;

     app_c_->cols = cols;

     app_c_->enable_local_beep = enable_local_beep;

+    app_c_->enable_orig_lang = enable_orig_lang;

     app_c_->enable_browser_src = enable_browser_src;

     app_c_->browser_src_port = browser_src_port;

     app_c_->use_cpu = use_cpu;

diff --git a/GUI/GUI/GUI/Frame.h b/GUI/GUI/GUI/Frame.h
index fc8bac8..2d682a7 100644
--- a/GUI/GUI/GUI/Frame.h
+++ b/GUI/GUI/GUI/Frame.h
@@ -69,6 +69,7 @@ private:
     wxChoice* unity_bytes_per_char_;

 

     wxCheckBox* py_app_enable_local_beep_;

+    wxCheckBox* py_app_enable_orig_lang_;

     wxCheckBox* py_app_enable_browser_src_;

     wxCheckBox* py_app_use_cpu_;

     wxCheckBox* py_app_use_flash_attention_;