Skip to content

Commit 5743f52

Browse files
jef-njef-n
committed
fix #7386 
1 parent bfde7c8 commit 5743f52

File tree

3 files changed

+38
-39
lines changed

3 files changed

+38
-39
lines changed

‎src/app/qgsattributedialog.cpp‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,10 @@ QgsAttributeDialog::QgsAttributeDialog( QgsVectorLayer *vl, QgsFeature *thepFeat
9999
tabWidget = new QTabWidget( mDialog );
100100
gridLayout->addWidget( tabWidget );
101101

102-
for ( QList<QgsAttributeEditorElement*>::const_iterator tIt = vl->attributeEditorElements().begin(); tIt != vl->attributeEditorElements().end(); ++tIt )
102+
foreach ( const QgsAttributeEditorElement *widgDef, vl->attributeEditorElements() )
103103
{
104-
QgsAttributeEditorElement* widgDef = *tIt;
105-
106104
QWidget* tabPage = new QWidget( tabWidget );
105+
107106
tabWidget->addTab( tabPage, widgDef->name() );
108107
QGridLayout *tabPageLayout = new QGridLayout( tabPage );
109108

@@ -230,16 +229,16 @@ QgsAttributeDialog::QgsAttributeDialog( QgsVectorLayer *vl, QgsFeature *thepFeat
230229
for ( int fldIdx = 0; fldIdx < theFields.count(); ++fldIdx )
231230
{
232231
QList<QWidget *> myWidgets = mDialog->findChildren<QWidget*>( theFields[fldIdx].name() );
233-
if ( !myWidgets.size() )
232+
if ( myWidgets.isEmpty() )
234233
continue;
235234

236-
for ( QList<QWidget *>::const_iterator itw = myWidgets.begin(); itw != myWidgets.end(); ++itw )
235+
foreach ( QWidget *w, myWidgets )
237236
{
238-
QgsAttributeEditor::createAttributeEditor( mDialog, *itw, vl, fldIdx, myAttributes[fldIdx], mProxyWidgets );
237+
QgsAttributeEditor::createAttributeEditor( mDialog, w, vl, fldIdx, myAttributes[fldIdx], mProxyWidgets );
239238

240-
if ( vl->editType( fldIdx ) != QgsVectorLayer::Immutable )
239+
if ( vl->editType( fldIdx ) != QgsVectorLayer::Immutable && w->isEnabled() )
241240
{
242-
( *itw )->setEnabled(( *itw )->isEnabled() && vl->isEditable() && vl->fieldEditable( fldIdx ) );
241+
w->setEnabled( vl->isEditable() && vl->fieldEditable( fldIdx ) );
243242
}
244243
}
245244
}

‎src/app/qgsfieldsproperties.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -487,11 +487,11 @@ void QgsFieldsProperties::attributeTypeDialog()
487487
QPair<QString, QString> checkStates = mCheckedStates.value( index, mLayer->checkedState( index ) );
488488
attributeTypeDialog.setCheckedState( checkStates.first, checkStates.second );
489489

490-
attributeTypeDialog.setDateFormat( mLayer->dateFormat( index ) );
490+
attributeTypeDialog.setDateFormat( mDateFormat.value( index, mLayer->dateFormat( index ) ) );
491491

492-
attributeTypeDialog.setIndex( index, mEditTypeMap.value( index, mLayer->editType( index ) ) );
492+
attributeTypeDialog.setFieldEditable( mFieldEditables.value( index, mLayer->fieldEditable( index ) ) );
493493

494-
attributeTypeDialog.setFieldEditable( mLayer->fieldEditable( index ) );
494+
attributeTypeDialog.setIndex( index, mEditTypeMap.value( index, mLayer->editType( index ) ) );
495495

496496
if ( !attributeTypeDialog.exec() )
497497
return;

‎src/core/composer/qgscomposition.cpp‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ const QgsComposerItem* QgsComposition::getComposerItemByUuid( QString theUuid, b
293293
}
294294
}
295295
}
296-
296+
297297
return 0;
298298
}
299299
*/
@@ -313,7 +313,7 @@ const QgsComposerItem* QgsComposition::getComposerItemByUuid( QString theUuid )
313313
}
314314
}
315315
}
316-
316+
317317
return 0;
318318
}
319319

@@ -491,14 +491,14 @@ bool QgsComposition::loadFromTemplate( const QDomDocument& doc, QMap<QString, QS
491491
return false;
492492
}
493493

494-
// remove all uuid attributes since we don't want duplicates UUIDS
495-
QDomNodeList composerItemsNodes = importDoc.elementsByTagName("ComposerItem");
496-
for (int i=0; i<composerItemsNodes.count(); ++i)
494+
// remove all uuid attributes since we don't want duplicates UUIDS
495+
QDomNodeList composerItemsNodes = importDoc.elementsByTagName( "ComposerItem" );
496+
for ( int i = 0; i < composerItemsNodes.count(); ++i )
497497
{
498-
QDomNode composerItemNode = composerItemsNodes.at(i);
499-
if( composerItemNode.isElement() )
498+
QDomNode composerItemNode = composerItemsNodes.at( i );
499+
if ( composerItemNode.isElement() )
500500
{
501-
composerItemNode.toElement().removeAttribute("uuid");
501+
composerItemNode.toElement().removeAttribute( "uuid" );
502502
}
503503
}
504504

@@ -514,10 +514,10 @@ bool QgsComposition::loadFromTemplate( const QDomDocument& doc, QMap<QString, QS
514514
void QgsComposition::addItemsFromXML( const QDomElement& elem, const QDomDocument& doc, QMap< QgsComposerMap*, int >* mapsToRestore,
515515
bool addUndoCommands, QPointF* pos, bool pasteInPlace )
516516
{
517-
QPointF* pasteInPlacePt;
518-
if( pasteInPlace )
517+
QPointF* pasteInPlacePt = 0;
518+
if ( pasteInPlace )
519519
{
520-
pasteInPlacePt = new QPointF(0, pageNumberAt( *pos ) * (mPageHeight+mSpaceBetweenPages) );
520+
pasteInPlacePt = new QPointF( 0, pageNumberAt( *pos ) * ( mPageHeight + mSpaceBetweenPages ) );
521521
}
522522
QDomNodeList composerLabelList = elem.elementsByTagName( "ComposerLabel" );
523523
for ( int i = 0; i < composerLabelList.size(); ++i )
@@ -527,10 +527,10 @@ void QgsComposition::addItemsFromXML( const QDomElement& elem, const QDomDocumen
527527
newLabel->readXML( currentComposerLabelElem, doc );
528528
if ( pos )
529529
{
530-
if ( pasteInPlace )
530+
if ( pasteInPlacePt )
531531
{
532-
newLabel->setItemPosition( newLabel->transform().dx(), fmod(newLabel->transform().dy(), (paperHeight()+spaceBetweenPages()) ) );
533-
newLabel->move( pasteInPlacePt->x(),pasteInPlacePt->y() );
532+
newLabel->setItemPosition( newLabel->transform().dx(), fmod( newLabel->transform().dy(), ( paperHeight() + spaceBetweenPages() ) ) );
533+
newLabel->move( pasteInPlacePt->x(), pasteInPlacePt->y() );
534534
}
535535
else
536536
{
@@ -563,8 +563,8 @@ void QgsComposition::addItemsFromXML( const QDomElement& elem, const QDomDocumen
563563
{
564564
if ( pasteInPlace )
565565
{
566-
newMap->setItemPosition( newMap->transform().dx(), fmod(newMap->transform().dy(), (paperHeight()+spaceBetweenPages()) ) );
567-
newMap->move( pasteInPlacePt->x(),pasteInPlacePt->y() );
566+
newMap->setItemPosition( newMap->transform().dx(), fmod( newMap->transform().dy(), ( paperHeight() + spaceBetweenPages() ) ) );
567+
newMap->move( pasteInPlacePt->x(), pasteInPlacePt->y() );
568568
}
569569
else
570570
{
@@ -588,8 +588,8 @@ void QgsComposition::addItemsFromXML( const QDomElement& elem, const QDomDocumen
588588
{
589589
if ( pasteInPlace )
590590
{
591-
newArrow->setItemPosition( newArrow->transform().dx(), fmod(newArrow->transform().dy(), (paperHeight()+spaceBetweenPages()) ) );
592-
newArrow->move( pasteInPlacePt->x(),pasteInPlacePt->y() );
591+
newArrow->setItemPosition( newArrow->transform().dx(), fmod( newArrow->transform().dy(), ( paperHeight() + spaceBetweenPages() ) ) );
592+
newArrow->move( pasteInPlacePt->x(), pasteInPlacePt->y() );
593593
}
594594
else
595595
{
@@ -613,8 +613,8 @@ void QgsComposition::addItemsFromXML( const QDomElement& elem, const QDomDocumen
613613
{
614614
if ( pasteInPlace )
615615
{
616-
newScaleBar->setItemPosition( newScaleBar->transform().dx(), fmod(newScaleBar->transform().dy(), (paperHeight()+spaceBetweenPages()) ) );
617-
newScaleBar->move( pasteInPlacePt->x(),pasteInPlacePt->y() );
616+
newScaleBar->setItemPosition( newScaleBar->transform().dx(), fmod( newScaleBar->transform().dy(), ( paperHeight() + spaceBetweenPages() ) ) );
617+
newScaleBar->move( pasteInPlacePt->x(), pasteInPlacePt->y() );
618618
}
619619
else
620620
{
@@ -638,8 +638,8 @@ void QgsComposition::addItemsFromXML( const QDomElement& elem, const QDomDocumen
638638
{
639639
if ( pasteInPlace )
640640
{
641-
newShape->setItemPosition( newShape->transform().dx(), fmod(newShape->transform().dy(), (paperHeight()+spaceBetweenPages()) ) );
642-
newShape->move( pasteInPlacePt->x(),pasteInPlacePt->y() );
641+
newShape->setItemPosition( newShape->transform().dx(), fmod( newShape->transform().dy(), ( paperHeight() + spaceBetweenPages() ) ) );
642+
newShape->move( pasteInPlacePt->x(), pasteInPlacePt->y() );
643643
}
644644
else
645645
{
@@ -663,8 +663,8 @@ void QgsComposition::addItemsFromXML( const QDomElement& elem, const QDomDocumen
663663
{
664664
if ( pasteInPlace )
665665
{
666-
newPicture->setItemPosition( newPicture->transform().dx(), fmod(newPicture->transform().dy(), (paperHeight()+spaceBetweenPages()) ) );
667-
newPicture->move( pasteInPlacePt->x(),pasteInPlacePt->y() );
666+
newPicture->setItemPosition( newPicture->transform().dx(), fmod( newPicture->transform().dy(), ( paperHeight() + spaceBetweenPages() ) ) );
667+
newPicture->move( pasteInPlacePt->x(), pasteInPlacePt->y() );
668668
}
669669
else
670670
{
@@ -688,8 +688,8 @@ void QgsComposition::addItemsFromXML( const QDomElement& elem, const QDomDocumen
688688
{
689689
if ( pasteInPlace )
690690
{
691-
newLegend->setItemPosition( newLegend->transform().dx(), fmod(newLegend->transform().dy(), (paperHeight()+spaceBetweenPages()) ) );
692-
newLegend->move( pasteInPlacePt->x(),pasteInPlacePt->y() );
691+
newLegend->setItemPosition( newLegend->transform().dx(), fmod( newLegend->transform().dy(), ( paperHeight() + spaceBetweenPages() ) ) );
692+
newLegend->move( pasteInPlacePt->x(), pasteInPlacePt->y() );
693693
}
694694
else
695695
{
@@ -713,8 +713,8 @@ void QgsComposition::addItemsFromXML( const QDomElement& elem, const QDomDocumen
713713
{
714714
if ( pasteInPlace )
715715
{
716-
newTable->setItemPosition( newTable->transform().dx(), fmod(newTable->transform().dy(), (paperHeight()+spaceBetweenPages()) ) );
717-
newTable->move( pasteInPlacePt->x(),pasteInPlacePt->y() );
716+
newTable->setItemPosition( newTable->transform().dx(), fmod( newTable->transform().dy(), ( paperHeight() + spaceBetweenPages() ) ) );
717+
newTable->move( pasteInPlacePt->x(), pasteInPlacePt->y() );
718718
}
719719
else
720720
{

0 commit comments

Comments
 (0)