From d00563dfebf964210ea41fe845545e758dbc0b71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Wed, 5 Mar 2008 21:21:58 +0000 Subject: [PATCH] * Created an icon for the Mail preflet, based on the Mail app icon. * Added vector icon loading for the interface (Haiku build). git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24246 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- data/artwork/icons/Prefs_Mail | Bin 0 -> 36620 bytes src/preferences/mail/ConfigWindow.cpp | 53 +++++++++++++++++--------- src/preferences/mail/e-mail.rdef | 53 +++++++++++++++++++++++++- 3 files changed, 88 insertions(+), 18 deletions(-) create mode 100644 data/artwork/icons/Prefs_Mail diff --git a/data/artwork/icons/Prefs_Mail b/data/artwork/icons/Prefs_Mail new file mode 100644 index 0000000000000000000000000000000000000000..0da703b176a6c226594011a7b685e7a78f08540d GIT binary patch literal 36620 zcmeHQ3w%`7nZKa~1NexKrKzQId8kvV8d*zIMCQ&2Cj3Mg0cl#%P6)vagk(&n8m&J% zTU`rV3t5-#vTK{hXG0%~#Vu5Kn=H1HT~VU8^3rZB+ZE9tW_8glRcHVId+#?nbLUQG zCJc|noS(-p_q*qO=iKlAecyT9bBEd2E-0PipLcb^IxU`-)h%35gsb+onzkERQpL>D z1)hsFt+aH(wS}Ph;fhFggQl@QuO&(S&M#$YtPDPWv$4 zv69FMgV&_+*^hB3GJoNMt4;wOUR$xU3bdiRVrkuNnud0+Zo&1!xdDFxXnwdZR2$K> zLi}x|BEP1UBd_*pS{Sq#w9&qff_jiiFGnVy*J1zSRXQl^729+UC~~v{v;?`vrgws} z?5)USkts_`>|ZMw(!T<;e|o6a?p^=-$u<)EdFgAD!DD}CA}`FapQoZMpSdfk zpChe))_nuIWa?i(se{CRTDmLuZ@gfx|0{cD_tDQ)s9T84XFXtJXX {h2dwo<9$C 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 #include +#include #include #include #include #include -#include #include +#include #include #include #include +using std::nothrow; + // define if you want to have an apply button //#define HAVE_APPLY_BUTTON @@ -53,7 +56,7 @@ const char *kMailto = "mailto:bemaildaemon-talk@bug-br.org.br"; const char *kBugsitePretty = "Bug-Tracker at SourceForge.net"; const char *kBugsite = "http://sourceforge.net/tracker/?func=add&group_id=26926&atid=388726"; const char *kWebsite = "http://www.haiku-os.org"; -const rgb_color kLinkColor = {40,40,180}; +const rgb_color kLinkColor = { 40, 40, 180, 255 }; const uint32 kMsgAccountSelected = 'acsl'; @@ -88,11 +91,13 @@ class AccountsListView : public BListView { class BitmapView : public BView { public: - BitmapView(BBitmap *bitmap) : BView(bitmap->Bounds(),NULL,B_FOLLOW_NONE,B_WILL_DRAW) + BitmapView(BBitmap *bitmap) : BView(bitmap->Bounds(), NULL, + B_FOLLOW_NONE, B_WILL_DRAW) { fBitmap = bitmap; SetDrawingMode(B_OP_ALPHA); + SetBlendingMode(B_PIXEL_ALPHA, B_ALPHA_OVERLAY); } ~BitmapView() @@ -104,12 +109,13 @@ class BitmapView : public BView { SetViewColor(Parent()->ViewColor()); - MoveTo((Parent()->Bounds().Width() - Bounds().Width()) / 2,Frame().top); + MoveTo((Parent()->Bounds().Width() - Bounds().Width()) / 2, + Frame().top); } virtual void Draw(BRect updateRect) { - DrawBitmap(fBitmap,updateRect,updateRect); + DrawBitmap(fBitmap, updateRect, updateRect); } private: @@ -120,24 +126,22 @@ class BitmapView : public BView class AboutTextView : public BTextView { public: - AboutTextView(BRect rect) : BTextView(rect,NULL,rect.OffsetToCopy(B_ORIGIN),B_FOLLOW_NONE,B_WILL_DRAW) + AboutTextView(BRect rect) : BTextView(rect, NULL, + rect.OffsetToCopy(B_ORIGIN), B_FOLLOW_NONE, B_WILL_DRAW) { int32 major = 0,middle = 0,minor = 0,variety = 0,internal = 1; // get version information for app app_info appInfo; - if (be_app->GetAppInfo(&appInfo) == B_OK) - { - BFile file(&appInfo.ref,B_READ_ONLY); - if (file.InitCheck() == B_OK) - { + if (be_app->GetAppInfo(&appInfo) == B_OK) { + BFile file(&appInfo.ref, B_READ_ONLY); + if (file.InitCheck() == B_OK) { BAppFileInfo info(&file); - if (info.InitCheck() == B_OK) - { + if (info.InitCheck() == B_OK) { version_info versionInfo; - if (info.GetVersionInfo(&versionInfo,B_APP_VERSION_KIND) == B_OK) - { + if (info.GetVersionInfo(&versionInfo, + B_APP_VERSION_KIND) == B_OK) { major = versionInfo.major; middle = versionInfo.middle; minor = versionInfo.minor; @@ -440,12 +444,13 @@ ConfigWindow::~ConfigWindow() void ConfigWindow::MakeHowToView() { +#ifndef HAIKU_TARGET_PLATFORM_HAIKU BResources *resources = BApplication::AppResources(); if (resources) { size_t length; char *buffer = (char *)resources->FindResource(B_LARGE_ICON_TYPE, 101, &length); if (buffer) { - BBitmap *bitmap = new BBitmap(BRect(0, 0, 63, 63), B_CMAP8); + BBitmap *bitmap = new (nothrow) BBitmap(BRect(0, 0, 63, 63), B_CMAP8); if (bitmap && bitmap->InitCheck() == B_OK) { // copy and enlarge a 32x32 8-bit bitmap char *bits = (char *)bitmap->Bits(); @@ -461,6 +466,20 @@ ConfigWindow::MakeHowToView() delete bitmap; } } +#else + app_info info; + if (be_app->GetAppInfo(&info) == B_OK) { + BFile appFile(&info.ref, B_READ_ONLY); + BAppFileInfo appFileInfo(&appFile); + if (appFileInfo.InitCheck() == B_OK) { + BBitmap *bitmap = new (nothrow) BBitmap(BRect(0, 0, 63, 63), B_RGBA32); + if (appFileInfo.GetIcon(bitmap, B_LARGE_ICON) == B_OK) { + fConfigView->AddChild(new BitmapView(bitmap)); + } else + delete bitmap; + } + } +#endif // HAIKU_TARGET_PLATFORM_HAIKU BRect rect = fConfigView->Bounds(); BTextView *text = new BTextView(rect, NULL, rect, B_FOLLOW_NONE, B_WILL_DRAW); diff --git a/src/preferences/mail/e-mail.rdef b/src/preferences/mail/e-mail.rdef index ed1eeb0287..f7730ff71c 100644 --- a/src/preferences/mail/e-mail.rdef +++ b/src/preferences/mail/e-mail.rdef @@ -15,9 +15,57 @@ resource app_version { internal = 3, short_info = "E-mail", - long_info = "E-mail ©2005-2006 Haiku" + long_info = "E-mail ©2005-2008 Haiku" }; +#ifdef HAIKU_TARGET_PLATFORM_HAIKU + +resource vector_icon { + $"6E63696619050004006A020006063C55F93D5C9ABF48EE3E484E4B6A43C35976" + $"495F849385EAF7FFA2A5B7C2C2A0BCCCDC748994FF829AB2020006033B9EE13B" + $"9EE1BB9EE13B9EE14A10E147F9EB00ACD3DB9FFFFFFFFF6492A8020006023A2A" + $"16B8F45D3AE2F43C1D5446BCF5477C2100F7FBFDFF31596B02000603BA68BD3A" + $"CB11BCBEBBBC5E184A35D549E60100343D412F364145FF566F7A020006023B4E" + $"07BA96743B15213BEFCE499B3D4A176700435563FF2D404802000602B275353A" + $"6F4ABC7EBAB484CB49DE564A6F2E00BED1DBFF8DADBA020006033C0E4E3CF575" + $"BF48EE3E484E4BCE1841BF59495F849385EAF7FFC4A0BCCC020006023A11DA3A" + $"5196BACC2E3A7F4848C35C4A23C100FFEEC0FFE7D6A80200060238DDE0B86563" + $"3B86F63C1C2A48AFCD493E7A00B4A06BFFA28B4E03826A310357697C03F20606" + $"020006022F146D3B80D3BC7FF03032974B85E5482BA200FFC7BAFFC31A1A0200" + $"06022F146D3B80D3BC7FF03032974B85E5482BA201E3E3E3FF59697A02000602" + $"2F146D3B80D3BC7FF03032974B75E5484BA200D6D9DCFF78899903FAA28E0200" + $"16023C9F493AEA2DBAABFF3C6759485B5A4A38E400FFFFDA0300337F02000603" + $"2E9D8036396AB97D97320D5448FDF84B9FEA00FFEECEE3F4A91AFFD78F05059E" + $"020006022E56F335D63CB97D683220C948CD3E4BB3CA00FFE2CEFFA67C620200" + $"1602320FFC35FEF8B8E7A334FFA04A967B4B950500F5FF94020006022E56F335" + $"D63CB97D683220C948ED3E4BB3CA00FFDBD5FFFCA98F190610AAAC2FFE465631" + $"5C2B5E31604A4D5E4D604D5C4A5CC2FC564C56C41E564E5653535155C788C71B" + $"C9764E5B5F48CB8147CB8147CC4D4460406043603D5C3B5E3C5C3B0204464745" + $"3BC291BE263C2DC189B9DE382B2F2D342B342D392F362DBFCBBADC0608FEAF5A" + $"405A345A345A2B4E23572649213F2545223F252E2D2E2DB7AFB8FEB6FDBC282A" + $"BA75B6FDBC282A49C1BCC81F0607FE1A5A405A345A345A2B4E23572649213F25" + $"45223F252E2D44455608022C3AC131C13E0404FE44564446444F443D382FC066" + $"BAE5BAE0B8222D2F302D2D2F0606EF03382F382FB89AB6FEB6FDBD5A2A30B6FD" + $"BD5A2A492B3A2B3A2B30382F2E2A382FBC910605EF03382F382FB89AB6FEB763" + $"BD5A2B30B763BD5A2B49C0BBBDBDC0BBBDBDC000BB9BBC912FBE9DBA00BC912F" + $"0605FE022C4A444D3B49444D44454445C156C041C0BBBDBDC122BEEAC0BBBDBD" + $"2A490A0844C7EB44442C3A2C4ABE31C68A3F4A434CBFEFC74D0A04BE31C68A3F" + $"4A434CBFEFC74D0A054EBA2B4E285623562C50310A044CB9BA4C274E284EBA20" + $"0A044C274E28562354220A044E404EBA2B4F324F3F0A044E404C3F4CB9C54EBA" + $"390A084C274C3F4E404F3F4F32562C562354220606B60E304246384CBB53C34B" + $"BDB7C5AF3C52404C3C48BF65C3B6BC53C1CB0A0E314534463549384A384B3B4B" + $"3B4D3E4C3C4B3B4939493847364734450606CA022B5A3058484A5A4A584A5C48" + $"5C300A0430584658465C305C0A032B5AB82DC9CAB838CA710A04B82DC9CA3058" + $"305CB838CA710A0446584858485C465C06032E48584A5A4A584A5C485C190A01" + $"0100000A000202131001178402040A020103000A030101000A00010510011784" + $"00040A040106000A050107000A060108000A070109000A0C010A000A08010410" + $"01178200040A0001101001178400040A0D010B000A0E010C000A11010D000A0F" + $"010E000A10010F000A0001111001178400040A120111000A1301120815FF0A14" + $"0114000A150115000A160116000A170117000A18011800" +}; + +#else // HAIKU_TARGET_PLATFORM_HAIKU + resource large_icon { $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" @@ -72,4 +120,7 @@ resource mini_icon { $"FFFF00000F0F0F0F0FFFFFFFFFFFFFFF" }; +#endif // HAIKU_TARGET_PLATFORM_HAIKU + + resource(1, "BEOS:FILE_TYPES") message;