Fix #196

HISTORY-ID.txt

@@ -312,3 +312,4 @@
     - Supported exporting RES file.
 - v.5.8.3 (2024-XX-YY)
     - Auto filling resource name from filename.
+    - Added resource language setting.

HISTORY-ITA.txt

@@ -312,3 +312,4 @@
     - Supporto esportazione file RES.
 - v.5.8.3 (2024-XX-YY)
     - Auto filling resource name from filename.
+    - Added resource language setting.

HISTORY-JPN.txt

@@ -656,3 +656,4 @@
     - RESファイルのエクスポートをサポート。
 - v.5.8.3 (2024-XX-YY)
     - ファイル名からリソース名を埋める。
+    - リソース言語設定を追加。

HISTORY-KOR.txt

@@ -313,3 +313,4 @@
     - RES 파일 내보내기가 지원됩니다.
 - v.5.8.3 (2024-XX-YY)
     - Auto filling resource name from filename.
+    - Added resource language setting.

HISTORY-PTB.txt

@@ -312,3 +312,4 @@
     - Supported exporting RES file.
 - v.5.8.3 (2024-XX-YY)
     - Auto filling resource name from filename.
+    - Added resource language setting.

HISTORY.txt

@@ -312,3 +312,4 @@
     - Supported exporting RES file.
 - v.5.8.3 (2024-XX-YY)
     - Auto filling resource name from filename.
+    - Added resource language setting.

src/Common.hpp

@@ -1,9 +1,16 @@
 #pragma once
 
+enum LANG_TYPE
+{
+    LANG_TYPE_0,
+    LANG_TYPE_1,
+    LANG_TYPE_2
+};
+
 BOOL CheckCommand(MString strCommand);
 BOOL CheckCommand(MString& strCommand);
 BOOL CheckLangComboBox(HWND hCmb3, WORD& lang);
-BOOL CheckLangComboBox(HWND hCmb3, WORD& lang, BOOL bUILanguage);
+BOOL CheckLangComboBox(HWND hCmb3, WORD& lang, LANG_TYPE type);
 BOOL CheckNameComboBox(HWND hCmb2, MIdOrString& name);
 BOOL CheckTypeComboBox(HWND hCmb1, MIdOrString& type);
 BOOL Cmb1_CheckKey(HWND hwnd, HWND hCmb1, BOOL bVirtKey, std::wstring& str);
@@ -29,8 +36,8 @@ void InitComboBoxPlaceholder(HWND hCmb, UINT nStringID);
 void InitConstantComboBox(HWND hCmb);
 void InitCtrlIDComboBox(HWND hCmb);
 void InitFontComboBox(HWND hCmb);
-void InitLangComboBox(HWND hCmb3, LANGID langid);
-void InitLangComboBox(HWND hCmb3, LANGID langid, BOOL bUILanguage);
+void InitLangComboBox(HWND hCmb3, DWORD langid);
+void InitLangComboBox(HWND hCmb3, DWORD langid, BOOL bUILanguage);
 void InitLangListView(HWND hLst1, LPCTSTR pszText);
 void InitMessageComboBox(HWND hCmb, const MString& strString);
 void InitResNameComboBox(HWND hCmb, const MIdOrString& id, IDTYPE_ nIDTYPE_);
@@ -41,3 +48,4 @@ void InitStyleListBox(HWND hLst, ConstantsDB::TableType& table);
 void InitWndClassComboBox(HWND hCmb, LPCTSTR pszWndClass);
 void ReplaceFullWithHalf(LPWSTR pszText);
 void ReplaceFullWithHalf(MStringW& strText);
+DWORD GetDefaultResLanguage(VOID);

src/MAddBitmapDlg.hpp

@@ -46,7 +46,6 @@ class MAddBitmapDlg : public MDialogBase
         , m_pAutoComplete(new MLangAutoComplete())
     {
         m_cmb3.m_bAcceptSpace = TRUE;
-        m_pAutoComplete->AddRef();
     }
 
     ~MAddBitmapDlg()
@@ -70,7 +69,7 @@ class MAddBitmapDlg : public MDialogBase
 
         // for Langs
         HWND hCmb3 = GetDlgItem(hwnd, cmb3);
-        InitLangComboBox(hCmb3, GetThreadUILanguage());
+        InitLangComboBox(hCmb3, GetDefaultResLanguage());
         SubclassChildDx(m_cmb3, cmb3);
 
         CenterWindowDx();

src/MAddCursorDlg.hpp

@@ -46,7 +46,6 @@ class MAddCursorDlg : public MDialogBase
         , m_file(NULL)
         , m_pAutoComplete(new MLangAutoComplete())
     {
-        m_pAutoComplete->AddRef();
         m_hCursor = NULL;
         m_cmb3.m_bAcceptSpace = TRUE;
     }
@@ -77,7 +76,7 @@ class MAddCursorDlg : public MDialogBase
 
         // for Langs
         HWND hCmb3 = GetDlgItem(hwnd, cmb3);
-        InitLangComboBox(hCmb3, GetThreadUILanguage());
+        InitLangComboBox(hCmb3, GetDefaultResLanguage());
         SubclassChildDx(m_cmb3, cmb3);
 
         // auto complete

src/MAddIconDlg.hpp

@@ -47,7 +47,6 @@ class MAddIconDlg : public MDialogBase
         , m_hIcon(NULL)
         , m_pAutoComplete(new MLangAutoComplete())
     {
-        m_pAutoComplete->AddRef();
         m_cmb3.m_bAcceptSpace = TRUE;
     }
 
@@ -77,7 +76,7 @@ class MAddIconDlg : public MDialogBase
 
         // for Langs
         HWND hCmb3 = GetDlgItem(hwnd, cmb3);
-        InitLangComboBox(hCmb3, GetThreadUILanguage());
+        InitLangComboBox(hCmb3, GetDefaultResLanguage());
         SubclassChildDx(m_cmb3, cmb3);
 
         CenterWindowDx();

src/MAddResDlg.hpp

@@ -50,7 +50,6 @@ class MAddResDlg : public MDialogBase
         , m_file(NULL)
         , m_pAutoComplete(new MLangAutoComplete())
     {
-        m_pAutoComplete->AddRef();
         m_cmb3.m_bAcceptSpace = TRUE;
     }
 
@@ -84,7 +83,7 @@ class MAddResDlg : public MDialogBase
 
         // for Langs
         HWND hCmb3 = GetDlgItem(hwnd, cmb3);
-        InitLangComboBox(hCmb3, GetThreadUILanguage());
+        InitLangComboBox(hCmb3, GetDefaultResLanguage());
         SubclassChildDx(m_cmb3, cmb3);
 
         // for file

src/MChooseLangDlg.hpp

@@ -43,14 +43,16 @@ class MChooseLangDlg : public MDialogBase
         , m_pAutoComplete(new MLangAutoComplete(TRUE))
     {
         m_cmb3.m_bAcceptSpace = TRUE;
-        m_pAutoComplete->AddRef();
     }
 
     ~MChooseLangDlg()
     {
-        m_pAutoComplete->unbind();
-        m_pAutoComplete->Release();
-        m_pAutoComplete = NULL;
+        if (m_pAutoComplete)
+        {
+            m_pAutoComplete->unbind();
+            m_pAutoComplete->Release();
+            m_pAutoComplete = NULL;
+        }
     }
 
     BOOL OnInitDialog(HWND hwnd, HWND hwndFocus, LPARAM lParam)
@@ -74,7 +76,7 @@ class MChooseLangDlg : public MDialogBase
     {
         HWND hCmb3 = GetDlgItem(hwnd, cmb3);
         WORD lang;
-        if (!CheckLangComboBox(hCmb3, lang, TRUE))
+        if (!CheckLangComboBox(hCmb3, lang, LANG_TYPE_1))
             return;
 
         m_langid = lang;

src/MConfigDlg.hpp

@@ -26,14 +26,31 @@
 #include "MMacrosDlg.hpp"
 #include "MPathsDlg.hpp"
 #include "MFontsDlg.hpp"
+#include "MLangAutoComplete.hpp"
 
 //////////////////////////////////////////////////////////////////////////////
 
 class MConfigDlg : public MDialogBase
 {
 public:
-    MConfigDlg() : MDialogBase(IDD_CONFIG)
+    MComboBoxAutoComplete m_cmb3;
+    MLangAutoComplete *m_pAutoComplete;
+
+    MConfigDlg()
+        : MDialogBase(IDD_CONFIG)
+        , m_pAutoComplete(new MLangAutoComplete())
+    {
+        m_cmb3.m_bAcceptSpace = TRUE;
+    }
+
+    ~MConfigDlg()
     {
+        if (m_pAutoComplete)
+        {
+            m_pAutoComplete->unbind();
+            m_pAutoComplete->Release();
+            m_pAutoComplete = NULL;
+        }
     }
 
     void Reload(HWND hwnd)
@@ -78,13 +95,33 @@ class MConfigDlg : public MDialogBase
         Cmb1_AddString(hwnd, TEXT(ATLAXWIN_CLASS));
 #endif
 
+        HWND hCmb3 = GetDlgItem(hwnd, cmb3);
+        InitLangComboBox(hCmb3, g_settings.nDefResLangID);
+        SubclassChildDx(m_cmb3, cmb3);
+
+        // auto complete
+        if (m_pAutoComplete)
+        {
+            COMBOBOXINFO info = { sizeof(info) };
+            GetComboBoxInfo(m_cmb3, &info);
+            HWND hwndEdit = info.hwndItem;
+            m_pAutoComplete->bind(hwndEdit);
+        }
+
         Reload(hwnd);
         CenterWindowDx();
         return TRUE;
     }
 
     void OnOK(HWND hwnd)
     {
+        HWND hCmb3 = GetDlgItem(hwnd, cmb3);
+        WORD lang;
+        if (CheckLangComboBox(hCmb3, lang, LANG_TYPE_2))
+            g_settings.nDefResLangID = lang;
+        else
+            g_settings.nDefResLangID = BAD_LANG;
+
         BOOL bTranslated = FALSE;
         INT nHeight = GetDlgItemInt(hwnd, edt1, &bTranslated, FALSE);
         if (!bTranslated)
@@ -171,6 +208,12 @@ class MConfigDlg : public MDialogBase
         case psh4:
             OnPsh4(hwnd);
             break;
+        case cmb3:
+            if (codeNotify == CBN_EDITCHANGE)
+            {
+                m_cmb3.OnEditChange();  // input completion
+            }
+            break;
         }
     }
 

src/MCopyToMultiLangDlg.hpp

@@ -46,14 +46,16 @@ class MCopyToMultiLangDlg : public MDialogBase
           m_pAutoComplete(new MLangAutoComplete())
     {
         m_cmb3.m_bAcceptSpace = TRUE;
-        m_pAutoComplete->AddRef();
     }
 
     ~MCopyToMultiLangDlg()
     {
-        m_pAutoComplete->unbind();
-        m_pAutoComplete->Release();
-        m_pAutoComplete = NULL;
+        if (m_pAutoComplete)
+        {
+            m_pAutoComplete->unbind();
+            m_pAutoComplete->Release();
+            m_pAutoComplete = NULL;
+        }
     }
 
     virtual INT_PTR CALLBACK

src/RisohEditor.cpp

@@ -247,6 +247,13 @@ void ReplaceFullWithHalf(MStringW& strText)
     ReplaceFullWithHalf(&strText[0]);
 }
 
+DWORD GetDefaultResLanguage(VOID)
+{
+    if (g_settings.nDefResLangID == BAD_LANG)
+        return ::GetThreadUILanguage();
+    return g_settings.nDefResLangID;
+}
+
 // get the path of a shortcut file
 BOOL GetPathOfShortcutDx(HWND hwnd, LPCWSTR pszLnkFile, LPWSTR pszPath)
 {
@@ -1218,7 +1225,7 @@ BOOL IsValidUILang(LANGID langid)
 MLangAutoComplete::MLangAutoComplete(BOOL bUILanguage)
 {
     m_nCurrentElement = 0;
-    m_nRefCount = 0;
+    m_nRefCount = 1;
     m_fBound = FALSE;
     m_pAC = NULL;
 
@@ -1232,7 +1239,7 @@ MLangAutoComplete::MLangAutoComplete(BOOL bUILanguage)
 }
 
 // initialize the language combobox
-void InitLangComboBox(HWND hCmb3, LANGID langid, BOOL bUILanguage)
+void InitLangComboBox(HWND hCmb3, DWORD langid, BOOL bUILanguage)
 {
     InitComboBoxPlaceholder(hCmb3, IDS_INTEGERORIDENTIFIER);
 
@@ -1275,10 +1282,13 @@ void InitLangComboBox(HWND hCmb3, LANGID langid, BOOL bUILanguage)
         // add the text as a new item to combobox
         ComboBox_AddString(hCmb3, sz);
     }
+
+    if (langid == (DWORD)-1)
+        ComboBox_SetText(hCmb3, L"");
 }
 
 // initialize the language combobox
-void InitLangComboBox(HWND hCmb3, LANGID langid)
+void InitLangComboBox(HWND hCmb3, DWORD langid)
 {
     InitLangComboBox(hCmb3, langid, FALSE);
 }
@@ -1595,29 +1605,33 @@ WORD LangFromText(LPWSTR pszLang)
 }
 
 // verify the language combobox
-BOOL CheckLangComboBox(HWND hCmb3, WORD& lang, BOOL bUILanguage)
+BOOL CheckLangComboBox(HWND hCmb3, WORD& lang, LANG_TYPE type)
 {
     // get the text from combobox
     WCHAR szLang[MAX_PATH];
     GetWindowTextW(hCmb3, szLang, _countof(szLang));
 
     // get the language ID from texts
     lang = LangFromText(szLang);
-    if ((!bUILanguage || IsValidUILang(lang)) && lang != BAD_LANG)
+    if ((type != LANG_TYPE_1 || IsValidUILang(lang)) && lang != BAD_LANG)
         return TRUE;    // success
 
-    // error
-    ComboBox_SetEditSel(hCmb3, 0, -1);
-    SetFocus(hCmb3);
-    LogMessageBoxW(GetParent(hCmb3), LoadStringDx(IDS_ENTERLANG),
-                   NULL, MB_ICONERROR);
+    if (type != LANG_TYPE_2)
+    {
+        // error
+        ComboBox_SetEditSel(hCmb3, 0, -1);
+        SetFocus(hCmb3);
+        LogMessageBoxW(GetParent(hCmb3), LoadStringDx(IDS_ENTERLANG),
+                       NULL, MB_ICONERROR);
+    }
+
     return FALSE;   // failure
 }
 
 // verify the language combobox
 BOOL CheckLangComboBox(HWND hCmb3, WORD& lang)
 {
-    return CheckLangComboBox(hCmb3, lang, FALSE);
+    return CheckLangComboBox(hCmb3, lang, LANG_TYPE_0);
 }
 
 // callback function for MMainWnd::DoLoadLangInfo
@@ -12091,7 +12105,6 @@ void MMainWnd::DoLangEditAutoComplete(HWND hwnd, HWND hwndEdit)
     if (!m_pAutoComplete)
         return;
 
-    m_pAutoComplete->AddRef();
     m_pAutoComplete->bind(hwndEdit);
     m_auto_comp_edit.hook(hwndEdit, m_hwndTV);
     m_auto_comp_edit.m_bAdjustSize = TRUE;
@@ -13693,6 +13706,7 @@ void MMainWnd::SetDefaultSettings(HWND hwnd)
     g_settings.nEgaY = CW_USEDEFAULT;
     g_settings.nEgaWidth = CW_USEDEFAULT;
     g_settings.nEgaHeight = CW_USEDEFAULT;
+    g_settings.nDefResLangID = BAD_LANG;
 
     HFONT hFont;
     LOGFONTW lf, lfBin, lfSrc;
@@ -13908,6 +13922,7 @@ BOOL MMainWnd::LoadSettings(HWND hwnd)
     keyRisoh.QueryDword(TEXT("nEgaY"), (DWORD&)g_settings.nEgaY);
     keyRisoh.QueryDword(TEXT("nEgaWidth"), (DWORD&)g_settings.nEgaWidth);
     keyRisoh.QueryDword(TEXT("nEgaHeight"), (DWORD&)g_settings.nEgaHeight);
+    keyRisoh.QueryDword(TEXT("nDefResLangID"), (DWORD&)g_settings.nDefResLangID);
 
     TCHAR szText[128];
     TCHAR szValueName[128];
@@ -14230,6 +14245,7 @@ BOOL MMainWnd::SaveSettings(HWND hwnd)
     keyRisoh.SetDword(TEXT("nEgaY"), g_settings.nEgaY);
     keyRisoh.SetDword(TEXT("nEgaWidth"), g_settings.nEgaWidth);
     keyRisoh.SetDword(TEXT("nEgaHeight"), g_settings.nEgaHeight);
+    keyRisoh.SetDword(TEXT("nDefResLangID"), g_settings.nDefResLangID);
     keyRisoh.SetSz(TEXT("strSrcFont"), g_settings.strSrcFont.c_str());
     keyRisoh.SetDword(TEXT("nSrcFontSize"), g_settings.nSrcFontSize);
     keyRisoh.SetSz(TEXT("strBinFont"), g_settings.strBinFont.c_str());

src/RisohEditor_res.rc

@@ -1,5 +1,5 @@
 // RisohEditor_res.rc
-// This file is automatically generated by RisohEditor 5.8.3.
+// This file is automatically generated by RisohEditor 5.8.2.
 // † <-- This dagger helps UTF-8 detection.
 
 #include "resource.h"

src/RisohSettings.hpp

@@ -110,6 +110,7 @@ struct RisohSettings
     MString             strFontReplaceTo1;
     MString             strFontReplaceTo2;
     MString             strFontReplaceTo3;
+    DWORD               nDefResLangID;
 
     RisohSettings()
     {