modified: main.cpp

	modified:   new_gpg.rc
	modified:   options.cpp
	modified:   resource.h

4 files changed, 14 insertions, 7 deletions

diff --git a/main.cpp b/main.cpp
index c2b8ad5..9f70ea8 100644
--- a/main.cpp
+++ b/main.cpp
@@ -308,10 +308,15 @@ static BOOL CALLBACK DlgProcNewKeyDialog(HWND hwndDlg, UINT msg, WPARAM wParam,
     {

 		TranslateDialogDefault(hwndDlg);

 		TCHAR *tmp = UniGetContactSettingUtf(new_key_hcnt, szGPGModuleName, "GPGPubKey", _T(""));

-		SetDlgItemText(hwndDlg, IDC_MESSAGE, (_tcslen(tmp) > 0)?_T("There is existing key for contact, do you want to replace with new key ?"):_T("New public key was received, do you want to import it?"));

+		SetDlgItemText(hwndDlg, IDC_MESSAGE, (_tcslen(tmp) > 0)?_T("There is existing key for contact, would you like to replace with new key ?"):_T("New public key was received, do you want to import it?"));

 		EnableWindow(GetDlgItem(hwndDlg, IDC_IMPORT_AND_USE), DBGetContactSettingByte(new_key_hcnt, szGPGModuleName, "GPGEncryption", 0)?0:1);

 		SetDlgItemText(hwndDlg, ID_IMPORT, (_tcslen(tmp) > 0)?_T("Replace"):_T("Accept"));

 		mir_free(tmp);

+		tmp = new TCHAR [256];

+		_tcscpy(tmp, _T("Received key from "));

+		_tcscat(tmp, (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)new_key_hcnt, (LPARAM)GCDNF_TCHAR));

+		SetDlgItemText(hwndDlg, IDC_KEY_FROM, tmp);

+		delete [] tmp;

       return TRUE;

     }

     

diff --git a/new_gpg.rc b/new_gpg.rc
index 84a2853..0026636 100644
--- a/new_gpg.rc
+++ b/new_gpg.rc
@@ -94,13 +94,14 @@ END
 

 IDD_NEW_KEY DIALOGEX 0, 0, 427, 68

 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU

-CAPTION "New public key recieved"

+CAPTION "The new public key was recieved"

 FONT 8, "MS Shell Dlg", 400, 0, 0x1

 BEGIN

     DEFPUSHBUTTON   "Import key",ID_IMPORT,9,47,46,14

-    PUSHBUTTON      "Import key end turn on encryption",IDC_IMPORT_AND_USE,156,47,119,14

-    PUSHBUTTON      "Ignore key",IDC_IGNORE_KEY,368,47,52,14

-    CTEXT           "Статический",IDC_MESSAGE,19,25,392,8

+    PUSHBUTTON      "Accept and enable encryption",IDC_IMPORT_AND_USE,156,47,119,14

+    PUSHBUTTON      "Ignore",IDC_IGNORE_KEY,368,47,52,14

+    CTEXT           "Статический",IDC_MESSAGE,18,25,392,8

+    CTEXT           "Статический",IDC_KEY_FROM,16,12,395,8

 END

 

 IDD_KEY_GEN DIALOGEX 0, 0, 209, 166

diff --git a/options.cpp b/options.cpp
index e1c9c9c..99d23f6 100644
--- a/options.cpp
+++ b/options.cpp
@@ -170,7 +170,7 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 			i++;
 		}
 		tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szLogFilePath", _T(""));
-		SetDlgItemText(hwndDlg, IDC_LOG_FILE_EDIT, tmp);
+		SetDlgItemText(hwndDlg, IDC_LOG_FILE_EDIT, (_tcslen(tmp) > 1)?tmp:_T("c:\\GPGdebug.log"));
 		mir_free(tmp);
 		CheckStateLoadDB(hwndDlg, IDC_DEBUG_LOG, "bDebugLog", 0);
 		CheckStateLoadDB(hwndDlg, IDC_JABBER_API, "bJabberAPI", 1);
diff --git a/resource.h b/resource.h
index 776505f..4d3734d 100644
--- a/resource.h
+++ b/resource.h
@@ -57,6 +57,7 @@
 #define IDC_DEBUG_LOG                   1048

 #define IDC_JABBER_API                  1049

 #define IDC_ENABLE_ENCRYPTION           1050

+#define IDC_KEY_FROM                    1051

 

 // Next default values for new objects

 // 

@@ -64,7 +65,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS

 #define _APS_NEXT_RESOURCE_VALUE        112

 #define _APS_NEXT_COMMAND_VALUE         40001

-#define _APS_NEXT_CONTROL_VALUE         1051

+#define _APS_NEXT_CONTROL_VALUE         1052

 #define _APS_NEXT_SYMED_VALUE           101

 #endif

 #endif