fixed #48 (key generation tab order)

implemented #49 (key generation notification)

4 files changed, 32 insertions, 8 deletions

diff --git a/main.cpp b/main.cpp
index 23d486b..dce18cd 100755
--- a/main.cpp
+++ b/main.cpp
@@ -426,6 +426,12 @@ static BOOL CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM
 				  params.out = &out;
 				  params.code = &code;
 				  params.result = &result;
+				  SetWindowTextA(GetDlgItem(hwndDlg, IDC_GENERATING_KEY), Translate("Generating new random key, please wait"));
+				  EnableWindow(GetDlgItem(hwndDlg, IDC_GENERATE_KEY), 0);
+				  EnableWindow(GetDlgItem(hwndDlg, IDC_OTHER), 0);
+				  EnableWindow(GetDlgItem(hwndDlg, IDC_DELETE_KEY), 0);
+				  EnableWindow(GetDlgItem(hwndDlg, IDC_KEY_LIST), 0);
+				  EnableWindow(GetDlgItem(hwndDlg, IDC_GENERATE_RANDOM), 0);
 				  boost::thread gpg_thread(boost::bind(&pxEexcute_thread, &params));
 				  if(!gpg_thread.timed_join(boost::posix_time::minutes(10)))
 				  {
@@ -1248,6 +1254,16 @@ static BOOL CALLBACK DlgProcKeyGenDialog(HWND hwndDlg, UINT msg, WPARAM wParam,
 				  params.out = &out;
 				  params.code = &code;
 				  params.result = &result;
+				  SetWindowTextA(GetDlgItem(hwndDlg, IDC_GENERATING_TEXT), Translate("Generating new key, please wait..."));
+				  EnableWindow(GetDlgItem(hwndDlg, IDCANCEL), 0);
+				  EnableWindow(GetDlgItem(hwndDlg, IDOK), 0);
+				  EnableWindow(GetDlgItem(hwndDlg, IDC_KEY_TYPE), 0);
+				  EnableWindow(GetDlgItem(hwndDlg, IDC_KEY_LENGTH), 0);
+				  EnableWindow(GetDlgItem(hwndDlg, IDC_KEY_PASSWD), 0);
+				  EnableWindow(GetDlgItem(hwndDlg, IDC_KEY_REAL_NAME), 0);
+				  EnableWindow(GetDlgItem(hwndDlg, IDC_KEY_EMAIL), 0);
+				  EnableWindow(GetDlgItem(hwndDlg, IDC_KEY_COMMENT), 0);
+				  EnableWindow(GetDlgItem(hwndDlg, IDC_KEY_EXPIRE_DATE), 0);
 				  boost::thread gpg_thread(boost::bind(&pxEexcute_thread, &params));
 				  if(!gpg_thread.timed_join(boost::posix_time::minutes(10)))
 				  {
diff --git a/new_gpg.rc b/new_gpg.rc
index 04cc77e..2804693 100755
--- a/new_gpg.rc
+++ b/new_gpg.rc
@@ -77,6 +77,7 @@ BEGIN
     PUSHBUTTON      "Load other",IDC_OTHER,83,131,64,14

     PUSHBUTTON      "Delete key",IDC_DELETE_KEY,149,131,70,14

     PUSHBUTTON      "Generate and use random key",IDC_GENERATE_RANDOM,99,163,118,14

+    LTEXT           "",IDC_GENERATING_KEY,82,186,174,8

 END

 

 IDD_BIN_PATH DIALOGEX 0, 0, 354, 108

@@ -115,22 +116,22 @@ BEGIN
     DEFPUSHBUTTON   "OK",IDOK,7,148,50,14

     PUSHBUTTON      "Cancel",IDCANCEL,227,148,50,14

     COMBOBOX        IDC_KEY_TYPE,120,14,48,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP

+    EDITTEXT        IDC_KEY_LENGTH,120,30,40,14,ES_AUTOHSCROLL | ES_NUMBER | WS_GROUP

+    EDITTEXT        IDC_KEY_PASSWD,120,46,55,14,ES_AUTOHSCROLL | WS_GROUP

+    EDITTEXT        IDC_KEY_REAL_NAME,120,61,55,14,ES_AUTOHSCROLL | WS_GROUP

+    EDITTEXT        IDC_KEY_EMAIL,120,76,55,14,ES_AUTOHSCROLL | WS_GROUP

+    EDITTEXT        IDC_KEY_COMMENT,120,91,55,14,ES_AUTOHSCROLL | WS_GROUP

+    EDITTEXT        IDC_KEY_EXPIRE_DATE,120,106,55,14,ES_AUTOHSCROLL | WS_GROUP

     LTEXT           "Key type:",IDC_STATIC,8,16,96,8

     LTEXT           "Key length:",IDC_STATIC,7,32,106,8

     LTEXT           "Key password:",IDC_STATIC,7,49,105,8

-    EDITTEXT        IDC_KEY_PASSWD,120,46,55,14,ES_AUTOHSCROLL | WS_GROUP

     LTEXT           "Real name:",IDC_STATIC,7,63,105,8

     LTEXT           "Email:",IDC_STATIC,7,79,108,8

     LTEXT           "Comment:",IDC_STATIC,7,92,107,8

     LTEXT           "Expire date:",IDC_STATIC,7,109,111,8

-    EDITTEXT        IDC_KEY_EMAIL,120,76,55,14,ES_AUTOHSCROLL | WS_GROUP

-    EDITTEXT        IDC_KEY_REAL_NAME,120,61,55,14,ES_AUTOHSCROLL | WS_GROUP

-    EDITTEXT        IDC_KEY_COMMENT,120,91,55,14,ES_AUTOHSCROLL | WS_GROUP

-    EDITTEXT        IDC_KEY_EXPIRE_DATE,120,106,55,14,ES_AUTOHSCROLL | WS_GROUP

     LTEXT           "ex.: 2010-08-15",IDC_STATIC,182,108,75,8

-    EDITTEXT        IDC_KEY_LENGTH,120,30,40,14,ES_AUTOHSCROLL | ES_NUMBER | WS_GROUP

     LTEXT           "From 1024 to 4096",IDC_STATIC,168,33,89,8

-    LTEXT           "It can take a long time, be patient",IDC_STATIC,15,132,246,8

+    LTEXT           "It can take a long time, be patient",IDC_GENERATING_TEXT,15,132,246,8

     LTEXT           "0 - does not expire",IDC_STATIC,122,122,141,8

 END

 

diff --git a/new_gpg.vcxproj b/new_gpg.vcxproj
index 9c5d49b..e98a996 100755
--- a/new_gpg.vcxproj
+++ b/new_gpg.vcxproj
@@ -1344,4 +1344,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

   </ImportGroup>

+  <ProjectExtensions>

+    <VisualStudio>

+      <UserProperties RESOURCE_FILE="new_gpg.rc" />

+    </VisualStudio>

+  </ProjectExtensions>

 </Project>
\ No newline at end of file
diff --git a/resource.h b/resource.h
index 77189f8..d531f12 100755
--- a/resource.h
+++ b/resource.h
@@ -78,6 +78,8 @@
 #define IDC_STRIP_TAGS                  1067

 #define IDC_CHECK1                      1068

 #define IDC_PRESCENSE_SUBSCRIPTION      1068

+#define IDC_GENERATING_KEY              1069

+#define IDC_GENERATING_TEXT             1070

 

 // Next default values for new objects

 // 

@@ -85,7 +87,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS

 #define _APS_NEXT_RESOURCE_VALUE        114

 #define _APS_NEXT_COMMAND_VALUE         40001

-#define _APS_NEXT_CONTROL_VALUE         1069

+#define _APS_NEXT_CONTROL_VALUE         1071

 #define _APS_NEXT_SYMED_VALUE           101

 #endif

 #endif