Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated button bitmaps to the Haiku-like style agreed upon quite some time ago.

Browse Source 
Made some layout tweaks to handle the different size bitmaps.
Sorry I took so long in getting around to this. ;-/


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21400 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
DarkWyrm 2007-06-12 17:00:00 +00:00
parent b991dadc45
commit e5c4c7b679
2 changed files with 347 additions and 1163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/apps/cdplayer/CDPlayer.cpp
View File

@ -82,6 +82,10 @@ CDPlayer::CDPlayer(BRect frame, const char *name, uint32 resizeMask, uint32 flag
fWindowState = fCDDrive.GetState(); fWindowState = fCDDrive.GetState();
fVolumeSlider->SetValue(fCDDrive.GetVolume()); fVolumeSlider->SetValue(fCDDrive.GetVolume());
if (fVolumeSlider->Value() <= 2) {
fCDDrive.SetVolume(255);
fVolumeSlider->SetValue(255);
}
WatchCDState(); WatchCDState();
} }
@ -131,9 +135,11 @@ CDPlayer::BuildGUI(void)
r.OffsetTo(box->Bounds().right / 2, r.top); r.OffsetTo(box->Bounds().right / 2, r.top);
fDiscTime = new BStringView(r,"DiscTime","Disc: --:-- / --:--",B_FOLLOW_RIGHT); fDiscTime = new BStringView(r,"DiscTime","Disc: --:-- / --:--",B_FOLLOW_RIGHT);
fDiscTime->ResizeToPreferred();
fDiscTime->ResizeBy(10,0);
box->AddChild(fDiscTime); box->AddChild(fDiscTime);
box->ResizeTo(box->Bounds().Width(), fDiscTime->Frame().bottom + 10); box->ResizeTo(fCDTitle->Frame().right + 5, fDiscTime->Frame().bottom + 10);
fStop = new DrawButton(BRect(0,0,1,1), "Stop", fStop = new DrawButton(BRect(0,0,1,1), "Stop",
BTranslationUtils::GetBitmap(B_PNG_FORMAT,"stop_up"), BTranslationUtils::GetBitmap(B_PNG_FORMAT,"stop_up"),
@ -150,7 +156,7 @@ CDPlayer::BuildGUI(void)
BTranslationUtils::GetBitmap(B_PNG_FORMAT,"play_up"), BTranslationUtils::GetBitmap(B_PNG_FORMAT,"play_up"),
BTranslationUtils::GetBitmap(B_PNG_FORMAT,"play_down"), BTranslationUtils::GetBitmap(B_PNG_FORMAT,"play_down"),
BTranslationUtils::GetBitmap(B_PNG_FORMAT,"play_up_on"), BTranslationUtils::GetBitmap(B_PNG_FORMAT,"play_up_on"),
BTranslationUtils::GetBitmap(B_PNG_FORMAT,"play_down_on"), BTranslationUtils::GetBitmap(B_PNG_FORMAT,"play_down"),
new BMessage(M_PLAY), B_FOLLOW_NONE, B_WILL_DRAW); new BMessage(M_PLAY), B_FOLLOW_NONE, B_WILL_DRAW);
fPlay->ResizeToPreferred(); fPlay->ResizeToPreferred();
@ -160,35 +166,35 @@ CDPlayer::BuildGUI(void)
fPrevTrack = new DrawButton(BRect(0,0,1,1), "PrevTrack", fPrevTrack = new DrawButton(BRect(0,0,1,1), "PrevTrack",
BTranslationUtils::GetBitmap(B_PNG_FORMAT,"prev_up"), BTranslationUtils::GetBitmap(B_PNG_FORMAT,"prev_up"),
BTranslationUtils::GetBitmap(B_PNG_FORMAT,"prev_down"), BTranslationUtils::GetBitmap(B_PNG_FORMAT,"prev_down"),
new BMessage(M_PREV_TRACK), B_FOLLOW_BOTTOM, new BMessage(M_PREV_TRACK), 0,
B_WILL_DRAW); B_WILL_DRAW);
fPrevTrack->ResizeToPreferred(); fPrevTrack->ResizeToPreferred();
fPrevTrack->MoveTo(fPlay->Frame().right + 10, stopTop); fPrevTrack->MoveTo(fPlay->Frame().right + 20, stopTop);
AddChild(fPrevTrack); AddChild(fPrevTrack);
fNextTrack = new DrawButton(BRect(0,0,1,1), "NextTrack", fNextTrack = new DrawButton(BRect(0,0,1,1), "NextTrack",
BTranslationUtils::GetBitmap(B_PNG_FORMAT,"next_up"), BTranslationUtils::GetBitmap(B_PNG_FORMAT,"next_up"),
BTranslationUtils::GetBitmap(B_PNG_FORMAT,"next_down"), BTranslationUtils::GetBitmap(B_PNG_FORMAT,"next_down"),
new BMessage(M_NEXT_TRACK), B_FOLLOW_BOTTOM, new BMessage(M_NEXT_TRACK), 0,
B_WILL_DRAW); B_WILL_DRAW);
fNextTrack->ResizeToPreferred(); fNextTrack->ResizeToPreferred();
fNextTrack->MoveTo(fPrevTrack->Frame().right + 2, stopTop); fNextTrack->MoveTo(fPrevTrack->Frame().right + 1, stopTop);
AddChild(fNextTrack); AddChild(fNextTrack);
fRewind = new DoubleShotDrawButton(BRect(0,0,1,1), "Rewind", fRewind = new DoubleShotDrawButton(BRect(0,0,1,1), "Rewind",
BTranslationUtils::GetBitmap(B_PNG_FORMAT,"rew_up"), BTranslationUtils::GetBitmap(B_PNG_FORMAT,"rew_up"),
BTranslationUtils::GetBitmap(B_PNG_FORMAT,"rew_down"), BTranslationUtils::GetBitmap(B_PNG_FORMAT,"rew_down"),
new BMessage(M_REWIND), B_FOLLOW_BOTTOM, B_WILL_DRAW); new BMessage(M_REWIND), 0, B_WILL_DRAW);
fRewind->ResizeToPreferred(); fRewind->ResizeToPreferred();
fRewind->MoveTo(fNextTrack->Frame().right + 10, stopTop); fRewind->MoveTo(fNextTrack->Frame().right + 20, stopTop);
AddChild(fRewind); AddChild(fRewind);
fFastFwd = new DoubleShotDrawButton(BRect(0,0,1,1), "FastFwd", fFastFwd = new DoubleShotDrawButton(BRect(0,0,1,1), "FastFwd",
BTranslationUtils::GetBitmap(B_PNG_FORMAT,"ffwd_up"), BTranslationUtils::GetBitmap(B_PNG_FORMAT,"ffwd_up"),
BTranslationUtils::GetBitmap(B_PNG_FORMAT,"ffwd_down"), BTranslationUtils::GetBitmap(B_PNG_FORMAT,"ffwd_down"),
new BMessage(M_FFWD), B_FOLLOW_BOTTOM, B_WILL_DRAW); new BMessage(M_FFWD), 0, B_WILL_DRAW);
fFastFwd->ResizeToPreferred(); fFastFwd->ResizeToPreferred();
fFastFwd->MoveTo(fRewind->Frame().right + 2, stopTop); fFastFwd->MoveTo(fRewind->Frame().right + 1, stopTop);
AddChild(fFastFwd); AddChild(fFastFwd);
r.left = 10; r.left = 10;
@ -201,10 +207,10 @@ CDPlayer::BuildGUI(void)
AddChild(fVolumeSlider); AddChild(fVolumeSlider);
fRepeat = new TwoStateDrawButton( BRect(0,0,1,1), "Repeat", fRepeat = new TwoStateDrawButton( BRect(0,0,1,1), "Repeat",
BTranslationUtils::GetBitmap(B_PNG_FORMAT,"repeat_up"), BTranslationUtils::GetBitmap(B_PNG_FORMAT,"repeat_up_off"),
BTranslationUtils::GetBitmap(B_PNG_FORMAT,"repeat_down"), BTranslationUtils::GetBitmap(B_PNG_FORMAT,"repeat_down"),
BTranslationUtils::GetBitmap(B_PNG_FORMAT,"repeat_up_on"), BTranslationUtils::GetBitmap(B_PNG_FORMAT,"repeat_up_on"),
BTranslationUtils::GetBitmap(B_PNG_FORMAT,"repeat_down_on"), BTranslationUtils::GetBitmap(B_PNG_FORMAT,"repeat_down"),
new BMessage(M_REPEAT), B_FOLLOW_NONE, B_WILL_DRAW); new BMessage(M_REPEAT), B_FOLLOW_NONE, B_WILL_DRAW);
fRepeat->ResizeToPreferred(); fRepeat->ResizeToPreferred();
fRepeat->MoveTo(fPrevTrack->Frame().left, fRepeat->MoveTo(fPrevTrack->Frame().left,
@ -213,24 +219,25 @@ CDPlayer::BuildGUI(void)
AddChild(fRepeat); AddChild(fRepeat);
fShuffle = new TwoStateDrawButton(BRect(0,0,1,1), "Shuffle", fShuffle = new TwoStateDrawButton(BRect(0,0,1,1), "Shuffle",
BTranslationUtils::GetBitmap(B_PNG_FORMAT,"shuffle_up"), BTranslationUtils::GetBitmap(B_PNG_FORMAT,"shuffle_up_off"),
BTranslationUtils::GetBitmap(B_PNG_FORMAT,"shuffle_down"), BTranslationUtils::GetBitmap(B_PNG_FORMAT,"shuffle_down"),
BTranslationUtils::GetBitmap(B_PNG_FORMAT,"shuffle_up_on"), BTranslationUtils::GetBitmap(B_PNG_FORMAT,"shuffle_up_on"),
BTranslationUtils::GetBitmap(B_PNG_FORMAT,"shuffle_down_on"), BTranslationUtils::GetBitmap(B_PNG_FORMAT,"shuffle_down"),
new BMessage(M_SHUFFLE), B_FOLLOW_NONE, B_WILL_DRAW); new BMessage(M_SHUFFLE), B_FOLLOW_NONE, B_WILL_DRAW);
fShuffle->ResizeToPreferred(); fShuffle->ResizeToPreferred();
fShuffle->MoveTo(fNextTrack->Frame().left + 2,fRepeat->Frame().top); fShuffle->MoveTo(fRepeat->Frame().right + 2,fRepeat->Frame().top);
AddChild(fShuffle); AddChild(fShuffle);
fEject = new DrawButton(BRect(0,0,1,1), "Eject", fEject = new DrawButton(BRect(0,0,1,1), "Eject",
BTranslationUtils::GetBitmap(B_PNG_FORMAT,"eject_up"), BTranslationUtils::GetBitmap(B_PNG_FORMAT,"eject_up"),
BTranslationUtils::GetBitmap(B_PNG_FORMAT,"eject_down"), BTranslationUtils::GetBitmap(B_PNG_FORMAT,"eject_down"),
new BMessage(M_EJECT), B_FOLLOW_BOTTOM, B_WILL_DRAW); new BMessage(M_EJECT), 0, B_WILL_DRAW);
fEject->ResizeToPreferred(); fEject->ResizeToPreferred();
fEject->MoveTo(fFastFwd->Frame().left, fShuffle->Frame().top); fEject->MoveTo(fFastFwd->Frame().left, fShuffle->Frame().top);
AddChild(fEject); AddChild(fEject);
ResizeTo(fFastFwd->Frame().right + 10, fVolumeSlider->Frame().bottom + 10); ResizeTo(box->Frame().right + 10, fVolumeSlider->Frame().bottom + 10);
} }
@ -259,7 +266,7 @@ CDPlayer::MessageReceived(BMessage *msg)
fWindowState = kPaused; fWindowState = kPaused;
fCDDrive.Pause(); fCDDrive.Pause();
fPlay->SetBitmaps(0, BTranslationUtils::GetBitmap(B_PNG_FORMAT,"paused_up"), fPlay->SetBitmaps(0, BTranslationUtils::GetBitmap(B_PNG_FORMAT,"paused_up"),
BTranslationUtils::GetBitmap(B_PNG_FORMAT,"paused_down")); BTranslationUtils::GetBitmap(B_PNG_FORMAT,"play_down"));
} else if (fWindowState == kPaused) { } else if (fWindowState == kPaused) {
fWindowState = kPlaying; fWindowState = kPlaying;
fCDDrive.Resume(); fCDDrive.Resume();

1467
src/apps/cdplayer/CDPlayer.rdef
View File

File diff suppressed because it is too large Load Diff