From c7a206e9b1328fd64263fa155d4cdb8dad939bf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Sundstr=C3=B6m?= Date: Sun, 6 Sep 2009 18:37:48 +0000 Subject: [PATCH] =?UTF-8?q?=C2=A1Ya=20basta!=20No=20more=20bitmap=20icons.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32970 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/people/PeopleApp.cpp | 8 +-- src/apps/people/PersonIcons.h | 131 ++++++++++------------------------ 2 files changed, 38 insertions(+), 101 deletions(-) diff --git a/src/apps/people/PeopleApp.cpp b/src/apps/people/PeopleApp.cpp index a60752c488..6f49470ca8 100644 --- a/src/apps/people/PeopleApp.cpp +++ b/src/apps/people/PeopleApp.cpp @@ -106,16 +106,10 @@ TPeopleApp::TPeopleApp(void) } } if (!valid) { - BBitmap largeIcon(BRect(0, 0, B_LARGE_ICON - 1, B_LARGE_ICON - 1), B_CMAP8); - BBitmap miniIcon(BRect(0, 0, B_MINI_ICON - 1, B_MINI_ICON - 1), B_CMAP8); - mime.Install(); - largeIcon.SetBits(kLargePersonIcon, largeIcon.BitsLength(), 0, B_CMAP8); - miniIcon.SetBits(kSmallPersonIcon, miniIcon.BitsLength(), 0, B_CMAP8); mime.SetShortDescription("Person"); mime.SetLongDescription("Contact information for a person."); - mime.SetIcon(&largeIcon, B_LARGE_ICON); - mime.SetIcon(&miniIcon, B_MINI_ICON); + mime.SetIcon(kPersonIcon, sizeof(kPersonIcon)); mime.SetPreferredApp(APP_SIG); // add relevant person fields to meta-mime type diff --git a/src/apps/people/PersonIcons.h b/src/apps/people/PersonIcons.h index 65740c3861..bf9530d627 100644 --- a/src/apps/people/PersonIcons.h +++ b/src/apps/people/PersonIcons.h @@ -1,97 +1,40 @@ -//-------------------------------------------------------------------- -// -// PersonIcons.h -// -// Written by: Robert Polic -// -//-------------------------------------------------------------------- -/* - Copyright 1999, Be Incorporated. All Rights Reserved. - This file may be used under the terms of the Be Sample Code License. -*/ -const uint8 kLargePersonIcon [] = { - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x02,0x02,0x00,0x08,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x04,0x1b,0x18,0x11,0x08,0x02,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x04,0x1b,0x3f,0x3f,0x1b,0x15,0x09,0x00, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x02,0x1b,0x3f,0x3f,0x1b,0x15,0x0b,0x00, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x04,0x15,0x1c,0x1b,0x18,0x11,0x08,0x00, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x02,0x08,0x15,0x16,0x15,0x0b,0x08,0x00, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0xf9,0x00,0x0a,0x0b,0x08,0x0b,0x00,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x3f,0xf9,0x7d,0x00,0x00,0x00,0x00,0x7d,0x00, - 0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0x00,0xf9,0x3f,0x3f,0x7d,0x7d,0x7d,0x7d,0x7d,0x7d, - 0xf9,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0x00,0xf9,0xf9,0xf9,0x3f,0x3f,0xf9,0xf9,0xf9,0xf9, - 0x7d,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0x00,0xf9,0xf9,0xf9,0xf9,0xf9,0x3f,0x3f,0xf9,0x7d, - 0x7d,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0x00,0xf9,0xf9,0xf9,0xf9,0xf9,0xf9,0xf9,0x7d,0x7d, - 0x7d,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0x00,0xf9,0xf9,0xf9,0xf9,0xf9,0xf9,0xf9,0x7d,0x7d, - 0x7d,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0x00,0xf9,0xf9,0xf9,0xf9,0xf9,0xf9,0xf9,0x7d,0x7d, - 0x7d,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0x00,0xf9,0xf9,0xf9,0xf9,0xf9,0xf9,0xf9,0x7d,0x7d, - 0x7d,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0x00,0xf9,0xf9,0xf9,0xf9,0xf9,0xf9,0xf9,0x7d,0x7d, - 0x7d,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0xf9,0xf9,0xf9,0xf9,0xf9,0xf9,0x7d,0x7d, - 0xc5,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0xf9,0xf9,0xf9,0xf9,0xf9,0xf9,0x7d,0xc5, - 0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0xf9,0xf9,0xc5,0xf9,0xf9,0xf9,0xc5,0xc5, - 0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0xf9,0xf9,0xc5,0xf9,0xf9,0xc5,0xc5,0x7d, - 0x00,0x0a,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0xf9,0xf9,0xc5,0xf9,0xf9,0x7d,0x7d,0x7d, - 0x00,0x0a,0x0b,0x0a,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0xf9,0xf9,0xc5,0xf9,0xf9,0x7d,0x7d,0x7d, - 0x00,0x0a,0x0b,0x0a,0x0b,0x0b,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0xf9,0xf9,0xc5,0xf9,0xf9,0x7d,0x7d,0x7d, - 0x00,0x0a,0x0b,0x0a,0x0b,0x0b,0x0a,0x0b,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0xf9,0xf9,0xc5,0xf9,0xf9,0x7d,0x7d,0x7d, - 0x00,0x0a,0x0b,0x0a,0x0b,0x0b,0x0a,0x0b,0x0b,0x0a,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0xf9,0xf9,0xc5,0xf9,0xf9,0x7d,0x7d,0x7d, - 0x00,0x0a,0x0b,0x0a,0x0b,0x0b,0x0a,0x0b,0x0b,0x0a,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0xf9,0xf9,0xc5,0xf9,0xf9,0x7d,0x7d,0x7d, - 0x00,0x0a,0x0b,0x0a,0x0b,0x0b,0x0a,0x0b,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0xf9,0xc5,0xf9,0xf9,0x7d,0x7d,0x7d, - 0x00,0x0a,0x0b,0x0a,0x0b,0x0b,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0xf9,0xf9,0x7d,0x7d,0x00, - 0x0a,0x0b,0x0a,0x0b,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x0a, - 0x0b,0x0a,0x0b,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff +const uint8 kPersonIcon[] = { + 0x6e, 0x63, 0x69, 0x66, 0x08, 0x05, 0x00, 0x02, 0x00, 0x06, 0x02, 0x3c, + 0xad, 0xf4, 0x3d, 0x10, 0x4e, 0xbf, 0x02, 0xca, 0x3e, 0xa2, 0x22, 0x4a, + 0xf0, 0x20, 0x46, 0x64, 0x8d, 0x00, 0xff, 0xdb, 0x97, 0xff, 0xfc, 0xaf, + 0x29, 0x02, 0x00, 0x06, 0x02, 0x3a, 0x64, 0x96, 0xba, 0x3f, 0x15, 0x3e, + 0xbc, 0xdd, 0x3e, 0xea, 0x91, 0x46, 0x59, 0x6a, 0x43, 0xb1, 0x57, 0x00, + 0xff, 0xf7, 0xea, 0xfe, 0xfd, 0xd1, 0x7b, 0x02, 0x00, 0x06, 0x02, 0x3a, + 0xb3, 0x67, 0x37, 0x51, 0xb2, 0xbc, 0x59, 0x78, 0x3f, 0xd2, 0xd7, 0x4a, + 0xe3, 0xf1, 0x46, 0xf8, 0x59, 0x00, 0xc8, 0x58, 0x05, 0xff, 0xf0, 0x63, + 0x06, 0x02, 0x01, 0x06, 0x03, 0x3b, 0xc7, 0x1c, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x3b, 0xb6, 0xdb, 0x48, 0xd4, 0x00, 0x45, 0x30, 0x00, 0x00, + 0xf2, 0xf2, 0xf2, 0xab, 0x7d, 0x7a, 0x7a, 0xff, 0xbc, 0xa1, 0x84, 0x04, + 0x01, 0x6c, 0x03, 0xa3, 0x29, 0x04, 0x02, 0x00, 0x06, 0x02, 0x38, 0x8a, + 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x4a, 0x20, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x58, 0x04, 0xff, 0xdc, 0x95, 0x2f, + 0x09, 0x0a, 0x0d, 0x2c, 0x32, 0x2c, 0x43, 0x30, 0x47, 0x30, 0x58, 0x34, + 0x5a, 0x36, 0x5a, 0x37, 0xca, 0xb5, 0x3c, 0x5e, 0x44, 0x56, 0x44, 0x4b, + 0x48, 0x47, 0x48, 0x35, 0x35, 0x2c, 0x0a, 0x0b, 0x2c, 0x32, 0x2c, 0x43, + 0x30, 0x47, 0x30, 0x58, 0x34, 0x5a, 0x36, 0x5a, 0x37, 0xca, 0xb5, 0x3c, + 0x5e, 0x3c, 0x4d, 0x40, 0x4d, 0x40, 0x3b, 0x0a, 0x06, 0x2c, 0x32, 0x40, + 0x3b, 0x48, 0x35, 0x3a, 0x34, 0xbf, 0xbf, 0xb9, 0xc5, 0x35, 0x2c, 0x0a, + 0x08, 0x40, 0x4d, 0x3c, 0x4d, 0x3c, 0x5e, 0x44, 0x56, 0x44, 0x4b, 0x48, + 0x47, 0x48, 0x35, 0x40, 0x3b, 0x02, 0x04, 0x3a, 0x22, 0x3e, 0x22, 0x36, + 0x22, 0x32, 0x2a, 0x32, 0x26, 0x32, 0x2e, 0x3a, 0x32, 0x36, 0x32, 0x3e, + 0x32, 0x42, 0x2a, 0x42, 0x2e, 0x42, 0x26, 0x06, 0x07, 0xfe, 0x1b, 0x3c, + 0x60, 0x46, 0x60, 0x41, 0x60, 0x4b, 0x60, 0xc8, 0x04, 0xcb, 0x59, 0xc6, + 0x35, 0xcb, 0x4a, 0xcc, 0x25, 0xcb, 0x81, 0xcb, 0x40, 0xc8, 0xa9, 0xcd, + 0xca, 0xc9, 0x75, 0xc9, 0xb9, 0xc8, 0x2f, 0xc6, 0x91, 0xc7, 0x6b, 0x54, + 0xc8, 0x37, 0xc5, 0x1c, 0xc6, 0x67, 0x46, 0x50, 0x57, 0x0a, 0x04, 0x3c, + 0x4d, 0x3c, 0x53, 0x44, 0x4b, 0x40, 0x4d, 0x0a, 0x03, 0x3a, 0x34, 0x48, + 0x35, 0x40, 0x31, 0x0a, 0x04, 0x34, 0x5a, 0x36, 0x5a, 0x36, 0x4c, 0x34, + 0x4b, 0x0a, 0x0a, 0x05, 0x01, 0x05, 0x00, 0x0a, 0x00, 0x01, 0x00, 0x10, + 0x01, 0x17, 0x84, 0x00, 0x04, 0x0a, 0x01, 0x01, 0x01, 0x00, 0x0a, 0x02, + 0x01, 0x02, 0x00, 0x0a, 0x03, 0x01, 0x03, 0x00, 0x0a, 0x06, 0x01, 0x06, + 0x00, 0x0a, 0x07, 0x01, 0x07, 0x00, 0x0a, 0x00, 0x01, 0x04, 0x10, 0x01, + 0x17, 0x84, 0x00, 0x04, 0x0a, 0x04, 0x01, 0x04, 0x00, 0x0a, 0x03, 0x01, + 0x08, 0x08, 0x15, 0xff }; -const uint8 kSmallPersonIcon [] = { - 0xff,0xff,0xff,0xff,0xff,0x02,0x02,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0x04,0x15,0x1e,0x15,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0x02,0x1d,0x1e,0x1c,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0x00,0x15,0x1b,0x16,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0x00,0xfa,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0x00,0xf9,0xf9,0xfa,0xfa,0xfa,0xfa,0x00,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0x00,0xf9,0xf9,0xf9,0xf9,0x7d,0x7d,0x00,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0x00,0xf9,0xf9,0xf9,0xf9,0x7d,0x7d,0x00,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0x00,0xf9,0xf9,0xf9,0xf9,0x7d,0x7d,0x00,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0x00,0xf9,0xf9,0xf9,0x7d,0x7d,0x00,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0x00,0xf9,0xf9,0x7d,0x7d,0x00,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0x00,0xf9,0xf9,0x7d,0x7d,0x00,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0x00,0xf9,0xf9,0x7d,0x7d,0x00,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0x00,0xf9,0xf9,0x7d,0x7d,0x00,0x0a,0x0b,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0x00,0x00,0xf9,0x7d,0x7d,0x00,0x0a,0x0b,0x0a,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x0a,0x0b,0x0a,0x0b,0xff,0xff,0xff -};