tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-25 23:05:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Sort Preferences->New Document->Default language combobox

Browse Source 
Fix #10513
This commit is contained in:
Don HO 2021-09-10 02:44:55 +02:00
parent 1c9009e9b2
commit 36d13f3ad8
3 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PowerEditor/src/WinControls/Preference/preference.rc
View File

@ -174,7 +174,7 @@ BEGIN
CONTROL "",IDC_RADIO_OTHERCP,"Button",BS_AUTORADIOBUTTON,242,126,10,10 CONTROL "",IDC_RADIO_OTHERCP,"Button",BS_AUTORADIOBUTTON,242,126,10,10
COMBOBOX IDC_COMBO_OTHERCP,257,125,100,140,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_COMBO_OTHERCP,257,125,100,140,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
RTEXT "Default language :",IDC_DEFAULTLANG_STATIC,16,130,77,8 RTEXT "Default language :",IDC_DEFAULTLANG_STATIC,16,130,77,8
COMBOBOX IDC_COMBO_DEFAULTLANG,98,128,100,140,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_COMBO_DEFAULTLANG,98,128,100,140,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
END END

33
PowerEditor/src/WinControls/Preference/preferenceDlg.cpp
View File

@ -1911,28 +1911,41 @@ INT_PTR CALLBACK NewDocumentSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPA
::SendDlgItemMessage(_hSelf, IDC_CHECK_OPENANSIASUTF8, BM_SETCHECK, (ID2Check == IDC_RADIO_UTF8SANSBOM && ndds._openAnsiAsUtf8)?BST_CHECKED:BST_UNCHECKED, 0); ::SendDlgItemMessage(_hSelf, IDC_CHECK_OPENANSIASUTF8, BM_SETCHECK, (ID2Check == IDC_RADIO_UTF8SANSBOM && ndds._openAnsiAsUtf8)?BST_CHECKED:BST_UNCHECKED, 0);
::EnableWindow(::GetDlgItem(_hSelf, IDC_CHECK_OPENANSIASUTF8), ID2Check == IDC_RADIO_UTF8SANSBOM); ::EnableWindow(::GetDlgItem(_hSelf, IDC_CHECK_OPENANSIASUTF8), ID2Check == IDC_RADIO_UTF8SANSBOM);
size_t index = 0; for (int i = L_TEXT + 1 ; i < nppParam.L_END ; ++i) // Skip L_TEXT
for (int i = L_TEXT ; i < nppParam.L_END ; ++i)
{ {
LangType lt = static_cast<LangType>(i);
str.clear(); str.clear();
if (static_cast<LangType>(i) != L_USER) if (lt != L_USER && lt != L_JS)
{ {
int cmdID = nppParam.langTypeToCommandID(static_cast<LangType>(i)); int cmdID = nppParam.langTypeToCommandID(lt);
if ((cmdID != -1)) if ((cmdID != -1))
{ {
getNameStrFromCmd(cmdID, str); getNameStrFromCmd(cmdID, str);
if (str.length() > 0) if (str.length() > 0)
{ {
_langList.push_back(LangID_Name(static_cast<LangType>(i), str)); size_t index = ::SendDlgItemMessage(_hSelf, IDC_COMBO_DEFAULTLANG, CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(str.c_str()));
::SendDlgItemMessage(_hSelf, IDC_COMBO_DEFAULTLANG, CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(str.c_str())); ::SendDlgItemMessage(_hSelf, IDC_COMBO_DEFAULTLANG, CB_SETITEMDATA, index, lt);
if (ndds._lang == i)
index = _langList.size() - 1;
} }
} }
} }
} }
::SendDlgItemMessage(_hSelf, IDC_COMBO_DEFAULTLANG, CB_SETCURSEL, index, 0);
// Insert L_TEXT to the 1st position
int normalTextCmdID = nppParam.langTypeToCommandID(L_TEXT);
getNameStrFromCmd(normalTextCmdID, str);
::SendDlgItemMessage(_hSelf, IDC_COMBO_DEFAULTLANG, CB_INSERTSTRING, 0, reinterpret_cast<LPARAM>(str.c_str()));
// Set chosen language
LangType l = L_TEXT;
size_t cbCount = ::SendDlgItemMessage(_hSelf, IDC_COMBO_DEFAULTLANG, CB_GETCOUNT, 0, 0);
size_t j = 0;
for (; j < cbCount; ++j)
{
l = static_cast<LangType>(::SendDlgItemMessage(_hSelf, IDC_COMBO_DEFAULTLANG, CB_GETITEMDATA, j, 0));
if (ndds._lang == l)
break;
}
::SendDlgItemMessage(_hSelf, IDC_COMBO_DEFAULTLANG, CB_SETCURSEL, j, 0);
} }
case WM_CTLCOLORLISTBOX: case WM_CTLCOLORLISTBOX:
@ -2038,7 +2051,7 @@ INT_PTR CALLBACK NewDocumentSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPA
if (LOWORD(wParam) == IDC_COMBO_DEFAULTLANG) if (LOWORD(wParam) == IDC_COMBO_DEFAULTLANG)
{ {
auto index = ::SendDlgItemMessage(_hSelf, IDC_COMBO_DEFAULTLANG, CB_GETCURSEL, 0, 0); auto index = ::SendDlgItemMessage(_hSelf, IDC_COMBO_DEFAULTLANG, CB_GETCURSEL, 0, 0);
ndds._lang = _langList[index]._id; ndds._lang = static_cast<LangType>(::SendDlgItemMessage(_hSelf, IDC_COMBO_DEFAULTLANG, CB_GETITEMDATA, index, 0));
return TRUE; return TRUE;
} }
else if (LOWORD(wParam) == IDC_COMBO_OTHERCP) else if (LOWORD(wParam) == IDC_COMBO_OTHERCP)

2
PowerEditor/src/WinControls/Preference/preferenceDlg.h
View File

@ -99,7 +99,6 @@ public :
NewDocumentSubDlg() = default; NewDocumentSubDlg() = default;
private : private :
std::vector<LangID_Name> _langList;
void makeOpenAnsiAsUtf8(bool doIt){ void makeOpenAnsiAsUtf8(bool doIt){
if (!doIt) if (!doIt)
::SendDlgItemMessage(_hSelf, IDC_CHECK_OPENANSIASUTF8, BM_SETCHECK, BST_UNCHECKED, 0); ::SendDlgItemMessage(_hSelf, IDC_CHECK_OPENANSIASUTF8, BM_SETCHECK, BST_UNCHECKED, 0);
@ -128,7 +127,6 @@ public :
private : private :
URLCtrl _nbHistoryVal; URLCtrl _nbHistoryVal;
URLCtrl _customLenVal; URLCtrl _customLenVal;
std::vector<LangID_Name> _langList;
void setCustomLen(int val); void setCustomLen(int val);
INT_PTR CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam);
}; };