/[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 248 by twoaday, Fri Jul 28 11:11:09 2006 UTC revision 262 by twoaday, Sat Sep 30 10:24:34 2006 UTC
# Line 522  update_status_bar (HWND sb, listview_ctr Line 522  update_status_bar (HWND sb, listview_ctr
522      char txt_sec[128];      char txt_sec[128];
523      char txt_pub[128];      char txt_pub[128];
524      int nkeys = 0, nsec = 0;      int nkeys = 0, nsec = 0;
     int i;  
525    
526      nkeys = listview_count_items (lv, 0);      nkeys = listview_count_items (lv, 0);
527      for (i = 0; i < nkeys; i++) {      nsec = gpg_keycache_get_size (keycache_get_ctx (0));
528          if (km_check_for_seckey (lv, i, NULL))  
             nsec++;  
     }  
529      _snprintf (txt_sec, sizeof (txt_sec)-1, _("%d secret keys"), nsec);      _snprintf (txt_sec, sizeof (txt_sec)-1, _("%d secret keys"), nsec);
530      _snprintf (txt_pub, sizeof (txt_pub)-1, _("%d keys"), nkeys);      _snprintf (txt_pub, sizeof (txt_pub)-1, _("%d keys"), nkeys);
531      SendMessage (sb, SB_SETTEXT, 1, (LPARAM)txt_sec);      SendMessage (sb, SB_SETTEXT, 1, (LPARAM)txt_sec);
# Line 993  translate_menu_strings (HWND dlg) Line 990  translate_menu_strings (HWND dlg)
990      set_menu_text (menu, ID_KEYMISC_EXPORT, _("&Export..."));      set_menu_text (menu, ID_KEYMISC_EXPORT, _("&Export..."));
991      set_menu_text (menu, ID_KEYMISC_IMPORT, _("&Import..."));      set_menu_text (menu, ID_KEYMISC_IMPORT, _("&Import..."));
992      set_menu_text (menu, ID_KEYMISC_PROPS, _("&Properties"));      set_menu_text (menu, ID_KEYMISC_PROPS, _("&Properties"));
993      set_menu_text (menu, ID_KEYMISC_GPGOPT, _("Options"));      set_menu_text (menu, ID_KEYMISC_GPGOPT, _("GPG &Options"));
994      set_menu_text (menu, ID_KEYMISC_GPGPREFS, _("Preferences"));      set_menu_text (menu, ID_KEYMISC_GPGPREFS, _("&GPG Preferences"));
995        set_menu_text (menu, ID_KEYMISC_WINPTPREFS, _("&WinPT Preferences"));
996      set_menu_text (menu, ID_KEYMISC_SENDRECV, _("Keyserver") );      set_menu_text (menu, ID_KEYMISC_SENDRECV, _("Keyserver") );
997      set_menu_text (menu, ID_KEYMISC_EXPORT_PRIVKEY, _("E&xport Secret Key"));      set_menu_text (menu, ID_KEYMISC_EXPORT_PRIVKEY, _("E&xport Secret Key"));
998      set_menu_text (menu, ID_KEYMISC_RECACHE, _("Re&load Key Cache"));      set_menu_text (menu, ID_KEYMISC_RECACHE, _("Re&load Key Cache"));
# Line 1106  refresh_keylist (struct km_info_s *kmi) Line 1104  refresh_keylist (struct km_info_s *kmi)
1104      keylist_sort (kmi->lv, kmi->keylist_sortby);      keylist_sort (kmi->lv, kmi->keylist_sortby);
1105      update_status_bar (kmi->statbar, kmi->lv);      update_status_bar (kmi->statbar, kmi->lv);
1106      keyring_check_last_access ();      keyring_check_last_access ();
1107        SetForegroundWindow (kmi->dlg);
1108  }  }
1109    
1110    
# Line 1147  check_ultimate_trusted_key (gpg_keycache Line 1146  check_ultimate_trusted_key (gpg_keycache
1146  }  }
1147    
1148    
 static void  
 reload_keylist (struct km_info_s *kmi)  
 {  
     gpg_keycache_t c;  
   
     c = keycache_get_ctx (1);  
     keycache_reload (kmi->dlg);  
     keylist_reload (kmi->lv, c, KEYLIST_LIST, kmi->keylist_sortby);  
     update_status_bar (kmi->statbar, kmi->lv);  
     keyring_check_last_access ();  
 }  
   
   
1149  /* Reload the entire key cache and update the listview. */  /* Reload the entire key cache and update the listview. */
1150  static void  static void
1151  reload_keycache (struct km_info_s *kmi)  reload_keycache (struct km_info_s *kmi)
1152  {  {
     refresh_cache_s rcs = {0};  
1153      gpg_keycache_t c;      gpg_keycache_t c;
1154    
1155      rcs.kr_reload = rcs.kr_update = 1;      keycache_reload (kmi->dlg);
     rcs.tr_update = 0;  
     DialogBoxParam (glob_hinst, (LPCSTR)IDD_WINPT_KEYCACHE, kmi->dlg,  
                     keycache_dlg_proc, (LPARAM)&rcs);  
1156      c = keycache_get_ctx (1);      c = keycache_get_ctx (1);
1157      keylist_reload (kmi->lv, c, KEYLIST_LIST, kmi->keylist_sortby);      keylist_reload (kmi->lv, c, KEYLIST_LIST, kmi->keylist_sortby);
1158      update_status_bar (kmi->statbar, kmi->lv);      update_status_bar (kmi->statbar, kmi->lv);
1159      SetForegroundWindow (kmi->dlg);      SetForegroundWindow (kmi->dlg);
1160        keyring_check_last_access ();
1161  }  }
1162    
1163    
# Line 1182  reload_keycache (struct km_info_s *kmi) Line 1165  reload_keycache (struct km_info_s *kmi)
1165  static void  static void
1166  km_gui_import (struct km_info_s *kmi, int cmd_id, void *param)  km_gui_import (struct km_info_s *kmi, int cmd_id, void *param)
1167  {  {
1168      int newkeys=0, newsks=0;      int newkeys = 0, newsks = 0;
1169      int err = 0;      int err = 0;
1170    
1171      switch (cmd_id) {      switch (cmd_id) {
# Line 1207  km_gui_import (struct km_info_s *kmi, in Line 1190  km_gui_import (struct km_info_s *kmi, in
1190      if (!err && !newsks && (newkeys > 0 && newkeys < KM_PRELOAD_KEYS))      if (!err && !newsks && (newkeys > 0 && newkeys < KM_PRELOAD_KEYS))
1191          refresh_keylist (kmi);          refresh_keylist (kmi);
1192      else if (!err) /* avoid to spawn too much processes. */      else if (!err) /* avoid to spawn too much processes. */
1193          reload_keylist (kmi);          reload_keycache (kmi);  
   
1194      SetForegroundWindow (kmi->dlg);      SetForegroundWindow (kmi->dlg);
1195  }  }
1196    
# Line 1360  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1342  keymanager_dlg_proc (HWND dlg, UINT msg,
1342          restore_column_info (kmi);          restore_column_info (kmi);
1343          keylist_sort (kmi->lv, kmi->keylist_sortby);          keylist_sort (kmi->lv, kmi->keylist_sortby);
1344    
1345            SendMessage (dlg, WM_SETICON, (WPARAM)ICON_SMALL,
1346                         (LPARAM)LoadIcon (glob_hinst, (LPCTSTR)IDI_WINPT));
1347          SetDlgItemText (dlg, IDC_KEYMISC_GTEXT, _("Groups"));          SetDlgItemText (dlg, IDC_KEYMISC_GTEXT, _("Groups"));
1348          SetDlgItemText (dlg, ID_GROUP_SHOW, _("&Show"));          SetDlgItemText (dlg, ID_GROUP_SHOW, _("&Show"));
1349          SetDlgItemText (dlg, ID_GROUP_NEW, _("&New..."));          SetDlgItemText (dlg, ID_GROUP_NEW, _("&New..."));
         SetClassLong (dlg, GCL_HICON, (LONG)LoadIcon (glob_hinst,  
                       (LPCTSTR)IDI_WINPT));  
1350          SetForegroundWindow (dlg);          SetForegroundWindow (dlg);
1351          kmi->magic = SetTimer (dlg, 1, 1000, NULL);          kmi->magic = SetTimer (dlg, 1, 1000, NULL);
1352          return TRUE;          return TRUE;
1353      
1354    
1355      case WM_TIMER:      case WM_TIMER:
1356          KillTimer (dlg, kmi->magic);          KillTimer (dlg, kmi->magic);
# Line 1638  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1621  keymanager_dlg_proc (HWND dlg, UINT msg,
1621          break;          break;
1622    
1623      case WM_INITMENUPOPUP:      case WM_INITMENUPOPUP:
1624          if ((UINT)LOWORD (lparam) == 3) {          hm = (HMENU)wparam;
1625              HMENU h = (HMENU)wparam;          if ((UINT)LOWORD (lparam) == 3)
1626              set_menu_text_bypos (h, 0, _("New"));              set_menu_text_bypos (hm, 0, _("New"));
1627          }          else if ((UINT)LOWORD (lparam) == 1)
1628          /* XXX: before we can use it, we need to find a way to              set_menu_text_bypos (hm, 8, _("Preferences..."));
                 update the gpg access timestamp after each operation.  
         if (keyring_check_last_access ())  
             reload_keylist (kmi);  
         */  
1629          return FALSE;          return FALSE;
1630    
1631      case WM_COMMAND:      case WM_COMMAND:
# Line 1821  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1800  keymanager_dlg_proc (HWND dlg, UINT msg,
1800              refresh_keylist (kmi);              refresh_keylist (kmi);
1801              return TRUE;              return TRUE;
1802                            
1803            case ID_KEYMISC_WINPTPREFS:
1804                dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_PREFS,
1805                                  dlg, prefs_dlg_proc, 0,
1806                                  _("WinPT Preferences"), 0);
1807                break;
1808    
1809          case ID_KEYMISC_GPGPREFS:          case ID_KEYMISC_GPGPREFS:
1810              rc = dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_GPGPREFS,              rc = dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_GPGPREFS,
1811                                     dlg, gpgprefs_dlg_proc, 0,                                     dlg, gpgprefs_dlg_proc, 0,
# Line 1906  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1891  keymanager_dlg_proc (HWND dlg, UINT msg,
1891                                IDS_WINPT_ABOUT);                                IDS_WINPT_ABOUT);
1892              break;              break;
1893    
1894            case ID_KEYMISC_DEVWWW:
1895                ShellExecute (dlg, "open", "http://wald.intevation.org/projects/winpt",
1896                              NULL, NULL, SW_SHOW);
1897                break;
1898    
1899          case ID_KEYMISC_WEBSITE:          case ID_KEYMISC_WEBSITE:
1900              ShellExecute (dlg, "open", "http://www.winpt.org",              ShellExecute (dlg, "open", "http://www.winpt.org",
1901                            NULL, NULL, SW_SHOW);                            NULL, NULL, SW_SHOW);
Legend:
Removed from v.248  
changed lines
  Added in v.262
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26