github
/
openvpn-gui
mirror of https://github.com/OpenVPN/openvpn-gui
1
0
Fork 0
Code Issues Releases Wiki Activity

simplify caption on user/password auth window 

also add openvpn ico to auth window
pull/214/head
Ilya Shipitsin 2018-01-29 01:30:20 +05:00 committed by Samuli Seppänen
parent ecb8e50c0f
commit e7fd11812f
20 changed files with 23 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openvpn.c
View File

@ -422,6 +422,7 @@ UserAuthDialogFunc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
/* Set connection for this dialog and show it */ /* Set connection for this dialog and show it */
param = (auth_param_t *) lParam; param = (auth_param_t *) lParam;
SetProp(hwndDlg, cfgProp, (HANDLE) param); SetProp(hwndDlg, cfgProp, (HANDLE) param);
SetStatusWinIcon(hwndDlg, ID_ICO_APP);
if (param->str) if (param->str)
{ {
@ -467,7 +468,7 @@ UserAuthDialogFunc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
else if (param->c->flags & FLAG_SAVE_AUTH_PASS) else if (param->c->flags & FLAG_SAVE_AUTH_PASS)
Button_SetCheck(GetDlgItem (hwndDlg, ID_CHK_SAVE_PASS), BST_CHECKED); Button_SetCheck(GetDlgItem (hwndDlg, ID_CHK_SAVE_PASS), BST_CHECKED);
AppendTextToCaption (hwndDlg, param->c->config_name); SetWindowText (hwndDlg, param->c->config_name);
if (param->c->failed_auth_attempts > 0) if (param->c->failed_auth_attempts > 0)
SetDlgItemTextW(hwndDlg, ID_TXT_WARNING, LoadLocalizedString(IDS_NFO_AUTH_PASS_RETRY)); SetDlgItemTextW(hwndDlg, ID_TXT_WARNING, LoadLocalizedString(IDS_NFO_AUTH_PASS_RETRY));
@ -570,6 +571,8 @@ UserAuthDialogFunc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
case WM_CLOSE: case WM_CLOSE:
EndDialog(hwndDlg, LOWORD(wParam)); EndDialog(hwndDlg, LOWORD(wParam));
param = (auth_param_t *) GetProp(hwndDlg, cfgProp);
StopOpenVPN(param->c);
return TRUE; return TRUE;
case WM_NCDESTROY: case WM_NCDESTROY:

3
res/openvpn-gui-res-cs.rc
View File

@ -38,8 +38,7 @@ END
/* Auth Username/Password Dialog */ /* Auth Username/Password Dialog */
ID_DLG_AUTH DIALOG 6, 18, 160, 95 ID_DLG_AUTH DIALOG 6, 18, 160, 95
STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER | DS_SETFOREGROUND
CAPTION "OpenVPN - Ověření uživatele"
FONT 8, "Microsoft Sans Serif" FONT 8, "Microsoft Sans Serif"
LANGUAGE LANG_CZECH, SUBLANG_DEFAULT LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
BEGIN BEGIN

3
res/openvpn-gui-res-de.rc
View File

@ -38,8 +38,7 @@ END
/* Auth Username/Password Dialog */ /* Auth Username/Password Dialog */
ID_DLG_AUTH DIALOG 6, 18, 160, 95 ID_DLG_AUTH DIALOG 6, 18, 160, 95
STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER | DS_SETFOREGROUND
CAPTION "OpenVPN – Benutzer-Authentifizierung"
FONT 8, "Microsoft Sans Serif" FONT 8, "Microsoft Sans Serif"
LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
BEGIN BEGIN

3
res/openvpn-gui-res-dk.rc
View File

@ -39,8 +39,7 @@ END
/* Auth Username/Password Dialog */ /* Auth Username/Password Dialog */
ID_DLG_AUTH DIALOG 6, 18, 160, 95 ID_DLG_AUTH DIALOG 6, 18, 160, 95
STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER | DS_SETFOREGROUND
CAPTION "OpenVPN - Brugerkontrol"
FONT 8, "Microsoft Sans Serif" FONT 8, "Microsoft Sans Serif"
LANGUAGE LANG_DANISH, SUBLANG_DEFAULT LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
BEGIN BEGIN

3
res/openvpn-gui-res-en.rc
View File

@ -38,8 +38,7 @@ END
/* Auth Username/Password Dialog */ /* Auth Username/Password Dialog */
ID_DLG_AUTH DIALOG 6, 18, 160, 95 ID_DLG_AUTH DIALOG 6, 18, 160, 95
STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER | DS_SETFOREGROUND
CAPTION "OpenVPN - User Authentication"
FONT 8, "Microsoft Sans Serif" FONT 8, "Microsoft Sans Serif"
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
BEGIN BEGIN

3
res/openvpn-gui-res-es.rc
View File

@ -37,8 +37,7 @@ END
/* Auth Username/Password Dialog */ /* Auth Username/Password Dialog */
ID_DLG_AUTH DIALOG 6, 18, 160, 95 ID_DLG_AUTH DIALOG 6, 18, 160, 95
STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER | DS_SETFOREGROUND
CAPTION "OpenVPN - Autenticación de usuario"
FONT 8, "Microsoft Sans Serif" FONT 8, "Microsoft Sans Serif"
LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT
BEGIN BEGIN

3
res/openvpn-gui-res-fi.rc
View File

@ -38,8 +38,7 @@ END
/* Auth Username/Password Dialog */ /* Auth Username/Password Dialog */
ID_DLG_AUTH DIALOG 6, 18, 160, 95 ID_DLG_AUTH DIALOG 6, 18, 160, 95
STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER | DS_SETFOREGROUND
CAPTION "OpenVPN - Käyttäjän todennus"
FONT 8, "Microsoft Sans Serif" FONT 8, "Microsoft Sans Serif"
LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
BEGIN BEGIN

3
res/openvpn-gui-res-fr.rc
View File

@ -37,8 +37,7 @@ END
/* Auth Username/Password Dialog */ /* Auth Username/Password Dialog */
ID_DLG_AUTH DIALOG 6, 18, 160, 95 ID_DLG_AUTH DIALOG 6, 18, 160, 95
STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER | DS_SETFOREGROUND
CAPTION "Authentification d'utilisateur"
FONT 8, "Microsoft Sans Serif" FONT 8, "Microsoft Sans Serif"
LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
BEGIN BEGIN

3
res/openvpn-gui-res-it.rc
View File

@ -37,8 +37,7 @@ END
/* Auth Username/Password Dialog */ /* Auth Username/Password Dialog */
ID_DLG_AUTH DIALOG 6, 18, 160, 95 ID_DLG_AUTH DIALOG 6, 18, 160, 95
STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER | DS_SETFOREGROUND
CAPTION "OpenVPN - Autenticazione dell'utente"
FONT 8, "Microsoft Sans Serif" FONT 8, "Microsoft Sans Serif"
LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT
BEGIN BEGIN

3
res/openvpn-gui-res-jp.rc
View File

@ -40,8 +40,7 @@ END
/* Auth Username/Password Dialog */ /* Auth Username/Password Dialog */
ID_DLG_AUTH DIALOG 6, 18, 160, 95 ID_DLG_AUTH DIALOG 6, 18, 160, 95
STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER | DS_SETFOREGROUND
CAPTION "OpenVPN - ユーザー認証"
FONT 8, "Microsoft Sans Serif" FONT 8, "Microsoft Sans Serif"
LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
BEGIN BEGIN

3
res/openvpn-gui-res-kr.rc
View File

@ -39,8 +39,7 @@ END
/* Auth Username/Password Dialog */ /* Auth Username/Password Dialog */
ID_DLG_AUTH DIALOG 6, 18, 160, 95 ID_DLG_AUTH DIALOG 6, 18, 160, 95
STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER | DS_SETFOREGROUND
CAPTION "OpenVPN - 사용자 인증"
FONT 9, "맑은 고딕" FONT 9, "맑은 고딕"
LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
BEGIN BEGIN

3
res/openvpn-gui-res-nl.rc
View File

@ -37,8 +37,7 @@ END
/* Auth Username/Password Dialog */ /* Auth Username/Password Dialog */
ID_DLG_AUTH DIALOG 6, 18, 160, 95 ID_DLG_AUTH DIALOG 6, 18, 160, 95
STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER | DS_SETFOREGROUND
CAPTION "OpenVPN - Gebruikersauthenticatie"
FONT 8, "Microsoft Sans Serif" FONT 8, "Microsoft Sans Serif"
LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT
BEGIN BEGIN

3
res/openvpn-gui-res-no.rc
View File

@ -38,8 +38,7 @@ END
/* Auth Username/Password Dialog */ /* Auth Username/Password Dialog */
ID_DLG_AUTH DIALOG 6, 18, 160, 95 ID_DLG_AUTH DIALOG 6, 18, 160, 95
STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER | DS_SETFOREGROUND
CAPTION "OpenVPN - Brukerautentisering"
FONT 8, "Microsoft Sans Serif" FONT 8, "Microsoft Sans Serif"
LANGUAGE LANG_NORWEGIAN, SUBLANG_DEFAULT LANGUAGE LANG_NORWEGIAN, SUBLANG_DEFAULT
BEGIN BEGIN

3
res/openvpn-gui-res-pl.rc
View File

@ -39,8 +39,7 @@ END
/* Auth Username/Password Dialog */ /* Auth Username/Password Dialog */
ID_DLG_AUTH DIALOG 6, 18, 160, 95 ID_DLG_AUTH DIALOG 6, 18, 160, 95
STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER | DS_SETFOREGROUND
CAPTION "OpenVPN - Autentykacja Użytkownika"
FONT 8, "Microsoft Sans Serif" FONT 8, "Microsoft Sans Serif"
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
BEGIN BEGIN

3
res/openvpn-gui-res-pt.rc
View File

@ -37,8 +37,7 @@ END
/* Auth Username/Password Dialog */ /* Auth Username/Password Dialog */
ID_DLG_AUTH DIALOG 6, 18, 160, 95 ID_DLG_AUTH DIALOG 6, 18, 160, 95
STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER | DS_SETFOREGROUND
CAPTION "OpenVPN - Autenticação de usuário"
FONT 8, "Microsoft Sans Serif" FONT 8, "Microsoft Sans Serif"
LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT
BEGIN BEGIN

3
res/openvpn-gui-res-ru.rc
View File

@ -39,8 +39,7 @@ END
/* Auth Username/Password Dialog */ /* Auth Username/Password Dialog */
ID_DLG_AUTH DIALOG 6, 18, 180, 95 ID_DLG_AUTH DIALOG 6, 18, 180, 95
STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER | DS_SETFOREGROUND
CAPTION "OpenVPN - Аутентификация пользователя"
FONT 8, "Microsoft Sans Serif" FONT 8, "Microsoft Sans Serif"
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
BEGIN BEGIN

3
res/openvpn-gui-res-se.rc
View File

@ -37,8 +37,7 @@ END
/* Auth Username/Password Dialog */ /* Auth Username/Password Dialog */
ID_DLG_AUTH DIALOG 6, 18, 160, 95 ID_DLG_AUTH DIALOG 6, 18, 160, 95
STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER | DS_SETFOREGROUND
CAPTION "OpenVPN - Användar Autentisering"
FONT 8, "Microsoft Sans Serif" FONT 8, "Microsoft Sans Serif"
LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
BEGIN BEGIN

3
res/openvpn-gui-res-tr.rc
View File

@ -39,8 +39,7 @@ END
/* Auth Username/Password Dialog */ /* Auth Username/Password Dialog */
ID_DLG_AUTH DIALOG 6, 18, 160, 95 ID_DLG_AUTH DIALOG 6, 18, 160, 95
STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER | DS_SETFOREGROUND
CAPTION "OpenVPN - Oturum Açma"
FONT 8, "Microsoft Sans Serif" FONT 8, "Microsoft Sans Serif"
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
BEGIN BEGIN

3
res/openvpn-gui-res-ua.rc
View File

@ -37,8 +37,7 @@ END
/* Auth Username/Password Dialog */ /* Auth Username/Password Dialog */
ID_DLG_AUTH DIALOG 6, 18, 180, 95 ID_DLG_AUTH DIALOG 6, 18, 180, 95
STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER | DS_SETFOREGROUND
CAPTION "OpenVPN - Перевірка подлінності користувача"
FONT 8, "Microsoft Sans Serif" FONT 8, "Microsoft Sans Serif"
LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
BEGIN BEGIN

3
res/openvpn-gui-res-zh-hant.rc
View File

@ -40,8 +40,7 @@ END
/* Auth Username/Password Dialog */ /* Auth Username/Password Dialog */
ID_DLG_AUTH DIALOG 6, 18, 160, 95 ID_DLG_AUTH DIALOG 6, 18, 160, 95
STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER | DS_SETFOREGROUND
CAPTION "OpenVPN - 使用者驗證"
FONT 8, "Microsoft Sans Serif" FONT 8, "Microsoft Sans Serif"
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
BEGIN BEGIN