From 615d572db00c03d9de04a6d3ed0f3c50929e0635 Mon Sep 17 00:00:00 2001 From: John Scipione Date: Fri, 4 May 2012 01:17:48 -0400 Subject: [PATCH] Fix #8505 cut-off Deskbar leaf bug. Replace the leaf bitmap with a non-cutoff version derived from the 'data/artwork/Haiku Leaf' file. So, when icon size is > 16 the full deskbar leaf is shown without the bottom cut-off. It should look pretty much identical at 16x16 and in vertical mode at any icon size. Also add a deskbar_leaf.png file to the data/artwork directory although I didn't use that file in Deskbar, instead I embed an archive bitmap into icons.h. I got rid of icon-freelogo.rdef and icons_logo.h. --- data/artwork/deskbar_leaf.png | Bin 0 -> 3096 bytes src/apps/deskbar/BarMenuBar.cpp | 6 +- src/apps/deskbar/BarMenuTitle.cpp | 2 +- src/apps/deskbar/ExpandoMenuBar.cpp | 9 +- src/apps/deskbar/Jamfile | 2 +- src/apps/deskbar/StatusView.cpp | 4 +- src/apps/deskbar/icon-freelogo.rdef | 186 --------------------------- src/apps/deskbar/icons.h | 1 + src/apps/deskbar/icons.rdef | 192 +++++++++++++++++++++++++++- src/apps/deskbar/icons_logo.h | 3 - 10 files changed, 206 insertions(+), 199 deletions(-) create mode 100644 data/artwork/deskbar_leaf.png delete mode 100644 src/apps/deskbar/icon-freelogo.rdef delete mode 100644 src/apps/deskbar/icons_logo.h diff --git a/data/artwork/deskbar_leaf.png b/data/artwork/deskbar_leaf.png new file mode 100644 index 0000000000000000000000000000000000000000..62f4be82034e918d87939ad63d7c195df7af58ed GIT binary patch literal 3096 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 m+XzMudGB!;4x^$UYW){D<=|e*x #include "icons.h" -#include "icons_logo.h" + #include "BarWindow.h" #include "DeskbarMenu.h" #include "DeskbarUtils.h" @@ -61,8 +61,10 @@ TBarMenuBar::TBarMenuBar(TBarView* bar, BRect frame, const char* name) TDeskbarMenu* beMenu = new TDeskbarMenu(bar); TBarWindow::SetDeskbarMenu(beMenu); + const BBitmap* logoBitmap = AppResSet()->FindBitmap(B_MESSAGE_TYPE, + R_LeafLogoBitmap); fDeskbarMenuItem = new TBarMenuTitle(frame.Width(), frame.Height(), - AppResSet()->FindBitmap(B_MESSAGE_TYPE, R_LeafLogoBitmap), beMenu); + logoBitmap, beMenu); AddItem(fDeskbarMenuItem); } diff --git a/src/apps/deskbar/BarMenuTitle.cpp b/src/apps/deskbar/BarMenuTitle.cpp index 4704b6c222..6f9d15fc1f 100644 --- a/src/apps/deskbar/BarMenuTitle.cpp +++ b/src/apps/deskbar/BarMenuTitle.cpp @@ -123,7 +123,7 @@ TBarMenuTitle::DrawContent() dstRect.OffsetTo(frame.LeftTop()); dstRect.OffsetBy(rintf(((frame.Width() - dstRect.Width()) / 2) - 1.0f), rintf(((frame.Height() - dstRect.Height()) / 2) - - 0.0f)); + + 2.0f)); menu->DrawBitmapAsync(fIcon, dstRect); } diff --git a/src/apps/deskbar/ExpandoMenuBar.cpp b/src/apps/deskbar/ExpandoMenuBar.cpp index 2dfe039447..997c0d11c5 100644 --- a/src/apps/deskbar/ExpandoMenuBar.cpp +++ b/src/apps/deskbar/ExpandoMenuBar.cpp @@ -46,14 +46,14 @@ All rights reserved. #include #include +#include "icons.h" + #include "BarApp.h" #include "BarMenuTitle.h" #include "BarView.h" #include "BarWindow.h" #include "DeskbarMenu.h" #include "DeskbarUtils.h" -#include "icons.h" -#include "icons_logo.h" #include "ResourceSet.h" #include "ShowHideMenuItem.h" #include "StatusView.h" @@ -143,8 +143,9 @@ TExpandoMenuBar::AttachedToWindow() R_LeafLogoBitmap); if (logoBitmap != NULL) fDeskbarMenuWidth = logoBitmap->Bounds().Width() + 16; - fDeskbarMenuItem = new TBarMenuTitle(fDeskbarMenuWidth, Frame().Height(), - logoBitmap, beMenu, true); + + fDeskbarMenuItem = new TBarMenuTitle(fDeskbarMenuWidth, + Frame().Height(), logoBitmap, beMenu, true); AddItem(fDeskbarMenuItem); fSeparatorItem = new TTeamMenuItem(kSepItemWidth, itemHeight, fVertical); diff --git a/src/apps/deskbar/Jamfile b/src/apps/deskbar/Jamfile index a2c3e55714..8fc34a1c55 100644 --- a/src/apps/deskbar/Jamfile +++ b/src/apps/deskbar/Jamfile @@ -4,7 +4,7 @@ UsePrivateHeaders app interface locale shared tracker ; UsePrivateHeaders private shared ; SubDirHdrs $(HAIKU_TOP) src kits tracker ; -AddResources Deskbar : Deskbar.rdef icon-freelogo.rdef icons.rdef ; +AddResources Deskbar : Deskbar.rdef icons.rdef ; SubDirC++Flags -DDB_ADDONS -D_INCLUDES_CLASS_DEVICE_MAP=1 diff --git a/src/apps/deskbar/StatusView.cpp b/src/apps/deskbar/StatusView.cpp index d2f36988c1..08da5e939b 100644 --- a/src/apps/deskbar/StatusView.cpp +++ b/src/apps/deskbar/StatusView.cpp @@ -66,13 +66,15 @@ All rights reserved. #include #include +#include "icons.h" + #include "BarApp.h" #include "DeskbarUtils.h" -#include "icons_logo.h" #include "ResourceSet.h" #include "StatusViewShelf.h" #include "TimeView.h" + using std::max; #ifdef DB_ADDONS diff --git a/src/apps/deskbar/icon-freelogo.rdef b/src/apps/deskbar/icon-freelogo.rdef deleted file mode 100644 index bf3fbf771a..0000000000 --- a/src/apps/deskbar/icon-freelogo.rdef +++ /dev/null @@ -1,186 +0,0 @@ - -resource(14, "kLeafLogoBitmap") archive BBitmap -{ - "_frame" = rect { 0.0, 0.0, 62.0, 21.0 }, - "_cspace" = 8200, - "_bmflags" = 0, - "_rowbytes" = 252, - "_data" = array - { - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"000000000000000000000000000000000000000091430021924400579345007d" - $"9447009d954800b6964800c8974900d2984a00d5994b00d1994c00c59b4d00b0" - $"9b4d00939c4e006d9d4f003b9d4f000600000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"904300049144001f000000009447002b954800f3964900fd984a00fd994b00fd" - $"9a4c00fd9b4d00fd9c4e00fd9d4f00fd9e5000fd9f5100fda05100fda05200fd" - $"a15300fda25300fda25300f2a354005a00000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"00000000000000000000000000000000000000009244003b9346009a954700ed" - $"9649008200000000994b00c09a4c00fd9b4d00fd9d4f00fd9e5000fd9f5100fd" - $"a05200fda15300fda35400fda35500fda45500fda55600fda65700fda65800fd" - $"a75800eea7580056000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"000000009245000b9447006b954800d3974900fd984a00fd9a4c00fd9b4d0074" - $"9d4f000e9e5000f9a05100fda15300fda35400fda45500fda55600fda65800fd" - $"a75800fda85900fdaa5b00fdaa5b00fdab5c00fdac5d00fdac5d00faad5e004c" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000009447001b9548008a" - $"974900ee994b00fd9b4d00fd9c4e00fd9e5000fda05100fda1530078a3540046" - $"a45500fda65700fda75800fda95a00fdaa5b00fdab5c00fdac5d00fdae5e00fd" - $"af5f00fdb06000fdb06100fdb16200fdb26300fdb26300850000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"000000000000000000000000954800189749009b994b00f79b4d00fd9d4f00fd" - $"9e5000fda05200fda25300fda45500fda65700fda75800d9a95a0072aa5b00fd" - $"ac5d00fdae5e00fdb06000fdb06100fdb26300fdb36300fdb46400fdb56500fd" - $"b66600fdb76700b7b868003fb969005200000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"97490002994b00759b4d00f09d4f00fd9e5000fda05200fda35400fda45500fd" - $"a65800fda95a00fdaa5b00fdac5d00fdae5e00fdb06000dfb16200fdb36300fd" - $"b56500fdb76700fdb86800fdb96900fdbb6a00fdbc6b00fdbd6c00fdbe6d00fd" - $"be6d00fdbe6e0074000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000009a4c003e9c4e00d0" - $"9e5000fda05200fda35400fda55600fda75800fda95a00fdab5c00fdad5e00fd" - $"b06000fdb16200fdb36300fdb56500fdb76700fdb96900fdbb6a00fdbd6c00fd" - $"be6d00fdc06f00fdc07000fdc17100fdc27200fdc37300fdc47400fdc47400f9" - $"c574004500000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000009b4d00219d4f00b7a05100fda25300fda45500fd" - $"a65800fda95a00fdab5c00fdae5e00fdb06100fdb26300fdb56500fdb76700fd" - $"b96900fdbb6a00fdbd6c00fdbe6e00fdc07000fdc27200fdc47400fdc57400fd" - $"c67500fdc87700fdc97800fdc97800fdca7900fdcb7a00fdcb7a007d00000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"000000000000000000000000000000009447000696480045984a00829a4c00b5" - $"9d4f008d00000000a15300c3a35500fda65800fda95a00fdab5c00fdae5e00fd" - $"b06100fdb26300fdb56500fdb86800fdba6900fdbd6c00fdbe6e00fdc07000fd" - $"c37300fdc57400fdc77600fdc87700fdca7900fdcb7a00fdcd7b00fdce7c00fd" - $"ce7d00fdcf7e00fdcf7e00fdd07f00fdd07f00b3000000000000000000000000" - $"000000000000000000000000000000007f33003e7f3300070000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000095470044974900a8994b00f39b4d00fd9d4f00fda05100fda35400a4" - $"a5560061a75800fdaa5b00fdad5e00fdb06000fdb26300fdb56500fdb86800fd" - $"bb6a00fdbd6c00fdc06f00fdc27200fdc47400fdc67500fdc97800fdcb7a00fd" - $"cd7b00fdce7c00fdcf7e00fdd17f00fdd28000fdd38100fdd48200fdd48200fd" - $"d58300fdd58300fdd68400dad684000e00000000000000000000000000000000" - $"0000000000000000000000007f33008c7f3300da7f3300618034000400000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"00000000000000000000000000000000000000000000000095470044974900cb" - $"994c00fd9b4d00fd9e5000fda15300fda35500fda65800fda95a00bdab5c00e2" - $"af5f00fdb16200fdb46400fdb76700fdba6900fdbd6c00fdc06f00fdc27200fd" - $"c57400fdc77600fdca7900fdcc7a00fdce7d00fdd07f00fdd28000fdd48200fd" - $"d48200fdd68400fdd78500fdd88600fdd98700fdd98700fdda8800fddb8800fd" - $"db8800efdb880029000000000000000000000000000000000000000000000000" - $"00000000000000007f3300917f3300fd803400fd813400e8813500948236003d" - $"8337000200000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000009548000d984a00a0994c00fd9c4e00fd9f5100fd" - $"a25300fda45500fda75800fdaa5b00fdad5e00fdb06000fdb36300fdb66600fd" - $"b96900fdbd6c00fdc06f00fdc27200fdc57400fdc87700fdca7900fdcd7b00fd" - $"cf7e00fdd17f00fdd48200fdd58300fdd78500fdd88600fdda8800fddb8800fd" - $"dc8a00fddd8a00fdde8b00fdde8c00fddf8c00fddf8c00fddf8c00f0df8c0046" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"00000000000000008034003a8135008c823600dc833700fd843700fd853900ee" - $"863a00ac883b0072893d003d8b3e000a00000000000000000000000000000000" - $"00000000984a00289a4c00d99d4f00fd9f5100fda25300fda55600fda85900fd" - $"aa5b00fdae5e00fdb06100fdb46400fdb76700fdbb6a00fdbe6d00fdc07000fd" - $"c47400fdc77600fdca7900fdcd7b00fdcf7e00fdd28000fdd48200fdd68400fd" - $"d88500fdda8800fddb8900fddd8a00fdde8c00fddf8c00fde18e00fde18e00fd" - $"e28f00fde39000fde39000fde39000fde49100e2e49100300000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000085390026863a006c883b00aa893d00e5" - $"8b3e00fd8d4000fd8f4200fd914300e5934500c3954800a9984a009e9a4c0094" - $"9d4f00eda05100fda25300fda55600fda85900fdab5c00fdae5e00fdb16200fd" - $"b56500fdb86800fdbc6b00fdbe6e00fdc27200fdc57400fdc97800fdcc7a00fd" - $"ce7d00fdd17f00fdd48200fdd68400fdd88600fddb8800fddc8a00fdde8c00fd" - $"e08d00fde18e00fde39000fde49100fde59100fde69300fde69300fde79400fd" - $"e79400fde89400fde89400bfe894001700000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"000000000000000000000000000000000000000000000000000000008e41001f" - $"9043004c924500799547009d974900b79a4c00d19d4f00de9f5100dfa25300e4" - $"a55600fda85900fdab5c00fdaf5f00fdb26300fdb56500fdb96900fdbd6c00fd" - $"c07000fdc37300fdc77600fdca7900fdce7c00fdd07f00fdd38100fdd68400fd" - $"d88600fddb8800fddd8a00fdde8c00fde18e00fde39000fde49100fde59200fd" - $"e69300fde89400fde89500fde99600d2ea960079eb97008aeb980092eb98008f" - $"eb980072eb980001000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"00000000000000000000000000000000000000000000000000000000ab5c0086" - $"af5f00fdb26300fdb66600fdba6900fdbd6c00fdc07000fdc47400fdc87700fd" - $"cb7a00fdce7d00fdd17f00fdd48200fdd78500fdda8800fddc8a00fdde8c00fd" - $"e18e00fde39000fde59100fde69300fde89400fde99500fdea9600fdeb9800fd" - $"ec9900fded9900fded9a00fdee9a00aaee9b000c000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"00000000000000000000000000000000000000000000000000000000b666006a" - $"b96900f7bd6c00fdc07000fdc47400fdc87700fdcc7a00fdcf7e00fdd28000fd" - $"d58300fdd88600fddb8800fdde8b00fde08d00fde28f00fde49100fde69300fd" - $"e89400fde99600fdeb9800fdec9900fded9a00fdee9b00fdef9b00fdf09c00fd" - $"f19d00fdf19d00fdf19d00fdf29e00eef29e0038000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"00000000000000000000000000000000000000000000000000000000c070003a" - $"c47400e2c87700fdcc7a00fdcf7e00fdd38100fdd68400fdd88600fddb8900fd" - $"de8c00fde18e00fde39000fde59200fde79400fde99600fdeb9800fded9900fd" - $"ee9a00fdef9b00fdf09c00fdf19d00fdf29e00fdf39f00fdf49f00fdf4a000fd" - $"f4a000fdf4a000f8f4a000640000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"00000000000000000000000000000000000000000000000000000000cc7a000f" - $"cf7e009ed38100fdd68400fdd98700fddb8900fdde8c00fde18e00fde49100fd" - $"e69300fde89500fdea9600fdec9900fdee9a00fdef9b00fdf19d00fdf29e00fd" - $"f39f00fdf4a000fdf5a000fdf6a100fdf6a200fdf6a200fdf7a200fdf7a200ea" - $"f7a2004600000000000000000000000000000000000000000000000000000000" - $"0000000000000000000000000000000000000000000000000000000000000000" - $"0000000000000000" - } -}; - diff --git a/src/apps/deskbar/icons.h b/src/apps/deskbar/icons.h index 952443c9ba..e5e65e050a 100644 --- a/src/apps/deskbar/icons.h +++ b/src/apps/deskbar/icons.h @@ -1,4 +1,5 @@ enum { + R_LeafLogoBitmap = 14, R_LargeNewGroupIcon = 16, R_SmallNewGroupIcon = 17, R_TeamIcon = 18, diff --git a/src/apps/deskbar/icons.rdef b/src/apps/deskbar/icons.rdef index 77924bf58b..d023d86a47 100644 --- a/src/apps/deskbar/icons.rdef +++ b/src/apps/deskbar/icons.rdef @@ -1,6 +1,197 @@ #include "icons.h" +resource(R_LeafLogoBitmap) archive(, 0x00000000) BBitmap { + "_frame" = rect { 0.0, 0.0, 62.0, 22.0 }, + "_cspace" = 8200, + "_bmflags" = 0, + "_rowbytes" = 252, + "_data" = array { + $"0000000000000000000000000000000000000000000000000000000000000000" + $"0000000000000000000000000000000000000000000000000000000000000000" + $"0000000000000000000000000000000000000000000000000000000000000000" + $"0000000000000000000000000000000000000000000000000000000000000000" + $"0000000000000000000000000000000000000000000000000000000180000002" + $"8080000280000002000000000000000000000000FF000001000000008B401344" + $"8D3E13778E3F1395904015AE914114C0924315CE934315DD944515E3964616DC" + $"974716CD984717BE9A4817A99B4A188A9C48185F9F4D1738AA55181500000000" + $"0000000000000000000000000000000000000000000000000000000000000000" + $"0000000000000000000000000000000000000000000000000000000000000000" + $"0000000000000000000000000000000000000000000000000000000000000000" + $"0000000000000000000000000000000000000000000000000000000000000000" + $"000000000000000000000000FF00000180000002808000020000000000000000" + $"00000000000000008C3F13358D3E1531000000008E401458914114FF964415FF" + $"9A4716FF9D4817FF9F4A17FFA04B17FF9F4B17FF9F4C18FFA24D18FFA54F19FF" + $"A65019FFA75119FFA44F19FFA9521AFFA24F19E99F4F184A0000000000000000" + $"0000000000000000000000000000000000000000000000000000000000000000" + $"0000000000000000000000000000000000000000000000000000000000000000" + $"0000000000000000000000000000000000000000000000000000000000000000" + $"0000000000000000000000000000000000000000000000000000000000000000" + $"FF0000018080000280800002000000000000000000000000853D14198D3E1262" + $"8E4013AE904214F99142156100000000954515D6A34C18FF9A4817FF9C4A17FF" + $"9C4B18FF9E4C18FE9F4E18FDA14E19FEA24F19FEA35019FEA45119FDA5521AFC" + $"A6521AFBAF571CFFA7531AF1A5511952AA550003000000000000000000000000" + $"0000000000000000000000000000000000000000000000000000000000000000" + $"0000000000000000000000000000000000000000000000000000000000000000" + $"0000000000000000000000000000000000000000000000000000000000000000" + $"0000000000000000000000000000000000000000000000018080000280800002" + $"0000000000000000000000008E4014349042148C924214D9944415FF9B4816FF" + $"A64D18FF994916469B491B1CA04C18FF9F4D18FDA14F18FAA34F19FCA45119FD" + $"A6511AFEA7521AFEA8541BFFA9551BFFAB551BFEAF581CFFB15A1DFFB25A1DFF" + $"AE591CF2B0581C37000000000000000000000000000000000000000000000000" + $"0000000000000000000000000000000000000000000000000000000000000000" + $"0000000000000000000000000000000000000000000000000000000000000000" + $"0000000000000000000000000000000000000000000000000000000000000000" + $"00000000000000000000000080000002AA550003000000000000000000000001" + $"91431548934315A7934315EF9C4816FF9F4A17FF9D4A17FF9C4A17FBAA521AFF" + $"9F4E1758A251183FB0561BFFA7521AFCA9541BFFAA551BFFAC561BFFAD571CFF" + $"AF581CFFB0591DFFB15A1DFFB45C1DFFB35B1DEDB45D1DECBC611FFFB35D1D68" + $"00000000AA550003AA5500030000000000000000000000000000000000000000" + $"0000000000000000000000000000000000000000000000000000000000000000" + $"0000000000000000000000000000000000000000000000000000000000000000" + $"0000000000000000000000000000000000000000000000000000000000000000" + $"FF00000180800002FF00000100000000000000009445154A954516B9964515FA" + $"A04B17FFA04C18FF9F4C18FFA04D18FCA34F19FBA4511AFAB2581CFFA8541BAD" + $"AB561C77B85D1EFFAE581CFCB05A1DFFB25B1DFFB45C1EFFB55D1EFFB75E1EFF" + $"B85F1FFFB9601FFDC16420FFBB621FCBB9611F3ABB612047FF80000200000000" + $"AA55000300000000000000000000000000000000000000000000000000000000" + $"0000000000000000000000000000000000000000000000000000000000000000" + $"0000000000000000000000000000000000000000000000000000000000000000" + $"00000000FF000001800000028080000280800002FF0000010000000080800002" + $"0000000000000000934617219746179D974716FBA34D18FFA24D18FFA04E19FF" + $"A34F19FBA5511AFCA7531AFFAA551BFFAC571CFFB0591CFFB0591DF8B35C1DE3" + $"B85E1EFFB75E1EFEB9601FFFBA611FFFBC6220FFBD6320FFBF6420FFC06521FF" + $"C16621FFC16621FCCA6B23FFC66A237400000000000000018080000200000000" + $"00000000FF000001000000000000000000000000000000000000000000000000" + $"0000000000000000000000000000000000000000000000000000000000000000" + $"0000000000000000000000000000000000000000000000018080000280800002" + $"8080000200000000000000000000000000000000AA55000300000000994D1A0A" + $"9948176E9A4A17E1A54F19FFA44F19FFA34F19FEA65119FBA8541AFDAB561BFF" + $"AD581CFFB0591DFFB25B1DFFB55D1EFFB85E1EFEBB611FFFC06420FFBE6320FE" + $"C06520FFC16621FFC36721FFC46822FFC66922FFC76A22FFC86B23FFC96B22FD" + $"CB6D23FFCF6F24FFC868225300000000BF804004000000000000000000000000" + $"0000000080000002800000020000000000000000000000000000000000000000" + $"0000000000000000000000000000000000000000000000000000000000000000" + $"0000000000000000000000008080000280800002000000000000000000000000" + $"00000000000000008E471C129E49181500000000994916469D4C18CEA34E19FF" + $"A9521AFFA6521AFFA9531AFBAB551BFEAE581CFFB15A1DFFB35C1DFFB65E1EFF" + $"B9601FFFBB621FFFBE6320FFC06521FFC36621FEC56822FEC66A22FFC86B23FF" + $"CA6C23FFCB6D23FFCC6E24FFCE6F24FFCF6F24FFD06F24FED17024FDDD7827FF" + $"D170257400000000BF8040040000000000000000000000000000000000000000" + $"00000000FF000001800000028000000280000002000000000000000000000000" + $"0000000000000000000000000000000000000000000000000000000000000000" + $"FF00000180800002000000000000000000000000893B140D8F44144094431579" + $"964616A5994816E39A48166A99660005A14E19EAB0561BFFA9541BFFAB551BFC" + $"AD581CFDB15A1DFFB35C1DFFB65E1EFFB9601FFFBC6220FFBF6420FFC26621FF" + $"C46822FFC76A22FFC96B23FFCB6D23FFCC6E24FFCF6F24FFD07024FFD27125FF" + $"D37225FFD47325FFD57426FFD57426FFD57526FBE67D29FFD77525A400000000" + $"00000000FF000001000000000000000000000000000000006F21085C70200010" + $"000000000000000000000000FF00000180000002800000028000000280000002" + $"FF00000100000000000000000000000000000000000000008000000280800002" + $"00000000000000008D43142691421480944415CC964516F79F4B17FFA14D18FF" + $"B6581CFFA24F187EA8531B84B85C1DFFAC571CFAB0591CFCB35C1DFFB65E1EFF" + $"B9601FFFBC6320FFBF6520FFC26721FFC56922FFC86B22FFCA6C23FFCD6E24FF" + $"CF7024FFD17125FFD37225FFD57325FFD67426FFD77526FFD97626FFDA7727FF" + $"DB7827FFDB7827FEDB7827FAEA802AFFDC7927CCC6711C0900000000BF804004" + $"00000000000000000000000000000000000000006F2109E86F2208DB6F230865" + $"6C1D0A1A00000000000000000000000000000000000000000000000180000002" + $"80800002555500035555000380800002AA550003000000000000000094430D13" + $"93431586944415E79D4917FFA24C18FFA24E18FFA34F19FFA45019FEAC551BFF" + $"AA561BC7AF581CEEB45C1DFFB55E1EFDB9601FFFBC6220FFBF6420FFC26721FF" + $"C56922FFC86B23FFCB6D23FFCE6F24FFD07124FFD37225FFD57426FFD77526FF" + $"D97626FFDA7727FFDC7927FFDD7A27FFDE7A28FFDF7B28FFE07B28FFE17C28FD" + $"E17C29FBED832BFFE07C28EAE3782B2400000000CC6633050000000000000000" + $"000000000000000000000000000000006F2208B5752409FF79260AFF71250AEC" + $"73270BA474280B5A78260F220000000000000000000000000000000000000000" + $"000000000000000000000000000000000000000094431645954516D39E4A17FF" + $"A14C18FFA04D18FFA24F19FDA5511AFCA9541AFCAC571BFDB0591CFEB55D1EFF" + $"B9601FFFBB611FFEBE6420FFC16621FFC56922FFC86B23FFCB6D23FFCE6F24FF" + $"D17125FFD47325FFD67426FFD87626FFDA7727FFDC7927FFDE7A28FFDF7B28FF" + $"E07C28FFE27C28FCE37D28FCE37E29FDE47E29FDE67E29FCE68029FEF4872CFF" + $"E57F2AEFE680293E00000000FF80400400000000000000000000000000000000" + $"000000000000000000000000661A000A6F22093C73240A8574270ACB75290BFB" + $"7B2D0DFF792D0DF27C300EC680330E92823410628638113B873810208833110F" + $"6633000500000000000000009545176F974717F8A34D18FFA04D18FFA34F19FC" + $"A6521AFCAA541BFEAD581CFFB15A1DFFB55D1EFFB8601FFFBD6320FFC06520FE" + $"C46821FFC76A22FFCA6C23FFCE6F24FFD17125FFD47325FFD67526FFD97626FF" + $"DB7827FFDD7927FFDF7B28FFE17C28FFE27D29FFE47E29FFE57F29FFE9812AFF" + $"EC832BFFEB822AFFEB822BFFEA822AFFEE842BFFF88A2DFFEA822BCCE6802734" + $"00000000AA550003FF0000010000000000000000000000000000000000000000" + $"000000000000000000000000000000000000000099330005772B0B2F792D0D65" + $"7C300EA07F320FD1823510F1863811FE883B12FC8C3E13EF8F4114DD934315CE" + $"964615C09A4917C7A74F19FFA55019FFA2501AFAA7531AFCAA551BFFAE581CFF" + $"B25B1DFFB65E1EFFB9601FFFBD6320FFC16621FFC56822FEC96B23FFCC6E24FF" + $"D07024FFD37225FFD67426FFD87626FFDB7827FFDD7A28FFE07B28FFE27D29FF" + $"E37E29FFE57F29FFE7802AFFE8812AFFE9822AFFEB832BFFEA832BF8EF852BFF" + $"F98B2DFFF78A2DFFF98B2DFFF1872CFFEC842B93DD88220F00000000FFFF0001" + $"FFFF000100000000000000000000000000000000000000000000000000000000" + $"0000000055000003FF0000010000000000000000000000000000000000000000" + $"8E391C0986361426883B11498A3D136D8F3F148D934315A7964616B99A4917C4" + $"9E4B18C2A24F19C5AB551BFFAD571CFFAE581CFCB25B1DFEB75E1EFFBA611FFF" + $"BE6420FFC26721FFC66A22FFCA6C23FFCE6F24FFD17125FFD47325FFD77526FF" + $"DA7727FFDD7927FFDF7B28FFE27D29FFE47E29FFE67F29FFE7802AFFE9822AFF" + $"EA832BFFEC832BFFED842BFFEE852BFDF68A2DFFF0862CCBEE872D5BEF842C5D" + $"EE852B6BF0862C74F0872B530000000000000000FF800002FFFF000100000000" + $"0000000000000000000000000000000000000000000000000000000000000000" + $"00000000FF000001550000035500000380000002000000000000000000000000" + $"000000000000000000000000000000000000000000000000AA550003AA550003" + $"FF000001AD571C89B95F1EFFBC611FFFBA611FFCBE6420FDC36721FFC76A22FF" + $"CB6D23FFCF6F24FFD27225FFD67426FFD97626FFDC7827FFDE7A28FFE17C28FF" + $"E37E29FFE57F29FFE7802AFFEA822AFFEB832BFFEC842BFFEE852BFFEF862CFF" + $"F0872CFFF2872CFFF3892CFEF5892DFFF4892CF8F68B2D8FFA8C2D33FFAA5503" + $"000000000000000000000000FFAA5503FFFF0001000000000000000000000000" + $"0000000000000000000000000000000000000000000000000000000000000000" + $"0000000000000000000000000000000180000002AA550003AA55000355550003" + $"FF00000100000000000000000000000000000000000000000000000000000000" + $"00000000B8611F6CBE6420F9CE6D23FFC76A22FFCB6D23FCD07024FDD37225FF" + $"D77526FFDA7727FFDD7927FFDF7B28FFE27D29FFE47F29FFE7802AFFE9812AFF" + $"EB832BFFED852BFEEE852BFDF0862CFFF2882CFFF3892DFFF4892DFFF58A2DFF" + $"F68B2DFFF68B2DFFF78B2EFCF88C2EFFFF9932FFF78B2DECFA8D2B2F00000000" + $"FF800002FF550003000000000000000000000000000000000000000000000000" + $"0000000000000000000000000000000000000000000000000000000000000000" + $"00000000000000000000000000000000000000000000000000000000FF000001" + $"80800002AA550003AA550003AA550003AA550003AA5500038040000400000000" + $"00000000C46A2341CB6D23D3DC7727FFD97626FFD77426FEDB7726FCDD7927FD" + $"E07B28FEE37E29FFE67F29FFE8812AFFEA822AFFEC842BFFEE852BFFF0862CFF" + $"F68A2DFFF58A2DFFF58A2DFCF68B2EFCF68B2DFDF78B2DFDF88C2DFDF98D2EFC" + $"F98C2EFDFA8D2EFFFF9631FFFA8D2EEDF98C2F5200000000BF804004FF800002" + $"0000000000000000000000000000000000000000000000000000000000000000" + $"0000000000000000000000000000000000000000000000000000000000000000" + $"0000000000000000000000000000000000000000000000000000000000000000" + $"000000000000000000000000000000000000000000000000AA55000300000000" + $"00000000CC732614D474258FDA7726F6EB812AFFE77F29FFE47E29FFE67F29FD" + $"E9822BFCEB832BFCED842BFDEE862BFEF1872CFEF3892CFEF58A2DFEF68A2DF5" + $"FF912FFFFF9230FFFD8F2FFFFB8E2EFFFB8E2EFFFD8F2FFFFF902FFFFF9531FF" + $"FF9731FFFC8F2FCAF98E2D2D0000000000000000000000000000000000000000" + $"0000000000000000000000000000000000000000000000000000000000000000" + $"0000000000000000000000000000000000000000000000000000000000000000" + $"0000000000000000000000000000000000000000000000000000000000000000" + $"000000000000000000000000000000000000000000000000FF80000280800002" + $"0000000000000000DC7B283AE27E29A8E6802AF5F6892DFFF6892DFFF3882CFF" + $"F2872CFFF2882CFFF3892CFEF58A2DFEF78B2EFBFF912FFFF88C2EBCFB8D2E86" + $"FB8E2FE6FF9230FFFF9731FFFF9832FFFF9732FFFF9330FFFE902FE2FD8F2F82" + $"FF88330F00000000FF800002FFFF000100000000000000000000000000000000" + $"0000000000000000000000000000000000000000000000000000000000000000" + $"0000000000000000000000000000000000000000000000000000000000000000" + $"0000000000000000000000000000000000000000000000000000000000000000" + $"000000000000000000000000000000000000000000000000FFFF0001AA550003" + $"000000000000000000000000E9822839ED832B8EEE862BD4F2882CFAFE8F2FFF" + $"FF9230FFFF9330FFFF9430FFFF9330FFFF9731FFFF9130FFFF912F51F6922E1C" + $"FF8F2F5DFF903085FF913094FF902F88FF92315EFF94311F0000000000000000" + $"FF80000280800002000000000000000000000000000000000000000000000000" + $"0000000000000000000000000000000000000000000000000000000000000000" + $"0000000000000000000000000000000000000000000000000000000000000000" + $"0000000000000000000000000000000000000000000000000000000000000000" + $"00000000000000000000000000000000000000000000000000000000AA550003" + $"FFFF0001000000000000000000000000FF862813F4892E43F68B2E75F98C2D9E" + $"F98D2DB9FB8E2FC9FD8F2ED2FE8F2ECBFE902ECBFF902F910000000000000000" + $"000000000000000000000000000000000000000000000000FFAA0003FFFF0001" + $"0000000000000000000000000000000000000000000000000000000000000000" + $"0000000000000000000000000000000000000000000000000000000000000000" + $"00000000" + } +}; + resource(R_LargeNewGroupIcon) archive(, 0x00000000) BBitmap { "_frame" = rect { 0.0, 0.0, 31.0, 31.0 }, "_cspace" = 4, @@ -233,4 +424,3 @@ resource(R_WindowHiddenSwitchIcon) archive(, 0x00000000) BBitmap { $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" } }; - diff --git a/src/apps/deskbar/icons_logo.h b/src/apps/deskbar/icons_logo.h deleted file mode 100644 index b70618875b..0000000000 --- a/src/apps/deskbar/icons_logo.h +++ /dev/null @@ -1,3 +0,0 @@ -enum { - R_LeafLogoBitmap = 14 -};