Updated all icons. These are now final versions (At least I hope that).
authorWerner Koch <wk@gnupg.org>
Tue, 22 Dec 2009 16:35:20 +0000 (16:35 +0000)
committerWerner Koch <wk@gnupg.org>
Tue, 22 Dec 2009 16:35:20 +0000 (16:35 +0000)
Add README.icons to document how to create the icons.

38 files changed:
ChangeLog
forms/encr-l.ico
forms/encr-s.ico
forms/sign-l.ico
forms/sign-s.ico
src/ChangeLog
src/Makefile.am
src/README.icons [new file with mode: 0644]
src/cryptostate.bmp [deleted file]
src/decrypt-16.bmp
src/decrypt-16m.bmp
src/decrypt-32.bmp [new file with mode: 0644]
src/decrypt-32m.bmp [new file with mode: 0644]
src/decrypt-verify-16.bmp
src/decrypt-verify-16m.bmp
src/decrypt-verify-32.bmp [new file with mode: 0644]
src/decrypt-verify-32m.bmp [new file with mode: 0644]
src/dialogs.rc
src/encrypt-16.bmp
src/encrypt-16m.bmp
src/encrypt-32.bmp [new file with mode: 0644]
src/encrypt-32m.bmp [new file with mode: 0644]
src/engine-assuan.c
src/key-manager-16.bmp
src/key-manager-16m.bmp
src/key-manager-32.bmp
src/key-manager-32m.bmp
src/key-manager-64.bmp [new file with mode: 0644]
src/key-manager-64m.bmp [new file with mode: 0644]
src/key_mana.bmp [deleted file]
src/sign-16.bmp
src/sign-16m.bmp
src/sign-32.bmp [new file with mode: 0644]
src/sign-32m.bmp [new file with mode: 0644]
src/verify-16.bmp
src/verify-16m.bmp
src/verify-32.bmp [new file with mode: 0644]
src/verify-32m.bmp [new file with mode: 0644]

index 941ffa3..bd1a8bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-22  Werner Koch  <wk@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@g10code.com>
 
        * forms/Makefile.am (cfg_english): New.
index 2f1f122..0946f76 100755 (executable)
Binary files a/forms/encr-l.ico and b/forms/encr-l.ico differ
index 92c0c50..114afef 100755 (executable)
Binary files a/forms/encr-s.ico and b/forms/encr-s.ico differ
index ec03b4b..4d3d070 100755 (executable)
Binary files a/forms/sign-l.ico and b/forms/sign-l.ico differ
index 04865d7..cc63eba 100755 (executable)
Binary files a/forms/sign-s.ico and b/forms/sign-s.ico differ
index 8b227af..7ad4956 100644 (file)
@@ -1,3 +1,25 @@
+2009-12-22  Werner Koch  <wk@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@g10code.com>
+
+       * README.icons: New.
+
 2009-12-08  Marcus Brinkmann  <marcus@g10code.de>
 
        * engine-assuan.c (getinfo_pid_cb, prep_foo_status_cb): Change
index c881d11..220a013 100644 (file)
@@ -18,13 +18,19 @@ bin_PROGRAMS = gpgol
 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
 
diff --git a/src/README.icons b/src/README.icons
new file mode 100644 (file)
index 0000000..fca2b61
--- /dev/null
@@ -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
+
diff --git a/src/cryptostate.bmp b/src/cryptostate.bmp
deleted file mode 100644 (file)
index 5c6c9b2..0000000
Binary files a/src/cryptostate.bmp and /dev/null differ
index f2251f1..5bb0f10 100644 (file)
Binary files a/src/decrypt-16.bmp and b/src/decrypt-16.bmp differ
index 71ab4a7..f6c1fab 100644 (file)
Binary files a/src/decrypt-16m.bmp and b/src/decrypt-16m.bmp differ
diff --git a/src/decrypt-32.bmp b/src/decrypt-32.bmp
new file mode 100644 (file)
index 0000000..f7d4405
Binary files /dev/null and b/src/decrypt-32.bmp differ
diff --git a/src/decrypt-32m.bmp b/src/decrypt-32m.bmp
new file mode 100644 (file)
index 0000000..47256be
Binary files /dev/null and b/src/decrypt-32m.bmp differ
index b2680ea..7f4fddc 100644 (file)
Binary files a/src/decrypt-verify-16.bmp and b/src/decrypt-verify-16.bmp differ
index c13623c..c90b425 100644 (file)
Binary files a/src/decrypt-verify-16m.bmp and b/src/decrypt-verify-16m.bmp differ
diff --git a/src/decrypt-verify-32.bmp b/src/decrypt-verify-32.bmp
new file mode 100644 (file)
index 0000000..059cc7f
Binary files /dev/null and b/src/decrypt-verify-32.bmp differ
diff --git a/src/decrypt-verify-32m.bmp b/src/decrypt-verify-32m.bmp
new file mode 100644 (file)
index 0000000..c4e3d3c
Binary files /dev/null and b/src/decrypt-verify-32m.bmp differ
index cb8f625..357d595 100644 (file)
 
 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"
 
 
 
index 400df01..dedb0cb 100644 (file)
Binary files a/src/encrypt-16.bmp and b/src/encrypt-16.bmp differ
index c86ddd2..cf0d3c9 100644 (file)
Binary files a/src/encrypt-16m.bmp and b/src/encrypt-16m.bmp differ
diff --git a/src/encrypt-32.bmp b/src/encrypt-32.bmp
new file mode 100644 (file)
index 0000000..b2c400e
Binary files /dev/null and b/src/encrypt-32.bmp differ
diff --git a/src/encrypt-32m.bmp b/src/encrypt-32m.bmp
new file mode 100644 (file)
index 0000000..f4fc2dc
Binary files /dev/null and b/src/encrypt-32m.bmp differ
index 018352b..569c794 100644 (file)
@@ -1836,7 +1836,7 @@ op_assuan_sign (protocol_t protocol,
 
   /* 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)
index 6ee81ca..2916624 100644 (file)
Binary files a/src/key-manager-16.bmp and b/src/key-manager-16.bmp differ
index a5a5e30..1c0af6a 100644 (file)
Binary files a/src/key-manager-16m.bmp and b/src/key-manager-16m.bmp differ
index 39f3ab5..4e97da0 100644 (file)
Binary files a/src/key-manager-32.bmp and b/src/key-manager-32.bmp differ
index b413659..9c4f21e 100644 (file)
Binary files a/src/key-manager-32m.bmp and b/src/key-manager-32m.bmp differ
diff --git a/src/key-manager-64.bmp b/src/key-manager-64.bmp
new file mode 100644 (file)
index 0000000..036ac2d
Binary files /dev/null and b/src/key-manager-64.bmp differ
diff --git a/src/key-manager-64m.bmp b/src/key-manager-64m.bmp
new file mode 100644 (file)
index 0000000..d79e998
Binary files /dev/null and b/src/key-manager-64m.bmp differ
diff --git a/src/key_mana.bmp b/src/key_mana.bmp
deleted file mode 100644 (file)
index 6fbf80e..0000000
Binary files a/src/key_mana.bmp and /dev/null differ
index 005fb6f..472be5a 100644 (file)
Binary files a/src/sign-16.bmp and b/src/sign-16.bmp differ
index 294865f..e4e99e4 100644 (file)
Binary files a/src/sign-16m.bmp and b/src/sign-16m.bmp differ
diff --git a/src/sign-32.bmp b/src/sign-32.bmp
new file mode 100644 (file)
index 0000000..5bb0784
Binary files /dev/null and b/src/sign-32.bmp differ
diff --git a/src/sign-32m.bmp b/src/sign-32m.bmp
new file mode 100644 (file)
index 0000000..0efcd7c
Binary files /dev/null and b/src/sign-32m.bmp differ
index f592e55..3c08f71 100644 (file)
Binary files a/src/verify-16.bmp and b/src/verify-16.bmp differ
index 9ec605a..42c242d 100644 (file)
Binary files a/src/verify-16m.bmp and b/src/verify-16m.bmp differ
diff --git a/src/verify-32.bmp b/src/verify-32.bmp
new file mode 100644 (file)
index 0000000..05f31f5
Binary files /dev/null and b/src/verify-32.bmp differ
diff --git a/src/verify-32m.bmp b/src/verify-32m.bmp
new file mode 100644 (file)
index 0000000..933186e
Binary files /dev/null and b/src/verify-32m.bmp differ