Show frame entry independent of translation

mhugent · mhugent · commit 0525c015c878 · 2014-07-10T13:02:59.000+02:00
diff --git a/src/app/composer/qgscomposermapwidget.cpp b/src/app/composer/qgscomposermapwidget.cpp
@@ -1283,14 +1283,14 @@ void QgsComposerMapWidget::setGridItems( const QgsComposerMapGrid* grid )
 
   //grid frame
   mFrameWidthSpinBox->setValue( grid->gridFrameWidth() );
-  QgsComposerMap::GridFrameStyle gridFrameStyle = mComposerMap->gridFrameStyle();
+  QgsComposerMap::GridFrameStyle gridFrameStyle = grid->gridFrameStyle();
   if ( gridFrameStyle == QgsComposerMap::Zebra )
   {
-    mFrameStyleComboBox->setCurrentIndex( mFrameStyleComboBox->findText( tr( "Zebra" ) ) );
+    mFrameStyleComboBox->setCurrentIndex( 1 );
   }
   else //NoGridFrame
   {
-    mFrameStyleComboBox->setCurrentIndex( mFrameStyleComboBox->findText( tr( "No frame" ) ) );
+    mFrameStyleComboBox->setCurrentIndex( 0 );
   }
 
   //line style

Original file line number	Diff line number	Diff line change
`@@ -1283,14 +1283,14 @@ void QgsComposerMapWidget::setGridItems( const QgsComposerMapGrid* grid )`
`1283`	`1283`
`1284`	`1284`	`//grid frame`
`1285`	`1285`	`mFrameWidthSpinBox->setValue( grid->gridFrameWidth() );`
`1286`		`- QgsComposerMap::GridFrameStyle gridFrameStyle = mComposerMap->gridFrameStyle();`
	`1286`	`+ QgsComposerMap::GridFrameStyle gridFrameStyle = grid->gridFrameStyle();`
`1287`	`1287`	`if ( gridFrameStyle == QgsComposerMap::Zebra )`
`1288`	`1288`	`{`
`1289`		`- mFrameStyleComboBox->setCurrentIndex( mFrameStyleComboBox->findText( tr( "Zebra" ) ) );`
	`1289`	`+ mFrameStyleComboBox->setCurrentIndex( 1 );`
`1290`	`1290`	`}`
`1291`	`1291`	`else //NoGridFrame`
`1292`	`1292`	`{`
`1293`		`- mFrameStyleComboBox->setCurrentIndex( mFrameStyleComboBox->findText( tr( "No frame" ) ) );`
	`1293`	`+ mFrameStyleComboBox->setCurrentIndex( 0 );`
`1294`	`1294`	`}`
`1295`	`1295`
`1296`	`1296`	`//line style`