[Winpt-commits] r88 - in trunk: . Src
scm-commit at wald.intevation.org
scm-commit at wald.intevation.org
Mon Nov 21 13:07:01 CET 2005
Author: twoaday
Date: 2005-11-21 13:06:59 +0100 (Mon, 21 Nov 2005)
New Revision: 88
Modified:
trunk/Src/ChangeLog
trunk/Src/WinPT-en.rc
trunk/Src/resource.h
trunk/Src/wptClipEditDlg.cpp
trunk/Src/wptFileManager.cpp
trunk/Src/wptFileManagerDlg.cpp
trunk/Src/wptGPGPrefsDlg.cpp
trunk/Src/wptKeyEditDlgs.cpp
trunk/Src/wptKeyRevokersDlg.cpp
trunk/Src/wptKeygenDlg.cpp
trunk/Src/wptKeylist.cpp
trunk/Src/wptKeysigDlg.cpp
trunk/Src/wptKeysignDlg.cpp
trunk/Src/wptPreferencesDlg.cpp
trunk/configure.ac
Log:
2005-11-21 Timo Schulz <ts at g10code.com>
* WinPT.cpp (WinMain): Implement --stop switch.
* wptClipEditDlg.cpp (clip_edit_dlg_proc): Localize
missing string.
* wptPreferencesDlg.cpp (prefs_dlg_proc): Likewise.
* wptKeygenDlg.cpp (keygen_dlg_proc): Verify valid context
first. Thanks to Ralf.
* wptFileManagerDlg.cpp (update_ui_items): New.
* wptFileManager.cpp (fm_set_status): New sigmode param.
Changed all callers.
Modified: trunk/Src/ChangeLog
===================================================================
--- trunk/Src/ChangeLog 2005-11-21 11:44:25 UTC (rev 87)
+++ trunk/Src/ChangeLog 2005-11-21 12:06:59 UTC (rev 88)
@@ -1,6 +1,14 @@
2005-11-21 Timo Schulz <ts at g10code.com>
* WinPT.cpp (WinMain): Implement --stop switch.
+ * wptClipEditDlg.cpp (clip_edit_dlg_proc): Localize
+ missing string.
+ * wptPreferencesDlg.cpp (prefs_dlg_proc): Likewise.
+ * wptKeygenDlg.cpp (keygen_dlg_proc): Verify valid context
+ first. Thanks to Ralf.
+ * wptFileManagerDlg.cpp (update_ui_items): New.
+ * wptFileManager.cpp (fm_set_status): New sigmode param.
+ Changed all callers.
2005-11-17 Timo Schulz <ts at g10code.com>
Modified: trunk/Src/WinPT-en.rc
===================================================================
--- trunk/Src/WinPT-en.rc 2005-11-21 11:44:25 UTC (rev 87)
+++ trunk/Src/WinPT-en.rc 2005-11-21 12:06:59 UTC (rev 88)
@@ -317,7 +317,7 @@
ES_WANTRETURN | WS_BORDER | WS_VSCROLL | WS_TABSTOP,6,6,
319,208
CONTROL "Add quotes",IDC_CLIPEDIT_QUOTE,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,7,216,56,10
+ WS_TABSTOP,7,216,66,10
PUSHBUTTON "&Copy",IDC_CLIPEDIT_SEND,100,217,42,15
PUSHBUTTON "Clea&r",IDC_CLIPEDIT_CLEAR,144,217,42,15
PUSHBUTTON "&Save",IDC_CLIPEDIT_SAVE,187,217,42,15
@@ -513,7 +513,7 @@
LTEXT "Passphrase",IDC_KEYSIGN_PWDINF,5,153,44,8
EDITTEXT IDC_KEYSIGN_PASSPHRASE,53,151,144,13,ES_PASSWORD |
ES_AUTOHSCROLL
- PUSHBUTTON "&Show photo",IDC_KEYSIGN_SHOWIMG,2,173,57,14,
+ PUSHBUTTON "&Show photo",IDC_KEYSIGN_SHOWIMG,2,173,67,14,
WS_DISABLED
DEFPUSHBUTTON "&OK",IDOK,174,173,50,14
PUSHBUTTON "&Cancel",IDCANCEL,227,172,54,15
@@ -540,7 +540,8 @@
LTEXT "Locale directory (to access the translation files)",
IDC_GPGPREFS_LOCALINF,12,111,148,8
EDITTEXT IDC_GPGPREFS_LOCALE,12,122,195,12,ES_AUTOHSCROLL
- GROUPBOX "General GPG options",IDC_STATIC,5,142,210,74
+ GROUPBOX "General GPG options",IDC_GPGPREFS_ALLOPTINF,5,142,210,
+ 74
CONTROL "Ask for the signature class during key sign",
IDC_GPGPREFS_ASKLEVEL,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,11,156,166,10
@@ -660,7 +661,7 @@
EDITTEXT IDC_PREFS_CACHETIME,124,7,25,13
LTEXT "(CTRL+ALT+F to clear the cache)",IDC_PREFS_CACHEHINT,
151,9,108,8
- GROUPBOX "General options",IDC_STATIC,8,23,245,113
+ GROUPBOX "General options",IDC_PREFS_ALLOPTINF,8,23,245,113
LTEXT "Word wrap cleartext &signatures at column",
IDC_PREFS_WWINFO,13,34,139,8
EDITTEXT IDC_PREFS_WORDWRAP,156,32,14,13
@@ -681,7 +682,7 @@
LTEXT "Keyserver &config",IDC_PREFS_KSINF,13,119,76,8
EDITTEXT IDC_PREFS_KSERVER,100,119,124,12,ES_AUTOHSCROLL
PUSHBUTTON "...",IDC_PREFS_KSELFILE,225,119,22,12
- GROUPBOX "Clipboard hotkey management",IDC_STATIC,8,137,112,70
+ GROUPBOX "Clipboard hotkeys",IDC_PREFS_CLIPINF,8,137,112,70
LTEXT "Encrypt CTRL+ALT+",IDC_STATIC,13,152,67,8
EDITTEXT IDC_PREFS_CLIP_ENCRYPT,83,150,10,12
LTEXT "Decrypt/verify CTRL+ALT+",IDC_STATIC,13,164,88,8
@@ -690,8 +691,8 @@
EDITTEXT IDC_PREFS_CLIP_SIGNENC,73,175,9,12
LTEXT "Sign && Encrypt CTRL+ALT+",IDC_STATIC,13,191,89,8
EDITTEXT IDC_PREFS_CLIP_SIGN,103,189,9,13
- GROUPBOX "Current window hotkey management",IDC_STATIC,127,137,
- 127,70
+ GROUPBOX "Current window hotkeys",IDC_PREFS_CURRINF,127,137,127,
+ 70
LTEXT "Encrypt ALT+SHIFT+",IDC_STATIC,134,152,69,8
EDITTEXT IDC_PREFS_CWS_ENCRYPT,210,150,9,12
LTEXT "Decrypt/verify ALT+SHIFT+",IDC_STATIC,134,165,90,8
@@ -994,18 +995,18 @@
GROUPBOX "",IDC_STATIC,8,81,122,38
END
-IDD_WINPT_FIRST DIALOG DISCARDABLE 0, 0, 175, 63
+IDD_WINPT_FIRST DIALOG DISCARDABLE 0, 0, 195, 63
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION
CAPTION "WinPT - First start"
FONT 8, "MS Sans Serif"
BEGIN
- GROUPBOX "",IDC_STATIC,6,2,163,34
+ GROUPBOX "",IDC_STATIC,6,2,185,34
CONTROL "&Generate a GnuPG key pair",IDC_FIRST_KEYGEN,"Button",
- BS_AUTORADIOBUTTON,8,9,119,10
+ BS_AUTORADIOBUTTON,8,9,149,10
CONTROL "&Copy GnuPG keyrings from another location",
- IDC_FIRST_IMPORT,"Button",BS_AUTORADIOBUTTON,8,22,153,10
- DEFPUSHBUTTON "&OK",IDOK,69,44,50,14
- PUSHBUTTON "&Cancel",IDCANCEL,121,44,50,14
+ IDC_FIRST_IMPORT,"Button",BS_AUTORADIOBUTTON,8,22,176,10
+ DEFPUSHBUTTON "&OK",IDOK,90,43,50,14
+ PUSHBUTTON "&Cancel",IDCANCEL,142,43,50,14
END
IDD_WINPT_SIGCLASS DIALOG DISCARDABLE 0, 0, 238, 98
@@ -1035,7 +1036,7 @@
DEFPUSHBUTTON "&OK",IDOK,89,87,52,14
CONTROL "List1",IDC_KEYREVOKERS_LIST,"SysListView32",LVS_REPORT |
LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,15,17,200,60
- GROUPBOX "Designated Revoker Keys",IDC_STATIC,9,5,209,79
+ GROUPBOX "Designated Revoker Keys",IDC_KEYREVOKERS_INF,9,5,209,79
END
IDD_WINPT_FILES_SECDEL DIALOG DISCARDABLE 0, 0, 233, 135
@@ -1739,7 +1740,7 @@
IDD_WINPT_FIRST, DIALOG
BEGIN
LEFTMARGIN, 2
- RIGHTMARGIN, 172
+ RIGHTMARGIN, 192
TOPMARGIN, 2
BOTTOMMARGIN, 58
END
@@ -2066,7 +2067,7 @@
MENUITEM SEPARATOR
MENUITEM "&Select All", ID_FILEMISC_SELALL
MENUITEM SEPARATOR
- MENUITEM "&Preferences", ID_FILEMISC_PREFS
+ MENUITEM "&Preferences", ID_FILEMISC_PREFS, GRAYED
END
POPUP "&View"
BEGIN
Modified: trunk/Src/resource.h
===================================================================
--- trunk/Src/resource.h 2005-11-21 11:44:25 UTC (rev 87)
+++ trunk/Src/resource.h 2005-11-21 12:06:59 UTC (rev 88)
@@ -588,6 +588,11 @@
#define IDC_SIGPROPS_CLASSINF 1474
#define IDC_SIGPROPS_KEYINF 1475
#define IDC_SIGPROPS_KEYIDINF 1476
+#define IDC_GPGPREFS_ALLOPTINF 1477
+#define IDC_PREFS_ALLOPTINF 1478
+#define IDC_PREFS_CLIPINF 1479
+#define IDC_PREFS_CURRINF 1480
+#define IDC_KEYREVOKERS_INF 1481
#define ID_GPG_ENCRYPT 40003
#define ID_GPG_DECRYPT 40004
#define ID_GPG_SIGN 40005
@@ -758,7 +763,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 230
#define _APS_NEXT_COMMAND_VALUE 40176
-#define _APS_NEXT_CONTROL_VALUE 1477
+#define _APS_NEXT_CONTROL_VALUE 1482
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
Modified: trunk/Src/wptClipEditDlg.cpp
===================================================================
--- trunk/Src/wptClipEditDlg.cpp 2005-11-21 11:44:25 UTC (rev 87)
+++ trunk/Src/wptClipEditDlg.cpp 2005-11-21 12:06:59 UTC (rev 88)
@@ -181,7 +181,8 @@
SetDlgItemText (dlg, IDC_CLIPEDIT_CLEAR, _("Clea&r"));
SetDlgItemText (dlg, IDC_CLIPEDIT_LOAD, _("&Load"));
SetDlgItemText (dlg, IDC_CLIPEDIT_SAVE, _("&Save"));
-
+ SetDlgItemText (dlg, IDC_CLIPEDIT_QUOTE, _("Add quotes"));
+
load_clipboard (dlg);
center_window (dlg, NULL);
SetForegroundWindow (dlg);
Modified: trunk/Src/wptFileManager.cpp
===================================================================
--- trunk/Src/wptFileManager.cpp 2005-11-21 11:44:25 UTC (rev 87)
+++ trunk/Src/wptFileManager.cpp 2005-11-21 12:06:59 UTC (rev 88)
@@ -21,7 +21,6 @@
/* TODO:
* check_armor_type: we should check the whole file and not only the first line!
*/
-
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
@@ -282,6 +281,9 @@
const char *s = NULL;
int rc = 0;
+ /* XXX: if the text was created with gpg --sign and armored
+ there is no way to differ between an encrypted text
+ and a one-pass signature. */
if (r_type)
*r_type = PGP_NONE;
if (!fname) {
@@ -337,7 +339,7 @@
s = "SECKEY"; rc = -2;
if (r_type) *r_type = PGP_SECKEY;
break;
-
+
default:
break;
}
@@ -730,30 +732,37 @@
} /* fm_check_file_type */
+/* Set the file status of the given command @fm_cmd.
+ @success is 0 on success. */
static void
-fm_set_status (listview_ctrl_t lv, int pos, int fm_cmd, int success,
- const char * output)
+fm_set_status (listview_ctrl_t lv, int pos, int fm_cmd,
+ gpgme_sig_mode_t sigmode, int success, const char *output)
{
char status[128], operat[128];
int update = 1;
const char *s;
- if ( fm_cmd == FM_LIST )
+ if (fm_cmd == FM_LIST)
return;
success ? s = "SUCCESS" : s = "FAILED";
- strcpy( operat, s );
+ strcpy (operat, s);
switch (fm_cmd) {
case FM_ENCRYPT:
case FM_ENCRYPT_DIR:
- case FM_SIGNENCRYPT: strcpy( status, "ENCRYPTED" ); break;
- case FM_DECRYPT: strcpy( status, "UNKNOWN" ); break;
- case FM_SIGN: strcpy( status, "SIGNED" ); break;
+ case FM_SIGNENCRYPT: strcpy (status, "ENCRYPTED"); break;
+ case FM_DECRYPT: strcpy (status, "UNKNOWN"); break;
+ case FM_SIGN:
+ if (sigmode == GPGME_SIG_MODE_DETACH)
+ strcpy (status, "SIGNED-DETACH");
+ else
+ strcpy (status, "SIGNED");
+ break;
case FM_VERIFY: update = 0; break;
- case FM_SYMENC: strcpy( status, "SYMKEYENC" ); break;
+ case FM_SYMENC: strcpy (status, "SYMKEYENC"); break;
case FM_IMPORT: update = 0; break;
- case FM_WIPE: strcpy( status, "WIPED" ); break;
- default: strcpy( status, "UNKNOWN"); break;
+ case FM_WIPE: strcpy (status, "WIPED"); break;
+ default: strcpy (status, "UNKNOWN"); break;
}
if (success) {
@@ -763,7 +772,7 @@
}
}
listview_add_sub_item( lv, pos, 2, operat );
-} /* fm_set_status */
+}
int
@@ -935,7 +944,7 @@
rc = fm_import (ctx, fname);
break;
}
- fm_set_status (lv, i, fm_cmd, !rc, ctx->output);
+ fm_set_status (lv, i, fm_cmd, ctx->sigmode, !rc, ctx->output);
free_if_alloc (ctx->output);
progress_cleanup (&pfx);
}
@@ -1650,7 +1659,7 @@
gpgme_error_t err;
gpgme_key_t *rset = c->recp;
file_data_t keydata = NULL;
- const char *name;
+ const char *name, *s = NULL;
char *p = NULL, *patt = NULL;
if (!rset || !rset[0]) {
@@ -1759,7 +1768,7 @@
fm_verify (ctx, detached, fn);
file_verify_wait ();
break;
-
+
default:
break;
}
@@ -1825,7 +1834,7 @@
return rc;
out_enc = make_filename (NULL, outfile, "gpg");
- fm_set_status (lv, idx, FM_ENCRYPT, 1, out_enc);
+ fm_set_status (lv, idx, FM_ENCRYPT, (gpgme_sig_mode_t)0, 1, out_enc);
free_if_alloc (out_enc);
for (i=0; i < nitems; i++) {
Modified: trunk/Src/wptFileManagerDlg.cpp
===================================================================
--- trunk/Src/wptFileManagerDlg.cpp 2005-11-21 11:44:25 UTC (rev 87)
+++ trunk/Src/wptFileManagerDlg.cpp 2005-11-21 12:06:59 UTC (rev 88)
@@ -265,13 +265,11 @@
c = (fm_state_s *)lparam;
if( c == NULL )
dlg_fatal_error( dlg, "Could not get dialog state!" );
- #ifndef LANG_DE
SetWindowText (dlg, _("File Sign"));
SetDlgItemText (dlg, IDC_FILE_SIG_ARMOR, _("&Text Output") );
SetDlgItemText (dlg, IDC_FILE_SIG_NORMAL, _("&Normal Signature"));
SetDlgItemText (dlg, IDC_FILE_SIG_DETACH, _("&Detached Signature"));
SetDlgItemText (dlg, IDC_FILE_SIG_CLEAR, _("&Cleartext Signature"));
- #endif
CheckDlgButton (dlg, IDC_FILE_SIG_DETACH, BST_CHECKED);
kc = keycache_get_ctx (KEYCACHE_PUB);
if (!kc)
@@ -407,6 +405,34 @@
}
+/* Enable or disabled menu entries from the dialog window @hwnd.
+ @lv is used to find out the state of the selected file entry. */
+static void
+update_ui_items (HWND hwnd, listview_ctrl_t lv)
+{
+ HMENU hm;
+ int pos;
+
+ hm = GetMenu (hwnd);
+
+ pos = listview_get_curr_pos (lv);
+ if (fm_check_file_type (lv, pos, FM_ENCRYPT)) {
+ set_menu_state (hm, ID_FILEMISC_DECRYPT, MF_GRAYED|MF_DISABLED);
+ set_menu_state (hm, ID_FILECTX_VERIFY, MF_GRAYED|MF_DISABLED);
+ }
+ if (fm_check_file_type (lv, pos, FM_DECRYPT)) {
+ set_menu_state (hm, ID_FILEMISC_ENCRYPT, MF_GRAYED|MF_DISABLED);
+ set_menu_state (hm, ID_FILEMISC_SIGN, MF_GRAYED|MF_DISABLED);
+ set_menu_state (hm, ID_FILEMISC_SIGNENC, MF_GRAYED|MF_DISABLED);
+ }
+ if (fm_check_file_type (lv, pos, FM_VERIFY)) {
+ set_menu_state (hm, ID_FILEMISC_VERIFY, MF_ENABLED);
+ set_menu_state (hm, ID_FILEMISC_SIGN, MF_GRAYED|MF_DISABLED);
+ set_menu_state (hm, ID_FILEMISC_SIGNENC, MF_GRAYED|MF_DISABLED);
+ }
+}
+
+
BOOL CALLBACK
file_manager_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
{
@@ -428,6 +454,7 @@
set_menu_text_bypos (menu, 2, _("View"));
set_menu_text (menu, ID_FILEMISC_OPEN, _("&Open...") );
set_menu_text (menu, ID_FILEMISC_ENCRYPT, _("&Encrypt") );
+ set_menu_text (menu, ID_FILEMISC_ENCRYPT_ZIP, _("Encrypt into ZIP"));
set_menu_text (menu, ID_FILEMISC_DECRYPT, _("&Decrypt") );
set_menu_text (menu, ID_FILEMISC_SIGN, _("&Sign") );
set_menu_text (menu, ID_FILEMISC_SIGNENC, _("Sign && Encrypt") );
@@ -500,6 +527,7 @@
GetCursorPos (&p);
hm = LoadMenu (glob_hinst, MAKEINTRESOURCE (IDR_WINPT_FILEMISC_CTX));
popup = GetSubMenu (hm, 0);
+ set_menu_text (popup, ID_FILECTX_ENCRYPT_ZIP, _("Encrypt into ZIP"));
set_menu_text (popup, ID_FILECTX_ENCRYPT, _("Encrypt"));
set_menu_text (popup, ID_FILECTX_DECRYPT, _("Decrypt"));
set_menu_text (popup, ID_FILECTX_SIGN, _("Sign"));
@@ -507,6 +535,7 @@
set_menu_text (popup, ID_FILECTX_VERIFY, _("Verify"));
set_menu_text (popup, ID_FILECTX_WIPE, _("Wipe"));
set_menu_text (popup, ID_FILECTX_SEND, _("Send as Mail"));
+ set_menu_text (popup, ID_FILECTX_LIST, _("List Packets"));
pos = listview_get_curr_pos (lv);
if (fm_check_file_type (lv, pos, FM_DECRYPT))
set_menu_state (popup, ID_FILECTX_SEND, MF_ENABLED);
@@ -525,7 +554,7 @@
set_menu_state (popup, ID_FILECTX_SIGNENC, MF_GRAYED|MF_DISABLED);
}
- TrackPopupMenu(popup, TPM_RIGHTALIGN, p.x, p.y, 0, dlg, NULL);
+ TrackPopupMenu (popup, TPM_RIGHTALIGN, p.x, p.y, 0, dlg, NULL);
DestroyMenu (popup);
DestroyMenu (hm);
}
@@ -538,18 +567,20 @@
else
set_menu_state (hm, ID_FILEMISC_SEND, MF_ENABLED);
}
+ if (notify && notify->code == LVN_ITEMCHANGED &&
+ ((LPNMLISTVIEW)lparam)->uNewState) /* item selected? */
+ update_ui_items (dlg, lv);
return TRUE;
case WM_SYSCOMMAND:
- if( LOWORD( wparam ) == SC_CLOSE )
- EndDialog( dlg, TRUE );
+ if (LOWORD (wparam) == SC_CLOSE)
+ EndDialog (dlg, TRUE);
return FALSE;
- case WM_INITMENUPOPUP:
- if ((UINT)LOWORD (lparam) == 0) {
- HMENU hm = (HMENU)wparam;
- set_menu_text_bypos (hm, 2, _("&Calc Digest"));
- }
+ case WM_INITMENUPOPUP:
+ if ((UINT)LOWORD (lparam) == 0 &&
+ GetMenuItemCount ((HMENU)wparam) == 19) /* XXX: do not hard code values */
+ set_menu_text_bypos ((HMENU)wparam, 2, _("&Calc Digest"));
return FALSE;
case WM_COMMAND:
Modified: trunk/Src/wptGPGPrefsDlg.cpp
===================================================================
--- trunk/Src/wptGPGPrefsDlg.cpp 2005-11-21 11:44:25 UTC (rev 87)
+++ trunk/Src/wptGPGPrefsDlg.cpp 2005-11-21 12:06:59 UTC (rev 88)
@@ -73,6 +73,7 @@
SetDlgItemText (dlg, IDC_GPGPREFS_ASKLEVEL, _("Ask for the signature class during key sign"));
SetDlgItemText (dlg, IDC_GPGPREFS_CMTINF, _("Comment in armored files"));
SetDlgItemText (dlg, IDC_GPGPREFS_ENCINF, _("Encrypt to this key"));
+ SetDlgItemText (dlg, IDC_GPGPREFS_ALLOPTINF, _("General GPG options"));
for( n=0; (s = opts[n].name); n++ ) {
p = get_reg_entry_gpg( s );
Modified: trunk/Src/wptKeyEditDlgs.cpp
===================================================================
--- trunk/Src/wptKeyEditDlgs.cpp 2005-11-21 11:44:25 UTC (rev 87)
+++ trunk/Src/wptKeyEditDlgs.cpp 2005-11-21 12:06:59 UTC (rev 88)
@@ -1756,6 +1756,10 @@
EnableWindow (GetDlgItem (dlg, IDOK), FALSE);
}
SetDlgItemText (dlg, IDC_KEYEDIT_CMDINF, _("Command>"));
+ SetDlgItemText (dlg, IDCANCEL, _("&Exit"));
+ SetDlgItemText (dlg, IDC_KEYEDIT_HELP, _("&Help"));
+ SetWindowText (dlg, _("Key Edit"));
+
SetForegroundWindow( dlg );
center_window( dlg, NULL );
return TRUE;
Modified: trunk/Src/wptKeyRevokersDlg.cpp
===================================================================
--- trunk/Src/wptKeyRevokersDlg.cpp 2005-11-21 11:44:25 UTC (rev 87)
+++ trunk/Src/wptKeyRevokersDlg.cpp 2005-11-21 12:06:59 UTC (rev 88)
@@ -18,7 +18,6 @@
* along with WinPT; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
-
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
@@ -129,7 +128,11 @@
ctx = keycache_get_ctx (1);
if (!ctx)
BUG (dlg);
- lv = revokelist_init( GetDlgItem( dlg, IDC_KEYREVOKERS_LIST ), key, ctx );
+ lv = revokelist_init (GetDlgItem (dlg, IDC_KEYREVOKERS_LIST), key, ctx);
+
+ SetDlgItemText (dlg, IDC_KEYREVOKERS_INF, _("Designated Revoker Keys"));
+ SetWindowText (dlg, _("Key Revokers"));
+ SetForegroundWindow (dlg);
return TRUE;
case WM_NOTIFY:
Modified: trunk/Src/wptKeygenDlg.cpp
===================================================================
--- trunk/Src/wptKeygenDlg.cpp 2005-11-21 11:44:25 UTC (rev 87)
+++ trunk/Src/wptKeygenDlg.cpp 2005-11-21 12:06:59 UTC (rev 88)
@@ -547,7 +547,7 @@
keycache_update (0, fpr);
keycache_update (1, fpr);
- if (ctx->first_start == 0 && ctx != NULL)
+ if (ctx != NULL && ctx->first_start == 0)
get_pubkey (fpr, &ctx->newkey);
if (fpr)
free (fpr);
Modified: trunk/Src/wptKeylist.cpp
===================================================================
--- trunk/Src/wptKeylist.cpp 2005-11-21 11:44:25 UTC (rev 87)
+++ trunk/Src/wptKeylist.cpp 2005-11-21 12:06:59 UTC (rev 88)
@@ -342,14 +342,14 @@
switch (val) {
case GPGME_VALIDITY_UNKNOWN:
case GPGME_VALIDITY_UNDEFINED:
- return "None";
+ return _("None");
case GPGME_VALIDITY_NEVER:
- return "Never";
+ return _("Never");
case GPGME_VALIDITY_MARGINAL:
- return "Marginal";
+ return _("Marginal");
case GPGME_VALIDITY_FULL:
case GPGME_VALIDITY_ULTIMATE:
- return "Full";
+ return _("Full");
}
return "";
}
Modified: trunk/Src/wptKeysigDlg.cpp
===================================================================
--- trunk/Src/wptKeysigDlg.cpp 2005-11-21 11:44:25 UTC (rev 87)
+++ trunk/Src/wptKeysigDlg.cpp 2005-11-21 12:06:59 UTC (rev 88)
@@ -17,7 +17,6 @@
* along with WinPT; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
-
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
@@ -130,6 +129,15 @@
return FALSE;
case WM_INITDIALOG:
+ SetWindowText (dlg, _("Signature Properties"));
+ SetDlgItemText (dlg, IDC_SIGPROPS_EXP, _("Exportable"));
+ SetDlgItemText (dlg, IDC_SIGPROPS_NREV, _("Non-revocably"));
+ SetDlgItemText (dlg, IDC_SIGPROPS_EXPIRED, _("Expired"));
+ SetDlgItemText (dlg, IDC_SIGPROPS_REV, _("Revoked"));
+ SetDlgItemText (dlg, IDC_SIGPROPS_CLASSINF, _("Class"));
+ SetDlgItemText (dlg, IDC_SIGPROPS_EXPSTR, _("Expire date"));
+ SetDlgItemText (dlg, IDC_SIGPROPS_KEYINF, _("Issuer key"));
+ SetDlgItemText (dlg, IDC_SIGPROPS_KEYIDINF, _("Issuer key ID"));
lv = (listview_ctrl_t)lparam;
if (!lv)
dlg_fatal_error (dlg, "could not get dialog param");
Modified: trunk/Src/wptKeysignDlg.cpp
===================================================================
--- trunk/Src/wptKeysignDlg.cpp 2005-11-21 11:44:25 UTC (rev 87)
+++ trunk/Src/wptKeysignDlg.cpp 2005-11-21 12:06:59 UTC (rev 88)
@@ -17,7 +17,6 @@
* along with WinPT; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
-
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
@@ -251,13 +250,13 @@
EndDialog (dlg, FALSE);
}
SetDlgItemText (dlg, IDC_KEYSIGN_INFOS, keymsg);
- #ifndef LANG_DE
SetDlgItemText (dlg, IDC_KEYSIGN_LOCAL, _("Sign local only (non exportable signature)"));
SetDlgItemText (dlg, IDC_KEYSIGN_EXPSIG, _("Signature expires on"));
SetDlgItemText (dlg, IDC_KEYSIGN_NREV, _("Sign non-revocably"));
SetDlgItemText (dlg, IDC_KEYSIGN_ASKLEVEL, _("&Ask for certification level"));
SetDlgItemText (dlg, IDC_KEYSIGN_PWDINF, _("Passphrase"));
- #endif
+ SetDlgItemText (dlg, IDCANCEL, _("&Cancel"));
+ SetDlgItemText (dlg, IDC_KEYSIGN_SHOWIMG, _("&Show photo"));
CheckDlgButton (dlg, IDC_KEYSIGN_LOCAL, BST_CHECKED);
CheckDlgButton (dlg, IDC_KEYSIGN_EXPSIG, BST_UNCHECKED);
CheckDlgButton (dlg, IDC_KEYSIGN_ASKLEVEL, BST_UNCHECKED);
Modified: trunk/Src/wptPreferencesDlg.cpp
===================================================================
--- trunk/Src/wptPreferencesDlg.cpp 2005-11-21 11:44:25 UTC (rev 87)
+++ trunk/Src/wptPreferencesDlg.cpp 2005-11-21 12:06:59 UTC (rev 88)
@@ -127,7 +127,7 @@
char path[256], * p;
HWND cb;
- switch ( msg ) {
+ switch (msg) {
case WM_INITDIALOG:
SetWindowText (dlg, _("WinPT Preferences"));
SetDlgItemText (dlg, IDC_PREFS_SECMODE, _("Do not use any &temporary files"));
@@ -143,6 +143,9 @@
SetDlgItemText (dlg, IDC_PREFS_KSINF, _("Keyserver &config"));
SetDlgItemText (dlg, IDC_PREFS_CACHEINF, _("Cache &passphrases for 'n' seconds"));
SetDlgItemText (dlg, IDC_PREFS_CACHEHINT, _("(CTRL+ALT+F to clear the cache)"));
+ SetDlgItemText (dlg, IDC_PREFS_ALLOPTINF, _("General options"));
+ SetDlgItemText (dlg, IDC_PREFS_CLIPINF, _("Clipboard hotkeys"));
+ SetDlgItemText (dlg, IDC_PREFS_CURRINF, _("Current window hotkeys"));
SetDlgItemInt( dlg, IDC_PREFS_CACHETIME, reg_prefs.cache_time, TRUE );
SetDlgItemInt( dlg, IDC_PREFS_WORDWRAP, reg_prefs.word_wrap, TRUE );
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2005-11-21 11:44:25 UTC (rev 87)
+++ trunk/configure.ac 2005-11-21 12:06:59 UTC (rev 88)
@@ -241,5 +241,6 @@
m4/Makefile
w32gpgme/Makefile
Gnupg/Makefile
+Po/Makefile
])
AC_OUTPUT
More information about the Winpt-commits
mailing list