From: Zoltan Papp <zoltan.papp@ixonos.com>
Date: Mon, 1 Jun 2009 07:12:18 +0000 (+0300)
Subject: Merge branch 'master' of https://git.maemo.org/projects/qtmeetings
X-Git-Url: https://vcs.maemo.org/git/?a=commitdiff_plain;h=33edea90bd097065e8c6b63cabc6b4b22c6a5d2c;hp=fcb810bb877a60fa126538479875420a6f199f98;p=qtmeetings

Merge branch 'master' of https://git.maemo.org/projects/qtmeetings
---

diff --git a/src/BusinessLogic/Engine.cpp b/src/BusinessLogic/Engine.cpp
index da479c2..aac84d4 100644
--- a/src/BusinessLogic/Engine.cpp
+++ b/src/BusinessLogic/Engine.cpp
@@ -109,7 +109,7 @@ void Engine::checkStatusOfAllRooms()
 	for (int i = 0; i < iConfiguration->rooms().count(); i++)
 	{
 		// and check the status
-		roomStatusInfoNeeded(iConfiguration->rooms().at(i) );
+		roomStatusInfoNeeded( iConfiguration->rooms().at(i) );
 	}
 }
 
@@ -369,4 +369,4 @@ void Engine::currentRoomChanged(Room *aRoom)
 	qDebug() << "[Engine::currentRoomChanged] <invoked>";
 	iCurrentRoom = aRoom;
 	roomStatusInfoNeeded( iCurrentRoom );
-}
\ No newline at end of file
+}
diff --git a/src/BusinessLogic/UIManager.cpp b/src/BusinessLogic/UIManager.cpp
index da6b93b..0b94628 100644
--- a/src/BusinessLogic/UIManager.cpp
+++ b/src/BusinessLogic/UIManager.cpp
@@ -90,7 +90,7 @@ void UIManager::createSettingsView()
 void UIManager::createRoomStatusIndicator()
 {
 	iRoomStatusIndicator = new RoomStatusIndicatorWidget( iEngine->defaultRoom(), Room::FreeStatus, QTime::currentTime(), iEngine->iConfiguration->displaySettings()->timeFormat() );
-	connect( iEngine, SIGNAL( roomStatusChanged( Room::Status, QTime ) ), this, SLOT( statusChanged( Room::Status, QTime ) ) );
+	connect( iEngine, SIGNAL( roomStatusChanged( Room::Status, QTime ) ), iRoomStatusIndicator, SLOT( statusChanged( Room::Status, QTime ) ) );
 	connect( iWeeklyView, SIGNAL( currentRoomChanged( Room * ) ), iRoomStatusIndicator, SLOT( currentRoomChanged( Room * ) ) );
 }
 
diff --git a/src/UserInterface/Views/RoomStatusIndicatorWidget.cpp b/src/UserInterface/Views/RoomStatusIndicatorWidget.cpp
index 89f65f1..1cf48a7 100644
--- a/src/UserInterface/Views/RoomStatusIndicatorWidget.cpp
+++ b/src/UserInterface/Views/RoomStatusIndicatorWidget.cpp
@@ -96,28 +96,26 @@ QString RoomStatusIndicatorWidget::statusToText( const Room::Status aStatus )
 
 QPalette RoomStatusIndicatorWidget::createPalette( Room::Status aStatus )
 {
-	// QPixmap pixmap( aStatus == Room::BusyStatus ? ":roomstatus_busy" : ":roomstatus_free" );
 	QString image = aStatus == Room::BusyStatus ? ":roomstatus_busy" : ":roomstatus_free";
+	QPixmap pixmap( image );
 
 	// The image needs to be moved in normal mode so the traffic light not partly outside the screen
 	const int xoffset( 60 );
 	const int yoffset( 19 );
-//	int cropwidth( pixmap.width() - xoffset );
-//	int cropheight( pixmap.height() - yoffset );
+	int cropwidth( pixmap.width() - xoffset );
+	int cropheight( pixmap.height() - yoffset );
 	
 	QBrush brush;
 	if ( windowState() == Qt::WindowFullScreen )
 	{
 		// Use the full image in full screen mode
-//		brush.setTexture( pixmap );
-		brush.setTexture( QPixmap(image) );
+		brush.setTexture( pixmap );
 	}
 	else
 	{
 		// Take part of the image so the traffic lights are moved xoffset poxels to left 
 		// and yoffset pixels to up
-//		brush.setTexture( pixmap.copy( xoffset, yoffset, cropwidth, cropheight ) );
-		brush.setTexture( QPixmap(image) );
+		brush.setTexture( pixmap.copy( xoffset, yoffset, cropwidth, cropheight ) );
 	}
 
 	QPalette palette;
@@ -132,7 +130,6 @@ void RoomStatusIndicatorWidget::setCurrentTime( QTime aCurrentTime )
 
 void RoomStatusIndicatorWidget::statusChanged( const Room::Status aStatus, const QTime aUntil )
 {
-	qDebug() << "[RoomStatusIndicatorWidget::statusChanged] <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>";
 	iStatusLabel->setText( tr( "is %1" ).arg( statusToText( aStatus ) ) );
 	if ( aUntil == RoomStatusIndicatorWidget::endOfTheDay )
 	{