Merge pull request #5467 from signedav/propertieslayout

Propertieslayout Fields And Forms Redesign
qgis · Nov 8, 2017 · 140b956 · 140b956
2 parents 7b427c6 + 0ba8f97
commit 140b956
Show file tree

Hide file tree

Showing 23 changed files with 3,334 additions and 2,075 deletions.
diff --git a/images/images.qrc b/images/images.qrc
@@ -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>

diff --git a/images/themes/default/mSourceFields.svg b/images/themes/default/mSourceFields.svg
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -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

diff --git a/src/app/qgsattributerelationedit.cpp b/src/app/qgsattributerelationedit.cpp
@@ -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();
+}
diff --git a/src/app/qgsattributerelationedit.h b/src/app/qgsattributerelationedit.h
@@ -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