[Winpt-commits] r346 - trunk/Src

[scm-commit@wald.intevation.org]

Author: twoaday
Date: 2011-11-30 22:50:43 +0100 (Wed, 30 Nov 2011)
New Revision: 346

Modified:
   trunk/Src/ChangeLog
   trunk/Src/wptKeyEditDlgs.cpp
Log:
2011-11-30  Timo Schulz  <twoaday at gmx.net>

       * wptKeyEditDlgs.cpp (keyedit_addsubkey_dlg_proc): Adjusted
       positions for GPG menu entries.
	      


Modified: trunk/Src/ChangeLog
===================================================================
--- trunk/Src/ChangeLog	2011-11-27 15:14:26 UTC (rev 345)
+++ trunk/Src/ChangeLog	2011-11-30 21:50:43 UTC (rev 346)
@@ -1,3 +1,8 @@
+2011-11-30  Timo Schulz  <twoaday at gmx.net>
+
+       * wptKeyEditDlgs.cpp (keyedit_addsubkey_dlg_proc): Adjusted
+       positions for GPG menu entries.
+       
 2011-11-25  Timo Schulz  <twoaday at gmx.net>
 
         * WinPT.cpp (check_os_version): New. Separated

Modified: trunk/Src/wptKeyEditDlgs.cpp
===================================================================
--- trunk/Src/wptKeyEditDlgs.cpp	2011-11-27 15:14:26 UTC (rev 345)
+++ trunk/Src/wptKeyEditDlgs.cpp	2011-11-30 21:50:43 UTC (rev 346)
@@ -633,9 +633,9 @@
 };
 subkey_menu_t SUBKEY_MENU[] = {
     {0, _("DSA (sign only)"),        3, GPGME_PK_DSA},
-    {1, _("ElGamal (encrypt only)"), 4, GPGME_PK_ELG_E},
-    {2, _("RSA (sign only)"),        5, GPGME_PK_RSA_E},
-    {3, _("RSA (encrypt only)"),     6, GPGME_PK_RSA_S}
+    {1, _("RSA (sign only)"),        4, GPGME_PK_RSA_S},
+    {2, _("ElGamal (encrypt only)"), 5, GPGME_PK_ELG_E},    
+    {3, _("RSA (encrypt only)"),     6, GPGME_PK_RSA_E}
 };
 #define N_SUBKEY_MENU 4
     
@@ -669,7 +669,7 @@
 	}
 	CheckDlgButton (dlg, IDC_ADDSUBKEY_EXPIRE, BST_CHECKED);
 	EnableWindow (GetDlgItem (dlg, IDC_ADDSUBKEY_EXPDATE), FALSE);
-        EnableWindow (GetDlgItem (dlg, IDC_ADDSUBKEY_SIZE), FALSE);
+        EnableWindow (GetDlgItem (dlg, IDC_ADDSUBKEY_SIZE), TRUE);
 	init_keysize_box (dlg, IDC_ADDSUBKEY_SIZE);
         SetForegroundWindow (dlg);
 	center_window (dlg, ctx->parent);
@@ -682,10 +682,8 @@
     case WM_COMMAND:
 	if (HIWORD (wparam) == BN_CLICKED && 
 	    LOWORD (wparam) == IDC_ADDSUBKEY_EXPIRE) {
-	    if (IsDlgButtonChecked (dlg, IDC_ADDSUBKEY_EXPIRE))
-		EnableWindow (GetDlgItem (dlg, IDC_ADDSUBKEY_EXPDATE), FALSE);
-	    else
-		EnableWindow (GetDlgItem (dlg, IDC_ADDSUBKEY_EXPDATE), TRUE);
+	    int on = IsDlgButtonChecked (dlg, IDC_ADDSUBKEY_EXPIRE);	    
+	    EnableWindow (GetDlgItem (dlg, IDC_ADDSUBKEY_EXPDATE), on? TRUE : FALSE);
 	}
 
         switch (LOWORD (wparam)) {