Skip to content

Commit

Permalink
relations in list
Browse files Browse the repository at this point in the history 
alias comment in gui (not ready yet)
  • Loading branch information
@signedav
signedav committed Oct 26, 2017
1 parent 18b6caf commit 3a547dc
Show file tree
Hide file tree
Showing 3 changed files with 74 additions and 64 deletions.
33 changes: 26 additions & 7 deletions src/app/qgsattributesformproperties.cpp
View file
Expand Up @@ -57,7 +57,7 @@ void QgsAttributesFormProperties::loadAttributeTypeDialog()
{ {
QTreeWidgetItem *currentItem = mAvailableWidgetsTree->currentItem(); QTreeWidgetItem *currentItem = mAvailableWidgetsTree->currentItem();


if ( !currentItem ) if ( !currentItem || !( currentItem->data( 0, DnDTreeRole ).value<DnDTreeItemData>().type()==DnDTreeItemData::Field ) )
mAttributeTypeDialog->setEnabled( false ); mAttributeTypeDialog->setEnabled( false );
else else
{ {
Expand Down Expand Up @@ -270,6 +270,7 @@ void QgsAttributesFormProperties::initAvailableWidgetsTree()
mAvailableWidgetsTree->setDragDropMode( QAbstractItemView::DragOnly ); mAvailableWidgetsTree->setDragDropMode( QAbstractItemView::DragOnly );


//load Fields //load Fields

DnDTreeItemData catItemData = DnDTreeItemData( DnDTreeItemData::Container, "Fields"); DnDTreeItemData catItemData = DnDTreeItemData( DnDTreeItemData::Container, "Fields");
QTreeWidgetItem *catitem = mAvailableWidgetsTree->addItem( mAvailableWidgetsTree->invisibleRootItem(), catItemData ); QTreeWidgetItem *catitem = mAvailableWidgetsTree->addItem( mAvailableWidgetsTree->invisibleRootItem(), catItemData );


Expand All @@ -283,6 +284,8 @@ void QgsAttributesFormProperties::initAvailableWidgetsTree()
FieldConfig cfg( mLayer, i ); FieldConfig cfg( mLayer, i );


QTreeWidgetItem *item = mAvailableWidgetsTree->addItem( catitem, itemData ); QTreeWidgetItem *item = mAvailableWidgetsTree->addItem( catitem, itemData );
//QTreeWidgetItem *item = mAvailableWidgetsTree->addItem( mAvailableWidgetsTree->invisibleRootItem(), itemData );

item->setData( 0, FieldConfigRole, cfg ); item->setData( 0, FieldConfigRole, cfg );
item->setData( 0, FieldNameRole, field.name() ); item->setData( 0, FieldNameRole, field.name() );
} }
Expand All @@ -293,6 +296,7 @@ void QgsAttributesFormProperties::initAvailableWidgetsTree()
itemData.setText(i, fields.at( i ).name() ); itemData.setText(i, fields.at( i ).name() );
*/ */



//load Relations //load Relations
catItemData = DnDTreeItemData( DnDTreeItemData::Container, "Relations"); catItemData = DnDTreeItemData( DnDTreeItemData::Container, "Relations");
catitem = mAvailableWidgetsTree->addItem( mAvailableWidgetsTree->invisibleRootItem(), catItemData ); catitem = mAvailableWidgetsTree->addItem( mAvailableWidgetsTree->invisibleRootItem(), catItemData );
Expand All @@ -308,6 +312,7 @@ void QgsAttributesFormProperties::initAvailableWidgetsTree()
item->setData( 0, FieldNameRole, relation.name() ); item->setData( 0, FieldNameRole, relation.name() );
} }



} }




Expand Down Expand Up @@ -362,7 +367,6 @@ QgsAttributeEditorElement *QgsAttributesFormProperties::createAttributeEditorWid
break; break;
} }


/*dave to do
case DnDTreeItemData::Relation: case DnDTreeItemData::Relation:
{ {
QgsRelation relation = QgsProject::instance()->relationManager()->relation( itemData.name() ); QgsRelation relation = QgsProject::instance()->relationManager()->relation( itemData.name() );
Expand All @@ -372,7 +376,6 @@ QgsAttributeEditorElement *QgsAttributesFormProperties::createAttributeEditorWid
widgetDef = relDef; widgetDef = relDef;
break; break;
} }
*/


case DnDTreeItemData::Container: case DnDTreeItemData::Container:
{ {
Expand Down Expand Up @@ -401,9 +404,13 @@ void QgsAttributesFormProperties::apply()
{ {
QgsEditFormConfig editFormConfig = mLayer->editFormConfig(); QgsEditFormConfig editFormConfig = mLayer->editFormConfig();


for ( QTreeWidgetItemIterator it( mAvailableWidgetsTree ); *it; ++it ) QTreeWidgetItem* fieldContainer=mAvailableWidgetsTree->invisibleRootItem()->child(0);

for ( int i = 0; i < fieldContainer->childCount(); i++ )
{ {
int idx = mAvailableWidgetsTree->invisibleRootItem()->indexOfChild( ( *it ) ); QTreeWidgetItem *fieldItem = fieldContainer->child( i );
int idx=fieldContainer->indexOfChild( fieldItem );

QString name = mLayer->fields().at( idx ).name(); QString name = mLayer->fields().at( idx ).name();
FieldConfig cfg = configForChild( idx ); FieldConfig cfg = configForChild( idx );


Expand Down Expand Up @@ -436,6 +443,8 @@ void QgsAttributesFormProperties::apply()
{ {
mLayer->removeFieldConstraint( idx, QgsFieldConstraints::ConstraintExpression ); mLayer->removeFieldConstraint( idx, QgsFieldConstraints::ConstraintExpression );
} }

//mLayer->setFieldAlias( idx, aliasItem->text() );
} }


// tabs and groups // tabs and groups
Expand All @@ -457,8 +466,19 @@ void QgsAttributesFormProperties::apply()
editFormConfig.setInitFilePath( mInitFilePathLineEdit->text() ); editFormConfig.setInitFilePath( mInitFilePathLineEdit->text() );
editFormConfig.setInitCodeSource( ( QgsEditFormConfig::PythonInitCodeSource )mInitCodeSourceComboBox->currentIndex() ); editFormConfig.setInitCodeSource( ( QgsEditFormConfig::PythonInitCodeSource )mInitCodeSourceComboBox->currentIndex() );
editFormConfig.setSuppress( ( QgsEditFormConfig::FeatureFormSuppress )mFormSuppressCmbBx->currentIndex() ); editFormConfig.setSuppress( ( QgsEditFormConfig::FeatureFormSuppress )mFormSuppressCmbBx->currentIndex() );
*/


/*
// relations // relations
QTreeWidgetItem* relationContainer=mAvailableWidgetsTree->invisibleRootItem()->child(1);
for ( int i = 0; i < relationContainer->childCount(); i++ )
{
QTreeWidgetItem *relationItem = relationContainer->child( i );
int idx=relationContainer->indexOfChild( relationItem );
QString name = mLayer->fields().at( idx ).name();
for ( int i = 0; i < mRelationsList->rowCount(); ++i ) for ( int i = 0; i < mRelationsList->rowCount(); ++i )
{ {
QVariantMap cfg; QVariantMap cfg;
Expand All @@ -477,8 +497,7 @@ void QgsAttributesFormProperties::apply()
editFormConfig.setWidgetConfig( relationName, cfg ); editFormConfig.setWidgetConfig( relationName, cfg );
} }
*/ */

mLayer->setEditFormConfig( editFormConfig ); mLayer->setEditFormConfig( editFormConfig );
} }


Expand Down
76 changes: 19 additions & 57 deletions src/ui/qgsattributesformproperties.ui
View file
Expand Up @@ -33,32 +33,36 @@
</property> </property>
<widget class="QWidget" name="widget" native="true"> <widget class="QWidget" name="widget" native="true">
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
<item row="2" column="1"> <item row="0" column="2">
<widget class="QToolButton" name="mRemoveTabOrGroupButton"> <widget class="QToolButton" name="mAddTabOrGroupButton">
<property name="text"> <property name="text">
<string>...</string> <string>...</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../../images/images.qrc"> <iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/symbologyRemove.svg</normaloff>:/images/themes/default/symbologyRemove.svg</iconset> <normaloff>:/images/themes/default/symbologyAdd.svg</normaloff>:/images/themes/default/symbologyAdd.svg</iconset>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="0" column="1" rowspan="6">
<spacer name="verticalSpacer"> <widget class="QWidget" name="mFormLayoutWidget" native="true"/>
<property name="orientation"> </item>
<enum>Qt::Vertical</enum> <item row="0" column="0" rowspan="6">
<widget class="QWidget" name="mAvailableWidgetsWidget" native="true"/>
</item>
<item row="2" column="2">
<widget class="QToolButton" name="mRemoveTabOrGroupButton">
<property name="text">
<string>...</string>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="icon">
<size> <iconset resource="../../images/images.qrc">
<width>20</width> <normaloff>:/images/themes/default/symbologyRemove.svg</normaloff>:/images/themes/default/symbologyRemove.svg</iconset>
<height>40</height>
</size>
</property> </property>
</spacer> </widget>
</item> </item>
<item row="0" column="1"> <item row="3" column="2">
<spacer name="verticalSpacer_2"> <spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
Expand All @@ -70,23 +74,6 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="1" column="1">
<widget class="QToolButton" name="mAddTabOrGroupButton">
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/symbologyAdd.svg</normaloff>:/images/themes/default/symbologyAdd.svg</iconset>
</property>
</widget>
</item>
<item row="0" column="2" rowspan="4">
<widget class="QWidget" name="mFormLayoutWidget" native="true"/>
</item>
<item row="0" column="0" rowspan="4">
<widget class="QWidget" name="mAvailableWidgetsWidget" native="true"/>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="mAttributeTypeFrame" native="true"> <widget class="QWidget" name="mAttributeTypeFrame" native="true">
Expand All @@ -98,31 +85,6 @@
</widget> </widget>
<resources> <resources>
<include location="../../images/images.qrc"/> <include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>
29 changes: 29 additions & 0 deletions src/ui/qgsattributetypeedit.ui
View file
Expand Up @@ -14,6 +14,35 @@
<string>Edit Widget Properties</string> <string>Edit Widget Properties</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QGroupBox" name="groupBox_4">
<property name="title">
<string>General</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Alias</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Comment</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="leAlias"/>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="leComment"/>
</item>
</layout>
</widget>
</item>
<item> <item>
<widget class="QGroupBox" name="groupBox_3"> <widget class="QGroupBox" name="groupBox_3">
<property name="title"> <property name="title">
Expand Down

0 comments on commit 3a547dc

Please sign in to comment.