[svn] GpgOL - r326 - in trunk: . forms src
svn author wk
cvs at cvs.gnupg.org
Tue Dec 22 17:35:21 CET 2009
Author: wk
Date: 2009-12-22 17:35:20 +0100 (Tue, 22 Dec 2009)
New Revision: 326
Added:
trunk/src/README.icons
trunk/src/decrypt-32.bmp
trunk/src/decrypt-32m.bmp
trunk/src/decrypt-verify-32.bmp
trunk/src/decrypt-verify-32m.bmp
trunk/src/encrypt-32.bmp
trunk/src/encrypt-32m.bmp
trunk/src/key-manager-64.bmp
trunk/src/key-manager-64m.bmp
trunk/src/sign-32.bmp
trunk/src/sign-32m.bmp
trunk/src/verify-32.bmp
trunk/src/verify-32m.bmp
Removed:
trunk/src/cryptostate.bmp
trunk/src/key_mana.bmp
Modified:
trunk/ChangeLog
trunk/forms/encr-l.ico
trunk/forms/encr-s.ico
trunk/forms/sign-l.ico
trunk/forms/sign-s.ico
trunk/src/ChangeLog
trunk/src/Makefile.am
trunk/src/decrypt-16.bmp
trunk/src/decrypt-16m.bmp
trunk/src/decrypt-verify-16.bmp
trunk/src/decrypt-verify-16m.bmp
trunk/src/dialogs.rc
trunk/src/encrypt-16.bmp
trunk/src/encrypt-16m.bmp
trunk/src/engine-assuan.c
trunk/src/key-manager-16.bmp
trunk/src/key-manager-16m.bmp
trunk/src/key-manager-32.bmp
trunk/src/key-manager-32m.bmp
trunk/src/sign-16.bmp
trunk/src/sign-16m.bmp
trunk/src/verify-16.bmp
trunk/src/verify-16m.bmp
Log:
Updated all icons. These are now final versions (At least I hope that).
Add README.icons to document how to create the icons.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-12-08 22:36:03 UTC (rev 325)
+++ trunk/ChangeLog 2009-12-22 16:35:20 UTC (rev 326)
@@ -1,3 +1,8 @@
+2009-12-22 Werner Koch <wk at g10code.com>
+
+ * forms/encr-l.ico, forms/encr-s.ico: Update.
+ * forms/sign-l.ico, forms/encr-l.ico: Update.
+
2009-11-02 Werner Koch <wk at g10code.com>
* forms/Makefile.am (cfg_english): New.
Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog 2009-12-08 22:36:03 UTC (rev 325)
+++ trunk/src/ChangeLog 2009-12-22 16:35:20 UTC (rev 326)
@@ -1,3 +1,25 @@
+2009-12-22 Werner Koch <wk at g10code.com>
+
+ * key-manager-16.bmp, key-manager-16m.bmp: Update.
+ * key-manager-32.bmp, key-manager-32m.bmp: Update.
+ * key-manager-64.bmp, key-manager-64m.bmp: New.
+ * verify-16.bmp, verify-16m.bmp: Update.
+ * verify-32.bmp, verify-32m.bmp: New.
+ * sign-16.bmp, sign-16m.bmp: Update.
+ * sign-32.bmp, sign-32m.bmp: New.
+ * encrypt-16.bmp, encrypt-16m.bmp: Update.
+ * encrypt-32.bmp, encrypt-32m.bmp: New.
+ * decrypt-16.bmp, decrypt-16m.bmp: Update.
+ * decrypt-32.bmp, decrypt-32m.bmp: New.
+ * decrypt-verify-16.bmp, decrypt-verify-16m.bmp: Update.
+ * decrypt-verify-32.bmp, decrypt-verify-32m.bmp: New.
+ * Makefile.am (EXTRA_DIST): Add new bitmaps.
+ * dialogs.rc: Add new bitmaps.
+
+2009-12-01 Werner Koch <wk at g10code.com>
+
+ * README.icons: New.
+
2009-12-08 Marcus Brinkmann <marcus at g10code.de>
* engine-assuan.c (getinfo_pid_cb, prep_foo_status_cb): Change
Modified: trunk/forms/encr-l.ico
===================================================================
(Binary files differ)
Modified: trunk/forms/encr-s.ico
===================================================================
(Binary files differ)
Modified: trunk/forms/sign-l.ico
===================================================================
(Binary files differ)
Modified: trunk/forms/sign-s.ico
===================================================================
(Binary files differ)
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2009-12-08 22:36:03 UTC (rev 325)
+++ trunk/src/Makefile.am 2009-12-22 16:35:20 UTC (rev 326)
@@ -18,13 +18,19 @@
EXTRA_DIST = \
versioninfo.rc.in mapi32.def $(unused_sources) Outlook.gpl \
encrypt-16.bmp encrypt-16m.bmp \
+ encrypt-32.bmp encrypt-32m.bmp \
sign-16.bmp sign-16m.bmp \
+ sign-32.bmp sign-32m.bmp \
key-manager-16.bmp key-manager-16m.bmp \
key-manager-32.bmp key-manager-32m.bmp \
+ key-manager-64.bmp key-manager-64m.bmp \
decrypt-16.bmp decrypt-16m.bmp \
+ decrypt-32.bmp decrypt-32m.bmp \
verify-16.bmp verify-16m.bmp \
+ verify-32.bmp verify-32m.bmp \
decrypt-verify-16.bmp decrypt-verify-16m.bmp \
- logo.bmp
+ decrypt-verify-32.bmp decrypt-verify-32m.bmp \
+ logo.bmp README.icons
EXEEXT = .dll
Added: trunk/src/README.icons
===================================================================
--- trunk/src/README.icons (rev 0)
+++ trunk/src/README.icons 2009-12-22 16:35:20 UTC (rev 326)
@@ -0,0 +1,131 @@
+ How to Change the Icons
+ =========================
+
+We have two kinds of icons: Those integrated as resources in gpgol.dll
+and those installed via the forms extensions from external files.
+
+ 1. Resource icons
+ =================
+
+ Before we changed GpgOL to include the icons via the OOM we used the
+ ECE semi-documented way of installing icons. This required a
+ special palette (file Outlook.gpl) and the pink background colour as
+ the transparency hack. Now we are using the OOM and things are much
+ easier.
+
+ Icons are included by the resource compiler which reads the file
+ dialogs.rc to create the resource. This is all integtraged into the
+ Makefile. A sample entry in dialogs.rc looks like this:
+
+ IDB_KEY_MANAGER_16 BITMAP DISCARDABLE "key-manager-16.bmp"
+ IDB_KEY_MANAGER_16M BITMAP DISCARDABLE "key-manager-16m.bmp"
+ IDB_KEY_MANAGER_32 BITMAP DISCARDABLE "key-manager-32.bmp"
+ IDB_KEY_MANAGER_32M BITMAP DISCARDABLE "key-manager-32m.bmp"
+ //IDB_KEY_MANAGER_64 BITMAP DISCARDABLE
+ //IDB_KEY_MANAGER_64M BITMAP DISCARDABLE
+
+ This is the icon for the certificate manager. We provide two
+ resolutions: 16x16 and 32x32 pixel. I have not yet encountered the
+ 32x32 thus most other icons are only available in the 16x16 variant.
+ The IDB_foo identifiers are defined in dialogs.h; see the comments
+ at the top of that file for details.
+
+ For compatibility with OL2003 we can't use PNGs directly but we need
+ to provide bitmaps and a mask for transparency.
+
+ These steps are required to create a new 16x16 icon using The Gimp:
+
+ 1. Take a 16x16 PNG version of the icon and load it into the Gimp.
+ This PNG should have a transparent background. If not, you may
+ use Gimp to wipe the background out.
+
+ 2. Select Select->By_Color, click on the transparent area. Use
+ "Bucket Fill" to fill with white (0xffffff).
+
+ 3. Run Image->Flatten_Image.
+
+ 4. Select Image->Mode->Indexed, click "Generate optimum palette with
+ 255 colors", click "Convert".
+
+ 5. Select File->SaveAs and enter a file name with suffix ".bmp".
+ The name should be like "foo-16.bmp". Do _not_ select
+ "Run-Length Encoded". Click "Save".
+
+ 6. Undo all or reload the image. Note that if you don't undo step 2
+ you may skip step 7.
+
+ 7. Select Select->By_Color, click on the transparent area. Use
+ "Bucket Fill" to fill with white (0xffffff).
+
+ 8. Select Select->Invert. Use "Bucket Fill" to fill the now
+ selected non-transparent area with black (0x000000). "Fill whole
+ selection" comes handy here. Make sure that you have a only
+ black and white and no other colored pixels.
+
+ 9. Run Image->Flatten_Image.
+
+ 10. Select Image->Mode->Indexed, click "Use black and white (1-bit)
+ palette", click "Convert".
+
+ 11. Select File->SaveAs and enter a file name with suffix ".bmp".
+ This is the mask thus the name should be like "foo-16m.bmp". Do
+ _not_ select "Run-Length Encoded". Click "Save".
+
+ 12. Done.
+
+ If required, do this also for 32x32 and 64x64.
+
+
+ 2. Forms icons
+ ===============
+
+ The forms icons which are displayed in the explorer are not a
+ resource of the DLL but installed separately. We have two versions
+ of them: A small one and a large one. Both use a canvas size of
+ 32x32 but the small icon covers only the upper left 16x16 quadrant.
+
+ These steps are required to create the small and the large icon.
+
+ 1. Load a 16x16 PNG version of the icon into The Gimp.
+
+ 2. Select Image->Canvas_Size and enter a size of 32x32 pixel. Keep
+ offset at (0,0), don't use resize layers, click on "Resize".
+
+ 3. Select File->SaveAs and enter a file name with the suffix ".ico".
+ Click "Save" and you will be asked for the type. From the
+ drop-down box choose "8 bpp, 1-bit alpha, 256-slot palette", no
+ compression. Click "Save".
+
+ 4. Load a 32x32 PNG version of the icon into The Gimp.
+
+ 5. Select File->SaveAs and enter a file name with the suffix ".ico".
+ Click "Save" and you will be asked for the type. From the
+ drop-down box choose "8 bpp, 1-bit alpha, 256-slot palette", no
+ compression. Click "Save".
+
+ 6. Done.
+
+
+That's all. The output of the file(1) command should show something
+like this:
+
+ forms/encr-l.ico: ms-windows icon resource - 1 icon
+ forms/encr-s.ico: ms-windows icon resource - 1 icon
+ forms/sign-l.ico: ms-windows icon resource - 1 icon
+ forms/sign-s.ico: ms-windows icon resource - 1 icon
+ src/decrypt-16.bmp: PC bitmap data, Windows 3.x format, 16 x 16 x 8
+ src/decrypt-16m.bmp: PC bitmap data, Windows 3.x format, 16 x 16 x 1
+ src/decrypt-verify-16.bmp: PC bitmap data, Windows 3.x format, 16 x 16 x 8
+ src/decrypt-verify-16m.bmp: PC bitmap data, Windows 3.x format, 16 x 16 x 1
+ src/encrypt-16.bmp: PC bitmap data, Windows 3.x format, 16 x 16 x 8
+ src/encrypt-16m.bmp: PC bitmap data, Windows 3.x format, 16 x 16 x 1
+ src/key-manager-16.bmp: PC bitmap data, Windows 3.x format, 16 x 16 x 8
+ src/key-manager-16m.bmp: PC bitmap data, Windows 3.x format, 16 x 16 x 1
+ src/key-manager-32.bmp: PC bitmap data, Windows 3.x format, 32 x 32 x 8
+ src/key-manager-32m.bmp: PC bitmap data, Windows 3.x format, 32 x 32 x 1
+ src/logo.bmp: PC bitmap data, Windows 3.x format, 138 x 64 x 1
+ src/sign-16.bmp: PC bitmap data, Windows 3.x format, 16 x 16 x 8
+ src/sign-16m.bmp: PC bitmap data, Windows 3.x format, 16 x 16 x 1
+ src/verify-16.bmp: PC bitmap data, Windows 3.x format, 16 x 16 x 8
+ src/verify-16m.bmp: PC bitmap data, Windows 3.x format, 16 x 16 x 1
+
Deleted: trunk/src/cryptostate.bmp
Modified: trunk/src/decrypt-16.bmp
===================================================================
(Binary files differ)
Modified: trunk/src/decrypt-16m.bmp
===================================================================
(Binary files differ)
Added: trunk/src/decrypt-32.bmp
===================================================================
(Binary files differ)
Property changes on: trunk/src/decrypt-32.bmp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/decrypt-32m.bmp
===================================================================
(Binary files differ)
Property changes on: trunk/src/decrypt-32m.bmp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/src/decrypt-verify-16.bmp
===================================================================
(Binary files differ)
Modified: trunk/src/decrypt-verify-16m.bmp
===================================================================
(Binary files differ)
Added: trunk/src/decrypt-verify-32.bmp
===================================================================
(Binary files differ)
Property changes on: trunk/src/decrypt-verify-32.bmp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/decrypt-verify-32m.bmp
===================================================================
(Binary files differ)
Property changes on: trunk/src/decrypt-verify-32m.bmp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/src/dialogs.rc
===================================================================
--- trunk/src/dialogs.rc 2009-12-08 22:36:03 UTC (rev 325)
+++ trunk/src/dialogs.rc 2009-12-22 16:35:20 UTC (rev 326)
@@ -25,49 +25,38 @@
IDB_ENCRYPT_16 BITMAP DISCARDABLE "encrypt-16.bmp"
IDB_ENCRYPT_16M BITMAP DISCARDABLE "encrypt-16m.bmp"
-//IDB_ENCRYPT_32 BITMAP DISCARDABLE
-//IDB_ENCRYPT_32M BITMAP DISCARDABLE
-//IDB_ENCRYPT_64 BITMAP DISCARDABLE
-//IDB_ENCRYPT_64M BITMAP DISCARDABLE
+IDB_ENCRYPT_32 BITMAP DISCARDABLE "encrypt-32.bmp"
+IDB_ENCRYPT_32M BITMAP DISCARDABLE "encrypt-32m.bmp"
IDB_SIGN_16 BITMAP DISCARDABLE "sign-16.bmp"
IDB_SIGN_16M BITMAP DISCARDABLE "sign-16m.bmp"
-//IDB_SIGN_32 BITMAP DISCARDABLE
-//IDB_SIGN_32M BITMAP DISCARDABLE
-//IDB_SIGN_64 BITMAP DISCARDABLE
-//IDB_SIGN_64M BITMAP DISCARDABLE
+IDB_SIGN_32 BITMAP DISCARDABLE "sign-32.bmp"
+IDB_SIGN_32M BITMAP DISCARDABLE "sign-32m.bmp"
IDB_KEY_MANAGER_16 BITMAP DISCARDABLE "key-manager-16.bmp"
IDB_KEY_MANAGER_16M BITMAP DISCARDABLE "key-manager-16m.bmp"
IDB_KEY_MANAGER_32 BITMAP DISCARDABLE "key-manager-32.bmp"
IDB_KEY_MANAGER_32M BITMAP DISCARDABLE "key-manager-32m.bmp"
-//IDB_KEY_MANAGER_64 BITMAP DISCARDABLE
-//IDB_KEY_MANAGER_64M BITMAP DISCARDABLE
+IDB_KEY_MANAGER_64 BITMAP DISCARDABLE "key-manager-64.bmp"
+IDB_KEY_MANAGER_64M BITMAP DISCARDABLE "key-manager-64m.bmp"
-IDB_DECRYPT_16 BITMAP DISCARDABLE "decrypt-16.bmp"
+IDB_DECRYPT_16 BITMAP DISCARDABLE "decrypt-16.bmp"
IDB_DECRYPT_16M BITMAP DISCARDABLE "decrypt-16m.bmp"
-//IDB_DECRYPT_32 BITMAP DISCARDABLE
-//IDB_DECRYPT_32M BITMAP DISCARDABLE
-//IDB_DECRYPT_64 BITMAP DISCARDABLE
-//IDB_DECRYPT_64M BITMAP DISCARDABLE
+IDB_DECRYPT_32 BITMAP DISCARDABLE "decrypt-32.bmp"
+IDB_DECRYPT_32M BITMAP DISCARDABLE "decrypt-32m.bmp"
IDB_VERIFY_16 BITMAP DISCARDABLE "verify-16.bmp"
IDB_VERIFY_16M BITMAP DISCARDABLE "verify-16m.bmp"
-//IDB_VERIFY_32 BITMAP DISCARDABLE
-//IDB_VERIFY_32M BITMAP DISCARDABLE
-//IDB_VERIFY_64 BITMAP DISCARDABLE
-//IDB_VERIFY_64M BITMAP DISCARDABLE
+IDB_VERIFY_32 BITMAP DISCARDABLE "verify-32.bmp"
+IDB_VERIFY_32M BITMAP DISCARDABLE "verify-32m.bmp"
IDB_DECRYPT_VERIFY_16 BITMAP DISCARDABLE "decrypt-verify-16.bmp"
IDB_DECRYPT_VERIFY_16M BITMAP DISCARDABLE "decrypt-verify-16m.bmp"
-//IDB_DECRYPT_VERIFY_32 BITMAP DISCARDABLE
-//IDB_DECRYPT_VERIFY_32M BITMAP DISCARDABLE
-//IDB_DECRYPT_VERIFY_64 BITMAP DISCARDABLE
-//IDB_DECRYPT_VERIFY_64M BITMAP DISCARDABLE
+IDB_DECRYPT_VERIFY_32 BITMAP DISCARDABLE "decrypt-verify-32.bmp"
+IDB_DECRYPT_VERIFY_32M BITMAP DISCARDABLE "decrypt-verify-32m.bmp"
-
IDB_BANNER BITMAP DISCARDABLE "logo.bmp"
Modified: trunk/src/encrypt-16.bmp
===================================================================
(Binary files differ)
Modified: trunk/src/encrypt-16m.bmp
===================================================================
(Binary files differ)
Added: trunk/src/encrypt-32.bmp
===================================================================
(Binary files differ)
Property changes on: trunk/src/encrypt-32.bmp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/encrypt-32m.bmp
===================================================================
(Binary files differ)
Property changes on: trunk/src/encrypt-32m.bmp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/src/engine-assuan.c
===================================================================
--- trunk/src/engine-assuan.c 2009-12-08 22:36:03 UTC (rev 325)
+++ trunk/src/engine-assuan.c 2009-12-22 16:35:20 UTC (rev 326)
@@ -1836,7 +1836,7 @@
/* We always send the SENDER command because it allows us to figure
out the protocol to use. In case the UI server fails to send the
- protocol we fall back to OpenPGP. The --protocol option isused
+ protocol we fall back to OpenPGP. The --protocol option is used
to given the server a hint on what protocol we would prefer. */
suggested_protocol = PROTOCOL_UNKNOWN;
if (!sender)
Modified: trunk/src/key-manager-16.bmp
===================================================================
(Binary files differ)
Modified: trunk/src/key-manager-16m.bmp
===================================================================
(Binary files differ)
Modified: trunk/src/key-manager-32.bmp
===================================================================
(Binary files differ)
Modified: trunk/src/key-manager-32m.bmp
===================================================================
(Binary files differ)
Added: trunk/src/key-manager-64.bmp
===================================================================
(Binary files differ)
Property changes on: trunk/src/key-manager-64.bmp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/key-manager-64m.bmp
===================================================================
(Binary files differ)
Property changes on: trunk/src/key-manager-64m.bmp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/src/key_mana.bmp
Modified: trunk/src/sign-16.bmp
===================================================================
(Binary files differ)
Modified: trunk/src/sign-16m.bmp
===================================================================
(Binary files differ)
Added: trunk/src/sign-32.bmp
===================================================================
(Binary files differ)
Property changes on: trunk/src/sign-32.bmp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/sign-32m.bmp
===================================================================
(Binary files differ)
Property changes on: trunk/src/sign-32m.bmp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/src/verify-16.bmp
===================================================================
(Binary files differ)
Modified: trunk/src/verify-16m.bmp
===================================================================
(Binary files differ)
Added: trunk/src/verify-32.bmp
===================================================================
(Binary files differ)
Property changes on: trunk/src/verify-32.bmp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/verify-32m.bmp
===================================================================
(Binary files differ)
Property changes on: trunk/src/verify-32m.bmp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
More information about the Gnupg-commits
mailing list