/[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 133 by twoaday, Mon Jan 9 09:15:29 2006 UTC revision 144 by twoaday, Thu Jan 12 16:28:06 2006 UTC
# Line 155  keylist_subclass_proc (HWND dlg, UINT ms Line 155  keylist_subclass_proc (HWND dlg, UINT ms
155  }  }
156    
157    
158    #define ico2idx(ico) imagelist_getindex((ico))
159    
160  static HWND  static HWND
161  load_toolbar (HWND dlg, struct km_info_s *kmi)  load_toolbar (HWND dlg, struct km_info_s *kmi)
162  {  {
163      HWND tbwnd;      HWND tbwnd;
164      TBSAVEPARAMS tbsp;      TBSAVEPARAMS tbsp;
165      TBBUTTON tb_buttons[] = {      TBBUTTON tb_buttons[] = {
166          /*{imagelist_getindex(IMI_EXIT),       ID_KEYMISC_QUIT,   TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0L, 0},*/          {ico2idx (IMI_KEY_NEW),    ID_KEYMISC_KEYWIZARD, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L},
167          {imagelist_getindex(IMI_KEY_DELETE), ID_KEYMISC_DELETE, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},          {ico2idx (IMI_KEY_DELETE), ID_KEYMISC_DELETE, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},
168          {imagelist_getindex(IMI_KEY_PROPS),  ID_KEYMISC_PROPS,  TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},          {ico2idx (IMI_KEY_PROPS),  ID_KEYMISC_PROPS,  TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},
169          {imagelist_getindex(IMI_KEY_SIGN),   ID_KEYMISC_SIGN,   TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},          {ico2idx (IMI_KEY_SIGN),   ID_KEYMISC_SIGN,   TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},
170            {ico2idx (IMI_KEY_SEARCH), ID_KEYMISC_SENDRECV, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},
171          {0,                                  0,                 0,               TBSTYLE_SEP,    {0}, 0L, 0},          {0,                                  0,                 0,               TBSTYLE_SEP,    {0}, 0L, 0},
172          {imagelist_getindex(IMI_KEY_IMPORT), ID_KEYMISC_IMPORT, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},          {ico2idx (IMI_KEY_FILE_IMPORT), ID_KEYMISC_IMPORT, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},
173          {imagelist_getindex(IMI_KEY_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},
174            {ico2idx (IMI_KEY_IMPORT), ID_KEYCTX_PASTE, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},
175            {ico2idx (IMI_KEY_EXPORT), ID_KEYCTX_COPY, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},
176       };       };
177            
178      tbwnd = CreateWindowEx (0, TOOLBARCLASSNAME, NULL,      tbwnd = CreateWindowEx (0, TOOLBARCLASSNAME, NULL,
# Line 663  update_ui_items (HWND hwnd, listview_ctr Line 668  update_ui_items (HWND hwnd, listview_ctr
668      enable_button (tb_hwnd, ID_KEYMISC_PROPS, key_selected);      enable_button (tb_hwnd, ID_KEYMISC_PROPS, key_selected);
669      enable_button (tb_hwnd, ID_KEYMISC_SIGN, key_selected && !key_inv);      enable_button (tb_hwnd, ID_KEYMISC_SIGN, key_selected && !key_inv);
670      enable_button (tb_hwnd, ID_KEYMISC_EXPORT, key_selected);      enable_button (tb_hwnd, ID_KEYMISC_EXPORT, key_selected);
671        enable_button (tb_hwnd, ID_KEYCTX_COPY, key_selected);
672    
673      /* Enable / disable menu items */      /* Enable / disable menu items */
674      state = key_selected? MF_ENABLED : MF_DISABLED|MF_GRAYED;      state = key_selected? MF_ENABLED : MF_DISABLED|MF_GRAYED;
# Line 1138  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1144  keymanager_dlg_proc (HWND dlg, UINT msg,
1144              LPTBNOTIFY lpTbNotify;              LPTBNOTIFY lpTbNotify;
1145              lpTbNotify = (LPTBNOTIFY)lparam;              lpTbNotify = (LPTBNOTIFY)lparam;
1146              if (lpTbNotify->iItem < (sizeof(myb) / sizeof(mybuttons))) {              if (lpTbNotify->iItem < (sizeof(myb) / sizeof(mybuttons))) {
1147                  lpTbNotify->tbButton.iBitmap = imagelist_getindex(myb[lpTbNotify->iItem].icon);                  lpTbNotify->tbButton.iBitmap = imagelist_getindex (myb[lpTbNotify->iItem].icon);
1148                  lpTbNotify->tbButton.idCommand = myb[lpTbNotify->iItem].command;                  lpTbNotify->tbButton.idCommand = myb[lpTbNotify->iItem].command;
1149                  lpTbNotify->tbButton.fsState = TBSTATE_ENABLED;                  lpTbNotify->tbButton.fsState = TBSTATE_ENABLED;
1150                  lpTbNotify->tbButton.fsStyle = TBSTYLE_BUTTON;                  lpTbNotify->tbButton.fsStyle = TBSTYLE_BUTTON;
# Line 1177  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1183  keymanager_dlg_proc (HWND dlg, UINT msg,
1183    
1184              lpttt->hinst = NULL;              lpttt->hinst = NULL;
1185              switch (lpttt->hdr.idFrom) {              switch (lpttt->hdr.idFrom) {
1186                case ID_KEYMISC_KEYWIZARD:
1187                    lpttt->lpszText = (char*)_("Generate new key pair");
1188                    break;
1189    
1190                case ID_KEYMISC_SENDRECV:
1191                    lpttt->lpszText = (char*)_("Search for a specific key");
1192                    break;
1193    
1194              case ID_KEYMISC_DELETE:              case ID_KEYMISC_DELETE:
1195                  lpttt->lpszText = (char *)_("Delete key from keyring");                  lpttt->lpszText = (char *)_("Delete key from keyring");
1196                  break;                  break;
# Line 1189  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1203  keymanager_dlg_proc (HWND dlg, UINT msg,
1203                  lpttt->lpszText = (char *)_("Sign key");                  lpttt->lpszText = (char *)_("Sign key");
1204                  break;                  break;
1205    
1206                case ID_KEYCTX_COPY:
1207                    lpttt->lpszText = (char *)_("Copy key to clipboard");
1208                    break;
1209    
1210                case ID_KEYCTX_PASTE:
1211                    lpttt->lpszText = (char*)_("Paste key from clipboard");
1212                    break;
1213    
1214              case ID_KEYMISC_IMPORT:              case ID_KEYMISC_IMPORT:
1215                  lpttt->lpszText = (char *)_("Import key to keyring");                  lpttt->lpszText = (char *)_("Import key to keyring");
1216                  break;                  break;
# Line 1462  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1484  keymanager_dlg_proc (HWND dlg, UINT msg,
1484          case ID_KEYMISC_RECACHE:          case ID_KEYMISC_RECACHE:
1485              /* If there is already a reload request,              /* If there is already a reload request,
1486                  don't bother the user with a message. */                  don't bother the user with a message. */
1487              if (keycache_get_reload() == 1)              if (keycache_get_reload () == 1)
1488                  l_idx = IDYES;                  l_idx = IDYES;
1489              else {              else {
1490                  char inf[256];                  char inf[256];
# Line 1790  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1812  keymanager_dlg_proc (HWND dlg, UINT msg,
1812              km_send_to_keyserver (kmi->lv, dlg, host, port);              km_send_to_keyserver (kmi->lv, dlg, host, port);
1813              break;              break;
1814    
1815          case ID_KEYCTX_RECVFROM:          case ID_KEYCTX_RECVFROM:
1816              km_refresh_from_keyserver (kmi->lv, dlg);              km_refresh_from_keyserver (kmi->lv, dlg);
1817              break;              break;
1818    
# Line 1811  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1833  keymanager_dlg_proc (HWND dlg, UINT msg,
1833    
1834          case ID_KEYCTX_FPR_COPY:          case ID_KEYCTX_FPR_COPY:
1835              key = (gpgme_key_t) listview_get_item2 (kmi->lv, kmi->lv_idx);              key = (gpgme_key_t) listview_get_item2 (kmi->lv, kmi->lv_idx);
             //t = get_key_fpr (key);  
1836              t = key->subkeys->fpr;              t = key->subkeys->fpr;
1837              set_clip_text (NULL, t? t : "", t? strlen (t): 0);              set_clip_text (NULL, t? t : "", t? strlen (t): 0);
1838              break;              break;
Legend:
Removed from v.133  
changed lines
  Added in v.144
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26