[svn] GpgOL - r288 - in trunk: . po src
svn author wk
cvs at cvs.gnupg.org
Wed Nov 26 15:41:24 CET 2008
Author: wk
Date: 2008-11-26 15:41:24 +0100 (Wed, 26 Nov 2008)
New Revision: 288
Modified:
trunk/configure.ac
trunk/po/de.po
trunk/src/ChangeLog
trunk/src/common.h
trunk/src/config-dialog.c
trunk/src/dialogs.h
trunk/src/dialogs.rc
trunk/src/ext-commands.cpp
trunk/src/olflange-dlgs.cpp
trunk/src/olflange.cpp
Log:
Minor GUI fixes.
Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog 2008-11-14 09:05:44 UTC (rev 287)
+++ trunk/src/ChangeLog 2008-11-26 14:41:24 UTC (rev 288)
@@ -1,3 +1,17 @@
+2008-11-26 Werner Koch <wk at g10code.com>
+
+ * config-dialog.c (start_key_manager): Remove.
+ * ext-commands.cpp (DoCommand): Do not use start_key_manager as a
+ fallback.
+
+ * olflange.cpp (GpgolExt): Show new version warning only once.
+
+ * dialogs.rc: Do not display the logo. Move version info around.
+ * dialogs.h (IDC_G10CODE_STRING): New.
+ * olflange-dlgs.cpp (GPGOptionsDlgProc): Active product page by a
+ click on IDC_G10CODE_STRING.
+ (set_labels): Remove the build date from the Version field.
+
2008-11-14 Werner Koch <wk at g10code.com>
* dialogs.rc: Remove preview-decrypt check button.
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2008-11-14 09:05:44 UTC (rev 287)
+++ trunk/configure.ac 2008-11-26 14:41:24 UTC (rev 288)
@@ -16,8 +16,8 @@
# Remember to change the version number immediately *after* a release.
# Set my_issvn to "yes" for non-released code. Remember to run an
# "svn up" and "autogen.sh" right before creating a distribution.
-m4_define([my_version], [0.10.17])
-m4_define([my_issvn], [no])
+m4_define([my_version], [0.10.18])
+m4_define([my_issvn], [yes])
m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \
|| echo 'Revision: 0')|sed -n '/^Revision:/ {s/[^0-9]//gp;q;}')]))
Modified: trunk/po/de.po [not shown]
Modified: trunk/src/common.h
===================================================================
--- trunk/src/common.h 2008-11-14 09:05:44 UTC (rev 287)
+++ trunk/src/common.h 2008-11-26 14:41:24 UTC (rev 288)
@@ -229,7 +229,6 @@
/*-- config-dialog.c --*/
void config_dialog_box (HWND parent);
-int start_key_manager (void);
int store_extension_value (const char *key, const char *val);
int load_extension_value (const char *key, char **val);
Modified: trunk/src/config-dialog.c
===================================================================
--- trunk/src/config-dialog.c 2008-11-14 09:05:44 UTC (rev 287)
+++ trunk/src/config-dialog.c 2008-11-26 14:41:24 UTC (rev 288)
@@ -192,84 +192,7 @@
}
-/* Start the key manager specified by the registry entry 'keyManager'. */
-int
-start_key_manager (void)
-{
- PROCESS_INFORMATION pi;
- STARTUPINFO si;
- char *p;
- char *keyman = NULL;
-
- if (load_config_value (NULL, REGPATH, "keyManager", &keyman))
- {
- /* In case we did not found a registry entry we try to locate
- the keymanager in the same directory as the gpgme backend. */
- gpgme_engine_info_t info;
- if (gpgme_get_engine_info (&info))
- {
- log_debug ("%s:%s: get_engine_info failed\n", SRCNAME, __func__);
- return -1;
- }
-
- while (info && info->protocol != GPGME_PROTOCOL_OpenPGP)
- info = info->next;
- if (info && info->file_name && *info->file_name)
- {
- keyman = xmalloc (strlen (info->file_name) + 50);
- strcpy (keyman, info->file_name);
- for (p=keyman; *p; p++)
- if (*p == '/')
- *p = '\\';
- p = strrchr (keyman, '\\');
- if (!p)
- {
- xfree (keyman);
- return -1;
- }
- strcpy (p+1, "winpt.exe");
- if (!access (keyman, F_OK))
- strcat (keyman, " --keymanager");
- else
- {
- log_debug ("%s:%s: accessing `%s' failed\n",
- SRCNAME, __func__, keyman );
- strcpy (p+1, "gpa.exe");
- if (!access (keyman, F_OK))
- strcat (keyman, " --keyring");
- else
- {
- log_debug ("%s:%s: accessing `%s' failed\n",
- SRCNAME, __func__, keyman );
- xfree (keyman);
- return -1;
- }
- }
- }
- }
-
- /* Create startup info for the keymanager process. */
- memset (&si, 0, sizeof (si));
- si.cb = sizeof (STARTUPINFO);
- si.dwFlags = STARTF_USESHOWWINDOW;
- si.wShowWindow = SW_SHOW;
-
- log_debug ("%s:%s: running `%s' ...\n",
- SRCNAME, __func__, keyman );
- if (CreateProcess (NULL, keyman,
- NULL, NULL, TRUE, CREATE_DEFAULT_ERROR_MODE,
- NULL, NULL, &si, &pi) == TRUE)
- {
- CloseHandle (pi.hProcess);
- CloseHandle (pi.hThread);
- }
-
- xfree (keyman);
- return 0;
-}
-
-
/* Store a key in the registry with the key given by @key and the
value @value. */
int
Modified: trunk/src/dialogs.h
===================================================================
--- trunk/src/dialogs.h 2008-11-14 09:05:44 UTC (rev 287)
+++ trunk/src/dialogs.h 2008-11-26 14:41:24 UTC (rev 288)
@@ -41,6 +41,7 @@
#define IDC_G_RECV 4025
#define IDC_BODY_AS_ATTACHMENT 4026
#define IDC_GPG_CONF 4027
+#define IDC_G10CODE_STRING 4028
/* Ids for the extended options dialog. */
Modified: trunk/src/dialogs.rc
===================================================================
--- trunk/src/dialogs.rc 2008-11-14 09:05:44 UTC (rev 287)
+++ trunk/src/dialogs.rc 2008-11-26 14:41:24 UTC (rev 288)
@@ -88,15 +88,16 @@
"Button", BS_AUTOCHECKBOX | WS_TABSTOP,
24, 125, 215, 10
- /* Stuff below the group boxes. */
- LTEXT "GpgOL by g10 Code GmbH", IDC_STATIC,
- 8, 197, 100, 8
+ /* Stuff at the lower left corner. */
+ LTEXT "GpgOL by g10 Code GmbH", IDC_G10CODE_STRING,
+ 8, 229, 100, 8
LTEXT "Version x ", IDC_VERSION_INFO,
- 130, 197, 129, 9
+ 8, 240, 100, 9
- CONTROL IDB_BANNER, IDC_BITMAP,
- "Static", SS_BITMAP | SS_REALSIZEIMAGE,
- 8, 212, 150, 64
+ /* No more logo due to problems with the background colour. */
+/* CONTROL IDB_BANNER, IDC_BITMAP, */
+/* "Static", SS_BITMAP | SS_REALSIZEIMAGE, */
+/* 8, 212, 150, 64 */
PUSHBUTTON "advanced", IDC_GPG_OPTIONS,
130, 240, 50, 14
Modified: trunk/src/ext-commands.cpp
===================================================================
--- trunk/src/ext-commands.cpp 2008-11-14 09:05:44 UTC (rev 287)
+++ trunk/src/ext-commands.cpp 2008-11-26 14:41:24 UTC (rev 288)
@@ -769,9 +769,8 @@
{
log_debug ("%s:%s: command KeyManager called\n", SRCNAME, __func__);
if (engine_start_keymanager (hwnd))
- if (start_key_manager ())
- MessageBox (NULL, _("Could not start certificate manager"),
- _("GpgOL"), MB_ICONERROR|MB_OK);
+ MessageBox (NULL, _("Could not start certificate manager"),
+ _("GpgOL"), MB_ICONERROR|MB_OK);
}
else if (nCommandID == m_nCmdRevertFolder
&& m_lContext == EECONTEXT_VIEWER)
@@ -1039,6 +1038,8 @@
ULONG flags)
{
toolbar_info_t tb_info;
+ size_t n;
+
(void)description_size;
(void)flags;
@@ -1066,7 +1067,10 @@
pTBB->dwData = 0;
pTBB->iString = -1;
- lstrcpyn (description, tb_info->desc, strlen (tb_info->desc));
+ n = strlen (tb_info->desc);
+ if (n > description_size)
+ n = description_size;
+ lstrcpyn (description, tb_info->desc, n);
if (tb_info->cmd_id == m_nCmdEncrypt)
{
Modified: trunk/src/olflange-dlgs.cpp
===================================================================
--- trunk/src/olflange-dlgs.cpp 2008-11-14 09:05:44 UTC (rev 287)
+++ trunk/src/olflange-dlgs.cpp 2008-11-26 14:41:24 UTC (rev 288)
@@ -57,7 +57,7 @@
{ IDC_GPG_OPTIONS, "Debug..."},
{ IDC_GPG_CONF, N_("Crypto Engine")},
- { IDC_VERSION_INFO, "Version "VERSION " ("__DATE__")"},
+ { IDC_VERSION_INFO, "Version "VERSION},
{ 0, NULL}
};
int i;
@@ -102,7 +102,7 @@
HWND bitmap;
GetWindowRect (hDlg, &rect_dlg);
- bitmap = GetDlgItem (hDlg, IDC_BITMAP);
+ bitmap = GetDlgItem (hDlg, IDC_G10CODE_STRING);
if (bitmap)
GetWindowRect (bitmap, &rect_banner);
@@ -237,8 +237,9 @@
opt.body_as_attachment = !!SendDlgItemMessage
(hDlg, IDC_BODY_AS_ATTACHMENT, BM_GETCHECK, 0, 0L);
- /* Now that the user has confirmed the options dialog, we
- mark the Registry with revision of this build. */
+ /* Make sure that no new-version-installed warning will pop
+ up on the next start. Not really needed as the warning
+ dialog set this too, but it doesn't harm to do it again. */
opt.svn_revision = SVN_REVISION;
write_options ();
Modified: trunk/src/olflange.cpp
===================================================================
--- trunk/src/olflange.cpp 2008-11-14 09:05:44 UTC (rev 287)
+++ trunk/src/olflange.cpp 2008-11-26 14:41:24 UTC (rev 288)
@@ -431,7 +431,8 @@
log_debug ("%s:%s: first time initialization done\n",
SRCNAME, __func__);
if ( SVN_REVISION > opt.svn_revision )
- MessageBox (NULL,
+ {
+ MessageBox (NULL,
_("You have installed a new version of GpgOL.\n"
"\n"
"Please open the option dialog and confirm that"
@@ -439,6 +440,10 @@
" dialog can be found in the main menu at:"
" Extras->Options->GpgOL.\n"),
"GpgOL", MB_ICONINFORMATION|MB_OK);
+ /* Show this warning only once. */
+ opt.svn_revision = SVN_REVISION;
+ write_options ();
+ }
if ( SVN_REVISION > opt.forms_revision )
install_forms ();
}
More information about the Gnupg-commits
mailing list