Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add allow typing Vietnamese in languages other than English option to Windows #271

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
10 changes: 10 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
################################################################################
# This .gitignore file was automatically created by Microsoft(R) Visual Studio.
################################################################################

/Sources/OpenKey/win32/OpenKey/.vs/OpenKey
/Sources/OpenKey/win32/OpenKey/x64/Debug
/Sources/OpenKey/win32/OpenKey/x64/Release
/Sources/OpenKey/win32/OpenKey/OpenKey/x64/Debug
/Sources/OpenKey/win32/OpenKey/OpenKey/x64/Release
/Sources/OpenKey/win32/OpenKey/OpenKeyUpdate/x64/Release
2 changes: 2 additions & 0 deletions Sources/OpenKey/win32/OpenKey/OpenKey/AppDelegate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ int vTempOffSpelling = 0;
int vAllowConsonantZFWJ = 0;
int vQuickStartConsonant = 0;
int vQuickEndConsonant = 0;
int vOtherLanguage = 1;
int vRememberCode = 1;
int vTempOffOpenKey = 0;

Expand Down Expand Up @@ -193,6 +194,7 @@ void AppDelegate::onDefaultConfig() {

APP_SET_DATA(vSupportMetroApp, 1);
APP_SET_DATA(vRememberCode, 1);
APP_SET_DATA(vOtherLanguage, 1);
APP_SET_DATA(vTempOffOpenKey, 0);
APP_SET_DATA(vFixChromiumBrowser, 0);

Expand Down
1,048 changes: 547 additions & 501 deletions Sources/OpenKey/win32/OpenKey/OpenKey/MainControlDialog.cpp

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Sources/OpenKey/win32/OpenKey/OpenKey/MainControlDialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class MainControlDialog : public BaseDialog {
checkAllowZWJF, checkTempOffSpelling, checkQuickStartConsonant, checkQuickEndConsonant;
HWND checkSmartSwitchKey, checkCapsFirstChar, checkQuickTelex, checkUseMacro, checkUseMacroInEnglish;
HWND checkCreateDesktopShortcut, checkCheckNewVersion, checkRunAsAdmin, checkSupportMetroApp, checkMacroAutoCaps;
HWND checkFixChromium, checkRememberTableCode, checkTempOffOpenKey;
HWND checkFixChromium, checkRememberTableCode, checkTempOffOpenKey, checkAllowOtherLanguages;
HWND hUpdateButton;
private:
void initDialog();
Expand Down
Binary file modified Sources/OpenKey/win32/OpenKey/OpenKey/OpenKey.aps
Binary file not shown.
1 change: 1 addition & 0 deletions Sources/OpenKey/win32/OpenKey/OpenKey/OpenKey.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ void OpenKeyInit() {
APP_GET_DATA(vCreateDesktopShortcut, 0);
APP_GET_DATA(vCheckNewVersion, 0);
APP_GET_DATA(vRememberCode, 1);
APP_GET_DATA(vOtherLanguage, 1);
APP_GET_DATA(vTempOffOpenKey, 0);
APP_GET_DATA(vFixChromiumBrowser, 0);

Expand Down
28 changes: 18 additions & 10 deletions Sources/OpenKey/win32/OpenKey/OpenKey/OpenKey.rc
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,12 @@ BEGIN
PUSHBUTTON "Kiểm tra bản mới...",IDC_BUTTON_CHECK_VERSION,44,117,75,14
END

IDD_DIALOG_MAIN DIALOGEX 0, 0, 297, 250
IDD_DIALOG_MAIN DIALOGEX 0, 0, 297, 261
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "OpenKey 1.4 - Bộ gõ Tiếng Việt"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
PUSHBUTTON "Cài đặt gốc",ID_BTN_DEFAULT,113,223,71,20
PUSHBUTTON "Cài đặt gốc",ID_BTN_DEFAULT,113,234,71,20
GROUPBOX "Điều khiển",IDC_STATIC,7,7,283,73
LTEXT "Kiểu gõ:",IDC_STATIC,14,23,27,8
COMBOBOX IDC_COMBO_INPUT_TYPE,64,20,75,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
Expand All @@ -129,9 +129,9 @@ BEGIN
LTEXT "Chế độ gõ:",IDC_STATIC,14,60,36,8
CONTROL "Tiếng Việt",IDC_RADIO_METHOD_VIETNAMESE,"Button",BS_AUTORADIOBUTTON,64,59,47,10
CONTROL "Tiếng Anh",IDC_RADIO_METHOD_ENGLISH,"Button",BS_AUTORADIOBUTTON,158,59,48,10
DEFPUSHBUTTON "Đóng",IDBUTTON_OK,200,223,71,20
PUSHBUTTON "Tắt OpenKey",IDBUTTON_EXIT,26,223,71,20
CONTROL "",IDC_TAB_CONTROL,"SysTabControl32",TCS_FIXEDWIDTH,7,89,283,127
DEFPUSHBUTTON "Đóng",IDBUTTON_OK,200,234,71,20
PUSHBUTTON "Tắt OpenKey",IDBUTTON_EXIT,26,234,71,20
CONTROL "",IDC_TAB_CONTROL,"SysTabControl32",TCS_FIXEDWIDTH,7,89,283,140
END

IDD_DIALOG_MACRO DIALOGEX 0, 0, 415, 253
Expand Down Expand Up @@ -183,7 +183,7 @@ BEGIN
PUSHBUTTON "Đảo",IDC_BUTTON_CONVERT_SWITCH,124,134,36,14
END

IDD_DIALOG_TAB_GENERAL DIALOGEX 0, 0, 353, 123
IDD_DIALOG_TAB_GENERAL DIALOGEX 0, 0, 353, 137
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
EXSTYLE WS_EX_TRANSPARENT
FONT 8, "MS Shell Dlg", 400, 0, 0x1
Expand All @@ -205,6 +205,8 @@ BEGIN
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,50,95,10
CONTROL "Tự ghi nhớ bảng mã theo ứng dụng",IDC_CHECK_SMART_SWITCH_CODE,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,88,130,10
CONTROL "Cho phép gõ trong các ngôn ngữ khác",IDC_CHECK_OTHER_LANGUAGES,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,106,204,10
CONTROL "Tạm tắt OpenKey bằng phím Alt",IDC_CHECK_TEMP_OFF_OPEN_KEY,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,151,88,123,10
END
Expand Down Expand Up @@ -304,7 +306,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 290
TOPMARGIN, 7
BOTTOMMARGIN, 243
BOTTOMMARGIN, 254
END

IDD_DIALOG_MACRO, DIALOG
Expand All @@ -328,7 +330,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 346
TOPMARGIN, 7
BOTTOMMARGIN, 116
BOTTOMMARGIN, 130
END

IDD_DIALOG_TAB_MACRO, DIALOG
Expand Down Expand Up @@ -486,6 +488,12 @@ BEGIN
"Bằng cách bấm phím Alt, OpenKey sẽ tạm ngừng hoạt động cho tới khi bạn gõ 1 từ mới."
END

STRINGTABLE
BEGIN
IDS_STRING_OTHER_LANGUAGES
"Cho phép gõ tiếng Việt với các ngôn ngữ ngoài tiếng Anh"
END

STRINGTABLE
BEGIN
IDS_STRING_CTRL "Bật phím Ctrl"
Expand All @@ -508,9 +516,9 @@ BEGIN
IDS_STRING_MACRO_AUTO_CAP
"Tự động chuyển qua chữ hoa. VD: định nghĩa ""ko = không"", nếu gõ ""KO"" sẽ thành ""KHÔNG"", gõ ""Ko"" sẽ thành Không"
IDS_STRING_START_CONSONANT
"Thay thế nhanh các phụ âm đầu như f, j, w bằng ph, gi, qu.Ví dụ: fải→phải, jảng→giảng, wên→quên"
"Thay thế nhanh các phụ âm đầu như f, j, w bằng ph, gi, qu.Ví dụ: fải→phải, jảng→giảng, wên→quên"
IDS_STRING_END_CONSONANT
"Thay thế nhanh các phụ âm cuối như g, h, k bằng ng, nh, ch.Ví dụ: trươg→trương, nhah→nhanh, bák→bách"
"Thay thế nhanh các phụ âm cuối như g, h, k bằng ng, nh, ch.Ví dụ: trươg→trương, nhah→nhanh, bák→bách"
END

STRINGTABLE
Expand Down
2 changes: 2 additions & 0 deletions Sources/OpenKey/win32/OpenKey/OpenKey/resource.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
#define IDD_DIALOG_TAB_SYSTEM 147
#define IDD_DIALOG_OLD 148
#define IDD_DIALOG_TAB_INFO 149
#define IDS_STRING_OTHER_LANGUAGES 150
#define IDC_COMBO1 1000
#define IDC_COMBO_INPUT_TYPE 1000
#define IDC_CHECK1 1001
Expand Down Expand Up @@ -180,6 +181,7 @@
#define IDS_STRING_MACRO_AUTO_CAP 1065
#define IDS_STRING_START_CONSONANT 1066
#define IDS_STRING_END_CONSONANT 1067
#define IDC_CHECK_OTHER_LANGUAGES 1068
#define IDC_STATIC -1

// Next default values for new objects
Expand Down
1 change: 1 addition & 0 deletions Sources/OpenKey/win32/OpenKey/OpenKey/stdafx.h
Original file line number Diff line number Diff line change
Expand Up @@ -83,5 +83,6 @@ extern int vCreateDesktopShortcut;
extern int vRunAsAdmin;
extern int vCheckNewVersion;
extern int vRememberCode;
extern int vOtherLanguage;
extern int vTempOffOpenKey;
extern int vFixChromiumBrowser;