1 files changed, 25 insertions, 6 deletions
diff --git a/new_gpg.rc b/new_gpg.rc
index fadafdc..887c9a6 100755
--- a/new_gpg.rc
+++ b/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
@@ -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
 
@@ -334,7 +353,7 @@ BEGIN
     PUSHBUTTON      "Copy own key",IDC_COPY_KEY,127,193,74,14
 END
 
-IDD_OPT_GPG_BIN DIALOGEX 0, 0, 282, 214
+IDD_OPT_GPG_BIN DIALOGEX 0, 0, 282, 71
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 FONT 8, "MS Shell Dlg", 400, 0, 0x0
 BEGIN
@@ -346,7 +365,7 @@ BEGIN
     LTEXT           "Home directory:",IDC_STATIC,9,34,144,8
 END
 
-IDD_OPT_GPG_MESSAGES DIALOGEX 0, 0, 302, 241
+IDD_OPT_GPG_MESSAGES DIALOGEX 0, 0, 302, 100
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 FONT 8, "MS Shell Dlg", 400, 0, 0x0
 BEGIN
@@ -366,12 +385,12 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,76,233,10
 END
 
-IDD_OPT_GPG_ADVANCED DIALOGEX 0, 0, 286, 214
+IDD_OPT_GPG_ADVANCED DIALOGEX 0, 0, 286, 32
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 FONT 8, "MS Shell Dlg", 400, 0, 0x0
 BEGIN
-    CONTROL         "Turn on presence signing (Jabber)",IDC_PRESCENSE_SUBSCRIPTION,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,9,190,10
+    CONTROL         "Turn on presence signing (Jabber) (required by xep 0-27)",IDC_PRESCENSE_SUBSCRIPTION,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,9,268,10
 END