Small coding style cleanup.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36803 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
parent
d38da14cdf
commit
559e4ec5f3
@ -37,9 +37,9 @@ DeskButton::DeskButton(BRect frame, entry_ref* ref, const char* name,
|
||||
fTitleList(titles)
|
||||
{
|
||||
#ifdef __HAIKU__
|
||||
fSegments = new BBitmap(BRect(0,0,15,15), B_RGBA32);
|
||||
fSegments = new BBitmap(BRect(0, 0, 15, 15), B_RGBA32);
|
||||
#else
|
||||
fSegments = new BBitmap(BRect(0,0,15,15), B_CMAP8);
|
||||
fSegments = new BBitmap(BRect(0, 0, 15, 15), B_CMAP8);
|
||||
#endif
|
||||
BNodeInfo::GetTrackerIcon(&fRef, fSegments, B_MINI_ICON);
|
||||
}
|
||||
@ -60,9 +60,9 @@ DeskButton::DeskButton(BMessage *message)
|
||||
}
|
||||
|
||||
#ifdef __HAIKU__
|
||||
fSegments = new BBitmap(BRect(0,0,15,15), B_RGBA32);
|
||||
fSegments = new BBitmap(BRect(0, 0, 15, 15), B_RGBA32);
|
||||
#else
|
||||
fSegments = new BBitmap(BRect(0,0,15,15), B_CMAP8);
|
||||
fSegments = new BBitmap(BRect(0, 0, 15, 15), B_CMAP8);
|
||||
#endif
|
||||
BNodeInfo::GetTrackerIcon(&fRef, fSegments, B_MINI_ICON);
|
||||
}
|
||||
|
||||
@ -2,6 +2,7 @@ SubDir HAIKU_TOP src bin desklink ;
|
||||
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
UseLibraryHeaders icon ;
|
||||
UsePrivateHeaders app interface shared ;
|
||||
|
||||
BinCommand desklink :
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2003-2009, Haiku. All rights reserved.
|
||||
* Copyright 2003-210, Haiku. All rights reserved.
|
||||
* Distributed under the terms of the MIT License.
|
||||
*
|
||||
* Authors:
|
||||
@ -8,6 +8,7 @@
|
||||
* Marcus Overhagen
|
||||
* Jonas Sundström
|
||||
* Axel Dörfler, axeld@pinc-software.de.
|
||||
* Stephan Aßmus <superstippi@gmx.de>
|
||||
*/
|
||||
|
||||
|
||||
@ -22,13 +23,13 @@
|
||||
#include <Entry.h>
|
||||
#include <File.h>
|
||||
#include <FindDirectory.h>
|
||||
#include <IconUtils.h>
|
||||
#include <MenuItem.h>
|
||||
#include <Path.h>
|
||||
#include <PopUpMenu.h>
|
||||
#include <Roster.h>
|
||||
#include <String.h>
|
||||
#include <StringView.h>
|
||||
|
||||
#include <ToolTip.h>
|
||||
#include <ToolTipManager.h>
|
||||
|
||||
@ -267,7 +268,7 @@ MediaReplicant::MessageReceived(BMessage* message)
|
||||
case B_ABOUT_REQUESTED:
|
||||
(new BAlert("About Volume Control", "Volume Control\n"
|
||||
" Brought to you by Jérôme DUVAL.\n\n"
|
||||
"Copyright " B_UTF8_COPYRIGHT "2003-2009, Haiku",
|
||||
"Copyright " B_UTF8_COPYRIGHT "2003-2010, Haiku",
|
||||
"OK"))->Go(NULL);
|
||||
break;
|
||||
|
||||
@ -449,8 +450,8 @@ void
|
||||
MediaReplicant::_Init()
|
||||
{
|
||||
fIcon = new BBitmap(BRect(0, 0, kSpeakerWidth - 1, kSpeakerHeight - 1),
|
||||
B_CMAP8);
|
||||
fIcon->SetBits(kSpeakerBits, kSpeakerWidth * kSpeakerHeight, 0, B_CMAP8);
|
||||
B_RGBA32);
|
||||
BIconUtils::GetVectorIcon(kSpeakerIcon, sizeof(kSpeakerIcon), fIcon);
|
||||
|
||||
_LoadSettings();
|
||||
|
||||
|
||||
@ -1,31 +1,57 @@
|
||||
/*
|
||||
* Copyright 2003-2007, Haiku. All rights reserved.
|
||||
* Copyright 2003-2010, Haiku. All rights reserved.
|
||||
* Distributed under the terms of the MIT License.
|
||||
*
|
||||
* Authors:
|
||||
* Jérôme Duval
|
||||
* Stephan Aßmus <superstippi@gmx.de>
|
||||
*/
|
||||
|
||||
const int32 kSpeakerWidth = 16;
|
||||
const int32 kSpeakerHeight = 16;
|
||||
const color_space kSpeakerColorSpace = B_CMAP8;
|
||||
|
||||
const unsigned char kSpeakerBits [] = {
|
||||
0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
|
||||
0xff,0xff,0xff,0xff,0x00,0x3f,0x1c,0x1c,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,
|
||||
0xff,0xff,0xff,0x00,0x3f,0x1c,0x1c,0x1c,0x1c,0x1c,0x00,0x00,0xff,0xff,0xff,0xff,
|
||||
0xff,0xff,0x00,0x3f,0x3f,0x1c,0x1c,0x1c,0x1c,0x1c,0x1c,0x11,0x00,0xff,0xff,0xff,
|
||||
0xff,0xff,0x00,0x17,0x18,0x3f,0x3f,0x1c,0x1c,0x1c,0x11,0x0f,0x00,0xff,0xff,0xff,
|
||||
0xff,0xff,0x00,0x17,0x17,0x18,0x17,0x3f,0x3f,0x11,0x0f,0x0f,0x00,0xff,0xff,0xff,
|
||||
0xff,0xff,0x00,0x11,0x00,0x00,0x00,0x17,0x11,0x0f,0x0f,0x0f,0x00,0xff,0xff,0xff,
|
||||
0xff,0xff,0x00,0x00,0x08,0x09,0x00,0x11,0x11,0x0f,0x0f,0x0f,0x00,0xff,0xff,0xff,
|
||||
0xff,0xff,0x00,0x00,0x08,0x0f,0x0b,0x08,0x11,0x0f,0x0f,0x0f,0x00,0xff,0xff,0xff,
|
||||
0xff,0xff,0x00,0x11,0x00,0x0a,0x0f,0x09,0x11,0x0f,0x0f,0x0f,0x00,0xff,0xff,0xff,
|
||||
0xff,0xff,0x00,0x17,0x11,0x08,0x09,0x11,0x11,0x0f,0x0f,0x0f,0x00,0xff,0xff,0xff,
|
||||
0xff,0xff,0x00,0x17,0x17,0x17,0x17,0x17,0x11,0x0f,0x0f,0x0f,0x00,0x0f,0xff,0xff,
|
||||
0xff,0xff,0x00,0x00,0x17,0x17,0x2d,0x18,0x11,0x0f,0x0f,0x00,0x0f,0x0f,0xff,0xff,
|
||||
0xff,0xff,0xff,0xff,0x00,0x00,0x17,0x17,0x11,0x0f,0x00,0x0f,0x0f,0xff,0xff,0xff,
|
||||
0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x11,0x00,0x0f,0x0f,0xff,0xff,0xff,0xff,
|
||||
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x0f,0x0f,0xff,0xff,0xff,0xff,0xff
|
||||
const unsigned char kSpeakerIcon[] = {
|
||||
0x6e, 0x63, 0x69, 0x66, 0x0b, 0x04, 0x01, 0x74, 0x05, 0x00, 0x02, 0x00,
|
||||
0x16, 0x02, 0x3b, 0xec, 0x7c, 0x3d, 0x46, 0x4b, 0xbd, 0xc2, 0x11, 0x3c,
|
||||
0x40, 0x66, 0x4a, 0x53, 0xa4, 0x49, 0x21, 0x70, 0x00, 0xdd, 0xff, 0xc5,
|
||||
0x02, 0x00, 0x16, 0x02, 0x3b, 0x9e, 0x03, 0x2f, 0xed, 0x63, 0xb0, 0xf2,
|
||||
0x4f, 0x3c, 0xb6, 0xc1, 0x4a, 0x53, 0x3f, 0x3a, 0xbe, 0x84, 0x00, 0xff,
|
||||
0xff, 0xc5, 0x02, 0x00, 0x16, 0x02, 0x39, 0x5e, 0x1e, 0x32, 0xdb, 0x49,
|
||||
0xb6, 0x92, 0x1a, 0x3d, 0x07, 0xd7, 0x4a, 0x57, 0x90, 0x49, 0x08, 0xd6,
|
||||
0x00, 0x64, 0xff, 0x8c, 0x05, 0x01, 0x02, 0x03, 0x16, 0x04, 0xbe, 0xbe,
|
||||
0x2b, 0xbe, 0xe9, 0x57, 0x3e, 0xe9, 0x57, 0xbe, 0xbe, 0x2b, 0x48, 0xb7,
|
||||
0x78, 0x4a, 0x2f, 0xd3, 0x00, 0x01, 0xc2, 0x70, 0xd0, 0x73, 0xff, 0xff,
|
||||
0x02, 0x01, 0x16, 0x03, 0x3b, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x3c, 0x20, 0x00, 0x48, 0x40, 0x00, 0x49, 0xe0, 0x00, 0xbe, 0x4b,
|
||||
0x00, 0x84, 0xff, 0x32, 0x02, 0x03, 0x16, 0x02, 0x3c, 0x4e, 0x21, 0x3d,
|
||||
0x44, 0xda, 0xbd, 0x44, 0xda, 0x3c, 0x4e, 0x21, 0x49, 0x26, 0x89, 0x4a,
|
||||
0x42, 0x8e, 0xa1, 0x43, 0xff, 0xff, 0x02, 0x03, 0x16, 0x03, 0xbc, 0x6b,
|
||||
0x27, 0xbd, 0x2f, 0x9c, 0x3d, 0x2f, 0x9c, 0xbc, 0x6b, 0x27, 0x48, 0xb0,
|
||||
0xfd, 0x4a, 0x3d, 0x7c, 0x2a, 0x01, 0xb2, 0x28, 0xff, 0xff, 0x03, 0x00,
|
||||
0xff, 0x00, 0x07, 0x0a, 0x04, 0x46, 0x60, 0x4e, 0x60, 0x60, 0x4c, 0x54,
|
||||
0x47, 0x0a, 0x04, 0x26, 0x2b, 0x26, 0x4e, 0x46, 0x5e, 0x46, 0x34, 0x0a,
|
||||
0x04, 0x46, 0x35, 0x46, 0x5e, 0x56, 0x4e, 0x56, 0x2a, 0x0a, 0x04, 0x26,
|
||||
0x2b, 0x46, 0x35, 0x56, 0x2a, 0x39, 0x22, 0x0a, 0x06, 0x26, 0x2b, 0x26,
|
||||
0x4e, 0x46, 0x5e, 0x56, 0x4e, 0x56, 0x2a, 0x39, 0x22, 0x02, 0x04, 0xb9,
|
||||
0xa5, 0xbb, 0x36, 0xbc, 0x06, 0xba, 0x55, 0xb7, 0x44, 0xbc, 0x17, 0xb7,
|
||||
0x73, 0x47, 0xb6, 0x49, 0xbf, 0x5f, 0xb8, 0x9e, 0xc5, 0xb6, 0xbd, 0xde,
|
||||
0xc6, 0xb1, 0xbb, 0x7d, 0xc7, 0x92, 0xc0, 0x3f, 0xc5, 0xd0, 0xc0, 0x11,
|
||||
0xbf, 0x5d, 0xc1, 0x3b, 0xc2, 0x88, 0xbe, 0xe6, 0xbc, 0x31, 0x02, 0x04,
|
||||
0xc0, 0x1c, 0xc7, 0xc1, 0xc0, 0x6d, 0xc7, 0xa8, 0xbf, 0xcb, 0xc7, 0xda,
|
||||
0xbf, 0xc6, 0xc8, 0xb1, 0xbf, 0xa5, 0xc8, 0x45, 0xbf, 0xe8, 0xc9, 0x1c,
|
||||
0xc0, 0x95, 0xc9, 0x46, 0xc0, 0x44, 0xc9, 0x5f, 0xc0, 0xe6, 0xc9, 0x2d,
|
||||
0xc0, 0xeb, 0xc8, 0x56, 0xc1, 0x0c, 0xc8, 0xc2, 0xc0, 0xc9, 0xc7, 0xeb,
|
||||
0x0c, 0x0a, 0x00, 0x01, 0x00, 0x20, 0x21, 0x21, 0x0a, 0x01, 0x01, 0x04,
|
||||
0x10, 0x01, 0x17, 0x84, 0x00, 0x04, 0x0a, 0x02, 0x01, 0x01, 0x00, 0x0a,
|
||||
0x03, 0x01, 0x03, 0x00, 0x0a, 0x04, 0x01, 0x02, 0x00, 0x0a, 0x05, 0x01,
|
||||
0x05, 0x10, 0x01, 0x17, 0x84, 0x00, 0x04, 0x0a, 0x06, 0x01, 0x05, 0x00,
|
||||
0x0a, 0x07, 0x01, 0x05, 0x02, 0x3d, 0xbb, 0xbb, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x3d, 0xbb, 0xbb, 0x47, 0x44, 0x44, 0x48, 0x62, 0x22, 0x0a,
|
||||
0x08, 0x01, 0x05, 0x1a, 0x3f, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x3f, 0xa0, 0x00, 0x41, 0xff, 0xfb, 0x42, 0xff, 0xfd, 0x13, 0xff,
|
||||
0x01, 0x17, 0x81, 0x00, 0x04, 0x0a, 0x09, 0x01, 0x05, 0x1a, 0x3f, 0x38,
|
||||
0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3d, 0xfb, 0x44, 0x32,
|
||||
0x85, 0x45, 0x59, 0x5c, 0x13, 0xff, 0x01, 0x17, 0x82, 0x00, 0x04, 0x0a,
|
||||
0x01, 0x01, 0x06, 0x10, 0x01, 0x17, 0x82, 0x00, 0x04, 0x0a, 0x0a, 0x01,
|
||||
0x06, 0x00
|
||||
};
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user