code style
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20704 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
88ec4b1dbe
commit
1cafa90eda
|
@ -23,27 +23,26 @@
|
|||
#define MENUITEM_ICON_SIZE 16
|
||||
|
||||
class MethodMenuItem : public BMenuItem {
|
||||
public:
|
||||
MethodMenuItem(int32 cookie, const char *label, const uchar *icon, BMenu *subMenu, BMessenger &messenger);
|
||||
MethodMenuItem(int32 cookie, const char *label, const uchar *icon);
|
||||
public:
|
||||
MethodMenuItem(int32 cookie, const char *label, const uchar *icon, BMenu *subMenu, BMessenger &messenger);
|
||||
MethodMenuItem(int32 cookie, const char *label, const uchar *icon);
|
||||
|
||||
virtual ~MethodMenuItem();
|
||||
virtual ~MethodMenuItem();
|
||||
|
||||
virtual void DrawContent();
|
||||
virtual void GetContentSize(float *width, float *height);
|
||||
virtual void DrawContent();
|
||||
virtual void GetContentSize(float *width, float *height);
|
||||
|
||||
void SetName(const char *name);
|
||||
const char *Name() { return Label(); };
|
||||
void SetName(const char *name);
|
||||
const char *Name() { return Label(); };
|
||||
|
||||
void SetIcon(const uchar *icon);
|
||||
const uchar *Icon() { return (uchar *)fIcon.Bits(); };
|
||||
void SetIcon(const uchar *icon);
|
||||
const uchar *Icon() { return(uchar *)fIcon.Bits(); };
|
||||
|
||||
const int32 Cookie() { return fCookie; };
|
||||
private:
|
||||
BBitmap fIcon;
|
||||
int32 fCookie;
|
||||
BMessenger fMessenger;
|
||||
const int32 Cookie() { return fCookie; };
|
||||
private:
|
||||
BBitmap fIcon;
|
||||
int32 fCookie;
|
||||
BMessenger fMessenger;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
@ -39,23 +39,23 @@
|
|||
|
||||
MethodReplicant::MethodReplicant(const char* signature)
|
||||
: BView(BRect(0, 0, 15, 15), REPLICANT_CTL_NAME, B_FOLLOW_ALL, B_WILL_DRAW),
|
||||
fMenu("", false, false)
|
||||
fMenu("", false, false)
|
||||
{
|
||||
// Background Bitmap
|
||||
fSegments = new BBitmap(BRect(0, 0, kRemoteWidth - 1, kRemoteHeight - 1), kRemoteColorSpace);
|
||||
fSegments->SetBits(kRemoteBits, kRemoteWidth*kRemoteHeight, 0, kRemoteColorSpace);
|
||||
// Background Color
|
||||
SetViewColor(184,184,184);
|
||||
SetViewColor(184, 184, 184);
|
||||
|
||||
//add dragger
|
||||
BRect rect(Bounds());
|
||||
rect.left = rect.right-7.0;
|
||||
rect.top = rect.bottom-7.0;
|
||||
rect.left = rect.right - 7.0;
|
||||
rect.top = rect.bottom - 7.0;
|
||||
BDragger *dragger = new BDragger(rect, this, B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM);
|
||||
AddChild(dragger);
|
||||
dragger->SetViewColor(B_TRANSPARENT_32_BIT);
|
||||
|
||||
ASSERT(signature!=NULL);
|
||||
ASSERT(signature != NULL);
|
||||
fSignature = strdup(signature);
|
||||
|
||||
fMenu.SetFont(be_plain_font);
|
||||
|
@ -65,7 +65,7 @@ MethodReplicant::MethodReplicant(const char* signature)
|
|||
|
||||
MethodReplicant::MethodReplicant(BMessage *message)
|
||||
: BView(message),
|
||||
fMenu("", false, false)
|
||||
fMenu("", false, false)
|
||||
{
|
||||
// Background Bitmap
|
||||
fSegments = new BBitmap(BRect(0, 0, kRemoteWidth - 1, kRemoteHeight - 1), kRemoteColorSpace);
|
||||
|
@ -73,7 +73,7 @@ MethodReplicant::MethodReplicant(BMessage *message)
|
|||
|
||||
const char *signature = NULL;
|
||||
message->FindString("add_on", &signature);
|
||||
ASSERT(signature!=NULL);
|
||||
ASSERT(signature != NULL);
|
||||
fSignature = strdup(signature);
|
||||
|
||||
fMenu.SetFont(be_plain_font);
|
||||
|
@ -118,7 +118,7 @@ MethodReplicant::AttachedToWindow()
|
|||
msg.AddMessenger("address", messenger);
|
||||
|
||||
BMessenger inputMessenger(fSignature);
|
||||
if (inputMessenger.SendMessage(&msg)!=B_OK) {
|
||||
if (inputMessenger.SendMessage(&msg) != B_OK) {
|
||||
printf("error when contacting input_server\n");
|
||||
}
|
||||
}
|
||||
|
@ -127,36 +127,36 @@ MethodReplicant::AttachedToWindow()
|
|||
void
|
||||
MethodReplicant::MessageReceived(BMessage *message)
|
||||
{
|
||||
PRINT(("%s what:%c%c%c%c\n", __PRETTY_FUNCTION__, message->what>>24, message->what>>16, message->what>>8, message->what));
|
||||
PRINT(("%s what:%c%c%c%c\n", __PRETTY_FUNCTION__, message->what >> 24, message->what >> 16, message->what >> 8, message->what));
|
||||
PRINT_OBJECT(*message);
|
||||
switch (message->what) {
|
||||
case B_ABOUT_REQUESTED:
|
||||
(new BAlert("About Method Replicant", "Method Replicant (Replicant)\n"
|
||||
" Brought to you by Jérôme DUVAL.\n\n"
|
||||
"Haiku, 2004","OK"))->Go();
|
||||
break;
|
||||
case IS_UPDATE_NAME:
|
||||
UpdateMethodName(message);
|
||||
break;
|
||||
case IS_UPDATE_ICON:
|
||||
UpdateMethodIcon(message);
|
||||
break;
|
||||
case IS_UPDATE_MENU:
|
||||
UpdateMethodMenu(message);
|
||||
break;
|
||||
case IS_UPDATE_METHOD:
|
||||
UpdateMethod(message);
|
||||
break;
|
||||
case IS_ADD_METHOD:
|
||||
AddMethod(message);
|
||||
break;
|
||||
case IS_REMOVE_METHOD:
|
||||
RemoveMethod(message);
|
||||
break;
|
||||
case B_ABOUT_REQUESTED:
|
||||
(new BAlert("About Method Replicant", "Method Replicant (Replicant)\n"
|
||||
" Brought to you by Jérôme DUVAL.\n\n"
|
||||
"Haiku, 2004", "OK"))->Go();
|
||||
break;
|
||||
case IS_UPDATE_NAME:
|
||||
UpdateMethodName(message);
|
||||
break;
|
||||
case IS_UPDATE_ICON:
|
||||
UpdateMethodIcon(message);
|
||||
break;
|
||||
case IS_UPDATE_MENU:
|
||||
UpdateMethodMenu(message);
|
||||
break;
|
||||
case IS_UPDATE_METHOD:
|
||||
UpdateMethod(message);
|
||||
break;
|
||||
case IS_ADD_METHOD:
|
||||
AddMethod(message);
|
||||
break;
|
||||
case IS_REMOVE_METHOD:
|
||||
RemoveMethod(message);
|
||||
break;
|
||||
|
||||
default:
|
||||
BView::MessageReceived(message);
|
||||
break;
|
||||
default:
|
||||
BView::MessageReceived(message);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -206,7 +206,7 @@ MethodReplicant::UpdateMethod(BMessage *message)
|
|||
{
|
||||
CALLED();
|
||||
int32 cookie;
|
||||
if (message->FindInt32("cookie", &cookie)!=B_OK) {
|
||||
if (message->FindInt32("cookie", &cookie) != B_OK) {
|
||||
fprintf(stderr, "can't find cookie in message\n");
|
||||
return;
|
||||
}
|
||||
|
@ -228,14 +228,14 @@ MethodReplicant::UpdateMethodIcon(BMessage *message)
|
|||
{
|
||||
CALLED();
|
||||
int32 cookie;
|
||||
if (message->FindInt32("cookie", &cookie)!=B_OK) {
|
||||
if (message->FindInt32("cookie", &cookie) != B_OK) {
|
||||
fprintf(stderr, "can't find cookie in message\n");
|
||||
return;
|
||||
}
|
||||
|
||||
const uchar *data;
|
||||
ssize_t numBytes;
|
||||
if (message->FindData("icon", B_ANY_TYPE, (const void**)&data, &numBytes)!=B_OK) {
|
||||
if (message->FindData("icon", B_ANY_TYPE, (const void**)&data, &numBytes) != B_OK) {
|
||||
fprintf(stderr, "can't find icon in message\n");
|
||||
return;
|
||||
}
|
||||
|
@ -255,20 +255,20 @@ MethodReplicant::UpdateMethodMenu(BMessage *message)
|
|||
{
|
||||
CALLED();
|
||||
int32 cookie;
|
||||
if (message->FindInt32("cookie", &cookie)!=B_OK) {
|
||||
if (message->FindInt32("cookie", &cookie) != B_OK) {
|
||||
fprintf(stderr, "can't find cookie in message\n");
|
||||
return;
|
||||
}
|
||||
|
||||
BMessage msg;
|
||||
if (message->FindMessage("menu", &msg)!=B_OK) {
|
||||
if (message->FindMessage("menu", &msg) != B_OK) {
|
||||
fprintf(stderr, "can't find menu in message\n");
|
||||
return;
|
||||
}
|
||||
PRINT_OBJECT(msg);
|
||||
|
||||
BMessenger messenger;
|
||||
if (message->FindMessenger("target", &messenger)!=B_OK) {
|
||||
if (message->FindMessenger("target", &messenger) != B_OK) {
|
||||
fprintf(stderr, "can't find target in message\n");
|
||||
return;
|
||||
}
|
||||
|
@ -304,13 +304,13 @@ MethodReplicant::UpdateMethodName(BMessage *message)
|
|||
{
|
||||
CALLED();
|
||||
int32 cookie;
|
||||
if (message->FindInt32("cookie", &cookie)!=B_OK) {
|
||||
if (message->FindInt32("cookie", &cookie) != B_OK) {
|
||||
fprintf(stderr, "can't find cookie in message\n");
|
||||
return;
|
||||
}
|
||||
|
||||
const char *name;
|
||||
if (message->FindString("name", &name)!=B_OK) {
|
||||
if (message->FindString("name", &name) != B_OK) {
|
||||
fprintf(stderr, "can't find name in message\n");
|
||||
return;
|
||||
}
|
||||
|
@ -328,10 +328,10 @@ MethodReplicant::UpdateMethodName(BMessage *message)
|
|||
MethodMenuItem *
|
||||
MethodReplicant::FindItemByCookie(int32 cookie)
|
||||
{
|
||||
for (int32 i=0; i<fMenu.CountItems(); i++) {
|
||||
for (int32 i = 0; i < fMenu.CountItems(); i++) {
|
||||
MethodMenuItem *item = (MethodMenuItem *)fMenu.ItemAt(i);
|
||||
PRINT(("cookie : 0x%lx\n", item->Cookie()));
|
||||
if (item->Cookie()==cookie)
|
||||
if (item->Cookie() == cookie)
|
||||
return item;
|
||||
}
|
||||
|
||||
|
@ -344,20 +344,20 @@ MethodReplicant::AddMethod(BMessage *message)
|
|||
{
|
||||
CALLED();
|
||||
int32 cookie;
|
||||
if (message->FindInt32("cookie", &cookie)!=B_OK) {
|
||||
if (message->FindInt32("cookie", &cookie) != B_OK) {
|
||||
fprintf(stderr, "can't find cookie in message\n");
|
||||
return;
|
||||
}
|
||||
|
||||
const char *name;
|
||||
if (message->FindString("name", &name)!=B_OK) {
|
||||
if (message->FindString("name", &name) != B_OK) {
|
||||
fprintf(stderr, "can't find name in message\n");
|
||||
return;
|
||||
}
|
||||
|
||||
const uchar *icon;
|
||||
ssize_t numBytes;
|
||||
if (message->FindData("icon", B_ANY_TYPE, (const void**)&icon, &numBytes)!=B_OK) {
|
||||
if (message->FindData("icon", B_ANY_TYPE, (const void**)&icon, &numBytes) != B_OK) {
|
||||
fprintf(stderr, "can't find icon in message\n");
|
||||
return;
|
||||
}
|
||||
|
@ -382,7 +382,7 @@ MethodReplicant::RemoveMethod(BMessage *message)
|
|||
{
|
||||
CALLED();
|
||||
int32 cookie;
|
||||
if (message->FindInt32("cookie", &cookie)!=B_OK) {
|
||||
if (message->FindInt32("cookie", &cookie) != B_OK) {
|
||||
fprintf(stderr, "can't find cookie in message\n");
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -26,39 +26,38 @@
|
|||
class _EXPORT MethodReplicant;
|
||||
|
||||
class MethodReplicant : public BView {
|
||||
public:
|
||||
MethodReplicant(const char* signature);
|
||||
public:
|
||||
MethodReplicant(const char* signature);
|
||||
|
||||
MethodReplicant(BMessage *);
|
||||
MethodReplicant(BMessage *);
|
||||
// BMessage * based constructor needed to support archiving
|
||||
virtual ~MethodReplicant();
|
||||
virtual ~MethodReplicant();
|
||||
|
||||
// archiving overrides
|
||||
static MethodReplicant *Instantiate(BMessage *data);
|
||||
virtual status_t Archive(BMessage *data, bool deep = true) const;
|
||||
// archiving overrides
|
||||
static MethodReplicant *Instantiate(BMessage *data);
|
||||
virtual status_t Archive(BMessage *data, bool deep = true) const;
|
||||
|
||||
virtual void AttachedToWindow();
|
||||
virtual void AttachedToWindow();
|
||||
|
||||
// misc BView overrides
|
||||
virtual void MouseDown(BPoint);
|
||||
virtual void MouseUp(BPoint);
|
||||
// misc BView overrides
|
||||
virtual void MouseDown(BPoint);
|
||||
virtual void MouseUp(BPoint);
|
||||
|
||||
virtual void Draw(BRect );
|
||||
virtual void Draw(BRect);
|
||||
|
||||
virtual void MessageReceived(BMessage *);
|
||||
private:
|
||||
BBitmap *fSegments;
|
||||
char *fSignature;
|
||||
BPopUpMenu fMenu;
|
||||
virtual void MessageReceived(BMessage *);
|
||||
private:
|
||||
BBitmap *fSegments;
|
||||
char *fSignature;
|
||||
BPopUpMenu fMenu;
|
||||
|
||||
void UpdateMethod(BMessage *);
|
||||
void UpdateMethodIcon(BMessage *);
|
||||
void UpdateMethodMenu(BMessage *);
|
||||
void UpdateMethodName(BMessage *);
|
||||
void AddMethod(BMessage *message);
|
||||
void RemoveMethod(BMessage *message);
|
||||
MethodMenuItem *FindItemByCookie(int32 cookie);
|
||||
void UpdateMethod(BMessage *);
|
||||
void UpdateMethodIcon(BMessage *);
|
||||
void UpdateMethodMenu(BMessage *);
|
||||
void UpdateMethodName(BMessage *);
|
||||
void AddMethod(BMessage *message);
|
||||
void RemoveMethod(BMessage *message);
|
||||
MethodMenuItem *FindItemByCookie(int32 cookie);
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Reference in New Issue