Skip to content

Commit 237455a

Browse files
committedJan 24, 2018
Use same relation parent/child order in list as in new relation dialog
Fixes #17939
1 parent 717a0f5 commit 237455a

File tree

2 files changed

+26
-8
lines changed

2 files changed

+26
-8
lines changed
 

‎src/app/qgsrelationmanagerdialog.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,19 +58,19 @@ void QgsRelationManagerDialog::addRelation( const QgsRelation &rel )
5858
item->setData( Qt::UserRole, QVariant::fromValue<QgsRelation>( rel ) );
5959
mRelationsTable->setItem( row, 0, item );
6060

61-
item = new QTableWidgetItem( rel.referencingLayer()->name() );
61+
item = new QTableWidgetItem( rel.referencedLayer()->name() );
6262
item->setFlags( Qt::ItemIsEditable );
6363
mRelationsTable->setItem( row, 1, item );
6464

65-
item = new QTableWidgetItem( rel.fieldPairs().at( 0 ).referencingField() );
65+
item = new QTableWidgetItem( rel.fieldPairs().at( 0 ).referencedField() );
6666
item->setFlags( Qt::ItemIsEditable );
6767
mRelationsTable->setItem( row, 2, item );
6868

69-
item = new QTableWidgetItem( rel.referencedLayer()->name() );
69+
item = new QTableWidgetItem( rel.referencingLayer()->name() );
7070
item->setFlags( Qt::ItemIsEditable );
7171
mRelationsTable->setItem( row, 3, item );
7272

73-
item = new QTableWidgetItem( rel.fieldPairs().at( 0 ).referencedField() );
73+
item = new QTableWidgetItem( rel.fieldPairs().at( 0 ).referencingField() );
7474
item->setFlags( Qt::ItemIsEditable );
7575
mRelationsTable->setItem( row, 4, item );
7676

‎src/ui/qgsrelationmanagerdialogbase.ui

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,33 +35,51 @@
3535
</column>
3636
<column>
3737
<property name="text">
38-
<string>Referencing Layer</string>
38+
<string>Referenced Layer</string>
39+
</property>
40+
<property name="toolTip">
41+
<string>Referenced Layer (Parent)</string>
3942
</property>
4043
</column>
4144
<column>
4245
<property name="text">
43-
<string>Referencing Field</string>
46+
<string>Referenced Field</string>
47+
</property>
48+
<property name="toolTip">
49+
<string>Referenced Field</string>
4450
</property>
4551
</column>
4652
<column>
4753
<property name="text">
48-
<string>Referenced Layer</string>
54+
<string>Referencing Layer</string>
55+
</property>
56+
<property name="toolTip">
57+
<string>Referencing Layer (Child)</string>
4958
</property>
5059
</column>
5160
<column>
5261
<property name="text">
53-
<string>Referenced Field</string>
62+
<string>Referencing Field</string>
63+
</property>
64+
<property name="toolTip">
65+
<string>Referencing Field</string>
5466
</property>
5567
</column>
5668
<column>
5769
<property name="text">
5870
<string>Id</string>
5971
</property>
72+
<property name="toolTip">
73+
<string>Id</string>
74+
</property>
6075
</column>
6176
<column>
6277
<property name="text">
6378
<string>Strength</string>
6479
</property>
80+
<property name="toolTip">
81+
<string>Strength</string>
82+
</property>
6583
</column>
6684
</widget>
6785
</item>

0 commit comments

Comments
 (0)
Please sign in to comment.