[Marble-commits] branches/KDE/4.4/kdeedu/marble/src

[Dennis Nienhüser]

SVN commit 1071882 by nienhueser:

Correctly restore infobox locking state setting. Backport of commit 1071879.


 M  +4 -2      QtMainWindow.cpp  


--- branches/KDE/4.4/kdeedu/marble/src/QtMainWindow.cpp #1071881:1071882
@@ -160,7 +160,7 @@
      m_lockFloatItemsAct = new QAction( tr("Lock Position"),this);
      m_lockFloatItemsAct->setCheckable( true );
      m_lockFloatItemsAct->setStatusTip(tr("Lock Position of Floating Items"));
-     connect(m_lockFloatItemsAct, SIGNAL(toggled( bool )), this, SLOT( lockPosition( bool )));
+     connect(m_lockFloatItemsAct, SIGNAL(triggered( bool )), this, SLOT( lockPosition( bool )));
 
      m_showCloudsAct = new QAction( tr("&Clouds"), this);
      m_showCloudsAct->setCheckable( true );
@@ -676,7 +676,9 @@
 	    m_controlView->marbleWidget()->goHome();
 	 }
          
-         m_lockFloatItemsAct->setChecked( settings.value( "lockFloatItemPositions", false ).toBool() );
+         bool isLocked = settings.value( "lockFloatItemPositions", false ).toBool();
+         m_lockFloatItemsAct->setChecked( isLocked );
+         lockPosition(isLocked);
      settings.endGroup();
      
      settings.beginGroup( "Sun" );