/[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 175 by twoaday, Tue Feb 7 08:58:04 2006 UTC revision 193 by twoaday, Sat Apr 1 12:36:35 2006 UTC
# Line 239  restore_column_info (listview_ctrl_t hd) Line 239  restore_column_info (listview_ctrl_t hd)
239              return -1;              return -1;
240          }          }
241      }      }
242      for (i=0; i < size/2; i++) {      for (i=0; i < size/2; i++)
243          LVCOLUMN lvc;          listview_set_column_width (hd, i, buf[i]);
   
         memset (&lvc, 0, sizeof (lvc));  
         lvc.mask = LVCF_WIDTH;  
         lvc.cx = buf[i];  
         ListView_SetColumn (hd->ctrl, i, &lvc);  
     }  
244      free_if_alloc (buf);      free_if_alloc (buf);
245      return 0;      return 0;
246  }  }
# Line 431  static void Line 425  static void
425  do_create_minpopup (HWND dlg)  do_create_minpopup (HWND dlg)
426  {  {
427      HMENU hm;      HMENU hm;
     MENUITEMINFO mi;  
     char * s;  
428      POINT p;      POINT p;
429            
430      if (gpg_read_only || !clip_contains_pgpkey ())      if (gpg_read_only || !clip_contains_pgpkey ())
431          return;          return;
432      hm = CreatePopupMenu ();      hm = CreatePopupMenu ();
433      if (!hm)      if (!hm)
434          BUG( NULL );          BUG (0);
435      memset (&mi, 0, sizeof mi);      insert_menu_item (hm, 0, ID_KEYCTX_PASTE, _("Paste Key from Clipboard"));
     mi.cbSize = sizeof mi;  
     s = (char *)_("Paste Key from Clipboard");  
     mi.fType = MF_STRING;  
     mi.dwTypeData = s;  
     mi.cch = strlen (s);  
     mi.fMask = MIIM_DATA | MIIM_ID | MIIM_TYPE;  
     mi.wID = ID_KEYCTX_PASTE;  
     InsertMenuItem (hm, 0, FALSE, &mi);  
436      GetCursorPos (&p);      GetCursorPos (&p);
437      TrackPopupMenu (hm, 0, p.x, p.y, 0, dlg, NULL);      TrackPopupMenu (hm, 0, p.x, p.y, 0, dlg, NULL);
438      DestroyMenu (hm);      DestroyMenu (hm);
# Line 1138  km_gui_import (struct km_info_s *kmi, in Line 1122  km_gui_import (struct km_info_s *kmi, in
1122  BOOL CALLBACK  BOOL CALLBACK
1123  keymanager_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)  keymanager_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
1124  {  {
1125      struct km_info_s *kmi;      struct km_info_s *kmi = NULL;
     INITCOMMONCONTROLSEX icex;  
1126      HWND kl;      HWND kl;
1127      HMENU hm;      HMENU hm;
1128      gpg_keycache_t c;      gpg_keycache_t c;
# Line 1155  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1138  keymanager_dlg_proc (HWND dlg, UINT msg,
1138      if ((msg != WM_INITDIALOG)      if ((msg != WM_INITDIALOG)
1139          && ((kmi = (struct km_info_s*)GetWindowLong (dlg, GWL_USERDATA)) == NULL))          && ((kmi = (struct km_info_s*)GetWindowLong (dlg, GWL_USERDATA)) == NULL))
1140          return FALSE;          return FALSE;
1141        
1142        /* handle dynamic popup items in the keyserver menu. */
1143        if (msg == WM_COMMAND && LOWORD (wparam) >= WM_APP &&
1144                                 LOWORD (wparam) <= WM_APP+MAX_KEYSERVERS) {
1145            l_idx = LOWORD (wparam)-WM_APP;
1146            if (l_idx < 0)
1147                return TRUE;
1148            host = kserver_get_hostname (l_idx, 0, &port);
1149            if (host != NULL)
1150                km_send_to_keyserver (kmi->lv, dlg, host, port);
1151            return TRUE;
1152        }
1153    
1154      switch (msg) {      switch (msg) {
1155      case WM_INITDIALOG:      case WM_INITDIALOG:
1156          kmi = new struct km_info_s;          kmi = new struct km_info_s;
1157          memset (kmi, 0, sizeof (struct km_info_s));          memset (kmi, 0, sizeof (struct km_info_s));
1158          kmi->lv_idx = -1;          kmi->lv_idx = -1;
         icex.dwSize = sizeof (INITCOMMONCONTROLSEX);  
         icex.dwICC  = ICC_BAR_CLASSES;  
         InitCommonControlsEx (&icex);  
1159          kmi->hwnd_sep = regist_sep_wnd (dlg, kmi);          kmi->hwnd_sep = regist_sep_wnd (dlg, kmi);
1160          imagelist_load (dlg);          imagelist_load (dlg);
1161          translate_menu_strings (dlg);          translate_menu_strings (dlg);
# Line 1231  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1223  keymanager_dlg_proc (HWND dlg, UINT msg,
1223          return FALSE;          return FALSE;
1224    
1225      case WM_SHOWWINDOW:      case WM_SHOWWINDOW:
         /*refresh_keylist (kmi);*/  
1226          break;          break;
1227    
1228      case WM_MOVE:      case WM_MOVE:
# Line 1394  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1385  keymanager_dlg_proc (HWND dlg, UINT msg,
1385                      set_menu_state (popup, ID_KEYCTX_PASTE, MF_DISABLED|MF_GRAYED);                      set_menu_state (popup, ID_KEYCTX_PASTE, MF_DISABLED|MF_GRAYED);
1386                  if (mapi_init ())                  if (mapi_init ())
1387                      set_menu_state (popup, ID_KEYCTX_SENDMAIL, MF_DISABLED|MF_GRAYED);                      set_menu_state (popup, ID_KEYCTX_SENDMAIL, MF_DISABLED|MF_GRAYED);
1388    
1389                  /* Override 'Default Keyserver' with the actual name. */                  /* Override 'Default Keyserver' with the actual name. */
1390                  host = kserver_get_hostname (0, -1, &port);                  host = kserver_get_hostname (0, -1, &port);
1391                    if (!host)
1392                        host = DEF_HKP_KEYSERVER;
1393                  set_menu_text (popup, ID_KEYCTX_KS_DEFAULT, host);                  set_menu_text (popup, ID_KEYCTX_KS_DEFAULT, host);
1394                    {
1395                        HMENU ks = GetSubMenu (popup, 19);
1396                        for (i=0; server[i].name != NULL; i++)                      
1397                            insert_menu_item (ks, i+2, WM_APP+i, server[i].name);
1398                    }
1399                  popup_gpg_readonly (dlg, popup);                  popup_gpg_readonly (dlg, popup);
1400                  if (listview_count_items (kmi->lv, 1) > 1)                  if (listview_count_items (kmi->lv, 1) > 1)
1401                      popup_multiple (dlg, popup);                      popup_multiple (dlg, popup);
# Line 1576  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1575  keymanager_dlg_proc (HWND dlg, UINT msg,
1575              k.keyid = k.tmp_keyid;              k.keyid = k.tmp_keyid;
1576              k.uid = key->uids->uid;              k.uid = key->uids->uid;
1577              k.ctx = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);              k.ctx = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
1578              dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_KEYSIG, dlg,              dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_KEYSIG_TREE, dlg,
1579                                keysig_dlg_proc, (LPARAM)&k,                                sigtree_dlg_proc, (LPARAM)&k,
1580                                _("Key Signature List" ), IDS_WINPT_KEYSIG);                                _("Key Signature List"), IDS_WINPT_KEYSIG);
1581              if (k.update)              if (k.update)
1582                  update_key (kmi->lv, kmi->lv_idx, k.tmp_keyid, 0);                  update_key (kmi->lv, kmi->lv_idx, k.tmp_keyid, 0);
1583              return TRUE;              return TRUE;
# Line 1692  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1691  keymanager_dlg_proc (HWND dlg, UINT msg,
1691    
1692          case ID_KEYMISC_IMPORT_HTTP:          case ID_KEYMISC_IMPORT_HTTP:
1693              url = (struct URL_ctx_s*)get_http_file_dlg (dlg);              url = (struct URL_ctx_s*)get_http_file_dlg (dlg);
1694              if (url->cancel == 0) {              if (url && url->cancel == 0) {
1695                  km_http_import (dlg, url->url);                  km_http_import (dlg, url->url);
1696                  refresh_keylist (kmi);                  refresh_keylist (kmi);
1697              }              }
# Line 1752  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1751  keymanager_dlg_proc (HWND dlg, UINT msg,
1751              return TRUE;              return TRUE;
1752    
1753          case ID_KEYMISC_INFO:          case ID_KEYMISC_INFO:
1754              dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_ABOUT, glob_hwnd,              dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_ABOUT, dlg,
1755                                about_winpt_dlg_proc, 0, _("About WinPT"),                                about_winpt_dlg_proc, 0, _("About WinPT"),
1756                                IDS_WINPT_ABOUT);                                IDS_WINPT_ABOUT);
1757              break;              break;
# Line 1768  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1767  keymanager_dlg_proc (HWND dlg, UINT msg,
1767    
1768          case ID_KEYMISC_OT:          case ID_KEYMISC_OT:
1769              dialog_box_param (glob_hinst, (LPCTSTR)IDD_WINPT_OWNERTRUST,              dialog_box_param (glob_hinst, (LPCTSTR)IDD_WINPT_OWNERTRUST,
1770                                glob_hwnd, ownertrust_dlg_proc, 0,                                dlg, ownertrust_dlg_proc, 0,
1771                                _("Ownertrust"), IDS_WINPT_OWNERTRUST);                                _("Ownertrust"), IDS_WINPT_OWNERTRUST);
1772              break;              break;
1773    
# Line 1810  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1809  keymanager_dlg_proc (HWND dlg, UINT msg,
1809              if (!key)              if (!key)
1810                  BUG (NULL);                  BUG (NULL);
1811              memset (&k, 0, sizeof (k));              memset (&k, 0, sizeof (k));
1812              k.keyid = key->subkeys->keyid+8;              strncpy (k.tmp_keyid, key->subkeys->keyid+8, 8);
1813                k.keyid = k.tmp_keyid;
1814                k.is_protected = km_check_if_protected (kmi->lv, kmi->lv_idx);
1815              keyedit_set_pref_keyserver (&k, dlg);              keyedit_set_pref_keyserver (&k, dlg);
1816              break;              break;
1817    
# Line 1913  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1914  keymanager_dlg_proc (HWND dlg, UINT msg,
1914                  update_key (kmi->lv, kmi->lv_idx, k.tmp_keyid, 1);                  update_key (kmi->lv, kmi->lv_idx, k.tmp_keyid, 1);
1915              break;              break;
1916    
         case ID_KEYCTX_KS_NL:  
         case ID_KEYCTX_KS_PL:  
         case ID_KEYCTX_KS_AT:  
         case ID_KEYCTX_KS_DE:  
         case ID_KEYCTX_KS_DK:  
         case ID_KEYCTX_KS_CZ:  
         case ID_KEYCTX_KS_ES:  
         case ID_KEYCTX_KS_UK:  
             host = kserver_get_hostname (LOWORD (wparam) - 40107, 0, &port);  
             km_send_to_keyserver (kmi->lv, dlg, host, port);  
             break;  
   
1917          case ID_KEYCTX_RECVFROM:          case ID_KEYCTX_RECVFROM:
1918              km_refresh_from_keyserver (kmi->lv, dlg);              km_refresh_from_keyserver (kmi->lv, dlg);
1919              if (updated_keys_avail ())              if (updated_keys_avail ())
# Line 1935  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1924  keymanager_dlg_proc (HWND dlg, UINT msg,
1924              /* XXX: add generic function to support multiple selection              /* XXX: add generic function to support multiple selection
1925                      with a callback */                      with a callback */
1926              key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);              key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
1927              name = utf8_to_wincp2 (key->uids->uid);              name = utf8_to_native (key->uids->uid);
1928              set_clip_text (NULL, name, strlen (name));              set_clip_text (NULL, name, strlen (name));
1929              safe_free (name);              safe_free (name);
1930              break;              break;
Legend:
Removed from v.175  
changed lines
  Added in v.193
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26