add relations into drag-tree

qgis · Oct 26, 2017 · 18b6caf · 18b6caf
1 parent b7bac1d
commit 18b6caf
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 9 deletions.
diff --git a/src/app/qgsattributesformproperties.cpp b/src/app/qgsattributesformproperties.cpp
@@ -269,6 +269,10 @@ void QgsAttributesFormProperties::initAvailableWidgetsTree()
   mAvailableWidgetsTree->setAcceptDrops( false );
   mAvailableWidgetsTree->setDragDropMode( QAbstractItemView::DragOnly );
 
+  //load Fields
+  DnDTreeItemData catItemData = DnDTreeItemData( DnDTreeItemData::Container, "Fields");
+  QTreeWidgetItem *catitem = mAvailableWidgetsTree->addItem( mAvailableWidgetsTree->invisibleRootItem(), catItemData );
+
   const QgsFields fields = mLayer->fields();
   for ( int i = 0; i < fields.size(); ++i )
   {
@@ -278,23 +282,32 @@ void QgsAttributesFormProperties::initAvailableWidgetsTree()
 
     FieldConfig cfg( mLayer, i );
 
-    QTreeWidgetItem *item = mAvailableWidgetsTree->addItem( mAvailableWidgetsTree->invisibleRootItem(), itemData );
+    QTreeWidgetItem *item = mAvailableWidgetsTree->addItem( catitem, itemData );
     item->setData( 0, FieldConfigRole, cfg );
     item->setData( 0, FieldNameRole, field.name() );
   }
 
-  /*some stuff for containers
-  //load Container Field
-  DnDTreeItemData catItemData = DnDTreeItemData( DnDTreeItemData::Container, "Fields");
-  catItemData.setShowLabel( true );
-  QTreeWidgetItem *catWidget = nullptr;
-  catWidget=mTree->addItem( mTree->invisibleRootItem(), catItemData );
-  mTree->mIndexedWidgets.insert( i, mTree->addItem( catWidget, itemData ) );
-
+  /* stuff
   itemData.setIcon(i, mLayer->fields().iconForField( i ));
   itemData.setText(i, QString::number( i+1 ) );
   itemData.setText(i, fields.at( i ).name() );
   */
+
+  //load Relations
+  catItemData = DnDTreeItemData( DnDTreeItemData::Container, "Relations");
+  catitem = mAvailableWidgetsTree->addItem( mAvailableWidgetsTree->invisibleRootItem(), catItemData );
+
+  const QList<QgsRelation> relations = QgsProject::instance()->relationManager()->referencedRelations( mLayer );
+
+  for ( const QgsRelation &relation : relations )
+  {
+    DnDTreeItemData itemData = DnDTreeItemData( DnDTreeItemData::Relation, relation.name() );
+    itemData.setShowLabel( true );
+
+    QTreeWidgetItem *item = mAvailableWidgetsTree->addItem( catitem, itemData );
+    item->setData( 0, FieldNameRole, relation.name() );
+  }
+
 }
 
 

diff --git a/src/app/qgsattributesformproperties.h b/src/app/qgsattributesformproperties.h
@@ -44,6 +44,7 @@
 #include "qgsgui.h"
 #include "qgseditorwidgetfactory.h"
 #include "qgseditorwidgetregistry.h"
+#include "qgsrelationmanager.h"
 
 class DnDTree;