/[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 208 by twoaday, Mon May 1 12:22:18 2006 UTC revision 214 by twoaday, Sun May 14 18:40:36 2006 UTC
# Line 82  struct km_info_s { Line 82  struct km_info_s {
82      int             lv_idx;      int             lv_idx;
83      int keylist_sortby;      int keylist_sortby;
84      int magic;      int magic;
85    
86        unsigned int enable_groups:1;
87  };  };
88    
89  /* Toolbar button structure. */  /* Toolbar button structure. */
# Line 401  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 685  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 1062  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 1071  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 1091  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 1131  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 1216  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1215  keymanager_dlg_proc (HWND dlg, UINT msg,
1215          keylist_sort (kmi->lv, kmi->keylist_sortby);          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);
# Line 1242  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 1409  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 1584  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 1799  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 1879  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 1949  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.208  
changed lines
  Added in v.214
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26