removed unneeded key warning on first run

2 files changed, 4 insertions, 4 deletions

diff --git a/main.cpp b/main.cpp
index 36a037f..9444dd6 100755
--- a/main.cpp
+++ b/main.cpp
@@ -1823,7 +1823,7 @@ void InitCheck()
 		char *keyid = UniGetContactSettingUtf(NULL, szGPGModuleName, "KeyID", "");
 		char *key = UniGetContactSettingUtf(NULL, szGPGModuleName, "GPGPubKey", "");
 		void ShowFirstRunDialog();
-		if(!keyid[0] || !key[0])
+		if(!DBGetContactSettingByte(NULL, szGPGModuleName, "FirstRun", 1) && (!keyid[0] || !key[0]))
 		{
 			question = Translate("You have not set public key for gpg, it's recommended to do it.\nDo you want to do it now ?");
 			if(MessageBoxA(0, question.c_str(), Translate("Own public key warning"), MB_YESNO) == IDYES)
diff --git a/new_gpg.rc b/new_gpg.rc
index 66dda83..4c04666 100755
--- a/new_gpg.rc
+++ b/new_gpg.rc
@@ -84,15 +84,15 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPT
 CAPTION "Set GPG bin path and keyring home dir."

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

 BEGIN

-    DEFPUSHBUTTON   "خت",ID_OK,7,87,50,14

+    DEFPUSHBUTTON   "Continue",ID_OK,7,87,50,14

     LTEXT           "Home directory:",IDC_STATIC,9,34,325,8

     LTEXT           "GnuPG binary:",IDC_STATIC,10,7,147,8

     PUSHBUTTON      "Browse",IDC_SET_BIN_PATH,293,18,54,14

     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,7,66,118,14

-    CONTROL         "Turn on key autoexchange",IDC_AUTO_EXCHANGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,133,68,191,10

+    PUSHBUTTON      "Generate and use random key",IDC_GENERATE_RANDOM,166,87,118,14

+    CONTROL         "Turn on key autoexchange",IDC_AUTO_EXCHANGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,64,277,10

 END

 

 IDD_NEW_KEY DIALOGEX 0, 0, 427, 68