/[winpt]/trunk/Src/wptKeyManagerDlg.cpp

Diff of /trunk/Src/wptKeyManagerDlg.cpp

Parent Directory | Revision Log | View Patch Patch

-revision 77 by twoaday,
Mon Nov 14 15:01:01 2005 UTC
+revision 130 by twoaday,
Fri Dec 30 14:06:39 2005 UTC
 Line 18
   * along with WinPT; if not, write to the Free Software Foundation,
   * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
   */
  #ifdef HAVE_CONFIG_H
  #include <config.h>
  #endif
-Line 42
+Line 41
  #include "wptKeyserver.h"
  #include "wptKeyEdit.h"
  #include "wptRegistry.h"
+ #include "wptUTF8.h"
- #define KM_SEPARATOR_ID                10000
+ /* Name and ID of the separator window. */
- #define WINDOWCLASS_SEPARATOR_CHILD "WINPT_SEP_CHILD"
+ #define KM_SEPARATOR_ID                 10000
- //#define KM_SEPARATOR_HEIGHT            5
+ #define WINDOWCLASS_SEPARATOR_CHILD     "WINPT_SEP_CHILD"
+ /* Virtual key codes. */
+ #ifndef VK_F
+ #define VK_F 70
+ #endif
+ #ifndef VK_A
+ #define VK_A 65
+ #endif
+ #ifndef VK_C
+ #define VK_C 67
+ #endif
+ #ifndef VK_P
+ #define VK_P 80
+ #endif
  static subclass_s keylist_proc;
- static int km_index = -1;
  HIMAGELIST glob_imagelist;
- struct km_info {
+ struct km_info_s {
      /* Window positions */
      int pos_x, pos_y;
      int ypos_sep;
-Line 64 
 struct km_info {
+Line 76 
 struct km_info {
      HWND statbar;
      listview_ctrl_t lv;
+     int             lv_idx;
      int keylist_sortby;
  };
+ /* Toolbar button structure. */
  struct mybuttons {
      long icon;
      long command;
-Line 82 
 struct mybuttons myb[] = {
+Line 96 
 struct mybuttons myb[] = {
  };
- #ifndef VK_F
+ /* Subclass the keylist listview control to allow extended commands. */
- #define VK_F 70
- #endif
- #ifndef VK_A
- #define VK_A 65
- #endif
- #ifndef VK_C
- #define VK_C 67
- #endif
- #ifndef VK_P
- #define VK_P 80
- #endif
  static BOOL CALLBACK
  keylist_subclass_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
  {
-Line 109 
 keylist_subclass_proc (HWND dlg, UINT ms
+Line 111 
 keylist_subclass_proc (HWND dlg, UINT ms
          int virt_key = (int)wparam;
          switch (virt_key) {
          case VK_SPACE:
-             send_cmd_id( keylist_proc.dlg, ID_KEYMISC_PROPS );
+             send_cmd_id (keylist_proc.dlg, ID_KEYMISC_PROPS);
              break;
          case VK_DELETE:
-             send_cmd_id( keylist_proc.dlg, ID_KEYMISC_DELETE );
+             send_cmd_id (keylist_proc.dlg, ID_KEYMISC_DELETE);
              break;
          case VK_INSERT:
-Line 130 
 keylist_subclass_proc (HWND dlg, UINT ms
+Line 132 
 keylist_subclass_proc (HWND dlg, UINT ms
          case VK_C:
              if (GetAsyncKeyState (VK_CONTROL)) {
                  lv.ctrl = GetDlgItem (keylist_proc.dlg, IDC_KEYMISC_KEYLIST);
-                 km_index = listview_get_curr_pos (&lv);
                  km_clip_export (keylist_proc.dlg, &lv);
              }
              break;
          case VK_P:
-             if (GetAsyncKeyState (VK_CONTROL)) {
+             if (GetAsyncKeyState (VK_CONTROL))
-                 km_index = -1;
                  km_clip_import (keylist_proc.dlg);
-             }
              break;
          case VK_F:
-Line 152 
 keylist_subclass_proc (HWND dlg, UINT ms
+Line 151 
 keylist_subclass_proc (HWND dlg, UINT ms
          break;
      }
-     return CallWindowProc( keylist_proc.old, dlg, msg, wparam, lparam );
+     return CallWindowProc (keylist_proc.old, dlg, msg, wparam, lparam);
- } /* keylist_subclass_proc */
+ }
  static HWND
- load_toolbar (HWND dlg, struct km_info * kmi)
+ load_toolbar (HWND dlg, struct km_info_s *kmi)
  {
      HWND tbwnd;
      TBSAVEPARAMS tbsp;
-Line 175 
 load_toolbar (HWND dlg, struct km_info *
+Line 174 
 load_toolbar (HWND dlg, struct km_info *
                              WS_CHILD|TBSTYLE_TOOLTIPS|TBSTYLE_FLAT|CCS_ADJUSTABLE,
 , 0, 0, 0, dlg, (HMENU)IDR_WINPT_KMTB, glob_hinst, NULL);
      if (tbwnd) {
          SendMessage (tbwnd, TB_BUTTONSTRUCTSIZE, (WPARAM) sizeof(TBBUTTON), 0);
          SendMessage (tbwnd, TB_SETIMAGELIST, 0, (LPARAM)glob_imagelist);
                  SendMessage (tbwnd, TB_AUTOSIZE, 0, 0);
          ShowWindow (tbwnd, SW_SHOW);
-Line 185 
 load_toolbar (HWND dlg, struct km_info *
+Line 184 
 load_toolbar (HWND dlg, struct km_info *
          tbsp.pszSubKey = "Software\\WinPT";
          tbsp.pszValueName = "KM_toolbar";
          if (SendMessage(tbwnd, TB_SAVERESTORE, FALSE, (LPARAM)&tbsp ) == 0)
-             SendMessage (tbwnd, TB_ADDBUTTONS, sizeof(tb_buttons) / sizeof(tb_buttons[0]), (LONG)&tb_buttons[0]);
+             SendMessage (tbwnd, TB_ADDBUTTONS, sizeof(tb_buttons) / sizeof(tb_buttons[0]),
+                          (LONG)&tb_buttons[0]);
       }
       return tbwnd;
- } /* load_toolbar */
+ }
+ /* Restore the width of the columns from the registry.
+    If no bitstring was found, the default size is used. */
+ int
+ restore_column_info (listview_ctrl_t hd)
+ {
+     WORD *buf;
+     HKEY root;
+     DWORD type;
+     DWORD size = hd->cols*sizeof (WORD), i;
+     LONG ec;
+     ec = RegOpenKeyEx (HKEY_CURRENT_USER, "Software\\WinPT", 0,
+                        KEY_ALL_ACCESS, &root);
+     if (ec != ERROR_SUCCESS)
+         return -1;
+     buf = new WORD[size/2];
+     if (!buf)
+         BUG (NULL);
+     ec = RegQueryValueEx (root, "KMColumnSize", NULL, &type,
+                           (BYTE*)buf, &size);
+     RegCloseKey (root);
+     if (ec != ERROR_SUCCESS) {
+         free_if_alloc (buf);
+         return -1;
+     }
+     /* check for garbled values. */
+     for (i=0; i < size/2; i++) {
+         if (buf[i] == 0 || buf[i] > 512) {
+             free_if_alloc (buf);
+             return -1;
+         }
+     }
+     for (i=0; i < size/2; i++) {
+         LVCOLUMN lvc;
+         memset (&lvc, 0, sizeof (lvc));
+         lvc.mask = LVCF_WIDTH;
+         lvc.cx = buf[i];
+         ListView_SetColumn (hd->ctrl, i, &lvc);
+     }
+     free_if_alloc (buf);
+     return 0;
+ }
+ /* Save the current column width to the registry. */
+ int
+ save_column_info (listview_ctrl_t hd)
+ {
+     WORD *buf;
+     HKEY root;
+     LONG ec;
+     int i;
+     buf = new WORD[hd->cols];
+     if (!buf)
+         BUG (NULL);
+     for (i=0; i < hd->cols; i++) {
+         LVCOLUMN lvc;
+         memset (&lvc, 0, sizeof (lvc));
+         lvc.mask = LVCF_WIDTH;
+         ListView_GetColumn (hd->ctrl, i, &lvc);
+         buf[i] = lvc.cx;
+     }
+     ec = RegOpenKeyEx (HKEY_CURRENT_USER, "Software\\WinPT", 0,
+                        KEY_ALL_ACCESS, &root);
+     if (ec != ERROR_SUCCESS) {
+         free_if_alloc (buf);
+         return -1;
+     }
+     ec = RegSetValueEx (root, "KMColumnSize", 0, REG_BINARY,
+                         (const BYTE*)buf, 2*hd->cols);
+     RegCloseKey (root);
+     free_if_alloc (buf);
+     return ec == ERROR_SUCCESS? 0 : -1;
+ }
+ /* Center window @dlg. */
  static void
- do_center_window (HWND dlg, struct km_info * kmi)
+ do_center_window (HWND dlg, struct km_info_s *kmi)
  {
      RECT rect;
-     char * p;
+     char *p;
-     int pos_x = 0, pos_y = 0;
+     int pos_x = 0;
+     int pos_y = 0;
      /* Find bottom of keylist */
      GetWindowRect (GetDlgItem(dlg, IDC_KEYMISC_KEYLIST), &rect);
-Line 204 
 do_center_window (HWND dlg, struct km_in
+Line 289 
 do_center_window (HWND dlg, struct km_in
      kmi->ypos_sep = rect.bottom;
-     p = get_reg_entry( HKEY_CURRENT_USER, "Software\\WinPT", "KM_Pos_X" );
+     p = get_reg_entry (HKEY_CURRENT_USER, "Software\\WinPT", "KM_Pos_X");
-     if( p && !strcmp( p, " " ) ) {
+     if (p && !strcmp (p, " ")) {
-         free_if_alloc( p );
+         free_if_alloc (p);
-         center_window( dlg, NULL );
+         center_window (dlg, NULL);
          return;
      }
-     else if( p )
+     else if (p)
-         pos_x = atol( p );
+         pos_x = atol (p);
-     p = get_reg_entry( HKEY_CURRENT_USER, "Software\\WinPT", "KM_Pos_Y" );
+     p = get_reg_entry (HKEY_CURRENT_USER, "Software\\WinPT", "KM_Pos_Y");
-     if( p && !strcmp( p, " " ) ) {
+     if (p && !strcmp (p, " ")) {
-         free_if_alloc( p );
+         free_if_alloc (p);
-         center_window( dlg, NULL );
+         center_window (dlg, NULL);
          return;
      }
-     else if( p )
+     else if (p)
-         pos_y = atol( p );
+         pos_y = atol (p);
-     if( !pos_y && !pos_x ) {
+     if (!pos_y && !pos_x) {
-         center_window( dlg, NULL );
+         center_window (dlg, NULL);
          return;
      }
-     if( pos_x > GetSystemMetrics( SM_CXSCREEN )
+     if (pos_x < 0 || pos_y < 0)
-         || pos_y > GetSystemMetrics( SM_CYSCREEN ) ) {
+         pos_x = pos_y = 0;
+     if (pos_x > GetSystemMetrics (SM_CXSCREEN)
+         || pos_y > GetSystemMetrics (SM_CYSCREEN)) {
          pos_x = pos_y = 0;
      }
-     GetClientRect( dlg, &rect );
+     GetClientRect (dlg, &rect);
-     MoveWindow( dlg, pos_x, pos_y, rect.right, rect.bottom, TRUE );
+     MoveWindow (dlg, pos_x, pos_y, rect.right, rect.bottom, TRUE);
  }
+ /* Resize the key manager window with the information from @kmi. */
  static void
- do_resize_window( HWND dlg, struct km_info *kmi)
+ do_resize_window (HWND dlg, struct km_info_s *kmi)
  {
      HWND h;
      RECT rclient, rect;
      BOOL bRepaint = FALSE;
      /* Get rect of client area and make life easier */
-     GetClientRect( dlg, &rclient );
+     GetClientRect (dlg, &rclient);
      /* Move toolbar to the top of the window */
      if (kmi->toolbar) {
-         GetWindowRect(kmi->toolbar, &rect);
+         GetWindowRect (kmi->toolbar, &rect);
-         ScreenToClient(dlg, (POINT*)&rect);
+         ScreenToClient (dlg, (POINT*)&rect);
-         ScreenToClient(dlg, (POINT*)&(rect.right));
+         ScreenToClient (dlg, (POINT*)&(rect.right));
          rclient.top += rect.bottom - rect.top;
          MoveWindow (kmi->toolbar, 0, 0, rclient.right - rclient.left,
-Line 259 
 do_resize_window( HWND dlg, struct km_in
+Line 347 
 do_resize_window( HWND dlg, struct km_in
      /* Move statusbar to the bottom of the window */
      if (kmi->statbar) {
-         GetWindowRect( kmi->statbar, &rect );
+         GetWindowRect (kmi->statbar, &rect);
-         ScreenToClient(dlg, (POINT*)&rect);
+         ScreenToClient (dlg, (POINT*)&rect);
-         ScreenToClient(dlg, (POINT*)&(rect.right));
+         ScreenToClient (dlg, (POINT*)&(rect.right));
          rclient.bottom -= rect.bottom - rect.top;
-         MoveWindow (kmi->statbar, 0, rclient.bottom, rclient.right - rclient.left,
+         MoveWindow (kmi->statbar, 0, rclient.bottom,
+                     rclient.right - rclient.left,
                      rect.bottom - rect.top, bRepaint);
      }
-     // Obtain separator information and move it to the desired posistion
+     /* Obtain separator information and move it to the desired posistion */
      if (kmi->ypercent_sep)
          kmi->ypos_sep = (rclient.bottom - rclient.top) * kmi->ypercent_sep / 100;
      else
          kmi->ypercent_sep = kmi->ypos_sep * 100 / (rclient.bottom - rclient.top);
-     // Don't move away
+     /* Don't move away */
      if (kmi->ypos_sep+5 > rclient.bottom)
          kmi->ypos_sep = rclient.bottom - 5;
      if (kmi->ypos_sep < rclient.top)
          kmi->ypos_sep = rclient.top;
-     MoveWindow (kmi->hwnd_sep, 0, kmi->ypos_sep, (rclient.right - rclient.left), 5, bRepaint);
+     MoveWindow (kmi->hwnd_sep, 0, kmi->ypos_sep,
+                 (rclient.right - rclient.left), 5, bRepaint);
-     // Place the keylist above the separator
+     /* Place the keylist above the separator */
-     h = GetDlgItem( dlg, IDC_KEYMISC_KEYLIST );
+     h = GetDlgItem (dlg, IDC_KEYMISC_KEYLIST);
      MoveWindow (h, rclient.left, rclient.top, rclient.right - rclient.left,
                  kmi->ypos_sep - rclient.top, bRepaint);
      rclient.top = kmi->ypos_sep + 5 + 8;
      /* Place the group text and the group box below the separator */
-     h = GetDlgItem( dlg, IDC_KEYMISC_GTEXT );
+     h = GetDlgItem (dlg, IDC_KEYMISC_GTEXT);
-     MoveWindow( h, rclient.left, rclient.top, 100, 14, bRepaint);
+     MoveWindow (h, rclient.left, rclient.top, 100, 14, bRepaint);
      rclient.top += 18;
-     h = GetDlgItem( dlg, IDC_KEYMISC_GROUP );
+     h = GetDlgItem (dlg, IDC_KEYMISC_GROUP);
      MoveWindow (h, rclient.left, rclient.top, rclient.right - rclient.left,
-                 (rclient.bottom < rclient.top) ? 0 : rclient.bottom - rclient.top, bRepaint);
+                 (rclient.bottom < rclient.top) ?
+: rclient.bottom - rclient.top, bRepaint);
      /* Repaint the whole thing */
      InvalidateRect (dlg, NULL, TRUE);
- } /* do_resize_window */
+ }
+ /* Return true if the clipboard contains an OpenPGP key. */
+ static bool
+ clip_contains_pgpkey (void)
+ {
+     char *ctxt;
+     bool val = false;
+     ctxt = get_clip_text (NULL);
+     if (!ctxt || strlen (ctxt) < 512)
+         val = false;
+     else if (strstr (ctxt, "BEGIN PGP") && strstr (ctxt, "KEY BLOCK") &&
+              strstr (ctxt, "END PGP"))
+         val = true;
+     free_if_alloc (ctxt);
+     return val;
+ }
+ /* Show a mini popup menu to import keys. */
  static void
  do_create_minpopup (HWND dlg)
  {
-Line 309 
 do_create_minpopup (HWND dlg)
+Line 419 
 do_create_minpopup (HWND dlg)
      char * s;
      POINT p;
-     if (gpg_read_only)
+     if (gpg_read_only || !clip_contains_pgpkey ())
          return;
      hm = CreatePopupMenu ();
      if (!hm)
-Line 326 
 do_create_minpopup (HWND dlg)
+Line 436 
 do_create_minpopup (HWND dlg)
      GetCursorPos (&p);
      TrackPopupMenu (hm, 0, p.x, p.y, 0, dlg, NULL);
      DestroyMenu (hm);
- } /* do_create_minpopup */
+ }
+ /* Update the default key entry in the status bar for dialog @dlg. */
+ void
+ update_default_key_str (HWND dlg)
+ {
+     const char *fmt;
+     char *keyid;
+     char defkeyinf[128];
+     /* XXX: also show the name? */
+     keyid = get_gnupg_default_key ();
+     if (!keyid)
+         return;
+     if ((keyid[0] >= 'A' && keyid[0] <= 'Z') ||
+         (keyid[0] >= 'a' && keyid[0] <= 'z') ||
+         (keyid[0] == '0' && keyid[1] == 'x'))
+         fmt = _("Default Key: %s");
+     else
+         fmt = _("Default Key: 0x%s");
+     _snprintf (defkeyinf, sizeof (defkeyinf) - 1, fmt, keyid);
+     SendMessage (dlg, SB_SETTEXT, 0, (LPARAM)defkeyinf);
+     free_if_alloc (keyid);
+ }
+ /* Count all keys and show from @lv results in the status bar @sb. */
+ void
+ update_status_bar (HWND sb, listview_ctrl_t lv)
+ {
+     char txt_sec[128], txt_pub[128];
+     int nkeys = 0, nsec = 0;
+     int i;
+     nkeys = listview_count_items (lv, 0);
+     for (i = 0; i < nkeys; i++) {
+         if (km_check_for_seckey (lv, i, NULL))
+             nsec++;
+     }
+     _snprintf (txt_sec, sizeof (txt_sec)-1, _("%d secret keys"), nsec);
+     _snprintf (txt_pub, sizeof (txt_pub)-1, _("%d keys"), nkeys);
+     SendMessage (sb, SB_SETTEXT, 1, (LPARAM)txt_sec);
+     SendMessage (sb, SB_SETTEXT, 2, (LPARAM)txt_pub);
+ }
+ /* Reload the key cache if requested. */
  static void
  do_check_cache (listview_ctrl_t lv, HWND dlg, HWND sb)
  {
      gpg_keycache_t cache;
-     if( keycache_get_reload( ) ) {
+     if (keycache_get_reload ()) {
-         keycache_reload( dlg );
+         keycache_reload (dlg);
-         keycache_set_reload( 0 );
+         keycache_set_reload (0);
-         cache = keycache_get_ctx( 1 );
+         cache = keycache_get_ctx (1);
-         if( !cache )
+         if (!cache)
-             BUG( dlg );
+             BUG (dlg);
-         keylist_reload( lv, cache, KEYLIST_LIST, KEY_SORT_USERID );
+         keylist_reload (lv, cache, KEYLIST_LIST, KEY_SORT_USERID);
-         km_complete_status_bar (sb, lv);
+         update_status_bar (sb, lv);
      }
- } /* do_check_cache */
+ }
  long CALLBACK
- separator_wnd_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam )
+ separator_wnd_proc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
  {
      static POINT last_mouse_pos;
-     RECT rect;
      if (msg == WM_CREATE)
-         SetWindowLong (hwnd, GWL_USERDATA, (long)(((CREATESTRUCT*)lparam)->lpCreateParams));
+         SetWindowLong (hwnd, GWL_USERDATA,
+                        (long)(((CREATESTRUCT*)lparam)->lpCreateParams));
      switch (msg) {
      case WM_PAINT:
          PAINTSTRUCT ps;
+         RECT rect;
          HPEN hpen;
          GetClientRect (hwnd, &rect);
          BeginPaint (hwnd, &ps);
-         // Background
+         /* Background */
          FillRect (ps.hdc, &rect, (HBRUSH)(COLOR_3DFACE+1));
-         // The lines from the light into the dark
+         /* The lines from the light into the dark */
          MoveToEx(ps.hdc, 0,0, NULL);
-         if ((hpen = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_3DHILIGHT))) != NULL) {
+         if ((hpen = CreatePen (PS_SOLID, 0, GetSysColor(COLOR_3DHILIGHT))) != NULL) {
-             SelectObject(ps.hdc, (LPVOID)hpen);
+             SelectObject (ps.hdc, (LPVOID)hpen);
-             LineTo(ps.hdc, rect.right, 0);
+             LineTo (ps.hdc, rect.right, 0);
-             DeleteObject(hpen);
+             DeleteObject (hpen);
          }
          MoveToEx(ps.hdc, 0, 1, NULL);
-         if ((hpen = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_3DLIGHT))) != NULL) {
+         if ((hpen = CreatePen (PS_SOLID, 0, GetSysColor(COLOR_3DLIGHT))) != NULL) {
-              SelectObject(ps.hdc, (LPVOID)hpen);
+              SelectObject (ps.hdc, (LPVOID)hpen);
-              LineTo(ps.hdc, rect.right, rect.bottom);
+              LineTo (ps.hdc, rect.right, rect.bottom);
-              DeleteObject(hpen);
+              DeleteObject (hpen);
           }
          MoveToEx(ps.hdc, 0, rect.bottom-1, NULL);
-         if ((hpen = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_3DSHADOW))) != NULL) {
+         if ((hpen = CreatePen (PS_SOLID, 0, GetSysColor(COLOR_3DSHADOW))) != NULL) {
-             SelectObject(ps.hdc, (LPVOID)hpen);
+             SelectObject (ps.hdc, (LPVOID)hpen);
-             LineTo(ps.hdc, rect.right, rect.bottom-1);
+             LineTo (ps.hdc, rect.right, rect.bottom-1);
-             DeleteObject(hpen);
+             DeleteObject (hpen);
          }
          MoveToEx(ps.hdc, 0, rect.bottom, NULL);
          if ((hpen = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_3DDKSHADOW))) != NULL) {
-             SelectObject(ps.hdc, (LPVOID)hpen);
+             SelectObject (ps.hdc, (LPVOID)hpen);
-             LineTo(ps.hdc, rect.right, rect.bottom);
+             LineTo (ps.hdc, rect.right, rect.bottom);
-             DeleteObject(hpen);
+             DeleteObject (hpen);
          }
          EndPaint (hwnd, &ps);
          return 0;
      case WM_LBUTTONDOWN:
-         last_mouse_pos.x = LOWORD(lparam);
+         last_mouse_pos.x = LOWORD (lparam);
-         last_mouse_pos.y = HIWORD(lparam);
+         last_mouse_pos.y = HIWORD (lparam);
          ClientToScreen (hwnd, &last_mouse_pos);
          SetCapture (hwnd);
          return 0;
-Line 409 
 separator_wnd_proc( HWND hwnd, UINT msg,
+Line 566 
 separator_wnd_proc( HWND hwnd, UINT msg,
      case WM_MOUSEMOVE:
          if (wparam == MK_LBUTTON) {
-             struct km_info *kmi;
+             struct km_info_s *kmi;
              POINT p;
+             RECT r;
-             if ((kmi = (struct km_info *)GetWindowLong (hwnd, GWL_USERDATA)) == NULL)
+             kmi = (struct km_info_s *)GetWindowLong (hwnd, GWL_USERDATA);
+             if (kmi == NULL)
                  break;
-             // Calculate mouse movement
+             /* Calculate mouse movement */
              p.x = LOWORD(lparam);
              p.y = HIWORD(lparam);
              ClientToScreen (hwnd, &p);
-             GetWindowRect (hwnd, &rect);
+             GetWindowRect (hwnd, &r);
-             rect.top += (short)(p.y - last_mouse_pos.y);
+             r.top += (short)(p.y - last_mouse_pos.y);
-             rect.bottom += (short)(p.y - last_mouse_pos.y);
+             r.bottom += (short)(p.y - last_mouse_pos.y);
              last_mouse_pos.y = p.y;
-             // Apply mouse movement to window. Beware the MoveWindow is relaive
+             /* Apply mouse movement to window. Beware the MoveWindow is relaive
-             // to parent NOT screen
+                to parent NOT screen */
-             MapWindowPoints (NULL, GetParent(hwnd), (POINT*)&rect, 2);
+             MapWindowPoints (NULL, GetParent(hwnd), (POINT*)&r, 2);
-             kmi->ypos_sep = rect.top;
+             kmi->ypos_sep = r.top;
-             kmi->ypercent_sep = 0; // This forces do_resize_window to use abs. position
+             kmi->ypercent_sep = 0; /* This forces do_resize_window to use abs. position */
              do_resize_window (GetParent(hwnd), kmi);
              return 0;
          }
-Line 440 
 separator_wnd_proc( HWND hwnd, UINT msg,
+Line 599 
 separator_wnd_proc( HWND hwnd, UINT msg,
  }
+ /* Register the separator window with @dlg as the parent window. */
  static HWND
- regist_sep_wnd (HWND dlg, struct km_info * kmi)
+ regist_sep_wnd (HWND dlg, struct km_info_s *kmi)
  {
      WNDCLASS wndclass;
      HWND h;
-Line 463 
 regist_sep_wnd (HWND dlg, struct km_info
+Line 623 
 regist_sep_wnd (HWND dlg, struct km_info
 , 400, 2000, 5, dlg, (HMENU) 0, glob_hinst, kmi);
      ShowWindow (h, SW_SHOW);
      return h;
- } /* regist_sep_wnd */
+ }
  #define enable_button(hwnd, cid) \
-Line 477 
 regist_sep_wnd (HWND dlg, struct km_info
+Line 636 
 regist_sep_wnd (HWND dlg, struct km_info
  void
  update_ui_items (HWND hwnd, listview_ctrl_t lv)
  {
-     int key_selected = 0, key_has_sec = 0;
-     int i, key_inv = 0;
      HWND hwnd_child;
      HMENU hmenu;
+     int key_selected = 0;
+     int key_has_sec = 0;
+     int key_inv = 0;
+     int mult_resids[] = {ID_KEYMISC_PROPS, ID_KEYMISC_SIGN, ID_KEYMISC_EDITKEY,
+                          ID_KEYMISC_CHECKSIGS, ID_KEYMISC_REVCERT, 0};
+     int i, state=0;
      /* Get some states */
      key_selected = SendMessage (GetDlgItem (hwnd, IDC_KEYMISC_KEYLIST),
-Line 490 
 update_ui_items (HWND hwnd, listview_ctr
+Line 653 
 update_ui_items (HWND hwnd, listview_ctr
      if (key_selected) {
          i = listview_get_curr_pos (lv);
          key_has_sec = km_check_for_seckey (lv, i, NULL) ? TRUE : FALSE;
-         key_inv = km_get_key_status (lv, i) & KM_FLAG_REVOKED;
+         key_inv = km_get_key_status (lv, i) & KM_FLAG_REVOKED ||
+                   km_get_key_status (lv, i) & KM_FLAG_EXPIRED;
      }
      /* Enable / disable toolbar buttons */
-Line 501 
 update_ui_items (HWND hwnd, listview_ctr
+Line 665 
 update_ui_items (HWND hwnd, listview_ctr
      enable_button (hwnd_child, ID_KEYMISC_EXPORT);
      /* Enable / disable menu items */
+     state = key_selected? MF_ENABLED : MF_DISABLED|MF_GRAYED;
      hmenu = GetMenu (hwnd);
-     set_menu_state (hmenu, ID_KEYMISC_EXPORT, key_selected ? MF_ENABLED : MF_GRAYED);
+     set_menu_state (hmenu, ID_KEYMISC_EXPORT, state);
-     set_menu_state (hmenu, ID_KEYMISC_EXPORT_PRIVKEY, key_has_sec ? MF_ENABLED : MF_GRAYED);
+     set_menu_state (hmenu, ID_KEYMISC_DELETE, state);
-     set_menu_state (hmenu, ID_KEYMISC_REVCERT, key_has_sec ? MF_ENABLED : MF_GRAYED);
+     set_menu_state (hmenu, ID_KEYMISC_PROPS, state);
-     set_menu_state (hmenu, ID_KEYMISC_DELETE, key_selected ? MF_ENABLED : MF_GRAYED);
+     set_menu_state (hmenu, ID_KEYMISC_EDITKEY, state);
-     set_menu_state (hmenu, ID_KEYMISC_PROPS, key_selected ? MF_ENABLED : MF_GRAYED);
+     set_menu_state (hmenu, ID_KEYMISC_CHECKSIGS, state);
-     set_menu_state (hmenu, ID_KEYMISC_SIGN, key_selected && !key_inv ? MF_ENABLED : MF_GRAYED);
+     set_menu_state (hmenu, ID_KEYMISC_SIGN,
-     set_menu_state (hmenu, ID_KEYMISC_EDITKEY, key_selected? MF_ENABLED : MF_GRAYED);
+                     key_selected && !key_inv ? MF_ENABLED : MF_GRAYED);
-     set_menu_state (hmenu, ID_KEYMISC_CHECKSIGS, key_selected? MF_ENABLED : MF_GRAYED);
+     set_menu_state (hmenu, ID_KEYMISC_EXPORT_PRIVKEY,
+                     key_selected && key_has_sec? MF_ENABLED : MF_GRAYED);
+     set_menu_state (hmenu, ID_KEYMISC_REVCERT,
+                     key_selected && key_has_sec? MF_ENABLED : MF_GRAYED);
+     /* Disable some menu items when multiple keys are selected. */
+     if (listview_count_items (lv, 1) > 1) {
+         for (i=0; mult_resids[i] != 0; i++)
+             set_menu_state (hmenu, mult_resids[i], MF_GRAYED);
+     }
+ }
+ /* Disable some context menu items when multiple keys are selected. */
+ static void
+ popup_multiple (HWND dlg, HMENU hm)
+ {
+     int resids[] = {
+         ID_KEYCTX_EDIT,
+         ID_KEYCTX_SIGN,
+         ID_KEYCTX_REV,
+         ID_KEYCTX_ENABLE,
+         ID_KEYCTX_DISABLE,
+         ID_KEYCTX_ADDKEY,
+         ID_KEYCTX_ADDPHOTO,
+         ID_KEYCTX_ADDUID,
+         ID_KEYCTX_ADDREV,
+         ID_KEYCTX_LISTSIGS,
+         ID_KEYCTX_MAXTRUST,
+         ID_KEYCTX_PROPS,
+         ID_KEYCTX_SENDMAIL,
+};
+     int i;
+     for (i=0; i < resids[i] != 0; i++)
+         set_menu_state (hm, resids[i], MF_GRAYED);
  }
-Line 541 
 popup_gpg_readonly (HWND dlg, HMENU hm)
+Line 740 
 popup_gpg_readonly (HWND dlg, HMENU hm)
  }
+ /* Change the 'Edit' menu based on the current state. */
  static void
- menu_gpg_readonly (HWND dlg, HMENU hm, int id)
+ change_edit_menu (listview_ctrl_t lv, HMENU hm, int id)
+ {
+     enum item { EDIT_MENU = 1 };
+     int no_sel;
+     if (id != EDIT_MENU)
+         return;
+     if (!clip_contains_pgpkey ())
+         set_menu_state (hm, ID_KEYMISC_PASTE, MF_GRAYED);
+     else
+         set_menu_state (hm, ID_KEYMISC_PASTE, MF_ENABLED);
+     no_sel = listview_get_curr_pos (lv) == -1? 1 : 0;
+     set_menu_state (hm, ID_KEYMISC_DELETE2, no_sel? MF_GRAYED: MF_ENABLED);
+     set_menu_state (hm, ID_KEYMISC_COPY, no_sel? MF_GRAYED : MF_ENABLED);
+ }
+ /* Show limited key menu entries when GPG is in read-only mode. */
+ static void
+ change_key_menu (HMENU hm, int id)
  {
      int key_resids[] = {
          ID_KEYMISC_SIGN,
-Line 573 
 menu_gpg_readonly (HWND dlg, HMENU hm, i
+Line 794 
 menu_gpg_readonly (HWND dlg, HMENU hm, i
      case 0: return;
      case 3: resids = key_resids; break;
      case 1: resids = edit_resids;break;
-     default: return;
+     default:resids = edit_resids; break;
      }
      for (i=0; resids[i] != 0; i++)
-Line 581 
 menu_gpg_readonly (HWND dlg, HMENU hm, i
+Line 802 
 menu_gpg_readonly (HWND dlg, HMENU hm, i
  }
- static char*
+ /* Reload a single key in the cache. */
- gen_export_filename (const char *keyid, int is_secret)
- {
-     gpgme_key_t key;
-     const char *s;
-     char *p;
-     if (get_pubkey (keyid, &key))
-         return m_strdup (keyid);
-     s = key->uids->name;
-     if (!s)
-         return m_strdup (keyid);
-     p = new char[strlen (s) + 8 + 16];
-     if (!p)
-         BUG (0);
-     sprintf (p, "%s%s.asc", s, is_secret? "_sec" : "");
-     for (size_t i=0; i < strlen (p); i++) {
-         if (p[i] == ' ' || p[i] == ':' || p[i] == '?' || p[i] == '|')
-             p[i] = '_';
-     }
-     return p;
- }
  static void
  update_key (listview_ctrl_t lv, int pos, const char *keyid, int keypair)
  {
-Line 625 
 update_key (listview_ctrl_t lv, int pos,
+Line 823 
 update_key (listview_ctrl_t lv, int pos,
  static HWND
  setup_status_bar (HWND dlg, listview_ctrl_t lv)
  {
      HWND statbar;
      RECT r;
      int partpos[3];
      int i;
-Line 639 
 setup_status_bar (HWND dlg, listview_ctr
+Line 837 
 setup_status_bar (HWND dlg, listview_ctr
      ShowWindow (statbar, SW_SHOW);
      SendMessage (statbar, SB_SETPARTS, (WPARAM)3, (LPARAM)partpos);
-     km_update_default_key_str (statbar);
+     update_default_key_str (statbar);
-     km_complete_status_bar (statbar, lv);
+     update_status_bar (statbar, lv);
      return statbar;
  }
+ /* Remove or add columns which depends on the state of @checked. */
+ void
+ modify_listview_columns (km_info_s *kmi, UINT m_uid, BOOL checked)
+ {
+     UINT resids[] = {
+,
+         ID_KEYMISC_VIEWKEYID,
+         ID_KEYMISC_VIEWTYPE,
+,
+         ID_KEYMISC_VIEWCIPHER,
+,
+,
+         ID_KEYMISC_VIEWCREAT,
+         -1
+     };
+     listview_column_s cols[] = {
+     {0, 240, (char *)_("User ID")},
+     {1, 78, (char *)_("Key ID")},
+     {2, 52, (char *)_("Type")},
+     {3, 66, (char *)_("Size")},
+     {4, 60, (char *)_("Cipher")},
+     {5, 66, (char *)_("Validity")},
+     {6, 58, (char *)_("Trust")},
+     {7, 72, (char *)_("Creation")},
+     {0, 0, NULL}
+     };
+     UINT pos;
+     for (pos=0; resids[pos] != -1; pos++) {
+         if (m_uid == resids[pos])
+             break;
+     }
+     if (!checked)
+         listview_del_column (kmi->lv, (int)pos);
+     else {
+         listview_add_column (kmi->lv, &cols[pos]);
+         keylist_upd_col (kmi->lv, pos);
+     }
+ }
+ /* Helper to handle the help file. If @check is 1
+    the existence of the file is checked.
+    Otherwise the help file will be loaded. */
+ static bool
+ start_help (HWND dlg, int check)
+ {
+     DWORD n;
+     char path[MAX_PATH+1+32];
+     n = GetModuleFileName (NULL, path, sizeof (path)-1-32);
+     if (!n)
+         return false;
+     path[n] = 0;
+     while (n-- && path[n] != '\\')
+         ;
+     path[n+1] = 0;
+     strcat (path, "winpt.chm");
+     if (!check)
+         ShellExecute (dlg, "open", path, NULL, NULL, SW_SHOW);
+     return file_exist_check (path) == 0? true : false;
+ }
+ /* Translate all menu strings. */
+ static void
+ translate_menu_strings (HWND dlg)
+ {
+     HMENU menu;
+     menu = LoadMenu (glob_hinst, (LPCSTR)IDR_WINPT_KEYMISC);
+     set_menu_text_bypos (menu, 0, _("File"));
+     set_menu_text_bypos (menu, 1, _("Edit"));
+     set_menu_text_bypos (menu, 2, _("View"));
+     set_menu_text_bypos (menu, 3, _("Key"));
+     set_menu_text_bypos (menu, 4, _("Groups"));
+     set_menu_text (menu, ID_KEYMISC_EDITKEY, _("Edit"));
+     set_menu_text (menu, ID_KEYMISC_MAIL, _("Send Mail..."));
+     set_menu_text (menu, ID_KEYMISC_OT, _("Ownertrust")); /* XXX */
+     set_menu_text (menu, ID_KEYMISC_COPY, _("&Copy\tCtrl+C"));
+     set_menu_text (menu, ID_KEYMISC_PASTE, _("&Paste\tCtrl+V"));
+     set_menu_text (menu, ID_KEYMISC_FIND, _("Search...\tCtrl+F"));
+     set_menu_text (menu, ID_KEYMISC_SELALL, _("Select All\tCtrl+A"));
+     set_menu_text (menu, ID_KEYMISC_QUIT, _("&Quit"));
+     set_menu_text (menu, ID_KEYMISC_UID, _("User ID"));
+     set_menu_text (menu, ID_KEYMISC_NEWKEY, _("&Expert"));
+     set_menu_text (menu, ID_KEYMISC_KEYWIZARD, _("&Normal"));
+     set_menu_text (menu, ID_KEYMISC_EDIT, _("Edit"));
+     set_menu_text (menu, ID_KEYMISC_SIGN, _("&Sign"));
+     set_menu_text (menu, ID_KEYMISC_DELETE, _("&Delete"));
+     set_menu_text (menu, ID_KEYMISC_DELETE2, _("&Delete"));
+     set_menu_text (menu, ID_KEYMISC_REVCERT, _("&Revoke Cert"));
+     set_menu_text (menu, ID_KEYMISC_CHECKSIGS, _("&List Signatures"));
+     set_menu_text (menu, ID_KEYMISC_TRUSTPATH, _("List Trust Path"));
+     set_menu_text (menu, ID_KEYMISC_EXPORT, _("&Export..."));
+     set_menu_text (menu, ID_KEYMISC_IMPORT, _("&Import..."));
+     set_menu_text (menu, ID_KEYMISC_PROPS, _("&Properties"));
+     set_menu_text (menu, ID_KEYMISC_GPGOPT, _("Options"));
+     set_menu_text (menu, ID_KEYMISC_GPGPREFS, _("Preferences"));
+     set_menu_text (menu, ID_KEYMISC_SENDRECV, _("Keyserver") );
+     set_menu_text (menu, ID_KEYMISC_EXPORT_PRIVKEY, _("E&xport Secret Key"));
+     set_menu_text (menu, ID_KEYMISC_RECACHE, _("Re&load Key Cache"));
+     set_menu_text (menu, ID_KEYMISC_REBUILD, _("R&everify Signatures"));
+     set_menu_text (menu, ID_KEYMISC_REFRESH_KEYS, _("Refresh &Keys (Keyserver)"));
+     set_menu_text (menu, ID_KEYMISC_INFO, _("Info") );
+     set_menu_text (menu, ID_KEYMISC_HELP, _("&Help"));
+     set_menu_text (menu, ID_KEYMISC_VIEWKEYID, _("Key ID"));
+     set_menu_text (menu, ID_KEYMISC_VIEWCIPHER, _("Cipher"));
+     set_menu_text (menu, ID_KEYMISC_VIEWTYPE, _("Type"));
+     set_menu_text (menu, ID_KEYMISC_VIEWCREAT, _("Creation"));
+     if (!start_help (NULL, 1))
+         set_menu_state (menu, ID_KEYMISC_HELP, MF_GRAYED);
+     SetMenu (dlg, menu);
+ }
+ /* Translate popup menu strings. */
+ static void
+ translate_popupmenu_strings (HMENU popup)
+ {
+     set_menu_text (popup, ID_KEYCTX_UID_COPY, _("Copy User ID to Clipboard"));
+     set_menu_text (popup, ID_KEYCTX_KEYID_COPY, _("Copy Key ID to Clipboard"));
+     set_menu_text (popup, ID_KEYCTX_FPR_COPY, _("Copy Fingerprint to Clipboard"));
+     set_menu_text (popup, ID_KEYCTX_KINFO_COPY, _("Copy Key Info to Clipboard"));
+     set_menu_text (popup, ID_KEYCTX_COPY, _("Copy Key to Clipboard"));
+     set_menu_text (popup, ID_KEYCTX_PASTE, _("Paste Key from Clipboard"));
+     set_menu_text (popup, ID_KEYCTX_RECVFROM, _("Refresh from Keyserver"));
+     set_menu_text (popup, ID_KEYCTX_MAXTRUST, _("Set Implicit &Trust"));
+     set_menu_text (popup, ID_KEYCTX_LISTSIGS, _("&List Signatures"));
+     set_menu_text (popup, ID_KEYCTX_PROPS, _("&Properties"));
+     set_menu_text (popup, ID_KEYCTX_EDIT, _("Key Edit"));
+     set_menu_text (popup, ID_KEYCTX_DEL, _("&Delete"));
+     set_menu_text (popup, ID_KEYCTX_REV, _("&Revoke Cert"));
+     set_menu_text (popup, ID_KEYCTX_SIGN, _("&Sign"));
+     set_menu_text (popup, ID_KEYCTX_ENABLE, _("&Enable"));
+     set_menu_text (popup, ID_KEYCTX_DISABLE, _("&Disable"));
+     set_menu_text (popup, ID_KEYCTX_RECVFROM, _("Re&fresh from Keyserver"));
+     set_menu_text (popup, ID_KEYCTX_SETPREFKS, _("Set preferred Keyserver URL"));
+     set_menu_text (popup, ID_KEYCTX_SENDMAIL, _("Send Key to Mail Recipient"));
+     set_menu_text (popup, ID_KEYCTX_SETDEFKEY, _("Set as Default Key"));
+     set_menu_text (popup, ID_KEYCTX_ADDKEY, _("Key..."));
+     set_menu_text (popup, ID_KEYCTX_ADDUID, _("User ID..."));
+     set_menu_text (popup, ID_KEYCTX_ADDPHOTO, _("Photo ID..."));
+     set_menu_text (popup, ID_KEYCTX_ADDREV, _("Revoker..."));
+     /* change popup texts */
+     set_menu_text_bypos (popup, 0, _("Key Attributes"));
+     set_menu_text_bypos (popup, 6, _("Add"));
+     set_menu_text_bypos (popup, 19, _("Send to Keyserver"));
+ }
+ /* Dialog box procedure for the Key Manager. */
  BOOL CALLBACK
  keymanager_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
  {
-     struct km_info *kmi;
+     struct km_info_s *kmi;
-     /*static km_group_s *gc = NULL;*/
-     static HMENU menu = NULL;
      static int refresh_keys = 0;
      INITCOMMONCONTROLSEX icex;
      HWND kl;
      HMENU hm;
      gpg_keycache_t c;
      gpgme_key_t key;
-     /*km_group_cb_s gcb; XXX */
      struct genkey_s genkey;
      struct winpt_key_s k = {0};
      struct URL_ctx_s *url;
      refresh_cache_s rcs = {0};
-     char keyid[48], uid[128], type[32], *name;
+     char type[32], *name;
-     const char *t, * host;
+     const char *t, *host;
-     u16 port = 0;
+     WORD port = 0;
-     int idx = 0, i=0, rc;
+     int l_idx = 0, i=0, rc;
      if ((msg != WM_INITDIALOG)
-         && ((kmi = (struct km_info*)GetWindowLong (dlg, GWL_USERDATA)) == NULL))
+         && ((kmi = (struct km_info_s*)GetWindowLong (dlg, GWL_USERDATA)) == NULL))
          return FALSE;
      switch (msg) {
      case WM_INITDIALOG:
-         kmi = new struct km_info;
+         kmi = new struct km_info_s;
-         memset (kmi, 0, sizeof (struct km_info));
+         memset (kmi, 0, sizeof (struct km_info_s));
+         kmi->lv_idx = -1;
          icex.dwSize = sizeof (INITCOMMONCONTROLSEX);
          icex.dwICC  = ICC_BAR_CLASSES;
          InitCommonControlsEx (&icex);
          kmi->hwnd_sep = regist_sep_wnd (dlg, kmi);
          imagelist_load (dlg);
+         translate_menu_strings (dlg);
+         SetWindowText (dlg, _("Key Manager"));
- #ifndef LANG_DE
+         if (keyring_check_last_access ())
-         SetWindowText( dlg, _("Key Manager") );
+             keycache_set_reload (1);
- #endif
+         if (keycache_get_reload ())
-         menu = LoadMenu( glob_hinst, (LPCSTR)IDR_WINPT_KEYMISC );
+             keycache_reload (dlg);
- #ifndef LANG_DE
+         c = keycache_get_ctx (KEYCACHE_PUB);
-         set_menu_text (menu, ID_KEYMISC_MAIL, _("Send Mail..."));
+         if (!c)
-         set_menu_text (menu, ID_KEYMISC_OT, _("Ownertrust")); /* XXX */
+             BUG (NULL);
-         set_menu_text (menu, ID_KEYMISC_COPY, _("&Copy\tCtrl+C"));
+         kl = GetDlgItem (dlg, IDC_KEYMISC_KEYLIST);
-         set_menu_text (menu, ID_KEYMISC_PASTE, _("&Paste\tCtrl+V"));
-         set_menu_text (menu, ID_KEYMISC_FIND, _("Search...\tCtrl+F"));
-         set_menu_text (menu, ID_KEYMISC_SELALL, _("Select All\tCtrl+A"));
-         set_menu_text (menu, ID_KEYMISC_QUIT, _("&Quit"));
-         set_menu_text (menu, ID_KEYMISC_UID, _("User ID"));
-         set_menu_text (menu, ID_KEYMISC_NEWKEY, _("&Expert"));
-         set_menu_text (menu, ID_KEYMISC_KEYWIZARD, _("&Normal"));
-         set_menu_text (menu, ID_KEYMISC_EDIT, _("Edit"));
-         set_menu_text (menu, ID_KEYMISC_SIGN, _("&Sign"));
-         set_menu_text (menu, ID_KEYMISC_DELETE, _("&Delete"));
-         set_menu_text (menu, ID_KEYMISC_REVCERT, _("&Revoke"));
-         set_menu_text (menu, ID_KEYMISC_CHECKSIGS, _("&List Signatures"));
-         set_menu_text (menu, ID_KEYMISC_TRUSTPATH, _("List Trust Path"));
-         set_menu_text (menu, ID_KEYMISC_EXPORT, _("&Export..."));
-         set_menu_text (menu, ID_KEYMISC_IMPORT, _("&Import..."));
-         set_menu_text (menu, ID_KEYMISC_PROPS, _("&Properties"));
-         set_menu_text (menu, ID_KEYMISC_GPGOPT, _("Options"));
-         set_menu_text (menu, ID_KEYMISC_GPGPREFS, _("Preferences"));
-         set_menu_text (menu, ID_KEYMISC_SENDRECV, _("Keyserver") );
-         set_menu_text (menu, ID_KEYMISC_EXPORT_PRIVKEY, _("E&xport Secret Key"));
-         set_menu_text (menu, ID_KEYMISC_RECACHE, _("Re&load Key Cache"));
-         set_menu_text (menu, ID_KEYMISC_REBUILD, _("R&everify Signatures"));
-         set_menu_text (menu, ID_KEYMISC_REFRESH_KEYS, _("Refresh &Keys (Keyserver)"));
-         set_menu_text (menu, ID_KEYMISC_INFO, _("Info") );
-         set_menu_text (menu, ID_KEYMISC_HELP, _("&Help"));
- #endif
-         SetMenu (dlg, menu);
-         if( keyring_check_last_access() )
-             keycache_set_reload( 1 );
-         if( keycache_get_reload( ) )
-             keycache_reload( dlg );
-         c = keycache_get_ctx( KEYCACHE_PUB );
-         if( !c )
-             BUG( NULL );
          kmi->keylist_sortby = KEY_SORT_USERID;
-         Header_SetImageList(ListView_GetHeader(GetDlgItem( dlg, IDC_KEYMISC_KEYLIST )),
+         Header_SetImageList(ListView_GetHeader (kl), glob_imagelist);
-                             glob_imagelist);
+         kmi->lv = keylist_load (GetDlgItem (dlg, IDC_KEYMISC_KEYLIST), c,
-         kmi->lv = keylist_load( GetDlgItem( dlg, IDC_KEYMISC_KEYLIST ), c,
+                                 NULL, KEYLIST_LIST, kmi->keylist_sortby);
-                                 NULL, KEYLIST_LIST, kmi->keylist_sortby );
          /* init subclassing for the listview */
-         kl = GetDlgItem( dlg, IDC_KEYMISC_KEYLIST );
          keylist_proc.dlg = dlg;
          keylist_proc.current = (WNDPROC)keylist_subclass_proc;
-         keylist_proc.old = (WNDPROC)GetWindowLong( kl, GWL_WNDPROC );
+         keylist_proc.old = (WNDPROC)GetWindowLong(kl, GWL_WNDPROC);
-         if( keylist_proc.old ) {
+         if (keylist_proc.old) {
-             if( !SetWindowLong( kl, GWL_WNDPROC, (LONG)keylist_proc.current) ) {
+             if( !SetWindowLong (kl, GWL_WNDPROC, (LONG)keylist_proc.current)) {
-                 msg_box( dlg, _("Could not set keylist window procedure."), _("Key Manager"), MB_ERR );
+                 msg_box (dlg, _("Could not set keylist window procedure."),
-                 BUG( NULL );
+                          _("Key Manager"), MB_ERR);
+                 BUG (NULL);
              }
          }
-         #if 0
-         km_groups_new( &gc, GetDlgItem( dlg, IDC_KEYMISC_GROUP ) );
-         km_groups_load( gc );
-         #endif
-         SetClassLong (dlg, GCL_HICON, (LONG)LoadIcon (glob_hinst, (LPCTSTR)IDI_WINPT));
-         SetForegroundWindow (dlg);
          kmi->statbar = setup_status_bar (dlg, kmi->lv);
          SetWindowLong (dlg, GWL_USERDATA, (LONG)kmi);
          kmi->toolbar = load_toolbar (dlg, kmi);
          do_center_window (dlg, kmi);
          do_resize_window (dlg, kmi);
          update_ui_items (dlg, kmi->lv);
+         restore_column_info (kmi->lv);
+         SetDlgItemText (dlg, IDC_KEYMISC_GTEXT, _("Groups"));
+         SetClassLong (dlg, GCL_HICON, (LONG)LoadIcon (glob_hinst,
+                       (LPCTSTR)IDI_WINPT));
+         SetForegroundWindow (dlg);
+         force_foreground_window (dlg, 1000);
          return TRUE;
      case WM_DESTROY:
+         save_column_info (kmi->lv);
          if (kmi->lv) {
              keylist_delete (kmi->lv);
              kmi->lv = NULL;
+         }
-          /*
+         imagelist_destroy ();
-          if (gc) {
-             km_groups_release (gc);
+         ltoa (kmi->pos_x, type, 10);
-             gc = NULL;
+         set_reg_entry (HKEY_CURRENT_USER, "Software\\WinPT", "KM_Pos_X", type);
-         }*/
+         ltoa (kmi->pos_y, type, 10);
-        imagelist_destroy ();
+         set_reg_entry (HKEY_CURRENT_USER, "Software\\WinPT", "KM_Pos_Y", type);
-        char buf[32];
+         /* Remove runtime information. This should be the last action taken here. */
-        ltoa (kmi->pos_x, buf, 10);
+         delete kmi; kmi = NULL;
-        set_reg_entry( HKEY_CURRENT_USER, "Software\\WinPT", "KM_Pos_X", buf );
+         SetWindowLong (dlg, GWL_USERDATA, 0);
-        ltoa (kmi->pos_y, buf, 10);
+         keycache_set_reload (refresh_keys);
-        set_reg_entry (HKEY_CURRENT_USER, "Software\\WinPT", "KM_Pos_Y", buf);
+         return FALSE;
-        /* Remove runtime information. This should be the last action taken here. */
-        delete kmi; kmi = NULL;
+     case WM_MOVE:
-        SetWindowLong (dlg, GWL_USERDATA, 0);
-        keycache_set_reload (refresh_keys);
-        return FALSE;
-     case WM_MOVE:
-         /* kmi->pos_x = (int)(short)LOWORD(lparam);
-            kmi->pos_y = (int)(short)HIWORD(lparam); */
          RECT r;
          GetWindowRect (dlg, &r);
          kmi->pos_x = r.left;
-Line 796 
 keymanager_dlg_proc (HWND dlg, UINT msg,
+Line 1109 
 keymanager_dlg_proc (HWND dlg, UINT msg,
          break;
      case WM_NOTIFY:
-         NMHDR * notify;
+         NMHDR *notify;
          POINT p;
          HMENU popup;
          notify = (NMHDR *)lparam;
-         if (notify == NULL)
+         if (!notify)
              break;
-         switch (notify->code)
+         switch (notify->code) {
-         {
          case TBN_QUERYDELETE:
-             SetWindowLong(dlg, DWL_MSGRESULT, TRUE);
+             SetWindowLong (dlg, DWL_MSGRESULT, TRUE);
              return TRUE;
          case TBN_QUERYINSERT:
-             SetWindowLong(dlg, DWL_MSGRESULT, TRUE);
+             SetWindowLong (dlg, DWL_MSGRESULT, TRUE);
              return TRUE;
          case TBN_GETBUTTONINFO:
-Line 879 
 keymanager_dlg_proc (HWND dlg, UINT msg,
+Line 1191 
 keymanager_dlg_proc (HWND dlg, UINT msg,
              return TRUE;
          case LVN_ITEMCHANGED:
-             if (((LPNMLISTVIEW)lparam)->uNewState) /* item selected? */
+             if (((LPNMLISTVIEW)lparam)->uNewState) { /* item selected? */
-             {
+                 kmi->lv_idx = listview_get_curr_pos (kmi->lv);
                  update_ui_items (dlg, kmi->lv);
                  return TRUE;
              }
-Line 888 
 keymanager_dlg_proc (HWND dlg, UINT msg,
+Line 1200 
 keymanager_dlg_proc (HWND dlg, UINT msg,
          case NM_RCLICK:
              if (notify->idFrom == IDC_KEYMISC_KEYLIST) {
-                 if (listview_get_curr_pos (kmi->lv) == -1)
+                 l_idx =listview_get_curr_pos (kmi->lv);
+                 if (l_idx == -1)
                      return TRUE; /* Popup only when a item was selected */
                  do_check_cache (kmi->lv, dlg, kmi->statbar);
                  GetCursorPos (&p);
                  hm = LoadMenu (glob_hinst, MAKEINTRESOURCE (IDR_WINPT_KEYMISC_CTX));
                  popup = GetSubMenu (hm, 0);
-             #ifndef LANG_DE
+                 translate_popupmenu_strings (popup);
-                 set_menu_text (popup, ID_KEYCTX_UID_COPY, _("Copy User ID to Clipboard"));
-                 set_menu_text (popup, ID_KEYCTX_KEYID_COPY, _("Copy Key ID to Clipboard"));
+                 if (km_check_for_seckey (kmi->lv, l_idx, &i))
-                 set_menu_text (popup, ID_KEYCTX_FPR_COPY, _("Copy Fingerprint to Clipboard"));
-                 set_menu_text (popup, ID_KEYCTX_KINFO_COPY, _("Copy Key Info to Clipboard"));
-                 set_menu_text (popup, ID_KEYCTX_COPY, _("Copy Key to Clipboard"));
-                 set_menu_text (popup, ID_KEYCTX_PASTE, _("Paste Key from Clipboard"));
-                 set_menu_text (popup, ID_KEYCTX_RECVFROM, _("Refresh from Keyserver"));
-                 set_menu_text (popup, ID_KEYCTX_MAXTRUST, _("Set Implicit &Trust"));
-                 set_menu_text (popup, ID_KEYCTX_LISTSIGS, _("&List Signatures"));
-                 set_menu_text (popup, ID_KEYCTX_PROPS, _("&Key Properties"));
-                 set_menu_text (popup, ID_KEYCTX_EDIT, _("Key Edit"));
-                 set_menu_text (popup, ID_KEYCTX_DEL, _("&Delete"));
-                 set_menu_text (popup, ID_KEYCTX_REV, _("&Revoke"));
-                 set_menu_text (popup, ID_KEYCTX_SIGN, _("&Sign"));
-                 set_menu_text (popup, ID_KEYCTX_ENABLE, _("&Enable"));
-                 set_menu_text (popup, ID_KEYCTX_DISABLE, _("&Disable"));
-                 set_menu_text (popup, ID_KEYCTX_RECVFROM, _("Re&fresh from Keyserver"));
-                 set_menu_text (popup, ID_KEYCTX_SETPREFKS, _("Set preferred Keyserver URL"));
-                 set_menu_text (popup, ID_KEYCTX_SENDMAIL, _("Send Key to Mail Recipient"));
-                 set_menu_text (popup, ID_KEYCTX_SETDEFKEY, _("Set as Default Key"));
-                 /* change popup texts */
-                 set_menu_text_bypos (popup, 0, _("Key Attributes"));
-                 set_menu_text_bypos (popup, 6, _("Add"));
-                 set_menu_text_bypos (popup, 19, _("Send to Keyserver"));
-             #endif
-                 idx = listview_get_curr_pos (kmi->lv);
-                 if (km_check_for_seckey (kmi->lv, idx, &i))
                      set_menu_state (popup, ID_KEYCTX_SETDEFKEY, MF_ENABLED);
                  if (i == 0)
                      set_menu_state (popup, ID_KEYCTX_MAXTRUST, MF_ENABLED);
-                 if (!km_check_for_seckey (kmi->lv, idx, NULL)) {
+                 if (!km_check_for_seckey (kmi->lv, l_idx, NULL)) {
-                     set_menu_state( popup, ID_KEYCTX_REV, MF_DISABLED|MF_GRAYED );
+                     set_menu_state (popup, ID_KEYCTX_REV, MF_DISABLED|MF_GRAYED);
-                     set_menu_state( popup, ID_KEYCTX_ADDKEY, MF_DISABLED|MF_GRAYED );
+                     set_menu_state (popup, ID_KEYCTX_ADDKEY, MF_DISABLED|MF_GRAYED);
-                     set_menu_state( popup, ID_KEYCTX_ADDUID, MF_DISABLED|MF_GRAYED );
+                     set_menu_state (popup, ID_KEYCTX_ADDUID, MF_DISABLED|MF_GRAYED);
-                     set_menu_state( popup, ID_KEYCTX_ADDREV, MF_DISABLED|MF_GRAYED );
+                     set_menu_state (popup, ID_KEYCTX_ADDREV, MF_DISABLED|MF_GRAYED);
-                     set_menu_state( popup, ID_KEYCTX_ADDPHOTO, MF_DISABLED|MF_GRAYED );
+                     set_menu_state (popup, ID_KEYCTX_ADDPHOTO, MF_DISABLED|MF_GRAYED );
                      set_menu_state (popup, ID_KEYCTX_SETPREFKS, MF_DISABLED|MF_GRAYED);
                  }
-                 else if( km_check_for_seckey (kmi->lv, idx, NULL)
+                 else if (km_check_for_seckey (kmi->lv, l_idx, NULL) &&
-                       && km_key_is_v3 (kmi->lv, idx)) {
+                          km_key_is_v3 (kmi->lv, l_idx)) {
                      /* PGP 2 keys, version 3 have no no support for photo-id's,
                         designated revokers and secondary keys. */
                      set_menu_state (popup, ID_KEYCTX_ADDKEY, MF_DISABLED|MF_GRAYED);
                      set_menu_state (popup, ID_KEYCTX_ADDREV, MF_DISABLED|MF_GRAYED);
                      set_menu_state (popup, ID_KEYCTX_ADDPHOTO, MF_DISABLED|MF_GRAYED);
                  }
-                 if( km_get_key_status( kmi->lv, idx ) & KM_FLAG_DISABLED )
+                 if (km_get_key_status( kmi->lv, l_idx ) & KM_FLAG_DISABLED)
-                     set_menu_state( popup, ID_KEYCTX_DISABLE, MF_DISABLED|MF_GRAYED );
+                     set_menu_state (popup, ID_KEYCTX_DISABLE, MF_DISABLED|MF_GRAYED);
                  else
-                     set_menu_state( popup, ID_KEYCTX_ENABLE, MF_DISABLED|MF_GRAYED );
+                     set_menu_state (popup, ID_KEYCTX_ENABLE, MF_DISABLED|MF_GRAYED);
-                 if (km_get_key_status (kmi->lv, idx) & KM_FLAG_REVOKED)
+                 if (km_get_key_status (kmi->lv, l_idx) & KM_FLAG_REVOKED ||
+                     km_get_key_status (kmi->lv, l_idx) & KM_FLAG_EXPIRED)
                      set_menu_state (popup, ID_KEYCTX_SIGN, MF_DISABLED|MF_GRAYED);
-                 if (mapi_init())
+                 if (!clip_contains_pgpkey ())
+                     set_menu_state (popup, ID_KEYCTX_PASTE, MF_DISABLED|MF_GRAYED);
+                 if (mapi_init ())
                      set_menu_state (popup, ID_KEYCTX_SENDMAIL, MF_DISABLED|MF_GRAYED);
                  /* Override 'Default Keyserver' with the actual name. */
                  host = kserver_get_hostname (0, -1, &port);
                  set_menu_text (popup, ID_KEYCTX_KS_DEFAULT, host);
                  popup_gpg_readonly (dlg, popup);
+                 if (listview_count_items (kmi->lv, 1) > 1)
+                     popup_multiple (dlg, popup);
                  TrackPopupMenu (popup, TPM_RIGHTALIGN, p.x, p.y, 0, dlg, NULL);
                  DestroyMenu (popup);
                  DestroyMenu (hm);
                  return TRUE;
              }
-             #if 0 /* XXX */
-             if( notify->idFrom == IDC_KEYMISC_GROUP ) {
-                 HWND tree = GetDlgItem( dlg, IDC_KEYMISC_GROUP );
-                 if( TreeView_GetSelection( tree ) ) {
-                     GetCursorPos( &p );
-                     hm = LoadMenu( glob_hinst, MAKEINTRESOURCE(IDR_WINPT_GROUP_CTX) );
-                     popup = GetSubMenu( hm, 0 );
-                     if( km_index == -1 )
-                         set_menu_state( popup, ID_GROUP_PASTE, MF_DISABLED|MF_GRAYED );
-                     set_menu_text( popup, ID_GROUP_PASTE, _("Paste into this group") );
-                     set_menu_text( popup, ID_GROUP_DELETE, _("Delete") );
-                     TrackPopupMenu( popup, TPM_RIGHTALIGN, p.x, p.y, 0, dlg, NULL );
-                     DestroyMenu( popup );
-                     DestroyMenu( hm );
-                     return TRUE;
-                 }
-             }
-             #endif
              break;
          case LVN_COLUMNCLICK:
              if (notify->idFrom == IDC_KEYMISC_KEYLIST) {
-                 NMLISTVIEW * p = (LPNMLISTVIEW) lparam;
+                 NMLISTVIEW *nft = (LPNMLISTVIEW) lparam;
                  int sortby = 0;
-                 switch (p->iSubItem) {
+                 switch (nft->iSubItem) {
                  case 0:  sortby = KEY_SORT_USERID; break;
                  case 1:  sortby = KEY_SORT_KEYID; break;
                  case 2:  sortby = KEY_SORT_IS_SECRET; break;
-Line 1004 
 keymanager_dlg_proc (HWND dlg, UINT msg,
+Line 1279 
 keymanager_dlg_proc (HWND dlg, UINT msg,
              break;
          }
          break;
-         }
      case WM_WINDOWPOSCHANGING:
          if (((WINDOWPOS*)lparam)->cx < 400)
-Line 1018 
 keymanager_dlg_proc (HWND dlg, UINT msg,
+Line 1292 
 keymanager_dlg_proc (HWND dlg, UINT msg,
          return TRUE;
      case WM_SYSCOMMAND:
-         if( LOWORD (wparam) == SC_CLOSE )
+         if (LOWORD (wparam) == SC_CLOSE)
-             EndDialog( dlg, TRUE );
+             EndDialog (dlg, TRUE);
          return FALSE;
      case WM_MENUSELECT:
-         menu_gpg_readonly (dlg, (HMENU)lparam, LOWORD (wparam));
+         change_edit_menu (kmi->lv, (HMENU)lparam, LOWORD (wparam));
+         change_key_menu ((HMENU)lparam, LOWORD (wparam));
          break;
      case WM_INITMENUPOPUP:
          if ((UINT)LOWORD (lparam) == 3) {
-             HMENU hm = (HMENU)wparam;
+             HMENU h = (HMENU)wparam;
-             set_menu_text_bypos (hm, 0, _("New"));
+             set_menu_text_bypos (h, 0, _("New"));
          }
          return FALSE;
      case WM_COMMAND:
-         if( gnupg_access_keyring( 1 ) ) {
+         /* Allow at least 'Exit' in such a case. */
-             msg_box( dlg, _("Could not access public keyring"), _("Key Manager"), MB_ERR );
+         if (gnupg_access_keyring (1) && LOWORD (wparam) != ID_KEYMISC_QUIT) {
+             msg_box (dlg, _("Could not access public keyring"),
+                      _("Key Manager"), MB_ERR);
              return FALSE;
          }
-         do_check_cache( kmi->lv, dlg, kmi->statbar );
+         do_check_cache (kmi->lv, dlg, kmi->statbar);
-         switch( LOWORD( wparam ) ) {
+         switch( LOWORD (wparam)) {
          case ID_KEYMISC_QUIT:
-             EndDialog( dlg, TRUE );
+             EndDialog (dlg, TRUE);
              return TRUE;
          case ID_KEYMISC_MAIL:
-Line 1055 
 keymanager_dlg_proc (HWND dlg, UINT msg,
+Line 1332 
 keymanager_dlg_proc (HWND dlg, UINT msg,
              break;
          case ID_KEYMISC_DELETE:
-             km_delete_keys (kmi->lv, dlg);
+         case ID_KEYMISC_DELETE2:
+             if (!km_delete_keys (kmi->lv, dlg))
+                 update_status_bar (kmi->statbar, kmi->lv);
              return TRUE;
          case ID_KEYMISC_SIGN:
-             if ( (idx = listview_get_curr_pos( kmi->lv )) == -1 ) {
+             if (kmi->lv_idx == -1) {
-                 msg_box( dlg, _("Please select a key."),  _("Key Manager"),
+                 msg_box (dlg, _("Please select a key."),
-                          MB_ERR );
+                          _("Key Manager"), MB_ERR);
-                 return TRUE;;
+                 return TRUE;
              }
-             if (km_check_key_status (kmi->lv, idx))
+             if (km_check_key_status (kmi->lv, kmi->lv_idx))
                  return TRUE;
-             key = (gpgme_key_t)listview_get_item2 (kmi->lv, idx);
+             key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
-             listview_get_item_text (kmi->lv, idx, 1, keyid, DIM (keyid)-1);
              memset (&k, 0, sizeof (k));
              k.ctx = key;
-             k.keyid = keyid;
+             k.keyid = key->subkeys->keyid;
              dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_KEYSIGN, dlg,
                                keysign_dlg_proc, (LPARAM)&k,
                                _("Key Signing"), IDS_WINPT_KEYSIGN);
              if (k.update)
-                 update_key (kmi->lv, idx, k.keyid, 0);
+                 update_key (kmi->lv, kmi->lv_idx, k.keyid, 0);
              return TRUE;
          case ID_KEYMISC_REVCERT:
-             idx = listview_get_curr_pos( kmi->lv );
+             if (kmi->lv_idx == -1) {
-             if( idx == -1 ) {
+                 msg_box (dlg, _("Please select a key."), _("Key Manager"), MB_ERR);
-                 msg_box( dlg, _("Please select a key."), _("Key Manager"), MB_ERR );
                  return TRUE;
              }
-             listview_get_item_text( kmi->lv, idx, 0, uid, sizeof uid -1 );
+             key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
-             listview_get_item_text( kmi->lv, idx, 1, keyid, sizeof keyid-1 );
+             if (!key)
-             if ( !km_check_for_seckey( kmi->lv, idx, NULL ) ) {
+                 BUG (NULL);
-                 msg_box( dlg, _("There is no secret key available!"), _("Key Manager"), MB_ERR );
+             if (!km_check_for_seckey (kmi->lv, kmi->lv_idx, NULL)) {
+                 msg_box (dlg, _("There is no secret key available!"),
+                         _("Key Manager"), MB_ERR);
                  return TRUE;
              }
              {
-                 char t[128];
+                 char state[64];
-                 listview_get_item_text( kmi->lv, idx, 5, t, sizeof t -1 );
+                 listview_get_item_text (kmi->lv, kmi->lv_idx, 5,
-                 if( strchr( t, 'R' ) ) {
+                                         state, sizeof (state) -1);
-                     msg_box( dlg, _("Key already revoked!"), _("Key Manager"), MB_INFO );
+                 if (strchr (state, 'R' )) {
+                     msg_box (dlg, _("Key already revoked!"),
+                              _("Key Manager"), MB_INFO);
                      return TRUE;
                  }
              }
              memset (&k, 0, sizeof (k));
              k.key_pair = 1;
-             k.keyid = keyid;
+             k.keyid = key->subkeys->keyid+8;
-             k.is_protected = km_check_if_protected (kmi->lv, idx);
+             k.is_protected = km_check_if_protected (kmi->lv, kmi->lv_idx);
              dialog_box_param(glob_hinst, (LPCSTR)IDD_WINPT_KEYREVOKE, dlg,
                               key_revoke_dlg_proc, (LPARAM)&k,
-                              _("Key Revocation"), IDS_WINPT_KEYREVOKE);
+                              _("Key Revocation Cert"), IDS_WINPT_KEYREVOKE);
              return TRUE;
          case ID_KEYMISC_TRUSTPATH:
-             idx = listview_get_curr_pos( kmi->lv );
+             if (kmi->lv_idx == -1) {
-             if( idx == -1 ) {
+                 msg_box (dlg, _("Please select a key."), _("Key Manager"), MB_ERR);
-                 msg_box( dlg, _("Please select a key."), _("Key Manager"), MB_ERR );
                  return TRUE;
              }
-             listview_get_item_text( kmi->lv, idx, 0, uid, sizeof uid -1 );
+             key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
-             listview_get_item_text( kmi->lv, idx, 1, keyid, sizeof keyid -1 );
+             if (km_check_for_seckey (kmi->lv, kmi->lv_idx, NULL)) {
-             if( km_check_for_seckey( kmi->lv, idx, NULL ) ) {
+                 msg_box (dlg, _("It does not make any sense with a key pair!"),
-                 msg_box( dlg, _("It does not make any sense with a key pair!"), _("Key Manager"), MB_OK );
+                          _("Key Manager"), MB_ERR);
-                 return FALSE;
+                 return TRUE;
              }
              memset (&k, 0, sizeof (k));
-             k.keyid = keyid;
+             k.keyid = key->subkeys->keyid+8;
-             k.uid = uid;
+             k.uid = key->uids->uid;
-             dialog_box_param( glob_hinst, (LPCSTR)IDD_WINPT_KEYTRUST, dlg,
+             dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_KEYTRUST, dlg,
                                keytrust_dlg_proc, (LPARAM)&k,
-                               _("List Trust Path"), IDS_WINPT_KEYTRUST );
+                               _("List Trust Path"), IDS_WINPT_KEYTRUST);
              return TRUE;
          case ID_KEYMISC_CHECKSIGS:
-             idx = listview_get_curr_pos (kmi->lv);
+             if (kmi->lv_idx == -1) {
-             if( idx == -1 ) {
+                 msg_box (dlg, _("Please select a key."), _("Key Manager"), MB_ERR);
-                 msg_box( dlg, _("Please select a key."), _("Key Manager"), MB_ERR );
+                 return TRUE;
-                 return FALSE;
              }
-             listview_get_item_text (kmi->lv, idx, 0, uid, DIM (uid)-1);
+             key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
-             listview_get_item_text (kmi->lv, idx, 1, keyid, DIM (keyid)-1);
+             if (!key)
+                 BUG (NULL);
              memset (&k, 0, sizeof (k));
-             k.keyid = keyid;
+             k.keyid = key->subkeys->keyid+8;
-             k.uid = uid;
+             k.uid = key->uids->uid;
-             k.ctx = (gpgme_key_t)listview_get_item2 (kmi->lv, idx);
+             k.ctx = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
              dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_KEYSIG, dlg,
                                keysig_dlg_proc, (LPARAM)&k,
                                _("Key Signature List" ), IDS_WINPT_KEYSIG);
              return TRUE;
          case ID_KEYMISC_PROPS:
-             idx = listview_get_curr_pos( kmi->lv );
+             if (kmi->lv_idx == -1) {
-             if( idx == -1 ) {
                  msg_box( dlg, _("Please select a key."), _("Key Manager"), MB_ERR );
-                 return FALSE;
+                 return TRUE;
              }
-             listview_get_item_text (kmi->lv, idx, 1, keyid, DIM (keyid)-1);
+             key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
-             listview_get_item_text (kmi->lv, idx, 2, type, DIM (type)-1);
+             if (!key)
+                 BUG (NULL);
              memset (&k, 0, sizeof (k));
-             k.key_pair = 0;
+             k.key_pair = km_check_for_seckey (kmi->lv, kmi->lv_idx, NULL)? 1 : 0;
-             k.keyid = keyid;
+             k.keyid = key->subkeys->keyid+8;
-             if( !strcmp( type, "pub/sec" ) || !strcmp( type, "pub/crd" ) )
-                 k.key_pair = 1;
              k.callback.ctl = kmi->lv;
-             k.callback.idx = idx;
+             k.callback.idx = kmi->lv_idx;
-             k.is_v3 = km_key_is_v3 (kmi->lv, idx);
+             k.is_v3 = km_key_is_v3 (kmi->lv, kmi->lv_idx);
              dialog_box_param( glob_hinst, (LPCSTR)IDD_WINPT_KEYPROPS, dlg,
                                keyprops_dlg_proc, (LPARAM)&k,
                                _("Key Properties"), IDS_WINPT_KEYPROPS );
              if (k.callback.new_val != 0) {
                  t = get_key_trust_str (k.callback.new_val);
-                 listview_add_sub_item (kmi->lv, idx, 6, t);
+                 listview_add_sub_item (kmi->lv, kmi->lv_idx, 6, t);
              }
              return TRUE;
          case ID_KEYMISC_RECACHE:
-             /* If there is already a reload request, don't bother the user with a message. */
+             /* If there is already a reload request,
-             if( keycache_get_reload() == 1 )
+                 don't bother the user with a message. */
-                 idx = IDYES;
+             if (keycache_get_reload() == 1)
+                 l_idx = IDYES;
              else {
-                 char t[256];
+                 char inf[256];
-                 _snprintf( t, sizeof t -1,
+                 _snprintf (inf, sizeof (inf) -1,
                             _("This is only useful when the keyring has been "
                               "modified (sign a key...).\n"
-                              "Do you really want to reload the keycache?") );
+                              "Do you really want to reload the keycache?"));
-                 idx = msg_box( dlg, t, _("Key Manager"), MB_YESNO );
+                 l_idx = msg_box (dlg, inf, _("Key Manager"), MB_YESNO);
              }
-             if( idx == IDYES ) {
+             if (l_idx == IDYES) {
                  rcs.kr_reload = rcs.kr_update = 1;
                  rcs.tr_update = 0;
-                 DialogBoxParam( glob_hinst, (LPCSTR)IDD_WINPT_KEYCACHE, dlg,
+                 DialogBoxParam (glob_hinst, (LPCSTR)IDD_WINPT_KEYCACHE, dlg,
-                                 keycache_dlg_proc, (LPARAM)&rcs );
+                                 keycache_dlg_proc, (LPARAM)&rcs);
-                 c = keycache_get_ctx( 1 );
+                 c = keycache_get_ctx (1);
-                 if( !c )
+                 if (!c)
-                     BUG( dlg );
+                     BUG (dlg);
-                 keylist_reload( kmi->lv, c, KEYLIST_LIST, KEY_SORT_USERID );
+                 keylist_reload (kmi->lv, c, KEYLIST_LIST, KEY_SORT_USERID);
                  refresh_keys = 0;
              }
              return TRUE;
          case ID_KEYMISC_REBUILD:
-             name=NULL;
+             name = NULL;
              gpg_rebuild_cache (&name);
-             if (name) {
+             if (name != NULL) {
-                 char *p = strchr (name, '\n');
+                 char *line = strchr (name, '\n');
-                 show_msg (dlg, 2000, p? name + (p-name)+1 : name);
+                 show_msg (dlg, 2000, line? name + (line-name)+1 : name);
-                 free (name);
+                 safe_free (name);
              }
              return TRUE;
          case ID_KEYMISC_NEWKEY:
              memset (&genkey, 0, sizeof (genkey));
              dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_KEYGEN, dlg,
                                keygen_dlg_proc, (LPARAM)&genkey, _("Key Generation"),
                                IDS_WINPT_KEYGEN);
-             if (genkey.newkey != NULL)
+             if (genkey.newkey != NULL) {
                  keylist_add_key (kmi->lv, KEYLIST_LIST, genkey.newkey);
+                 keylist_sort (kmi->lv, KEY_SORT_USERID);
+             }
              return TRUE;
          case ID_KEYMISC_CARDNEW:
-             if( !scard_support ) {
+             if (!scard_support) {
-                 msg_box( dlg, _("Smart Card support is not available."), _("Key Manager"), MB_INFO );
+                 msg_box (dlg, _("Smart Card support is not available."),
+                          _("Key Manager"), MB_INFO);
                  return TRUE;
              }
-             dialog_box_param( glob_hinst, (LPCSTR)IDD_WINPT_CARD_KEYGEN, dlg,
+             dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_CARD_KEYGEN, dlg,
                                card_keygen_dlg_proc, 0, _("Card Key Generation"),
-                               IDS_WINPT_CARD_KEYGEN );
+                               IDS_WINPT_CARD_KEYGEN);
              /* XXX: use new code */
-             if( keycache_get_reload() )
+             if (keycache_get_reload ())
-                 send_cmd_id( dlg, ID_KEYMISC_RECACHE );
+                 send_cmd_id (dlg, ID_KEYMISC_RECACHE);
              return TRUE;
          case ID_KEYMISC_KEYWIZARD:
              memset (&genkey, 0, sizeof (genkey));
              dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_KEYWIZARD, dlg,
-                               keygen_wizard_dlg_proc, (LPARAM)&genkey, _("Key Generation Wizard"),
+                               keygen_wizard_dlg_proc, (LPARAM)&genkey,
+                               _("Key Generation Wizard"),
                                IDS_WINPT_KEYWIZARD);
-             if (genkey.newkey != NULL)
+             if (genkey.newkey != NULL) {
                  keylist_add_key (kmi->lv, KEYLIST_LIST, genkey.newkey);
+                 keylist_sort (kmi->lv, KEY_SORT_USERID);
+             }
              return TRUE;
          case ID_KEYMISC_SENDRECV:
-             dialog_box_param( glob_hinst, (LPCSTR)IDD_WINPT_KEYSERVER, dlg,
+             memset (&genkey, 0, sizeof (genkey));
-                               keyserver_dlg_proc, 0, _("Keyserver Access"),
+             dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_KEYSERVER, dlg,
-                               IDS_WINPT_KEYSERVER );
+                               keyserver_dlg_proc, (LPARAM)&genkey, _("Keyserver Access"),
+                               IDS_WINPT_KEYSERVER);
+             if (genkey.newkey != NULL) {
+                 keylist_add_key (kmi->lv, KEYLIST_LIST, genkey.newkey);
+                 keylist_sort (kmi->lv, KEY_SORT_USERID);
+             }
              return TRUE;
          case ID_KEYMISC_GPGPREFS:
-             dialog_box_param( glob_hinst, (LPCSTR)IDD_WINPT_GPGPREFS, dlg,
+             dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_GPGPREFS, dlg,
                                gpgprefs_dlg_proc, 0, _("GnuPG Preferences"),
-                               IDS_WINPT_GPGPREFS );
+                               IDS_WINPT_GPGPREFS);
              return TRUE;
          case ID_KEYMISC_GPGOPT:
-             dialog_box_param( glob_hinst, (LPCSTR)IDD_WINPT_GPGOPT, dlg,
+             dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_GPGOPT, dlg,
-                               gpgopt_dlg_proc, 0, _("GnuPG Options" ),
+                               gpgopt_dlg_proc, 0, _("GnuPG Options"),
-                               IDS_WINPT_GPGOPT );
+                               IDS_WINPT_GPGOPT);
              return TRUE;
          case ID_KEYMISC_IMPORT:
-             t = get_fileopen_dlg (dlg, _("Choose Name of the Key File"), NULL, NULL);
+             t = get_fileopen_dlg (dlg, _("Choose Name of the Key File"),
+                                   NULL, NULL);
              if (t)
                  km_file_import (dlg, t);
              return TRUE;
-Line 1269 
 keymanager_dlg_proc (HWND dlg, UINT msg,
+Line 1560 
 keymanager_dlg_proc (HWND dlg, UINT msg,
              break;
          case ID_KEYMISC_EXPORT:
-             idx = listview_get_curr_pos (kmi->lv);
+             if (kmi->lv_idx == -1) {
-             if (idx == -1) {
+                 msg_box (dlg, _("Please select a key."),
-                 msg_box( dlg, _("Please select a key."), _("Key Manager"), MB_ERR );
+                          _("Key Manager"), MB_ERR);
                  return TRUE;
              }
              if (listview_count_items (kmi->lv, 1) > 1)
                  name = m_strdup ("Exported_GPG_Keys.asc");
              else {
-                 listview_get_item_text (kmi->lv, idx, 1, keyid, DIM (keyid)-1);
+                 key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
-                 name = gen_export_filename (keyid, 0);
+                 name = km_gen_export_filename (key->subkeys->keyid+8, 0);
              }
              t = get_filesave_dlg (dlg, _("Choose Name for Key File"), NULL, name);
              free_if_alloc (name);
-Line 1288 
 keymanager_dlg_proc (HWND dlg, UINT msg,
+Line 1579 
 keymanager_dlg_proc (HWND dlg, UINT msg,
              return TRUE;
          case ID_KEYMISC_EXPORT_PRIVKEY:
-             idx = listview_get_curr_pos( kmi->lv );
+             if (kmi->lv_idx == -1) {
-             if( idx == -1 ) {
+                 msg_box (dlg, _("Please select a key."), _("Key Manager"), MB_ERR);
-                 msg_box( dlg, _("Please select a key."), _("Key Manager"), MB_ERR );
                  return TRUE;
              }
-             if( !km_check_for_seckey( kmi->lv, idx, NULL ) ) {
+             if( !km_check_for_seckey( kmi->lv, kmi->lv_idx, NULL ) ) {
-                 msg_box( dlg, _("There is no corresponding secret key for this key."),
+                 msg_box (dlg, _("There is no corresponding secret key for this key."),
-                         _("Key Manager"), MB_ERR );
+                          _("Key Manager"), MB_ERR);
                  return TRUE;
              }
-             if( listview_count_items( kmi->lv, 1 ) > 1 ) {
+             if (listview_count_items (kmi->lv, 1) > 1) {
-                 msg_box( dlg, _("You can only export one secret key."), _("Key Manager"), MB_ERR );
+                 msg_box (dlg, _("You can only export one secret key."),
+                          _("Key Manager"), MB_ERR);
                  return TRUE;
              }
-             idx = msg_box( dlg,
+             i = msg_box (dlg,
                            _("This operation will export your *SECRET* key!\n\n"
                              "Never send this key to ANYONE, it should be available\n"
                              "ONLY on your machine and you may use this function\n"
                              "to copy the key to a safe place.\n\n"
                              "Do you really want to export the key?"),
-                           _("WARNING"), MB_INFO|MB_YESNO );
+                           _("WARNING"), MB_INFO|MB_YESNO);
-             if( idx == IDYES ) {
+             if (i == IDYES) {
-                 idx = listview_get_curr_pos( kmi->lv );
+                 key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
-                 listview_get_item_text( kmi->lv, idx, 1, keyid, sizeof (keyid)-8 );
+                 if (!key)
-                 name = gen_export_filename (keyid, 1);
+                     BUG (NULL);
+                 name = km_gen_export_filename (key->subkeys->keyid+8, 1);
                  t = get_filesave_dlg (dlg, _("Choose Name for Key File"), NULL, name);
                  if (t != NULL)
                      km_privkey_export (dlg, kmi->lv, t);
              }
              return TRUE;
          case ID_KEYMISC_INFO:
-             dialog_box_param( glob_hinst, (LPCSTR)IDD_WINPT_ABOUT, glob_hwnd,
+             dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_ABOUT, glob_hwnd,
                                about_winpt_dlg_proc, 0, _("About WinPT"),
-                               IDS_WINPT_ABOUT );
+                               IDS_WINPT_ABOUT);
+             break;
+         case ID_KEYMISC_WEBSITE:
+             ShellExecute (dlg, "open", "http://www.winpt.org",
+                           NULL, NULL, SW_SHOW);
              break;
          case ID_KEYMISC_HELP:
-             ShellExecute (dlg, "open", "winpt.chm", NULL, NULL, SW_SHOW);
+             start_help (dlg, 0);
              break;
          case ID_KEYMISC_OT:
-             dialog_box_param( glob_hinst, (LPCTSTR)IDD_WINPT_OWNERTRUST, glob_hwnd,
+             dialog_box_param (glob_hinst, (LPCTSTR)IDD_WINPT_OWNERTRUST,
-                               ownertrust_dlg_proc, 0,
+                               glob_hwnd, ownertrust_dlg_proc, 0,
-                               _("Ownertrust"), IDS_WINPT_OWNERTRUST );
+                               _("Ownertrust"), IDS_WINPT_OWNERTRUST);
              break;
          case ID_KEYMISC_EDITKEY:
-             idx = listview_get_curr_pos (kmi->lv);
+             if (kmi->lv_idx == -1)
-             if (idx == -1)
                  break;
-             listview_get_item_text (kmi->lv, idx, 1, keyid, sizeof (keyid)-1);
+             key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
+             if (!key)
+                 BUG (NULL);
              /* XXX: pub/crd = secret key does not work */
              memset (&k, 0, sizeof (k));
-             k.is_protected = km_check_if_protected (kmi->lv, idx);
+             k.is_protected = km_check_if_protected (kmi->lv, kmi->lv_idx);
-             k.key_pair = km_check_for_seckey (kmi->lv, idx, NULL);
+             k.key_pair = km_check_for_seckey (kmi->lv, kmi->lv_idx, NULL);
-             k.keyid = keyid;
+             k.keyid = key->subkeys->keyid+8;
-             k.is_v3 = km_key_is_v3 (kmi->lv, idx);
+             k.is_v3 = km_key_is_v3 (kmi->lv, kmi->lv_idx);
-             k.flags = km_get_key_status (kmi->lv, idx);
+             k.flags = km_get_key_status (kmi->lv, kmi->lv_idx);
              dialog_box_param (glob_hinst, (LPCTSTR)IDD_WINPT_KEYEDIT, dlg,
                                keyedit_main_dlg_proc, (LPARAM)&k,
                                _("Key Edit"), IDS_KEYCTX_EDIT);
              if (k.update)
-                 update_key (kmi->lv,  idx, keyid, 1);
+                 update_key (kmi->lv,  kmi->lv_idx, k.keyid, 1);
              break;
          case ID_KEYMISC_COPY:
-             km_index = listview_get_curr_pos (kmi->lv);
              km_clip_export (dlg, kmi->lv);
              break;
-Line 1364 
 keymanager_dlg_proc (HWND dlg, UINT msg,
+Line 1661 
 keymanager_dlg_proc (HWND dlg, UINT msg,
              break;
          case ID_KEYMISC_PASTE:
-             km_index = -1;
              km_clip_import (dlg);
              break;
          case ID_KEYCTX_SETPREFKS:
-             listview_get_item_text (kmi->lv, idx, 1, keyid, DIM(keyid)-1);
+             key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
+             if (!key)
+                 BUG (NULL);
              memset (&k, 0, sizeof (k));
-             k.keyid = keyid;
+             k.keyid = key->subkeys->keyid+8;
              keyedit_set_pref_keyserver (&k, dlg);
              break;
          case ID_KEYMISC_REFRESH_KEYS:
              if (listview_count_items (kmi->lv, 1) == 0) {
-                 msg_box (dlg, _("No key was selected, select all by default."), _("Key Manager"), MB_INFO);
+                 msg_box (dlg, _("No key was selected, select all by default."),
+                          _("Key Manager"), MB_INFO);
                  listview_select_all (kmi->lv);
              }
              km_refresh_from_keyserver (kmi->lv, dlg);
-Line 1418 
 keymanager_dlg_proc (HWND dlg, UINT msg,
+Line 1717 
 keymanager_dlg_proc (HWND dlg, UINT msg,
              break;
          case ID_KEYCTX_ADDKEY:
-             idx = listview_get_curr_pos (kmi->lv);
+             key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
-             listview_get_item_text( kmi->lv, idx, 1, keyid, DIM (keyid)-1);
+             if (!key)
+                 BUG (NULL);
              memset (&k, 0, sizeof (k));
-             k.key_pair = km_check_for_seckey (kmi->lv, idx, NULL);
+             k.key_pair = km_check_for_seckey (kmi->lv, kmi->lv_idx, NULL);
-             k.is_protected = km_check_if_protected (kmi->lv, idx);
+             k.is_protected = km_check_if_protected (kmi->lv, kmi->lv_idx);
-             k.keyid = keyid;
+             k.keyid = key->subkeys->keyid+8;
              keyedit_add_subkey (&k, dlg, NULL);
              if (k.update)
-                 update_key (kmi->lv, idx, keyid, 1);
+                 update_key (kmi->lv, kmi->lv_idx, k.keyid, 1);
              break;
          case ID_KEYCTX_ADDUID:
-             idx = listview_get_curr_pos (kmi->lv);
+             key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
-             listview_get_item_text( kmi->lv, idx, 1, keyid, DIM (keyid)-1);
+             if (!key)
+                 BUG (NULL);
              memset (&k, 0, sizeof (k));
-             k.key_pair = km_check_for_seckey (kmi->lv, idx, NULL);
+             k.key_pair = km_check_for_seckey (kmi->lv, kmi->lv_idx, NULL);
-             k.is_protected = km_check_if_protected (kmi->lv, idx);
+             k.is_protected = km_check_if_protected (kmi->lv, kmi->lv_idx);
-             k.keyid = keyid;
+             k.keyid = key->subkeys->keyid+8;
              keyedit_add_userid (&k, dlg, NULL);
              if (k.update)
-                 update_key (kmi->lv, idx, keyid, 1);
+                 update_key (kmi->lv, kmi->lv_idx, k.keyid, 1);
              break;
          case ID_KEYCTX_ADDREV:
-             idx = listview_get_curr_pos (kmi->lv);
+             key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
-             listview_get_item_text (kmi->lv, idx, 1, keyid, DIM (keyid)-1);
+             if (!key)
+                 BUG (NULL);
              memset (&k, 0, sizeof (k));
-             k.keyid = keyid;
+             k.keyid = key->subkeys->keyid+8;
-             k.is_protected = km_check_if_protected (kmi->lv, idx);
+             k.is_protected = km_check_if_protected (kmi->lv, kmi->lv_idx);
-             k.key_pair = km_check_for_seckey( kmi->lv, idx, NULL );
+             k.key_pair = km_check_for_seckey (kmi->lv, kmi->lv_idx, NULL);
              keyedit_add_revoker (&k, dlg);
              if (k.update)
-                 update_key (kmi->lv, idx, keyid, 1);
+                 update_key (kmi->lv, kmi->lv_idx, k.keyid, 1);
              break;
          case ID_KEYCTX_ADDPHOTO:
-             idx = listview_get_curr_pos (kmi->lv);
+             key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
-             listview_get_item_text (kmi->lv, idx, 1, keyid, DIM (keyid)-1);
+             if (!key)
+                 BUG (NULL);
              memset (&k, 0, sizeof (k));
-             k.keyid = keyid;
+             k.keyid = key->subkeys->keyid+8;
-             k.is_protected = km_check_if_protected (kmi->lv, idx);
+             k.is_protected = km_check_if_protected (kmi->lv, kmi->lv_idx);
-             k.key_pair = km_check_for_seckey (kmi->lv, idx, NULL);
+             k.key_pair = km_check_for_seckey (kmi->lv, kmi->lv_idx, NULL);
              keyedit_add_photo (&k, dlg);
              if (k.update)
-                 update_key (kmi->lv, idx, keyid, 1);
+                 update_key (kmi->lv, kmi->lv_idx, k.keyid, 1);
              break;
          case ID_KEYCTX_KS_NL:
-Line 1484 
 keymanager_dlg_proc (HWND dlg, UINT msg,
+Line 1787 
 keymanager_dlg_proc (HWND dlg, UINT msg,
          case ID_KEYCTX_UID_COPY:
              /* XXX: add generic function to support multiple selection
                      with a callback */
-             idx = listview_get_curr_pos( kmi->lv );
+             key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
-             listview_get_item_text( kmi->lv, idx, 0, uid, sizeof uid-1 );
+             name = utf8_to_wincp2 (key->uids->uid);
-             set_clip_text( NULL, uid, strlen( uid ) );
+             set_clip_text (NULL, name, strlen (name));
+             safe_free (name);
              break;
          case ID_KEYCTX_KEYID_COPY:
-             idx = listview_get_curr_pos( kmi->lv );
+             key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
-             listview_get_item_text( kmi->lv, idx, 1, uid, sizeof uid-1 );
+             set_clip_text (NULL, key->subkeys->keyid+8,
-             set_clip_text( NULL, uid, strlen( uid ) );
+                            strlen (key->subkeys->keyid+8));
              break;
          case ID_KEYCTX_FPR_COPY:
-             idx = listview_get_curr_pos( kmi->lv );
+             key = (gpgme_key_t) listview_get_item2 (kmi->lv, kmi->lv_idx);
-             key = (gpgme_key_t) listview_get_item2 (kmi->lv, idx);
+             //t = get_key_fpr (key);
-             if (key) {
+             t = key->subkeys->fpr;
-                 const char * s = get_key_fpr (key);
+             set_clip_text (NULL, t? t : "", t? strlen (t): 0);
-                 set_clip_text (NULL, s? s : "", s? strlen (s): 0);
-             }
              break;
          case ID_KEYCTX_KINFO_COPY:
-             idx = listview_get_curr_pos( kmi->lv );
+             key = (gpgme_key_t) listview_get_item2 (kmi->lv, kmi->lv_idx);
-             listview_get_item_text( kmi->lv, idx, 1, uid, sizeof uid-1 );
+             if (!key)
-             km_set_clip_info( uid );
+                 BUG (NULL);
+             km_set_clip_info (key->subkeys->keyid+8);
              break;
          case ID_KEYCTX_COPY:
-             km_index = listview_get_curr_pos (kmi->lv);
              km_clip_export (dlg, kmi->lv);
              break;
          case ID_KEYCTX_PASTE:
-             km_index = -1;
              km_clip_import (dlg);
              break;
          case ID_KEYCTX_DISABLE:
-             idx = listview_get_curr_pos (kmi->lv);
-             km_enable_disable_key (kmi->lv, dlg, idx, 0);
-             break;
          case ID_KEYCTX_ENABLE:
-             idx = listview_get_curr_pos (kmi->lv);
+             i = LOWORD (wparam) == ID_KEYCTX_ENABLE? 1 : 0;
-             km_enable_disable_key (kmi->lv, dlg, idx, 1);
+             key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
+             if (!key)
+                 BUG (NULL);
+             rc = km_enable_disable_key (kmi->lv, dlg, kmi->lv_idx, i);
+             if (!rc)
+                 update_key (kmi->lv, kmi->lv_idx, key->subkeys->keyid+8, 0);
+             /* XXX: switching a key from disabled -> enabled. does not
+                change the validity field in the KM. */
              break;
          case ID_KEYCTX_LISTSIGS:
-Line 1535 
 keymanager_dlg_proc (HWND dlg, UINT msg,
+Line 1839 
 keymanager_dlg_proc (HWND dlg, UINT msg,
              break;
          case ID_KEYCTX_MAXTRUST:
-             idx = listview_get_curr_pos (kmi->lv);
+             key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
-             listview_get_item_text (kmi->lv, idx, 1, keyid, DIM (keyid)-1);
+             if (!key)
-             rc = km_set_implicit_trust (dlg, kmi->lv, idx);
+                 BUG (NULL);
+             rc = km_set_implicit_trust (dlg, kmi->lv, kmi->lv_idx);
              if (!rc)
-                 update_key (kmi->lv, idx, keyid, 0);
+                 update_key (kmi->lv, kmi->lv_idx, key->subkeys->keyid+8, 0);
              break;
          case ID_KEYCTX_SETDEFKEY:
-             idx = listview_get_curr_pos (kmi->lv);
+             if (!km_check_key_status (kmi->lv, kmi->lv_idx)) {
-             if (!km_check_key_status (kmi->lv, idx)) {
+                 key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
-                 listview_get_item_text (kmi->lv, idx, 1, keyid, DIM (keyid)-1);
+                 rc = set_gnupg_default_key (key->subkeys->keyid+8);
-                 rc = set_gnupg_default_key (keyid);
                  if (rc)
-                     msg_box( dlg, winpt_strerror (rc), _("Key Manager"), MB_ERR);
+                     msg_box (dlg, winpt_strerror (rc), _("Key Manager"), MB_ERR);
-                 km_update_default_key_str (kmi->statbar);
+                 update_default_key_str (kmi->statbar);
              }
              break;
-         #if 0 /* XXX */
+         case ID_KEYMISC_VIEWKEYID:
+         case ID_KEYMISC_VIEWCIPHER:
+         case ID_KEYMISC_VIEWTYPE:
+         case ID_KEYMISC_VIEWCREAT:
+             DWORD n;
+             hm = GetMenu (dlg);
+             n = get_menu_state (hm, LOWORD (wparam));
+             set_menu_state (hm, LOWORD (wparam),
+                             n & MFS_CHECKED? MFS_UNCHECKED : MFS_CHECKED);
+             modify_listview_columns (kmi, LOWORD (wparam), !(n & MFS_CHECKED));
+             break;
          case ID_GROUP_NEW:
-             memset (&gcb, 0, sizeof (gcb));
-             gcb.gc = gc;
-             dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_GROUP, glob_hwnd,
-                              group_manager_dlg_proc, (LPARAM)&gcb, _("New Group"),
-                              IDS_WINPT_GROUP);
-             if( gcb.use_name )
-                 treeview_add_item( GetDlgItem(dlg, IDC_KEYMISC_GROUP), NULL, gcb.name );
-             return TRUE;
          case ID_GROUP_PASTE:
-             km_groups_add (gc, kmi->lv, km_index);
-             break;
          case ID_GROUP_DELETE:
-             km_groups_del (gc);
+             /* XXX: Implement group manager. */
-             break;
+             return TRUE;
-         #endif
+         case IDCANCEL:
+             EndDialog (dlg, TRUE);
+             return TRUE;
          }
          break;
-Line 1579 
 keymanager_dlg_proc (HWND dlg, UINT msg,
+Line 1886 
 keymanager_dlg_proc (HWND dlg, UINT msg,
      return FALSE;
  }

 Legend:



Removed from v.77
 


changed lines


 
Added in v.130
 Legend:



Removed from v.77
 


changed lines


 
Added in v.130
-Removed from v.77
+Added in v.130

[email protected]	ViewVC Help
Powered by ViewVC 1.1.26