/[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 211 by twoaday, Sun May 7 12:36:48 2006 UTC revision 244 by twoaday, Mon Jul 3 14:10:21 2006 UTC
# Line 85  struct km_info_s { Line 85  struct km_info_s {
85    
86      unsigned int enable_groups:1;      unsigned int enable_groups:1;
87  };  };
88    typedef struct km_info_s *km_info_t;
89    
90  /* Toolbar button structure. */  /* Toolbar button structure. */
91  struct mybuttons {  struct mybuttons {
# Line 103  struct mybuttons myb[] = { Line 104  struct mybuttons myb[] = {
104    
105    
106  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);
107    void key_get_clip_info (const char *keyid, char *buf, size_t buflen);
108    
109    
110  /* Subclass the keylist listview control to allow extended commands. */  /* Subclass the keylist listview control to allow extended commands. */
# Line 170  keylist_subclass_proc (HWND dlg, UINT ms Line 172  keylist_subclass_proc (HWND dlg, UINT ms
172  }  }
173    
174    
175  #define ico2idx(ico) imagelist_getindex((ico))  #define ico2idx(ico) imagelist_getindex ((ico))
176    
177    /* Create a new toolbar window with a pre-defined list of buttons. */
178  static HWND  static HWND
179  load_toolbar (HWND dlg, struct km_info_s *kmi)  create_toolbar (HWND dlg, struct km_info_s *kmi)
180  {  {    
181      HWND tbwnd;      HWND tbwnd;
182      TBSAVEPARAMS tbsp;      TBSAVEPARAMS tbsp;
183      TBBUTTON tb_buttons[] = {      TBBUTTON tb_buttons[] = {
# Line 188  load_toolbar (HWND dlg, struct km_info_s Line 191  load_toolbar (HWND dlg, struct km_info_s
191          {ico2idx (IMI_KEY_FILE_EXPORT), ID_KEYMISC_EXPORT, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},          {ico2idx (IMI_KEY_FILE_EXPORT), ID_KEYMISC_EXPORT, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},
192          {ico2idx (IMI_KEY_IMPORT), ID_KEYCTX_PASTE, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},          {ico2idx (IMI_KEY_IMPORT), ID_KEYCTX_PASTE, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},
193          {ico2idx (IMI_KEY_EXPORT), ID_KEYCTX_COPY, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},          {ico2idx (IMI_KEY_EXPORT), ID_KEYCTX_COPY, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},
194       };      };
195        
196      tbwnd = CreateWindowEx (0, TOOLBARCLASSNAME, NULL,      tbwnd = CreateWindowEx (0, TOOLBARCLASSNAME, NULL,
197                              WS_CHILD|TBSTYLE_TOOLTIPS|TBSTYLE_FLAT|CCS_ADJUSTABLE,                              WS_CHILD|TBSTYLE_TOOLTIPS|TBSTYLE_FLAT|CCS_ADJUSTABLE,
198                              0, 0, 0, 0, dlg, (HMENU)IDR_WINPT_KMTB, glob_hinst, NULL);                              0, 0, 0, 0, dlg, (HMENU)IDR_WINPT_KMTB, glob_hinst, NULL);
199      if (tbwnd) {      if (!tbwnd)
200          SendMessage (tbwnd, TB_BUTTONSTRUCTSIZE, (WPARAM) sizeof(TBBUTTON), 0);          BUG (0);
201          SendMessage (tbwnd, TB_SETIMAGELIST, 0, (LPARAM)glob_imagelist);      SendMessage (tbwnd, TB_BUTTONSTRUCTSIZE, (WPARAM) sizeof(TBBUTTON), 0);
202                  SendMessage (tbwnd, TB_AUTOSIZE, 0, 0);      SendMessage (tbwnd, TB_SETIMAGELIST, 0, (LPARAM)glob_imagelist);
203          ShowWindow (tbwnd, SW_SHOW);      SendMessage (tbwnd, TB_AUTOSIZE, 0, 0);
204        ShowWindow (tbwnd, SW_SHOW);
205          /* Restore toolbar */  
206          tbsp.hkr = HKEY_CURRENT_USER;      /* Restore toolbar */
207          tbsp.pszSubKey = "Software\\WinPT";      tbsp.hkr = HKEY_CURRENT_USER;
208          tbsp.pszValueName = "KM_toolbar";      tbsp.pszSubKey = "Software\\WinPT";
209          if (SendMessage(tbwnd, TB_SAVERESTORE, FALSE, (LPARAM)&tbsp ) == 0)      tbsp.pszValueName = "KM_toolbar";
210              SendMessage (tbwnd, TB_ADDBUTTONS, sizeof(tb_buttons) / sizeof(tb_buttons[0]),      if (SendMessage (tbwnd, TB_SAVERESTORE, FALSE, (LPARAM)&tbsp) == 0)
211                           (LONG)&tb_buttons[0]);          SendMessage (tbwnd, TB_ADDBUTTONS,
212       }                       sizeof (tb_buttons) / sizeof (tb_buttons[0]),
213       return tbwnd;                       (LONG)&tb_buttons[0]);
214    
215        return tbwnd;
216  }  }
217    
218    
# Line 300  save_column_info (struct km_info_s *kmi) Line 305  save_column_info (struct km_info_s *kmi)
305  }  }
306    
307    
308    /* Restore the original size of the dialog. */
309    static void
310    restore_window_size (HWND dlg, struct km_info_s *kmi)
311    {
312        char *p;
313        int height = 0, width = 0;
314    
315        /* Restore the original window size. */
316        p = get_reg_entry (HKEY_CURRENT_USER, "Software\\WinPT", "KM_Size_Width");
317        if (p) {
318            width = atoi (p);
319            free_if_alloc (p);
320        }
321        p = get_reg_entry (HKEY_CURRENT_USER, "Software\\WinPT", "KM_Size_Height");
322        if (p) {
323            height = atoi (p);
324            free_if_alloc (p);
325        }
326        if (height > 0 && width > 0)
327            SetWindowPos (dlg, HWND_TOP, kmi->pos_x, kmi->pos_y,
328                          height, width, SWP_SHOWWINDOW);
329    }
330    
331    
332  /* Center window @dlg. */  /* Center window @dlg. */
333  static void  static void
334  do_center_window (HWND dlg, struct km_info_s *kmi)  do_center_window (HWND dlg, struct km_info_s *kmi)
# Line 322  do_center_window (HWND dlg, struct km_in Line 351  do_center_window (HWND dlg, struct km_in
351          return;          return;
352      }      }
353      else if (p)      else if (p)
354          pos_x = atol (p);          pos_x = atoi (p);
355    
356      p = get_reg_entry (HKEY_CURRENT_USER, "Software\\WinPT", "KM_Pos_Y");      p = get_reg_entry (HKEY_CURRENT_USER, "Software\\WinPT", "KM_Pos_Y");
357      if (p && !strcmp (p, " ")) {      if (p && !strcmp (p, " ")) {
# Line 331  do_center_window (HWND dlg, struct km_in Line 360  do_center_window (HWND dlg, struct km_in
360          return;          return;
361      }      }
362      else if (p)      else if (p)
363          pos_y = atol (p);          pos_y = atoi (p);
364    
365      if (!pos_y && !pos_x) {      if (!pos_y && !pos_x) {
366          center_window (dlg, NULL);          center_window (dlg, NULL);
# Line 344  do_center_window (HWND dlg, struct km_in Line 373  do_center_window (HWND dlg, struct km_in
373          || pos_y > GetSystemMetrics (SM_CYSCREEN)) {          || pos_y > GetSystemMetrics (SM_CYSCREEN)) {
374          pos_x = pos_y = 0;          pos_x = pos_y = 0;
375      }      }
376        kmi->pos_x = pos_x;
377        kmi->pos_y = pos_y;
378    
379      GetClientRect (dlg, &rect);      GetClientRect (dlg, &rect);
380      MoveWindow (dlg, pos_x, pos_y, rect.right, rect.bottom, TRUE);      MoveWindow (dlg, pos_x, pos_y, rect.right, rect.bottom, TRUE);
381  }  }
# Line 399  do_resize_window (HWND dlg, struct km_in Line 431  do_resize_window (HWND dlg, struct km_in
431                    
432      /* Place the keylist above the separator */      /* Place the keylist above the separator */
433      h = GetDlgItem (dlg, IDC_KEYMISC_KEYLIST);      h = GetDlgItem (dlg, IDC_KEYMISC_KEYLIST);
434      MoveWindow (h, rclient.left, rclient.top, rclient.right - rclient.left,      MoveWindow (h, rclient.left, rclient.top, rclient.right - rclient.left,
435                  kmi->ypos_sep - rclient.top, bRepaint);                  kmi->ypos_sep - rclient.top, bRepaint);
436      rclient.top = kmi->ypos_sep + 5 + 8;      rclient.top = kmi->ypos_sep + 5 + 8;
437    
# Line 524  separator_wnd_proc (HWND hwnd, UINT msg, Line 556  separator_wnd_proc (HWND hwnd, UINT msg,
556          FillRect (ps.hdc, &rect, (HBRUSH)(COLOR_3DFACE+1));          FillRect (ps.hdc, &rect, (HBRUSH)(COLOR_3DFACE+1));
557    
558          /* The lines from the light into the dark */          /* The lines from the light into the dark */
559          MoveToEx(ps.hdc, 0,0, NULL);          MoveToEx (ps.hdc, 0,0, NULL);
560          if ((hpen = CreatePen (PS_SOLID, 0, GetSysColor(COLOR_3DHILIGHT))) != NULL) {          hpen = CreatePen (PS_SOLID, 0, GetSysColor (COLOR_3DHILIGHT));
561            if (hpen != NULL) {
562              SelectObject (ps.hdc, (LPVOID)hpen);              SelectObject (ps.hdc, (LPVOID)hpen);
563              LineTo (ps.hdc, rect.right, 0);              LineTo (ps.hdc, rect.right, 0);
564              DeleteObject (hpen);              DeleteObject (hpen);
565          }          }
566          MoveToEx(ps.hdc, 0, 1, NULL);          MoveToEx (ps.hdc, 0, 1, NULL);
567          if ((hpen = CreatePen (PS_SOLID, 0, GetSysColor(COLOR_3DLIGHT))) != NULL) {          hpen = CreatePen (PS_SOLID, 0, GetSysColor (COLOR_3DLIGHT));
568            if (hpen != NULL) {
569               SelectObject (ps.hdc, (LPVOID)hpen);               SelectObject (ps.hdc, (LPVOID)hpen);
570               LineTo (ps.hdc, rect.right, rect.bottom);               LineTo (ps.hdc, rect.right, rect.bottom);
571               DeleteObject (hpen);               DeleteObject (hpen);
572           }           }
573    
574          MoveToEx(ps.hdc, 0, rect.bottom-1, NULL);          MoveToEx (ps.hdc, 0, rect.bottom-1, NULL);
575          if ((hpen = CreatePen (PS_SOLID, 0, GetSysColor(COLOR_3DSHADOW))) != NULL) {          hpen = CreatePen (PS_SOLID, 0, GetSysColor(COLOR_3DSHADOW));
576            if (hpen != NULL) {
577              SelectObject (ps.hdc, (LPVOID)hpen);              SelectObject (ps.hdc, (LPVOID)hpen);
578              LineTo (ps.hdc, rect.right, rect.bottom-1);              LineTo (ps.hdc, rect.right, rect.bottom-1);
579              DeleteObject (hpen);              DeleteObject (hpen);
580          }          }
581          MoveToEx(ps.hdc, 0, rect.bottom, NULL);          MoveToEx (ps.hdc, 0, rect.bottom, NULL);
582          if ((hpen = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_3DDKSHADOW))) != NULL) {          hpen = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_3DDKSHADOW));
583            if (hpen != NULL) {
584              SelectObject (ps.hdc, (LPVOID)hpen);              SelectObject (ps.hdc, (LPVOID)hpen);
585              LineTo (ps.hdc, rect.right, rect.bottom);              LineTo (ps.hdc, rect.right, rect.bottom);
586              DeleteObject (hpen);              DeleteObject (hpen);
# Line 575  separator_wnd_proc (HWND hwnd, UINT msg, Line 611  separator_wnd_proc (HWND hwnd, UINT msg,
611                  break;                  break;
612    
613              /* Calculate mouse movement */              /* Calculate mouse movement */
614              p.x = LOWORD(lparam);              p.x = LOWORD (lparam);
615              p.y = HIWORD(lparam);              p.y = HIWORD (lparam);
616              ClientToScreen (hwnd, &p);              ClientToScreen (hwnd, &p);
617    
618              GetWindowRect (hwnd, &r);              GetWindowRect (hwnd, &r);
# Line 590  separator_wnd_proc (HWND hwnd, UINT msg, Line 626  separator_wnd_proc (HWND hwnd, UINT msg,
626              MapWindowPoints (NULL, GetParent(hwnd), (POINT*)&r, 2);              MapWindowPoints (NULL, GetParent(hwnd), (POINT*)&r, 2);
627              kmi->ypos_sep = r.top;              kmi->ypos_sep = r.top;
628              kmi->ypercent_sep = 0; /* This forces do_resize_window to use abs. position */              kmi->ypercent_sep = 0; /* This forces do_resize_window to use abs. position */
629              do_resize_window (GetParent(hwnd), kmi);              do_resize_window (GetParent (hwnd), kmi);
630              return 0;              return 0;
631          }          }
632      }      }
# Line 688  update_ui_items (HWND hwnd, listview_ctr Line 724  update_ui_items (HWND hwnd, listview_ctr
724      }      }
725    
726      /* Disable all secret-key functions when no secret key is available. */      /* Disable all secret-key functions when no secret key is available. */
727      {      if (!secret_key_available ()) {
728          gpg_keycache_t sec = keycache_get_ctx (0);          enable_button (tb_hwnd, ID_KEYMISC_SIGN, FALSE);
729          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);  
         }  
730      }      }
731  }  }
732    
# Line 1071  refresh_keylist (struct km_info_s *kmi) Line 1104  refresh_keylist (struct km_info_s *kmi)
1104  }  }
1105    
1106    
1107    /* Reload the key cache. */
1108    static void
1109    keycache_reload (HWND dlg)
1110    {      
1111        refresh_cache_s rcs;
1112    
1113        memset (&rcs, 0, sizeof rcs);
1114        rcs.kr_reload = rcs.kr_update = 1;
1115        rcs.tr_update = 0;
1116        DialogBoxParam (glob_hinst, (LPCSTR)IDD_WINPT_KEYCACHE, dlg,                                        
1117                        keycache_dlg_proc, (LPARAM)&rcs);
1118    }
1119    
1120    
1121    /* Check if the secret keyring contains at least one
1122       key with ultimate trust.
1123       Return value: 0 on success. */
1124    int
1125    check_ultimate_trusted_key (gpg_keycache_t _sec)
1126    {
1127        struct keycache_s *n;
1128        int nkeys = 0;
1129    
1130        for (n = _sec->item; n; n = n->next) {
1131            if (n->pubpart &&
1132                n->pubpart->key->owner_trust == GPGME_VALIDITY_ULTIMATE)
1133                return 0;
1134            nkeys++;
1135        }
1136    
1137        /* if we do not have any secret keys, it does not make sense
1138           to return an error. */
1139        if (nkeys == 0)
1140            return 0;
1141        return -1;
1142    }
1143    
1144    
1145  static void  static void
1146  reload_keylist (struct km_info_s *kmi)  reload_keylist (struct km_info_s *kmi)
1147  {  {
# Line 1137  km_gui_import (struct km_info_s *kmi, in Line 1208  km_gui_import (struct km_info_s *kmi, in
1208  }  }
1209    
1210    
1211    /* Copy the requested key information (@what) to the clipboard.
1212       If multiple items were selected, each key info is copied to
1213       the clipboard. The data is separated by \r\n. */
1214    static void
1215    copy_key_info (int what, struct km_info_s *kmi)
1216    {
1217        gpgme_data_t out;
1218        gpgme_key_t key;
1219        struct keycache_s *kci = NULL;
1220        size_t n=0;
1221        char *p, tmp[256];
1222        int i=0, end = listview_count_items (kmi->lv, 0);
1223        bool single = false;
1224    
1225        /* Do not iterate over the entire list if just one item is selected. */
1226        n = listview_count_items (kmi->lv, 1);
1227        if (n == 1) {
1228            i = kmi->lv_idx;
1229            end = i+1;
1230            single = true;
1231        }
1232    
1233        gpgme_data_new (&out);
1234        for (; i < end; i++) {
1235            if (!listview_get_item_state (kmi->lv, i))
1236                continue;
1237            switch (what) {
1238            case ID_KEYCTX_UID_COPY:
1239                key = km_get_key_ptr (kmi->lv, i, &kci);
1240                gpgme_data_write (out, kci->uids->uid, strlen (kci->uids->uid));
1241                if (!single) gpgme_data_write (out, "\r\n", 2);
1242                break;
1243    
1244            case ID_KEYCTX_KEYID_COPY:
1245                key = km_get_key_ptr (kmi->lv, i, NULL);
1246                gpgme_data_write (out, "0x", 2);
1247                gpgme_data_write (out, key->subkeys->keyid+8, 8);
1248                if (!single) gpgme_data_write (out, "\r\n", 2);
1249                break;
1250    
1251            case ID_KEYCTX_FPR_COPY:
1252                key = km_get_key_ptr (kmi->lv, i, NULL);
1253                gpgme_data_write (out, key->subkeys->fpr, strlen (key->subkeys->fpr));
1254                if (!single) gpgme_data_write (out, "\r\n", 2);
1255                break;
1256    
1257            case ID_KEYCTX_KINFO_COPY:
1258                key = km_get_key_ptr (kmi->lv, i, NULL);
1259                key_get_clip_info (key->subkeys->keyid+8, tmp, sizeof (tmp)-1);
1260                gpgme_data_write (out, tmp, strlen (tmp));
1261                if (!single) gpgme_data_write (out, "\r\n", 2);
1262                break;
1263            }
1264        }
1265        gpgme_data_write (out, "\0", 1);
1266        p = gpgme_data_release_and_get_mem (out, &n);
1267        set_clip_text (NULL, p, n);
1268        gpgme_free (p);
1269    }
1270    
1271    
1272  /* Dialog box procedure for the Key Manager. */  /* Dialog box procedure for the Key Manager. */
1273  BOOL CALLBACK  BOOL CALLBACK
1274  keymanager_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)  keymanager_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
1275  {  {
     struct km_info_s *kmi = NULL;  
1276      HWND kl;      HWND kl;
1277      HMENU hm;      HMENU hm;
1278      struct keycache_s *kci;      RECT r;
1279      gpg_keycache_t c;      gpg_keycache_t c;
1280      gpgme_key_t key;      gpgme_key_t key;
1281        km_info_t kmi = NULL;    
1282      struct genkey_s genkey;      struct genkey_s genkey;
1283      struct winpt_key_s k = {0};      struct winpt_key_s k = {0};
1284      struct URL_ctx_s *url;      struct URL_ctx_s *url;
# Line 1156  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1288  keymanager_dlg_proc (HWND dlg, UINT msg,
1288      int l_idx = 0, i=0, rc;      int l_idx = 0, i=0, rc;
1289    
1290      if ((msg != WM_INITDIALOG)      if ((msg != WM_INITDIALOG)
1291          && ((kmi = (struct km_info_s*)GetWindowLong (dlg, GWL_USERDATA)) == NULL))          && ((kmi = (km_info_t)GetWindowLong (dlg, GWL_USERDATA)) == NULL))
1292          return FALSE;          return FALSE;
1293            
1294      /* handle dynamic popup items in the keyserver menu. */      /* handle dynamic popup items in the keyserver menu. */
# Line 1182  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1314  keymanager_dlg_proc (HWND dlg, UINT msg,
1314          SetWindowText (dlg, _("Key Manager"));          SetWindowText (dlg, _("Key Manager"));
1315    
1316          c = keycache_get_ctx (KEYCACHE_PUB);          c = keycache_get_ctx (KEYCACHE_PUB);
         if (!c)  
             BUG (NULL);  
1317          kl = GetDlgItem (dlg, IDC_KEYMISC_KEYLIST);          kl = GetDlgItem (dlg, IDC_KEYMISC_KEYLIST);
1318          kmi->keylist_sortby = KEY_SORT_USERID;          kmi->keylist_sortby = KEY_SORT_USERID;
1319          Header_SetImageList(ListView_GetHeader (kl), glob_imagelist);          Header_SetImageList(ListView_GetHeader (kl), glob_imagelist);
1320          kmi->lv = keylist_load (GetDlgItem (dlg, IDC_KEYMISC_KEYLIST), c,          kmi->lv = keylist_load (GetDlgItem (dlg, IDC_KEYMISC_KEYLIST), c,
1321                                  NULL, KEYLIST_LIST, kmi->keylist_sortby);                                  NULL, KEYLIST_LIST, kmi->keylist_sortby);
1322          if (check_ultimate_trusted_key ()) {          if (check_ultimate_trusted_key (keycache_get_ctx (0))) {
1323              msg_box (dlg, _("No ultimately trusted key found.\n"              msg_box (dlg, _("No ultimately trusted key found.\n"
1324                              "Please set at least one secret key to ultimate trust."),                              "Please set at least one secret key to ultimate trust."),
1325                              _("Key Manager"), MB_WARN);                              _("Key Manager"), MB_WARN);
# Line 1200  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1330  keymanager_dlg_proc (HWND dlg, UINT msg,
1330          keylist_proc.current = (WNDPROC)keylist_subclass_proc;          keylist_proc.current = (WNDPROC)keylist_subclass_proc;
1331          keylist_proc.old = (WNDPROC)GetWindowLong(kl, GWL_WNDPROC);          keylist_proc.old = (WNDPROC)GetWindowLong(kl, GWL_WNDPROC);
1332          if (keylist_proc.old) {          if (keylist_proc.old) {
1333              if( !SetWindowLong (kl, GWL_WNDPROC, (LONG)keylist_proc.current)) {              if (!SetWindowLong (kl, GWL_WNDPROC, (LONG)keylist_proc.current)) {
1334                  msg_box (dlg, _("Could not set keylist window procedure."),                  msg_box (dlg, "Could not set keylist window procedure.",
1335                           _("Key Manager"), MB_ERR);                           _("Key Manager"), MB_ERR);
1336                  BUG (NULL);                  BUG (NULL);
1337              }              }
1338          }          }
1339          kmi->statbar = setup_status_bar (dlg, kmi->lv);          kmi->statbar = setup_status_bar (dlg, kmi->lv);
1340          SetWindowLong (dlg, GWL_USERDATA, (LONG)kmi);          SetWindowLong (dlg, GWL_USERDATA, (LONG)kmi);
1341          kmi->toolbar = load_toolbar (dlg, kmi);          kmi->toolbar = create_toolbar (dlg, kmi);
1342          kmi->dlg = dlg;          kmi->dlg = dlg;
1343    
1344          do_center_window (dlg, kmi);          do_center_window (dlg, kmi);
1345          do_resize_window (dlg, kmi);          do_resize_window (dlg, kmi);
1346            restore_window_size (dlg, kmi);
1347          update_ui_items (dlg, kmi->lv);          update_ui_items (dlg, kmi->lv);
1348          restore_column_info (kmi);          restore_column_info (kmi);
1349          keylist_sort (kmi->lv, kmi->keylist_sortby);          keylist_sort (kmi->lv, kmi->keylist_sortby);
# Line 1243  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1374  keymanager_dlg_proc (HWND dlg, UINT msg,
1374          set_reg_entry (HKEY_CURRENT_USER, "Software\\WinPT", "KM_Pos_X", type);          set_reg_entry (HKEY_CURRENT_USER, "Software\\WinPT", "KM_Pos_X", type);
1375          ltoa (kmi->pos_y, type, 10);          ltoa (kmi->pos_y, type, 10);
1376          set_reg_entry (HKEY_CURRENT_USER, "Software\\WinPT", "KM_Pos_Y", type);          set_reg_entry (HKEY_CURRENT_USER, "Software\\WinPT", "KM_Pos_Y", type);
1377          /* XXX: store window size. */  
1378                    GetWindowRect (dlg, &r);
1379            sprintf (type, "%d", (int)(r.bottom-r.top));
1380            set_reg_entry (HKEY_CURRENT_USER, "Software\\WinPT", "KM_Size_Width",
1381                               type);
1382            sprintf (type, "%d", (int)(r.right-r.left));
1383            set_reg_entry (HKEY_CURRENT_USER, "Software\\WinPT", "KM_Size_Height",
1384                            type);
1385    
1386          /* Remove runtime information. This should be the last action taken here. */          /* Remove runtime information. This should be the last action taken here. */
1387          delete kmi;          delete kmi;
1388          kmi = NULL;          kmi = NULL;
# Line 1252  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1390  keymanager_dlg_proc (HWND dlg, UINT msg,
1390          return FALSE;          return FALSE;
1391    
1392      case WM_MOVE:      case WM_MOVE:
         RECT r;  
1393          GetWindowRect (dlg, &r);          GetWindowRect (dlg, &r);
1394          kmi->pos_x = r.left;          kmi->pos_x = r.left;
1395          kmi->pos_y = r.top;              kmi->pos_y = r.top;    
# Line 1370  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1507  keymanager_dlg_proc (HWND dlg, UINT msg,
1507              break;              break;
1508    
1509          case NM_RCLICK:          case NM_RCLICK:
1510                if (!wait_for_progress_cb (0))
1511                    break;
1512              if (notify->idFrom == IDC_KEYMISC_KEYLIST) {              if (notify->idFrom == IDC_KEYMISC_KEYLIST) {
1513                  l_idx =listview_get_curr_pos (kmi->lv);                  l_idx =listview_get_curr_pos (kmi->lv);
1514                  if (l_idx == -1)                  if (l_idx == -1)
# Line 1411  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1550  keymanager_dlg_proc (HWND dlg, UINT msg,
1550                      set_menu_state (popup, ID_KEYCTX_PASTE, MF_DISABLED|MF_GRAYED);                      set_menu_state (popup, ID_KEYCTX_PASTE, MF_DISABLED|MF_GRAYED);
1551                  if (mapi_init ())                  if (mapi_init ())
1552                      set_menu_state (popup, ID_KEYCTX_SENDMAIL, MF_DISABLED|MF_GRAYED);                      set_menu_state (popup, ID_KEYCTX_SENDMAIL, MF_DISABLED|MF_GRAYED);
1553                    if (!secret_key_available ())
1554                        set_menu_state (popup, ID_KEYCTX_SIGN, MF_DISABLED|MF_GRAYED);
1555    
1556                  /* Override 'Default Keyserver' with the actual name. */                  /* Override 'Default Keyserver' with the actual name. */
1557                  host = kserver_get_hostname (0, -1, &port);                  host = kserver_get_hostname (0, -1, &port);
# Line 1436  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1577  keymanager_dlg_proc (HWND dlg, UINT msg,
1577              if (notify->idFrom == IDC_KEYMISC_KEYLIST) {              if (notify->idFrom == IDC_KEYMISC_KEYLIST) {
1578                  NMLISTVIEW *nft = (LPNMLISTVIEW) lparam;                  NMLISTVIEW *nft = (LPNMLISTVIEW) lparam;
1579                  int sortby = 0;                  int sortby = 0;
1580    
1581                    if (!wait_for_progress_cb (0))
1582                        break;
1583                  switch (nft->iSubItem) {                  switch (nft->iSubItem) {
1584                  case 0:  sortby = KEY_SORT_USERID; break;                  case 0:  sortby = KEY_SORT_USERID; break;
1585                  case 1:  sortby = KEY_SORT_KEYID; break;                  case 1:  sortby = KEY_SORT_KEYID; break;
# Line 1445  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1589  keymanager_dlg_proc (HWND dlg, UINT msg,
1589                  case 6:  sortby = KEY_SORT_OTRUST; break;                  case 6:  sortby = KEY_SORT_OTRUST; break;
1590                  case 7:  sortby = KEY_SORT_CREATED; break;                  case 7:  sortby = KEY_SORT_CREATED; break;
1591                  case 8:  sortby = KEY_SORT_ALGO; break;                  case 8:  sortby = KEY_SORT_ALGO; break;
1592                  default: return TRUE; //sortby = KEY_SORT_USERID; break;                  default: return TRUE; /*sortby userid.*/
1593                  }                  }
1594    
1595                  if ((kmi->keylist_sortby & ~KEYLIST_SORT_DESC) == sortby)                  if ((kmi->keylist_sortby & ~KEYLIST_SORT_DESC) == sortby)
# Line 1500  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1644  keymanager_dlg_proc (HWND dlg, UINT msg,
1644              return FALSE;              return FALSE;
1645          }          }
1646    
1647            /*wait_for_progress_cb ();*/
1648          switch (LOWORD (wparam)) {          switch (LOWORD (wparam)) {
1649          case ID_KEYMISC_QUIT:          case ID_KEYMISC_QUIT:
1650              EndDialog (dlg, TRUE);              EndDialog (dlg, TRUE);
# Line 1565  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1710  keymanager_dlg_proc (HWND dlg, UINT msg,
1710                  return TRUE;                  return TRUE;
1711              }              }
1712              km_get_key (kmi->lv, kmi->lv_idx, &k);              km_get_key (kmi->lv, kmi->lv_idx, &k);
             if (!k.key_pair) {  
                 msg_box (dlg, _("It does not make any sense with a key pair!"),  
                          _("Key Manager"), MB_ERR);  
                 return TRUE;  
             }  
1713              dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_KEYTRUST, dlg,              dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_KEYTRUST, dlg,
1714                                keytrust_dlg_proc, (LPARAM)&k,                                keytrust_dlg_proc, (LPARAM)&k,
1715                                _("List Trust Path"), IDS_WINPT_KEYTRUST);                                _("List Trust Path"), IDS_WINPT_KEYTRUST);
# Line 1586  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1726  keymanager_dlg_proc (HWND dlg, UINT msg,
1726                                _("Key Signature List"), IDS_WINPT_KEYSIG);                                _("Key Signature List"), IDS_WINPT_KEYSIG);
1727              if (k.update)              if (k.update)
1728                  update_key (kmi->lv, kmi->lv_idx, k.tmp_keyid, 0);                  update_key (kmi->lv, kmi->lv_idx, k.tmp_keyid, 0);
1729                if (updated_keys_avail ())
1730                    refresh_keylist (kmi);
1731              return TRUE;              return TRUE;
1732                            
1733          case ID_KEYMISC_PROPS:                case ID_KEYMISC_PROPS:      
# Line 1800  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1942  keymanager_dlg_proc (HWND dlg, UINT msg,
1942                           _("Key Manager"), MB_INFO);                           _("Key Manager"), MB_INFO);
1943                  listview_select_all (kmi->lv);                  listview_select_all (kmi->lv);
1944              }              }
1945              km_refresh_from_keyserver (kmi->lv, dlg);              if (!km_refresh_from_keyserver (kmi->lv, dlg))
1946              msg_box (dlg, _("Keyserver refresh finished."),                  msg_box (dlg, _("Keyserver refresh finished."),
1947                       _("Key Manager"), MB_OK);                           _("Key Manager"), MB_OK);
1948              break;              break;
1949                                                    
1950          /** Context menu **/          /** Context menu **/
# Line 1874  keymanager_dlg_proc (HWND dlg, UINT msg, Line 2016  keymanager_dlg_proc (HWND dlg, UINT msg,
2016              break;              break;
2017    
2018          case ID_KEYCTX_UID_COPY:          case ID_KEYCTX_UID_COPY:
             /* XXX: add generic function to support multiple selection  
                     with a callback */  
             key = km_get_key_ptr (kmi->lv, kmi->lv_idx, &kci);  
             name = kci->uids->name;  
             set_clip_text (NULL, name, strlen (name));  
             break;  
   
2019          case ID_KEYCTX_KEYID_COPY:          case ID_KEYCTX_KEYID_COPY:
             key = km_get_key_ptr (kmi->lv, kmi->lv_idx, NULL);  
             memset (type, 0, sizeof (type));  
             type[0] = '0'; type[1] = 'x';  
             memcpy (type+2, key->subkeys->keyid+8, 8);  
             set_clip_text (NULL, type, strlen (type));  
             break;  
   
2020          case ID_KEYCTX_FPR_COPY:          case ID_KEYCTX_FPR_COPY:
             key = km_get_key_ptr (kmi->lv, kmi->lv_idx, NULL);  
             t = key->subkeys->fpr;  
             set_clip_text (NULL, t? t : "", t? strlen (t): 0);  
             break;  
   
2021          case ID_KEYCTX_KINFO_COPY:          case ID_KEYCTX_KINFO_COPY:
2022              key = km_get_key_ptr (kmi->lv, kmi->lv_idx, NULL);              copy_key_info (LOWORD (wparam), kmi);
             km_set_clip_info (key->subkeys->keyid+8);  
2023              break;              break;
2024    
2025          case ID_KEYCTX_COPY:          case ID_KEYCTX_COPY:
# Line 1958  keymanager_dlg_proc (HWND dlg, UINT msg, Line 2080  keymanager_dlg_proc (HWND dlg, UINT msg,
2080          case ID_GROUP_SHOW:          case ID_GROUP_SHOW:
2081              /* XXX: Implement group manager. */              /* XXX: Implement group manager. */
2082              return TRUE;              return TRUE;
   
         case IDCANCEL:  
             EndDialog (dlg, TRUE);  
             return TRUE;  
2083          }          }
2084                    
2085          break;          break;

Legend:
Removed from v.211  
changed lines
  Added in v.244

[email protected]
ViewVC Help
Powered by ViewVC 1.1.26