diff options
| author | dnobori <da.git@softether.co.jp> | 2014-03-20 00:45:05 +0400 |
|---|---|---|
| committer | dnobori <da.git@softether.co.jp> | 2014-03-20 00:45:05 +0400 |
| commit | cf2a6a42bce34bd0c14223cd9e86d2395d3bd01c (patch) | |
| tree | 0f1d237a4b9d7343b390398ce9eecdd54c251c1e /src/PenCore | |
| parent | dcd9b943817c4420bfbe4d973b358f4cc9d737c6 (diff) | |
v4.06-9430-beta
Diffstat (limited to 'src/PenCore')
| -rw-r--r-- | src/PenCore/PenCore.rc | 87 | ||||
| -rw-r--r-- | src/PenCore/resource.h | 11 |
2 files changed, 71 insertions, 27 deletions
diff --git a/src/PenCore/PenCore.rc b/src/PenCore/PenCore.rc index 0f1e4d76..bb799ace 100644 --- a/src/PenCore/PenCore.rc +++ b/src/PenCore/PenCore.rc @@ -13,7 +13,7 @@ #undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// Japanese resources
+// 日本語 resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_JPN)
#ifdef _WIN32
@@ -498,7 +498,7 @@ BEGIN LEFTMARGIN, 7
RIGHTMARGIN, 412
TOPMARGIN, 7
- BOTTOMMARGIN, 300
+ BOTTOMMARGIN, 318
END
D_NM_NAT, DIALOG
@@ -1261,6 +1261,14 @@ BEGIN TOPMARGIN, 7
BOTTOMMARGIN, 284
END
+
+ D_NM_PUSH, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 360
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 286
+ END
END
#endif // APSTUDIO_INVOKED
@@ -1505,8 +1513,9 @@ BEGIN RTEXT "@STATIC4",S_STATIC4,14,101,54,10
EDITTEXT E_HOSTNAME,72,99,126,12,ES_AUTOHSCROLL
RTEXT "@STATIC5",S_STATIC5,14,119,54,10
- COMBOBOX C_PORT,72,115,81,48,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
- LTEXT "@STATIC6",S_STATIC66,159,119,46,11
+ COMBOBOX C_PORT,72,115,77,48,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+ CONTROL "@R_DISABLE_NATT",R_DISABLE_NATT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,152,117,57,10
+ LTEXT "@STATIC6",S_STATIC66,172,159,46,11,NOT WS_VISIBLE
RTEXT "@STATIC7",S_STATIC7,14,137,54,10
COMBOBOX C_HUBNAME,72,133,126,72,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
GROUPBOX "@STATIC8",IDC_STATIC,7,161,206,108
@@ -1724,7 +1733,8 @@ FONT 9, "MS UI Gothic", 400, 0, 0x80 BEGIN
DEFPUSHBUTTON "@IDCANCEL",IDCANCEL,250,339,76,18
CONTROL 224,S_LOGO,"Static",SS_BITMAP,7,6,319,76
- LTEXT "@S_INFO1",S_INFO1,7,83,319,17
+ LTEXT "@S_INFO1",S_INFO1,7,83,240,17
+ PUSHBUTTON "@B_AUTHORS",B_AUTHORS,251,83,75,18
LTEXT "@S_INFO2",S_INFO2,7,101,319,39
LTEXT "@S_INFO4",S_INFO4,7,143,319,61
CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,211,319,1
@@ -2742,15 +2752,15 @@ BEGIN PUSHBUTTON "@IDCANCEL",IDCANCEL,279,356,65,17
END
-D_NM_OPTION DIALOGEX 0, 0, 419, 307
+D_NM_OPTION DIALOGEX 0, 0, 419, 325
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "@D_NM_OPTION"
FONT 9, "MS UI Gothic", 400, 0, 0x80
BEGIN
- ICON ICO_ROUTER,IDC_STATIC,7,7,20,20
+ ICON ICO_ROUTER,IDC_STATIC,7,7,18,21
LTEXT "@S_TITLE",S_TITLE,29,11,357,19
GROUPBOX "@STATIC1",IDC_STATIC,7,40,199,83
- ICON ICO_NIC_ONLINE,IDC_STATIC,14,55,20,20
+ ICON ICO_NIC_ONLINE,IDC_STATIC,14,55,18,21
RTEXT "@STATIC2",IDC_STATIC,39,60,59,12
EDITTEXT E_MAC,102,59,81,12,ES_AUTOHSCROLL
RTEXT "@STATIC3",IDC_STATIC,39,81,59,11
@@ -2768,7 +2778,11 @@ BEGIN RTEXT "@STATIC10",IDC_STATIC,10,198,88,11
EDITTEXT E_UDP,102,196,39,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
LTEXT "@STATIC11",IDC_STATIC,145,198,51,10
- CONTROL "@R_SAVE_LOG",R_SAVE_LOG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,255,190,10
+ GROUPBOX "@S_1",S_1,7,227,199,72
+ ICON ICO_PROTOCOL,IDC_STATIC,14,239,18,21
+ LTEXT "@S_2",S_2,40,243,159,20
+ PUSHBUTTON "@B_PUSH",B_PUSH,55,269,143,19
+ CONTROL "@R_SAVE_LOG",R_SAVE_LOG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,308,190,10
GROUPBOX "@STATIC12",IDC_STATIC,211,40,201,228
CONTROL "@R_USE_DHCP",R_USE_DHCP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,218,56,161,10
RTEXT "@STATIC13",IDC_STATIC,218,74,84,11
@@ -2791,8 +2805,8 @@ BEGIN CONTROL "",E_DNS2,"SysIPAddress32",WS_TABSTOP,306,226,75,13
RTEXT "@STATIC22",IDC_STATIC,218,249,84,12
EDITTEXT E_DOMAIN,306,247,98,12,ES_AUTOHSCROLL
- DEFPUSHBUTTON "@IDOK",IDOK,274,281,64,19
- PUSHBUTTON "@IDCANCEL",IDCANCEL,348,281,64,19
+ DEFPUSHBUTTON "@IDOK",IDOK,274,299,64,19
+ PUSHBUTTON "@IDCANCEL",IDCANCEL,348,299,64,19
END
D_NM_NAT DIALOGEX 0, 0, 451, 337
@@ -4072,20 +4086,23 @@ BEGIN LTEXT "@S_22",IDC_STATIC,7,89,401,34
LTEXT "@S_3",IDC_STATIC,7,125,401,25
GROUPBOX "@S_4",IDC_STATIC,7,153,194,123
- LTEXT "@S_STATUS3",S_STATUS3,14,170,182,11
- EDITTEXT E_HOST,17,184,155,15,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
- PUSHBUTTON "@B_HINT",B_HINT,174,181,24,17
- LTEXT "@S_STATUS4",S_STATUS4,14,205,171,11
- EDITTEXT E_IPV4,17,217,172,15,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
- LTEXT "@S_STATUS5",S_STATUS5,14,239,171,10
- EDITTEXT E_IPV6,17,251,172,15,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+ LTEXT "@S_STATUS3",S_STATUS3,14,165,182,11
+ EDITTEXT E_HOST,17,178,155,15,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+ PUSHBUTTON "@B_HINT",B_HINT,174,176,24,17
+ LTEXT "@S_STATUS4",S_STATUS4,14,197,171,11
+ EDITTEXT E_IPV4,17,209,172,15,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+ LTEXT "@S_STATUS5",S_STATUS5,14,228,171,10
+ EDITTEXT E_IPV6,17,240,172,15,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+ LTEXT "@S_STATUS8",S_STATUS8,14,258,31,11
+ EDITTEXT E_KEY,41,258,131,15,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+ PUSHBUTTON "@B_HINT2",B_HINT2,174,255,24,17
GROUPBOX "@S_5",IDC_STATIC,206,153,202,123
LTEXT "@S_STATUS6",S_STATUS6,212,170,189,11
EDITTEXT E_NEWHOST,215,184,86,15,ES_AUTOHSCROLL
LTEXT "",S_SUFFIX,303,186,98,12
LTEXT "@S_STATUS7",S_STATUS7,219,201,182,34
- DEFPUSHBUTTON "@IDOK",IDOK,218,237,119,18
- PUSHBUTTON "@B_RESTORE",B_RESTORE,341,237,60,18
+ DEFPUSHBUTTON "@IDOK",IDOK,218,240,119,18
+ PUSHBUTTON "@B_RESTORE",B_RESTORE,341,240,60,18
ICON ICO_INFORMATION,IDC_STATIC,7,282,20,20
LTEXT "@S_2",S_2,30,281,378,25
PUSHBUTTON "@B_DISABLE",B_DISABLE,7,310,145,18
@@ -4234,8 +4251,8 @@ CAPTION "@D_SW_EULA" FONT 9, "MS UI Gothic", 400, 0, 0x80
BEGIN
LTEXT "@S_1",IDC_STATIC,7,2,309,12,WS_TABSTOP
- EDITTEXT E_TEXT,7,19,309,139,ES_MULTILINE | ES_READONLY | WS_VSCROLL
- CONTROL "@B_AGREE",B_AGREE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,168,297,12
+ EDITTEXT E_TEXT,7,19,309,126,ES_MULTILINE | ES_READONLY | WS_VSCROLL
+ CONTROL "@B_AGREE",B_AGREE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,150,297,12
END
D_SW_WARNING DIALOGEX 0, 0, 323, 181
@@ -4244,7 +4261,7 @@ CAPTION "@D_SW_WARNING" FONT 9, "MS UI Gothic", 400, 0, 0x80
BEGIN
LTEXT "@S_1",IDC_STATIC,22,2,294,19,WS_TABSTOP
- EDITTEXT E_TEXT,7,27,309,141,ES_MULTILINE | ES_READONLY | WS_VSCROLL
+ EDITTEXT E_TEXT,7,27,309,135,ES_MULTILINE | ES_READONLY | WS_VSCROLL
ICON ICO_INFORMATION,IDC_STATIC,0,0,20,20
END
@@ -4594,6 +4611,24 @@ BEGIN ICON ICO_RESEARCH,IDC_STATIC,7,185,20,20
END
+D_NM_PUSH DIALOGEX 0, 0, 367, 293
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "@D_NM_PUSH"
+FONT 9, "MS UI Gothic", 400, 0, 0x80
+BEGIN
+ ICON ICO_PROTOCOL,IDC_STATIC,7,7,18,21
+ LTEXT "@S1",S1,35,11,325,28,WS_TABSTOP
+ LTEXT "@S2",S2,35,39,325,34
+ LTEXT "@S3",S3,35,75,325,34
+ LTEXT "@S4",S4,35,111,325,34
+ GROUPBOX "@S5",S5,23,145,337,111
+ EDITTEXT E_TEXT,35,203,315,42,ES_MULTILINE | WS_VSCROLL
+ LTEXT "@S6",IDC_STATIC,35,159,315,42
+ DEFPUSHBUTTON "@IDOK",IDOK,222,267,64,19
+ PUSHBUTTON "@IDCANCEL",IDCANCEL,296,267,64,19
+ LTEXT "@S7",IDC_STATIC,35,272,185,13
+END
+
/////////////////////////////////////////////////////////////////////////////
//
@@ -4807,12 +4842,12 @@ END //
BIN_WINPCAP BIN "Dummy.bin"
-#endif // Japanese resources
+#endif // 日本語 resources
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// English resources
+// 英語 (米国) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
@@ -4873,7 +4908,7 @@ BMP_ZURUKKO BITMAP "Zurukko.bmp" BMP_VPNGATEEN BITMAP "VPNGateEN.bmp"
BMP_VPNGATEJA BITMAP "VPNGateJA.bmp"
BMP_UNIVTSUKUBA BITMAP "UnivTsukuba.bmp"
-#endif // English resources
+#endif // 英語 (米国) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/src/PenCore/resource.h b/src/PenCore/resource.h index 040eff0d..df43db6c 100644 --- a/src/PenCore/resource.h +++ b/src/PenCore/resource.h @@ -13,6 +13,7 @@ #define B_SIMULATION 3
#define B_RESTORE 3
#define B_MESSAGE 3
+#define B_PUSH 3
#define B_HUB_STATUS 4
#define IDCANCEL2 4
#define B_SECURE_MANAGER 4
@@ -34,6 +35,7 @@ #define B_LEGAL3 8
#define B_LANGUAGE 8
#define B_STOP 9
+#define B_AUTHORS 9
#define B_EDIT 10
#define S_STATUSBAR 101
#define ICO_TEST 103
@@ -245,6 +247,7 @@ #define S_SUFFIX 1020
#define E_PASSPHRASE 1021
#define S_STATUS7 1021
+#define S_STATUS8 1022
#define E_USERNAME 1023
#define C_TYPE 1024
#define E_HUBNAME 1024
@@ -363,6 +366,7 @@ #define B_IMPORT2 1089
#define B_REGENERATE 1089
#define B_FACTORY 1089
+#define R_RETRY2 1089
#define R_REMOTE_ONLY 1090
#define IDC_STATIC4 1090
#define B_DELETE 1091
@@ -966,10 +970,12 @@ #define E_IPV4 1467
#define E_NEWHOST 1468
#define B_NSLOOKUP 1469
+#define E_KEY 1469
#define B_HINT 1470
#define S_DDNS 1470
#define R_OVER_ICMP 1471
#define S_AZURE 1471
+#define B_HINT2 1471
#define R_OVER_ICMP2 1472
#define R_OVER_DNS 1472
#define B_WIZ_NEXT 1472
@@ -1018,6 +1024,7 @@ #define B_VGS 1513
#define S_VGS3 1514
#define S_TSUKUBA 1515
+#define R_DISABLE_NATT 1516
#define B_ONLINE 1655
#define D_NM_CONNECT 1998
#define D_NM_MAIN 1999
@@ -1126,6 +1133,8 @@ #define D_VGS_CONFIG 2094
#define D_VGS_OPTION 2095
#define D_VGS_WARNING 2096
+#define D_DEFAULT3 2097
+#define D_NM_PUSH 2097
#define ID_Menu40011 40011
#define CMD_CONNECT 40020
#define CMD_STATUS 40021
@@ -1198,7 +1207,7 @@ #define _APS_NO_MFC 1
#define _APS_NEXT_RESOURCE_VALUE 242
#define _APS_NEXT_COMMAND_VALUE 40111
-#define _APS_NEXT_CONTROL_VALUE 1516
+#define _APS_NEXT_CONTROL_VALUE 1517
#define _APS_NEXT_SYMED_VALUE 102
#endif
#endif
|