From 9ded7996abfd50e8147e6cc53ccb5683ebe11012 Mon Sep 17 00:00:00 2001 From: Lev Stipakov Date: Mon, 28 Jun 2021 16:05:23 +0300 Subject: [PATCH] URL profile import: add profile import dialog This is the first patch from series which implemets importing profile from URL, currently implemented by OpenVPN Access Server. Move "Import from file" menu item under new "Import" item. Add "Import from AS..." item under "Import", which opens new profile import dialog. Signed-off-by: Lev Stipakov --- CMakeLists.txt | 1 + as.c | 89 ++++++++++++++++++++++++++++++++++ as.h | 22 +++++++++ main.c | 7 ++- misc.h | 2 + openvpn-gui-res.h | 6 +++ openvpn.h | 2 + res/openvpn-gui-res-cs.rc | 22 ++++++++- res/openvpn-gui-res-de.rc | 24 ++++++++- res/openvpn-gui-res-dk.rc | 22 ++++++++- res/openvpn-gui-res-en.rc | 23 ++++++++- res/openvpn-gui-res-es.rc | 22 ++++++++- res/openvpn-gui-res-fa.rc | 24 ++++++++- res/openvpn-gui-res-fi.rc | 22 ++++++++- res/openvpn-gui-res-fr.rc | 26 ++++++++-- res/openvpn-gui-res-it.rc | 30 ++++++++++-- res/openvpn-gui-res-jp.rc | 26 ++++++++-- res/openvpn-gui-res-kr.rc | 22 ++++++++- res/openvpn-gui-res-nl.rc | 24 ++++++++- res/openvpn-gui-res-no.rc | 22 ++++++++- res/openvpn-gui-res-pl.rc | 22 ++++++++- res/openvpn-gui-res-pt.rc | 22 ++++++++- res/openvpn-gui-res-ru.rc | 22 ++++++++- res/openvpn-gui-res-se.rc | 22 ++++++++- res/openvpn-gui-res-tr.rc | 22 ++++++++- res/openvpn-gui-res-ua.rc | 26 ++++++++-- res/openvpn-gui-res-zh-hans.rc | 22 ++++++++- res/openvpn-gui-res-zh-hant.rc | 22 ++++++++- tray.c | 16 ++++-- tray.h | 2 + 30 files changed, 597 insertions(+), 39 deletions(-) create mode 100644 as.c create mode 100644 as.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 245c158..5364cc7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,6 +23,7 @@ add_executable(${PROJECT_NAME} WIN32 service.c tray.c viewlog.c + as.c res/openvpn-gui-res.rc) find_package(OpenSSL REQUIRED) diff --git a/as.c b/as.c new file mode 100644 index 0000000..153f416 --- /dev/null +++ b/as.c @@ -0,0 +1,89 @@ +/* + * OpenVPN-GUI -- A Windows GUI for OpenVPN. + * + * Copyright (C) 2021 Lev Stipakov + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program (see the file COPYING included with this + * distribution); if not, write to the Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include +#include + +#include "config.h" +#include "localization.h" +#include "main.h" +#include "misc.h" +#include "openvpn.h" +#include "openvpn-gui-res.h" +#include "save_pass.h" + +#define URL_LEN 1024 +#define PROFILE_NAME_LEN 128 + + +INT_PTR CALLBACK +ImportProfileFromURLDialogFunc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch (msg) + { + case WM_INITDIALOG: + SetStatusWinIcon(hwndDlg, ID_ICO_APP); + + /* disable OK button by default - not disabled in resources */ + EnableWindow(GetDlgItem(hwndDlg, IDOK), FALSE); + + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case ID_EDT_AUTH_USER: + case ID_EDT_AUTH_PASS: + case ID_EDT_URL: + if (HIWORD(wParam) == EN_UPDATE) + { + /* enable OK button only if url and username are filled */ + BOOL enableOK = GetWindowTextLengthW(GetDlgItem(hwndDlg, ID_EDT_URL)) + && GetWindowTextLengthW(GetDlgItem(hwndDlg, ID_EDT_AUTH_USER)); + EnableWindow(GetDlgItem(hwndDlg, IDOK), enableOK); + } + break; + + case IDOK: + return TRUE; + + case IDCANCEL: + EndDialog(hwndDlg, LOWORD(wParam)); + return TRUE; + } + break; + + + case WM_CLOSE: + EndDialog(hwndDlg, LOWORD(wParam)); + return TRUE; + + case WM_NCDESTROY: + break; + } + + return FALSE; +} + +void ImportConfigFromAS() +{ + LocalizedDialogBoxParam(ID_DLG_URL_PROFILE_IMPORT, ImportProfileFromURLDialogFunc, 0); +} \ No newline at end of file diff --git a/as.h b/as.h new file mode 100644 index 0000000..4a7439a --- /dev/null +++ b/as.h @@ -0,0 +1,22 @@ +/* + * OpenVPN-GUI -- A Windows GUI for OpenVPN. + * + * Copyright (C) 2021 Lev Stipakov + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program (see the file COPYING included with this + * distribution); if not, write to the Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +void ImportConfigFromAS(); \ No newline at end of file diff --git a/main.c b/main.c index 1eacf01..75320f5 100644 --- a/main.c +++ b/main.c @@ -50,6 +50,7 @@ #include "misc.h" #include "save_pass.h" #include "echo.h" +#include "as.h" #ifndef DISABLE_CHANGE_PASSWORD #include @@ -65,6 +66,7 @@ LRESULT CALLBACK WindowProcedure (HWND, UINT, WPARAM, LPARAM); static void ShowSettingsDialog(); void CloseApplication(HWND hwnd); void ImportConfigFile(); +void ImportConfigFromAS(); /* Class name and window title */ TCHAR szClassName[ ] = _T("OpenVPN-GUI"); @@ -540,9 +542,12 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM wParam = GetMenuItemID((HMENU) lParam, wParam); /* we first check global menu items which do not require a connnection index */ - if (LOWORD(wParam) == IDM_IMPORT) { + if (LOWORD(wParam) == IDM_IMPORT_FILE) { ImportConfigFile(); } + else if (LOWORD(wParam) == IDM_IMPORT_AS) { + ImportConfigFromAS(); + } else if (LOWORD(wParam) == IDM_SETTINGS) { ShowSettingsDialog(); } diff --git a/misc.h b/misc.h index 7e102cd..74a3e30 100644 --- a/misc.h +++ b/misc.h @@ -24,6 +24,8 @@ #include +#include "options.h" + BOOL ManagementCommandFromInput(connection_t *, LPCSTR, HWND, int); BOOL ManagementCommandFromTwoInputsBase64(connection_t*, LPCSTR, HWND, int, int); BOOL ManagementCommandFromInputBase64(connection_t *, LPCSTR, HWND, int); diff --git a/openvpn-gui-res.h b/openvpn-gui-res.h index 18d0358..d177f1d 100644 --- a/openvpn-gui-res.h +++ b/openvpn-gui-res.h @@ -145,6 +145,10 @@ #define ID_DLG_MESSAGE 300 #define ID_TXT_MESSAGE 301 +#define ID_DLG_URL_PROFILE_IMPORT 400 +#define ID_EDT_URL 401 +#define ID_CHK_AUTOLOGIN 402 + /* * String Table Resources */ @@ -176,6 +180,8 @@ #define IDS_MENU_IMPORT 1023 #define IDS_MENU_CLEARPASS 1024 #define IDS_MENU_RECONNECT 1025 +#define IDS_MENU_IMPORT_AS 1026 +#define IDS_MENU_IMPORT_FILE 1027 /* LogViewer Dialog */ #define IDS_ERR_START_LOG_VIEWER 1101 diff --git a/openvpn.h b/openvpn.h index 6dd9818..0d47fd2 100644 --- a/openvpn.h +++ b/openvpn.h @@ -23,6 +23,8 @@ #ifndef OPENVPN_H #define OPENVPN_H +#include "options.h" + BOOL StartOpenVPN(connection_t *); void StopOpenVPN(connection_t *); void SuspendOpenVPN(int config); diff --git a/res/openvpn-gui-res-cs.rc b/res/openvpn-gui-res-cs.rc index 0b36e7a..c0560dd 100644 --- a/res/openvpn-gui-res-cs.rc +++ b/res/openvpn-gui-res-cs.rc @@ -249,6 +249,24 @@ BEGIN PUSHBUTTON "OK", IDOK, 58, 43, 40, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED END +/* URL Profile Import Dialog */ +ID_DLG_URL_PROFILE_IMPORT DIALOG 6, 18, 160, 95 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER | DS_SETFOREGROUND +CAPTION "Import Profile from Access Server" +FONT 8, "Microsoft Sans Serif" +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT +BEGIN + LTEXT "U&RL:", 201, 6, 9, 50, 10 + EDITTEXT ID_EDT_URL, 60, 6, 94, 12, ES_AUTOHSCROLL + LTEXT "&Username:", 202, 6, 26, 50, 10 + EDITTEXT ID_EDT_AUTH_USER, 60, 23, 94, 12, ES_AUTOHSCROLL + LTEXT "&Password:", ID_LTEXT_PASSWORD, 6, 42, 50, 10 + EDITTEXT ID_EDT_AUTH_PASS, 60, 40, 94, 12, ES_PASSWORD | ES_AUTOHSCROLL + AUTOCHECKBOX "&Autologin", ID_CHK_AUTOLOGIN, 6, 59, 100, 10 + PUSHBUTTON "&OK", IDOK, 20, 76, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "&Cancel", IDCANCEL, 90, 76, 52, 14 +END + STRINGTABLE LANGUAGE LANG_CZECH, SUBLANG_DEFAULT BEGIN @@ -261,7 +279,9 @@ BEGIN IDS_TIP_CONNECTED_SINCE "\nPřipojeno od: " IDS_TIP_ASSIGNED_IP "\nPřiřazená IP: %s" IDS_MENU_SERVICE "Služba OpenVPN" - IDS_MENU_IMPORT "Import souboru konfigurace…" + IDS_MENU_IMPORT "Import" + IDS_MENU_IMPORT_AS "Import from Access Server…" + IDS_MENU_IMPORT_FILE "Import souboru konfigurace…" IDS_MENU_SETTINGS "Nastavení…" IDS_MENU_CLOSE "Ukončit" IDS_MENU_CONNECT "Připojit" diff --git a/res/openvpn-gui-res-de.rc b/res/openvpn-gui-res-de.rc index a98c624..eb75b07 100644 --- a/res/openvpn-gui-res-de.rc +++ b/res/openvpn-gui-res-de.rc @@ -158,7 +158,7 @@ BEGIN GROUPBOX "Systemstart", 202, 6, 47, 235, 30 AUTOCHECKBOX "Mit &Windows starten", ID_CHK_STARTUP, 17, 59, 200, 12 - + AUTOCHECKBOX "An &Log anhängen", ID_CHK_LOG_APPEND, 17, 95, 60, 10 AUTOCHECKBOX "&Skriptfenster zeigen", ID_CHK_SHOW_SCRIPT_WIN, 17, 110, 200, 10 AUTOCHECKBOX "Stille &Verbindung", ID_CHK_SILENT, 17, 125, 200, 10 @@ -251,6 +251,24 @@ BEGIN PUSHBUTTON "&OK", IDOK, 58, 43, 40, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED END +/* URL Profile Import Dialog */ +ID_DLG_URL_PROFILE_IMPORT DIALOG 6, 18, 160, 95 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER | DS_SETFOREGROUND +CAPTION "Import Profile from Access Server" +FONT 8, "Microsoft Sans Serif" +LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT +BEGIN + LTEXT "U&RL:", 201, 6, 9, 50, 10 + EDITTEXT ID_EDT_URL, 60, 6, 94, 12, ES_AUTOHSCROLL + LTEXT "&Username:", 202, 6, 26, 50, 10 + EDITTEXT ID_EDT_AUTH_USER, 60, 23, 94, 12, ES_AUTOHSCROLL + LTEXT "&Password:", ID_LTEXT_PASSWORD, 6, 42, 50, 10 + EDITTEXT ID_EDT_AUTH_PASS, 60, 40, 94, 12, ES_PASSWORD | ES_AUTOHSCROLL + AUTOCHECKBOX "&Autologin", ID_CHK_AUTOLOGIN, 6, 59, 100, 10 + PUSHBUTTON "&OK", IDOK, 20, 76, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "&Cancel", IDCANCEL, 90, 76, 52, 14 +END + STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT BEGIN @@ -263,7 +281,9 @@ BEGIN IDS_TIP_CONNECTED_SINCE "\nVerbunden seit: " IDS_TIP_ASSIGNED_IP "\nZugewiesene IP: %s" IDS_MENU_SERVICE "OpenVPN-Dienst" - IDS_MENU_IMPORT "Datei importieren…" + IDS_MENU_IMPORT "Import" + IDS_MENU_IMPORT_AS "Import from Access Server…" + IDS_MENU_IMPORT_FILE "Datei importieren…" IDS_MENU_SETTINGS "Einstellungen…" IDS_MENU_CLOSE "Beenden" IDS_MENU_CONNECT "Verbinden" diff --git a/res/openvpn-gui-res-dk.rc b/res/openvpn-gui-res-dk.rc index eafb8a2..ceab5f4 100644 --- a/res/openvpn-gui-res-dk.rc +++ b/res/openvpn-gui-res-dk.rc @@ -249,6 +249,24 @@ BEGIN PUSHBUTTON "OK", IDOK, 60, 43, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED END +/* URL Profile Import Dialog */ +ID_DLG_URL_PROFILE_IMPORT DIALOG 6, 18, 160, 95 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER | DS_SETFOREGROUND +CAPTION "Import Profile from Access Server" +FONT 8, "Microsoft Sans Serif" +LANGUAGE LANG_DANISH, SUBLANG_DEFAULT +BEGIN + LTEXT "U&RL:", 201, 6, 9, 50, 10 + EDITTEXT ID_EDT_URL, 60, 6, 94, 12, ES_AUTOHSCROLL + LTEXT "&Username:", 202, 6, 26, 50, 10 + EDITTEXT ID_EDT_AUTH_USER, 60, 23, 94, 12, ES_AUTOHSCROLL + LTEXT "&Password:", ID_LTEXT_PASSWORD, 6, 42, 50, 10 + EDITTEXT ID_EDT_AUTH_PASS, 60, 40, 94, 12, ES_PASSWORD | ES_AUTOHSCROLL + AUTOCHECKBOX "&Autologin", ID_CHK_AUTOLOGIN, 6, 59, 100, 10 + PUSHBUTTON "&OK", IDOK, 20, 76, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "&Cancel", IDCANCEL, 90, 76, 52, 14 +END + STRINGTABLE LANGUAGE LANG_DANISH, SUBLANG_DEFAULT BEGIN @@ -261,7 +279,9 @@ BEGIN IDS_TIP_CONNECTED_SINCE "\nForbundet siden: " IDS_TIP_ASSIGNED_IP "\nTildelt IP: %s" IDS_MENU_SERVICE "OpenVPN Service" - IDS_MENU_IMPORT "Import file…" + IDS_MENU_IMPORT "Import" + IDS_MENU_IMPORT_AS "Import from Access Server…" + IDS_MENU_IMPORT_FILE "Import file…" IDS_MENU_SETTINGS "Indstillinger…" IDS_MENU_CLOSE "Afslut" IDS_MENU_CONNECT "Forbind" diff --git a/res/openvpn-gui-res-en.rc b/res/openvpn-gui-res-en.rc index 27887d9..e4e4b9b 100644 --- a/res/openvpn-gui-res-en.rc +++ b/res/openvpn-gui-res-en.rc @@ -168,7 +168,6 @@ BEGIN LTEXT "&Language:", ID_TXT_LANGUAGE, 17, 25, 52, 12 COMBOBOX ID_CMB_LANGUAGE, 57, 23, 171, 400, CBS_DROPDOWNLIST | WS_TABSTOP - GROUPBOX "Startup", 202, 6, 47, 235, 30 AUTOCHECKBOX "Launch on User &Logon", ID_CHK_STARTUP, 17, 59, 100, 12 @@ -264,6 +263,24 @@ BEGIN PUSHBUTTON "&OK", IDOK, 58, 43, 40, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED END +/* URL Profile Import Dialog */ +ID_DLG_URL_PROFILE_IMPORT DIALOG 6, 18, 160, 95 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER | DS_SETFOREGROUND +CAPTION "Import Profile from Access Server" +FONT 8, "Microsoft Sans Serif" +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +BEGIN + LTEXT "U&RL:", 201, 6, 9, 50, 10 + EDITTEXT ID_EDT_URL, 60, 6, 94, 12, ES_AUTOHSCROLL + LTEXT "&Username:", 202, 6, 26, 50, 10 + EDITTEXT ID_EDT_AUTH_USER, 60, 23, 94, 12, ES_AUTOHSCROLL + LTEXT "&Password:", ID_LTEXT_PASSWORD, 6, 42, 50, 10 + EDITTEXT ID_EDT_AUTH_PASS, 60, 40, 94, 12, ES_PASSWORD | ES_AUTOHSCROLL + AUTOCHECKBOX "&Autologin", ID_CHK_AUTOLOGIN, 6, 59, 100, 10 + PUSHBUTTON "&OK", IDOK, 20, 76, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "&Cancel", IDCANCEL, 90, 76, 52, 14 +END + STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT BEGIN @@ -276,7 +293,9 @@ BEGIN IDS_TIP_CONNECTED_SINCE "\nConnected since: " IDS_TIP_ASSIGNED_IP "\nAssigned IP: %s" IDS_MENU_SERVICE "OpenVPN Service" - IDS_MENU_IMPORT "Import file…" + IDS_MENU_IMPORT "Import" + IDS_MENU_IMPORT_AS "Import from Access Server…" + IDS_MENU_IMPORT_FILE "Import file…" IDS_MENU_SETTINGS "Settings…" IDS_MENU_CLOSE "Exit" IDS_MENU_CONNECT "Connect" diff --git a/res/openvpn-gui-res-es.rc b/res/openvpn-gui-res-es.rc index 121d9f2..20589e6 100644 --- a/res/openvpn-gui-res-es.rc +++ b/res/openvpn-gui-res-es.rc @@ -247,6 +247,24 @@ BEGIN PUSHBUTTON "OK", IDOK, 58, 43, 40, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED END +/* URL Profile Import Dialog */ +ID_DLG_URL_PROFILE_IMPORT DIALOG 6, 18, 160, 95 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER | DS_SETFOREGROUND +CAPTION "Import Profile from Access Server" +FONT 8, "Microsoft Sans Serif" +LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT +BEGIN + LTEXT "U&RL:", 201, 6, 9, 50, 10 + EDITTEXT ID_EDT_URL, 60, 6, 94, 12, ES_AUTOHSCROLL + LTEXT "&Username:", 202, 6, 26, 50, 10 + EDITTEXT ID_EDT_AUTH_USER, 60, 23, 94, 12, ES_AUTOHSCROLL + LTEXT "&Password:", ID_LTEXT_PASSWORD, 6, 42, 50, 10 + EDITTEXT ID_EDT_AUTH_PASS, 60, 40, 94, 12, ES_PASSWORD | ES_AUTOHSCROLL + AUTOCHECKBOX "&Autologin", ID_CHK_AUTOLOGIN, 6, 59, 100, 10 + PUSHBUTTON "&OK", IDOK, 20, 76, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "&Cancel", IDCANCEL, 90, 76, 52, 14 +END + STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT BEGIN @@ -259,7 +277,9 @@ BEGIN IDS_TIP_CONNECTED_SINCE "\nConectado desde: " IDS_TIP_ASSIGNED_IP "\nIP asignada: %s" IDS_MENU_SERVICE "Servicio OpenVPN" - IDS_MENU_IMPORT "Import file…" + IDS_MENU_IMPORT "Import" + IDS_MENU_IMPORT_AS "Import from Access Server…" + IDS_MENU_IMPORT_FILE "Import file…" IDS_MENU_SETTINGS "Opciones…" IDS_MENU_CLOSE "Salir" IDS_MENU_CONNECT "Conectar" diff --git a/res/openvpn-gui-res-fa.rc b/res/openvpn-gui-res-fa.rc index 4c1111a..ab4b190 100644 --- a/res/openvpn-gui-res-fa.rc +++ b/res/openvpn-gui-res-fa.rc @@ -155,7 +155,7 @@ BEGIN LTEXT "زبان :", ID_TXT_LANGUAGE, 17, 25, 52, 12 COMBOBOX ID_CMB_LANGUAGE, 57, 23, 171, 400, CBS_DROPDOWNLIST | WS_TABSTOP - + GROUPBOX "شروع به کار", 202, 6, 47, 235, 30 AUTOCHECKBOX "شروع به کار - وقتی کاربر وارد شد", ID_CHK_STARTUP, 17, 59, 100, 12 @@ -251,6 +251,24 @@ BEGIN PUSHBUTTON "بسیار خوب", IDOK, 58, 43, 40, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED END +/* URL Profile Import Dialog */ +ID_DLG_URL_PROFILE_IMPORT DIALOG 6, 18, 160, 95 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER | DS_SETFOREGROUND +CAPTION "Import Profile from Access Server" +FONT 8, "Microsoft Sans Serif" +LANGUAGE LANG_FARSI, SUBLANG_DEFAULT +BEGIN + LTEXT "U&RL:", 201, 6, 9, 50, 10 + EDITTEXT ID_EDT_URL, 60, 6, 94, 12, ES_AUTOHSCROLL + LTEXT "&Username:", 202, 6, 26, 50, 10 + EDITTEXT ID_EDT_AUTH_USER, 60, 23, 94, 12, ES_AUTOHSCROLL + LTEXT "&Password:", ID_LTEXT_PASSWORD, 6, 42, 50, 10 + EDITTEXT ID_EDT_AUTH_PASS, 60, 40, 94, 12, ES_PASSWORD | ES_AUTOHSCROLL + AUTOCHECKBOX "&Autologin", ID_CHK_AUTOLOGIN, 6, 59, 100, 10 + PUSHBUTTON "&OK", IDOK, 20, 76, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "&Cancel", IDCANCEL, 90, 76, 52, 14 +END + STRINGTABLE LANGUAGE LANG_FARSI, SUBLANG_DEFAULT BEGIN @@ -263,7 +281,9 @@ BEGIN IDS_TIP_CONNECTED_SINCE "\nمتصل شده به: " IDS_TIP_ASSIGNED_IP "\nآی پی اختصاصی: %s" IDS_MENU_SERVICE "سرویس OpenVPN" - IDS_MENU_IMPORT "وارد کردن فایل..." + IDS_MENU_IMPORT "Import" + IDS_MENU_IMPORT_AS "Import from Access Server..." + IDS_MENU_IMPORT_FILE "وارد کردن فایل..." IDS_MENU_SETTINGS "تنظیمات..." IDS_MENU_CLOSE "خروج" IDS_MENU_CONNECT "اتصال" diff --git a/res/openvpn-gui-res-fi.rc b/res/openvpn-gui-res-fi.rc index 1155fea..a561560 100644 --- a/res/openvpn-gui-res-fi.rc +++ b/res/openvpn-gui-res-fi.rc @@ -248,6 +248,24 @@ BEGIN PUSHBUTTON "OK", IDOK, 58, 43, 40, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED END +/* URL Profile Import Dialog */ +ID_DLG_URL_PROFILE_IMPORT DIALOG 6, 18, 160, 95 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER | DS_SETFOREGROUND +CAPTION "Import Profile from Access Server" +FONT 8, "Microsoft Sans Serif" +LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT +BEGIN + LTEXT "U&RL:", 201, 6, 9, 50, 10 + EDITTEXT ID_EDT_URL, 60, 6, 94, 12, ES_AUTOHSCROLL + LTEXT "&Username:", 202, 6, 26, 50, 10 + EDITTEXT ID_EDT_AUTH_USER, 60, 23, 94, 12, ES_AUTOHSCROLL + LTEXT "&Password:", ID_LTEXT_PASSWORD, 6, 42, 50, 10 + EDITTEXT ID_EDT_AUTH_PASS, 60, 40, 94, 12, ES_PASSWORD | ES_AUTOHSCROLL + AUTOCHECKBOX "&Autologin", ID_CHK_AUTOLOGIN, 6, 59, 100, 10 + PUSHBUTTON "&OK", IDOK, 20, 76, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "&Cancel", IDCANCEL, 90, 76, 52, 14 +END + STRINGTABLE LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT BEGIN @@ -260,7 +278,9 @@ BEGIN IDS_TIP_CONNECTED_SINCE "\nYhteys luotu: " IDS_TIP_ASSIGNED_IP "\nIP-osoite: %s" IDS_MENU_SERVICE "OpenVPN-palvelu" - IDS_MENU_IMPORT "Tuo tiedosto…" + IDS_MENU_IMPORT "Tuo" + IDS_MENU_IMPORT_AS "Import from Access Server…" + IDS_MENU_IMPORT_FILE "Tuo tiedosto…" IDS_MENU_SETTINGS "Asetukset…" IDS_MENU_CLOSE "Poistu" IDS_MENU_CONNECT "Yhdistä" diff --git a/res/openvpn-gui-res-fr.rc b/res/openvpn-gui-res-fr.rc index 4e2b148..61e8ea3 100644 --- a/res/openvpn-gui-res-fr.rc +++ b/res/openvpn-gui-res-fr.rc @@ -152,7 +152,7 @@ BEGIN GROUPBOX "Interface utilisateur", 201, 6, 12, 235, 30 LTEXT "Langue:", ID_TXT_LANGUAGE, 17, 25, 52, 12 COMBOBOX ID_CMB_LANGUAGE, 47, 23, 181, 400, CBS_DROPDOWNLIST | WS_TABSTOP - + GROUPBOX "Démarrage", 202, 6, 47, 235, 30 AUTOCHECKBOX "Lancer au démarrage de Windows", ID_CHK_STARTUP, 17, 59, 200, 12 @@ -248,6 +248,24 @@ BEGIN PUSHBUTTON "OK", IDOK, 58, 43, 40, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED END +/* URL Profile Import Dialog */ +ID_DLG_URL_PROFILE_IMPORT DIALOG 6, 18, 160, 95 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER | DS_SETFOREGROUND +CAPTION "Import Profile from Access Server" +FONT 8, "Microsoft Sans Serif" +LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT +BEGIN + LTEXT "U&RL:", 201, 6, 9, 50, 10 + EDITTEXT ID_EDT_URL, 60, 6, 94, 12, ES_AUTOHSCROLL + LTEXT "&Username:", 202, 6, 26, 50, 10 + EDITTEXT ID_EDT_AUTH_USER, 60, 23, 94, 12, ES_AUTOHSCROLL + LTEXT "&Password:", ID_LTEXT_PASSWORD, 6, 42, 50, 10 + EDITTEXT ID_EDT_AUTH_PASS, 60, 40, 94, 12, ES_PASSWORD | ES_AUTOHSCROLL + AUTOCHECKBOX "&Autologin", ID_CHK_AUTOLOGIN, 6, 59, 100, 10 + PUSHBUTTON "&OK", IDOK, 20, 76, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "&Cancel", IDCANCEL, 90, 76, 52, 14 +END + STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT BEGIN @@ -260,7 +278,9 @@ BEGIN IDS_TIP_CONNECTED_SINCE "\nConnecté depuis: " IDS_TIP_ASSIGNED_IP "\nAdresse IP assignée: %s" IDS_MENU_SERVICE "OpenVPN Service" - IDS_MENU_IMPORT "Importer fichier…" + IDS_MENU_IMPORT "Import" + IDS_MENU_IMPORT_AS "Import from Access Server…" + IDS_MENU_IMPORT_FILE "Importer fichier…" IDS_MENU_SETTINGS "Configuration…" IDS_MENU_CLOSE "Quitter" IDS_MENU_CONNECT "Connecter" @@ -478,7 +498,7 @@ OpenVPN n'est probablement pas installé." en tant qu'Administrator pour mettre à jour la base de registre." IDS_ERR_READ_SET_KEY "Impossible de lire et modifier la clé de registre ""%s""." IDS_ERR_WRITE_REGVALUE "Impossible d'écrire la valeur de registre ""HKEY_CURRENT_USER\\%s\\%s""." - + /* importation */ IDS_ERR_IMPORT_EXISTS "Une configuration nommée ""%s"" existe déjà." IDS_ERR_IMPORT_FAILED "Impossible d'importer un fichier. Le chemin suivant n'a pas pu être créé.\n\n\ diff --git a/res/openvpn-gui-res-it.rc b/res/openvpn-gui-res-it.rc index c5b0294..8867bc4 100644 --- a/res/openvpn-gui-res-it.rc +++ b/res/openvpn-gui-res-it.rc @@ -152,7 +152,7 @@ BEGIN GROUPBOX "Interfaccia utente", 201, 6, 12, 235, 30 LTEXT "&Lingua:", ID_TXT_LANGUAGE, 17, 25, 52, 12 COMBOBOX ID_CMB_LANGUAGE, 43, 23, 185, 400, CBS_DROPDOWNLIST | WS_TABSTOP - + GROUPBOX "Avvio", 202, 6, 47, 235, 30 AUTOCHECKBOX "&Avvia all'apertura di Windows", ID_CHK_STARTUP, 17, 59, 200, 12 @@ -225,7 +225,7 @@ Copyright (C) 2004-2005 Mathias Sundman \n\ Copyright (C) 2008-2014 Heiko Hund \n\ Copyright (C) 2012-2021 OpenVPN GUI contributors\n", ID_TXT_VERSION, 36, 15, 206, 50 LTEXT "https://github.com/OpenVPN/openvpn-gui/", ID_LTEXT_ABOUT2, 36, 55, 206, 50 - + LTEXT "OpenVPN - Un'applicazione che permette di creare tunnel sicuri su reti IP \ con una singola porta TCP/UDP, con il supporto basato sull'autenticazione e lo scambio \ di chiavi SSL/TLS, cifratura, autenticazione e compressione dei pacchetti.\n\ @@ -248,6 +248,24 @@ BEGIN PUSHBUTTON "&OK", IDOK, 58, 43, 40, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED END +/* URL Profile Import Dialog */ +ID_DLG_URL_PROFILE_IMPORT DIALOG 6, 18, 160, 95 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER | DS_SETFOREGROUND +CAPTION "Import Profile from Access Server" +FONT 8, "Microsoft Sans Serif" +LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT +BEGIN + LTEXT "U&RL:", 201, 6, 9, 50, 10 + EDITTEXT ID_EDT_URL, 60, 6, 94, 12, ES_AUTOHSCROLL + LTEXT "&Username:", 202, 6, 26, 50, 10 + EDITTEXT ID_EDT_AUTH_USER, 60, 23, 94, 12, ES_AUTOHSCROLL + LTEXT "&Password:", ID_LTEXT_PASSWORD, 6, 42, 50, 10 + EDITTEXT ID_EDT_AUTH_PASS, 60, 40, 94, 12, ES_PASSWORD | ES_AUTOHSCROLL + AUTOCHECKBOX "&Autologin", ID_CHK_AUTOLOGIN, 6, 59, 100, 10 + PUSHBUTTON "&OK", IDOK, 20, 76, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "&Cancel", IDCANCEL, 90, 76, 52, 14 +END + STRINGTABLE LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT BEGIN @@ -260,7 +278,9 @@ BEGIN IDS_TIP_CONNECTED_SINCE "\nConnesso da: " IDS_TIP_ASSIGNED_IP "\nIP assegnato: %s" IDS_MENU_SERVICE "Servizio OpenVPN" - IDS_MENU_IMPORT "Importa file…" + IDS_MENU_IMPORT "Import" + IDS_MENU_IMPORT_AS "Import from Access Server…" + IDS_MENU_IMPORT_FILE "Importa file…" IDS_MENU_SETTINGS "Impostazioni…" IDS_MENU_CLOSE "Esci" IDS_MENU_CONNECT "Connetti" @@ -478,7 +498,7 @@ OpenVPN probabilmente non è installato" una volta che l'amministratore ha aggiornato il registro." IDS_ERR_READ_SET_KEY "Errore nella lettura e modifica della chiave di registro ""%s""." IDS_ERR_WRITE_REGVALUE "Errore nella scrittura del valore di registro ""HKEY_CURRENT_USER\\%s\\%s""." - + /* importation */ IDS_ERR_IMPORT_EXISTS "Esiste già una configurazione con il nome ""%s""." IDS_ERR_IMPORT_FAILED "Errore nell'importazione del file. Non ho potuto creare il percorso seguente:\n\n\ @@ -501,5 +521,5 @@ una volta che l'amministratore ha aggiornato il registro." IDS_NFO_AUTO_CONNECT "Connessione automatica tra %u secondi..." IDS_NFO_CLICK_HERE_TO_START "L'interfaccia OpenVPN è già in esecuzione. Clicca con il tasto destro sull'icona nell'area di notifica per cominciare." IDS_NFO_BYTECOUNT "Byte in: %s out: %s" - + END diff --git a/res/openvpn-gui-res-jp.rc b/res/openvpn-gui-res-jp.rc index edeb244..3e4c0b7 100644 --- a/res/openvpn-gui-res-jp.rc +++ b/res/openvpn-gui-res-jp.rc @@ -249,6 +249,24 @@ BEGIN PUSHBUTTON "OK(&O)", IDOK, 58, 43, 40, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED END +/* URL Profile Import Dialog */ +ID_DLG_URL_PROFILE_IMPORT DIALOG 6, 18, 160, 95 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER | DS_SETFOREGROUND +CAPTION "Import Profile from Access Server" +FONT 8, "Microsoft Sans Serif" +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT +BEGIN + LTEXT "U&RL:", 201, 6, 9, 50, 10 + EDITTEXT ID_EDT_URL, 60, 6, 94, 12, ES_AUTOHSCROLL + LTEXT "&Username:", 202, 6, 26, 50, 10 + EDITTEXT ID_EDT_AUTH_USER, 60, 23, 94, 12, ES_AUTOHSCROLL + LTEXT "&Password:", ID_LTEXT_PASSWORD, 6, 42, 50, 10 + EDITTEXT ID_EDT_AUTH_PASS, 60, 40, 94, 12, ES_PASSWORD | ES_AUTOHSCROLL + AUTOCHECKBOX "&Autologin", ID_CHK_AUTOLOGIN, 6, 59, 100, 10 + PUSHBUTTON "&OK", IDOK, 20, 76, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "&Cancel", IDCANCEL, 90, 76, 52, 14 +END + STRINGTABLE LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT BEGIN @@ -261,7 +279,9 @@ BEGIN IDS_TIP_CONNECTED_SINCE "\n接続時間: " IDS_TIP_ASSIGNED_IP "\n割り当てられたIP: %s" IDS_MENU_SERVICE "OpenVPNサービス" - IDS_MENU_IMPORT "ファイルのインポート..." + IDS_MENU_IMPORT "Import" + IDS_MENU_IMPORT_AS "Import from Access Server..." + IDS_MENU_IMPORT_FILE "ファイルのインポート..." IDS_MENU_SETTINGS "設定..." IDS_MENU_CLOSE "終了" IDS_MENU_CONNECT "接続" @@ -343,7 +363,7 @@ BEGIN 別フォルダでも同じ名前で複数の設定ファイルを使用することはできません。" IDS_NFO_CONN_TIMEOUT "管理インターフェイスに接続できませんでした。\n\ ログファイル (%s) を確認してください。" - + /* main - Resources */ IDS_ERR_OPEN_DEBUG_FILE "デバッグファイル (%s) を出力用に開くときにエラーが発生しました。" IDS_ERR_CREATE_PATH "%s を作成できませんでした。パス:\n%s" @@ -476,7 +496,7 @@ OpenVPNがインストールされていない可能性があります。" IDS_ERR_PRECONN_SCRIPT_TIMEOUT "レジストリ ""preconnectscript_timeout"" の値は 1-99 の範囲内である必要があります。" IDS_ERR_CREATE_REG_KEY "キー HKLM\\SOFTWARE\\OpenVPN-GUI の作成に失敗しました。" IDS_ERR_OPEN_WRITE_REG "レジストリの書き込みに失敗しました。レジストリの更新時にはアプリケーションを管理者権限で実行する必要があります。" - IDS_ERR_READ_SET_KEY "レジストリ ""%s"" の読み取り/書き込みに失敗しました。" + IDS_ERR_READ_SET_KEY "レジストリ ""%s"" の読み取り/書き込みに失敗しました。" IDS_ERR_WRITE_REGVALUE "レジストリ ""HKEY_CURRENT_USER\\%s\\%s"" への書き込みに失敗しました。" /* importation */ diff --git a/res/openvpn-gui-res-kr.rc b/res/openvpn-gui-res-kr.rc index ad77af9..e39497e 100644 --- a/res/openvpn-gui-res-kr.rc +++ b/res/openvpn-gui-res-kr.rc @@ -249,6 +249,24 @@ BEGIN PUSHBUTTON "확인", IDOK, 58, 43, 40, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED END +/* URL Profile Import Dialog */ +ID_DLG_URL_PROFILE_IMPORT DIALOG 6, 18, 160, 95 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER | DS_SETFOREGROUND +CAPTION "Import Profile from Access Server" +FONT 8, "Microsoft Sans Serif" +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT +BEGIN + LTEXT "U&RL:", 201, 6, 9, 50, 10 + EDITTEXT ID_EDT_URL, 60, 6, 94, 12, ES_AUTOHSCROLL + LTEXT "&Username:", 202, 6, 26, 50, 10 + EDITTEXT ID_EDT_AUTH_USER, 60, 23, 94, 12, ES_AUTOHSCROLL + LTEXT "&Password:", ID_LTEXT_PASSWORD, 6, 42, 50, 10 + EDITTEXT ID_EDT_AUTH_PASS, 60, 40, 94, 12, ES_PASSWORD | ES_AUTOHSCROLL + AUTOCHECKBOX "&Autologin", ID_CHK_AUTOLOGIN, 6, 59, 100, 10 + PUSHBUTTON "&OK", IDOK, 20, 76, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "&Cancel", IDCANCEL, 90, 76, 52, 14 +END + STRINGTABLE LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT BEGIN @@ -261,7 +279,9 @@ BEGIN IDS_TIP_CONNECTED_SINCE "\n연결 시간: " IDS_TIP_ASSIGNED_IP "\n할당된 IP: %s" IDS_MENU_SERVICE "OpenVPN 서비스" - IDS_MENU_IMPORT "파일 불러오기…" + IDS_MENU_IMPORT "Import" + IDS_MENU_IMPORT_AS "Import from Access Server…" + IDS_MENU_IMPORT_FILE "파일 불러오기…" IDS_MENU_SETTINGS "설정…" IDS_MENU_CLOSE "종료" IDS_MENU_CONNECT "연결" diff --git a/res/openvpn-gui-res-nl.rc b/res/openvpn-gui-res-nl.rc index 724947d..3550c72 100644 --- a/res/openvpn-gui-res-nl.rc +++ b/res/openvpn-gui-res-nl.rc @@ -153,7 +153,7 @@ BEGIN LTEXT "Taal:", ID_TXT_LANGUAGE, 17, 25, 52, 12 COMBOBOX ID_CMB_LANGUAGE, 37, 23, 191, 400, CBS_DROPDOWNLIST | WS_TABSTOP - + GROUPBOX "Opstarten", 202, 6, 47, 235, 30 AUTOCHECKBOX "Opstarten met Windows", ID_CHK_STARTUP, 17, 59, 200, 12 @@ -249,6 +249,24 @@ BEGIN PUSHBUTTON "OK", IDOK, 68, 43, 40, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED END +/* URL Profile Import Dialog */ +ID_DLG_URL_PROFILE_IMPORT DIALOG 6, 18, 160, 95 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER | DS_SETFOREGROUND +CAPTION "Import Profile from Access Server" +FONT 8, "Microsoft Sans Serif" +LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT +BEGIN + LTEXT "U&RL:", 201, 6, 9, 50, 10 + EDITTEXT ID_EDT_URL, 60, 6, 94, 12, ES_AUTOHSCROLL + LTEXT "&Username:", 202, 6, 26, 50, 10 + EDITTEXT ID_EDT_AUTH_USER, 60, 23, 94, 12, ES_AUTOHSCROLL + LTEXT "&Password:", ID_LTEXT_PASSWORD, 6, 42, 50, 10 + EDITTEXT ID_EDT_AUTH_PASS, 60, 40, 94, 12, ES_PASSWORD | ES_AUTOHSCROLL + AUTOCHECKBOX "&Autologin", ID_CHK_AUTOLOGIN, 6, 59, 100, 10 + PUSHBUTTON "&OK", IDOK, 20, 76, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "&Cancel", IDCANCEL, 90, 76, 52, 14 +END + STRINGTABLE LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT BEGIN @@ -261,7 +279,9 @@ BEGIN IDS_TIP_CONNECTED_SINCE "\nVerbonden sinds: " IDS_TIP_ASSIGNED_IP "\nToegewezen IP: %s" IDS_MENU_SERVICE "OpenVPN Service" - IDS_MENU_IMPORT "Bestand importeren…" + IDS_MENU_IMPORT "Import" + IDS_MENU_IMPORT_AS "Import from Access Server…" + IDS_MENU_IMPORT_FILE "Bestand importeren…" IDS_MENU_SETTINGS "Instellingen…" IDS_MENU_CLOSE "Afsluiten" IDS_MENU_CONNECT "Verbinden" diff --git a/res/openvpn-gui-res-no.rc b/res/openvpn-gui-res-no.rc index a7d920d..0df4476 100644 --- a/res/openvpn-gui-res-no.rc +++ b/res/openvpn-gui-res-no.rc @@ -248,6 +248,24 @@ BEGIN PUSHBUTTON "OK", IDOK, 60, 43, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED END +/* URL Profile Import Dialog */ +ID_DLG_URL_PROFILE_IMPORT DIALOG 6, 18, 160, 95 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER | DS_SETFOREGROUND +CAPTION "Import Profile from Access Server" +FONT 8, "Microsoft Sans Serif" +LANGUAGE LANG_NORWEGIAN, SUBLANG_DEFAULT +BEGIN + LTEXT "U&RL:", 201, 6, 9, 50, 10 + EDITTEXT ID_EDT_URL, 60, 6, 94, 12, ES_AUTOHSCROLL + LTEXT "&Username:", 202, 6, 26, 50, 10 + EDITTEXT ID_EDT_AUTH_USER, 60, 23, 94, 12, ES_AUTOHSCROLL + LTEXT "&Password:", ID_LTEXT_PASSWORD, 6, 42, 50, 10 + EDITTEXT ID_EDT_AUTH_PASS, 60, 40, 94, 12, ES_PASSWORD | ES_AUTOHSCROLL + AUTOCHECKBOX "&Autologin", ID_CHK_AUTOLOGIN, 6, 59, 100, 10 + PUSHBUTTON "&OK", IDOK, 20, 76, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "&Cancel", IDCANCEL, 90, 76, 52, 14 +END + STRINGTABLE LANGUAGE LANG_NORWEGIAN, SUBLANG_DEFAULT BEGIN @@ -260,7 +278,9 @@ BEGIN IDS_TIP_CONNECTED_SINCE "\nTilkoblet siden: " IDS_TIP_ASSIGNED_IP "\nTildelt IP: %s" IDS_MENU_SERVICE "OpenVPN-tjenesten" - IDS_MENU_IMPORT "Importer fil…" + IDS_MENU_IMPORT "Import" + IDS_MENU_IMPORT_AS "Import from Access Server…" + IDS_MENU_IMPORT_FILE "Importer fil…" IDS_MENU_SETTINGS "Innstillinger…" IDS_MENU_CLOSE "Avslutte" IDS_MENU_CONNECT "Koble til" diff --git a/res/openvpn-gui-res-pl.rc b/res/openvpn-gui-res-pl.rc index ac19c6f..af85ea5 100644 --- a/res/openvpn-gui-res-pl.rc +++ b/res/openvpn-gui-res-pl.rc @@ -249,6 +249,24 @@ BEGIN PUSHBUTTON "OK", IDOK, 58, 43, 40, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED END +/* URL Profile Import Dialog */ +ID_DLG_URL_PROFILE_IMPORT DIALOG 6, 18, 160, 95 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER | DS_SETFOREGROUND +CAPTION "Import Profile from Access Server" +FONT 8, "Microsoft Sans Serif" +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT +BEGIN + LTEXT "U&RL:", 201, 6, 9, 50, 10 + EDITTEXT ID_EDT_URL, 60, 6, 94, 12, ES_AUTOHSCROLL + LTEXT "&Username:", 202, 6, 26, 50, 10 + EDITTEXT ID_EDT_AUTH_USER, 60, 23, 94, 12, ES_AUTOHSCROLL + LTEXT "&Password:", ID_LTEXT_PASSWORD, 6, 42, 50, 10 + EDITTEXT ID_EDT_AUTH_PASS, 60, 40, 94, 12, ES_PASSWORD | ES_AUTOHSCROLL + AUTOCHECKBOX "&Autologin", ID_CHK_AUTOLOGIN, 6, 59, 100, 10 + PUSHBUTTON "&OK", IDOK, 20, 76, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "&Cancel", IDCANCEL, 90, 76, 52, 14 +END + STRINGTABLE LANGUAGE LANG_POLISH, SUBLANG_DEFAULT BEGIN @@ -261,7 +279,9 @@ BEGIN IDS_TIP_CONNECTED_SINCE "\nPołączony od: " IDS_TIP_ASSIGNED_IP "\nPrzyznany IP: %s" IDS_MENU_SERVICE "Usługa OpenVPN" - IDS_MENU_IMPORT "Importuj plik…" + IDS_MENU_IMPORT "Import" + IDS_MENU_IMPORT_AS "Import from Access Server…" + IDS_MENU_IMPORT_FILE "Importuj plik…" IDS_MENU_SETTINGS "Ustawienia…" IDS_MENU_CLOSE "Zakończ" IDS_MENU_CONNECT "Połącz" diff --git a/res/openvpn-gui-res-pt.rc b/res/openvpn-gui-res-pt.rc index 9d4b07a..3295228 100644 --- a/res/openvpn-gui-res-pt.rc +++ b/res/openvpn-gui-res-pt.rc @@ -247,6 +247,24 @@ BEGIN PUSHBUTTON "OK", IDOK, 58, 43, 40, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED END +/* URL Profile Import Dialog */ +ID_DLG_URL_PROFILE_IMPORT DIALOG 6, 18, 160, 95 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER | DS_SETFOREGROUND +CAPTION "Import Profile from Access Server" +FONT 8, "Microsoft Sans Serif" +LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT +BEGIN + LTEXT "U&RL:", 201, 6, 9, 50, 10 + EDITTEXT ID_EDT_URL, 60, 6, 94, 12, ES_AUTOHSCROLL + LTEXT "&Username:", 202, 6, 26, 50, 10 + EDITTEXT ID_EDT_AUTH_USER, 60, 23, 94, 12, ES_AUTOHSCROLL + LTEXT "&Password:", ID_LTEXT_PASSWORD, 6, 42, 50, 10 + EDITTEXT ID_EDT_AUTH_PASS, 60, 40, 94, 12, ES_PASSWORD | ES_AUTOHSCROLL + AUTOCHECKBOX "&Autologin", ID_CHK_AUTOLOGIN, 6, 59, 100, 10 + PUSHBUTTON "&OK", IDOK, 20, 76, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "&Cancel", IDCANCEL, 90, 76, 52, 14 +END + STRINGTABLE LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT BEGIN @@ -259,7 +277,9 @@ BEGIN IDS_TIP_CONNECTED_SINCE "\nConectado desde: " IDS_TIP_ASSIGNED_IP "\nIP atribuído: %s" IDS_MENU_SERVICE "Serviço OpenVPN" - IDS_MENU_IMPORT "Importar arquivo…" + IDS_MENU_IMPORT "Import" + IDS_MENU_IMPORT_AS "Import from Access Server…" + IDS_MENU_IMPORT_FILE "Importar arquivo…" IDS_MENU_SETTINGS "Configurações…" IDS_MENU_CLOSE "Sair" IDS_MENU_CONNECT "Conectar" diff --git a/res/openvpn-gui-res-ru.rc b/res/openvpn-gui-res-ru.rc index 0239016..3ed24ff 100644 --- a/res/openvpn-gui-res-ru.rc +++ b/res/openvpn-gui-res-ru.rc @@ -250,6 +250,24 @@ BEGIN PUSHBUTTON "OK", IDOK, 78, 43, 40, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED END +/* URL Profile Import Dialog */ +ID_DLG_URL_PROFILE_IMPORT DIALOG 6, 18, 160, 95 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER | DS_SETFOREGROUND +CAPTION "Import Profile from Access Server" +FONT 8, "Microsoft Sans Serif" +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +BEGIN + LTEXT "U&RL:", 201, 6, 9, 50, 10 + EDITTEXT ID_EDT_URL, 60, 6, 94, 12, ES_AUTOHSCROLL + LTEXT "&Username:", 202, 6, 26, 50, 10 + EDITTEXT ID_EDT_AUTH_USER, 60, 23, 94, 12, ES_AUTOHSCROLL + LTEXT "&Password:", ID_LTEXT_PASSWORD, 6, 42, 50, 10 + EDITTEXT ID_EDT_AUTH_PASS, 60, 40, 94, 12, ES_PASSWORD | ES_AUTOHSCROLL + AUTOCHECKBOX "&Autologin", ID_CHK_AUTOLOGIN, 6, 59, 100, 10 + PUSHBUTTON "&OK", IDOK, 20, 76, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "&Cancel", IDCANCEL, 90, 76, 52, 14 +END + STRINGTABLE LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT BEGIN @@ -262,7 +280,9 @@ BEGIN IDS_TIP_CONNECTED_SINCE "\nПодключен с: " IDS_TIP_ASSIGNED_IP "\nНазначенный IP: %s" IDS_MENU_SERVICE "Служба OpenVPN" - IDS_MENU_IMPORT "Импорт конфигурации…" + IDS_MENU_IMPORT "Импорт" + IDS_MENU_IMPORT_AS "Import from Access Server…" + IDS_MENU_IMPORT_FILE "Импорт файла конфигурации…" IDS_MENU_SETTINGS "Настройки…" IDS_MENU_CLOSE "Выход" IDS_MENU_CONNECT "Подключиться" diff --git a/res/openvpn-gui-res-se.rc b/res/openvpn-gui-res-se.rc index ac18d37..b981029 100644 --- a/res/openvpn-gui-res-se.rc +++ b/res/openvpn-gui-res-se.rc @@ -247,6 +247,24 @@ BEGIN PUSHBUTTON "OK", IDOK, 60, 43, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED END +/* URL Profile Import Dialog */ +ID_DLG_URL_PROFILE_IMPORT DIALOG 6, 18, 160, 95 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER | DS_SETFOREGROUND +CAPTION "Import Profile from Access Server" +FONT 8, "Microsoft Sans Serif" +LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT +BEGIN + LTEXT "U&RL:", 201, 6, 9, 50, 10 + EDITTEXT ID_EDT_URL, 60, 6, 94, 12, ES_AUTOHSCROLL + LTEXT "&Username:", 202, 6, 26, 50, 10 + EDITTEXT ID_EDT_AUTH_USER, 60, 23, 94, 12, ES_AUTOHSCROLL + LTEXT "&Password:", ID_LTEXT_PASSWORD, 6, 42, 50, 10 + EDITTEXT ID_EDT_AUTH_PASS, 60, 40, 94, 12, ES_PASSWORD | ES_AUTOHSCROLL + AUTOCHECKBOX "&Autologin", ID_CHK_AUTOLOGIN, 6, 59, 100, 10 + PUSHBUTTON "&OK", IDOK, 20, 76, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "&Cancel", IDCANCEL, 90, 76, 52, 14 +END + STRINGTABLE LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT BEGIN @@ -259,7 +277,9 @@ BEGIN IDS_TIP_CONNECTED_SINCE "\nAnsluten sedan: " IDS_TIP_ASSIGNED_IP "\nTilldelad IP: %s" IDS_MENU_SERVICE "OpenVPN Service" - IDS_MENU_IMPORT "Import file…" + IDS_MENU_IMPORT "Import" + IDS_MENU_IMPORT_AS "Import from Access Server…" + IDS_MENU_IMPORT_FILE "Import file…" IDS_MENU_SETTINGS "Inställningar…" IDS_MENU_CLOSE "Avsluta" IDS_MENU_CONNECT "Anslut" diff --git a/res/openvpn-gui-res-tr.rc b/res/openvpn-gui-res-tr.rc index 09b10b4..f8a1895 100644 --- a/res/openvpn-gui-res-tr.rc +++ b/res/openvpn-gui-res-tr.rc @@ -249,6 +249,24 @@ BEGIN PUSHBUTTON "Tamam", IDOK, 58, 43, 40, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED END +/* URL Profile Import Dialog */ +ID_DLG_URL_PROFILE_IMPORT DIALOG 6, 18, 160, 95 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER | DS_SETFOREGROUND +CAPTION "Import Profile from Access Server" +FONT 8, "Microsoft Sans Serif" +LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT +BEGIN + LTEXT "U&RL:", 201, 6, 9, 50, 10 + EDITTEXT ID_EDT_URL, 60, 6, 94, 12, ES_AUTOHSCROLL + LTEXT "&Username:", 202, 6, 26, 50, 10 + EDITTEXT ID_EDT_AUTH_USER, 60, 23, 94, 12, ES_AUTOHSCROLL + LTEXT "&Password:", ID_LTEXT_PASSWORD, 6, 42, 50, 10 + EDITTEXT ID_EDT_AUTH_PASS, 60, 40, 94, 12, ES_PASSWORD | ES_AUTOHSCROLL + AUTOCHECKBOX "&Autologin", ID_CHK_AUTOLOGIN, 6, 59, 100, 10 + PUSHBUTTON "&OK", IDOK, 20, 76, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "&Cancel", IDCANCEL, 90, 76, 52, 14 +END + STRINGTABLE LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT BEGIN @@ -261,7 +279,9 @@ BEGIN IDS_TIP_CONNECTED_SINCE "\nBağlanıldı: " IDS_TIP_ASSIGNED_IP "\nBağlanılan IP: %s" IDS_MENU_SERVICE "OpenVPN Servisi" - IDS_MENU_IMPORT "Import file…" + IDS_MENU_IMPORT "Import" + IDS_MENU_IMPORT_AS "Import from Access Server…" + IDS_MENU_IMPORT_FILE "Import file…" IDS_MENU_SETTINGS "Ayarlar…" IDS_MENU_CLOSE "Çıkış" IDS_MENU_CONNECT "Bağlan" diff --git a/res/openvpn-gui-res-ua.rc b/res/openvpn-gui-res-ua.rc index 0aee320..33d26b2 100644 --- a/res/openvpn-gui-res-ua.rc +++ b/res/openvpn-gui-res-ua.rc @@ -249,6 +249,24 @@ BEGIN PUSHBUTTON "OK", IDOK, 78, 43, 40, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED END +/* URL Profile Import Dialog */ +ID_DLG_URL_PROFILE_IMPORT DIALOG 6, 18, 160, 95 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER | DS_SETFOREGROUND +CAPTION "Import Profile from Access Server" +FONT 8, "Microsoft Sans Serif" +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +BEGIN + LTEXT "U&RL:", 201, 6, 9, 50, 10 + EDITTEXT ID_EDT_URL, 60, 6, 94, 12, ES_AUTOHSCROLL + LTEXT "&Username:", 202, 6, 26, 50, 10 + EDITTEXT ID_EDT_AUTH_USER, 60, 23, 94, 12, ES_AUTOHSCROLL + LTEXT "&Password:", ID_LTEXT_PASSWORD, 6, 42, 50, 10 + EDITTEXT ID_EDT_AUTH_PASS, 60, 40, 94, 12, ES_PASSWORD | ES_AUTOHSCROLL + AUTOCHECKBOX "&Autologin", ID_CHK_AUTOLOGIN, 6, 59, 100, 10 + PUSHBUTTON "&OK", IDOK, 20, 76, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "&Cancel", IDCANCEL, 90, 76, 52, 14 +END + STRINGTABLE LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT BEGIN @@ -261,7 +279,9 @@ BEGIN IDS_TIP_CONNECTED_SINCE "\nЗ'єднано з такого часу: " IDS_TIP_ASSIGNED_IP "\n IP: %s" IDS_MENU_SERVICE "Служба OpenVPN" - IDS_MENU_IMPORT "Імпортувати файл…" + IDS_MENU_IMPORT "Import" + IDS_MENU_IMPORT_AS "Import from Access Server…" + IDS_MENU_IMPORT_FILE "Імпортувати файл…" IDS_MENU_SETTINGS "Конфігурація…" IDS_MENU_CLOSE "Вихід" IDS_MENU_CONNECT "З'єднати" @@ -489,13 +509,13 @@ OpenVPN, можливо, не встановлений." /* save/delete password */ IDS_NFO_DELETE_PASS "Підтвердіть видалення збережених паролів для ""%s""" - + /* Token password related */ IDS_NFO_TOKEN_PASSWORD_CAPTION "OpenVPN - Пароль токену" IDS_NFO_TOKEN_PASSWORD_REQUEST "Введіть пароль/PIN-код токену '%S'" IDS_NFO_AUTH_PASS_RETRY "Невірне ім'я користувача або пароль" IDS_NFO_KEY_PASS_RETRY "Невірний пароль" - + IDS_ERR_INVALID_PASSWORD_INPUT "Невірний символ у паролі" IDS_ERR_INVALID_USERNAME_INPUT "Невірний символ в імені користувача" IDS_NFO_AUTO_CONNECT "Автоматичне підключення через %u секунд…" diff --git a/res/openvpn-gui-res-zh-hans.rc b/res/openvpn-gui-res-zh-hans.rc index 9368069..08a5437 100644 --- a/res/openvpn-gui-res-zh-hans.rc +++ b/res/openvpn-gui-res-zh-hans.rc @@ -251,6 +251,24 @@ BEGIN PUSHBUTTON "确定", IDOK, 58, 43, 40, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED END +/* URL Profile Import Dialog */ +ID_DLG_URL_PROFILE_IMPORT DIALOG 6, 18, 160, 95 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER | DS_SETFOREGROUND +CAPTION "Import Profile from Access Server" +FONT 8, "Microsoft Sans Serif" +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED +BEGIN + LTEXT "U&RL:", 201, 6, 9, 50, 10 + EDITTEXT ID_EDT_URL, 60, 6, 94, 12, ES_AUTOHSCROLL + LTEXT "&Username:", 202, 6, 26, 50, 10 + EDITTEXT ID_EDT_AUTH_USER, 60, 23, 94, 12, ES_AUTOHSCROLL + LTEXT "&Password:", ID_LTEXT_PASSWORD, 6, 42, 50, 10 + EDITTEXT ID_EDT_AUTH_PASS, 60, 40, 94, 12, ES_PASSWORD | ES_AUTOHSCROLL + AUTOCHECKBOX "&Autologin", ID_CHK_AUTOLOGIN, 6, 59, 100, 10 + PUSHBUTTON "&OK", IDOK, 20, 76, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "&Cancel", IDCANCEL, 90, 76, 52, 14 +END + STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED BEGIN @@ -263,7 +281,9 @@ BEGIN IDS_TIP_CONNECTED_SINCE "\n连接自: " IDS_TIP_ASSIGNED_IP "\n分配 IP: %s" IDS_MENU_SERVICE "OpenVPN 服务" - IDS_MENU_IMPORT "导入配置文件…" + IDS_MENU_IMPORT "Import" + IDS_MENU_IMPORT_AS "Import from Access Server…" + IDS_MENU_IMPORT_FILE "导入配置文件…" IDS_MENU_SETTINGS "选项…" IDS_MENU_CLOSE "退出" IDS_MENU_CONNECT "连接" diff --git a/res/openvpn-gui-res-zh-hant.rc b/res/openvpn-gui-res-zh-hant.rc index 665965a..19ede00 100644 --- a/res/openvpn-gui-res-zh-hant.rc +++ b/res/openvpn-gui-res-zh-hant.rc @@ -251,6 +251,24 @@ BEGIN PUSHBUTTON "確認", IDOK, 58, 43, 40, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED END +/* URL Profile Import Dialog */ +ID_DLG_URL_PROFILE_IMPORT DIALOG 6, 18, 160, 95 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER | DS_SETFOREGROUND +CAPTION "Import Profile from Access Server" +FONT 8, "Microsoft Sans Serif" +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL +BEGIN + LTEXT "U&RL:", 201, 6, 9, 50, 10 + EDITTEXT ID_EDT_URL, 60, 6, 94, 12, ES_AUTOHSCROLL + LTEXT "&Username:", 202, 6, 26, 50, 10 + EDITTEXT ID_EDT_AUTH_USER, 60, 23, 94, 12, ES_AUTOHSCROLL + LTEXT "&Password:", ID_LTEXT_PASSWORD, 6, 42, 50, 10 + EDITTEXT ID_EDT_AUTH_PASS, 60, 40, 94, 12, ES_PASSWORD | ES_AUTOHSCROLL + AUTOCHECKBOX "&Autologin", ID_CHK_AUTOLOGIN, 6, 59, 100, 10 + PUSHBUTTON "&OK", IDOK, 20, 76, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "&Cancel", IDCANCEL, 90, 76, 52, 14 +END + STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL BEGIN @@ -263,7 +281,9 @@ BEGIN IDS_TIP_CONNECTED_SINCE "\n連線自: " IDS_TIP_ASSIGNED_IP "\n配發 IP: %s" IDS_MENU_SERVICE "OpenVPN 服務" - IDS_MENU_IMPORT "匯入設定檔…" + IDS_MENU_IMPORT "Import" + IDS_MENU_IMPORT_AS "Import from Access Server…" + IDS_MENU_IMPORT_FILE "匯入設定檔…" IDS_MENU_SETTINGS "選項…" IDS_MENU_CLOSE "離開" IDS_MENU_CONNECT "連線" diff --git a/tray.c b/tray.c index 4ee1fec..306a2bd 100644 --- a/tray.c +++ b/tray.c @@ -43,6 +43,7 @@ /* Popup Menus */ HMENU hMenu; HMENU *hMenuConn; +HMENU hMenuImport; int hmenu_size = 0; /* allocated size of hMenuConn array */ HMENU hMenuService; @@ -215,7 +216,11 @@ CreatePopupMenus() AppendMenu(hMenu, MF_SEPARATOR, 0, 0); - AppendMenu(hMenu, MF_STRING, IDM_IMPORT, LoadLocalizedString(IDS_MENU_IMPORT)); + hMenuImport = CreatePopupMenu(); + AppendMenu(hMenu, MF_POPUP, (UINT_PTR) hMenuImport, LoadLocalizedString(IDS_MENU_IMPORT)); + AppendMenu(hMenuImport, MF_STRING, IDM_IMPORT_FILE, LoadLocalizedString(IDS_MENU_IMPORT_FILE)); + AppendMenu(hMenuImport, MF_STRING, IDM_IMPORT_AS, LoadLocalizedString(IDS_MENU_IMPORT_AS)); + AppendMenu(hMenu, MF_STRING ,IDM_SETTINGS, LoadLocalizedString(IDS_MENU_SETTINGS)); AppendMenu(hMenu, MF_STRING ,IDM_CLOSE, LoadLocalizedString(IDS_MENU_CLOSE)); @@ -271,11 +276,14 @@ CreatePopupMenus() AppendMenu(hMenu, MF_SEPARATOR, 0, 0); } - AppendMenu(hMenu, MF_STRING, IDM_IMPORT, LoadLocalizedString(IDS_MENU_IMPORT)); + hMenuImport = CreatePopupMenu(); + AppendMenu(hMenu, MF_POPUP, (UINT_PTR) hMenuImport, LoadLocalizedString(IDS_MENU_IMPORT)); + AppendMenu(hMenuImport, MF_STRING, IDM_IMPORT_FILE, LoadLocalizedString(IDS_MENU_IMPORT_FILE)); + AppendMenu(hMenuImport, MF_STRING, IDM_IMPORT_AS, LoadLocalizedString(IDS_MENU_IMPORT_AS)); + AppendMenu(hMenu, MF_STRING, IDM_SETTINGS, LoadLocalizedString(IDS_MENU_SETTINGS)); AppendMenu(hMenu, MF_STRING, IDM_CLOSE, LoadLocalizedString(IDS_MENU_CLOSE)); - /* Create popup menus for every connection */ for (int i = 0; i < o.num_configs; i++) { if (o.service_only == 0) { @@ -313,9 +321,11 @@ DestroyPopupMenus() DestroyMenu(hMenuConn[i]); DestroyMenu(hMenuService); + DestroyMenu(hMenuImport); DestroyMenu(hMenu); hMenuService = NULL; + hMenuImport = NULL; hMenu = NULL; } diff --git a/tray.h b/tray.h index 5250d5f..e236abf 100644 --- a/tray.h +++ b/tray.h @@ -32,6 +32,8 @@ #define IDM_SETTINGS 221 #define IDM_CLOSE 223 #define IDM_IMPORT 224 +#define IDM_IMPORT_FILE 225 +#define IDM_IMPORT_AS 226 #define IDM_CONNECTMENU 300 #define IDM_DISCONNECTMENU (1 + IDM_CONNECTMENU)