/[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 205 by twoaday, Thu Apr 27 12:46:03 2006 UTC revision 214 by twoaday, Sun May 14 18:40:36 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 669  update_ui_items (HWND hwnd, listview_ctr Line 688  update_ui_items (HWND hwnd, listview_ctr
688      }      }
689    
690      /* Disable all secret-key functions when no secret key is available. */      /* Disable all secret-key functions when no secret key is available. */
691      {      if (!secret_key_available ()) {
692          gpg_keycache_t sec = keycache_get_ctx (0);          enable_button (tb_hwnd, ID_KEYMISC_SIGN, FALSE);
693          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);  
         }  
694      }      }
695  }  }
696    
# Line 1046  refresh_keylist (struct km_info_s *kmi) Line 1062  refresh_keylist (struct km_info_s *kmi)
1062                  keylist_upd_key (kmi->lv, pos, ctx, ctx->key);                  keylist_upd_key (kmi->lv, pos, ctx, ctx->key);
1063          }          }
1064      }      }
1065      keylist_sort (kmi->lv, KEY_SORT_USERID);      keylist_sort (kmi->lv, kmi->keylist_sortby);
1066      update_status_bar (kmi->statbar, kmi->lv);      update_status_bar (kmi->statbar, kmi->lv);
1067      keyring_check_last_access ();      keyring_check_last_access ();
1068  }  }
# Line 1055  refresh_keylist (struct km_info_s *kmi) Line 1071  refresh_keylist (struct km_info_s *kmi)
1071  static void  static void
1072  reload_keylist (struct km_info_s *kmi)  reload_keylist (struct km_info_s *kmi)
1073  {  {
1074        gpg_keycache_t c;
1075    
1076        c = keycache_get_ctx (1);
1077      keycache_reload (kmi->dlg);      keycache_reload (kmi->dlg);
1078      keylist_reload (kmi->lv, keycache_get_ctx (1),      keylist_reload (kmi->lv, c, KEYLIST_LIST, kmi->keylist_sortby);
                     KEYLIST_LIST, KEY_SORT_USERID);  
1079      update_status_bar (kmi->statbar, kmi->lv);      update_status_bar (kmi->statbar, kmi->lv);
1080      keyring_check_last_access ();      keyring_check_last_access ();
1081  }  }
# Line 1075  reload_keycache (struct km_info_s *kmi) Line 1093  reload_keycache (struct km_info_s *kmi)
1093      DialogBoxParam (glob_hinst, (LPCSTR)IDD_WINPT_KEYCACHE, kmi->dlg,      DialogBoxParam (glob_hinst, (LPCSTR)IDD_WINPT_KEYCACHE, kmi->dlg,
1094                      keycache_dlg_proc, (LPARAM)&rcs);                      keycache_dlg_proc, (LPARAM)&rcs);
1095      c = keycache_get_ctx (1);      c = keycache_get_ctx (1);
1096      if (!c)      keylist_reload (kmi->lv, c, KEYLIST_LIST, kmi->keylist_sortby);
         BUG (0);  
     keylist_reload (kmi->lv, c, KEYLIST_LIST, KEY_SORT_USERID);  
1097      update_status_bar (kmi->statbar, kmi->lv);      update_status_bar (kmi->statbar, kmi->lv);
1098      SetForegroundWindow (kmi->dlg);      SetForegroundWindow (kmi->dlg);
1099  }  }
# Line 1115  km_gui_import (struct km_info_s *kmi, in Line 1131  km_gui_import (struct km_info_s *kmi, in
1131          reload_keylist (kmi);          reload_keylist (kmi);
1132    
1133      SetForegroundWindow (kmi->dlg);      SetForegroundWindow (kmi->dlg);
     center_window (kmi->dlg, NULL);  
1134  }  }
1135    
1136    
# Line 1196  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1211  keymanager_dlg_proc (HWND dlg, UINT msg,
1211          do_center_window (dlg, kmi);          do_center_window (dlg, kmi);
1212          do_resize_window (dlg, kmi);          do_resize_window (dlg, kmi);
1213          update_ui_items (dlg, kmi->lv);          update_ui_items (dlg, kmi->lv);
1214          restore_column_info (kmi->lv);          restore_column_info (kmi);
1215            keylist_sort (kmi->lv, kmi->keylist_sortby);
1216    
1217          SetDlgItemText (dlg, IDC_KEYMISC_GTEXT, _("Groups"));          SetDlgItemText (dlg, IDC_KEYMISC_GTEXT, _("Groups"));
1218            SetDlgItemText (dlg, ID_GROUP_SHOW, _("&Show"));
1219            SetDlgItemText (dlg, ID_GROUP_NEW, _("&New..."));
1220          SetClassLong (dlg, GCL_HICON, (LONG)LoadIcon (glob_hinst,          SetClassLong (dlg, GCL_HICON, (LONG)LoadIcon (glob_hinst,
1221                        (LPCTSTR)IDI_WINPT));                        (LPCTSTR)IDI_WINPT));
1222          SetForegroundWindow (dlg);          SetForegroundWindow (dlg);
1223          force_foreground_window (dlg, 1000);          kmi->magic = SetTimer (dlg, 1, 1000, NULL);
1224          return TRUE;          return TRUE;
1225    
1226        case WM_TIMER:
1227            KillTimer (dlg, kmi->magic);
1228            SetForegroundWindow (dlg);
1229            break;
1230                    
1231      case WM_DESTROY:      case WM_DESTROY:
1232          save_column_info (kmi->lv);          save_column_info (kmi);
1233          if (kmi->lv) {          if (kmi->lv) {
1234              keylist_delete (kmi->lv);              keylist_delete (kmi->lv);
1235              kmi->lv = NULL;                    kmi->lv = NULL;      
# Line 1220  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1243  keymanager_dlg_proc (HWND dlg, UINT msg,
1243          /* XXX: store window size. */          /* XXX: store window size. */
1244                    
1245          /* Remove runtime information. This should be the last action taken here. */          /* Remove runtime information. This should be the last action taken here. */
1246          delete kmi; kmi = NULL;          delete kmi;
1247            kmi = NULL;
1248          SetWindowLong (dlg, GWL_USERDATA, 0);          SetWindowLong (dlg, GWL_USERDATA, 0);
1249          return FALSE;          return FALSE;
1250    
     case WM_SHOWWINDOW:  
         break;  
   
1251      case WM_MOVE:      case WM_MOVE:
1252          RECT r;          RECT r;
1253          GetWindowRect (dlg, &r);          GetWindowRect (dlg, &r);
# Line 1387  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1408  keymanager_dlg_proc (HWND dlg, UINT msg,
1408                      set_menu_state (popup, ID_KEYCTX_PASTE, MF_DISABLED|MF_GRAYED);                      set_menu_state (popup, ID_KEYCTX_PASTE, MF_DISABLED|MF_GRAYED);
1409                  if (mapi_init ())                  if (mapi_init ())
1410                      set_menu_state (popup, ID_KEYCTX_SENDMAIL, MF_DISABLED|MF_GRAYED);                      set_menu_state (popup, ID_KEYCTX_SENDMAIL, MF_DISABLED|MF_GRAYED);
1411                    if (!secret_key_available ())
1412                        set_menu_state (popup, ID_KEYCTX_SIGN, MF_DISABLED|MF_GRAYED);
1413    
1414                  /* Override 'Default Keyserver' with the actual name. */                  /* Override 'Default Keyserver' with the actual name. */
1415                  host = kserver_get_hostname (0, -1, &port);                  host = kserver_get_hostname (0, -1, &port);
# Line 1562  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1585  keymanager_dlg_proc (HWND dlg, UINT msg,
1585                                _("Key Signature List"), IDS_WINPT_KEYSIG);                                _("Key Signature List"), IDS_WINPT_KEYSIG);
1586              if (k.update)              if (k.update)
1587                  update_key (kmi->lv, kmi->lv_idx, k.tmp_keyid, 0);                  update_key (kmi->lv, kmi->lv_idx, k.tmp_keyid, 0);
1588                if (updated_keys_avail ())
1589                    refresh_keylist (kmi);
1590              return TRUE;              return TRUE;
1591                            
1592          case ID_KEYMISC_PROPS:                case ID_KEYMISC_PROPS:      
# Line 1777  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1802  keymanager_dlg_proc (HWND dlg, UINT msg,
1802                  listview_select_all (kmi->lv);                  listview_select_all (kmi->lv);
1803              }              }
1804              km_refresh_from_keyserver (kmi->lv, dlg);              km_refresh_from_keyserver (kmi->lv, dlg);
1805                msg_box (dlg, _("Keyserver refresh finished."),
1806                         _("Key Manager"), MB_OK);
1807              break;              break;
1808                                                    
1809          /** Context menu **/          /** Context menu **/
# Line 1857  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1884  keymanager_dlg_proc (HWND dlg, UINT msg,
1884    
1885          case ID_KEYCTX_KEYID_COPY:          case ID_KEYCTX_KEYID_COPY:
1886              key = km_get_key_ptr (kmi->lv, kmi->lv_idx, NULL);              key = km_get_key_ptr (kmi->lv, kmi->lv_idx, NULL);
1887              set_clip_text (NULL, key->subkeys->keyid+8,              memset (type, 0, sizeof (type));
1888                             strlen (key->subkeys->keyid+8));              type[0] = '0'; type[1] = 'x';
1889                memcpy (type+2, key->subkeys->keyid+8, 8);
1890                set_clip_text (NULL, type, strlen (type));
1891              break;              break;
1892    
1893          case ID_KEYCTX_FPR_COPY:          case ID_KEYCTX_FPR_COPY:
# Line 1927  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1956  keymanager_dlg_proc (HWND dlg, UINT msg,
1956          case ID_GROUP_NEW:          case ID_GROUP_NEW:
1957          case ID_GROUP_PASTE:          case ID_GROUP_PASTE:
1958          case ID_GROUP_DELETE:          case ID_GROUP_DELETE:
1959            case ID_GROUP_SHOW:
1960              /* XXX: Implement group manager. */              /* XXX: Implement group manager. */
1961              return TRUE;              return TRUE;
1962    
Legend:
Removed from v.205  
changed lines
  Added in v.214
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26