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

Diff of /trunk/Src/wptKeyManagerDlg.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 197 by twoaday, Mon Apr 10 07:38:06 2006 UTC revision 262 by twoaday, Sat Sep 30 10:24:34 2006 UTC
# Line 63  Line 63 
63    
64  static subclass_s keylist_proc;  static subclass_s keylist_proc;
65    
66    /* Handle to the global image list. */
67  HIMAGELIST glob_imagelist;  HIMAGELIST glob_imagelist;
68    
69  struct km_info_s {  struct km_info_s {
# Line 71  struct km_info_s { Line 72  struct km_info_s {
72      int ypos_sep;      int ypos_sep;
73      int ypercent_sep;      int ypercent_sep;
74    
75        /* Different kind of windows. */
76      HWND dlg;      HWND dlg;
77      HWND hwnd_sep;      HWND hwnd_sep;
78      HWND toolbar;      HWND toolbar;
# Line 79  struct km_info_s { Line 81  struct km_info_s {
81      listview_ctrl_t lv;      listview_ctrl_t lv;
82      int             lv_idx;      int             lv_idx;
83      int keylist_sortby;      int keylist_sortby;
84        int magic;
85    
86        unsigned int enable_groups:1;
87  };  };
88    typedef struct km_info_s *km_info_t;
89    
90  /* Toolbar button structure. */  /* Toolbar button structure. */
91  struct mybuttons {  struct tb_button_s {
92      long icon;      long icon;
93      long command;      long command;
94      char *text;      char *text;
95  };  };
96    
97  struct mybuttons myb[] = {  /* The buttons in the toolbar. */
98    struct tb_button_s tbb[] = {
99      {IMI_KEY_DELETE, ID_KEYMISC_DELETE, "Delete"},      {IMI_KEY_DELETE, ID_KEYMISC_DELETE, "Delete"},
100      {IMI_KEY_PROPS,  ID_KEYMISC_PROPS,  "Properties"},      {IMI_KEY_PROPS,  ID_KEYMISC_PROPS,  "Properties"},
101      {IMI_KEY_SIGN,   ID_KEYMISC_SIGN,   "Sign"},      {IMI_KEY_SIGN,   ID_KEYMISC_SIGN,   "Sign"},
# Line 98  struct mybuttons myb[] = { Line 105  struct mybuttons myb[] = {
105    
106    
107  static void km_gui_import (struct km_info_s *kmi, int cmd_id, void *param);  static void km_gui_import (struct km_info_s *kmi, int cmd_id, void *param);
108    void key_get_clip_info (const char *keyid, char *buf, size_t buflen);
109    
110    
111  /* Subclass the keylist listview control to allow extended commands. */  /* Subclass the keylist listview control to allow extended commands. */
112  static BOOL CALLBACK  static BOOL CALLBACK
# Line 164  keylist_subclass_proc (HWND dlg, UINT ms Line 173  keylist_subclass_proc (HWND dlg, UINT ms
173  }  }
174    
175    
176  #define ico2idx(ico) imagelist_getindex((ico))  #define ico2idx(ico) imagelist_getindex ((ico))
177    
178    /* Create a new toolbar window with a pre-defined list of buttons. */
179  static HWND  static HWND
180  load_toolbar (HWND dlg, struct km_info_s *kmi)  create_toolbar (HWND dlg, struct km_info_s *kmi)
181  {  {    
182      HWND tbwnd;      HWND tbwnd;
183      TBSAVEPARAMS tbsp;      TBSAVEPARAMS tbsp;
184      TBBUTTON tb_buttons[] = {      TBBUTTON tb_buttons[] = {
# Line 182  load_toolbar (HWND dlg, struct km_info_s Line 192  load_toolbar (HWND dlg, struct km_info_s
192          {ico2idx (IMI_KEY_FILE_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},
193          {ico2idx (IMI_KEY_IMPORT), ID_KEYCTX_PASTE, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},          {ico2idx (IMI_KEY_IMPORT), ID_KEYCTX_PASTE, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},
194          {ico2idx (IMI_KEY_EXPORT), ID_KEYCTX_COPY, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},          {ico2idx (IMI_KEY_EXPORT), ID_KEYCTX_COPY, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},
195       };      };
196        
197      tbwnd = CreateWindowEx (0, TOOLBARCLASSNAME, NULL,      tbwnd = CreateWindowEx (0, TOOLBARCLASSNAME, NULL,
198                              WS_CHILD|TBSTYLE_TOOLTIPS|TBSTYLE_FLAT|CCS_ADJUSTABLE,                              WS_CHILD|TBSTYLE_TOOLTIPS|TBSTYLE_FLAT|CCS_ADJUSTABLE,
199                              0, 0, 0, 0, dlg, (HMENU)IDR_WINPT_KMTB, glob_hinst, NULL);                              0, 0, 0, 0, dlg, (HMENU)IDR_WINPT_KMTB, glob_hinst, NULL);
200      if (tbwnd) {      if (!tbwnd)
201          SendMessage (tbwnd, TB_BUTTONSTRUCTSIZE, (WPARAM) sizeof(TBBUTTON), 0);          BUG (0);
202          SendMessage (tbwnd, TB_SETIMAGELIST, 0, (LPARAM)glob_imagelist);      SendMessage (tbwnd, TB_BUTTONSTRUCTSIZE, (WPARAM) sizeof(TBBUTTON), 0);
203                  SendMessage (tbwnd, TB_AUTOSIZE, 0, 0);      SendMessage (tbwnd, TB_SETIMAGELIST, 0, (LPARAM)glob_imagelist);
204          ShowWindow (tbwnd, SW_SHOW);      SendMessage (tbwnd, TB_AUTOSIZE, 0, 0);
205        ShowWindow (tbwnd, SW_SHOW);
206          /* Restore toolbar */  
207          tbsp.hkr = HKEY_CURRENT_USER;      /* Restore toolbar */
208          tbsp.pszSubKey = "Software\\WinPT";      tbsp.hkr = HKEY_CURRENT_USER;
209          tbsp.pszValueName = "KM_toolbar";      tbsp.pszSubKey = "Software\\WinPT";
210          if (SendMessage(tbwnd, TB_SAVERESTORE, FALSE, (LPARAM)&tbsp ) == 0)      tbsp.pszValueName = "KM_toolbar";
211              SendMessage (tbwnd, TB_ADDBUTTONS, sizeof(tb_buttons) / sizeof(tb_buttons[0]),      if (SendMessage (tbwnd, TB_SAVERESTORE, FALSE, (LPARAM)&tbsp) == 0)
212                           (LONG)&tb_buttons[0]);          SendMessage (tbwnd, TB_ADDBUTTONS,
213       }                       sizeof (tb_buttons) / sizeof (tb_buttons[0]),
214       return tbwnd;                       (LONG)&tb_buttons[0]);
215    
216        return tbwnd;
217  }  }
218    
219    
220  /* Restore the width of the columns from the registry.  /* Restore the width of the columns from the registry.
221     If no bitstring was found, the default size is used. */     If no bitstring was found, the default size is used. */
222  int  int
223  restore_column_info (listview_ctrl_t hd)  restore_column_info (struct km_info_s *kmi)
224  {  {
225      WORD *buf;      WORD *buf;
226      HKEY root;      HKEY root;
227      DWORD type;      DWORD type, size, i;
     DWORD size = hd->cols*sizeof (WORD), i;  
228      LONG ec;      LONG ec;
229    
230        size = kmi->lv->cols*sizeof (WORD);
231      ec = RegOpenKeyEx (HKEY_CURRENT_USER, "Software\\WinPT", 0,      ec = RegOpenKeyEx (HKEY_CURRENT_USER, "Software\\WinPT", 0,
232                         KEY_ALL_ACCESS, &root);                         KEY_ALL_ACCESS, &root);
233      if (ec != ERROR_SUCCESS)      if (ec != ERROR_SUCCESS)
# Line 225  restore_column_info (listview_ctrl_t hd) Line 237  restore_column_info (listview_ctrl_t hd)
237      if (!buf)      if (!buf)
238          BUG (NULL);          BUG (NULL);
239      ec = RegQueryValueEx (root, "KMColumnSize", NULL, &type,      ec = RegQueryValueEx (root, "KMColumnSize", NULL, &type,
240                            (BYTE*)buf, &size);                            (BYTE*)buf, &size);    
     RegCloseKey (root);  
241      if (ec != ERROR_SUCCESS) {      if (ec != ERROR_SUCCESS) {
242            RegCloseKey (root);
243          free_if_alloc (buf);          free_if_alloc (buf);
244          return -1;          return -1;
245      }      }
# Line 240  restore_column_info (listview_ctrl_t hd) Line 252  restore_column_info (listview_ctrl_t hd)
252          }          }
253      }      }
254      for (i=0; i < size/2; i++)      for (i=0; i < size/2; i++)
255          listview_set_column_width (hd, i, buf[i]);          listview_set_column_width (kmi->lv, i, buf[i]);
256      free_if_alloc (buf);      free_if_alloc (buf);
257    
258        size = sizeof (kmi->keylist_sortby);
259        ec = RegQueryValueEx (root, "KMSortBy", NULL, &type,
260                              (BYTE*)&kmi->keylist_sortby, &size);
261        if (ec != ERROR_SUCCESS)
262            kmi->keylist_sortby = KEY_SORT_USERID;
263        RegCloseKey (root);
264      return 0;      return 0;
265  }  }
266    
267    
268  /* Save the current column width to the registry. */  /* Save the current column width to the registry. */
269  int  int
270  save_column_info (listview_ctrl_t hd)  save_column_info (struct km_info_s *kmi)
271  {  {    
     WORD *buf;  
272      HKEY root;      HKEY root;
273        WORD *buf;
274      LONG ec;      LONG ec;
275      int i;      int i;
276    
277      buf = new WORD[hd->cols];      buf = new WORD[kmi->lv->cols];
278      if (!buf)      if (!buf)
279          BUG (NULL);          BUG (NULL);
280      for (i=0; i < hd->cols; i++) {      for (i=0; i < kmi->lv->cols; i++) {
281          LVCOLUMN lvc;          LVCOLUMN lvc;
282    
283          memset (&lvc, 0, sizeof (lvc));          memset (&lvc, 0, sizeof (lvc));
284          lvc.mask = LVCF_WIDTH;          lvc.mask = LVCF_WIDTH;
285          ListView_GetColumn (hd->ctrl, i, &lvc);          ListView_GetColumn (kmi->lv->ctrl, i, &lvc);
286          buf[i] = lvc.cx;          buf[i] = lvc.cx;
287      }      }
288    
# Line 275  save_column_info (listview_ctrl_t hd) Line 294  save_column_info (listview_ctrl_t hd)
294      }      }
295    
296      ec = RegSetValueEx (root, "KMColumnSize", 0, REG_BINARY,      ec = RegSetValueEx (root, "KMColumnSize", 0, REG_BINARY,
297                          (const BYTE*)buf, 2*hd->cols);                          (const BYTE*)buf, 2*kmi->lv->cols);
298        if (ec == ERROR_SUCCESS) {
299            ec = RegSetValueEx (root, "KMSortBy", 0, REG_DWORD_BIG_ENDIAN,
300                                (const BYTE*)&kmi->keylist_sortby,
301                                sizeof (kmi->keylist_sortby));
302        }
303      RegCloseKey (root);      RegCloseKey (root);
304      free_if_alloc (buf);      free_if_alloc (buf);
305      return ec == ERROR_SUCCESS? 0 : -1;      return ec == ERROR_SUCCESS? 0 : -1;
306  }  }
307    
308    
309    /* Restore the original size of the dialog. */
310    static void
311    restore_window_size (HWND dlg, struct km_info_s *kmi)
312    {
313        char *p;
314        int height = 0, width = 0;
315    
316        /* Restore the original window size. */
317        p = get_reg_entry (HKEY_CURRENT_USER, "Software\\WinPT", "KM_Size_Width");
318        if (p) {
319            width = atoi (p);
320            free_if_alloc (p);
321        }
322        p = get_reg_entry (HKEY_CURRENT_USER, "Software\\WinPT", "KM_Size_Height");
323        if (p) {
324            height = atoi (p);
325            free_if_alloc (p);
326        }
327        if (height > 0 && width > 0)
328            SetWindowPos (dlg, HWND_TOP, kmi->pos_x, kmi->pos_y,
329                          height, width, SWP_SHOWWINDOW);
330    }
331    
332    
333  /* Center window @dlg. */  /* Center window @dlg. */
334  static void  static void
335  do_center_window (HWND dlg, struct km_info_s *kmi)  do_center_window (HWND dlg, struct km_info_s *kmi)
# Line 304  do_center_window (HWND dlg, struct km_in Line 352  do_center_window (HWND dlg, struct km_in
352          return;          return;
353      }      }
354      else if (p)      else if (p)
355          pos_x = atol (p);          pos_x = atoi (p);
356    
357      p = get_reg_entry (HKEY_CURRENT_USER, "Software\\WinPT", "KM_Pos_Y");      p = get_reg_entry (HKEY_CURRENT_USER, "Software\\WinPT", "KM_Pos_Y");
358      if (p && !strcmp (p, " ")) {      if (p && !strcmp (p, " ")) {
# Line 313  do_center_window (HWND dlg, struct km_in Line 361  do_center_window (HWND dlg, struct km_in
361          return;          return;
362      }      }
363      else if (p)      else if (p)
364          pos_y = atol (p);          pos_y = atoi (p);
365    
366      if (!pos_y && !pos_x) {      if (!pos_y && !pos_x) {
367          center_window (dlg, NULL);          center_window (dlg, NULL);
# Line 326  do_center_window (HWND dlg, struct km_in Line 374  do_center_window (HWND dlg, struct km_in
374          || pos_y > GetSystemMetrics (SM_CYSCREEN)) {          || pos_y > GetSystemMetrics (SM_CYSCREEN)) {
375          pos_x = pos_y = 0;          pos_x = pos_y = 0;
376      }      }
377        kmi->pos_x = pos_x;
378        kmi->pos_y = pos_y;
379    
380      GetClientRect (dlg, &rect);      GetClientRect (dlg, &rect);
381      MoveWindow (dlg, pos_x, pos_y, rect.right, rect.bottom, TRUE);      MoveWindow (dlg, pos_x, pos_y, rect.right, rect.bottom, TRUE);
382  }  }
# Line 381  do_resize_window (HWND dlg, struct km_in Line 432  do_resize_window (HWND dlg, struct km_in
432                    
433      /* Place the keylist above the separator */      /* Place the keylist above the separator */
434      h = GetDlgItem (dlg, IDC_KEYMISC_KEYLIST);      h = GetDlgItem (dlg, IDC_KEYMISC_KEYLIST);
435      MoveWindow (h, rclient.left, rclient.top, rclient.right - rclient.left,      MoveWindow (h, rclient.left, rclient.top, rclient.right - rclient.left,
436                  kmi->ypos_sep - rclient.top, bRepaint);                  kmi->ypos_sep - rclient.top, bRepaint);
437      rclient.top = kmi->ypos_sep + 5 + 8;      rclient.top = kmi->ypos_sep + 5 + 8;
438    
439  #if 0 /* Disable the code until we support groups again. */      if (kmi->enable_groups != 0) {
440      /* Place the group text and the group box below the separator */          /* Place the group text and the group box below the separator */
441      h = GetDlgItem (dlg, IDC_KEYMISC_GTEXT);          h = GetDlgItem (dlg, IDC_KEYMISC_GTEXT);
442      MoveWindow (h, rclient.left, rclient.top, 100, 14, bRepaint);          MoveWindow (h, rclient.left, rclient.top, 100, 14, bRepaint);
443      rclient.top += 18;          rclient.top += 18;
444    
445      h = GetDlgItem (dlg, IDC_KEYMISC_GROUP);          h = GetDlgItem (dlg, IDC_KEYMISC_GROUP);
446      MoveWindow (h, rclient.left, rclient.top, rclient.right - rclient.left,          MoveWindow (h, rclient.left, rclient.top,
447                  (rclient.bottom < rclient.top) ?                      rclient.right - rclient.left,
448                  0 : rclient.bottom - rclient.top, bRepaint);                      (rclient.bottom < rclient.top) ?
449  #endif                      0 : rclient.bottom - rclient.top, bRepaint);
450        }
451            
452      /* Repaint the whole thing */      /* Repaint the whole thing */
453      InvalidateRect (dlg, NULL, TRUE);      InvalidateRect (dlg, NULL, TRUE);
# Line 467  update_default_key_str (HWND dlg) Line 519  update_default_key_str (HWND dlg)
519  void  void
520  update_status_bar (HWND sb, listview_ctrl_t lv)  update_status_bar (HWND sb, listview_ctrl_t lv)
521  {  {
522      char txt_sec[128], txt_pub[128];      char txt_sec[128];
523        char txt_pub[128];
524      int nkeys = 0, nsec = 0;      int nkeys = 0, nsec = 0;
     int i;  
525    
526      nkeys = listview_count_items (lv, 0);      nkeys = listview_count_items (lv, 0);
527      for (i = 0; i < nkeys; i++) {      nsec = gpg_keycache_get_size (keycache_get_ctx (0));
528          if (km_check_for_seckey (lv, i, NULL))  
             nsec++;  
     }  
529      _snprintf (txt_sec, sizeof (txt_sec)-1, _("%d secret keys"), nsec);      _snprintf (txt_sec, sizeof (txt_sec)-1, _("%d secret keys"), nsec);
530      _snprintf (txt_pub, sizeof (txt_pub)-1, _("%d keys"), nkeys);      _snprintf (txt_pub, sizeof (txt_pub)-1, _("%d keys"), nkeys);
531      SendMessage (sb, SB_SETTEXT, 1, (LPARAM)txt_sec);      SendMessage (sb, SB_SETTEXT, 1, (LPARAM)txt_sec);
# Line 487  long CALLBACK Line 537  long CALLBACK
537  separator_wnd_proc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)  separator_wnd_proc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
538  {  {
539      static POINT last_mouse_pos;      static POINT last_mouse_pos;
540        PAINTSTRUCT ps;
541        RECT rect;
542        HPEN hpen;
543    
544      if (msg == WM_CREATE)      if (msg == WM_CREATE)
545          SetWindowLong (hwnd, GWL_USERDATA,          SetWindowLong (hwnd, GWL_USERDATA,
# Line 494  separator_wnd_proc (HWND hwnd, UINT msg, Line 547  separator_wnd_proc (HWND hwnd, UINT msg,
547    
548      switch (msg) {      switch (msg) {
549      case WM_PAINT:      case WM_PAINT:
         PAINTSTRUCT ps;  
         RECT rect;  
         HPEN hpen;  
   
550          GetClientRect (hwnd, &rect);          GetClientRect (hwnd, &rect);
551          BeginPaint (hwnd, &ps);          BeginPaint (hwnd, &ps);
552    
# Line 505  separator_wnd_proc (HWND hwnd, UINT msg, Line 554  separator_wnd_proc (HWND hwnd, UINT msg,
554          FillRect (ps.hdc, &rect, (HBRUSH)(COLOR_3DFACE+1));          FillRect (ps.hdc, &rect, (HBRUSH)(COLOR_3DFACE+1));
555    
556          /* The lines from the light into the dark */          /* The lines from the light into the dark */
557          MoveToEx(ps.hdc, 0,0, NULL);          MoveToEx (ps.hdc, 0,0, NULL);
558          if ((hpen = CreatePen (PS_SOLID, 0, GetSysColor(COLOR_3DHILIGHT))) != NULL) {          hpen = CreatePen (PS_SOLID, 0, GetSysColor (COLOR_3DHILIGHT));
559            if (hpen != NULL) {
560              SelectObject (ps.hdc, (LPVOID)hpen);              SelectObject (ps.hdc, (LPVOID)hpen);
561              LineTo (ps.hdc, rect.right, 0);              LineTo (ps.hdc, rect.right, 0);
562              DeleteObject (hpen);              DeleteObject (hpen);
563          }          }
564          MoveToEx(ps.hdc, 0, 1, NULL);          MoveToEx (ps.hdc, 0, 1, NULL);
565          if ((hpen = CreatePen (PS_SOLID, 0, GetSysColor(COLOR_3DLIGHT))) != NULL) {          hpen = CreatePen (PS_SOLID, 0, GetSysColor (COLOR_3DLIGHT));
566            if (hpen != NULL) {
567               SelectObject (ps.hdc, (LPVOID)hpen);               SelectObject (ps.hdc, (LPVOID)hpen);
568               LineTo (ps.hdc, rect.right, rect.bottom);               LineTo (ps.hdc, rect.right, rect.bottom);
569               DeleteObject (hpen);               DeleteObject (hpen);
570           }           }
571    
572          MoveToEx(ps.hdc, 0, rect.bottom-1, NULL);          MoveToEx (ps.hdc, 0, rect.bottom-1, NULL);
573          if ((hpen = CreatePen (PS_SOLID, 0, GetSysColor(COLOR_3DSHADOW))) != NULL) {          hpen = CreatePen (PS_SOLID, 0, GetSysColor(COLOR_3DSHADOW));
574            if (hpen != NULL) {
575              SelectObject (ps.hdc, (LPVOID)hpen);              SelectObject (ps.hdc, (LPVOID)hpen);
576              LineTo (ps.hdc, rect.right, rect.bottom-1);              LineTo (ps.hdc, rect.right, rect.bottom-1);
577              DeleteObject (hpen);              DeleteObject (hpen);
578          }          }
579          MoveToEx(ps.hdc, 0, rect.bottom, NULL);          MoveToEx (ps.hdc, 0, rect.bottom, NULL);
580          if ((hpen = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_3DDKSHADOW))) != NULL) {          hpen = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_3DDKSHADOW));
581            if (hpen != NULL) {
582              SelectObject (ps.hdc, (LPVOID)hpen);              SelectObject (ps.hdc, (LPVOID)hpen);
583              LineTo (ps.hdc, rect.right, rect.bottom);              LineTo (ps.hdc, rect.right, rect.bottom);
584              DeleteObject (hpen);              DeleteObject (hpen);
# Line 549  separator_wnd_proc (HWND hwnd, UINT msg, Line 602  separator_wnd_proc (HWND hwnd, UINT msg,
602          if (wparam == MK_LBUTTON) {          if (wparam == MK_LBUTTON) {
603              struct km_info_s *kmi;              struct km_info_s *kmi;
604              POINT p;              POINT p;
             RECT r;  
605    
606              kmi = (struct km_info_s *)GetWindowLong (hwnd, GWL_USERDATA);              kmi = (struct km_info_s *)GetWindowLong (hwnd, GWL_USERDATA);
607              if (kmi == NULL)              if (kmi == NULL)
608                  break;                  break;
609    
610              /* Calculate mouse movement */              /* Calculate mouse movement */
611              p.x = LOWORD(lparam);              p.x = LOWORD (lparam);
612              p.y = HIWORD(lparam);              p.y = HIWORD (lparam);
613              ClientToScreen (hwnd, &p);              ClientToScreen (hwnd, &p);
614    
615              GetWindowRect (hwnd, &r);              GetWindowRect (hwnd, &rect);
616              r.top += (short)(p.y - last_mouse_pos.y);              rect.top += (short)(p.y - last_mouse_pos.y);
617              r.bottom += (short)(p.y - last_mouse_pos.y);              rect.bottom += (short)(p.y - last_mouse_pos.y);
618    
619              last_mouse_pos.y = p.y;              last_mouse_pos.y = p.y;
620    
621              /* Apply mouse movement to window. Beware the MoveWindow is relaive              /* Apply mouse movement to window. Beware the MoveWindow is relaive
622                 to parent NOT screen */                 to parent NOT screen */
623              MapWindowPoints (NULL, GetParent(hwnd), (POINT*)&r, 2);              MapWindowPoints (NULL, GetParent(hwnd), (POINT*)&rect, 2);
624              kmi->ypos_sep = r.top;              kmi->ypos_sep = rect.top;
625              kmi->ypercent_sep = 0; /* This forces do_resize_window to use abs. position */              kmi->ypercent_sep = 0; /* This forces do_resize_window to use abs. position */
626              do_resize_window (GetParent(hwnd), kmi);              do_resize_window (GetParent (hwnd), kmi);
627              return 0;              return 0;
628          }          }
629      }      }
# Line 587  regist_sep_wnd (HWND dlg, struct km_info Line 639  regist_sep_wnd (HWND dlg, struct km_info
639      WNDCLASS wndclass;      WNDCLASS wndclass;
640      HWND h;      HWND h;
641    
642        memset (&wndclass, 0, sizeof (wndclass));
643      wndclass.style         = CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW;      wndclass.style         = CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW;
644      wndclass.lpfnWndProc   = separator_wnd_proc;      wndclass.lpfnWndProc   = separator_wnd_proc;
645      wndclass.cbClsExtra    = 0;      wndclass.cbClsExtra    = 0;
# Line 601  regist_sep_wnd (HWND dlg, struct km_info Line 654  regist_sep_wnd (HWND dlg, struct km_info
654    
655      h = CreateWindowEx (WS_EX_WINDOWEDGE, WINDOWCLASS_SEPARATOR_CHILD, NULL,      h = CreateWindowEx (WS_EX_WINDOWEDGE, WINDOWCLASS_SEPARATOR_CHILD, NULL,
656                          WS_CHILD | WS_CLIPCHILDREN | WS_VISIBLE,                          WS_CHILD | WS_CLIPCHILDREN | WS_VISIBLE,
657                          0, 400, 2000, 5, dlg, (HMENU) 0, glob_hinst, kmi);                              0, 400, 2000, 5, dlg, (HMENU) 0, glob_hinst, kmi);
658        if (!h)
659            BUG (NULL);
660      ShowWindow (h, SW_SHOW);      ShowWindow (h, SW_SHOW);
661      return h;      return h;
662  }  }
# Line 621  update_ui_items (HWND hwnd, listview_ctr Line 676  update_ui_items (HWND hwnd, listview_ctr
676      HMENU hmenu;      HMENU hmenu;
677      int mult_resids[] = {ID_KEYMISC_PROPS, ID_KEYMISC_SIGN, ID_KEYMISC_EDITKEY,      int mult_resids[] = {ID_KEYMISC_PROPS, ID_KEYMISC_SIGN, ID_KEYMISC_EDITKEY,
678                           ID_KEYMISC_CHECKSIGS, ID_KEYMISC_REVCERT, 0};                           ID_KEYMISC_CHECKSIGS, ID_KEYMISC_REVCERT, 0};
679      int key_selected = 0;      int key_selected;
680      int key_has_sec = 0;      int key_has_sec;
681      int key_inv = 0;      int key_inv = 0;
682      int i, state=0;      int i, state=0;
683    
# Line 669  update_ui_items (HWND hwnd, listview_ctr Line 724  update_ui_items (HWND hwnd, listview_ctr
724      }      }
725    
726      /* Disable all secret-key functions when no secret key is available. */      /* Disable all secret-key functions when no secret key is available. */
727      {      if (!secret_key_available ()) {
728          gpg_keycache_t sec = keycache_get_ctx (0);          enable_button (tb_hwnd, ID_KEYMISC_SIGN, FALSE);
729          if (gpg_keycache_get_size (sec) == 0) {          set_menu_state (hmenu, ID_KEYMISC_SIGN, MF_GRAYED);
             enable_button (tb_hwnd, ID_KEYMISC_SIGN, FALSE);  
             set_menu_state (hmenu, ID_KEYMISC_SIGN, MF_GRAYED);  
         }  
730      }      }
731  }  }
732    
# Line 798  change_key_menu (HMENU hm, int id) Line 850  change_key_menu (HMENU hm, int id)
850  static void  static void
851  update_key (listview_ctrl_t lv, int pos, const char *keyid, int keypair)  update_key (listview_ctrl_t lv, int pos, const char *keyid, int keypair)
852  {  {
853      gpgme_key_t key;      struct winpt_key_s key;
854    
855      keycache_update (0, keyid);      keycache_update (0, keyid);
856      if (keypair)      if (keypair)
# Line 806  update_key (listview_ctrl_t lv, int pos, Line 858  update_key (listview_ctrl_t lv, int pos,
858    
859      /* because we replaced the key item, we need to update the      /* because we replaced the key item, we need to update the
860         address of the pointer in the ListView control. */         address of the pointer in the ListView control. */
861      get_pubkey (keyid, &key);      memset (&key, 0, sizeof (key));
862      keylist_upd_key (lv, pos, key);      winpt_get_pubkey (keyid, &key);
863        keylist_upd_key (lv, pos, key.ext, key.ctx);
864      keyring_check_last_access ();      keyring_check_last_access ();
865  }  }
866    
# Line 825  setup_status_bar (HWND dlg, listview_ctr Line 878  setup_status_bar (HWND dlg, listview_ctr
878      for (i=1; i <= 3; i++)      for (i=1; i <= 3; i++)
879          partpos[i-1] = r.right/3*i;          partpos[i-1] = r.right/3*i;
880      statbar = CreateStatusWindow (WS_CHILD | WS_VISIBLE | CCS_BOTTOM,      statbar = CreateStatusWindow (WS_CHILD | WS_VISIBLE | CCS_BOTTOM,
881                                    "status bar", dlg, KM_SEPARATOR_ID);                                    "WinPT_Status_Bar", dlg, KM_SEPARATOR_ID);
882        if (!statbar)
883            BUG (NULL);
884      ShowWindow (statbar, SW_SHOW);      ShowWindow (statbar, SW_SHOW);
885      SendMessage (statbar, SB_SETPARTS, (WPARAM)3, (LPARAM)partpos);      SendMessage (statbar, SB_SETPARTS, (WPARAM)3, (LPARAM)partpos);
886    
887      update_default_key_str (statbar);      update_default_key_str (statbar);
888      update_status_bar (statbar, lv);      update_status_bar (statbar, lv);
   
889      return statbar;      return statbar;
890  }  }
891    
# Line 902  start_help (HWND dlg, int check) Line 955  start_help (HWND dlg, int check)
955      return file_exist_check (path) == 0? true : false;      return file_exist_check (path) == 0? true : false;
956  }  }
957    
958    
959  /* Translate all menu strings. */  /* Translate all menu strings. */
960  static void  static void
961  translate_menu_strings (HWND dlg)  translate_menu_strings (HWND dlg)
# Line 936  translate_menu_strings (HWND dlg) Line 990  translate_menu_strings (HWND dlg)
990      set_menu_text (menu, ID_KEYMISC_EXPORT, _("&Export..."));      set_menu_text (menu, ID_KEYMISC_EXPORT, _("&Export..."));
991      set_menu_text (menu, ID_KEYMISC_IMPORT, _("&Import..."));      set_menu_text (menu, ID_KEYMISC_IMPORT, _("&Import..."));
992      set_menu_text (menu, ID_KEYMISC_PROPS, _("&Properties"));      set_menu_text (menu, ID_KEYMISC_PROPS, _("&Properties"));
993      set_menu_text (menu, ID_KEYMISC_GPGOPT, _("Options"));      set_menu_text (menu, ID_KEYMISC_GPGOPT, _("GPG &Options"));
994      set_menu_text (menu, ID_KEYMISC_GPGPREFS, _("Preferences"));      set_menu_text (menu, ID_KEYMISC_GPGPREFS, _("&GPG Preferences"));
995        set_menu_text (menu, ID_KEYMISC_WINPTPREFS, _("&WinPT Preferences"));
996      set_menu_text (menu, ID_KEYMISC_SENDRECV, _("Keyserver") );      set_menu_text (menu, ID_KEYMISC_SENDRECV, _("Keyserver") );
997      set_menu_text (menu, ID_KEYMISC_EXPORT_PRIVKEY, _("E&xport Secret Key"));      set_menu_text (menu, ID_KEYMISC_EXPORT_PRIVKEY, _("E&xport Secret Key"));
998      set_menu_text (menu, ID_KEYMISC_RECACHE, _("Re&load Key Cache"));      set_menu_text (menu, ID_KEYMISC_RECACHE, _("Re&load Key Cache"));
# Line 966  translate_popupmenu_strings (HMENU popup Line 1021  translate_popupmenu_strings (HMENU popup
1021      set_menu_text (popup, ID_KEYCTX_KEYID_COPY, _("Copy Key ID to Clipboard"));      set_menu_text (popup, ID_KEYCTX_KEYID_COPY, _("Copy Key ID to Clipboard"));
1022      set_menu_text (popup, ID_KEYCTX_FPR_COPY, _("Copy Fingerprint to Clipboard"));      set_menu_text (popup, ID_KEYCTX_FPR_COPY, _("Copy Fingerprint to Clipboard"));
1023      set_menu_text (popup, ID_KEYCTX_KINFO_COPY, _("Copy Key Info to Clipboard"));      set_menu_text (popup, ID_KEYCTX_KINFO_COPY, _("Copy Key Info to Clipboard"));
1024        set_menu_text (popup, ID_KEYCTX_EMAIL_COPY, _("Copy E-Mail to Clipboard"));
1025      set_menu_text (popup, ID_KEYCTX_COPY, _("Copy Key to Clipboard"));      set_menu_text (popup, ID_KEYCTX_COPY, _("Copy Key to Clipboard"));
1026      set_menu_text (popup, ID_KEYCTX_PASTE, _("Paste Key from Clipboard"));      set_menu_text (popup, ID_KEYCTX_PASTE, _("Paste Key from Clipboard"));
1027      set_menu_text (popup, ID_KEYCTX_RECVFROM, _("Refresh from Keyserver"));      set_menu_text (popup, ID_KEYCTX_RECVFROM, _("Refresh from Keyserver"));
# Line 1014  updated_keys_avail (void) Line 1070  updated_keys_avail (void)
1070  static int  static int
1071  find_keypos (listview_ctrl_t lv, gpgme_key_t key)  find_keypos (listview_ctrl_t lv, gpgme_key_t key)
1072  {  {
1073      char keyid[16+1];      char keyid[32+1];
1074      int i;      int i;
1075    
1076      for (i=0; i < listview_count_items (lv, 0); i++) {      for (i=0; i < listview_count_items (lv, 0); i++) {
# Line 1038  refresh_keylist (struct km_info_s *kmi) Line 1094  refresh_keylist (struct km_info_s *kmi)
1094      kc = keycache_get_ctx (1);      kc = keycache_get_ctx (1);
1095      while (!gpg_keycache_next_updated_key (kc, &ctx, &status)) {      while (!gpg_keycache_next_updated_key (kc, &ctx, &status)) {
1096          if (status == KC_FLAG_ADD)          if (status == KC_FLAG_ADD)
1097              keylist_add_key (kmi->lv, KEYLIST_LIST, ctx->key);              keylist_add_key (kmi->lv, KEYLIST_LIST, ctx, ctx->key);
1098          else {          else {
1099              pos = find_keypos (kmi->lv, ctx->key);              pos = find_keypos (kmi->lv, ctx->key);
1100              if (pos != -1)              if (pos != -1)
1101                  keylist_upd_key (kmi->lv, pos, ctx->key);                  keylist_upd_key (kmi->lv, pos, ctx, ctx->key);
1102          }          }
1103      }      }
1104      keylist_sort (kmi->lv, KEY_SORT_USERID);      keylist_sort (kmi->lv, kmi->keylist_sortby);
1105      update_status_bar (kmi->statbar, kmi->lv);      update_status_bar (kmi->statbar, kmi->lv);
1106      keyring_check_last_access ();      keyring_check_last_access ();
1107        SetForegroundWindow (kmi->dlg);
1108  }  }
1109    
1110    
1111    /* Reload the key cache. */
1112  static void  static void
1113  reload_keylist (struct km_info_s *kmi)  keycache_reload (HWND dlg)
1114    {      
1115        refresh_cache_s rcs;
1116    
1117        memset (&rcs, 0, sizeof rcs);
1118        rcs.kr_reload = rcs.kr_update = 1;
1119        rcs.tr_update = 0;
1120        DialogBoxParam (glob_hinst, (LPCSTR)IDD_WINPT_KEYCACHE, dlg,                                        
1121                        keycache_dlg_proc, (LPARAM)&rcs);
1122    }
1123    
1124    
1125    /* Check if the secret keyring contains at least one
1126       key with ultimate trust.
1127       Return value: 0 on success. */
1128    int
1129    check_ultimate_trusted_key (gpg_keycache_t _sec)
1130  {  {
1131      keycache_reload (kmi->dlg);      struct keycache_s *n;
1132      keylist_reload (kmi->lv, keycache_get_ctx (1),      int nkeys = 0;
1133                      KEYLIST_LIST, KEY_SORT_USERID);  
1134      update_status_bar (kmi->statbar, kmi->lv);      for (n = _sec->item; n; n = n->next) {
1135      keyring_check_last_access ();          if (n->pubpart &&
1136                n->pubpart->key->owner_trust == GPGME_VALIDITY_ULTIMATE)
1137                return 0;
1138            nkeys++;
1139        }
1140    
1141        /* if we do not have any secret keys, it does not make sense
1142           to return an error. */
1143        if (nkeys == 0)
1144            return 0;
1145        return -1;
1146  }  }
1147    
1148    
# Line 1066  reload_keylist (struct km_info_s *kmi) Line 1150  reload_keylist (struct km_info_s *kmi)
1150  static void  static void
1151  reload_keycache (struct km_info_s *kmi)  reload_keycache (struct km_info_s *kmi)
1152  {  {
     refresh_cache_s rcs = {0};  
1153      gpg_keycache_t c;      gpg_keycache_t c;
1154    
1155      rcs.kr_reload = rcs.kr_update = 1;      keycache_reload (kmi->dlg);
     rcs.tr_update = 0;  
     DialogBoxParam (glob_hinst, (LPCSTR)IDD_WINPT_KEYCACHE, kmi->dlg,  
                     keycache_dlg_proc, (LPARAM)&rcs);  
1156      c = keycache_get_ctx (1);      c = keycache_get_ctx (1);
1157      if (!c)      keylist_reload (kmi->lv, c, KEYLIST_LIST, kmi->keylist_sortby);
         BUG (0);  
     keylist_reload (kmi->lv, c, KEYLIST_LIST, KEY_SORT_USERID);  
1158      update_status_bar (kmi->statbar, kmi->lv);      update_status_bar (kmi->statbar, kmi->lv);
1159      SetForegroundWindow (kmi->dlg);      SetForegroundWindow (kmi->dlg);
1160        keyring_check_last_access ();
1161  }  }
1162    
1163    
# Line 1086  reload_keycache (struct km_info_s *kmi) Line 1165  reload_keycache (struct km_info_s *kmi)
1165  static void  static void
1166  km_gui_import (struct km_info_s *kmi, int cmd_id, void *param)  km_gui_import (struct km_info_s *kmi, int cmd_id, void *param)
1167  {  {
1168      int newkeys=0, newsks=0;      int newkeys = 0, newsks = 0;
1169      int err = 0;      int err = 0;
1170    
1171      switch (cmd_id) {      switch (cmd_id) {
# Line 1111  km_gui_import (struct km_info_s *kmi, in Line 1190  km_gui_import (struct km_info_s *kmi, in
1190      if (!err && !newsks && (newkeys > 0 && newkeys < KM_PRELOAD_KEYS))      if (!err && !newsks && (newkeys > 0 && newkeys < KM_PRELOAD_KEYS))
1191          refresh_keylist (kmi);          refresh_keylist (kmi);
1192      else if (!err) /* avoid to spawn too much processes. */      else if (!err) /* avoid to spawn too much processes. */
1193          reload_keylist (kmi);          reload_keycache (kmi);  
   
1194      SetForegroundWindow (kmi->dlg);      SetForegroundWindow (kmi->dlg);
1195      center_window (kmi->dlg, NULL);  }
1196    
1197    
1198    /* Copy the requested key information (@what) to the clipboard.
1199       If multiple items were selected, each key info is copied to
1200       the clipboard. The data is separated by \r\n. */
1201    static void
1202    copy_key_info (int what, struct km_info_s *kmi)
1203    {
1204        gpgme_data_t out;
1205        gpgme_key_t key;
1206        struct keycache_s *kci = NULL;
1207        size_t n=0;
1208        char *p, tmp[256];
1209        int i=0, end = listview_count_items (kmi->lv, 0);
1210        bool single = false;
1211    
1212        /* Do not iterate over the entire list if just one item is selected. */
1213        n = listview_count_items (kmi->lv, 1);
1214        if (n == 1) {
1215            i = kmi->lv_idx;
1216            end = i+1;
1217            single = true;
1218        }
1219    
1220        gpgme_data_new (&out);
1221        for (; i < end; i++) {
1222            if (!listview_get_item_state (kmi->lv, i))
1223                continue;
1224            switch (what) {
1225    
1226            case ID_KEYCTX_EMAIL_COPY:
1227                key = km_get_key_ptr (kmi->lv, i, NULL);
1228                gpgme_data_write (out, key->uids->email, strlen (key->uids->email));
1229                if (!single) gpgme_data_write (out, "\r\n", 2);
1230                break;
1231    
1232            case ID_KEYCTX_UID_COPY:
1233                key = km_get_key_ptr (kmi->lv, i, &kci);
1234                gpgme_data_write (out, kci->uids->uid, strlen (kci->uids->uid));
1235                if (!single) gpgme_data_write (out, "\r\n", 2);
1236                break;
1237    
1238            case ID_KEYCTX_KEYID_COPY:
1239                key = km_get_key_ptr (kmi->lv, i, NULL);
1240                gpgme_data_write (out, "0x", 2);
1241                gpgme_data_write (out, key->subkeys->keyid+8, 8);
1242                if (!single) gpgme_data_write (out, "\r\n", 2);
1243                break;
1244    
1245            case ID_KEYCTX_FPR_COPY:
1246                key = km_get_key_ptr (kmi->lv, i, NULL);
1247                gpgme_data_write (out, key->subkeys->fpr, strlen (key->subkeys->fpr));
1248                if (!single) gpgme_data_write (out, "\r\n", 2);
1249                break;
1250    
1251            case ID_KEYCTX_KINFO_COPY:
1252                key = km_get_key_ptr (kmi->lv, i, NULL);
1253                key_get_clip_info (key->subkeys->keyid+8, tmp, sizeof (tmp)-1);
1254                gpgme_data_write (out, tmp, strlen (tmp));
1255                if (!single) gpgme_data_write (out, "\r\n", 2);
1256                break;
1257            }
1258        }
1259        gpgme_data_write (out, "\0", 1);
1260        p = gpgme_data_release_and_get_mem (out, &n);
1261        set_clip_text (NULL, p, n);
1262        gpgme_free (p);
1263  }  }
1264    
1265    
# Line 1122  km_gui_import (struct km_info_s *kmi, in Line 1267  km_gui_import (struct km_info_s *kmi, in
1267  BOOL CALLBACK  BOOL CALLBACK
1268  keymanager_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)  keymanager_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
1269  {  {
     struct km_info_s *kmi = NULL;  
1270      HWND kl;      HWND kl;
1271      HMENU hm;      HMENU hm;
1272        RECT r;
1273      gpg_keycache_t c;      gpg_keycache_t c;
1274      gpgme_key_t key;      gpgme_key_t key;
1275        km_info_t kmi = NULL;    
1276      struct genkey_s genkey;      struct genkey_s genkey;
1277      struct winpt_key_s k = {0};      struct winpt_key_s k = {0};
1278      struct URL_ctx_s *url;      struct URL_ctx_s *url;
# Line 1136  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1282  keymanager_dlg_proc (HWND dlg, UINT msg,
1282      int l_idx = 0, i=0, rc;      int l_idx = 0, i=0, rc;
1283    
1284      if ((msg != WM_INITDIALOG)      if ((msg != WM_INITDIALOG)
1285          && ((kmi = (struct km_info_s*)GetWindowLong (dlg, GWL_USERDATA)) == NULL))          && ((kmi = (km_info_t)GetWindowLong (dlg, GWL_USERDATA)) == NULL))
1286          return FALSE;          return FALSE;
1287            
1288      /* handle dynamic popup items in the keyserver menu. */      /* handle dynamic popup items in the keyserver menu. */
# Line 1162  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1308  keymanager_dlg_proc (HWND dlg, UINT msg,
1308          SetWindowText (dlg, _("Key Manager"));          SetWindowText (dlg, _("Key Manager"));
1309    
1310          c = keycache_get_ctx (KEYCACHE_PUB);          c = keycache_get_ctx (KEYCACHE_PUB);
         if (!c)  
             BUG (NULL);  
1311          kl = GetDlgItem (dlg, IDC_KEYMISC_KEYLIST);          kl = GetDlgItem (dlg, IDC_KEYMISC_KEYLIST);
1312          kmi->keylist_sortby = KEY_SORT_USERID;          kmi->keylist_sortby = KEY_SORT_USERID;
1313          Header_SetImageList(ListView_GetHeader (kl), glob_imagelist);          Header_SetImageList(ListView_GetHeader (kl), glob_imagelist);
1314          kmi->lv = keylist_load (GetDlgItem (dlg, IDC_KEYMISC_KEYLIST), c,          kmi->lv = keylist_load (GetDlgItem (dlg, IDC_KEYMISC_KEYLIST), c,
1315                                  NULL, KEYLIST_LIST, kmi->keylist_sortby);                                  NULL, KEYLIST_LIST, kmi->keylist_sortby);
1316          if (check_ultimate_trusted_key ()) {          if (check_ultimate_trusted_key (keycache_get_ctx (0))) {
1317              msg_box (dlg, _("No ultimately trusted key found.\n"              msg_box (dlg, _("No ultimately trusted key found.\n"
1318                              "Please set at least one secret key to ultimate trust."),                              "Please set at least one secret key to ultimate trust."),
1319                              _("Key Manager"), MB_WARN);                              _("Key Manager"), MB_WARN);
# Line 1180  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1324  keymanager_dlg_proc (HWND dlg, UINT msg,
1324          keylist_proc.current = (WNDPROC)keylist_subclass_proc;          keylist_proc.current = (WNDPROC)keylist_subclass_proc;
1325          keylist_proc.old = (WNDPROC)GetWindowLong(kl, GWL_WNDPROC);          keylist_proc.old = (WNDPROC)GetWindowLong(kl, GWL_WNDPROC);
1326          if (keylist_proc.old) {          if (keylist_proc.old) {
1327              if( !SetWindowLong (kl, GWL_WNDPROC, (LONG)keylist_proc.current)) {              if (!SetWindowLong (kl, GWL_WNDPROC, (LONG)keylist_proc.current)) {
1328                  msg_box (dlg, _("Could not set keylist window procedure."),                  msg_box (dlg, "Could not set keylist window procedure.",
1329                           _("Key Manager"), MB_ERR);                           _("Key Manager"), MB_ERR);
1330                  BUG (NULL);                  BUG (NULL);
1331              }              }
1332          }          }
1333          kmi->statbar = setup_status_bar (dlg, kmi->lv);          kmi->statbar = setup_status_bar (dlg, kmi->lv);
1334          SetWindowLong (dlg, GWL_USERDATA, (LONG)kmi);          SetWindowLong (dlg, GWL_USERDATA, (LONG)kmi);
1335          kmi->toolbar = load_toolbar (dlg, kmi);          kmi->toolbar = create_toolbar (dlg, kmi);
1336          kmi->dlg = dlg;          kmi->dlg = dlg;
1337    
1338          do_center_window (dlg, kmi);          do_center_window (dlg, kmi);
1339          do_resize_window (dlg, kmi);          do_resize_window (dlg, kmi);
1340            restore_window_size (dlg, kmi);
1341          update_ui_items (dlg, kmi->lv);          update_ui_items (dlg, kmi->lv);
1342          restore_column_info (kmi->lv);          restore_column_info (kmi);
1343            keylist_sort (kmi->lv, kmi->keylist_sortby);
1344    
1345            SendMessage (dlg, WM_SETICON, (WPARAM)ICON_SMALL,
1346                         (LPARAM)LoadIcon (glob_hinst, (LPCTSTR)IDI_WINPT));
1347          SetDlgItemText (dlg, IDC_KEYMISC_GTEXT, _("Groups"));          SetDlgItemText (dlg, IDC_KEYMISC_GTEXT, _("Groups"));
1348          SetClassLong (dlg, GCL_HICON, (LONG)LoadIcon (glob_hinst,          SetDlgItemText (dlg, ID_GROUP_SHOW, _("&Show"));
1349                        (LPCTSTR)IDI_WINPT));          SetDlgItemText (dlg, ID_GROUP_NEW, _("&New..."));
1350          SetForegroundWindow (dlg);          SetForegroundWindow (dlg);
1351          force_foreground_window (dlg, 1000);          kmi->magic = SetTimer (dlg, 1, 1000, NULL);
1352          return TRUE;          return TRUE;
1353      
1354    
1355        case WM_TIMER:
1356            KillTimer (dlg, kmi->magic);
1357            SetForegroundWindow (dlg);
1358            break;
1359                    
1360      case WM_DESTROY:      case WM_DESTROY:
1361          save_column_info (kmi->lv);          save_column_info (kmi);
1362          if (kmi->lv) {          if (kmi->lv) {
1363              keylist_delete (kmi->lv);              keylist_delete (kmi->lv);
1364              kmi->lv = NULL;                    kmi->lv = NULL;      
# Line 1215  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1369  keymanager_dlg_proc (HWND dlg, UINT msg,
1369          set_reg_entry (HKEY_CURRENT_USER, "Software\\WinPT", "KM_Pos_X", type);          set_reg_entry (HKEY_CURRENT_USER, "Software\\WinPT", "KM_Pos_X", type);
1370          ltoa (kmi->pos_y, type, 10);          ltoa (kmi->pos_y, type, 10);
1371          set_reg_entry (HKEY_CURRENT_USER, "Software\\WinPT", "KM_Pos_Y", type);          set_reg_entry (HKEY_CURRENT_USER, "Software\\WinPT", "KM_Pos_Y", type);
1372          /* XXX: store window size. */  
1373                    GetWindowRect (dlg, &r);
1374          /* Remove runtime information. This should be the last action taken here. */          sprintf (type, "%d", (int)(r.bottom-r.top));
1375          delete kmi; kmi = NULL;          set_reg_entry (HKEY_CURRENT_USER, "Software\\WinPT", "KM_Size_Width",
1376                               type);
1377            sprintf (type, "%d", (int)(r.right-r.left));
1378            set_reg_entry (HKEY_CURRENT_USER, "Software\\WinPT", "KM_Size_Height",
1379                            type);
1380    
1381            /* Remove runtime information.
1382               This should be the last action taken here. */
1383            delete kmi;
1384            kmi = NULL;
1385          SetWindowLong (dlg, GWL_USERDATA, 0);          SetWindowLong (dlg, GWL_USERDATA, 0);
1386          return FALSE;          return FALSE;
1387    
     case WM_SHOWWINDOW:  
         break;  
   
1388      case WM_MOVE:      case WM_MOVE:
         RECT r;  
1389          GetWindowRect (dlg, &r);          GetWindowRect (dlg, &r);
1390          kmi->pos_x = r.left;          kmi->pos_x = r.left;
1391          kmi->pos_y = r.top;              kmi->pos_y = r.top;    
# Line 1257  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1416  keymanager_dlg_proc (HWND dlg, UINT msg,
1416          case TBN_GETBUTTONINFO:          case TBN_GETBUTTONINFO:
1417              LPTBNOTIFY lpTbNotify;              LPTBNOTIFY lpTbNotify;
1418              lpTbNotify = (LPTBNOTIFY)lparam;              lpTbNotify = (LPTBNOTIFY)lparam;
1419              if (lpTbNotify->iItem < (sizeof(myb) / sizeof(mybuttons))) {              if (lpTbNotify->iItem < (sizeof(tbb) / sizeof(tb_button_s))) {
1420                  lpTbNotify->tbButton.iBitmap = imagelist_getindex (myb[lpTbNotify->iItem].icon);                  lpTbNotify->tbButton.iBitmap = imagelist_getindex (tbb[lpTbNotify->iItem].icon);
1421                  lpTbNotify->tbButton.idCommand = myb[lpTbNotify->iItem].command;                  lpTbNotify->tbButton.idCommand = tbb[lpTbNotify->iItem].command;
1422                  lpTbNotify->tbButton.fsState = TBSTATE_ENABLED;                  lpTbNotify->tbButton.fsState = TBSTATE_ENABLED;
1423                  lpTbNotify->tbButton.fsStyle = TBSTYLE_BUTTON;                  lpTbNotify->tbButton.fsStyle = TBSTYLE_BUTTON;
1424                  lpTbNotify->tbButton.iString = 0;                  lpTbNotify->tbButton.iString = 0;
1425                  strncpy (lpTbNotify->pszText, myb[lpTbNotify->iItem].text, lpTbNotify->cchText);                  strncpy (lpTbNotify->pszText, tbb[lpTbNotify->iItem].text, lpTbNotify->cchText);
1426                  SetWindowLong(dlg, DWL_MSGRESULT, TRUE);                  SetWindowLong(dlg, DWL_MSGRESULT, TRUE);
1427              }              }
1428              return TRUE;              return TRUE;
# Line 1344  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1503  keymanager_dlg_proc (HWND dlg, UINT msg,
1503              break;              break;
1504    
1505          case NM_RCLICK:          case NM_RCLICK:
1506                if (!wait_for_progress_cb (0))
1507                    break;
1508              if (notify->idFrom == IDC_KEYMISC_KEYLIST) {              if (notify->idFrom == IDC_KEYMISC_KEYLIST) {
1509                  l_idx =listview_get_curr_pos (kmi->lv);                  l_idx =listview_get_curr_pos (kmi->lv);
1510                  if (l_idx == -1)                  if (l_idx == -1)
# Line 1385  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1546  keymanager_dlg_proc (HWND dlg, UINT msg,
1546                      set_menu_state (popup, ID_KEYCTX_PASTE, MF_DISABLED|MF_GRAYED);                      set_menu_state (popup, ID_KEYCTX_PASTE, MF_DISABLED|MF_GRAYED);
1547                  if (mapi_init ())                  if (mapi_init ())
1548                      set_menu_state (popup, ID_KEYCTX_SENDMAIL, MF_DISABLED|MF_GRAYED);                      set_menu_state (popup, ID_KEYCTX_SENDMAIL, MF_DISABLED|MF_GRAYED);
1549                    if (!secret_key_available ())
1550                        set_menu_state (popup, ID_KEYCTX_SIGN, MF_DISABLED|MF_GRAYED);
1551    
1552                  /* Override 'Default Keyserver' with the actual name. */                  /* Override 'Default Keyserver' with the actual name. */
1553                  host = kserver_get_hostname (0, -1, &port);                  host = kserver_get_hostname (0, -1, &port);
# Line 1410  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1573  keymanager_dlg_proc (HWND dlg, UINT msg,
1573              if (notify->idFrom == IDC_KEYMISC_KEYLIST) {              if (notify->idFrom == IDC_KEYMISC_KEYLIST) {
1574                  NMLISTVIEW *nft = (LPNMLISTVIEW) lparam;                  NMLISTVIEW *nft = (LPNMLISTVIEW) lparam;
1575                  int sortby = 0;                  int sortby = 0;
1576    
1577                    if (!wait_for_progress_cb (0))
1578                        break;
1579                  switch (nft->iSubItem) {                  switch (nft->iSubItem) {
1580                  case 0:  sortby = KEY_SORT_USERID; break;                  case 0:  sortby = KEY_SORT_USERID; break;
1581                  case 1:  sortby = KEY_SORT_KEYID; break;                  case 1:  sortby = KEY_SORT_KEYID; break;
# Line 1419  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1585  keymanager_dlg_proc (HWND dlg, UINT msg,
1585                  case 6:  sortby = KEY_SORT_OTRUST; break;                  case 6:  sortby = KEY_SORT_OTRUST; break;
1586                  case 7:  sortby = KEY_SORT_CREATED; break;                  case 7:  sortby = KEY_SORT_CREATED; break;
1587                  case 8:  sortby = KEY_SORT_ALGO; break;                  case 8:  sortby = KEY_SORT_ALGO; break;
1588                  default: return TRUE; //sortby = KEY_SORT_USERID; break;                  default: return TRUE; /*sortby userid.*/
1589                  }                  }
1590    
1591                  if ((kmi->keylist_sortby & ~KEYLIST_SORT_DESC) == sortby)                  if ((kmi->keylist_sortby & ~KEYLIST_SORT_DESC) == sortby)
# Line 1455  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1621  keymanager_dlg_proc (HWND dlg, UINT msg,
1621          break;          break;
1622    
1623      case WM_INITMENUPOPUP:      case WM_INITMENUPOPUP:
1624          if ((UINT)LOWORD (lparam) == 3) {          hm = (HMENU)wparam;
1625              HMENU h = (HMENU)wparam;          if ((UINT)LOWORD (lparam) == 3)
1626              set_menu_text_bypos (h, 0, _("New"));              set_menu_text_bypos (hm, 0, _("New"));
1627          }          else if ((UINT)LOWORD (lparam) == 1)
1628          /* XXX: before we can use it, we need to find a way to              set_menu_text_bypos (hm, 8, _("Preferences..."));
                 update the gpg access timestamp after each operation.  
         if (keyring_check_last_access ())  
             reload_keylist (kmi);  
         */  
1629          return FALSE;          return FALSE;
1630    
1631      case WM_COMMAND:      case WM_COMMAND:
# Line 1474  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1636  keymanager_dlg_proc (HWND dlg, UINT msg,
1636              return FALSE;              return FALSE;
1637          }          }
1638    
1639            /*wait_for_progress_cb ();*/
1640          switch (LOWORD (wparam)) {          switch (LOWORD (wparam)) {
1641          case ID_KEYMISC_QUIT:          case ID_KEYMISC_QUIT:
1642              EndDialog (dlg, TRUE);              EndDialog (dlg, TRUE);
# Line 1497  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1660  keymanager_dlg_proc (HWND dlg, UINT msg,
1660              }              }
1661              if (km_check_key_status (kmi->lv, kmi->lv_idx))              if (km_check_key_status (kmi->lv, kmi->lv_idx))
1662                  return TRUE;                  return TRUE;
1663              key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);              km_get_key (kmi->lv, kmi->lv_idx, &k);
             memset (&k, 0, sizeof (k));  
             strncpy (k.tmp_keyid, key->subkeys->keyid+8, 8);  
             k.ctx = key;  
             k.keyid = key->subkeys->keyid;  
1664              dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_KEYSIGN, dlg,              dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_KEYSIGN, dlg,
1665                                keysign_dlg_proc, (LPARAM)&k,                                keysign_dlg_proc, (LPARAM)&k,
1666                                _("Key Signing"), IDS_WINPT_KEYSIGN);                                _("Key Signing"), IDS_WINPT_KEYSIGN);
# Line 1514  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1673  keymanager_dlg_proc (HWND dlg, UINT msg,
1673                  msg_box (dlg, _("Please select a key."), _("Key Manager"), MB_ERR);                  msg_box (dlg, _("Please select a key."), _("Key Manager"), MB_ERR);
1674                  return TRUE;                  return TRUE;
1675              }              }
1676              key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);                  
             if (!key)  
                 BUG (NULL);  
             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;  
             }  
               
1677              {              {
1678                  char state[64];                  char state[64];
1679                  listview_get_item_text (kmi->lv, kmi->lv_idx, 5,                  listview_get_item_text (kmi->lv, kmi->lv_idx, 5,
# Line 1533  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1684  keymanager_dlg_proc (HWND dlg, UINT msg,
1684                      return TRUE;                      return TRUE;
1685                  }                  }
1686              }              }
1687                
1688              memset (&k, 0, sizeof (k));              km_get_key (kmi->lv, kmi->lv_idx, &k);
1689              k.key_pair = 1;              if (!k.key_pair) {
1690              k.keyid = key->subkeys->keyid+8;                  msg_box (dlg, _("There is no secret key available!"),
1691              k.is_protected = km_check_if_protected (kmi->lv, kmi->lv_idx);                          _("Key Manager"), MB_ERR);
1692                    return TRUE;
1693                }
1694              dialog_box_param(glob_hinst, (LPCSTR)IDD_WINPT_KEYREVOKE, dlg,              dialog_box_param(glob_hinst, (LPCSTR)IDD_WINPT_KEYREVOKE, dlg,
1695                               key_revoke_dlg_proc, (LPARAM)&k,                               key_revoke_dlg_proc, (LPARAM)&k,
1696                               _("Key Revocation Cert"), IDS_WINPT_KEYREVOKE);                               _("Key Revocation Cert"), IDS_WINPT_KEYREVOKE);
# Line 1548  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1701  keymanager_dlg_proc (HWND dlg, UINT msg,
1701                  msg_box (dlg, _("Please select a key."), _("Key Manager"), MB_ERR);                  msg_box (dlg, _("Please select a key."), _("Key Manager"), MB_ERR);
1702                  return TRUE;                  return TRUE;
1703              }              }
1704              key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);              km_get_key (kmi->lv, kmi->lv_idx, &k);
             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_ERR);  
                 return TRUE;  
             }  
             memset (&k, 0, sizeof (k));  
             k.keyid = key->subkeys->keyid+8;  
             k.uid = key->uids->uid;  
1705              dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_KEYTRUST, dlg,              dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_KEYTRUST, dlg,
1706                                keytrust_dlg_proc, (LPARAM)&k,                                keytrust_dlg_proc, (LPARAM)&k,
1707                                _("List Trust Path"), IDS_WINPT_KEYTRUST);                                _("List Trust Path"), IDS_WINPT_KEYTRUST);
# Line 1567  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1712  keymanager_dlg_proc (HWND dlg, UINT msg,
1712                  msg_box (dlg, _("Please select a key."), _("Key Manager"), MB_ERR);                  msg_box (dlg, _("Please select a key."), _("Key Manager"), MB_ERR);
1713                  return TRUE;                  return TRUE;
1714              }              }
1715              key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);              km_get_key (kmi->lv, kmi->lv_idx, &k);
             if (!key)  
                 BUG (NULL);  
             memset (&k, 0, sizeof (k));  
             strncpy (k.tmp_keyid, key->subkeys->keyid+8, 8);  
             k.keyid = k.tmp_keyid;  
             k.uid = key->uids->uid;  
             k.ctx = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);  
1716              dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_KEYSIG_TREE, dlg,              dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_KEYSIG_TREE, dlg,
1717                                sigtree_dlg_proc, (LPARAM)&k,                                sigtree_dlg_proc, (LPARAM)&k,
1718                                _("Key Signature List"), IDS_WINPT_KEYSIG);                                _("Key Signature List"), IDS_WINPT_KEYSIG);
1719              if (k.update)              if (k.update)
1720                  update_key (kmi->lv, kmi->lv_idx, k.tmp_keyid, 0);                  update_key (kmi->lv, kmi->lv_idx, k.tmp_keyid, 0);
1721                if (updated_keys_avail ())
1722                    refresh_keylist (kmi);
1723              return TRUE;              return TRUE;
1724                            
1725          case ID_KEYMISC_PROPS:                case ID_KEYMISC_PROPS:      
# Line 1587  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1727  keymanager_dlg_proc (HWND dlg, UINT msg,
1727                  msg_box (dlg, _("Please select a key."), _("Key Manager"), MB_ERR);                  msg_box (dlg, _("Please select a key."), _("Key Manager"), MB_ERR);
1728                  return TRUE;                  return TRUE;
1729              }              }
1730              key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);              km_get_key (kmi->lv, kmi->lv_idx, &k);
             if (!key)  
                 BUG (NULL);  
             memset (&k, 0, sizeof (k));  
             strncpy (k.tmp_keyid, key->subkeys->keyid+8, 8);  
             k.keyid = k.tmp_keyid;  
             k.key_pair = km_check_for_seckey (kmi->lv, kmi->lv_idx, NULL)? 1 : 0;  
1731              k.callback.ctl = kmi->lv;              k.callback.ctl = kmi->lv;
1732              k.callback.idx = kmi->lv_idx;              k.callback.idx = kmi->lv_idx;
             k.is_v3 = km_key_is_v3 (kmi->lv, kmi->lv_idx);  
1733              dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_KEYPROPS, dlg,              dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_KEYPROPS, dlg,
1734                                keyprops_dlg_proc, (LPARAM)&k,                                keyprops_dlg_proc, (LPARAM)&k,
1735                                _("Key Properties"), IDS_WINPT_KEYPROPS);                                _("Key Properties"), IDS_WINPT_KEYPROPS);
# Line 1608  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1741  keymanager_dlg_proc (HWND dlg, UINT msg,
1741              if (updated_keys_avail ())              if (updated_keys_avail ())
1742                  l_idx = IDYES;                  l_idx = IDYES;
1743              else {              else {
1744                  char inf[256];                  l_idx = log_box (_("Key Manager"), MB_YESNO,
                 _snprintf (inf, sizeof (inf) -1,  
1745                             _("This is only useful when the keyring has been "                             _("This is only useful when the keyring has been "
1746                               "modified (sign a key...).\n"                               "modified (sign a key...).\n"
1747                               "Do you really want to reload the keycache?"));                               "Do you really want to reload the keycache?"));
                 l_idx = msg_box (dlg, inf, _("Key Manager"), MB_YESNO);  
1748              }              }
1749              if (l_idx == IDYES)              if (l_idx == IDYES)
1750                  reload_keycache (kmi);                  reload_keycache (kmi);
# Line 1669  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1800  keymanager_dlg_proc (HWND dlg, UINT msg,
1800              refresh_keylist (kmi);              refresh_keylist (kmi);
1801              return TRUE;              return TRUE;
1802                            
1803            case ID_KEYMISC_WINPTPREFS:
1804                dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_PREFS,
1805                                  dlg, prefs_dlg_proc, 0,
1806                                  _("WinPT Preferences"), 0);
1807                break;
1808    
1809          case ID_KEYMISC_GPGPREFS:          case ID_KEYMISC_GPGPREFS:
1810              rc = dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_GPGPREFS,              rc = dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_GPGPREFS,
1811                                     dlg, gpgprefs_dlg_proc, 0,                                     dlg, gpgprefs_dlg_proc, 0,
# Line 1707  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1844  keymanager_dlg_proc (HWND dlg, UINT msg,
1844              if (listview_count_items (kmi->lv, 1) > 1)              if (listview_count_items (kmi->lv, 1) > 1)
1845                  name = m_strdup ("Exported_GPG_Keys.asc");                  name = m_strdup ("Exported_GPG_Keys.asc");
1846              else {              else {
1847                  key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);                            key = km_get_key_ptr (kmi->lv, kmi->lv_idx, NULL);
1848                  name = km_gen_export_filename (key->subkeys->keyid+8, 0);                  name = km_gen_export_filename (key->subkeys->keyid+8, 0);
1849              }              }
1850              t = get_filesave_dlg (dlg, _("Choose Name for Key File"), NULL, name);              t = get_filesave_dlg (dlg, _("Choose Name for Key File"), NULL, name);
# Line 1740  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1877  keymanager_dlg_proc (HWND dlg, UINT msg,
1877                              "Do you really want to export the key?"),                              "Do you really want to export the key?"),
1878                            _("WARNING"), MB_INFO|MB_YESNO);                            _("WARNING"), MB_INFO|MB_YESNO);
1879              if (i == IDYES) {              if (i == IDYES) {
1880                  key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);                  key = km_get_key_ptr (kmi->lv, kmi->lv_idx, NULL);
                 if (!key)  
                     BUG (NULL);  
1881                  name = km_gen_export_filename (key->subkeys->keyid+8, 1);                  name = km_gen_export_filename (key->subkeys->keyid+8, 1);
1882                  t = get_filesave_dlg (dlg, _("Choose Name for Key File"), NULL, name);                  t = get_filesave_dlg (dlg, _("Choose Name for Key File"), NULL, name);
1883                  if (t != NULL)                            if (t != NULL)          
# Line 1756  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1891  keymanager_dlg_proc (HWND dlg, UINT msg,
1891                                IDS_WINPT_ABOUT);                                IDS_WINPT_ABOUT);
1892              break;              break;
1893    
1894            case ID_KEYMISC_DEVWWW:
1895                ShellExecute (dlg, "open", "http://wald.intevation.org/projects/winpt",
1896                              NULL, NULL, SW_SHOW);
1897                break;
1898    
1899          case ID_KEYMISC_WEBSITE:          case ID_KEYMISC_WEBSITE:
1900              ShellExecute (dlg, "open", "http://www.winpt.org",              ShellExecute (dlg, "open", "http://www.winpt.org",
1901                            NULL, NULL, SW_SHOW);                            NULL, NULL, SW_SHOW);
# Line 1772  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1912  keymanager_dlg_proc (HWND dlg, UINT msg,
1912              break;              break;
1913    
1914          case ID_KEYMISC_EDITKEY:          case ID_KEYMISC_EDITKEY:
1915              if (kmi->lv_idx == -1)              if (km_get_key (kmi->lv, kmi->lv_idx, &k))
1916                  break;                  break;
             key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);  
             if (!key)  
                 BUG (NULL);  
             /* XXX: pub/crd = secret key does not work */  
             memset (&k, 0, sizeof (k));  
             strncpy (k.tmp_keyid, key->subkeys->keyid+8, 8);  
             k.keyid = k.tmp_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);  
             k.is_v3 = km_key_is_v3 (kmi->lv, kmi->lv_idx);  
             k.flags = km_get_key_status (kmi->lv, kmi->lv_idx);  
1917              dialog_box_param (glob_hinst, (LPCTSTR)IDD_WINPT_KEYEDIT, dlg,              dialog_box_param (glob_hinst, (LPCTSTR)IDD_WINPT_KEYEDIT, dlg,
1918                                keyedit_main_dlg_proc, (LPARAM)&k,                                keyedit_main_dlg_proc, (LPARAM)&k,
1919                                _("Key Edit"), IDS_KEYCTX_EDIT);                                _("Key Edit"), IDS_KEYCTX_EDIT);
# Line 1805  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1934  keymanager_dlg_proc (HWND dlg, UINT msg,
1934              break;              break;
1935                            
1936          case ID_KEYCTX_SETPREFKS:          case ID_KEYCTX_SETPREFKS:
1937              key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);              if (km_get_key (kmi->lv, kmi->lv_idx, &k))
1938              if (!key)                  break;
                 BUG (NULL);  
             memset (&k, 0, sizeof (k));  
             strncpy (k.tmp_keyid, key->subkeys->keyid+8, 8);  
             k.keyid = k.tmp_keyid;  
             k.is_protected = km_check_if_protected (kmi->lv, kmi->lv_idx);  
1939              keyedit_set_pref_keyserver (&k, dlg);              keyedit_set_pref_keyserver (&k, dlg);
1940              break;              break;
1941    
# Line 1821  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1945  keymanager_dlg_proc (HWND dlg, UINT msg,
1945                           _("Key Manager"), MB_INFO);                           _("Key Manager"), MB_INFO);
1946                  listview_select_all (kmi->lv);                  listview_select_all (kmi->lv);
1947              }              }
1948              km_refresh_from_keyserver (kmi->lv, dlg);              if (!km_refresh_from_keyserver (kmi->lv, dlg))
1949                    msg_box (dlg, _("Keyserver refresh finished."),
1950                             _("Key Manager"), MB_OK);
1951              break;              break;
1952                                                    
1953          /** Context menu **/          /** Context menu **/
# Line 1859  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1985  keymanager_dlg_proc (HWND dlg, UINT msg,
1985              break;              break;
1986    
1987          case ID_KEYCTX_ADDKEY:          case ID_KEYCTX_ADDKEY:
1988              key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);              km_get_key (kmi->lv, kmi->lv_idx, &k);
             if (!key)  
                 BUG (NULL);  
             memset (&k, 0, sizeof (k));  
             strncpy (k.tmp_keyid, key->subkeys->keyid+8, 8);  
             k.keyid = k.tmp_keyid;  
             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);  
1989              keyedit_add_subkey (&k, dlg, NULL);              keyedit_add_subkey (&k, dlg, NULL);
1990              if (k.update)              if (k.update)
1991                  update_key (kmi->lv, kmi->lv_idx, k.tmp_keyid, 1);                  update_key (kmi->lv, kmi->lv_idx, k.tmp_keyid, 1);
1992              break;              break;
1993    
1994          case ID_KEYCTX_ADDUID:          case ID_KEYCTX_ADDUID:
1995              key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);              km_get_key (kmi->lv, kmi->lv_idx, &k);
             if (!key)  
                 BUG (NULL);  
             memset (&k, 0, sizeof (k));  
             strncpy (k.tmp_keyid, key->subkeys->keyid+8, 8);  
             k.keyid = k.tmp_keyid;  
             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);  
1996              keyedit_add_userid (&k, dlg, NULL);              keyedit_add_userid (&k, dlg, NULL);
1997              if (k.update)              if (k.update)
1998                  update_key (kmi->lv, kmi->lv_idx, k.tmp_keyid, 1);                  update_key (kmi->lv, kmi->lv_idx, k.tmp_keyid, 1);
1999              break;              break;
2000    
2001          case ID_KEYCTX_ADDREV:          case ID_KEYCTX_ADDREV:
2002              key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);              km_get_key (kmi->lv, kmi->lv_idx, &k);
             if (!key)  
                 BUG (NULL);  
             memset (&k, 0, sizeof (k));  
             strncpy (k.tmp_keyid, key->subkeys->keyid+8, 8);  
             k.keyid = k.tmp_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);  
2003              keyedit_add_revoker (&k, dlg);              keyedit_add_revoker (&k, dlg);
2004              if (k.update)              if (k.update)
2005                  update_key (kmi->lv, kmi->lv_idx, k.tmp_keyid, 1);                  update_key (kmi->lv, kmi->lv_idx, k.tmp_keyid, 1);
2006              break;              break;
2007    
2008          case ID_KEYCTX_ADDPHOTO:          case ID_KEYCTX_ADDPHOTO:
2009              key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);              km_get_key (kmi->lv, kmi->lv_idx, &k);
             if (!key)  
                 BUG (NULL);  
             memset (&k, 0, sizeof (k));  
             strncpy (k.tmp_keyid, key->subkeys->keyid+8, 8);  
             k.keyid = k.tmp_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);  
2010              keyedit_add_photo (&k, dlg);              keyedit_add_photo (&k, dlg);
2011              if (k.update)              if (k.update)
2012                  update_key (kmi->lv, kmi->lv_idx, k.tmp_keyid, 1);                  update_key (kmi->lv, kmi->lv_idx, k.tmp_keyid, 1);
# Line 1921  keymanager_dlg_proc (HWND dlg, UINT msg, Line 2019  keymanager_dlg_proc (HWND dlg, UINT msg,
2019              break;              break;
2020    
2021          case ID_KEYCTX_UID_COPY:          case ID_KEYCTX_UID_COPY:
             /* XXX: add generic function to support multiple selection  
                     with a callback */  
             key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);  
             name = utf8_to_native (key->uids->uid);  
             set_clip_text (NULL, name, strlen (name));  
             safe_free (name);  
             break;  
   
2022          case ID_KEYCTX_KEYID_COPY:          case ID_KEYCTX_KEYID_COPY:
             key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);  
             set_clip_text (NULL, key->subkeys->keyid+8,  
                            strlen (key->subkeys->keyid+8));  
             break;  
   
2023          case ID_KEYCTX_FPR_COPY:          case ID_KEYCTX_FPR_COPY:
             key = (gpgme_key_t) listview_get_item2 (kmi->lv, kmi->lv_idx);  
             t = key->subkeys->fpr;  
             set_clip_text (NULL, t? t : "", t? strlen (t): 0);  
             break;  
   
2024          case ID_KEYCTX_KINFO_COPY:          case ID_KEYCTX_KINFO_COPY:
2025              key = (gpgme_key_t) listview_get_item2 (kmi->lv, kmi->lv_idx);          case ID_KEYCTX_EMAIL_COPY:
2026              if (!key)              copy_key_info (LOWORD (wparam), kmi);
                 BUG (NULL);  
             km_set_clip_info (key->subkeys->keyid+8);  
2027              break;              break;
2028    
2029          case ID_KEYCTX_COPY:          case ID_KEYCTX_COPY:
# Line 1959  keymanager_dlg_proc (HWND dlg, UINT msg, Line 2037  keymanager_dlg_proc (HWND dlg, UINT msg,
2037          case ID_KEYCTX_DISABLE:          case ID_KEYCTX_DISABLE:
2038          case ID_KEYCTX_ENABLE:          case ID_KEYCTX_ENABLE:
2039              i = LOWORD (wparam) == ID_KEYCTX_ENABLE? 1 : 0;              i = LOWORD (wparam) == ID_KEYCTX_ENABLE? 1 : 0;
2040              key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);              if (km_get_key (kmi->lv, kmi->lv_idx, &k))
2041              if (!key)                  break;
                 BUG (NULL);  
             memset (&k, 0, sizeof (k));  
             strncpy (k.tmp_keyid, key->subkeys->keyid+8, 8);  
             k.keyid = k.tmp_keyid;  
2042              rc = km_enable_disable_key (kmi->lv, dlg, kmi->lv_idx, i);              rc = km_enable_disable_key (kmi->lv, dlg, kmi->lv_idx, i);
2043              if (!rc)              if (!rc)
2044                  update_key (kmi->lv, kmi->lv_idx, k.tmp_keyid, 0);                  update_key (kmi->lv, kmi->lv_idx, k.tmp_keyid, 0);
             /* XXX: switching a key from disabled -> enabled. does not  
                change the validity field in the KM. */  
2045              break;              break;
2046    
2047          case ID_KEYCTX_LISTSIGS:          case ID_KEYCTX_LISTSIGS:
# Line 1977  keymanager_dlg_proc (HWND dlg, UINT msg, Line 2049  keymanager_dlg_proc (HWND dlg, UINT msg,
2049              break;              break;
2050    
2051          case ID_KEYCTX_MAXTRUST:          case ID_KEYCTX_MAXTRUST:
2052              key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);              if (km_get_key (kmi->lv, kmi->lv_idx, &k))
2053              if (!key)                  break;
                 BUG (NULL);  
             memset (&k, 0, sizeof (k));  
             strncpy (k.tmp_keyid, key->subkeys->keyid+8, 8);  
             k.keyid = k.tmp_keyid;  
2054              rc = km_set_implicit_trust (dlg, kmi->lv, kmi->lv_idx);              rc = km_set_implicit_trust (dlg, kmi->lv, kmi->lv_idx);
2055              if (!rc)              if (!rc)
2056                  update_key (kmi->lv, kmi->lv_idx, k.tmp_keyid, 0);                  update_key (kmi->lv, kmi->lv_idx, k.tmp_keyid, 0);
# Line 1990  keymanager_dlg_proc (HWND dlg, UINT msg, Line 2058  keymanager_dlg_proc (HWND dlg, UINT msg,
2058    
2059          case ID_KEYCTX_SETDEFKEY:          case ID_KEYCTX_SETDEFKEY:
2060              if (!km_check_key_status (kmi->lv, kmi->lv_idx)) {              if (!km_check_key_status (kmi->lv, kmi->lv_idx)) {
2061                  key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);                  key = km_get_key_ptr (kmi->lv, kmi->lv_idx, NULL);
2062                  rc = set_gnupg_default_key (key->subkeys->keyid+8);                  rc = set_gnupg_default_key (key->subkeys->keyid+8);
2063                  if (rc)                  if (rc)
2064                      msg_box (dlg, winpt_strerror (rc), _("Key Manager"), MB_ERR);                      msg_box (dlg, winpt_strerror (rc), _("Key Manager"), MB_ERR);
# Line 2003  keymanager_dlg_proc (HWND dlg, UINT msg, Line 2071  keymanager_dlg_proc (HWND dlg, UINT msg,
2071          case ID_KEYMISC_VIEWTYPE:          case ID_KEYMISC_VIEWTYPE:
2072          case ID_KEYMISC_VIEWCREAT:          case ID_KEYMISC_VIEWCREAT:
2073          case ID_KEYMISC_VIEWDESC:          case ID_KEYMISC_VIEWDESC:
             DWORD n;  
   
2074              hm = GetMenu (dlg);              hm = GetMenu (dlg);
2075              n = get_menu_state (hm, LOWORD (wparam));              i = get_menu_state (hm, LOWORD (wparam));
2076              set_menu_state (hm, LOWORD (wparam),              set_menu_state (hm, LOWORD (wparam),
2077                              n & MFS_CHECKED? MFS_UNCHECKED : MFS_CHECKED);                              i & MFS_CHECKED? MFS_UNCHECKED : MFS_CHECKED);
2078              modify_listview_columns (kmi, LOWORD (wparam), !(n & MFS_CHECKED));              modify_listview_columns (kmi, LOWORD (wparam), !(i & MFS_CHECKED));
2079              break;              break;
2080    
2081          case ID_GROUP_NEW:          case ID_GROUP_NEW:
2082          case ID_GROUP_PASTE:          case ID_GROUP_PASTE:
2083          case ID_GROUP_DELETE:          case ID_GROUP_DELETE:
2084            case ID_GROUP_SHOW:
2085              /* XXX: Implement group manager. */              /* XXX: Implement group manager. */
2086              return TRUE;              return TRUE;
   
         case IDCANCEL:  
             EndDialog (dlg, TRUE);  
             return TRUE;  
2087          }          }
2088                    
2089          break;          break;
Legend:
Removed from v.197  
changed lines
  Added in v.262
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26