i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Minor cleanup.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33518 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2009-10-11 15:28:19 +00:00
parent a1a928319d
commit 18a16affab
1 changed files with 184 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/cortex/RouteApp/RouteWindow.cpp
+116 -126
View File
@@ -35,7 +35,6 @@
__USE_CORTEX_NAMESPACE __USE_CORTEX_NAMESPACE
// -------------------------------------------------------- //
const char* const RouteWindow::s_windowName = "Cortex"; const char* const RouteWindow::s_windowName = "Cortex";
@@ -52,13 +51,14 @@ const char* const g_aboutText =
"Certain icons used herein are the property of\n" "Certain icons used herein are the property of\n"
"Be, Inc. and are used by permission."; "Be, Inc. and are used by permission.";
// -------------------------------------------------------- //
// ctor/dtor
// -------------------------------------------------------- //
RouteWindow::~RouteWindow() {} RouteWindow::~RouteWindow()
{
}
RouteWindow::RouteWindow(RouteAppNodeManager* manager) :
RouteWindow::RouteWindow(RouteAppNodeManager* manager)
:
BWindow(s_initFrame, s_windowName, B_DOCUMENT_WINDOW, 0), BWindow(s_initFrame, s_windowName, B_DOCUMENT_WINDOW, 0),
m_hScrollBar(0), m_hScrollBar(0),
m_vScrollBar(0), m_vScrollBar(0),
@@ -66,24 +66,20 @@ RouteWindow::RouteWindow(RouteAppNodeManager* manager) :
m_dormantNodeWindow(0), m_dormantNodeWindow(0),
m_selectedGroupID(0), m_selectedGroupID(0),
m_zoomed(false), m_zoomed(false),
m_zooming(false) { m_zooming(false)
{
BRect b = Bounds(); BRect b = Bounds();
// initialize the menu bar: add all menus that target this window // initialize the menu bar: add all menus that target this window
BMenuBar* pMenuBar = new BMenuBar(b, "menuBar"); BMenuBar* pMenuBar = new BMenuBar(b, "menuBar");
BMenu* pFileMenu = new BMenu("File"); BMenu* pFileMenu = new BMenu("File");
BMenuItem* item = new BMenuItem( BMenuItem* item = new BMenuItem("Open" B_UTF8_ELLIPSIS,
"Open" B_UTF8_ELLIPSIS, new BMessage(RouteApp::M_SHOW_OPEN_PANEL), 'O');
new BMessage(RouteApp::M_SHOW_OPEN_PANEL),
'O');
item->SetTarget(be_app); item->SetTarget(be_app);
pFileMenu->AddItem(item); pFileMenu->AddItem(item);
pFileMenu->AddItem(new BSeparatorItem()); pFileMenu->AddItem(new BSeparatorItem());
item = new BMenuItem( item = new BMenuItem("Save Nodes" B_UTF8_ELLIPSIS,
"Save Nodes" B_UTF8_ELLIPSIS, new BMessage(RouteApp::M_SHOW_SAVE_PANEL), 'S');
new BMessage(RouteApp::M_SHOW_SAVE_PANEL),
'S');
item->SetTarget(be_app); item->SetTarget(be_app);
pFileMenu->AddItem(item); pFileMenu->AddItem(item);
pFileMenu->AddItem(new BSeparatorItem()); pFileMenu->AddItem(new BSeparatorItem());
@@ -99,10 +95,7 @@ RouteWindow::RouteWindow(RouteAppNodeManager* manager) :
rvBounds.top = pMenuBar->Frame().bottom+1; rvBounds.top = pMenuBar->Frame().bottom+1;
rvBounds.right -= B_V_SCROLL_BAR_WIDTH; rvBounds.right -= B_V_SCROLL_BAR_WIDTH;
rvBounds.bottom -= B_H_SCROLL_BAR_HEIGHT; rvBounds.bottom -= B_H_SCROLL_BAR_HEIGHT;
m_routingView = new MediaRoutingView( m_routingView = new MediaRoutingView(manager, rvBounds, "routingView");
manager,
rvBounds,
"routingView");
BRect hsBounds = rvBounds; BRect hsBounds = rvBounds;
hsBounds.left = rvBounds.left + 199; hsBounds.left = rvBounds.left + 199;
@@ -110,10 +103,7 @@ RouteWindow::RouteWindow(RouteAppNodeManager* manager) :
hsBounds.right++; hsBounds.right++;
hsBounds.bottom = b.bottom + 1; hsBounds.bottom = b.bottom + 1;
m_hScrollBar = new BScrollBar( m_hScrollBar = new BScrollBar(hsBounds, "hScrollBar", m_routingView,
hsBounds,
"hScrollBar",
m_routingView,
0, 0, B_HORIZONTAL); 0, 0, B_HORIZONTAL);
AddChild(m_hScrollBar); AddChild(m_hScrollBar);
@@ -123,10 +113,7 @@ RouteWindow::RouteWindow(RouteAppNodeManager* manager) :
vsBounds.right = b.right + 1; vsBounds.right = b.right + 1;
vsBounds.bottom++; vsBounds.bottom++;
m_vScrollBar = new BScrollBar( m_vScrollBar = new BScrollBar(vsBounds, "vScrollBar", m_routingView,
vsBounds,
"vScrollBar",
m_routingView,
0, 0, B_VERTICAL); 0, 0, B_VERTICAL);
AddChild(m_vScrollBar); AddChild(m_vScrollBar);
@@ -136,10 +123,7 @@ RouteWindow::RouteWindow(RouteAppNodeManager* manager) :
svBounds.top = svBounds.bottom + 1; svBounds.top = svBounds.bottom + 1;
svBounds.bottom = b.bottom + 1; svBounds.bottom = b.bottom + 1;
m_statusView = new StatusView( m_statusView = new StatusView(svBounds, manager, m_hScrollBar);
svBounds,
manager,
m_hScrollBar);
AddChild(m_statusView); AddChild(m_statusView);
AddChild(m_routingView); AddChild(m_routingView);
@@ -178,24 +162,30 @@ RouteWindow::RouteWindow(RouteAppNodeManager* manager) :
_toggleTransportWindow(); _toggleTransportWindow();
} }
// -------------------------------------------------------- //
// operations
// -------------------------------------------------------- //
// enable/disable palette position-locking (when the main // #pragma mark - operations
// window is moved, all palettes follow)
bool RouteWindow::isPullPalettes() const {
/*! Enable/disable palette position-locking (when the main
window is moved, all palettes follow).
*/
bool
RouteWindow::isPullPalettes() const
{
return m_pullPalettesItem->IsMarked(); return m_pullPalettesItem->IsMarked();
} }
void RouteWindow::setPullPalettes(
bool enabled) {
void
RouteWindow::setPullPalettes(bool enabled)
{
m_pullPalettesItem->SetMarked(enabled); m_pullPalettesItem->SetMarked(enabled);
} }
// [e.moon 2dec99] force window & palettes on-screen
void RouteWindow::constrainToScreen() {
void
RouteWindow::constrainToScreen()
{
BScreen screen(this); BScreen screen(this);
const BRect sr = screen.Frame(); const BRect sr = screen.Frame();
@@ -263,14 +253,13 @@ void RouteWindow::constrainToScreen() {
} }
// -------------------------------------------------------- //
// BWindow impl
// -------------------------------------------------------- //
// [e.moon 17nov99] 'palette-pulling' impl // #pragma mark - BWindow implementation
void RouteWindow::FrameMoved(
BPoint point) {
void
RouteWindow::FrameMoved(BPoint point)
{
// ignore notification if the window isn't yet visible // ignore notification if the window isn't yet visible
if(IsHidden()) if(IsHidden())
return; return;
@@ -278,15 +267,15 @@ void RouteWindow::FrameMoved(
BPoint delta = point - m_lastFramePosition; BPoint delta = point - m_lastFramePosition;
m_lastFramePosition = point; m_lastFramePosition = point;
if(m_pullPalettesItem->IsMarked()) {
if (m_pullPalettesItem->IsMarked())
_movePalettesBy(delta.x, delta.y); _movePalettesBy(delta.x, delta.y);
} }
}
// [c.lenz 1mar2000] added for better Zoom() support
void RouteWindow::FrameResized( void
float width, RouteWindow::FrameResized(float width, float height)
float height) { {
D_HOOK(("RouteWindow::FrameResized()\n")); D_HOOK(("RouteWindow::FrameResized()\n"));
if (!m_zooming) { if (!m_zooming) {
@@ -297,17 +286,18 @@ void RouteWindow::FrameResized(
} }
} }
bool RouteWindow::QuitRequested() {
bool
RouteWindow::QuitRequested()
{
be_app->PostMessage(B_QUIT_REQUESTED); be_app->PostMessage(B_QUIT_REQUESTED);
return false; // [e.moon 20oct99] app now quits window return false; // [e.moon 20oct99] app now quits window
} }
// [c.lenz 1mar2000] resize to MediaRoutingView's preferred size
void RouteWindow::Zoom( void
BPoint origin, RouteWindow::Zoom(BPoint origin, float width, float height)
float width, {
float height) {
D_HOOK(("RouteWindow::Zoom()\n")); D_HOOK(("RouteWindow::Zoom()\n"));
m_zooming = true; m_zooming = true;
@@ -338,11 +328,13 @@ void RouteWindow::Zoom(
} }
} }
// -------------------------------------------------------- //
// BHandler impl
// -------------------------------------------------------- //
void RouteWindow::MessageReceived(BMessage* pMsg) { // #pragma mark - BHandler implemenation
void
RouteWindow::MessageReceived(BMessage* pMsg)
{
// PRINT(( // PRINT((
// "RouteWindow::MessageReceived()\n")); // "RouteWindow::MessageReceived()\n"));
// pMsg->PrintToStream(); // pMsg->PrintToStream();
@@ -386,13 +378,13 @@ void RouteWindow::MessageReceived(BMessage* pMsg) {
} }
} }
// -------------------------------------------------------- //
// *** IStateArchivable
// -------------------------------------------------------- //
status_t RouteWindow::importState( // #pragma mark - IStateArchivable
const BMessage* archive) {
status_t
RouteWindow::importState(const BMessage* archive)
{
status_t err; status_t err;
// frame rect // frame rect
@@ -432,8 +424,7 @@ status_t RouteWindow::importState(
if (err == B_OK) if (err == B_OK)
m_dormantNodeWindowFrame = r; m_dormantNodeWindowFrame = r;
err = archive->FindBool("addonPaletteVisible", &b); err = archive->FindBool("addonPaletteVisible", &b);
if(err == B_OK && if (err == B_OK && (b != (m_dormantNodeWindow != 0))) {
(b != (m_dormantNodeWindow != 0))) {
_toggleDormantNodeWindow(); _toggleDormantNodeWindow();
if(!m_dormantNodeWindow) if(!m_dormantNodeWindow)
m_dormantNodeWindowFrame = r; m_dormantNodeWindowFrame = r;
@@ -451,8 +442,7 @@ status_t RouteWindow::importState(
if (err == B_OK) if (err == B_OK)
m_transportWindowFrame = r; m_transportWindowFrame = r;
err = archive->FindBool("transportVisible", &b); err = archive->FindBool("transportVisible", &b);
if(err == B_OK && if (err == B_OK && (b != (m_transportWindow != 0))) {
(b != (m_transportWindow != 0))) {
_toggleTransportWindow(); _toggleTransportWindow();
if (!m_transportWindow) if (!m_transportWindow)
m_transportWindowFrame = r; m_transportWindowFrame = r;
@@ -468,23 +458,21 @@ status_t RouteWindow::importState(
return B_OK; return B_OK;
} }
status_t RouteWindow::exportState(
BMessage* archive) const {
status_t
RouteWindow::exportState(BMessage* archive) const
{
BRect r = Frame(); BRect r = Frame();
archive->AddRect("frame", r); archive->AddRect("frame", r);
archive->AddBool("pullPalettes", m_pullPalettesItem->IsMarked()); archive->AddBool("pullPalettes", m_pullPalettesItem->IsMarked());
bool b = (m_dormantNodeWindow != 0); bool b = (m_dormantNodeWindow != 0);
r = (b) ? r = b ? m_dormantNodeWindow->Frame() : m_dormantNodeWindowFrame;
m_dormantNodeWindow->Frame() :
m_dormantNodeWindowFrame;
archive->AddRect("addonPaletteFrame", r); archive->AddRect("addonPaletteFrame", r);
archive->AddBool("addonPaletteVisible", b); archive->AddBool("addonPaletteVisible", b);
b = (m_transportWindow != 0); b = (m_transportWindow != 0);
r = (b) ? m_transportWindow->Frame() : r = b ? m_transportWindow->Frame() : m_transportWindowFrame;
m_transportWindowFrame;
archive->AddRect("transportFrame", r); archive->AddRect("transportFrame", r);
archive->AddBool("transportVisible", b); archive->AddBool("transportVisible", b);
@@ -505,12 +493,13 @@ status_t RouteWindow::exportState(
return B_OK; return B_OK;
} }
// -------------------------------------------------------- //
// implementation
// -------------------------------------------------------- //
// [c.lenz 1mar2000] added for better Zoom() support // #pragma mark - implementation
void RouteWindow::_constrainToScreen() {
void
RouteWindow::_constrainToScreen()
{
D_INTERNAL(("RouteWindow::_constrainToScreen()\n")); D_INTERNAL(("RouteWindow::_constrainToScreen()\n"));
BScreen screen(this); BScreen screen(this);
@@ -548,19 +537,19 @@ void RouteWindow::_constrainToScreen() {
} }
} }
void RouteWindow::_toggleTransportWindow() {
void
RouteWindow::_toggleTransportWindow()
{
if (m_transportWindow) { if (m_transportWindow) {
m_transportWindowFrame = m_transportWindow->Frame(); m_transportWindowFrame = m_transportWindow->Frame();
m_transportWindow->Lock(); m_transportWindow->Lock();
m_transportWindow->Quit(); m_transportWindow->Quit();
m_transportWindow = 0; m_transportWindow = 0;
m_transportWindowItem->SetMarked(false); m_transportWindowItem->SetMarked(false);
} } else {
else { m_transportWindow = new TransportWindow(m_routingView->manager,
m_transportWindow = new TransportWindow( this, "Transport");
m_routingView->manager,
this,
"Transport");
// ask for a selection update // ask for a selection update
BMessenger(m_routingView).SendMessage( BMessenger(m_routingView).SendMessage(
@@ -569,8 +558,7 @@ void RouteWindow::_toggleTransportWindow() {
// place & display the window // place & display the window
if (m_transportWindowFrame.IsValid()) { if (m_transportWindowFrame.IsValid()) {
m_transportWindow->MoveTo(m_transportWindowFrame.LeftTop()); m_transportWindow->MoveTo(m_transportWindowFrame.LeftTop());
m_transportWindow->ResizeTo( m_transportWindow->ResizeTo(m_transportWindowFrame.Width(),
m_transportWindowFrame.Width(),
m_transportWindowFrame.Height()); m_transportWindowFrame.Height());
} }
@@ -579,27 +567,28 @@ void RouteWindow::_toggleTransportWindow() {
} }
} }
// [e.moon 17nov99]
void RouteWindow::_togglePullPalettes() {
void
RouteWindow::_togglePullPalettes()
{
m_pullPalettesItem->SetMarked(!m_pullPalettesItem->IsMarked()); m_pullPalettesItem->SetMarked(!m_pullPalettesItem->IsMarked());
} }
void RouteWindow::_toggleDormantNodeWindow() {
void
RouteWindow::_toggleDormantNodeWindow()
{
if (m_dormantNodeWindow) { if (m_dormantNodeWindow) {
m_dormantNodeWindowFrame = m_dormantNodeWindow->Frame(); m_dormantNodeWindowFrame = m_dormantNodeWindow->Frame();
m_dormantNodeWindow->Lock(); m_dormantNodeWindow->Lock();
m_dormantNodeWindow->Quit(); m_dormantNodeWindow->Quit();
m_dormantNodeWindow = 0; m_dormantNodeWindow = 0;
m_dormantNodeWindowItem->SetMarked(false); m_dormantNodeWindowItem->SetMarked(false);
} } else {
else {
m_dormantNodeWindow = new DormantNodeWindow(this); m_dormantNodeWindow = new DormantNodeWindow(this);
if (m_dormantNodeWindowFrame.IsValid()) { if (m_dormantNodeWindowFrame.IsValid()) {
m_dormantNodeWindow->MoveTo(m_dormantNodeWindowFrame.LeftTop()); m_dormantNodeWindow->MoveTo(m_dormantNodeWindowFrame.LeftTop());
m_dormantNodeWindow->ResizeTo( m_dormantNodeWindow->ResizeTo(m_dormantNodeWindowFrame.Width(),
m_dormantNodeWindowFrame.Width(),
m_dormantNodeWindowFrame.Height()); m_dormantNodeWindowFrame.Height());
} }
m_dormantNodeWindow->Show(); m_dormantNodeWindow->Show();
@@ -607,8 +596,10 @@ void RouteWindow::_toggleDormantNodeWindow() {
} }
} }
void RouteWindow::_handleGroupSelected(
BMessage* message) { void
RouteWindow::_handleGroupSelected(BMessage* message)
{
status_t err; status_t err;
uint32 groupID; uint32 groupID;
@@ -629,8 +620,10 @@ void RouteWindow::_handleGroupSelected(
m_selectedGroupID = groupID; m_selectedGroupID = groupID;
} }
void RouteWindow::_handleShowErrorMessage(
BMessage* message) { void
RouteWindow::_handleShowErrorMessage(BMessage* message)
{
status_t err; status_t err;
BString text; BString text;
@@ -644,10 +637,11 @@ void RouteWindow::_handleShowErrorMessage(
m_statusView->setErrorMessage(text.String(), message->HasBool("error")); m_statusView->setErrorMessage(text.String(), message->HasBool("error"));
} }
// refresh the transport window for the given group, if any
void RouteWindow::_refreshTransportSettings(
BMessage* message) {
//! Refresh the transport window for the given group, if any
void
RouteWindow::_refreshTransportSettings(BMessage* message)
{
status_t err; status_t err;
uint32 groupID; uint32 groupID;
@@ -665,7 +659,9 @@ void RouteWindow::_refreshTransportSettings(
} }
void RouteWindow::_closePalettes() { void
RouteWindow::_closePalettes()
{
BAutolock _l(this); BAutolock _l(this);
if (m_transportWindow) { if (m_transportWindow) {
@@ -675,12 +671,10 @@ void RouteWindow::_closePalettes() {
} }
} }
// [e.moon 17nov99] move all palette windows by the
// specified amounts
void RouteWindow::_movePalettesBy(
float xDelta,
float yDelta) {
//! Move all palette windows by the specified amounts
void RouteWindow::_movePalettesBy(float xDelta, float yDelta)
{
if (m_transportWindow) if (m_transportWindow)
m_transportWindow->MoveBy(xDelta, yDelta); m_transportWindow->MoveBy(xDelta, yDelta);
@@ -688,24 +682,22 @@ void RouteWindow::_movePalettesBy(
m_dormantNodeWindow->MoveBy(xDelta, yDelta); m_dormantNodeWindow->MoveBy(xDelta, yDelta);
} }
// [e.moon 1dec99] toggle group playback
void RouteWindow::_toggleGroupRolling() {
//! Toggle group playback
void
RouteWindow::_toggleGroupRolling()
{
if (!m_selectedGroupID) if (!m_selectedGroupID)
return; return;
NodeGroup* g; NodeGroup* g;
status_t err = m_routingView->manager->findGroup( status_t err = m_routingView->manager->findGroup(m_selectedGroupID, &g);
m_selectedGroupID,
&g);
if (err < B_OK) if (err < B_OK)
return; return;
Autolock _l(g); Autolock _l(g);
uint32 startAction = uint32 startAction = (g->runMode() == BMediaNode::B_OFFLINE)
(g->runMode() == BMediaNode::B_OFFLINE) ? ? NodeGroup::M_ROLL : NodeGroup::M_START;
NodeGroup::M_ROLL :
NodeGroup::M_START;
BMessenger m(g); BMessenger m(g);
switch (g->transportState()) { switch (g->transportState()) {
@@ -722,5 +714,3 @@ void RouteWindow::_toggleGroupRolling() {
break; break;
} }
} }
// END -- RouteWindow.cpp --