/[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 200 by twoaday, Mon Apr 17 09:12:50 2006 UTC revision 211 by twoaday, Sun May 7 12:36:48 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    
89  /* Toolbar button structure. */  /* Toolbar button structure. */
# Line 99  struct mybuttons myb[] = { Line 104  struct mybuttons myb[] = {
104    
105  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);
106    
107    
108  /* Subclass the keylist listview control to allow extended commands. */  /* Subclass the keylist listview control to allow extended commands. */
109  static BOOL CALLBACK  static BOOL CALLBACK
110  keylist_subclass_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)  keylist_subclass_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
# Line 208  load_toolbar (HWND dlg, struct km_info_s Line 214  load_toolbar (HWND dlg, struct km_info_s
214  /* Restore the width of the columns from the registry.  /* Restore the width of the columns from the registry.
215     If no bitstring was found, the default size is used. */     If no bitstring was found, the default size is used. */
216  int  int
217  restore_column_info (listview_ctrl_t hd)  restore_column_info (struct km_info_s *kmi)
218  {  {
219      WORD *buf;      WORD *buf;
220      HKEY root;      HKEY root;
221      DWORD type;      DWORD type;
222      DWORD size = hd->cols*sizeof (WORD), i;      DWORD size = kmi->lv->cols*sizeof (WORD), i;
223      LONG ec;      LONG ec;
224    
225      ec = RegOpenKeyEx (HKEY_CURRENT_USER, "Software\\WinPT", 0,      ec = RegOpenKeyEx (HKEY_CURRENT_USER, "Software\\WinPT", 0,
# Line 225  restore_column_info (listview_ctrl_t hd) Line 231  restore_column_info (listview_ctrl_t hd)
231      if (!buf)      if (!buf)
232          BUG (NULL);          BUG (NULL);
233      ec = RegQueryValueEx (root, "KMColumnSize", NULL, &type,      ec = RegQueryValueEx (root, "KMColumnSize", NULL, &type,
234                            (BYTE*)buf, &size);                            (BYTE*)buf, &size);    
     RegCloseKey (root);  
235      if (ec != ERROR_SUCCESS) {      if (ec != ERROR_SUCCESS) {
236            RegCloseKey (root);
237          free_if_alloc (buf);          free_if_alloc (buf);
238          return -1;          return -1;
239      }      }
# Line 240  restore_column_info (listview_ctrl_t hd) Line 246  restore_column_info (listview_ctrl_t hd)
246          }          }
247      }      }
248      for (i=0; i < size/2; i++)      for (i=0; i < size/2; i++)
249          listview_set_column_width (hd, i, buf[i]);          listview_set_column_width (kmi->lv, i, buf[i]);
250      free_if_alloc (buf);      free_if_alloc (buf);
251    
252        size = sizeof (kmi->keylist_sortby);
253        ec = RegQueryValueEx (root, "KMSortBy", NULL, &type,
254                              (BYTE*)&kmi->keylist_sortby, &size);
255        if (ec != ERROR_SUCCESS)
256            kmi->keylist_sortby = KEY_SORT_USERID;
257        RegCloseKey (root);
258      return 0;      return 0;
259  }  }
260    
261    
262  /* Save the current column width to the registry. */  /* Save the current column width to the registry. */
263  int  int
264  save_column_info (listview_ctrl_t hd)  save_column_info (struct km_info_s *kmi)
265  {  {    
     WORD *buf;  
266      HKEY root;      HKEY root;
267        WORD *buf;
268      LONG ec;      LONG ec;
269      int i;      int i;
270    
271      buf = new WORD[hd->cols];      buf = new WORD[kmi->lv->cols];
272      if (!buf)      if (!buf)
273          BUG (NULL);          BUG (NULL);
274      for (i=0; i < hd->cols; i++) {      for (i=0; i < kmi->lv->cols; i++) {
275          LVCOLUMN lvc;          LVCOLUMN lvc;
276    
277          memset (&lvc, 0, sizeof (lvc));          memset (&lvc, 0, sizeof (lvc));
278          lvc.mask = LVCF_WIDTH;          lvc.mask = LVCF_WIDTH;
279          ListView_GetColumn (hd->ctrl, i, &lvc);          ListView_GetColumn (kmi->lv->ctrl, i, &lvc);
280          buf[i] = lvc.cx;          buf[i] = lvc.cx;
281      }      }
282    
# Line 275  save_column_info (listview_ctrl_t hd) Line 288  save_column_info (listview_ctrl_t hd)
288      }      }
289    
290      ec = RegSetValueEx (root, "KMColumnSize", 0, REG_BINARY,      ec = RegSetValueEx (root, "KMColumnSize", 0, REG_BINARY,
291                          (const BYTE*)buf, 2*hd->cols);                          (const BYTE*)buf, 2*kmi->lv->cols);
292        if (ec == ERROR_SUCCESS) {
293            ec = RegSetValueEx (root, "KMSortBy", 0, REG_DWORD_BIG_ENDIAN,
294                                (const BYTE*)&kmi->keylist_sortby,
295                                sizeof (kmi->keylist_sortby));
296        }
297      RegCloseKey (root);      RegCloseKey (root);
298      free_if_alloc (buf);      free_if_alloc (buf);
299      return ec == ERROR_SUCCESS? 0 : -1;      return ec == ERROR_SUCCESS? 0 : -1;
# Line 385  do_resize_window (HWND dlg, struct km_in Line 403  do_resize_window (HWND dlg, struct km_in
403                  kmi->ypos_sep - rclient.top, bRepaint);                  kmi->ypos_sep - rclient.top, bRepaint);
404      rclient.top = kmi->ypos_sep + 5 + 8;      rclient.top = kmi->ypos_sep + 5 + 8;
405    
406  #if 0 /* Disable the code until we support groups again. */      if (kmi->enable_groups != 0) {
407      /* Place the group text and the group box below the separator */          /* Place the group text and the group box below the separator */
408      h = GetDlgItem (dlg, IDC_KEYMISC_GTEXT);          h = GetDlgItem (dlg, IDC_KEYMISC_GTEXT);
409      MoveWindow (h, rclient.left, rclient.top, 100, 14, bRepaint);          MoveWindow (h, rclient.left, rclient.top, 100, 14, bRepaint);
410      rclient.top += 18;          rclient.top += 18;
411    
412      h = GetDlgItem (dlg, IDC_KEYMISC_GROUP);          h = GetDlgItem (dlg, IDC_KEYMISC_GROUP);
413      MoveWindow (h, rclient.left, rclient.top, rclient.right - rclient.left,          MoveWindow (h, rclient.left, rclient.top,
414                  (rclient.bottom < rclient.top) ?                      rclient.right - rclient.left,
415                  0 : rclient.bottom - rclient.top, bRepaint);                      (rclient.bottom < rclient.top) ?
416  #endif                      0 : rclient.bottom - rclient.top, bRepaint);
417        }
418            
419      /* Repaint the whole thing */      /* Repaint the whole thing */
420      InvalidateRect (dlg, NULL, TRUE);      InvalidateRect (dlg, NULL, TRUE);
# Line 798  change_key_menu (HMENU hm, int id) Line 817  change_key_menu (HMENU hm, int id)
817  static void  static void
818  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)
819  {  {
820      gpgme_key_t key;      struct winpt_key_s key;
821    
822      keycache_update (0, keyid);      keycache_update (0, keyid);
823      if (keypair)      if (keypair)
# Line 806  update_key (listview_ctrl_t lv, int pos, Line 825  update_key (listview_ctrl_t lv, int pos,
825    
826      /* because we replaced the key item, we need to update the      /* because we replaced the key item, we need to update the
827         address of the pointer in the ListView control. */         address of the pointer in the ListView control. */
828      get_pubkey (keyid, &key);      memset (&key, 0, sizeof (key));
829      keylist_upd_key (lv, pos, key);      winpt_get_pubkey (keyid, &key);
830        keylist_upd_key (lv, pos, key.ext, key.ctx);
831      keyring_check_last_access ();      keyring_check_last_access ();
832  }  }
833    
# Line 1038  refresh_keylist (struct km_info_s *kmi) Line 1058  refresh_keylist (struct km_info_s *kmi)
1058      kc = keycache_get_ctx (1);      kc = keycache_get_ctx (1);
1059      while (!gpg_keycache_next_updated_key (kc, &ctx, &status)) {      while (!gpg_keycache_next_updated_key (kc, &ctx, &status)) {
1060          if (status == KC_FLAG_ADD)          if (status == KC_FLAG_ADD)
1061              keylist_add_key (kmi->lv, KEYLIST_LIST, ctx->key);              keylist_add_key (kmi->lv, KEYLIST_LIST, ctx, ctx->key);
1062          else {          else {
1063              pos = find_keypos (kmi->lv, ctx->key);              pos = find_keypos (kmi->lv, ctx->key);
1064              if (pos != -1)              if (pos != -1)
1065                  keylist_upd_key (kmi->lv, pos, ctx->key);                  keylist_upd_key (kmi->lv, pos, ctx, ctx->key);
1066          }          }
1067      }      }
1068      keylist_sort (kmi->lv, KEY_SORT_USERID);      keylist_sort (kmi->lv, kmi->keylist_sortby);
1069      update_status_bar (kmi->statbar, kmi->lv);      update_status_bar (kmi->statbar, kmi->lv);
1070      keyring_check_last_access ();      keyring_check_last_access ();
1071  }  }
# Line 1054  refresh_keylist (struct km_info_s *kmi) Line 1074  refresh_keylist (struct km_info_s *kmi)
1074  static void  static void
1075  reload_keylist (struct km_info_s *kmi)  reload_keylist (struct km_info_s *kmi)
1076  {  {
1077        gpg_keycache_t c;
1078    
1079        c = keycache_get_ctx (1);
1080      keycache_reload (kmi->dlg);      keycache_reload (kmi->dlg);
1081      keylist_reload (kmi->lv, keycache_get_ctx (1),      keylist_reload (kmi->lv, c, KEYLIST_LIST, kmi->keylist_sortby);
                     KEYLIST_LIST, KEY_SORT_USERID);  
1082      update_status_bar (kmi->statbar, kmi->lv);      update_status_bar (kmi->statbar, kmi->lv);
1083      keyring_check_last_access ();      keyring_check_last_access ();
1084  }  }
# Line 1074  reload_keycache (struct km_info_s *kmi) Line 1096  reload_keycache (struct km_info_s *kmi)
1096      DialogBoxParam (glob_hinst, (LPCSTR)IDD_WINPT_KEYCACHE, kmi->dlg,      DialogBoxParam (glob_hinst, (LPCSTR)IDD_WINPT_KEYCACHE, kmi->dlg,
1097                      keycache_dlg_proc, (LPARAM)&rcs);                      keycache_dlg_proc, (LPARAM)&rcs);
1098      c = keycache_get_ctx (1);      c = keycache_get_ctx (1);
1099      if (!c)      keylist_reload (kmi->lv, c, KEYLIST_LIST, kmi->keylist_sortby);
         BUG (0);  
     keylist_reload (kmi->lv, c, KEYLIST_LIST, KEY_SORT_USERID);  
1100      update_status_bar (kmi->statbar, kmi->lv);      update_status_bar (kmi->statbar, kmi->lv);
1101      SetForegroundWindow (kmi->dlg);      SetForegroundWindow (kmi->dlg);
1102  }  }
# Line 1114  km_gui_import (struct km_info_s *kmi, in Line 1134  km_gui_import (struct km_info_s *kmi, in
1134          reload_keylist (kmi);          reload_keylist (kmi);
1135    
1136      SetForegroundWindow (kmi->dlg);      SetForegroundWindow (kmi->dlg);
     center_window (kmi->dlg, NULL);  
1137  }  }
1138    
1139    
# Line 1125  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1144  keymanager_dlg_proc (HWND dlg, UINT msg,
1144      struct km_info_s *kmi = NULL;      struct km_info_s *kmi = NULL;
1145      HWND kl;      HWND kl;
1146      HMENU hm;      HMENU hm;
1147        struct keycache_s *kci;
1148      gpg_keycache_t c;      gpg_keycache_t c;
1149      gpgme_key_t key;      gpgme_key_t key;
1150      struct genkey_s genkey;      struct genkey_s genkey;
# Line 1194  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1214  keymanager_dlg_proc (HWND dlg, UINT msg,
1214          do_center_window (dlg, kmi);          do_center_window (dlg, kmi);
1215          do_resize_window (dlg, kmi);          do_resize_window (dlg, kmi);
1216          update_ui_items (dlg, kmi->lv);          update_ui_items (dlg, kmi->lv);
1217          restore_column_info (kmi->lv);          restore_column_info (kmi);
1218            keylist_sort (kmi->lv, kmi->keylist_sortby);
1219    
1220          SetDlgItemText (dlg, IDC_KEYMISC_GTEXT, _("Groups"));          SetDlgItemText (dlg, IDC_KEYMISC_GTEXT, _("Groups"));
1221            SetDlgItemText (dlg, ID_GROUP_SHOW, _("&Show"));
1222            SetDlgItemText (dlg, ID_GROUP_NEW, _("&New..."));
1223          SetClassLong (dlg, GCL_HICON, (LONG)LoadIcon (glob_hinst,          SetClassLong (dlg, GCL_HICON, (LONG)LoadIcon (glob_hinst,
1224                        (LPCTSTR)IDI_WINPT));                        (LPCTSTR)IDI_WINPT));
1225          SetForegroundWindow (dlg);          SetForegroundWindow (dlg);
1226          force_foreground_window (dlg, 1000);          kmi->magic = SetTimer (dlg, 1, 1000, NULL);
1227          return TRUE;          return TRUE;
1228    
1229        case WM_TIMER:
1230            KillTimer (dlg, kmi->magic);
1231            SetForegroundWindow (dlg);
1232            break;
1233                    
1234      case WM_DESTROY:      case WM_DESTROY:
1235          save_column_info (kmi->lv);          save_column_info (kmi);
1236          if (kmi->lv) {          if (kmi->lv) {
1237              keylist_delete (kmi->lv);              keylist_delete (kmi->lv);
1238              kmi->lv = NULL;                    kmi->lv = NULL;      
# Line 1218  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1246  keymanager_dlg_proc (HWND dlg, UINT msg,
1246          /* XXX: store window size. */          /* XXX: store window size. */
1247                    
1248          /* Remove runtime information. This should be the last action taken here. */          /* Remove runtime information. This should be the last action taken here. */
1249          delete kmi; kmi = NULL;          delete kmi;
1250            kmi = NULL;
1251          SetWindowLong (dlg, GWL_USERDATA, 0);          SetWindowLong (dlg, GWL_USERDATA, 0);
1252          return FALSE;          return FALSE;
1253    
     case WM_SHOWWINDOW:  
         break;  
   
1254      case WM_MOVE:      case WM_MOVE:
1255          RECT r;          RECT r;
1256          GetWindowRect (dlg, &r);          GetWindowRect (dlg, &r);
# Line 1678  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1704  keymanager_dlg_proc (HWND dlg, UINT msg,
1704              if (listview_count_items (kmi->lv, 1) > 1)              if (listview_count_items (kmi->lv, 1) > 1)
1705                  name = m_strdup ("Exported_GPG_Keys.asc");                  name = m_strdup ("Exported_GPG_Keys.asc");
1706              else {              else {
1707                  key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);                            key = km_get_key_ptr (kmi->lv, kmi->lv_idx, NULL);
1708                  name = km_gen_export_filename (key->subkeys->keyid+8, 0);                  name = km_gen_export_filename (key->subkeys->keyid+8, 0);
1709              }              }
1710              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 1711  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1737  keymanager_dlg_proc (HWND dlg, UINT msg,
1737                              "Do you really want to export the key?"),                              "Do you really want to export the key?"),
1738                            _("WARNING"), MB_INFO|MB_YESNO);                            _("WARNING"), MB_INFO|MB_YESNO);
1739              if (i == IDYES) {              if (i == IDYES) {
1740                  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);  
1741                  name = km_gen_export_filename (key->subkeys->keyid+8, 1);                  name = km_gen_export_filename (key->subkeys->keyid+8, 1);
1742                  t = get_filesave_dlg (dlg, _("Choose Name for Key File"), NULL, name);                  t = get_filesave_dlg (dlg, _("Choose Name for Key File"), NULL, name);
1743                  if (t != NULL)                            if (t != NULL)          
# Line 1777  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1801  keymanager_dlg_proc (HWND dlg, UINT msg,
1801                  listview_select_all (kmi->lv);                  listview_select_all (kmi->lv);
1802              }              }
1803              km_refresh_from_keyserver (kmi->lv, dlg);              km_refresh_from_keyserver (kmi->lv, dlg);
1804                msg_box (dlg, _("Keyserver refresh finished."),
1805                         _("Key Manager"), MB_OK);
1806              break;              break;
1807                                                    
1808          /** Context menu **/          /** Context menu **/
# Line 1850  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1876  keymanager_dlg_proc (HWND dlg, UINT msg,
1876          case ID_KEYCTX_UID_COPY:          case ID_KEYCTX_UID_COPY:
1877              /* XXX: add generic function to support multiple selection              /* XXX: add generic function to support multiple selection
1878                      with a callback */                      with a callback */
1879              key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);              key = km_get_key_ptr (kmi->lv, kmi->lv_idx, &kci);
1880              name = utf8_to_native (key->uids->uid);              name = kci->uids->name;
1881              set_clip_text (NULL, name, strlen (name));              set_clip_text (NULL, name, strlen (name));
             safe_free (name);  
1882              break;              break;
1883    
1884          case ID_KEYCTX_KEYID_COPY:          case ID_KEYCTX_KEYID_COPY:
1885              key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);              key = km_get_key_ptr (kmi->lv, kmi->lv_idx, NULL);
1886              set_clip_text (NULL, key->subkeys->keyid+8,              memset (type, 0, sizeof (type));
1887                             strlen (key->subkeys->keyid+8));              type[0] = '0'; type[1] = 'x';
1888                memcpy (type+2, key->subkeys->keyid+8, 8);
1889                set_clip_text (NULL, type, strlen (type));
1890              break;              break;
1891    
1892          case ID_KEYCTX_FPR_COPY:          case ID_KEYCTX_FPR_COPY:
1893              key = (gpgme_key_t) listview_get_item2 (kmi->lv, kmi->lv_idx);              key = km_get_key_ptr (kmi->lv, kmi->lv_idx, NULL);
1894              t = key->subkeys->fpr;              t = key->subkeys->fpr;
1895              set_clip_text (NULL, t? t : "", t? strlen (t): 0);              set_clip_text (NULL, t? t : "", t? strlen (t): 0);
1896              break;              break;
1897    
1898          case ID_KEYCTX_KINFO_COPY:          case ID_KEYCTX_KINFO_COPY:
1899              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);  
1900              km_set_clip_info (key->subkeys->keyid+8);              km_set_clip_info (key->subkeys->keyid+8);
1901              break;              break;
1902    
# Line 1907  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1932  keymanager_dlg_proc (HWND dlg, UINT msg,
1932    
1933          case ID_KEYCTX_SETDEFKEY:          case ID_KEYCTX_SETDEFKEY:
1934              if (!km_check_key_status (kmi->lv, kmi->lv_idx)) {              if (!km_check_key_status (kmi->lv, kmi->lv_idx)) {
1935                  key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);                  key = km_get_key_ptr (kmi->lv, kmi->lv_idx, NULL);
1936                  rc = set_gnupg_default_key (key->subkeys->keyid+8);                  rc = set_gnupg_default_key (key->subkeys->keyid+8);
1937                  if (rc)                  if (rc)
1938                      msg_box (dlg, winpt_strerror (rc), _("Key Manager"), MB_ERR);                      msg_box (dlg, winpt_strerror (rc), _("Key Manager"), MB_ERR);
# Line 1930  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1955  keymanager_dlg_proc (HWND dlg, UINT msg,
1955          case ID_GROUP_NEW:          case ID_GROUP_NEW:
1956          case ID_GROUP_PASTE:          case ID_GROUP_PASTE:
1957          case ID_GROUP_DELETE:          case ID_GROUP_DELETE:
1958            case ID_GROUP_SHOW:
1959              /* XXX: Implement group manager. */              /* XXX: Implement group manager. */
1960              return TRUE;              return TRUE;
1961    
Legend:
Removed from v.200  
changed lines
  Added in v.211
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26