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

Diff of /trunk/Src/wptKeyManagerDlg.cpp

Parent Directory | Revision Log | View Patch Patch

-revision 128 by twoaday,
Mon Dec 19 13:05:59 2005 UTC
+revision 447 by twoaday,
Mon Apr 16 19:42:28 2012 UTC
 Line 1
  /* wptKeyManagerDlg.cpp - WinPT Key Manager
-  *      Copyright (C) 2000-2005 Timo Schulz
+  *      Copyright (C) 2000-2006, 2008, 2009 Timo Schulz
   *      Copyright (C) 2004 Andreas Jobs
   *
   * This file is part of WinPT.
 Line 13
   * but WITHOUT ANY WARRANTY; without even the implied warranty of
   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * 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>
-Line 41
+Line 37
  #include "wptKeyserver.h"
  #include "wptKeyEdit.h"
  #include "wptRegistry.h"
+ #include "wptUTF8.h"
  /* Name and ID of the separator window. */
- #define KM_SEPARATOR_ID                10000
+ #define KM_SEPARATOR_ID                 10000
- #define WINDOWCLASS_SEPARATOR_CHILD "WINPT_SEP_CHILD"
+ #define WINDOWCLASS_SEPARATOR_CHILD     "WINPT_SEP_CHILD"
  /* Virtual key codes. */
  #ifndef VK_F
-Line 62
+Line 59
  static subclass_s keylist_proc;
- HIMAGELIST glob_imagelist;
- struct km_info {
+ struct km_info_s {
      /* Window positions */
      int pos_x, pos_y;
      int ypos_sep;
      int ypercent_sep;
+     /* Different kind of windows. */
+     HWND dlg;
      HWND hwnd_sep;
      HWND toolbar;
      HWND statbar;
+     /* Handle to the icon imagelist. */
+     HIMAGELIST iconlist;
+     keylist_ctrl_t  kl;
      listview_ctrl_t lv;
-     int             lv_idx;
+     int lv_idx;
      int keylist_sortby;
+     int magic;
+     int enable_redraw;
+     //unsigned int enable_groups:1;
  };
+ typedef struct km_info_s *km_info_t;
  /* Toolbar button structure. */
- struct mybuttons {
+ struct tb_button_s {
      long icon;
      long command;
      char *text;
  };
- struct mybuttons myb[] = {
+ /* The buttons in the toolbar. */
-     {IMI_KEY_DELETE, ID_KEYMISC_DELETE, "Delete"},
+ struct tb_button_s tbb[] = {
-     {IMI_KEY_PROPS,  ID_KEYMISC_PROPS,  "Properties"},
+     {IMI_KEY_DELETE, ID_KEYMISC_DELETE, (char*)"Delete"},
-     {IMI_KEY_SIGN,   ID_KEYMISC_SIGN,   "Sign"},
+     {IMI_KEY_PROPS,  ID_KEYMISC_PROPS,  (char*)"Properties"},
-     {IMI_KEY_IMPORT, ID_KEYMISC_IMPORT, "Import"},
+     {IMI_KEY_SIGN,   ID_KEYMISC_SIGN,   (char*)"Sign"},
-     {IMI_KEY_EXPORT, ID_KEYMISC_EXPORT, "Export"},
+     {IMI_KEY_IMPORT, ID_KEYMISC_IMPORT, (char*)"Import"},
+     {IMI_KEY_EXPORT, ID_KEYMISC_EXPORT, (char*)"Export"},
  };
+ static void km_gui_import (struct km_info_s *kmi, int cmd_id, void *param);
+ void key_get_clip_info (const char *keyid, char *buf, size_t buflen);
  /* Subclass the keylist listview control to allow extended commands. */
  static BOOL CALLBACK
  keylist_subclass_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
  {
+     struct keylist_ctrl_s kl;
      struct listview_ctrl_s lv;
+     struct km_info_s *kmi;
      switch (msg) {
+     case WM_DROPFILES:
+         kmi = (km_info_s *)keylist_proc.opaque;
+         km_gui_import (kmi, WM_DROPFILES, (void*)wparam);
+         break;
      case WM_LBUTTONDBLCLK:
          send_cmd_id (keylist_proc.dlg, ID_KEYMISC_PROPS);
          break;
-Line 129 
 keylist_subclass_proc (HWND dlg, UINT ms
+Line 148 
 keylist_subclass_proc (HWND dlg, UINT ms
              break;
          case VK_C:
              if (GetAsyncKeyState (VK_CONTROL)) {
                  lv.ctrl = GetDlgItem (keylist_proc.dlg, IDC_KEYMISC_KEYLIST);
-                 km_clip_export (keylist_proc.dlg, &lv);
+                 kl.lv = &lv;
+                 km_clip_export (keylist_proc.dlg, &kl);
              }
              break;
          case VK_P:
              if (GetAsyncKeyState (VK_CONTROL))
-                 km_clip_import (keylist_proc.dlg);
+                 send_cmd_id (keylist_proc.dlg, ID_KEYMISC_PASTE);
              break;
          case VK_F:
              if (GetAsyncKeyState (VK_CONTROL)) {
                  lv.ctrl = GetDlgItem (keylist_proc.dlg, IDC_KEYMISC_KEYLIST);
-                 km_find_key (dlg, &lv);
+                 kl.lv = &lv;
+                 km_find_key (dlg, &kl);
              }
              break;
          }
-Line 154 
 keylist_subclass_proc (HWND dlg, UINT ms
+Line 175 
 keylist_subclass_proc (HWND dlg, UINT ms
  }
- static HWND
- load_toolbar (HWND dlg, struct km_info *kmi)
+ static void
+ redraw_keylist (km_info_t kmi)
  {
+     kmi->enable_redraw = 1;
+     InvalidateRect(GetDlgItem (kmi->dlg, IDC_KEYMISC_KEYLIST), NULL, TRUE);
+ }
+ #define ico2idx(ico) km_imagelist_getindex (kmi->iconlist, (ico))
+ /* Create a new toolbar window with a pre-defined list of buttons. */
+ static HWND
+ create_toolbar (HWND dlg, struct km_info_s *kmi)
+ {
      HWND tbwnd;
      TBSAVEPARAMS tbsp;
      TBBUTTON tb_buttons[] = {
-         /*{imagelist_getindex(IMI_EXIT),       ID_KEYMISC_QUIT,   TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0L, 0},*/
+         {ico2idx (IMI_KEY_NEW),    ID_KEYMISC_KEYWIZARD, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L},
-         {imagelist_getindex(IMI_KEY_DELETE), ID_KEYMISC_DELETE, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},
+         {ico2idx (IMI_KEY_DELETE), ID_KEYMISC_DELETE, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},
-         {imagelist_getindex(IMI_KEY_PROPS),  ID_KEYMISC_PROPS,  TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},
+         {ico2idx (IMI_KEY_PROPS),  ID_KEYMISC_PROPS,  TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},
-         {imagelist_getindex(IMI_KEY_SIGN),   ID_KEYMISC_SIGN,   TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},
+         {ico2idx (IMI_KEY_SIGN),   ID_KEYMISC_SIGN,   TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},
+         {ico2idx (IMI_KEY_SEARCH), ID_KEYMISC_SENDRECV, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},
          {0,                                  0,                 0,               TBSTYLE_SEP,    {0}, 0L, 0},
-         {imagelist_getindex(IMI_KEY_IMPORT), ID_KEYMISC_IMPORT, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},
+         {ico2idx (IMI_KEY_FILE_IMPORT), ID_KEYMISC_IMPORT, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},
-         {imagelist_getindex(IMI_KEY_EXPORT), ID_KEYMISC_EXPORT, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},
+         {ico2idx (IMI_KEY_FILE_EXPORT), ID_KEYMISC_EXPORT, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},
-      };
+         {ico2idx (IMI_KEY_IMPORT), ID_KEYCTX_PASTE, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},
+         {ico2idx (IMI_KEY_EXPORT), ID_KEYCTX_COPY, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},
+     };
      tbwnd = CreateWindowEx (0, TOOLBARCLASSNAME, NULL,
                              WS_CHILD|TBSTYLE_TOOLTIPS|TBSTYLE_FLAT|CCS_ADJUSTABLE,
-, 0, 0, 0, dlg, (HMENU)IDR_WINPT_KMTB, glob_hinst, NULL);
+, 0, 0, 0, dlg, (HMENU)IDR_WINPT_KMTB,
-     if (tbwnd) {
+                             glob_hinst, NULL);
-         SendMessage (tbwnd, TB_BUTTONSTRUCTSIZE, (WPARAM) sizeof(TBBUTTON), 0);
+     SendMessage (tbwnd, TB_BUTTONSTRUCTSIZE, (WPARAM) sizeof (TBBUTTON), 0);
-         SendMessage (tbwnd, TB_SETIMAGELIST, 0, (LPARAM)glob_imagelist);
+     SendMessage (tbwnd, TB_SETIMAGELIST, 0, (LPARAM)kmi->iconlist);
-                 SendMessage (tbwnd, TB_AUTOSIZE, 0, 0);
+     SendMessage (tbwnd, TB_AUTOSIZE, 0, 0);
-         ShowWindow (tbwnd, SW_SHOW);
+     ShowWindow (tbwnd, SW_SHOW);
-         /* Restore toolbar */
+     /* Restore toolbar */
-         tbsp.hkr = HKEY_CURRENT_USER;
+     tbsp.hkr = HKEY_CURRENT_USER;
-         tbsp.pszSubKey = "Software\\WinPT";
+     tbsp.pszSubKey = "Software\\WinPT";
-         tbsp.pszValueName = "KM_toolbar";
+     tbsp.pszValueName = "KM_toolbar";
-         if (SendMessage(tbwnd, TB_SAVERESTORE, FALSE, (LPARAM)&tbsp ) == 0)
+     if (SendMessage (tbwnd, TB_SAVERESTORE, FALSE, (LPARAM)&tbsp) == 0)
-             SendMessage (tbwnd, TB_ADDBUTTONS, sizeof(tb_buttons) / sizeof(tb_buttons[0]),
+         SendMessage (tbwnd, TB_ADDBUTTONS,
-                          (LONG)&tb_buttons[0]);
+                      sizeof (tb_buttons) / sizeof (tb_buttons[0]),
-      }
+                      (LONG)&tb_buttons[0]);
-      return tbwnd;
+     return tbwnd;
  }
  /* Restore the width of the columns from the registry.
     If no bitstring was found, the default size is used. */
  int
- restore_column_size (listview_ctrl_t hd)
+ restore_column_info (struct km_info_s *kmi)
  {
      WORD *buf;
      HKEY root;
-     DWORD type;
+     DWORD type, size, i;
-     DWORD size = hd->cols*sizeof (WORD), i;
      LONG ec;
+     listview_ctrl_t lv = kmi->kl->lv;
+     size = lv->cols*sizeof (WORD);
      ec = RegOpenKeyEx (HKEY_CURRENT_USER, "Software\\WinPT", 0,
                         KEY_ALL_ACCESS, &root);
      if (ec != ERROR_SUCCESS)
-Line 210 
 restore_column_size (listview_ctrl_t hd)
+Line 248 
 restore_column_size (listview_ctrl_t hd)
      if (!buf)
          BUG (NULL);
      ec = RegQueryValueEx (root, "KMColumnSize", NULL, &type,
                            (BYTE*)buf, &size);
-     RegCloseKey (root);
      if (ec != ERROR_SUCCESS) {
+         RegCloseKey (root);
          free_if_alloc (buf);
          return -1;
      }
      /* check for garbled values. */
      for (i=0; i < size/2; i++) {
-         if (buf[i] > 512) {
+         if (buf[i] == 0 || buf[i] > 512) {
              free_if_alloc (buf);
              return -1;
          }
      }
-     for (i=0; i < size/2; i++) {
+     for (i=0; i < size/2; i++)
-         LVCOLUMN lvc;
+         listview_set_column_width (lv, i, buf[i]);
-         memset (&lvc, 0, sizeof (lvc));
-         lvc.mask = LVCF_WIDTH;
-         lvc.cx = buf[i];
-         ListView_SetColumn (hd->ctrl, i, &lvc);
-     }
      free_if_alloc (buf);
+     size = sizeof (kmi->keylist_sortby);
+     ec = RegQueryValueEx (root, "KMSortBy", NULL, &type,
+                           (BYTE*)&kmi->keylist_sortby, &size);
+     if (ec != ERROR_SUCCESS)
+         kmi->keylist_sortby = KEY_SORT_USERID;
+     RegCloseKey (root);
      return 0;
  }
  /* Save the current column width to the registry. */
  int
- save_column_size (listview_ctrl_t hd)
+ save_column_info (struct km_info_s *kmi)
  {
-     WORD *buf;
      HKEY root;
+     WORD *buf;
      LONG ec;
      int i;
-     buf = new WORD[hd->cols];
+     listview_ctrl_t lv = kmi->kl->lv;
+     buf = new WORD[lv->cols];
      if (!buf)
          BUG (NULL);
-     for (i=0; i < hd->cols; i++) {
+     for (i=0; i < lv->cols; i++) {
          LVCOLUMN lvc;
          memset (&lvc, 0, sizeof (lvc));
          lvc.mask = LVCF_WIDTH;
-         ListView_GetColumn (hd->ctrl, i, &lvc);
+         ListView_GetColumn (lv->ctrl, i, &lvc);
          buf[i] = lvc.cx;
      }
-Line 266 
 save_column_size (listview_ctrl_t hd)
+Line 306 
 save_column_size (listview_ctrl_t hd)
      }
      ec = RegSetValueEx (root, "KMColumnSize", 0, REG_BINARY,
-                         (const BYTE*)buf, 2*hd->cols);
+                         (const BYTE*)buf, 2*lv->cols);
+     if (ec == ERROR_SUCCESS) {
+         ec = RegSetValueEx (root, "KMSortBy", 0, REG_DWORD_BIG_ENDIAN,
+                             (const BYTE*)&kmi->keylist_sortby,
+                             sizeof (kmi->keylist_sortby));
+     }
      RegCloseKey (root);
      free_if_alloc (buf);
      return ec == ERROR_SUCCESS? 0 : -1;
  }
+ /* Restore the original size of the dialog. */
+ static void
+ restore_window_size (HWND dlg, struct km_info_s *kmi)
+ {
+     char *p;
+     int height = 0, width = 0;
+     /* Restore the original window size. */
+     p = get_reg_entry (HKEY_CURRENT_USER, "Software\\WinPT", "KM_Size_Width");
+     if (p) {
+         width = atoi (p);
+         free_if_alloc (p);
+     }
+     p = get_reg_entry (HKEY_CURRENT_USER, "Software\\WinPT", "KM_Size_Height");
+     if (p) {
+         height = atoi (p);
+         free_if_alloc (p);
+     }
+     if (height > 0 && width > 0)
+         SetWindowPos (dlg, HWND_TOP, kmi->pos_x, kmi->pos_y,
+                       height, width, SWP_SHOWWINDOW);
+ }
  /* 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;
-Line 295 
 do_center_window (HWND dlg, struct km_in
+Line 364 
 do_center_window (HWND dlg, struct km_in
          return;
      }
      else if (p)
-         pos_x = atol (p);
+         pos_x = atoi (p);
      p = get_reg_entry (HKEY_CURRENT_USER, "Software\\WinPT", "KM_Pos_Y");
      if (p && !strcmp (p, " ")) {
-Line 304 
 do_center_window (HWND dlg, struct km_in
+Line 373 
 do_center_window (HWND dlg, struct km_in
          return;
      }
      else if (p)
-         pos_y = atol (p);
+         pos_y = atoi (p);
      if (!pos_y && !pos_x) {
          center_window (dlg, NULL);
-Line 317 
 do_center_window (HWND dlg, struct km_in
+Line 386 
 do_center_window (HWND dlg, struct km_in
          || pos_y > GetSystemMetrics (SM_CYSCREEN)) {
          pos_x = pos_y = 0;
      }
+     kmi->pos_x = pos_x;
+     kmi->pos_y = pos_y;
      GetClientRect (dlg, &rect);
      MoveWindow (dlg, pos_x, pos_y, rect.right, rect.bottom, TRUE);
  }
-Line 324 
 do_center_window (HWND dlg, struct km_in
+Line 396 
 do_center_window (HWND dlg, struct km_in
  /* 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;
-Line 372 
 do_resize_window (HWND dlg, struct km_in
+Line 444 
 do_resize_window (HWND dlg, struct km_in
      /* Place the keylist above the separator */
      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 */
+ #if 0
-     h = GetDlgItem (dlg, IDC_KEYMISC_GTEXT);
+     if (kmi->enable_groups != 0) {
-     MoveWindow (h, rclient.left, rclient.top, 100, 14, bRepaint);
+         /* Place the group text and the group box below the separator */
-     rclient.top += 18;
+         h = GetDlgItem (dlg, IDC_KEYMISC_GTEXT);
+         MoveWindow (h, rclient.left, rclient.top, 100, 14, bRepaint);
-     h = GetDlgItem (dlg, IDC_KEYMISC_GROUP);
+         rclient.top += 18;
-     MoveWindow (h, rclient.left, rclient.top, rclient.right - rclient.left,
-                 (rclient.bottom < rclient.top) ?
+         h = GetDlgItem (dlg, IDC_KEYMISC_GROUP);
-: rclient.bottom - rclient.top, bRepaint);
+         MoveWindow (h, rclient.left, rclient.top,
+                     rclient.right - rclient.left,
+                     (rclient.bottom < rclient.top) ?
+: rclient.bottom - rclient.top, bRepaint);
+     }
+ #endif
      /* Repaint the whole thing */
      InvalidateRect (dlg, NULL, TRUE);
-Line 396 
 static bool
+Line 473 
 static bool
  clip_contains_pgpkey (void)
  {
      char *ctxt;
-     bool val = false;
+     bool val;
+     val = false;
      ctxt = get_clip_text (NULL);
      if (!ctxt || strlen (ctxt) < 512)
          val = false;
-Line 414 
 static void
+Line 492 
 static void
  do_create_minpopup (HWND dlg)
  {
      HMENU hm;
-     MENUITEMINFO mi;
-     char * s;
      POINT p;
      if (gpg_read_only || !clip_contains_pgpkey ())
          return;
      hm = CreatePopupMenu ();
-     if (!hm)
+     insert_menu_item (hm, 0, ID_KEYCTX_PASTE, _("Paste Key from Clipboard..."));
-         BUG( NULL );
-     memset (&mi, 0, sizeof mi);
-     mi.cbSize = sizeof mi;
-     s = (char *)_("Paste Key from Clipboard");
-     mi.fType = MF_STRING;
-     mi.dwTypeData = s;
-     mi.cch = strlen (s);
-     mi.fMask = MIIM_DATA | MIIM_ID | MIIM_TYPE;
-     mi.wID = ID_KEYCTX_PASTE;
-     InsertMenuItem (hm, 0, FALSE, &mi);
      GetCursorPos (&p);
      TrackPopupMenu (hm, 0, p.x, p.y, 0, dlg, NULL);
      DestroyMenu (hm);
  }
- /* Reload the key cache if requested. */
+ /* Update the default key entry in the status bar for dialog @dlg. */
- static void
+ void
- do_check_cache (listview_ctrl_t lv, HWND dlg, HWND sb)
+ update_default_key_str (HWND dlg)
  {
-     gpg_keycache_t cache;
+     const char *fmt;
+     char *keyid;
+     char defkeyinf[128];
-     if (keycache_get_reload ()) {
+     keyid = get_gnupg_default_key ();
-         keycache_reload (dlg);
+     if (!keyid)
-         keycache_set_reload (0);
+         return;
-         cache = keycache_get_ctx (1);
+     if ((keyid[0] >= 'A' && keyid[0] <= 'Z') ||
-         if (!cache)
+         (keyid[0] >= 'a' && keyid[0] <= 'z') ||
-             BUG (dlg);
+         (keyid[0] == '0' && keyid[1] == 'x'))
-         keylist_reload (lv, cache, KEYLIST_LIST, KEY_SORT_USERID);
+         fmt = _("Default Key: %s");
-         km_update_status_bar (sb, lv);
+     else
-     }
+         fmt = _("Default Key: 0x%s");
+     _snprintf (defkeyinf, sizeof (defkeyinf) - 1, fmt, keyid);
+     SendMessage (dlg, SB_SETTEXT, 0, (LPARAM)defkeyinf);
+     gpg_keycache_set_default_key (keycache_get_ctx (0), keyid);
+     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[256];
+     int nkeys, nsec;
+     nkeys = listview_count_items (lv, 0);
+     _snprintf (txt, DIM (txt)-1, _("%d keys"), nkeys);
+     SendMessage (sb, SB_SETTEXT, 2, (LPARAM)txt);
+     nsec = gpg_keycache_get_size (keycache_get_ctx (0));
+     _snprintf (txt, DIM (txt)-1, _("%d secret keys"), nsec);
+     SendMessage (sb, SB_SETTEXT, 1, (LPARAM)txt);
  }
-Line 460 
 long CALLBACK
+Line 549 
 long CALLBACK
  separator_wnd_proc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
  {
      static POINT last_mouse_pos;
+     PAINTSTRUCT ps;
+     RECT rect;
+     HPEN hpen;
      if (msg == WM_CREATE)
          SetWindowLong (hwnd, GWL_USERDATA,
-Line 467 
 separator_wnd_proc (HWND hwnd, UINT msg,
+Line 559 
 separator_wnd_proc (HWND hwnd, UINT msg,
      switch (msg) {
      case WM_PAINT:
-         PAINTSTRUCT ps;
-         RECT rect;
-         HPEN hpen;
          GetClientRect (hwnd, &rect);
          BeginPaint (hwnd, &ps);
-Line 478 
 separator_wnd_proc (HWND hwnd, UINT msg,
+Line 566 
 separator_wnd_proc (HWND hwnd, UINT msg,
          FillRect (ps.hdc, &rect, (HBRUSH)(COLOR_3DFACE+1));
          /* The lines from the light into the dark */
-         MoveToEx(ps.hdc, 0,0, NULL);
+         MoveToEx (ps.hdc, 0,0, NULL);
-         if ((hpen = CreatePen (PS_SOLID, 0, GetSysColor(COLOR_3DHILIGHT))) != NULL) {
+         hpen = CreatePen (PS_SOLID, 0, GetSysColor (COLOR_3DHILIGHT));
+         if (hpen != NULL) {
              SelectObject (ps.hdc, (LPVOID)hpen);
              LineTo (ps.hdc, rect.right, 0);
              DeleteObject (hpen);
          }
-         MoveToEx(ps.hdc, 0, 1, NULL);
+         MoveToEx (ps.hdc, 0, 1, NULL);
-         if ((hpen = CreatePen (PS_SOLID, 0, GetSysColor(COLOR_3DLIGHT))) != NULL) {
+         hpen = CreatePen (PS_SOLID, 0, GetSysColor (COLOR_3DLIGHT));
+         if (hpen != NULL) {
               SelectObject (ps.hdc, (LPVOID)hpen);
               LineTo (ps.hdc, rect.right, rect.bottom);
               DeleteObject (hpen);
           }
-         MoveToEx(ps.hdc, 0, rect.bottom-1, NULL);
+         MoveToEx (ps.hdc, 0, rect.bottom-1, NULL);
-         if ((hpen = CreatePen (PS_SOLID, 0, GetSysColor(COLOR_3DSHADOW))) != NULL) {
+         hpen = CreatePen (PS_SOLID, 0, GetSysColor(COLOR_3DSHADOW));
+         if (hpen != NULL) {
              SelectObject (ps.hdc, (LPVOID)hpen);
              LineTo (ps.hdc, rect.right, rect.bottom-1);
              DeleteObject (hpen);
          }
-         MoveToEx(ps.hdc, 0, rect.bottom, NULL);
+         MoveToEx (ps.hdc, 0, rect.bottom, NULL);
-         if ((hpen = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_3DDKSHADOW))) != NULL) {
+         hpen = CreatePen(PS_SOLID, 0, GetSysColor (COLOR_3DDKSHADOW));
+         if (hpen != NULL) {
              SelectObject (ps.hdc, (LPVOID)hpen);
              LineTo (ps.hdc, rect.right, rect.bottom);
              DeleteObject (hpen);
-Line 520 
 separator_wnd_proc (HWND hwnd, UINT msg,
+Line 612 
 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;
-             kmi = (struct km_info *)GetWindowLong (hwnd, GWL_USERDATA);
+             kmi = (struct km_info_s *)GetWindowLong (hwnd, GWL_USERDATA);
              if (kmi == NULL)
                  break;
              /* Calculate mouse movement */
-             p.x = LOWORD(lparam);
+             p.x = LOWORD (lparam);
-             p.y = HIWORD(lparam);
+             p.y = HIWORD (lparam);
              ClientToScreen (hwnd, &p);
-             GetWindowRect (hwnd, &r);
+             GetWindowRect (hwnd, &rect);
-             r.top += (short)(p.y - last_mouse_pos.y);
+             rect.top += (short)(p.y - last_mouse_pos.y);
-             r.bottom += (short)(p.y - last_mouse_pos.y);
+             rect.bottom += (short)(p.y - last_mouse_pos.y);
              last_mouse_pos.y = p.y;
              /* Apply mouse movement to window. Beware the MoveWindow is relaive
                 to parent NOT screen */
-             MapWindowPoints (NULL, GetParent(hwnd), (POINT*)&r, 2);
+             MapWindowPoints (NULL, GetParent(hwnd), (POINT*)&rect, 2);
-             kmi->ypos_sep = r.top;
+             kmi->ypos_sep = rect.top;
              kmi->ypercent_sep = 0; /* This forces do_resize_window to use abs. position */
-             do_resize_window (GetParent(hwnd), kmi);
+             do_resize_window (GetParent (hwnd), kmi);
              return 0;
          }
      }
-Line 555 
 separator_wnd_proc (HWND hwnd, UINT msg,
+Line 646 
 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)
+ register_separator_window (HWND dlg, struct km_info_s *kmi)
  {
      WNDCLASS wndclass;
      HWND h;
+     memset (&wndclass, 0, sizeof (wndclass));
      wndclass.style         = CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW;
      wndclass.lpfnWndProc   = separator_wnd_proc;
      wndclass.cbClsExtra    = 0;
-Line 574 
 regist_sep_wnd (HWND dlg, struct km_info
+Line 666 
 regist_sep_wnd (HWND dlg, struct km_info
      h = CreateWindowEx (WS_EX_WINDOWEDGE, WINDOWCLASS_SEPARATOR_CHILD, NULL,
                          WS_CHILD | WS_CLIPCHILDREN | WS_VISIBLE,
 , 400, 2000, 5, dlg, (HMENU) 0, glob_hinst, kmi);
      ShowWindow (h, SW_SHOW);
      return h;
  }
- #define enable_button(hwnd, cid) \
+ #define enable_button(hwnd, cid, item_selected) \
-     SendMessage ((hwnd), TB_ENABLEBUTTON, (cid), MAKELONG (key_selected, 0))
+     SendMessage ((hwnd), TB_ENABLEBUTTON, (cid), MAKELONG ((item_selected), 0))
  /* Interactive modification of the dialog item which depend if an item
     is selected or not and what kind of item. @lv is the list view with
     the items. */
  void
- update_ui_items (HWND hwnd, listview_ctrl_t lv)
+ update_ui_items (HWND hwnd, keylist_ctrl_t kl)
  {
-     HWND hwnd_child;
+     HWND tb_hwnd;
      HMENU hmenu;
-     int key_selected = 0;
+     listview_ctrl_t lv = kl->lv;
-     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 key_selected;
+     int key_has_sec;
+     int key_inv = 0;
      int i, state=0;
      /* Get some states */
      key_selected = SendMessage (GetDlgItem (hwnd, IDC_KEYMISC_KEYLIST),
                                             LVM_GETSELECTEDCOUNT, 0, 0)
-Line 606 
 update_ui_items (HWND hwnd, listview_ctr
+Line 699 
 update_ui_items (HWND hwnd, listview_ctr
      key_has_sec = FALSE;
      if (key_selected) {
          i = listview_get_curr_pos (lv);
-         key_has_sec = km_check_for_seckey (lv, i, NULL) ? TRUE : FALSE;
+         key_has_sec = km_check_for_seckey (kl, i, NULL) ? TRUE : FALSE;
-         key_inv = km_get_key_status (lv, i) & KM_FLAG_REVOKED ||
+         key_inv = km_get_key_status (kl, i) & KM_FLAG_REVOKED ||
-                   km_get_key_status (lv, i) & KM_FLAG_EXPIRED;
+                   km_get_key_status (kl, i) & KM_FLAG_EXPIRED;
      }
      /* Enable / disable toolbar buttons */
-     hwnd_child = GetDlgItem (hwnd, IDR_WINPT_KMTB);
+     tb_hwnd = GetDlgItem (hwnd, IDR_WINPT_KMTB);
-     enable_button (hwnd_child, ID_KEYMISC_DELETE);
+     enable_button (tb_hwnd, ID_KEYMISC_DELETE, key_selected);
-     enable_button (hwnd_child, ID_KEYMISC_PROPS);
+     enable_button (tb_hwnd, ID_KEYMISC_PROPS, key_selected);
-     enable_button (hwnd_child, ID_KEYMISC_SIGN);
+     enable_button (tb_hwnd, ID_KEYMISC_SIGN, key_selected && !key_inv);
-     enable_button (hwnd_child, ID_KEYMISC_EXPORT);
+     enable_button (tb_hwnd, ID_KEYMISC_EXPORT, key_selected);
+     enable_button (tb_hwnd, ID_KEYCTX_COPY, key_selected);
+     enable_button (tb_hwnd, ID_KEYCTX_PASTE, clip_contains_pgpkey ());
      /* Enable / disable menu items */
      state = key_selected? MF_ENABLED : MF_DISABLED|MF_GRAYED;
      hmenu = GetMenu (hwnd);
      set_menu_state (hmenu, ID_KEYMISC_EXPORT, state);
-     set_menu_state (hmenu, ID_KEYMISC_EXPORT_PRIVKEY, state);
-     set_menu_state (hmenu, ID_KEYMISC_REVCERT, state);
      set_menu_state (hmenu, ID_KEYMISC_DELETE, state);
      set_menu_state (hmenu, ID_KEYMISC_PROPS, state);
      set_menu_state (hmenu, ID_KEYMISC_EDITKEY, state);
-     set_menu_state (hmenu, ID_KEYMISC_CHECKSIGS, state);
+     set_menu_state (hmenu, ID_KEYMISC_CHECKSIGS,
-     set_menu_state (hmenu, ID_KEYMISC_SIGN, key_selected && !key_inv ? MF_ENABLED : MF_GRAYED);
+                     key_selected && !key_inv ? MF_ENABLED : MF_GRAYED);
+     set_menu_state (hmenu, ID_KEYMISC_SIGN,
+                     key_selected && !key_inv ? 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 all secret-key functions when no secret key is available. */
+     if (!secret_key_available ()) {
+         enable_button (tb_hwnd, ID_KEYMISC_SIGN, FALSE);
+         set_menu_state (hmenu, ID_KEYMISC_SIGN, MF_GRAYED);
+     }
  }
-Line 657 
 popup_multiple (HWND dlg, HMENU hm)
+Line 762 
 popup_multiple (HWND dlg, HMENU hm)
          ID_KEYCTX_PROPS,
          ID_KEYCTX_SENDMAIL,
 };
-     int i;
+     for (int i=0; resids[i] != 0; i++)
-     for (i=0; i < resids[i] != 0; i++)
          set_menu_state (hm, resids[i], MF_GRAYED);
  }
-Line 682 
 popup_gpg_readonly (HWND dlg, HMENU hm)
+Line 786 
 popup_gpg_readonly (HWND dlg, HMENU hm)
          ID_KEYCTX_ADDREV,
      };
-     int i;
      if (gpg_read_only == 0)
          return;
-     for (i=0; resids[i] != 0; i++)
+     for (int i=0; resids[i] != 0; i++)
          set_menu_state (hm, resids[i], MF_GRAYED);
  }
-Line 736 
 change_key_menu (HMENU hm, int id)
+Line 839 
 change_key_menu (HMENU hm, int id)
      };
      int *resids;
-     int i;
      if (gpg_read_only == 0)
-Line 748 
 change_key_menu (HMENU hm, int id)
+Line 850 
 change_key_menu (HMENU hm, int id)
      default:resids = edit_resids; break;
      }
-     for (i=0; resids[i] != 0; i++)
+     for (int i=0; resids[i] != 0; i++)
          set_menu_state (hm, resids[i], MF_GRAYED);
  }
- /* Return a user-friendly name for a key derrived from
-    name. If @is_secret is 1, a secret key name will be generated. */
- static char*
- 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;
- }
  /* Reload a single key in the cache. */
  static void
- update_key (listview_ctrl_t lv, int pos, const char *keyid, int keypair)
+ update_key (keylist_ctrl_t kl, int pos, const char *keyid, int keypair)
  {
-     gpgme_key_t key;
+     struct winpt_key_s key;
      keycache_update (0, keyid);
      if (keypair)
          keycache_update (1, keyid);
-     /* because we replaced the key item, we need to update the
+     memset (&key, 0, sizeof (key));
-        address of the pointer in the ListView control. */
+     if (winpt_get_pubkey (keyid, &key))
-     get_pubkey (keyid, &key);
+         BUG (0);
-     keylist_upd_key (lv, pos, key);
+     keylist_upd_key (kl, pos, key.ext, key.ctx);
+     keyring_check_last_access ();
  }
-Line 809 
 setup_status_bar (HWND dlg, listview_ctr
+Line 886 
 setup_status_bar (HWND dlg, listview_ctr
      for (i=1; i <= 3; i++)
          partpos[i-1] = r.right/3*i;
      statbar = CreateStatusWindow (WS_CHILD | WS_VISIBLE | CCS_BOTTOM,
-                                   "status bar", dlg, KM_SEPARATOR_ID);
+                                   "WinPT_Status_Bar", dlg, KM_SEPARATOR_ID);
+     if (!statbar)
+         BUG (NULL);
      ShowWindow (statbar, SW_SHOW);
      SendMessage (statbar, SB_SETPARTS, (WPARAM)3, (LPARAM)partpos);
-     km_update_default_key_str (statbar);
+     update_default_key_str (statbar);
-     km_update_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,
+         ID_KEYMISC_VIEWUID,
+xFFFFFF
+     };
+     listview_ctrl_t lv = kmi->kl->lv;
+     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")},
+     {8, 160,(char *)_("Description")},
+     {0, 0, NULL}
+     };
+     UINT pos;
+     for (pos=0; resids[pos] != 0xFFFFFF; pos++) {
+         if (m_uid == resids[pos])
+             break;
+     }
+     if (!checked)
+         listview_del_column (lv, (int)pos);
+     else {
+         listview_add_column (lv, &cols[pos]);
+         keylist_upd_col (kmi->kl, 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)
-Line 832 
 translate_menu_strings (HWND dlg)
+Line 976 
 translate_menu_strings (HWND dlg)
      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_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_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_NEWKEY, _("&Expert..."));
-     set_menu_text (menu, ID_KEYMISC_KEYWIZARD, _("&Normal"));
+     set_menu_text (menu, ID_KEYMISC_KEYWIZARD, _("&Normal..."));
-     set_menu_text (menu, ID_KEYMISC_EDIT, _("Edit"));
+     set_menu_text (menu, ID_KEYMISC_EDIT, _("Edit..."));
-     set_menu_text (menu, ID_KEYMISC_SIGN, _("&Sign"));
+     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"));
+     set_menu_text (menu, ID_KEYMISC_REVCERT, _("&Revoke Cert..."));
-     set_menu_text (menu, ID_KEYMISC_CHECKSIGS, _("&List Signatures"));
+     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_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_PROPS, _("&Properties..."));
-     set_menu_text (menu, ID_KEYMISC_GPGOPT, _("Options"));
+     set_menu_text (menu, ID_KEYMISC_GPGOPT, _("GPG &Options..."));
-     set_menu_text (menu, ID_KEYMISC_GPGPREFS, _("Preferences"));
+     set_menu_text (menu, ID_KEYMISC_GPGPREFS, _("&GPG Preferences..."));
+     set_menu_text (menu, ID_KEYMISC_WINPTPREFS, _("&WinPT 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_INFO, _("Info"));
      set_menu_text (menu, ID_KEYMISC_HELP, _("&Help"));
+     set_menu_text (menu, ID_KEYMISC_DEVWWW, _("&Developer Website"));
+     set_menu_text (menu, ID_KEYMISC_WEBSITE, _("WinPT &Website"));
+     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"));
+     set_menu_text (menu, ID_KEYMISC_VIEWUID, _("User ID"));
-     /* XXX: implement help code. */
+     if (!start_help (NULL, 1))
-     set_menu_state (menu, ID_KEYMISC_HELP, MF_GRAYED);
+         set_menu_state (menu, ID_KEYMISC_HELP, MF_GRAYED);
      SetMenu (dlg, menu);
  }
-Line 880 
 translate_popupmenu_strings (HMENU popup
+Line 1032 
 translate_popupmenu_strings (HMENU popup
      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_EMAIL_COPY, _("Copy E-Mail 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_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_LISTSIGS, _("&List Signatures..."));
-     set_menu_text (popup, ID_KEYCTX_PROPS, _("&Properties"));
+     set_menu_text (popup, ID_KEYCTX_PROPS, _("&Properties..."));
-     set_menu_text (popup, ID_KEYCTX_EDIT, _("Key Edit"));
+     set_menu_text (popup, ID_KEYCTX_EDIT, _("Edit..."));
      set_menu_text (popup, ID_KEYCTX_DEL, _("&Delete"));
-     set_menu_text (popup, ID_KEYCTX_REV, _("&Revoke"));
+     set_menu_text (popup, ID_KEYCTX_REV, _("&Revoke Cert..."));
-     set_menu_text (popup, ID_KEYCTX_SIGN, _("&Sign"));
+     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_SETPREFKS, _("Set preferred Keyserver..."));
-     set_menu_text (popup, ID_KEYCTX_SENDMAIL, _("Send Key to Mail Recipient"));
+     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_SETDEFKEY, _("Set as Default Signing Key"));
      set_menu_text (popup, ID_KEYCTX_ADDKEY, _("Key..."));
      set_menu_text (popup, ID_KEYCTX_ADDUID, _("User ID..."));
-Line 903 
 translate_popupmenu_strings (HMENU popup
+Line 1056 
 translate_popupmenu_strings (HMENU popup
      set_menu_text (popup, ID_KEYCTX_ADDREV, _("Revoker..."));
      /* change popup texts */
-     set_menu_text_bypos (popup, 0, _("Key Attributes"));
+     set_menu_text_bypos (popup, 0, _("Attributes"));
-     set_menu_text_bypos (popup, 6, _("Add"));
+     set_menu_text_bypos (popup, 7, _("Add"));
-     set_menu_text_bypos (popup, 19, _("Send to Keyserver"));
+     set_menu_text_bypos (popup, 15, _("Send to Keyserver"));
+ }
+ static int
+ km_gui_adjust_column_images (struct km_info_s *kmi, int sortby)
+ {
+     HWND hheader;
+     HDITEM hdi;
+     listview_ctrl_t ctx = kmi->kl->lv;
+     int idx, sort_desc = 0;
+     hheader = ListView_GetHeader (ctx->ctrl);
+     if (!hheader)
+         return 0;
+     /* Remove image from all header fields */
+     memset (&hdi, 0, sizeof(hdi));
+     for (int i=0; i < 7; i++) {
+         hdi.mask = HDI_FORMAT;
+         Header_GetItem (hheader, i, &hdi);
+         hdi.fmt &= ~HDF_IMAGE;
+         Header_SetItem (hheader, i, &hdi);
+     }
+     switch (sortby & ~KEYLIST_SORT_DESC) {
+     case KEY_SORT_USERID:    idx = 0; break;
+     case KEY_SORT_KEYID:     idx = 1; break;
+     case KEY_SORT_IS_SECRET: idx = 2; break;
+     case KEY_SORT_LEN:       idx = 3; break;
+     case KEY_SORT_VALIDITY:  idx = 5; break;
+     case KEY_SORT_OTRUST:    idx = 6; break;
+     case KEY_SORT_CREATED:   idx = 7; break;
+     case KEY_SORT_ALGO:      idx = 8; break;
+     default:                 idx = 0; break;
+     }
+     sort_desc = sortby & KEYLIST_SORT_DESC;
+     /* Set image to currently sorted field */
+     memset (&hdi, 0, sizeof(hdi));
+     hdi.mask = HDI_IMAGE | HDI_FORMAT;
+     Header_GetItem (hheader, idx, &hdi);
+     hdi.fmt |= HDF_IMAGE | HDF_BITMAP_ON_RIGHT;
+     if (!ctx->ext_chkbox)
+         hdi.iImage = km_imagelist_getindex (kmi->iconlist,
+                                             sort_desc? IMI_SORT_DOWNARROW :
+                                                        IMI_SORT_UPARROW);
+     else
+         hdi.iImage = sort_desc? KEY_IMG_SORT_DOWN : KEY_IMG_SORT_UP;
+     Header_SetItem (hheader, idx, &hdi);
+     return 0;
+ }
+ /* Return true if the cache contain marked keys. */
+ static bool
+ updated_keys_avail (void)
+ {
+     gpg_keycache_t kc = keycache_get_ctx (1);
+     struct keycache_s *k;
+     for (k = kc->item; k; k = k->next) {
+         if (k->flags)
+             return true;
+     }
+     return false;
+ }
+ /* Find the index of the key identified by @key. */
+ static int
+ find_keypos (listview_ctrl_t lv, gpgme_key_t key)
+ {
+     char keyid[32+1];
+     for (int i=0; i < listview_count_items (lv, 0); i++) {
+         listview_get_item_text (lv, i, KM_COL_KEYID, keyid, sizeof (keyid)-1);
+         if (!strcmp (key->subkeys->keyid+8, keyid+2))
+             return i;
+     }
+     return -1;
  }
+ /* Add all recently updated keys in the cache to the list
+    and refresh all GUI elements. */
+ static void
+ refresh_keylist (struct km_info_s *kmi)
+ {
+     struct keycache_s *ctx;
+     gpg_keycache_t kc;
+     int nadded = 0;
+     int status=0, pos;
+     kc = keycache_get_ctx (1);
+     while (!gpg_keycache_next_updated_key (kc, &ctx, &status)) {
+         if (status == KC_FLAG_ADD) {
+             keylist_add_key (kmi->kl, KEYLIST_LIST, ctx, ctx->key);
+             nadded++;
+         }
+         else {
+             pos = find_keypos (kmi->kl->lv, ctx->key);
+             if (pos != -1)
+                 keylist_upd_key (kmi->kl, pos, ctx, ctx->key);
+         }
+     }
+     /* if keys were added, we need to sync the key array. */
+     kmi->enable_redraw = 0;
+     if (nadded > 0)
+         keylist_sync (kmi->kl);
+     keylist_sort (kmi->kl, kmi->keylist_sortby);
+     km_gui_adjust_column_images (kmi, kmi->keylist_sortby);
+     update_status_bar (kmi->statbar, kmi->kl->lv);
+     keyring_check_last_access ();
+     SetForegroundWindow (kmi->dlg);
+     if (nadded > 0)
+         redraw_keylist (kmi);
+ }
+ /* Reload the key cache. */
+ static void
+ keycache_reload (HWND dlg)
+ {
+     refresh_cache_s rcs;
+     memset (&rcs, 0, sizeof rcs);
+     rcs.kring_update = 1;
+     DialogBoxParam (glob_hinst, (LPCSTR)IDD_WINPT_KEYCACHE, dlg,
+                     keycache_dlg_proc, (LPARAM)&rcs);
+ }
+ /* Check if the secret keyring contains at least one
+    key with ultimate trust.
+    Return value: 0 on success. */
+ int
+ check_ultimate_trusted_key (gpg_keycache_t _sec)
+ {
+     struct keycache_s *n;
+     int nkeys = 0;
+     for (n = _sec->item; n; n = n->next) {
+         if (n->pubpart &&
+             n->pubpart->key->owner_trust == GPGME_VALIDITY_ULTIMATE)
+             return 0;
+         nkeys++;
+     }
+     /* if we do not have any secret keys, it does not make sense
+        to return an error. */
+     if (nkeys == 0)
+         return 0;
+     return -1;
+ }
+ /* Reload the entire key cache and update the listview. */
+ static void
+ reload_keycache (struct km_info_s *kmi)
+ {
+     gpg_keycache_t cache;
+     kmi->enable_redraw = 0;
+     keycache_reload (kmi->dlg);
+     cache = keycache_get_ctx (KEYCACHE_PUB);
+     keylist_reload (kmi->kl, cache, KEYLIST_LIST, kmi->keylist_sortby);
+     update_status_bar (kmi->statbar, kmi->kl->lv);
+     keyring_check_last_access ();
+     redraw_keylist (kmi);
+     SetForegroundWindow (kmi->dlg);
+ }
+ /* Handle all import request. */
+ static void
+ km_gui_import (struct km_info_s *kmi, int cmd_id, void *param)
+ {
+     int newkeys = 0, newsks = 0;
+     int err = 0;
+     switch (cmd_id) {
+     case ID_KEYMISC_PASTE:
+         err = km_clip_import (kmi->dlg, &newkeys, &newsks);
+         break;
+     case ID_KEYMISC_IMPORT:
+         err = km_file_import (kmi->dlg, NULL, &newkeys, &newsks);
+         break;
+     case WM_DROPFILES:
+         err = km_dropped_file_import (kmi->dlg, (HDROP)param,
+                                       &newkeys, &newsks);
+         break;
+     default:
+         err = 1;
+         break;
+     }
+     if (!err && !newsks && (newkeys > 0 && newkeys < KM_PRELOAD_KEYS))
+         refresh_keylist (kmi);
+     else if (!err) /* avoid to spawn too much processes. */
+         reload_keycache (kmi);
+     SetForegroundWindow (kmi->dlg);
+ }
+ /* Copy the requested key information (@what) to the clipboard.
+    If multiple items were selected, each key info is copied to
+    the clipboard. The data is separated by \r\n. */
+ static void
+ copy_key_info (int what, struct km_info_s *kmi)
+ {
+     gpgme_data_t out;
+     gpgme_key_t key;
+     struct keycache_s *kci = NULL;
+     size_t n=0;
+     char *p, tmp[256];
+     int i=0, end = listview_count_items (kmi->kl->lv, 0);
+     bool single = false;
+     /* Do not iterate over the entire list if just one item is selected. */
+     n = listview_count_items (kmi->kl->lv, 1);
+     if (n == 1) {
+         i = kmi->lv_idx;
+         end = i+1;
+         single = true;
+     }
+     gpgme_data_new (&out);
+     for (; i < end; i++) {
+         if (!listview_get_item_state (kmi->kl->lv, i))
+             continue;
+         switch (what) {
+         case ID_KEYCTX_EMAIL_COPY:
+             key = km_get_key_ptr (kmi->kl, i, NULL);
+             gpgme_data_write (out, key->uids->email, strlen (key->uids->email));
+             if (!single) gpgme_data_write (out, "\r\n", 2);
+             break;
+         case ID_KEYCTX_UID_COPY:
+             key = km_get_key_ptr (kmi->kl, i, &kci);
+             gpgme_data_write (out, kci->uids->uid, strlen (kci->uids->uid));
+             if (!single) gpgme_data_write (out, "\r\n", 2);
+             break;
+         case ID_KEYCTX_KEYID_COPY:
+             key = km_get_key_ptr (kmi->kl, i, NULL);
+             gpgme_data_write (out, "0x", 2);
+             gpgme_data_write (out, key->subkeys->keyid+8, 8);
+             if (!single) gpgme_data_write (out, "\r\n", 2);
+             break;
+         case ID_KEYCTX_FPR_COPY:
+             key = km_get_key_ptr (kmi->kl, i, NULL);
+             gpgme_data_write (out, key->subkeys->fpr, strlen (key->subkeys->fpr));
+             if (!single) gpgme_data_write (out, "\r\n", 2);
+             break;
+         case ID_KEYCTX_KINFO_COPY:
+             key = km_get_key_ptr (kmi->kl, i, NULL);
+             key_get_clip_info (key->subkeys->keyid+8, tmp, sizeof (tmp)-1);
+             gpgme_data_write (out, tmp, strlen (tmp));
+             if (!single) gpgme_data_write (out, "\r\n", 2);
+             break;
+         }
+     }
+     gpgme_data_write (out, "\0", 1);
+     p = gpgme_data_release_and_get_mem (out, &n);
+     set_clip_text (NULL, p, n);
+     gpgme_free (p);
+ }
  /* Dialog box procedure for the Key Manager. */
  BOOL CALLBACK
  keymanager_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
  {
-     struct km_info *kmi;
-     static int refresh_keys = 0;
-     INITCOMMONCONTROLSEX icex;
      HWND kl;
      HMENU hm;
+     RECT r;
      gpg_keycache_t c;
      gpgme_key_t key;
+     km_info_t kmi = NULL;
      struct genkey_s genkey;
      struct winpt_key_s k = {0};
      struct URL_ctx_s *url;
-     refresh_cache_s rcs = {0};
+     char type[32];
-     char keyid[48], uid[128], type[32], *name;
+     char *name;
      const char *t, *host;
-     u16 port = 0;
+     WORD port = 0;
      int l_idx = 0, i=0, rc;
      if ((msg != WM_INITDIALOG)
-         && ((kmi = (struct km_info*)GetWindowLong (dlg, GWL_USERDATA)) == NULL))
+         && ((kmi = (km_info_t)GetWindowLong (dlg, GWL_USERDATA)) == NULL))
          return FALSE;
+     /* handle dynamic popup items in the keyserver menu. */
+     if (msg == WM_COMMAND && LOWORD (wparam) >= WM_APP &&
+                              LOWORD (wparam) <= WM_APP+MAX_KEYSERVERS) {
+         l_idx = LOWORD (wparam)-WM_APP;
+         if (l_idx < 0)
+             return TRUE;
+         host = kserver_get_hostname (l_idx, 0, &port);
+         if (host != NULL)
+             km_send_to_keyserver (kmi->kl, dlg, host, port);
+         return TRUE;
+     }
      switch (msg) {
+     case WM_HELP:
+         if (GetForegroundWindow () != dlg) {
+             char buf[258];
+             GetWindowText (GetForegroundWindow (), buf, 255);
+             if (strstr (buf, _("Key Generation Wizard")))
+                 html_help_show (28);
+             else
+                 html_help_show (32);
+         }
+         else {
+             name = get_locale_name("winpt.chm");
+             ShellExecute (dlg, "open", name, NULL, NULL, SW_SHOW);
+             free_if_alloc (name);
+         }
+         break;
      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);
+         kmi->hwnd_sep = register_separator_window (dlg, kmi);
-         icex.dwICC  = ICC_BAR_CLASSES;
+         km_imagelist_load (dlg, &kmi->iconlist);
-         InitCommonControlsEx (&icex);
-         kmi->hwnd_sep = regist_sep_wnd (dlg, kmi);
-         imagelist_load (dlg);
          translate_menu_strings (dlg);
          SetWindowText (dlg, _("Key Manager"));
-         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);
          kl = GetDlgItem (dlg, IDC_KEYMISC_KEYLIST);
          kmi->keylist_sortby = KEY_SORT_USERID;
-         Header_SetImageList(ListView_GetHeader (kl), glob_imagelist);
+         (void)Header_SetImageList(ListView_GetHeader (kl), kmi->iconlist);
-         kmi->lv = keylist_load (GetDlgItem (dlg, IDC_KEYMISC_KEYLIST), c,
+         kmi->kl = keylist_load (kl, c, NULL, KEYLIST_LIST,
-                                 NULL, KEYLIST_LIST, kmi->keylist_sortby);
+                                 kmi->keylist_sortby);
+         kmi->lv = kmi->kl->lv;
+         if (check_ultimate_trusted_key (keycache_get_ctx (0))) {
+             msg_box (dlg, _("No ultimately trusted key found.\n"
+                             "Please set at least one secret key to ultimate trust."),
+                             _("Key Manager"), MB_WARN);
+         }
          /* init subclassing for the listview */
+         keylist_proc.opaque = kmi;
          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( !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."),
+                 msg_box (dlg, "Could not set keylist window procedure.",
                           _("Key Manager"), MB_ERR);
                  BUG (NULL);
              }
          }
          kmi->statbar = setup_status_bar (dlg, kmi->lv);
          SetWindowLong (dlg, GWL_USERDATA, (LONG)kmi);
-         kmi->toolbar = load_toolbar (dlg, kmi);
+         kmi->toolbar = create_toolbar (dlg, kmi);
+         kmi->dlg = dlg;
          do_center_window (dlg, kmi);
          do_resize_window (dlg, kmi);
-         update_ui_items (dlg, kmi->lv);
+         restore_window_size (dlg, kmi);
-         restore_column_size (kmi->lv);
+         update_ui_items (dlg, kmi->kl);
+         restore_column_info (kmi);
+         keylist_sort (kmi->kl, kmi->keylist_sortby);
+         km_gui_adjust_column_images (kmi, kmi->keylist_sortby);
+         // force a redraw of the keylist view
+         redraw_keylist (kmi);
-         SetDlgItemText (dlg, IDC_KEYMISC_GTEXT, _("Groups"));
+         SendMessage (dlg, WM_SETICON, (WPARAM)ICON_SMALL,
-         SetClassLong (dlg, GCL_HICON, (LONG)LoadIcon (glob_hinst,
+                      (LPARAM)LoadIcon (glob_hinst, (LPCTSTR)IDI_WINPT));
-                       (LPCTSTR)IDI_WINPT));
          SetForegroundWindow (dlg);
-         return TRUE;
+         kmi->magic = SetTimer (dlg, 1, 1000, NULL);
+         return TRUE;
+     case WM_TIMER:
+         KillTimer (dlg, kmi->magic);
+         SetForegroundWindow (dlg);
+         break;
      case WM_DESTROY:
-         save_column_size (kmi->lv);
+         save_column_info (kmi);
-         if (kmi->lv) {
+         km_imagelist_destroy (kmi->iconlist);
-             keylist_delete (kmi->lv);
+         if (kmi->kl) {
-             kmi->lv = NULL;
+             keylist_delete (kmi->kl);
+             kmi->kl = NULL;
          }
-         imagelist_destroy ();
          ltoa (kmi->pos_x, type, 10);
          set_reg_entry (HKEY_CURRENT_USER, "Software\\WinPT", "KM_Pos_X", type);
          ltoa (kmi->pos_y, type, 10);
          set_reg_entry (HKEY_CURRENT_USER, "Software\\WinPT", "KM_Pos_Y", type);
-         /* Remove runtime information. This should be the last action taken here. */
+         GetWindowRect (dlg, &r);
-         delete kmi; kmi = NULL;
+         sprintf (type, "%d", (int)(r.bottom-r.top));
+         set_reg_entry (HKEY_CURRENT_USER, "Software\\WinPT", "KM_Size_Width",
+                            type);
+         sprintf (type, "%d", (int)(r.right-r.left));
+         set_reg_entry (HKEY_CURRENT_USER, "Software\\WinPT", "KM_Size_Height",
+                         type);
+         /* Remove runtime information.
+            This should be the last action taken here. */
+         delete kmi;
+         kmi = NULL;
          SetWindowLong (dlg, GWL_USERDATA, 0);
-         keycache_set_reload (refresh_keys);
          return FALSE;
      case WM_MOVE:
-         RECT r;
          GetWindowRect (dlg, &r);
          kmi->pos_x = r.left;
          kmi->pos_y = r.top;
-Line 1016 
 keymanager_dlg_proc (HWND dlg, UINT msg,
+Line 1487 
 keymanager_dlg_proc (HWND dlg, UINT msg,
          break;
      case WM_NOTIFY:
          NMHDR *notify;
-         POINT p;
-         HMENU popup;
          notify = (NMHDR *)lparam;
          if (!notify)
              break;
+         if (kmi->enable_redraw) {
+             int n;
+             n = keylist_listview_notify (dlg, kmi->kl->keys, IDC_KEYMISC_KEYLIST,
+                                          lparam);
+             if (n != 0) {
+                 SetWindowLong (dlg, DWL_MSGRESULT, n);
+                 return TRUE;
+             }
+         }
          switch (notify->code) {
          case TBN_QUERYDELETE:
              SetWindowLong (dlg, DWL_MSGRESULT, TRUE);
-Line 1035 
 keymanager_dlg_proc (HWND dlg, UINT msg,
+Line 1515 
 keymanager_dlg_proc (HWND dlg, UINT msg,
          case TBN_GETBUTTONINFO:
              LPTBNOTIFY lpTbNotify;
              lpTbNotify = (LPTBNOTIFY)lparam;
-             if (lpTbNotify->iItem < (sizeof(myb) / sizeof(mybuttons))) {
+             if (lpTbNotify->iItem < (sizeof (tbb) / sizeof (tb_button_s))) {
-                 lpTbNotify->tbButton.iBitmap = imagelist_getindex(myb[lpTbNotify->iItem].icon);
+                 lpTbNotify->tbButton.iBitmap = km_imagelist_getindex (kmi->iconlist,
-                 lpTbNotify->tbButton.idCommand = myb[lpTbNotify->iItem].command;
+                                                                       tbb[lpTbNotify->iItem].icon);
+                 lpTbNotify->tbButton.idCommand = tbb[lpTbNotify->iItem].command;
                  lpTbNotify->tbButton.fsState = TBSTATE_ENABLED;
                  lpTbNotify->tbButton.fsStyle = TBSTYLE_BUTTON;
                  lpTbNotify->tbButton.iString = 0;
-                 strncpy (lpTbNotify->pszText, myb[lpTbNotify->iItem].text, lpTbNotify->cchText);
+                 strncpy (lpTbNotify->pszText, tbb[lpTbNotify->iItem].text,
-                 SetWindowLong(dlg, DWL_MSGRESULT, TRUE);
+                          lpTbNotify->cchText);
+                 SetWindowLong (dlg, DWL_MSGRESULT, TRUE);
              }
              return TRUE;
-Line 1075 
 keymanager_dlg_proc (HWND dlg, UINT msg,
+Line 1557 
 keymanager_dlg_proc (HWND dlg, UINT msg,
              lpttt->hinst = NULL;
              switch (lpttt->hdr.idFrom) {
+             case ID_KEYMISC_KEYWIZARD:
+                 lpttt->lpszText = (char*)_("Generate new key pair");
+                 break;
+             case ID_KEYMISC_SENDRECV:
+                 lpttt->lpszText = (char*)_("Search for a specific key");
+                 break;
              case ID_KEYMISC_DELETE:
                  lpttt->lpszText = (char *)_("Delete key from keyring");
                  break;
-Line 1087 
 keymanager_dlg_proc (HWND dlg, UINT msg,
+Line 1577 
 keymanager_dlg_proc (HWND dlg, UINT msg,
                  lpttt->lpszText = (char *)_("Sign key");
                  break;
+             case ID_KEYCTX_COPY:
+                 lpttt->lpszText = (char *)_("Copy key to clipboard");
+                 break;
+             case ID_KEYCTX_PASTE:
+                 lpttt->lpszText = (char*)_("Paste key from clipboard");
+                 break;
              case ID_KEYMISC_IMPORT:
                  lpttt->lpszText = (char *)_("Import key to keyring");
                  break;
-Line 1100 
 keymanager_dlg_proc (HWND dlg, UINT msg,
+Line 1598 
 keymanager_dlg_proc (HWND dlg, UINT msg,
          case LVN_ITEMCHANGED:
              if (((LPNMLISTVIEW)lparam)->uNewState) { /* item selected? */
                  kmi->lv_idx = listview_get_curr_pos (kmi->lv);
-                 update_ui_items (dlg, kmi->lv);
+                 update_ui_items (dlg, kmi->kl);
                  return TRUE;
              }
              break;
          case NM_RCLICK:
+             if (!wait_for_progress_cb (0))
+                 break;
              if (notify->idFrom == IDC_KEYMISC_KEYLIST) {
-                 l_idx =listview_get_curr_pos (kmi->lv);
+                 POINT p;
+                 HMENU popup;
+                 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);
                  translate_popupmenu_strings (popup);
-                 if (km_check_for_seckey (kmi->lv, l_idx, &i))
+                 if (km_check_for_seckey (kmi->kl, l_idx, &i) &&
+                     !(km_get_key_status (kmi->kl, l_idx) & KM_FLAG_REVOKED))
                      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, l_idx, NULL)) {
+                 if (!km_check_for_seckey (kmi->kl, l_idx, NULL) ||
+                     (km_get_key_status (kmi->kl, l_idx) & KM_FLAG_REVOKED)) {
                      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_ADDUID, MF_DISABLED|MF_GRAYED);
-Line 1128 
 keymanager_dlg_proc (HWND dlg, UINT msg,
+Line 1632 
 keymanager_dlg_proc (HWND dlg, UINT msg,
                      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, l_idx, NULL) &&
+                 else if (km_check_for_seckey (kmi->kl, l_idx, NULL) &&
-                          km_key_is_v3 (kmi->lv, l_idx)) {
+                          km_key_is_v3 (kmi->kl, 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, l_idx ) & KM_FLAG_DISABLED)
+                 if (km_get_key_status (kmi->kl, l_idx ) & KM_FLAG_DISABLED)
                      set_menu_state (popup, ID_KEYCTX_DISABLE, MF_DISABLED|MF_GRAYED);
                  else
                      set_menu_state (popup, ID_KEYCTX_ENABLE, MF_DISABLED|MF_GRAYED);
-                 if (km_get_key_status (kmi->lv, l_idx) & KM_FLAG_REVOKED ||
+                 if (km_get_key_status (kmi->kl, l_idx) & KM_FLAG_REVOKED ||
-                     km_get_key_status (kmi->lv, l_idx) & KM_FLAG_EXPIRED)
+                     km_get_key_status (kmi->kl, l_idx) & KM_FLAG_EXPIRED)
                      set_menu_state (popup, ID_KEYCTX_SIGN, MF_DISABLED|MF_GRAYED);
                  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);
+                 if (!secret_key_available ())
+                     set_menu_state (popup, ID_KEYCTX_SIGN, MF_DISABLED|MF_GRAYED);
                  /* Override 'Default Keyserver' with the actual name. */
                  host = kserver_get_hostname (0, -1, &port);
+                 if (!host)
+                     host = DEF_HKP_KEYSERVER;
                  set_menu_text (popup, ID_KEYCTX_KS_DEFAULT, host);
+                 {
+                     HMENU ks = GetSubMenu (popup, 19);
+                     for (i=0; server[i].name != NULL && server[i].used; i++)
+                         insert_menu_item (ks, i+2, WM_APP+i, server[i].name);
+                 }
                  popup_gpg_readonly (dlg, popup);
                  if (listview_count_items (kmi->lv, 1) > 1)
                      popup_multiple (dlg, popup);
-Line 1164 
 keymanager_dlg_proc (HWND dlg, UINT msg,
+Line 1678 
 keymanager_dlg_proc (HWND dlg, UINT msg,
              if (notify->idFrom == IDC_KEYMISC_KEYLIST) {
                  NMLISTVIEW *nft = (LPNMLISTVIEW) lparam;
                  int sortby = 0;
+                 if (!wait_for_progress_cb (0))
+                     break;
                  switch (nft->iSubItem) {
                  case 0:  sortby = KEY_SORT_USERID; break;
                  case 1:  sortby = KEY_SORT_KEYID; break;
-Line 1173 
 keymanager_dlg_proc (HWND dlg, UINT msg,
+Line 1690 
 keymanager_dlg_proc (HWND dlg, UINT msg,
                  case 6:  sortby = KEY_SORT_OTRUST; break;
                  case 7:  sortby = KEY_SORT_CREATED; break;
                  case 8:  sortby = KEY_SORT_ALGO; break;
-                 default: return TRUE; //sortby = KEY_SORT_USERID; break;
+                 default: return TRUE; /*sortby userid.*/
                  }
                  if ((kmi->keylist_sortby & ~KEYLIST_SORT_DESC) == sortby)
                      kmi->keylist_sortby ^= KEYLIST_SORT_DESC;
                  else
                      kmi->keylist_sortby = sortby;
-                 keylist_sort (kmi->lv, kmi->keylist_sortby);
+                 keylist_sort (kmi->kl, kmi->keylist_sortby);
+                 km_gui_adjust_column_images (kmi, kmi->keylist_sortby);
                  return TRUE;
              }
              break;
-Line 1198 
 keymanager_dlg_proc (HWND dlg, UINT msg,
+Line 1716 
 keymanager_dlg_proc (HWND dlg, UINT msg,
          do_resize_window (dlg, kmi);
          return TRUE;
-     case WM_SYSCOMMAND:
-         if (LOWORD (wparam) == SC_CLOSE)
-             EndDialog (dlg, TRUE);
-         return FALSE;
      case WM_MENUSELECT:
          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) {
+         hm = (HMENU)wparam;
-             HMENU h = (HMENU)wparam;
+         if ((UINT)LOWORD (lparam) == 3)
-             set_menu_text_bypos (h, 0, _("New"));
+             set_menu_text_bypos (hm, 0, _("New"));
-         }
+         else if ((UINT)LOWORD (lparam) == 1)
+             set_menu_text_bypos (hm, 8, _("Preferences"));
          return FALSE;
      case WM_COMMAND:
-Line 1222 
 keymanager_dlg_proc (HWND dlg, UINT msg,
+Line 1736 
 keymanager_dlg_proc (HWND dlg, UINT msg,
                       _("Key Manager"), MB_ERR);
              return FALSE;
          }
-         do_check_cache (kmi->lv, dlg, kmi->statbar);
-         switch( LOWORD (wparam)) {
+         // FIXME: after some commands, a redraw of the keylist is required.
+         //  Thus, we need a better way to force a redraw of the control
+         switch (LOWORD (wparam)) {
          case ID_KEYMISC_QUIT:
+         case IDCANCEL:
              EndDialog (dlg, TRUE);
              return TRUE;
-         case ID_KEYMISC_MAIL:
-             /* XXX
-             DialogBoxParam (glob_hinst, (LPCTSTR)IDD_WINPT_MAIL, GetDesktopWindow (),
-                             winpt_mail_proc, NULL);*/
-             break;
          case ID_KEYMISC_FIND:
-             km_find_key (dlg, kmi->lv);
+             km_find_key (dlg, kmi->kl);
              break;
          case ID_KEYMISC_DELETE:
          case ID_KEYMISC_DELETE2:
-             if (!km_delete_keys (kmi->lv, dlg))
+             if (!km_delete_keys (kmi->kl, dlg)) {
-                 km_update_status_bar (kmi->statbar, kmi->lv);
+                 update_status_bar (kmi->statbar, kmi->lv);
+                 keylist_sync (kmi->kl);
+             }
              return TRUE;
          case ID_KEYMISC_SIGN:
-Line 1250 
 keymanager_dlg_proc (HWND dlg, UINT msg,
+Line 1765 
 keymanager_dlg_proc (HWND dlg, UINT msg,
                           _("Key Manager"), MB_ERR);
                  return TRUE;
              }
-             if (km_check_key_status (kmi->lv, kmi->lv_idx))
+             if (km_check_key_status (kmi->kl, kmi->lv_idx))
                  return TRUE;
-             key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
+             km_get_key (kmi->kl, kmi->lv_idx, &k);
-             memset (&k, 0, sizeof (k));
-             k.ctx = key;
-             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, kmi->lv_idx, k.keyid, 0);
+                 update_key (kmi->kl, kmi->lv_idx, k.tmp_keyid, 0);
              return TRUE;
          case ID_KEYMISC_REVCERT:
-Line 1268 
 keymanager_dlg_proc (HWND dlg, UINT msg,
+Line 1780 
 keymanager_dlg_proc (HWND dlg, UINT msg,
                  msg_box (dlg, _("Please select a key."), _("Key Manager"), MB_ERR);
                  return TRUE;
              }
-             listview_get_item_text (kmi->lv, kmi->lv_idx, 0, uid, sizeof uid-1);
-             listview_get_item_text (kmi->lv, kmi->lv_idx, 1, keyid, sizeof keyid-1);
-             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 state[64];
                  listview_get_item_text (kmi->lv, kmi->lv_idx, 5,
                                          state, sizeof (state) -1);
-                 if( strchr (state, 'R' )) {
+                 if (strchr (state, 'R' )) {
                      msg_box (dlg, _("Key already revoked!"),
                               _("Key Manager"), MB_INFO);
                      return TRUE;
                  }
              }
-             memset (&k, 0, sizeof (k));
+             km_get_key (kmi->kl, kmi->lv_idx, &k);
-             k.key_pair = 1;
+             if (!k.key_pair) {
-             k.keyid = keyid;
+                 msg_box (dlg, _("There is no secret key available!"),
-             k.is_protected = km_check_if_protected (kmi->lv, kmi->lv_idx);
+                         _("Key Manager"), MB_ERR);
+                 return TRUE;
+             }
              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:
-             if (kmi->lv_idx == -1) {
+             /* No support in GnuPG 1.4 */
-                 msg_box (dlg, _("Please select a key."), _("Key Manager"), MB_ERR);
-                 return TRUE;
-             }
-             listview_get_item_text( kmi->lv, kmi->lv_idx, 0, uid, sizeof uid -1 );
-             listview_get_item_text( kmi->lv, kmi->lv_idx, 1, keyid, sizeof keyid -1 );
-             if( km_check_for_seckey( kmi->lv, kmi->lv_idx, NULL ) ) {
-                 msg_box( dlg, _("It does not make any sense with a key pair!"), _("Key Manager"), MB_OK );
-                 return TRUE;
-             }
-             memset (&k, 0, sizeof (k));
-             k.keyid = keyid;
-             k.uid = uid;
-             dialog_box_param( glob_hinst, (LPCSTR)IDD_WINPT_KEYTRUST, dlg,
-                               keytrust_dlg_proc, (LPARAM)&k,
-                               _("List Trust Path"), IDS_WINPT_KEYTRUST );
              return TRUE;
          case ID_KEYMISC_CHECKSIGS:
-Line 1320 
 keymanager_dlg_proc (HWND dlg, UINT msg,
+Line 1812 
 keymanager_dlg_proc (HWND dlg, UINT msg,
                  msg_box (dlg, _("Please select a key."), _("Key Manager"), MB_ERR);
                  return TRUE;
              }
-             listview_get_item_text (kmi->lv, kmi->lv_idx, 0, uid, DIM (uid)-1);
+             km_get_key (kmi->kl, kmi->lv_idx, &k);
-             listview_get_item_text (kmi->lv, kmi->lv_idx, 1, keyid, DIM (keyid)-1);
+             dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_KEYSIG_TREE, dlg,
-             memset (&k, 0, sizeof (k));
+                               sigtree_dlg_proc, (LPARAM)&k,
-             k.keyid = keyid;
+                               _("Key Signature List"), IDS_WINPT_KEYSIG);
-             k.uid = uid;
+             if (k.update)
-             k.ctx = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
+                 update_key (kmi->kl, kmi->lv_idx, k.tmp_keyid, 0);
-             dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_KEYSIG, dlg,
+             if (updated_keys_avail ())
-                               keysig_dlg_proc, (LPARAM)&k,
+                 refresh_keylist (kmi);
-                               _("Key Signature List" ), IDS_WINPT_KEYSIG);
              return TRUE;
          case ID_KEYMISC_PROPS:
              if (kmi->lv_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, kmi->lv_idx, 1, keyid, DIM (keyid)-1);
+             km_get_key (kmi->kl, kmi->lv_idx, &k);
-             listview_get_item_text (kmi->lv, kmi->lv_idx, 2, type, DIM (type)-1);
-             memset (&k, 0, sizeof (k));
-             k.key_pair = 0;
-             k.keyid = keyid;
-             if( !strcmp( type, "pub/sec" ) || !strcmp( type, "pub/crd" ) )
-                 k.key_pair = 1;
              k.callback.ctl = kmi->lv;
              k.callback.idx = 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,
-             dialog_box_param( glob_hinst, (LPCSTR)IDD_WINPT_KEYPROPS, dlg,
                                keyprops_dlg_proc, (LPARAM)&k,
-                               _("Key Properties"), IDS_WINPT_KEYPROPS );
+                               _("Key Properties"), IDS_WINPT_KEYPROPS);
-             if (k.callback.new_val != 0) {
+             if (k.update)
-                 t = get_key_trust_str (k.callback.new_val);
+                 update_key (kmi->kl, kmi->lv_idx, k.tmp_keyid, k.key_pair);
-                 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 (updated_keys_avail ())
-             if (keycache_get_reload() == 1)
                  l_idx = IDYES;
              else {
-                 char inf[256];
+                 l_idx = log_box (_("Key Manager"), MB_YESNO,
-                 _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?"));
-                 l_idx = msg_box (dlg, inf, _("Key Manager"), MB_YESNO);
-             }
-             if (l_idx == IDYES) {
-                 rcs.kr_reload = rcs.kr_update = 1;
-                 rcs.tr_update = 0;
-                 DialogBoxParam (glob_hinst, (LPCSTR)IDD_WINPT_KEYCACHE, dlg,
-                                 keycache_dlg_proc, (LPARAM)&rcs);
-                 c = keycache_get_ctx (1);
-                 if (!c)
-                     BUG (dlg);
-                 keylist_reload (kmi->lv, c, KEYLIST_LIST, KEY_SORT_USERID);
-                 refresh_keys = 0;
              }
+             if (l_idx == IDYES)
+                 reload_keycache (kmi);
              return TRUE;
          case ID_KEYMISC_REBUILD:
              name = NULL;
              gpg_rebuild_cache (&name);
              if (name != NULL) {
-                 char *line = strchr (name, '\n');
+                 int a = strchr (name, '(') - name + 1;
-                 show_msg (dlg, 2000, line? name + (line-name)+1 : name);
+                 int b = strchr (name+a, ' ') - name;
+                 if (a > 0 && b > 0) {
+                     char *inf = substr(name, a, b);
+                     char buf[256];
+                     _snprintf (buf, DIM (buf)-1, _("GPG Output: %d keys, %s signatures"),
+                                listview_count_items (kmi->lv, 0), inf);
+                     show_msg (dlg, 2000, buf);
+                     free_if_alloc (inf);
+                 }
                  safe_free (name);
              }
+             SetForegroundWindow (dlg);
              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"),
+                               keygen_dlg_proc, (LPARAM)&genkey,
+                               _("Key Generation"),
                                IDS_WINPT_KEYGEN);
-             if (genkey.newkey != NULL) {
+             if (genkey.cancel == 0)
-                 keylist_add_key (kmi->lv, KEYLIST_LIST, genkey.newkey);
+                 refresh_keylist (kmi);
-                 keylist_sort (kmi->lv, KEY_SORT_USERID);
-             }
              return TRUE;
          case ID_KEYMISC_CARDNEW:
-Line 1410 
 keymanager_dlg_proc (HWND dlg, UINT msg,
+Line 1888 
 keymanager_dlg_proc (HWND dlg, UINT msg,
              dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_CARD_KEYGEN, dlg,
                                card_keygen_dlg_proc, 0, _("Card Key Generation"),
                                IDS_WINPT_CARD_KEYGEN);
-             /* XXX: use new code */
+             if (updated_keys_avail ())
-             if (keycache_get_reload ())
                  send_cmd_id (dlg, ID_KEYMISC_RECACHE);
              return TRUE;
-Line 1421 
 keymanager_dlg_proc (HWND dlg, UINT msg,
+Line 1898 
 keymanager_dlg_proc (HWND dlg, UINT msg,
                                keygen_wizard_dlg_proc, (LPARAM)&genkey,
                                _("Key Generation Wizard"),
                                IDS_WINPT_KEYWIZARD);
-             if (genkey.newkey != NULL) {
+             if (genkey.cancel == 0)
-                 keylist_add_key (kmi->lv, KEYLIST_LIST, genkey.newkey);
+                 refresh_keylist (kmi);
-                 keylist_sort (kmi->lv, KEY_SORT_USERID);
-             }
              return TRUE;
          case ID_KEYMISC_SENDRECV:
-             memset (&genkey, 0, sizeof (genkey));
              dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_KEYSERVER, dlg,
-                               keyserver_dlg_proc, (LPARAM)&genkey, _("Keyserver Access"),
+                               keyserver_dlg_proc, 0, _("Keyserver Access"),
                                IDS_WINPT_KEYSERVER);
-             if (genkey.newkey != NULL) {
+             refresh_keylist (kmi);
-                 keylist_add_key (kmi->lv, KEYLIST_LIST, genkey.newkey);
+             redraw_keylist (kmi);
-                 keylist_sort (kmi->lv, KEY_SORT_USERID);
-             }
              return TRUE;
+         case ID_KEYMISC_WINPTPREFS:
+             dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_PREFS,
+                               dlg, prefs_dlg_proc, 0,
+                               _("WinPT Preferences"), 0);
+             break;
          case ID_KEYMISC_GPGPREFS:
-             dialog_box_param( glob_hinst, (LPCSTR)IDD_WINPT_GPGPREFS, dlg,
+             rc = dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_GPGPREFS,
-                               gpgprefs_dlg_proc, 0, _("GnuPG Preferences"),
+                                    dlg, gpgprefs_dlg_proc, 0,
-                               IDS_WINPT_GPGPREFS );
+                                    _("GnuPG Preferences"), IDS_WINPT_GPGPREFS);
+             if (rc == TRUE) {
+                 reload_keycache (kmi);
+                 update_default_key_str (kmi->statbar);
+             }
              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);
+             km_gui_import (kmi, LOWORD (wparam), NULL);
-             if (t)
-                 km_file_import (dlg, t);
              return TRUE;
          case ID_KEYMISC_IMPORT_HTTP:
              url = (struct URL_ctx_s*)get_http_file_dlg (dlg);
-             if (url->cancel == 0)
+             if (url && url->cancel == 0) {
                  km_http_import (dlg, url->url);
-             delete url; url=NULL;
+                 refresh_keylist (kmi);
+             }
+             free_if_alloc (url);
+             redraw_keylist (kmi);
              break;
          case ID_KEYMISC_EXPORT:
              if (kmi->lv_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 (listview_count_items (kmi->lv, 1) > 1)
                  name = m_strdup ("Exported_GPG_Keys.asc");
              else {
-                 listview_get_item_text (kmi->lv, kmi->lv_idx, 1, keyid, DIM (keyid)-1);
+                 key = km_get_key_ptr (kmi->kl, kmi->lv_idx, NULL);
-                 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);
              if (t == NULL)
                  return TRUE;
-             km_file_export (dlg, kmi->lv, t);
+             km_file_export (dlg, kmi->kl, t);
              return TRUE;
          case ID_KEYMISC_EXPORT_PRIVKEY:
-Line 1486 
 keymanager_dlg_proc (HWND dlg, UINT msg,
+Line 1969 
 keymanager_dlg_proc (HWND dlg, UINT msg,
                  msg_box (dlg, _("Please select a key."), _("Key Manager"), MB_ERR);
                  return TRUE;
              }
-             if( !km_check_for_seckey( kmi->lv, kmi->lv_idx, NULL ) ) {
+             if( !km_check_for_seckey (kmi->kl, kmi->lv_idx, NULL)) {
                  msg_box (dlg, _("There is no corresponding secret key for this key."),
                           _("Key Manager"), MB_ERR);
                  return TRUE;
-Line 1503 
 keymanager_dlg_proc (HWND dlg, UINT msg,
+Line 1986 
 keymanager_dlg_proc (HWND dlg, UINT msg,
                              "to copy the key to a safe place.\n\n"
                              "Do you really want to export the key?"),
                            _("WARNING"), MB_INFO|MB_YESNO);
-             if( i == IDYES ) {
+             if (i == IDYES) {
-                 listview_get_item_text( kmi->lv, kmi->lv_idx, 1, keyid, sizeof (keyid)-8 );
+                 key = km_get_key_ptr (kmi->kl, kmi->lv_idx, NULL);
-                 name = gen_export_filename (keyid, 1);
+                 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);
+                     km_privkey_export (dlg, kmi->kl, 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, dlg,
                                about_winpt_dlg_proc, 0, _("About WinPT"),
                                IDS_WINPT_ABOUT);
              break;
+         case ID_KEYMISC_FAQWWW:
+             ShellExecute (dlg, "open", "http://winpt.gnupt.de/faq.php",
+                           NULL, NULL, SW_SHOW);
+             break;
+         case ID_KEYMISC_DEVWWW:
+             ShellExecute (dlg, "open", "http://wald.intevation.org/projects/winpt",
+                           NULL, NULL, SW_SHOW);
+             break;
+         case ID_KEYMISC_WEBSITE:
+             ShellExecute (dlg, "open", "http://winpt.gnupt.de",
+                           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,
+                               dlg, ownertrust_dlg_proc, 0,
-                               _("Ownertrust"), IDS_WINPT_OWNERTRUST );
+                               _("Ownertrust"), IDS_WINPT_OWNERTRUST);
              break;
          case ID_KEYMISC_EDITKEY:
-             if (kmi->lv_idx == -1)
+             if (km_get_key (kmi->kl, kmi->lv_idx, &k))
                  break;
-             listview_get_item_text (kmi->lv, kmi->lv_idx, 1, keyid, sizeof (keyid)-1);
-             /* XXX: pub/crd = secret key does not work */
-             memset (&k, 0, sizeof (k));
-             k.is_protected = km_check_if_protected (kmi->lv, kmi->lv_idx);
-             k.key_pair = km_check_for_seckey (kmi->lv, kmi->lv_idx, NULL);
-             k.keyid = keyid;
-             k.is_v3 = km_key_is_v3 (kmi->lv, 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,  kmi->lv_idx, keyid, 1);
+                 update_key (kmi->kl,  kmi->lv_idx, k.tmp_keyid, 1);
              break;
          case ID_KEYMISC_COPY:
-             km_clip_export (dlg, kmi->lv);
+             km_clip_export (dlg, kmi->kl);
              break;
          case ID_KEYMISC_SELALL:
-Line 1555 
 keymanager_dlg_proc (HWND dlg, UINT msg,
+Line 2045 
 keymanager_dlg_proc (HWND dlg, UINT msg,
              break;
          case ID_KEYMISC_PASTE:
-             km_clip_import (dlg);
+             km_gui_import (kmi, LOWORD (wparam), NULL);
              break;
          case ID_KEYCTX_SETPREFKS:
-             listview_get_item_text (kmi->lv, kmi->lv_idx, 1, keyid, DIM(keyid)-1);
+             if (km_get_key (kmi->kl, kmi->lv_idx, &k))
-             memset (&k, 0, sizeof (k));
+                 break;
-             k.keyid = keyid;
              keyedit_set_pref_keyserver (&k, dlg);
              break;
-Line 1571 
 keymanager_dlg_proc (HWND dlg, UINT msg,
+Line 2060 
 keymanager_dlg_proc (HWND dlg, UINT msg,
                           _("Key Manager"), MB_INFO);
                  listview_select_all (kmi->lv);
              }
-             km_refresh_from_keyserver (kmi->lv, dlg);
+             if (!km_refresh_from_keyserver (kmi->kl, dlg))
+                 msg_box (dlg, _("Keyserver refresh finished."),
+                          _("Key Manager"), MB_OK);
              break;
          /** Context menu **/
          case ID_KEYCTX_EDIT:
-             send_cmd_id( dlg, ID_KEYMISC_EDITKEY );
+             send_cmd_id (dlg, ID_KEYMISC_EDITKEY);
              break;
          case ID_KEYCTX_PROPS:
-             send_cmd_id( dlg, ID_KEYMISC_PROPS );
+             send_cmd_id (dlg, ID_KEYMISC_PROPS);
              break;
          case ID_KEYCTX_UIDS:
-Line 1588 
 keymanager_dlg_proc (HWND dlg, UINT msg,
+Line 2079 
 keymanager_dlg_proc (HWND dlg, UINT msg,
              break;
          case ID_KEYCTX_SIGN:
-             send_cmd_id( dlg, ID_KEYMISC_SIGN );
+             send_cmd_id (dlg, ID_KEYMISC_SIGN);
              break;
          case ID_KEYCTX_DEL:
-Line 1596 
 keymanager_dlg_proc (HWND dlg, UINT msg,
+Line 2087 
 keymanager_dlg_proc (HWND dlg, UINT msg,
              break;
          case ID_KEYCTX_REV:
-             send_cmd_id( dlg, ID_KEYMISC_REVCERT );
+             send_cmd_id (dlg, ID_KEYMISC_REVCERT);
              break;
          case ID_KEYCTX_SENDMAIL:
-             km_send_to_mail_recipient (kmi->lv, dlg);
+             km_send_to_mail_recipient (kmi->kl, dlg);
              break;
          case ID_KEYCTX_KS_DEFAULT:
              host = kserver_get_hostname (0, -1, &port);
-             km_send_to_keyserver (kmi->lv, dlg, host, port);
+             km_send_to_keyserver (kmi->kl, dlg, host, port);
              break;
          case ID_KEYCTX_ADDKEY:
-             listview_get_item_text (kmi->lv, kmi->lv_idx, 1, keyid, DIM (keyid)-1);
+             km_get_key (kmi->kl, kmi->lv_idx, &k);
-             memset (&k, 0, sizeof (k));
-             k.key_pair = km_check_for_seckey (kmi->lv, kmi->lv_idx, NULL);
-             k.is_protected = km_check_if_protected (kmi->lv, kmi->lv_idx);
-             k.keyid = keyid;
              keyedit_add_subkey (&k, dlg, NULL);
              if (k.update)
-                 update_key (kmi->lv, kmi->lv_idx, keyid, 1);
+                 update_key (kmi->kl, kmi->lv_idx, k.tmp_keyid, 1);
              break;
          case ID_KEYCTX_ADDUID:
-             listview_get_item_text( kmi->lv, kmi->lv_idx, 1, keyid, DIM (keyid)-1);
+             km_get_key (kmi->kl, kmi->lv_idx, &k);
-             memset (&k, 0, sizeof (k));
-             k.key_pair = km_check_for_seckey (kmi->lv, kmi->lv_idx, NULL);
-             k.is_protected = km_check_if_protected (kmi->lv, kmi->lv_idx);
-             k.keyid = keyid;
              keyedit_add_userid (&k, dlg, NULL);
              if (k.update)
-                 update_key (kmi->lv, kmi->lv_idx, keyid, 1);
+                 update_key (kmi->kl, kmi->lv_idx, k.tmp_keyid, 1);
              break;
          case ID_KEYCTX_ADDREV:
-             listview_get_item_text (kmi->lv, kmi->lv_idx, 1, keyid, DIM (keyid)-1);
+             km_get_key (kmi->kl, kmi->lv_idx, &k);
-             memset (&k, 0, sizeof (k));
-             k.keyid = keyid;
-             k.is_protected = km_check_if_protected (kmi->lv, kmi->lv_idx);
-             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, kmi->lv_idx, keyid, 1);
+                 update_key (kmi->kl, kmi->lv_idx, k.tmp_keyid, 1);
              break;
          case ID_KEYCTX_ADDPHOTO:
-             listview_get_item_text (kmi->lv, kmi->lv_idx, 1, keyid, DIM (keyid)-1);
+             km_get_key (kmi->kl, kmi->lv_idx, &k);
-             memset (&k, 0, sizeof (k));
-             k.keyid = keyid;
-             k.is_protected = km_check_if_protected (kmi->lv, kmi->lv_idx);
-             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, kmi->lv_idx, keyid, 1);
+                 update_key (kmi->kl, kmi->lv_idx, k.tmp_keyid, 1);
              break;
-         case ID_KEYCTX_KS_NL:
+         case ID_KEYCTX_RECVFROM:
-         case ID_KEYCTX_KS_PL:
+             km_refresh_from_keyserver (kmi->kl, dlg);
-         case ID_KEYCTX_KS_AT:
+             if (updated_keys_avail ()) {
-         case ID_KEYCTX_KS_DE:
+                 refresh_keylist (kmi);
-         case ID_KEYCTX_KS_DK:
+                 redraw_keylist (kmi);
-         case ID_KEYCTX_KS_CZ:
+             }
-         case ID_KEYCTX_KS_ES:
-         case ID_KEYCTX_KS_UK:
-             host = kserver_get_hostname (LOWORD (wparam) - 40107, 0, &port);
-             km_send_to_keyserver (kmi->lv, dlg, host, port);
-             break;
-         case ID_KEYCTX_RECVFROM:
-             km_refresh_from_keyserver (kmi->lv, dlg);
              break;
          case ID_KEYCTX_UID_COPY:
-             /* XXX: add generic function to support multiple selection
-                     with a callback */
-             listview_get_item_text( kmi->lv, kmi->lv_idx, 0, uid, sizeof uid-1 );
-             set_clip_text( NULL, uid, strlen( uid ) );
-             break;
          case ID_KEYCTX_KEYID_COPY:
-             listview_get_item_text (kmi->lv, kmi->lv_idx, 1, uid, sizeof uid-1);
-             set_clip_text (NULL, uid, strlen (uid));
-             break;
          case ID_KEYCTX_FPR_COPY:
-             key = (gpgme_key_t) listview_get_item2 (kmi->lv, kmi->lv_idx);
-             if (key) {
-                 t = get_key_fpr (key);
-                 set_clip_text (NULL, t? t : "", t? strlen (t): 0);
-             }
-             break;
          case ID_KEYCTX_KINFO_COPY:
-             listview_get_item_text( kmi->lv, kmi->lv_idx, 1, uid, sizeof uid-1 );
+         case ID_KEYCTX_EMAIL_COPY:
-             km_set_clip_info( uid );
+             copy_key_info (LOWORD (wparam), kmi);
              break;
          case ID_KEYCTX_COPY:
-             km_clip_export (dlg, kmi->lv);
+             send_cmd_id (dlg, ID_KEYMISC_COPY);
              break;
          case ID_KEYCTX_PASTE:
-             km_clip_import (dlg);
+             send_cmd_id (dlg, ID_KEYMISC_PASTE);
              break;
          case ID_KEYCTX_DISABLE:
          case ID_KEYCTX_ENABLE:
              i = LOWORD (wparam) == ID_KEYCTX_ENABLE? 1 : 0;
-             listview_get_item_text (kmi->lv, kmi->lv_idx, KM_COL_KEYID,
+             if (km_get_key (kmi->kl, kmi->lv_idx, &k))
-                                     keyid, DIM (keyid)-1);
+                 break;
-             rc = km_enable_disable_key (kmi->lv, dlg, kmi->lv_idx, i);
+             rc = km_enable_disable_key (kmi->kl, dlg, kmi->lv_idx, i);
              if (!rc)
-                 update_key (kmi->lv, kmi->lv_idx, keyid, 0);
+                 update_key (kmi->kl, kmi->lv_idx, k.tmp_keyid, 0);
-             /* XXX: switching a key from disabled -> enabled. does not
-                change the validity field in the KM. */
              break;
          case ID_KEYCTX_LISTSIGS:
-Line 1718 
 keymanager_dlg_proc (HWND dlg, UINT msg,
+Line 2166 
 keymanager_dlg_proc (HWND dlg, UINT msg,
              break;
          case ID_KEYCTX_MAXTRUST:
-             listview_get_item_text (kmi->lv, kmi->lv_idx, 1, keyid, DIM (keyid)-1);
+             if (km_get_key (kmi->kl, kmi->lv_idx, &k))
-             rc = km_set_implicit_trust (dlg, kmi->lv, kmi->lv_idx);
+                 break;
+             rc = km_set_implicit_trust (dlg, kmi->kl, kmi->lv_idx);
              if (!rc)
-                 update_key (kmi->lv, kmi->lv_idx, keyid, 0);
+                 update_key (kmi->kl, kmi->lv_idx, k.tmp_keyid, 0);
              break;
          case ID_KEYCTX_SETDEFKEY:
-             if (!km_check_key_status (kmi->lv, kmi->lv_idx)) {
+             if (!km_check_key_status (kmi->kl, kmi->lv_idx)) {
-                 listview_get_item_text (kmi->lv, kmi->lv_idx, 1, keyid, DIM (keyid)-1);
+                 key = km_get_key_ptr (kmi->kl, kmi->lv_idx, NULL);
-                 rc = set_gnupg_default_key (keyid);
+                 rc = set_gnupg_default_key (key->subkeys->keyid+8);
                  if (rc)
                      msg_box (dlg, winpt_strerror (rc), _("Key Manager"), MB_ERR);
-                 km_update_default_key_str (kmi->statbar);
+                 update_default_key_str (kmi->statbar);
              }
              break;
-         case ID_GROUP_NEW:
+         case ID_KEYMISC_VIEWKEYID:
-         case ID_GROUP_PASTE:
+         case ID_KEYMISC_VIEWCIPHER:
-         case ID_GROUP_DELETE:
+         case ID_KEYMISC_VIEWTYPE:
-             /* XXX: Implement group manager. */
+         case ID_KEYMISC_VIEWCREAT:
-             return TRUE;
+         case ID_KEYMISC_VIEWUID:
+             hm = GetMenu (dlg);
+             i = get_menu_state (hm, LOWORD (wparam));
+             set_menu_state (hm, LOWORD (wparam),
+                             i & MFS_CHECKED? MFS_UNCHECKED : MFS_CHECKED);
+             modify_listview_columns (kmi, LOWORD (wparam), !(i & MFS_CHECKED));
+             break;
          }
          break;

 Legend:



Removed from v.128
 


changed lines


 
Added in v.447
 Legend:



Removed from v.128
 


changed lines


 
Added in v.447
-Removed from v.128
+Added in v.447

[email protected]	ViewVC Help
Powered by ViewVC 1.1.26