jadedctrl/Chat-O-Matic
jadedctrl/ Chat-O-Matic
1
0
Disbranĉigi 0
Fontkodo Issues 20 Tirpetoj Actions Packages Projects Eldonoj 2 Wiki Activity

Resolved a memory leak, removed unuseful commented code, CAYA_EXTENDED_AWAY replaced with CAYA_CUSTOM_STATUS and added CAYA_INVISIBLE.

This commit is contained in:
barrett 2012-05-15 17:20:11 +00:00
parent 710a3c6526
commit 7540f60d24
9 changed files with 51 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
application/CayaConstants.h
View File

@ -31,9 +31,10 @@ enum CayaStatus {
CAYA_ONLINE = 1,
CAYA_AWAY = 2,
CAYA_DO_NOT_DISTURB = 3,
CAYA_OFFLINE = 4,
CAYA_EXTENDED_AWAY = 5,
CAYA_STATUSES = 6
CAYA_CUSTOM_STATUS = 4,
CAYA_INVISIBLE = 5,
CAYA_OFFLINE = 6,
CAYA_STATUSES = 7
};
#endif // _CAYA_CONSTANTS_H

10
application/CayaUtils.cpp
View File

@ -24,14 +24,16 @@ CayaStatusToString(CayaStatus status)
switch (status) {
case CAYA_ONLINE:
return "Available";
case CAYA_OFFLINE:
return "Offline";
case CAYA_AWAY:
return "Away";
case CAYA_EXTENDED_AWAY:
return "Custom Status";
case CAYA_DO_NOT_DISTURB:
return "Busy";
case CAYA_CUSTOM_STATUS:
return "Custom Status";
case CAYA_INVISIBLE:
return "Invisible";
case CAYA_OFFLINE:
return "Offline";
default:
return NULL;
}

7
application/ChatWindow.cpp
View File

@ -242,13 +242,18 @@ ChatWindow::AppendStatus(CayaStatus status)
case CAYA_ONLINE:
message << " is available";
break;
case CAYA_EXTENDED_AWAY:
case CAYA_AWAY:
message << " is away";
break;
case CAYA_DO_NOT_DISTURB:
message << " is busy, please do not disturb!";
break;
case CAYA_CUSTOM_STATUS:
message << " has set a custom status.";
break;
case CAYA_INVISIBLE:
message << " is invisible.";
break;
case CAYA_OFFLINE:
message << " is offline";
break;

3
application/TheApp.cpp
View File

@ -109,7 +109,7 @@ TheApp::AboutRequested()
AboutWindow* about = new AboutWindow("Caya", holders,
authors, extraInfo.String());
about->Show();
//delete about;
delete about;
}
@ -123,7 +123,6 @@ TheApp::GetMainWindow() const
void
TheApp::MessageReceived(BMessage* message)
{
//message->PrintToStream();
switch (message->what) {
case CAYA_REPLICANT_STATUS_SET:
case CAYA_REPLICANT_SHOW_WINDOW:

20
application/views/ContactInfoWindow.cpp
View File

@ -24,6 +24,7 @@
#include "ContactLinker.h"
#include "CayaConstants.h"
#include "CayaRenderView.h"
#include "CayaUtils.h"
#include "NotifyMessage.h"
#include "ContactInfoWindow.h"
@ -45,24 +46,7 @@ ContactInfoWindow::ContactInfoWindow(ContactLinker* linker)
fPersonalMessage->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
BString status(fContactLinker->GetName());
switch (fContactLinker->GetNotifyStatus()) {
case CAYA_ONLINE:
status << " is available";
break;
case CAYA_EXTENDED_AWAY:
case CAYA_AWAY:
status << " is away";
break;
case CAYA_DO_NOT_DISTURB:
status << " is busy, please do not disturb!";
break;
case CAYA_OFFLINE:
status << " is offline";
break;
default:
break;
}
status << CayaStatusToString(fContactLinker->GetNotifyStatus());
status << "\n\n ID : ";
status << fContactLinker->GetId();

7
application/views/ReplicantMenuItem.cpp
View File

@ -67,15 +67,16 @@ ReplicantMenuItem::SetIcon()
case CAYA_ONLINE:
num = kOnlineReplicant;
break;
case CAYA_EXTENDED_AWAY:
num = kCayaIconReplicant;
break;
case CAYA_AWAY:
num = kAwayReplicant;
break;
case CAYA_DO_NOT_DISTURB:
num = kBusyReplicant;
break;
case CAYA_CUSTOM_STATUS:
num = kCayaIconReplicant;
break;
case CAYA_INVISIBLE:
case CAYA_OFFLINE:
num = kOfflineReplicant;
break;

7
application/views/ReplicantStatusView.cpp
View File

@ -153,12 +153,13 @@ ReplicantStatusView::SetStatus(CayaStatus status)
case CAYA_AWAY:
fIcon = fAwayIcon;
break;
case CAYA_EXTENDED_AWAY:
fIcon = fCayaIcon;
break;
case CAYA_DO_NOT_DISTURB:
fIcon = fBusyIcon;
break;
case CAYA_CUSTOM_STATUS:
fIcon = fCayaIcon;
break;
case CAYA_INVISIBLE:
case CAYA_OFFLINE:
fIcon = fOfflineIcon;
break;

75
application/views/RosterItem.cpp
View File

@ -112,64 +112,29 @@ void RosterItem::DrawItem(BView* owner, BRect frame, bool complete)
owner->FillRect(frame);
}
/*BResources* res = CayaResources();
if (res) {
int32 num = 0;
switch (fStatus) {
case CAYA_ONLINE:
num = kOnlineReplicant;
break;
case CAYA_EXTENDED_AWAY:
num = kCayaIconReplicant;
break;
case CAYA_AWAY:
num = kAwayReplicant;
break;
case CAYA_DO_NOT_DISTURB:
num = kBusyReplicant;
break;
case CAYA_OFFLINE:
num = kOfflineReplicant;
break;
default:
// Draw contact status
switch (fStatus) {
case CAYA_ONLINE:
owner->SetHighColor(CAYA_GREEN_COLOR);
break;
case CAYA_CUSTOM_STATUS:
case CAYA_AWAY:
owner->SetHighColor(CAYA_ORANGE_COLOR);
break;
case CAYA_DO_NOT_DISTURB:
owner->SetHighColor(CAYA_RED_COLOR);
break;
case CAYA_INVISIBLE:
case CAYA_OFFLINE:
break;
default:
break;
}
BBitmap* bitmap = IconFromResources(res, num, B_MINI_ICON);
BRect bitmapRect(frame.left + 40, frame.top + fBaselineOffset - 10,
frame.left + 55, frame.top + 18);
owner->SetDrawingMode(B_OP_ALPHA);
owner->SetBlendingMode(B_PIXEL_ALPHA, B_ALPHA_OVERLAY);
owner->DrawBitmap(bitmap, bitmap->Bounds(),
bitmapRect, B_FILTER_BITMAP_BILINEAR);
delete res;
} else {*/
// Draw contact status
switch (fStatus) {
case CAYA_ONLINE:
owner->SetHighColor(CAYA_GREEN_COLOR);
break;
case CAYA_EXTENDED_AWAY:
case CAYA_AWAY:
owner->SetHighColor(CAYA_ORANGE_COLOR);
break;
case CAYA_DO_NOT_DISTURB:
owner->SetHighColor(CAYA_RED_COLOR);
break;
case CAYA_OFFLINE:
break;
default:
break;
}
owner->FillRect(BRect(frame.left,
frame.top,
frame.left + 5, frame.top + h - 1
));
//}
owner->FillRect(BRect(frame.left,
frame.top,
frame.left + 5, frame.top + h - 1
));
// Draw avatar icon
if (fBitmap != NULL) {

7
application/views/StatusMenuItem.cpp
View File

@ -64,15 +64,16 @@ StatusMenuItem::SetIcon()
case CAYA_ONLINE:
num = kOnlineReplicant;
break;
case CAYA_EXTENDED_AWAY:
num = kCayaIconReplicant;
break;
case CAYA_AWAY:
num = kAwayReplicant;
break;
case CAYA_DO_NOT_DISTURB:
num = kBusyReplicant;
break;
case CAYA_CUSTOM_STATUS:
num = kCayaIconReplicant;
break;
case CAYA_INVISIBLE:
case CAYA_OFFLINE:
num = kOfflineReplicant;
break;