diff options
| author | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2013-01-12 09:38:47 +0200 |
|---|---|---|
| committer | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2013-01-12 09:38:47 +0200 |
| commit | 8ce00d8111b239b57e3ecd5e8cde8c70593027d4 (patch) | |
| tree | 7ffc6a830cfc2ed809bf427f258832a067d6ca45 | |
| parent | 913374a19774643fb97455d0a294a26a93019557 (diff) | |
merged with miranda_Ng main repo
| -rwxr-xr-x | res/new_gpg.rc | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/res/new_gpg.rc b/res/new_gpg.rc index b88a5d2..b6955f5 100755 --- a/res/new_gpg.rc +++ b/res/new_gpg.rc @@ -76,7 +76,7 @@ BEGIN RTEXT "Key password:",IDC_STATIC,12,170,76,8
PUSHBUTTON "Load other",IDC_OTHER,83,152,64,14
PUSHBUTTON "Delete key",IDC_DELETE_KEY,149,152,70,14
- PUSHBUTTON "Generate and use random key",IDC_GENERATE_RANDOM,99,184,118,14
+ PUSHBUTTON "Generate and use random key",IDC_GENERATE_RANDOM,40,184,141,14
LTEXT "",IDC_GENERATING_KEY,82,207,174,8
LTEXT "Account:",IDC_STATIC,15,12,42,8
LTEXT "key id: ",IDC_KEY_ID,178,12,99,8
@@ -95,7 +95,7 @@ BEGIN PUSHBUTTON "Browse",IDC_SET_HOME_DIR,293,44,54,14
EDITTEXT IDC_HOME_DIR,7,44,277,14,ES_AUTOHSCROLL
EDITTEXT IDC_BIN_PATH,7,17,277,14,ES_AUTOHSCROLL
- PUSHBUTTON "Generate and use random key",IDC_GENERATE_RANDOM,166,87,118,14
+ PUSHBUTTON "Generate and use random key",IDC_GENERATE_RANDOM,132,87,152,14
CONTROL "Turn on key autoexchange",IDC_AUTO_EXCHANGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,64,277,10
END
@@ -172,6 +172,17 @@ BEGIN COMBOBOX IDC_KEYSERVER,15,34,125,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
END
+IDD_ENCRYPTED_FILE_MSG_BOX DIALOGEX 0, 0, 229, 63
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Recieved encrypted file"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+ PUSHBUTTON "Ignore",IDC_IGNORE,7,42,50,14
+ PUSHBUTTON "Decrypt",IDC_DECRYPT,97,42,50,14
+ LTEXT "Recieved encrypted file form contact whith disabled encryption.",IDC_STATIC,7,7,215,14
+ CONTROL "Remember choice",IDC_REMEMBER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,22,157,10
+END
+
/////////////////////////////////////////////////////////////////////////////
//
@@ -247,6 +258,14 @@ BEGIN TOPMARGIN, 7
BOTTOMMARGIN, 74
END
+
+ IDD_ENCRYPTED_FILE_MSG_BOX, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 222
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 56
+ END
END
#endif // APSTUDIO_INVOKED
|