equal
deleted
inserted
replaced
315 { |
315 { |
316 aView->handleCommand(EIR_ViewCommand_TOBEACTIVATED, EIR_ViewCommandReason_Show); |
316 aView->handleCommand(EIR_ViewCommand_TOBEACTIVATED, EIR_ViewCommandReason_Show); |
317 IRBaseView *viewToHide = static_cast<IRBaseView*>(currentView()); |
317 IRBaseView *viewToHide = static_cast<IRBaseView*>(currentView()); |
318 if( viewToHide ) |
318 if( viewToHide ) |
319 { |
319 { |
320 if( (EIRView_StationDetailsView == aView->id() && EIRView_PlayingView == viewToHide->id()) |
320 if( (EIRView_StationDetailsView == aView->id()) || |
321 ||(EIRView_StationDetailsView == viewToHide->id() && EIRView_PlayingView == aView->id()) |
321 (EIRView_StationDetailsView == viewToHide->id()) |
322 ) |
322 ) |
323 { |
323 { |
324 setCurrentView(aView,true,Hb::ViewSwitchUseAltEvent); |
324 setCurrentView(aView,true,Hb::ViewSwitchUseAltEvent); |
325 } |
325 } |
326 else |
326 else |
483 } |
483 } |
484 } |
484 } |
485 |
485 |
486 void IRViewManager::handleViewReady() |
486 void IRViewManager::handleViewReady() |
487 { |
487 { |
488 IRBaseView *topView = static_cast<IRBaseView*>(currentView()); |
488 IRBaseView *topView = dynamic_cast<IRBaseView*>(currentView()); |
489 if (topView) |
489 if (topView) |
490 { |
490 { |
491 topView->handleCommand(EIR_ViewCommand_ACTIVATED, EIR_ViewCommandReason_Show); |
491 topView->handleCommand(EIR_ViewCommand_ACTIVATED, EIR_ViewCommandReason_Show); |
492 } |
492 } |
493 |
493 |
581 } |
581 } |
582 } |
582 } |
583 |
583 |
584 void IRViewManager::updateSoftkey() |
584 void IRViewManager::updateSoftkey() |
585 { |
585 { |
586 IRBaseView *topView = static_cast<IRBaseView*>(currentView()); |
586 IRBaseView *topView = dynamic_cast<IRBaseView*>(currentView()); |
587 if (topView) |
587 if (topView) |
588 { |
588 { |
589 if (topView->testFlag(IRBaseView::EViewFlag_ClearStackWhenActivate)) |
589 if (topView->testFlag(IRBaseView::EViewFlag_ClearStackWhenActivate)) |
590 { |
590 { |
591 topView->setNavigationAction(iExitAction); |
591 topView->setNavigationAction(iExitAction); |