add optimize multilang option

dinhngtu · Jan 7, 2024 · f919c3a · f919c3a
1 parent 351b8b4
commit f919c3a
Show file tree

Hide file tree

Showing 10 changed files with 396 additions and 122 deletions.
diff --git a/VietTypeATL/EngineSettingsController.cpp b/VietTypeATL/EngineSettingsController.cpp
@@ -61,12 +61,26 @@ _Check_return_ HRESULT EngineSettingsController::Initialize(
         clientid);
     HRESULT_CHECK_RETURN(hr, L"%s", L"CreateInitialize(_tc_backspace_invalid) failed");
 
+    hr = CreateInitialize(
+        &_tc_optimize_multilang,
+        HKEY_CURRENT_USER,
+        Globals::ConfigKeyName.c_str(),
+        L"optimize_multilang",
+        KEY_QUERY_VALUE,
+        threadMgr,
+        clientid);
+    HRESULT_CHECK_RETURN(hr, L"%s", L"CreateInitialize(_tc_optimize_multilang) failed");
+
     return S_OK;
 }
 
 HRESULT EngineSettingsController::Uninitialize() {
     HRESULT hr;
 
+    hr = _tc_optimize_multilang->Uninitialize();
+    HRESULT_CHECK_RETURN(hr, L"%s", L"_tc_optimize_multilang->Uninitialize failed");
+    _tc_optimize_multilang.Release();
+
     hr = _tc_backspace_invalid->Uninitialize();
     HRESULT_CHECK_RETURN(hr, L"%s", L"_tc_backspace_invalid->Uninitialize failed");
     _tc_backspace_invalid.Release();
@@ -109,6 +123,12 @@ HRESULT EngineSettingsController::LoadTelexSettings(Telex::TelexConfig& cfg) {
     HRESULT_CHECK_RETURN(hr, L"%s", L"_tc_backspace_invalid->GetValueOrWriteback failed");
     cfg.backspaced_word_stays_invalid = static_cast<bool>(backspace_invalid);
 
+    DWORD optimize_multilang = true;
+    hr = _tc_optimize_multilang->GetValueOrDefault(
+        &optimize_multilang, _ec->GetEngine().GetConfig().optimize_multilang);
+    HRESULT_CHECK_RETURN(hr, L"%s", L"_tc_optimize_multilang->GetValueOrWriteback failed");
+    cfg.optimize_multilang = static_cast<bool>(optimize_multilang);
+
     return S_OK;
 }
 

diff --git a/VietTypeATL/EngineSettingsController.h b/VietTypeATL/EngineSettingsController.h
@@ -46,6 +46,7 @@ class EngineSettingsController : public CComObjectRootEx<CComSingleThreadModel>
     CComPtr<RegistrySetting<DWORD>> _tc_oa_uy_tone1;
     CComPtr<RegistrySetting<DWORD>> _tc_accept_dd;
     CComPtr<RegistrySetting<DWORD>> _tc_backspace_invalid;
+    CComPtr<RegistrySetting<DWORD>> _tc_optimize_multilang;
 };
 
 } // namespace VietType
diff --git a/VietTypeConfig/Form1.Designer.cs b/VietTypeConfig/Form1.Designer.cs
diff --git a/VietTypeConfig/Form1.en.resx b/VietTypeConfig/Form1.en.resx
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="$this.Text" xml:space="preserve">
+    <value>VietType Settings</value>
+  </data>
+  <data name="aboutMessage" xml:space="preserve">
+    <value>VietType {0} {1}
+Copyright © 2018 Dinh Ngoc Tu.
+VietType is free software, licensed under the GNU General Public License. VietType is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the included LICENSE file for more details.</value>
+  </data>
+  <data name="aboutTitle" xml:space="preserve">
+    <value>About VietType</value>
+  </data>
+  <data name="btnAbout.Text" xml:space="preserve">
+    <value>A&amp;bout</value>
+  </data>
+  <data name="btnCancel.Text" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+  <data name="btnEnable.Text" xml:space="preserve">
+    <value>&amp;Enable VietType</value>
+  </data>
+  <data name="btnEnable_DisableText" xml:space="preserve">
+    <value>&amp;Disable VietType</value>
+  </data>
+  <data name="btnOK.Text" xml:space="preserve">
+    <value>OK</value>
+  </data>
+  <data name="cannotConfigureMessage" xml:space="preserve">
+    <value>Cannot configure VietType: {0}</value>
+  </data>
+  <data name="cannotFindLibraryMessage" xml:space="preserve">
+    <value>Cannot find VietType library: {0}</value>
+  </data>
+  <data name="cannotSaveSettingsMessage" xml:space="preserve">
+    <value>Cannot save settings: {0}</value>
+  </data>
+  <data name="cbAcceptDd.Text" xml:space="preserve">
+    <value>Accept 'd' any&amp;where</value>
+  </data>
+  <data name="cbBackconvertOnBackspace.Text" xml:space="preserve">
+    <value>&amp;Reconvert word on Backspace (Experimental)</value>
+  </data>
+  <data name="cbBackspaceInvalid.Text" xml:space="preserve">
+    <value>Backspaced &amp;invalid word stays invalid</value>
+  </data>
+  <data name="cbDefaultEnabled.Text" xml:space="preserve">
+    <value>Vietnamese mode by de&amp;fault</value>
+  </data>
+  <data name="cbOaUy.Text" xml:space="preserve">
+    <value>&amp;Use "oà", "uý" instead of "òa", "úy"</value>
+  </data>
+  <data name="cbOptimizeMultilang.Text" xml:space="preserve">
+    <value>&amp;Optimize multilingual typing</value>
+  </data>
+  <data name="disableSuccessMessage" xml:space="preserve">
+    <value>Successfully disabled VietType.</value>
+  </data>
+  <data name="enableSuccessMessage" xml:space="preserve">
+    <value>Successfully enabled VietType. Switch to VietType in the language bar to start using it.</value>
+  </data>
+  <data name="label1.Text" xml:space="preserve">
+    <value>label1</value>
+  </data>
+  <data name="notEnabledQuestion" xml:space="preserve">
+    <value>VietType is not enabled. Enable it now?</value>
+  </data>
+</root>