/[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 210 by twoaday, Mon May 1 12:22:18 2006 UTC revision 211 by twoaday, Sun May 7 12:36:48 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 1062  refresh_keylist (struct km_info_s *kmi) Line 1065  refresh_keylist (struct km_info_s *kmi)
1065                  keylist_upd_key (kmi->lv, pos, ctx, 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 1071  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 1091  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 1131  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 1216  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1218  keymanager_dlg_proc (HWND dlg, UINT msg,
1218          keylist_sort (kmi->lv, kmi->keylist_sortby);          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);
# Line 1242  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 1799  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 1879  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1883  keymanager_dlg_proc (HWND dlg, UINT msg,
1883    
1884          case ID_KEYCTX_KEYID_COPY:          case ID_KEYCTX_KEYID_COPY:
1885              key = km_get_key_ptr (kmi->lv, kmi->lv_idx, NULL);              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:
# Line 1949  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.210  
changed lines
  Added in v.211
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26