From: Zoltan Papp <zoltan.papp@ixonos.com>
Date: Mon, 1 Jun 2009 06:16:11 +0000 (+0300)
Subject: Merge branch 'master' into dev_local
X-Git-Url: https://vcs.maemo.org/git/?p=qtmeetings;a=commitdiff_plain;h=270286b17231aedeedd0bd4b3fa7db7b65f7c9da

Merge branch 'master' into dev_local
---

270286b17231aedeedd0bd4b3fa7db7b65f7c9da
diff --cc src/UserInterface/Views/RoomStatusIndicatorWidget.cpp
index 6573e28,dbc2b07..e3ba648
--- a/src/UserInterface/Views/RoomStatusIndicatorWidget.cpp
+++ b/src/UserInterface/Views/RoomStatusIndicatorWidget.cpp
@@@ -137,27 -122,26 +142,49 @@@ void RoomStatusIndicatorWidget::statusC
  		iUntilTextLabel->setText( tr( "until %1" ).arg( aUntil.toString( iTimeFormat ) ) );
  	}
  	setPalette( createPalette( aStatus ) );
+ }
+ 
+ void RoomStatusIndicatorWidget::currentRoomChanged( Room *aRoom )
+ {
+ 	iDefaultRoomLabel->setText( aRoom->name() );
+ }
+ 
+ bool RoomStatusIndicatorWidget::event(QEvent *event)
+ {
+ 	switch(event->type())
+ 	{
+ 		case QEvent::Paint:
+ 			qDebug() << "[RoomStatusIndicatorWidget::event] <Paint event>";
+ 			break;
+ 		case QEvent::PaletteChange:
+ 			qDebug() << "[RoomStatusIndicatorWidget::event] <Palette change event>";
+ 			break;
+ 		default:
+ 			break;
+ 	}
+ 	
+ 	return ViewBase::event( event );
  }
 +
 +void RoomStatusIndicatorWidget::connectionEstablished()
 +{
 +	
 +	if( !connectedOnce )
 +	{
 +		// Just got the required meetings for the first time
 +		qDebug() << "RoomStatusIndicatorWidget::connectionEstablished() first call";
 +		iDefaultRoomLabel->setHidden( false );
 +		iUntilTextLabel->setHidden( false );
 +		iStatusLabel->setHidden( false );
 +	}
 +	else qDebug() << "RoomStatusIndicatorWidget::connectionEstablished()";
 +	ViewBase::connectionEstablished();
 +	iConnectionLabel->setHidden( true );
 +}
 +
 +void RoomStatusIndicatorWidget::connectionLost()
 +{
 +	ViewBase::connectionLost();
 +	iConnectionLabel->setHidden( false );
 +}
 +