diff options
| author | Mykhaylo Yehorov <yehorov@gmail.com> | 2016-05-04 12:27:52 +0300 |
|---|---|---|
| committer | Mykhaylo Yehorov <yehorov@gmail.com> | 2016-05-04 12:27:52 +0300 |
| commit | 03ffd7535ac3ecb0b5985ab919ed3f50fa6aa7dd (patch) | |
| tree | e7f8fb32a7c8325deffbdb012fed7b4c7b334949 /src/PenCore | |
| parent | 698babf408789fc74a9ee5fbc693beff7ad01bef (diff) | |
| parent | 1e17c9bcfd7e7b31756aa5389bcbff76c2c9c88a (diff) | |
merge upstream v4.21-9613-beta
Diffstat (limited to 'src/PenCore')
| -rw-r--r-- | src/PenCore/PenCore.rc | 6 | ||||
| -rw-r--r-- | src/PenCore/resource.h | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/PenCore/PenCore.rc b/src/PenCore/PenCore.rc index e0447530..0553addf 100644 --- a/src/PenCore/PenCore.rc +++ b/src/PenCore/PenCore.rc @@ -1810,16 +1810,16 @@ FONT 9, "MS Shell Dlg", 400, 0, 0x80 BEGIN
CONTROL 141,IDC_STATIC,"Static",SS_BITMAP,0,0,275,46
GROUPBOX "@STATIC1",IDC_STATIC,6,53,261,187
- ICON ICO_VPNSERVER,IDC_STATIC,14,67,20,18
+ ICON ICO_VPNSERVER,IDC_STATIC,14,67,20,20
LTEXT "@STATIC2",IDC_STATIC,41,67,218,29
CONTROL "",L_SETTING,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_EDITLABELS | WS_BORDER | WS_TABSTOP,15,96,242,96
PUSHBUTTON "@B_NEW_SETTING",B_NEW_SETTING,15,197,76,14
PUSHBUTTON "@B_EDIT_SETTING",B_EDIT_SETTING,98,197,76,14
PUSHBUTTON "@B_DELETE",B_DELETE,181,197,76,14
PUSHBUTTON "@IDOK",IDOK,181,217,76,17
- ICON ICO_CERT,IDC_STATIC,147,246,20,18
+ ICON ICO_CERT,IDC_STATIC,147,246,20,20
PUSHBUTTON "@B_CERT_TOOL",B_CERT_TOOL,171,248,86,14
- ICON ICO_SECURE,IDC_STATIC,45,266,20,18
+ ICON ICO_SECURE,S_SMARTCARD_ICON,45,266,18,18
PUSHBUTTON "@B_SECURE_MANAGER",B_SECURE_MANAGER,67,269,96,14
PUSHBUTTON "@B_SELECT_SECURE",B_SELECT_SECURE,171,269,86,14
PUSHBUTTON "@B_ABOUT",B_ABOUT,14,288,76,14
diff --git a/src/PenCore/resource.h b/src/PenCore/resource.h index df43db6c..3de66a64 100644 --- a/src/PenCore/resource.h +++ b/src/PenCore/resource.h @@ -1025,6 +1025,7 @@ #define S_VGS3 1514
#define S_TSUKUBA 1515
#define R_DISABLE_NATT 1516
+#define S_SMARTCARD_ICON 1517
#define B_ONLINE 1655
#define D_NM_CONNECT 1998
#define D_NM_MAIN 1999
@@ -1207,7 +1208,7 @@ #define _APS_NO_MFC 1
#define _APS_NEXT_RESOURCE_VALUE 242
#define _APS_NEXT_COMMAND_VALUE 40111
-#define _APS_NEXT_CONTROL_VALUE 1517
+#define _APS_NEXT_CONTROL_VALUE 1518
#define _APS_NEXT_SYMED_VALUE 102
#endif
#endif
|