Confilcts solved

Conflicts:
	src/BusinessLogic/Engine.cpp
	src/UserInterface/Views/RoomStatusIndicatorWidget.cpp

diff --cc src/BusinessLogic/Engine.cpp
Simple merge

diff --cc src/BusinessLogic/UIManager.cpp
index 54ee865,ab3d93e..7d697e8
--- 1/src/BusinessLogic/UIManager.cpp
--- 2/src/BusinessLogic/UIManager.cpp
+++ b/src/BusinessLogic/UIManager.cpp
@@@ -260,10 -251,10 +249,10 @@@ void UIManager::passwordEntered( Passwo
                        {
                                iProgressBar->update( tr( "" ), tr( "Changing operation mode" ) );
                                iProgressBar->toggleCancellable( false );
 -                              iWindowManager->showDialog( static_cast<QDialog *>( iProgressBar ), false );
 +                              iWindowManager->showDialog( static_cast<QDialog *>( iProgressBar ), false, false );
                        }
                        // ... and initiate the mode changing
-                       iEngine->changeDeviceMode( true );
+                       iEngine->changeDeviceMode();
                        break;
                case PasswordDialog::Incorrect:
                        iWindowManager->error( tr("Incorrect Password") );

diff --cc src/UserInterface/Views/RoomStatusIndicatorWidget.cpp
index 302c931,c903bc0..dbc2b07
--- 1/src/UserInterface/Views/RoomStatusIndicatorWidget.cpp
--- 2/src/UserInterface/Views/RoomStatusIndicatorWidget.cpp
+++ b/src/UserInterface/Views/RoomStatusIndicatorWidget.cpp
@@@ -123,26 -117,4 +122,26 @@@ void RoomStatusIndicatorWidget::statusC
                iUntilTextLabel->setText( tr( "until %1" ).arg( aUntil.toString( iTimeFormat ) ) );\r
        }\r
        setPalette( createPalette( aStatus ) );\r
- }\r
++}
 +\r
 +void RoomStatusIndicatorWidget::currentRoomChanged( Room *aRoom )\r
 +{\r
 +      iDefaultRoomLabel->setText( aRoom->name() );\r
 +}\r
 +\r
 +bool RoomStatusIndicatorWidget::event(QEvent *event)\r
 +{\r
 +      switch(event->type())\r
 +      {\r
 +              case QEvent::Paint:\r
 +                      qDebug() << "[RoomStatusIndicatorWidget::event] <Paint event>";\r
 +                      break;\r
 +              case QEvent::PaletteChange:\r
 +                      qDebug() << "[RoomStatusIndicatorWidget::event] <Palette change event>";\r
 +                      break;\r
 +              default:\r
 +                      break;\r
 +      }\r
 +      \r
 +      return ViewBase::event( event );\r
  }\r

diff --cc src/UserInterface/Views/RoomStatusIndicatorWidget.h
Simple merge