Implement the setting to turn on/off auto-rotation for maemo 5

ieatlint · Dec 5, 2010 · 1319c74 · 1319c74
1 parent b27b53f
commit 1319c74
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 6 deletions.
diff --git a/magread.cpp b/magread.cpp
@@ -40,7 +40,9 @@ MagRead::MagRead(QWidget *parent) : QMainWindow(parent) {
 
 	//Set the auto-rotation for Maemo5
 #ifdef Q_WS_MAEMO_5
-	setAttribute(Qt::WA_Maemo5AutoOrientation, true);
+	if( settings->value( "autoReorient" ) == true ) {
+		setAttribute( Qt::WA_Maemo5AutoOrientation, true );
+	}
 #endif
 
 
@@ -295,16 +297,17 @@ void MagRead::removeShowData() {
 void MagRead::settingsPage() {
 	onMainPage = false;
 
-	SettingsPage *settings = new SettingsPage;
+	SettingsPage *settingsWidget = new SettingsPage;
+	connect( settingsWidget, SIGNAL( autoReorientSig( bool ) ), this, SLOT( autoReorient( bool ) ) );
 
 #ifdef Q_OS_SYMBIAN
-	setCentralWidget( settings );
+	setCentralWidget( settingsWidget );
 #else
 	if( mainLayout->count() > 1 ) {
 		mainLayout->itemAt( 0 )->widget()->hide();
 		mainLayout->removeItem( mainLayout->itemAt( 0 ) );
 	}
-	mainLayout->insertWidget( 0, settings, 1 );
+	mainLayout->insertWidget( 0, settingsWidget, 1 );
 #endif
 
 #ifdef Q_OS_SYMBIAN
@@ -316,6 +319,12 @@ void MagRead::settingsPage() {
 	removeShowData();
 }
 
+void MagRead::autoReorient( bool enabled ) {
+#ifdef Q_WS_MAEMO_5
+	setAttribute( Qt::WA_Maemo5AutoOrientation, enabled );
+#endif
+}
+
 /* Credit Page */
 void MagRead::creditPage() {
 	notice( "Successfully Read Credit Card", 750 );

diff --git a/magread.h b/magread.h
@@ -113,6 +113,7 @@ class MagRead : public QMainWindow {
 		void aboutDialogue();
 		void showData();
 		void settingsPage();
+		void autoReorient( bool enabled );
 };
 
 #endif // MAGREAD_H
diff --git a/settingspage.cpp b/settingspage.cpp
@@ -38,7 +38,7 @@ void SettingsPage::makeGeneralBox() {
 		formatAAMVA->setCheckState( Qt::Checked );
 	connect( formatAAMVA, SIGNAL( stateChanged( int ) ), this, SLOT( formatAAMVA_checked( int ) ) );
 
-#ifndef Q_OS_SYMBIAN
+#ifdef Q_WS_MAEMO_5
 	autoReorient = new QCheckBox( "Auto-reorient Screen" );//not symbian
 	generalLayout->addWidget( autoReorient );
 	if( settings->value( "autoReorient" ) == true )
@@ -85,7 +85,14 @@ void SettingsPage::autoReorient_checked( int state ) {
 	if( state == Qt::Checked )
 		settings->setValue( "autoReorient", true );
 	else
-		settings->setValue( "autoReorient", false );
+		settings->setValue( "autoReorient", false );	
+#ifdef Q_WS_MAEMO_5
+	if( settings->value( "autoReorient" ) == true ) {
+		emit autoReorientSig( true );
+	} else {
+		emit autoReorientSig( false );
+	}
+#endif
 }
 
 void SettingsPage::timeOutChanged( int value ) {

diff --git a/settingspage.h b/settingspage.h
@@ -46,6 +46,7 @@ class SettingsPage : public QScrollArea {
 		QSlider *silenceSlider;
 
 	signals:
+		void autoReorientSig( bool );
 
 	private slots:
 		void formatCredit_checked( int state );