update HTML output and review UI for vector properties

CMakeLists.txt

@@ -278,6 +278,8 @@ ENDIF (WITH_QTMOBILITY)
 # search for QScintilla2 (C++ lib)
 FIND_PACKAGE(QScintilla REQUIRED)
 
+# Password helper
+FIND_PACKAGE(QtKeychain REQUIRED)
 # Master password hash and authentication encryption
 FIND_PACKAGE(QCA REQUIRED)
 # Check for runtime dependency of qca-ossl plugin

ci/travis/linux/before_install.sh

@@ -22,7 +22,7 @@
 pushd ${HOME}
 
 # fetching data from github should be just as fast as S3
-curl -s -S -L https://github.com/opengisch/osgeo4travis/archive/qt5bin.tar.gz | tar --strip-components=1 -xz -C /home/travis &
+curl -s -S -L https://github.com/opengisch/osgeo4travis/archive/qt55bin.tar.gz | tar --strip-components=1 -xz -C /home/travis &
 SETUP_OSGEO4W_PID=$!
 
 mkdir /home/travis/osgeo4travis

cmake/FindQtKeychain.cmake

@@ -0,0 +1,51 @@
+# Find QtKeychain
+# ~~~~~~~~~~~~~~~
+# Copyright (c) 2016, Boundless Spatial
+# Author: Larry Shaffer <lshaffer (at) boundlessgeo (dot) com>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+# CMake module to search for QtKeychain library from:
+#    https://github.com/frankosterfeld/qtkeychain
+#
+# If it's found it sets QTKEYCHAIN_FOUND to TRUE
+# and following variables are set:
+#    QTKEYCHAIN_INCLUDE_DIR
+#    QTKEYCHAIN_LIBRARY
+
+FIND_PATH(QTKEYCHAIN_INCLUDE_DIR keychain.h
+  PATHS
+  ${LIB_DIR}/include
+  "$ENV{LIB_DIR}/include"
+  $ENV{INCLUDE}
+  /usr/local/include
+  /usr/include
+  PATH_SUFFIXES qt5keychain qtkeychain
+)
+
+FIND_LIBRARY(QTKEYCHAIN_LIBRARY NAMES qt5keychain qtkeychain
+  PATHS
+  ${LIB_DIR}
+  "$ENV{LIB_DIR}"
+  $ENV{LIB}
+  /usr/local/lib
+  /usr/lib
+)
+
+
+IF (QTKEYCHAIN_INCLUDE_DIR AND QTKEYCHAIN_LIBRARY)
+  SET(QTKEYCHAIN_FOUND TRUE)
+ELSE()
+  SET(QTKEYCHAIN_FOUND FALSE)
+ENDIF (QTKEYCHAIN_INCLUDE_DIR AND QTKEYCHAIN_LIBRARY)
+
+IF (QTKEYCHAIN_FOUND)
+   IF (NOT QTKEYCHAIN_FIND_QUIETLY)
+      MESSAGE(STATUS "Found QtKeychain: ${QTKEYCHAIN_LIBRARY}")
+   ENDIF (NOT QTKEYCHAIN_FIND_QUIETLY)
+ELSE (QTKEYCHAIN_FOUND)
+   IF (QTKEYCHAIN_FIND_REQUIRED)
+      MESSAGE(FATAL_ERROR "Could not find QtKeychain")
+   ENDIF (QTKEYCHAIN_FIND_REQUIRED)
+ENDIF (QTKEYCHAIN_FOUND)

debian/control.in

@@ -20,7 +20,7 @@ Build-Depends:
  libspatialite-dev,
  libsqlite3-dev,
  libspatialindex-dev,
- qtbase5-dev, qttools5-dev-tools, qttools5-dev, qtscript5-dev, qtpositioning5-dev,
+ qtbase5-dev, qttools5-dev-tools, qttools5-dev, qtscript5-dev, qtpositioning5-dev, qt5keychain-dev,
  libqt5svg5-dev, libqt5xmlpatterns5-dev, libqt5webkit5-dev, libqt5opengl5-dev, libqt5sql5-sqlite, libqt5scintilla2-dev,
  libqwt-qt5-dev, libqca-qt5-2-dev, libqca-qt5-2-plugins,
  python3-dev, python3-all-dev, python3-sip, python3-sip-dev,

images/images.qrc

@@ -557,6 +557,7 @@
         <file>themes/default/mActionNewMap.svg</file>
         <file>themes/default/mActionMapSettings.svg</file>
         <file>themes/default/mActionLockExtent.svg</file>
+        <file>icons/qgis_icon.svg</file>
     </qresource>
     <qresource prefix="/images/tips">
         <file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>

python/CMakeLists.txt

@@ -89,6 +89,7 @@ INCLUDE_DIRECTORIES(SYSTEM
   ${QEXTSERIALPORT_INCLUDE_DIR}
   ${QSCINTILLA_INCLUDE_DIR}
   ${QCA_INCLUDE_DIR}
+  ${QTKEYCHAIN_INCLUDE_DIR}
   ${SQLITE3_INCLUDE_DIR}
 )
 INCLUDE_DIRECTORIES(

python/auto_sip.blacklist

@@ -95,7 +95,6 @@ core/qgspropertycollection.sip
 core/qgsprovidermetadata.sip
 core/qgsproviderregistry.sip
 core/qgspythonrunner.sip
-core/qgsrectangle.sip
 core/qgsrelation.sip
 core/qgsrelationmanager.sip
 core/qgsrenderchecker.sip

python/core/auth/qgsauthmanager.sip

@@ -442,14 +442,36 @@ class QgsAuthManager : QObject
     QMutex *mutex();
 
   signals:
+
+    /**
+     * Signals emitted on password helper failure,
+     * mainly used in the tests to exit main application loop
+     */
+    void passwordHelperFailure();
+
+    /**
+     * Signals emitted on password helper success,
+     * mainly used in the tests to exit main application loop
+     */
+    void passwordHelperSuccess();
+
     /**
      * Custom logging signal to relay to console output and QgsMessageLog
      * @see QgsMessageLog
      * @param message Message to send
      * @param tag Associated tag (title)
      * @param level Message log level
      */
-    void messageOut( const QString& message, const QString& tag, QgsAuthManager::MessageLevel level = INFO ) const;
+    void messageOut( const QString& message, const QString& tag = QgsAuthManager::AUTH_MAN_TAG, QgsAuthManager::MessageLevel level = INFO ) const;
+
+    /**
+     * Custom logging signal to inform the user about master password <-> password manager interactions
+     * @see QgsMessageLog
+     * @param message Message to send
+     * @param tag Associated tag (title)
+     * @param level Message log level
+     */
+    void passwordHelperMessageOut( const QString &message, const QString &tag = QgsAuthManager::AUTH_MAN_TAG, QgsAuthManager::MessageLevel level = INFO ) const;
 
     /**
      * Emitted when a password has been verify (or not)

python/core/core.sip

@@ -126,7 +126,6 @@
 %Include qgsprovidermetadata.sip
 %Include qgsproviderregistry.sip
 %Include qgspythonrunner.sip
-%Include qgsrectangle.sip
 %Include qgsrelation.sip
 %Include qgsrelationmanager.sip
 %Include qgsrenderchecker.sip
@@ -357,6 +356,7 @@
 %Include dxf/qgsdxfexport.sip
 
 %Include geometry/qgsabstractgeometry.sip
+%Include geometry/qgsbox3d.sip
 %Include geometry/qgscircularstring.sip
 %Include geometry/qgscompoundcurve.sip
 %Include geometry/qgscurvepolygon.sip
@@ -373,6 +373,7 @@
 %Include geometry/qgsmultisurface.sip
 %Include geometry/qgspointv2.sip
 %Include geometry/qgspolygon.sip
+%Include geometry/qgsrectangle.sip
 %Include geometry/qgssurface.sip
 %Include geometry/qgstriangle.sip
 %Include geometry/qgswkbtypes.sip

python/core/geometry/qgsbox3d.sip

@@ -0,0 +1,206 @@
+/************************************************************************
+ * This file has been generated automatically from                      *
+ *                                                                      *
+ * src/core/geometry/qgsbox3d.h                                         *
+ *                                                                      *
+ * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
+ ************************************************************************/
+
+
+
+
+class QgsBox3d
+{
+%Docstring
+ A 3-dimensional box composed of x, y, z coordinates.
+
+ A box composed of x/y/z minimum and maximum values. It is often used to return the 3D
+ extent of a geometry or collection of geometries.
+
+.. versionadded:: 3.0
+ \see QgsRectangle
+%End
+
+%TypeHeaderCode
+#include "qgsbox3d.h"
+%End
+  public:
+
+    QgsBox3d( double xmin = 0, double ymin = 0, double mZmin = 0, double xmax = 0, double ymax = 0, double mZmax = 0 );
+%Docstring
+ Constructor for QgsBox3D which accepts the ranges of x/y/z coordinates.
+%End
+
+    QgsBox3d( const QgsPointV2 &p1, const QgsPointV2 &p2 );
+%Docstring
+ Constructs a QgsBox3D from two points representing opposite corners of the box.
+ The box is normalized after construction.
+%End
+
+    void setXMinimum( double x );
+%Docstring
+ Sets the minimum x value.
+ \see xMinimum()
+ \see setXMaximum()
+%End
+
+    void setXMaximum( double x );
+%Docstring
+ Sets the maximum x value.
+ \see xMaximum()
+ \see setXMinimum()
+%End
+
+    double xMinimum() const;
+%Docstring
+ Returns the minimum x value.
+ \see setXMinimum()
+ \see xMaximum()
+ :rtype: float
+%End
+
+    double xMaximum() const;
+%Docstring
+ Returns the maximum x value.
+ \see setXMaximum()
+ \see xMinimum()
+ :rtype: float
+%End
+
+    void setYMinimum( double y );
+%Docstring
+ Sets the minimum y value.
+ \see yMinimum()
+ \see setYMaximum()
+%End
+
+    void setYMaximum( double y );
+%Docstring
+ Sets the maximum y value.
+ \see yMaximum()
+ \see setYMinimum()
+%End
+
+    double yMinimum() const;
+%Docstring
+ Returns the minimum y value.
+ \see setYMinimum()
+ \see yMaximum()
+ :rtype: float
+%End
+
+    double yMaximum() const;
+%Docstring
+ Returns the maximum y value.
+ \see setYMaximum()
+ \see yMinimum()
+ :rtype: float
+%End
+
+    void setZMinimum( double z );
+%Docstring
+ Sets the minimum z value.
+ \see zMinimum()
+ \see setZMaximum()
+%End
+
+    void setZMaximum( double z );
+%Docstring
+ Sets the maximum z value.
+ \see zMaximum()
+ \see setZMinimum()
+%End
+
+    double zMinimum() const;
+%Docstring
+ Returns the minimum z value.
+ \see setZMinimum()
+ \see zMaximum()
+ :rtype: float
+%End
+
+    double zMaximum() const;
+%Docstring
+ Returns the maximum z value.
+ \see setZMaximum()
+ \see zMinimum()
+ :rtype: float
+%End
+
+    void normalize();
+%Docstring
+ Normalize the box so it has non-negative width/height/depth.
+%End
+
+    double width() const;
+%Docstring
+ Returns the width of the box.
+ \see height()
+ \see depth()
+ :rtype: float
+%End
+
+    double height() const;
+%Docstring
+ Returns the height of the box.
+ \see width()
+ \see depth()
+ :rtype: float
+%End
+
+    double depth() const;
+%Docstring
+ Returns the depth of the box.
+ \see width()
+ \see height()
+ :rtype: float
+%End
+
+    double volume() const;
+%Docstring
+ Returns the volume of the box.
+ :rtype: float
+%End
+
+    QgsBox3d intersect( const QgsBox3d &other ) const;
+%Docstring
+ Returns the intersection of this box and another 3D box.
+ :rtype: QgsBox3d
+%End
+
+    bool intersects( const QgsBox3d &other ) const;
+%Docstring
+ Returns true if box intersects with another box.
+ :rtype: bool
+%End
+
+    bool contains( const QgsBox3d &other ) const;
+%Docstring
+ Returns true when box contains other box.
+ :rtype: bool
+%End
+
+    bool contains( const QgsPointV2 &point ) const;
+%Docstring
+ Returns true when box contains a point.
+
+ If the point is a 2D point (no z-coordinate), then the containment test
+ will be performed on the x/y extent of the box only.
+ :rtype: bool
+%End
+
+    QgsRectangle toRectangle() const;
+%Docstring
+ Converts the box to a 2D rectangle.
+ :rtype: QgsRectangle
+%End
+
+};
+
+/************************************************************************
+ * This file has been generated automatically from                      *
+ *                                                                      *
+ * src/core/geometry/qgsbox3d.h                                         *
+ *                                                                      *
+ * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
+ ************************************************************************/