Skip to content
Permalink
Browse files
Merge pull request #5467 from signedav/propertieslayout
Propertieslayout Fields And Forms Redesign
  • Loading branch information
m-kuhn committed Nov 8, 2017
2 parents 7b427c6 + 0ba8f97 commit 140b9568b9a3db250f71e70560ca5dff14f348c3
Show file tree
Hide file tree
Showing 23 changed files with 3,334 additions and 2,075 deletions.
@@ -602,6 +602,7 @@
<file>themes/default/mActionRegularPolygonCenterPoint.svg</file>
<file>themes/default/3d.svg</file>
<file>themes/default/mActionResizeSquare.svg</file>
<file>themes/default/mSourceFields.svg</file>
</qresource>
<qresource prefix="/images/tips">
<file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -15,6 +15,8 @@ SET(QGIS_APP_SRCS
qgsattributeactiondialog.cpp
qgsattributeactionpropertiesdialog.cpp
qgsattributetypedialog.cpp
qgsattributerelationedit.cpp
qgsattributesforminitcode.cpp
qgsattributetabledialog.cpp
qgsbookmarks.cpp
qgsclipboard.cpp
@@ -40,7 +42,8 @@ SET(QGIS_APP_SRCS
qgsdiagramproperties.cpp
qgsdisplayangle.cpp
qgsfieldcalculator.cpp
qgsfieldsproperties.cpp
qgssourcefieldsproperties.cpp
qgsattributesformproperties.cpp
qgsidentifyresultsdialog.cpp
qgsfeatureaction.cpp
qgslabelpropertydialog.cpp
@@ -228,6 +231,8 @@ SET (QGIS_APP_MOC_HDRS
qgsattributeactiondialog.h
qgsattributeactionpropertiesdialog.h
qgsattributetypedialog.h
qgsattributerelationedit.h
qgsattributesforminitcode.h
qgsattributetabledialog.h
qgsbookmarks.h
qgsclipboard.h
@@ -251,7 +256,8 @@ SET (QGIS_APP_MOC_HDRS
qgsdxfexportdialog.h
qgsfeatureaction.h
qgsfieldcalculator.h
qgsfieldsproperties.h
qgssourcefieldsproperties.h
qgsattributesformproperties.h
qgsformannotationdialog.h
qgsguivectorlayertools.h
qgshtmlannotationdialog.h
@@ -0,0 +1,31 @@
#include "qgsattributerelationedit.h"
#include "ui_qgsattributerelationedit.h"

QgsAttributeRelationEdit::QgsAttributeRelationEdit( const QString &relationid, QWidget *parent ) :
QWidget( parent ),
mRelationId( relationid )
{
setupUi( this );
}

QgsAttributeRelationEdit::~QgsAttributeRelationEdit()
{
}

void QgsAttributeRelationEdit::setCardinalityCombo( const QString &cardinalityComboItem, const QVariant &auserData )
{
coCardinality->addItem( cardinalityComboItem, auserData );
}

void QgsAttributeRelationEdit::setCardinality( const QString &cardinality )
{
int idx = coCardinality->findText( cardinality );

if ( idx != -1 )
coCardinality->setCurrentIndex( idx );
}

QString QgsAttributeRelationEdit::cardinality()
{
return coCardinality->currentText();
}
@@ -0,0 +1,57 @@
/***************************************************************************
qgsattributerelationedit.h
---------------------
begin : October 2017
copyright : (C) 2017 by David Signer
email : david at opengis dot ch
***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/

#ifndef QGSATTRIBUTERELATIONEDIT_H
#define QGSATTRIBUTERELATIONEDIT_H

#include "ui_qgsattributerelationedit.h"

#include "qgseditorconfigwidget.h"
#include "qgsfeature.h"
#include "qgsvectordataprovider.h"
#include "qgshelp.h"
#include "qgis_app.h"
#include <QWidget>

class APP_EXPORT QgsAttributeRelationEdit: public QWidget, private Ui::QgsAttributeRelationEdit
{
Q_OBJECT

public:
explicit QgsAttributeRelationEdit( const QString &relationid, QWidget *parent = 0 );
~QgsAttributeRelationEdit();

/**
* Setter for combo cardinality item
*/
void setCardinalityCombo( const QString &cardinalityComboItem, const QVariant &auserData = QVariant() );

/**
* Setter for combo cardinality
*/
void setCardinality( const QString &cardinality );

/**
* Getter for combo cardinality
*/
QString cardinality();

QString mRelationId;
private:

//Ui::QgsAttributeRelationEdit *ui;
};

#endif // QGSATTRIBUTERELATIONEDIT_H

0 comments on commit 140b956

Please sign in to comment.