[Winpt-commits] r177 - in trunk: . Src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue Feb 14 16:46:33 CET 2006
Author: twoaday
Date: 2006-02-14 16:46:29 +0100 (Tue, 14 Feb 2006)
New Revision: 177
Modified:
trunk/AUTHORS
trunk/NEWS
trunk/README-0.11.txt
trunk/Src/ChangeLog
trunk/Src/WinPT-en.rc
trunk/Src/resource.h
trunk/Src/wptFileManager.cpp
trunk/Src/wptFileManagerDlg.cpp
trunk/Src/wptGPGPrefsDlg.cpp
trunk/Src/wptKeysignDlg.cpp
trunk/TODO-GPGME-PORT.txt
trunk/configure.ac
Log:
2006-02-14 Timo Schulz <ts at g10code.de>
* wptGPGPrefsDlg.cpp (gpgprefs_dlg_proc): Localize 'Cancel'.
* wptKeysignDlg.cpp (keysign_dlg_proc): Implement 'Hide Typing'.
* wptFileManager.cpp (fm_sym_encrypt): Set cancel.
(fm_parse_files): Handle cancel.
Prepare first release candidate.
Modified: trunk/AUTHORS
===================================================================
--- trunk/AUTHORS 2006-02-13 09:38:03 UTC (rev 176)
+++ trunk/AUTHORS 2006-02-14 15:46:29 UTC (rev 177)
@@ -43,8 +43,13 @@
wptSecmem.cpp - John J. Kane <jkane89 at softhome.net>
Translators:
+(maintained)
+[Japanese] Davar Pishva <dpishva at andrew.cmu.edu>
[German] Timo Schulz <twoaday at freakmail.de>,
- Thomas Henlich <henlich at mmers1.mw.tu-dresden.de>
+ Thomas Henlich <henlich at mmers1.mw.tu-dresden.de>
+ Ralf Kreutzmann <ralf.kreutzmann at equipmente.de>
+
+(inactive)
[French] Nicolas Robaux <nicolas at robaux.com>
[Italy] Andrea Ungaro <semperfin at tin.it>,
Scirè Salvatore <scires at tin.it>
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2006-02-13 09:38:03 UTC (rev 176)
+++ trunk/NEWS 2006-02-14 15:46:29 UTC (rev 177)
@@ -753,4 +753,5 @@
if appropriate.
* The program can now handle keys without a passphrase (again).
* New tree based dialog to list the signatures.
+* Several minor cleanups and bug fixes.
Modified: trunk/README-0.11.txt
===================================================================
--- trunk/README-0.11.txt 2006-02-13 09:38:03 UTC (rev 176)
+++ trunk/README-0.11.txt 2006-02-14 15:46:29 UTC (rev 177)
@@ -61,4 +61,4 @@
Authors address
~~~~~~~~~~~~~~~
-Timo Schulz <twoaday at freakmail.de> (keyID BF3DF9B4)
+Timo Schulz <twoaday at freakmail.de> (keyID BF3DF9B4)
Modified: trunk/Src/ChangeLog
===================================================================
--- trunk/Src/ChangeLog 2006-02-13 09:38:03 UTC (rev 176)
+++ trunk/Src/ChangeLog 2006-02-14 15:46:29 UTC (rev 177)
@@ -1,3 +1,10 @@
+2006-02-14 Timo Schulz <ts at g10code.de>
+
+ * wptGPGPrefsDlg.cpp (gpgprefs_dlg_proc): Localize 'Cancel'.
+ * wptKeysignDlg.cpp (keysign_dlg_proc): Implement 'Hide Typing'.
+ * wptFileManager.cpp (fm_sym_encrypt): Set cancel.
+ (fm_parse_files): Handle cancel.
+
2006-02-10 Timo Schulz <ts at g10code.de>
* wptKeyPropsDlg.cpp (props_dlg_proc): Removed unused vars.
Modified: trunk/Src/WinPT-en.rc
===================================================================
--- trunk/Src/WinPT-en.rc 2006-02-13 09:38:03 UTC (rev 176)
+++ trunk/Src/WinPT-en.rc 2006-02-14 15:46:29 UTC (rev 177)
@@ -307,7 +307,7 @@
PUSHBUTTON "&Cancel",IDCANCEL,294,189,53,14
END
-IDD_WINPT_DECRYPT DIALOG DISCARDABLE 0, 0, 225, 159
+IDD_WINPT_DECRYPT DIALOG DISCARDABLE 0, 0, 225, 167
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Decryption"
FONT 8, "MS Sans Serif"
@@ -322,11 +322,11 @@
LTEXT "Please enter your passphrase",IDC_DECRYPT_PWDINFO,8,105,
137,8
CONTROL "&Hide Typing",IDC_DECRYPT_HIDE,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,146,106,72,10
+ WS_TABSTOP,146,131,72,10
EDITTEXT IDC_DECRYPT_PWD,8,117,206,13,ES_PASSWORD |
ES_AUTOHSCROLL
- DEFPUSHBUTTON "&OK",IDOK,116,137,48,14
- PUSHBUTTON "&Cancel",IDCANCEL,165,137,49,14
+ DEFPUSHBUTTON "&OK",IDOK,116,150,48,14
+ PUSHBUTTON "&Cancel",IDCANCEL,165,150,49,14
END
IDD_WINPT_KEYSERVER DIALOG DISCARDABLE 0, 0, 219, 215
@@ -446,7 +446,7 @@
LTEXT "Info",IDC_KEYCACHE_INFO,10,9,162,8
END
-IDD_WINPT_KEYSIGN DIALOG DISCARDABLE 0, 0, 286, 193
+IDD_WINPT_KEYSIGN DIALOG DISCARDABLE 0, 0, 286, 207
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Key Signing"
FONT 8, "MS Sans Serif"
@@ -468,10 +468,12 @@
LTEXT "Passphrase",IDC_KEYSIGN_PWDINF,5,155,44,8
EDITTEXT IDC_KEYSIGN_PASSPHRASE,53,153,144,13,ES_PASSWORD |
ES_AUTOHSCROLL
- PUSHBUTTON "&Show photo",IDC_KEYSIGN_SHOWIMG,2,175,67,14,
+ CONTROL "&Hide typing",IDC_KEYSIGN_HIDE,"Button",BS_AUTOCHECKBOX |
+ WS_TABSTOP,135,168,60,9
+ PUSHBUTTON "&Show photo",IDC_KEYSIGN_SHOWIMG,2,189,67,14,
WS_DISABLED
- DEFPUSHBUTTON "&OK",IDOK,174,175,50,14
- PUSHBUTTON "&Cancel",IDCANCEL,227,174,54,15
+ DEFPUSHBUTTON "&OK",IDOK,174,189,50,14
+ PUSHBUTTON "&Cancel",IDCANCEL,227,188,54,15
END
IDD_WINPT_GPGPREFS DIALOG DISCARDABLE 0, 0, 222, 226
@@ -789,17 +791,17 @@
PUSHBUTTON "&Cancel",IDCANCEL,119,130,50,14
END
-IDD_WINPT_PASSWD DIALOG DISCARDABLE 0, 0, 219, 58
+IDD_WINPT_PASSWD DIALOG DISCARDABLE 0, 0, 219, 71
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Passphrase Dialog"
FONT 8, "MS Sans Serif"
BEGIN
LTEXT "Enter passphrase",IDC_PASSWD_INFO,9,7,108,8
EDITTEXT IDC_PASSWD_PWD,9,18,202,12,ES_PASSWORD | ES_AUTOHSCROLL
- DEFPUSHBUTTON "&OK",IDOK,107,37,50,14
- PUSHBUTTON "&Cancel",IDCANCEL,160,37,50,14
CONTROL "&Hide Typing",IDC_PASSWD_HIDE,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,134,7,78,10
+ WS_TABSTOP,134,31,78,10
+ DEFPUSHBUTTON "&OK",IDOK,107,50,50,14
+ PUSHBUTTON "&Cancel",IDCANCEL,160,50,50,14
END
IDD_WINPT_DATE DIALOG DISCARDABLE 0, 0, 93, 58
@@ -821,7 +823,7 @@
ES_WANTRETURN | WS_DISABLED
END
-IDD_WINPT_DECRYPT_SIGN DIALOG DISCARDABLE 0, 0, 237, 110
+IDD_WINPT_DECRYPT_SIGN DIALOG DISCARDABLE 0, 0, 237, 118
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Signing"
FONT 8, "MS Sans Serif"
@@ -833,9 +835,9 @@
EDITTEXT IDC_DECRYPT_SIGN_PWD,7,71,219,12,ES_PASSWORD |
ES_AUTOHSCROLL
CONTROL "&Hide Typing",IDC_DECRYPT_SIGN_HIDE,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,159,59,71,10
- DEFPUSHBUTTON "&OK",IDOK,131,89,48,14
- PUSHBUTTON "&Cancel",IDCANCEL,181,89,47,14
+ BS_AUTOCHECKBOX | WS_TABSTOP,159,83,71,10
+ DEFPUSHBUTTON "&OK",IDOK,131,101,48,14
+ PUSHBUTTON "&Cancel",IDCANCEL,181,101,47,14
END
IDD_WINPT_GROUP DIALOG DISCARDABLE 0, 0, 178, 66
@@ -1198,20 +1200,20 @@
BEGIN
GROUPBOX "",IDC_STATIC,7,5,138,33
CONTROL "Admin PIN (min. 8 characters)",IDC_CHPIN_ISADMIN,"Button",
- BS_AUTORADIOBUTTON,13,12,109,10
+ BS_AUTORADIOBUTTON,13,12,124,10
CONTROL "User PIN (min. 6 characters)",IDC_CHPIN_ISWORK,"Button",
- BS_AUTORADIOBUTTON,13,26,105,10
- LTEXT "Old PIN",IDC_STATIC,7,52,26,8
+ BS_AUTORADIOBUTTON,13,26,122,10
+ LTEXT "Old PIN",IDC_STATIC,7,52,38,8
EDITTEXT IDC_CHPIN_OLDPIN,49,50,95,12,ES_PASSWORD |
ES_AUTOHSCROLL
- LTEXT "New PIN",IDC_STATIC,7,72,30,8
+ LTEXT "New PIN",IDC_STATIC,7,72,39,8
EDITTEXT IDC_CHPIN_NEWPIN,49,69,95,12,ES_PASSWORD |
ES_AUTOHSCROLL
LTEXT "Repeat PIN",IDC_STATIC,7,87,38,8
EDITTEXT IDC_CHPIN_NEWPIN2,49,84,95,12,ES_PASSWORD |
ES_AUTOHSCROLL
CONTROL "&Hide Typing",IDC_CHPIN_HIDE,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,89,98,54,10
+ WS_TABSTOP,79,98,64,10
DEFPUSHBUTTON "&OK",IDOK,41,121,50,14
PUSHBUTTON "&Cancel",IDCANCEL,94,121,50,14
END
@@ -1228,7 +1230,7 @@
EDITTEXT IDC_CKEYGEN_NAME,73,19,110,12,ES_AUTOHSCROLL
LTEXT "&Comment (optional)",IDC_CKEYGEN_CMTINF,7,37,61,8
EDITTEXT IDC_CKEYGEN_COMMENT,73,35,110,12,ES_AUTOHSCROLL
- LTEXT "Email &address",IDC_CKEYGEN_MAILINF,7,53,44,8
+ LTEXT "Email &address",IDC_CKEYGEN_MAILINF,7,53,61,8
EDITTEXT IDC_CKEYGEN_EMAIL,73,50,110,13,ES_AUTOHSCROLL
LTEXT "&Expire date",IDC_CKEYGEN_EXPDATEINF,7,69,47,8
CONTROL "&Never",IDC_CKEYGEN_NEVER,"Button",BS_AUTOCHECKBOX |
@@ -1428,7 +1430,7 @@
LEFTMARGIN, 4
RIGHTMARGIN, 218
TOPMARGIN, 3
- BOTTOMMARGIN, 153
+ BOTTOMMARGIN, 161
END
IDD_WINPT_KEYSERVER, DIALOG
@@ -1500,7 +1502,7 @@
LEFTMARGIN, 3
RIGHTMARGIN, 281
TOPMARGIN, 3
- BOTTOMMARGIN, 189
+ BOTTOMMARGIN, 203
END
IDD_WINPT_GPGPREFS, DIALOG
@@ -1636,7 +1638,7 @@
LEFTMARGIN, 4
RIGHTMARGIN, 212
TOPMARGIN, 3
- BOTTOMMARGIN, 52
+ BOTTOMMARGIN, 65
END
IDD_WINPT_DATE, DIALOG
@@ -1660,7 +1662,7 @@
LEFTMARGIN, 4
RIGHTMARGIN, 230
TOPMARGIN, 3
- BOTTOMMARGIN, 104
+ BOTTOMMARGIN, 112
END
IDD_WINPT_GROUP, DIALOG
Modified: trunk/Src/resource.h
===================================================================
--- trunk/Src/resource.h 2006-02-13 09:38:03 UTC (rev 176)
+++ trunk/Src/resource.h 2006-02-14 15:46:29 UTC (rev 177)
@@ -637,6 +637,7 @@
#define IDC_MDSUM_TOCLIP 1511
#define IDC_VKEYSIG_TREE 1512
#define IDC_VKEYSIG_EDIT 1514
+#define IDC_KEYSIGN_HIDE 1515
#define ID_GPG_ENCRYPT 40003
#define ID_GPG_DECRYPT 40004
#define ID_GPG_SIGN 40005
@@ -815,9 +816,9 @@
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 244
+#define _APS_NEXT_RESOURCE_VALUE 245
#define _APS_NEXT_COMMAND_VALUE 40186
-#define _APS_NEXT_CONTROL_VALUE 1515
+#define _APS_NEXT_CONTROL_VALUE 1516
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
Modified: trunk/Src/wptFileManager.cpp
===================================================================
--- trunk/Src/wptFileManager.cpp 2006-02-13 09:38:03 UTC (rev 176)
+++ trunk/Src/wptFileManager.cpp 2006-02-14 15:46:29 UTC (rev 177)
@@ -921,9 +921,9 @@
fm_encrypt_into_zip (ctx, lv);
for (i = 0; i < listview_count_items (lv, 0); i++) {
- if( !listview_get_item_state( lv, i ) )
+ if (!listview_get_item_state (lv, i))
continue;
- listview_get_item_text(lv, i, 1, fname, sizeof (fname) - 1);
+ listview_get_item_text (lv, i, 1, fname, sizeof (fname) - 1);
if( file_exist_check (fname) && !is_directory (fname)) {
log_box (_("File Manager"), MB_ERR,
_("\"%s\" does not exist"), fname);
@@ -942,20 +942,24 @@
case FM_SIGNENCRYPT: rc = fm_encrypt( ctx, fname, 1 ); break;
case FM_DECRYPT: rc = fm_decrypt( ctx, fname ); break;
case FM_SIGN: rc = fm_sign( ctx, fname ); break;
- case FM_SYMENC: rc = fm_sym_encrypt( ctx, fname );break;
+ case FM_SYMENC: rc = fm_sym_encrypt (ctx, fname); break;
case FM_VERIFY: rc = fm_verify (ctx, sig_detached, fname);break;
case FM_IMPORT:
free_if_alloc (ctx->opaque);
ctx->opaque = m_strdup (fname);
if (!ctx->opaque)
BUG (0);
- DialogBoxParam( glob_hinst, (LPCSTR)IDD_WINPT_IMPORT, dlg,
- file_import_dlg_proc, (LPARAM)ctx );
+ DialogBoxParam (glob_hinst, (LPCSTR)IDD_WINPT_IMPORT, dlg,
+ file_import_dlg_proc, (LPARAM)ctx);
if (ctx->cancel == 1)
continue;
rc = fm_import (ctx, fname);
break;
}
+ if (ctx->cancel == 1) {
+ ctx->cancel = 0;
+ continue;
+ }
fm_set_status (lv, i, fm_cmd, ctx->sigmode, !rc, ctx->output);
free_if_alloc (ctx->output);
progress_cleanup (&pfx);
@@ -1156,8 +1160,10 @@
char ext[5], * pass;
pass = request_passphrase2 (_("Symmetric"), 0, &cancel);
- if (cancel)
+ if (cancel) {
+ c->cancel = 1;
return 0;
+ }
/* XXX gpgme_control (ctx, GPGME_CTRL_CIPHER, -1);*/
c->output = new char[strlen (name) + 5 + 1];
Modified: trunk/Src/wptFileManagerDlg.cpp
===================================================================
--- trunk/Src/wptFileManagerDlg.cpp 2006-02-13 09:38:03 UTC (rev 176)
+++ trunk/Src/wptFileManagerDlg.cpp 2006-02-14 15:46:29 UTC (rev 177)
@@ -494,7 +494,7 @@
filelist_proc.old = (WNDPROC)GetWindowLong (fl, GWL_WNDPROC);
if (filelist_proc.old) {
if (!SetWindowLong (fl, GWL_WNDPROC, (LONG)filelist_proc.current)) {
- msg_box (dlg, "Could not set filelist window procedure.",
+ msg_box (dlg, _("Could not set filelist window procedure."),
_("File Manager"), MB_ERR);
BUG (NULL);
}
@@ -560,6 +560,7 @@
set_menu_state (popup, ID_FILECTX_VERIFY, MF_GRAYED|MF_DISABLED);
}
if (fm_check_file_type (lv, pos, FM_DECRYPT)) {
+ set_menu_state (popup, ID_FILECTX_ENCRYPT_ZIP, MF_GRAYED|MF_DISABLED);
set_menu_state (popup, ID_FILECTX_ENCRYPT, MF_GRAYED|MF_DISABLED);
set_menu_state (popup, ID_FILECTX_SIGN, MF_GRAYED|MF_DISABLED);
set_menu_state (popup, ID_FILECTX_SIGNENC, MF_GRAYED|MF_DISABLED);
Modified: trunk/Src/wptGPGPrefsDlg.cpp
===================================================================
--- trunk/Src/wptGPGPrefsDlg.cpp 2006-02-13 09:38:03 UTC (rev 176)
+++ trunk/Src/wptGPGPrefsDlg.cpp 2006-02-14 15:46:29 UTC (rev 177)
@@ -153,6 +153,7 @@
SetDlgItemText (dlg, IDC_GPGREFS_EXEDLG, _("Browse..."));
SetDlgItemText (dlg, IDC_GPGPREFS_LOCDLG, _("Browse..."));
SetDlgItemText (dlg, IDC_GPGPREFS_OVRDEFAULT, _("&Overwrite default settings"));
+ SetDlgItemText (dlg, IDCANCEL, _("&Cancel"));
gpg4win = load_gpg4win_values (dlg);
if (!gpg4win) {
@@ -167,9 +168,11 @@
if (opt) {
if (find_option (opt, "ask-cert-level"))
CheckDlgButton (dlg, IDC_GPGPREFS_ASKLEVEL, BST_CHECKED);
- if ((e=find_option (opt, "comment")))
- SetDlgItemText (dlg, IDC_GPGPREFS_COMMENT, e->val);
- if ((e=find_option (opt, "encrypt-to")))
+ e = find_option (opt, "comment");
+ if (e != NULL)
+ SetDlgItemText (dlg, IDC_GPGPREFS_COMMENT, e->val);
+ e = find_option (opt, "encrypt-to");
+ if (e != NULL)
SetDlgItemText (dlg, IDC_GPGPREFS_ENCTO, e->val);
release_gpg_options (opt);
}
Modified: trunk/Src/wptKeysignDlg.cpp
===================================================================
--- trunk/Src/wptKeysignDlg.cpp 2006-02-13 09:38:03 UTC (rev 176)
+++ trunk/Src/wptKeysignDlg.cpp 2006-02-14 15:46:29 UTC (rev 177)
@@ -234,10 +234,10 @@
int type, expires=0, idx;
int sig_class = 0;
- switch ( msg ) {
+ switch (msg) {
case WM_INITDIALOG:
if (lparam == 0)
- dlg_fatal_error (dlg, "Could not get dialog param.");
+ dlg_fatal_error (dlg, "could not get dialog param.");
SetWindowText (dlg, _("Key Signing"));
key = (winpt_key_t) lparam;
s = key->ctx->uids->uid;
@@ -278,15 +278,16 @@
EnableWindow (GetDlgItem (dlg, IDC_KEYSIGN_SHOWIMG), TRUE);
if (!reg_prefs.gpg.ask_cert_level)
EnableWindow (GetDlgItem (dlg, IDC_KEYSIGN_ASKLEVEL), FALSE);
+ CheckDlgButton (dlg, IDC_KEYSIGN_HIDE, BST_CHECKED);
SetForegroundWindow (dlg);
h = GetDlgItem (dlg, IDC_KEYSIGN_PASSPHRASE);
SetFocus (h);
return FALSE;
case WM_SYSCOMMAND:
- if( LOWORD( wparam ) == SC_CLOSE ) {
- SetDlgItemText( dlg, IDC_KEYSIGN_PASSPHRASE, "" );
- EndDialog( dlg, TRUE );
+ if (LOWORD (wparam) == SC_CLOSE) {
+ SetDlgItemText (dlg, IDC_KEYSIGN_PASSPHRASE, "");
+ EndDialog (dlg, TRUE);
}
return FALSE;
@@ -295,10 +296,18 @@
do_check_protection (dlg);
break;
}
- if (HIWORD (wparam) == BN_CLICKED && LOWORD (wparam) == IDC_KEYSIGN_EXPSIG) {
+ if (HIWORD (wparam) == BN_CLICKED &&
+ LOWORD (wparam) == IDC_KEYSIGN_EXPSIG) {
int enable = IsDlgButtonChecked (dlg, IDC_KEYSIGN_EXPSIG);
EnableWindow (GetDlgItem (dlg, IDC_KEYSIGN_EXPIRES), enable? TRUE : FALSE);
}
+ if (HIWORD (wparam) == BN_CLICKED &&
+ LOWORD (wparam) == IDC_KEYSIGN_HIDE) {
+ HWND hwnd = GetDlgItem (dlg, IDC_KEYSIGN_PASSPHRASE);
+ int hide = IsDlgButtonChecked (dlg, IDC_KEYSIGN_HIDE);
+ SendMessage (hwnd, EM_SETPASSWORDCHAR, hide? '*' : 0, 0);
+ SetFocus (hwnd);
+ }
switch (LOWORD (wparam)) {
case IDOK:
Modified: trunk/TODO-GPGME-PORT.txt
===================================================================
--- trunk/TODO-GPGME-PORT.txt 2006-02-13 09:38:03 UTC (rev 176)
+++ trunk/TODO-GPGME-PORT.txt 2006-02-14 15:46:29 UTC (rev 177)
@@ -1,3 +1,7 @@
+* Select the signing subkey.
+
+* Allow to use --hidden-recipient.
+
* Grep for 'XXX' and implement the missing code or
replace the dummy code with real code.
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2006-02-13 09:38:03 UTC (rev 176)
+++ trunk/configure.ac 2006-02-14 15:46:29 UTC (rev 177)
@@ -15,7 +15,7 @@
# Version number: Remember to change it immediately *after* a release.
# Add a "-cvs" prefix for non-released code.
-AC_INIT(WinPT, 0.11.8-cvs, http://www.winpt.org)
+AC_INIT(WinPT, 0.11.8rc1, http://www.winpt.org)
NEED_GPG_VERSION=1.4.2
NEED_GPGME_API=1
NEED_GPGME_VERSION=1.1.1
More information about the Winpt-commits
mailing list