a batch of small improvements and bug fixes

Author: Koen Deforche

Changelog

@@ -1,3 +1,9 @@
+10-07-2013:
+	* WSignal: Due to boost 1.54 complaining on boost.signals being
+	deprecated, namespace Wt::Signals was created. This namespace contains
+	the boost signals implementation that is optimal for your boost: for
+	boost < 1.54 it will be signals, for boost > 1.54 it will be signals2.
+
 15-05-2013:
 	* WStandardItem, WStandardItemModel: before: checkboxes are rendered
 	in enabled state when ItemIsUserCheckable flag is set. Now: checkboxes

WConfig.h.in

@@ -39,5 +39,10 @@
 #cmakedefine WT_NO_STD_WSTRING
 #cmakedefine WT_DEBUG_ENABLED
 
+// Only one of the two below should be selected
+#cmakedefine WT_USE_BOOST_SIGNALS
+#cmakedefine WT_USE_BOOST_SIGNALS2
+#define WT_USE_BOOST_SIGNALS
+
 #endif
 

cmake/WtFindHaru.txt

@@ -29,6 +29,11 @@ IF(WIN32)
     PATHS
       ${HARU_PREFIX}/lib
   )
+  SET(HARU_LIB ${HARU_LIB_RELEASE})
+  IF(HARU_LIB_RELEASE AND HARU_LIB_DEBUG)
+    SET(HARU_LIB optimized ${HARU_LIB_RELEASE} debug ${HARU_LIB_DEBUG})
+  ENDIF(HARU_LIB_RELEASE AND HARU_LIB_DEBUG)
+
   FIND_LIBRARY(PNG_LIB_RELEASE
     NAMES
       libpng
@@ -41,24 +46,24 @@ IF(WIN32)
     PATHS
       ${HARU_PREFIX}/lib
   )
+  SET(PNG_LIB ${PNG_LIB_RELEASE})
+  IF(PNG_LIB_RELEASE AND PNG_LIB_DEBUG)
+    SET(PNG_LIB optimized ${PNG_LIB_RELEASE} debug ${PNG_LIB_DEBUG})
+  ENDIF(PNG_LIB_RELEASE AND PNG_LIB_DEBUG)
+
   FIND_LIBRARY(Z_LIB
     NAMES
       zlib
+      libz
     PATHS
       ${HARU_PREFIX}/lib
       ${USERLIB_PREFIX}/lib
   )
-  IF(HARU_LIB_RELEASE AND HARU_LIB_DEBUG)
-    SET(HARU_LIB optimized ${HARU_LIB_RELEASE} debug ${HARU_LIB_DEBUG})
-    SET(HARU_SUPPORT_LIBS "")
-    IF(PNG_LIB_RELEASE AND PNG_LIB_DEBUG)
-      SET(HARU_SUPPORT_LIBS ${HARU_SUPPORT_LIBS} optimized ${PNG_LIB_RELEASE} debug ${PNG_LIB_DEBUG})
-    ENDIF(PNG_LIB_RELEASE AND PNG_LIB_DEBUG)
-    IF(Z_LIB)
-      SET(HARU_SUPPORT_LIBS ${HARU_SUPPORT_LIBS} ${Z_LIB})
-    ENDIF(Z_LIB)
-  ENDIF(HARU_LIB_RELEASE AND HARU_LIB_DEBUG)
-  SET(HARU_SUPPORT_LIBS_FOUND TRUE)
+  SET(HARU_SUPPORT_LIBS_FOUND FALSE)
+  IF (PNG_LIB AND Z_LIB)
+    SET(HARU_SUPPORT_LIBS_FOUND TRUE)
+    SET(HARU_SUPPORT_LIBS ${PNG_LIB} ${Z_LIB})
+  ENDIF (PNG_LIB AND Z_LIB)
 ELSE(WIN32)
   FIND_LIBRARY(HARU_LIB
     NAMES

cmake/WtFindMysql.txt

@@ -17,7 +17,7 @@ FIND_PATH(MYSQL_INCLUDE mysql.h
     /usr/local/include/mysql
 )
 
-SET(MYSQL_LIBRARY "mariadb;mariadbclient" CACHE STRING "Library that provides MySQL/MariaDB API (set to mysqlclient for mysql on unix; libmysql on windows)")
+SET(MYSQL_LIBRARY mariadb mariadbclient mysqlclient libmysql CACHE STRING "Library that provides MySQL/MariaDB API (set to mysqlclient for mysql on unix; libmysql on windows)")
 
 FIND_LIBRARY(MYSQL_LIB
     NAMES

examples/dragdrop/DragExample.C

@@ -22,6 +22,7 @@ WImage *createDragImage(const char *url, const char *smallurl,
 {
   WImage *result = new WImage(url, p);
   WImage *dragImage = new WImage(smallurl, p);
+  dragImage->setMargin(-15, Left | Top);
 
   /*
    * Set the image to be draggable, showing the other image (dragImage)

examples/widgetgallery/examples/SpinBox.cpp

@@ -4,6 +4,7 @@
 
 SAMPLE_BEGIN(SpinBox)
 Wt::WContainerWidget *container = new Wt::WContainerWidget();
+container->addStyleClass("control-group");
 
 new Wt::WText("Enter a number between 0 and 100:", container);
 
@@ -16,9 +17,13 @@ sb->setMargin(10, Wt::Left | Wt::Right);
 
 Wt::WText *out = new Wt::WText("", container);
 
-sb->valueChanged().connect(std::bind([=] (double d) {
-    out->setText(Wt::WString::fromUTF8("Spin box value changed to {1}.")
-		 .arg(d));
-}, std::placeholders::_1));
+sb->changed().connect(std::bind([=] () {
+    if (sb->validate() == Wt::WValidator::Valid) {
+        out->setText(Wt::WString::fromUTF8("Spin box value changed to {1}")
+		     .arg(sb->text()));
+    } else {
+        out->setText(Wt::WString::fromUTF8("Invalid spin box value!"));
+    }
+}));
 
 SAMPLE_END(return container)

src/Wt/Auth/AbstractUserDatabase

@@ -119,9 +119,9 @@ public:
   virtual User findWithIdentity(const std::string& provider,
 				const WT_USTRING& identity) const = 0;
 
-  /*! \brief Sets an identifier for the user.
+  /*! \brief Adds an identify for the user.
    *
-   * This associates an identifier with the user.
+   * This adds an identity to the user.
    *
    * You are free to support only one identity per user, e.g. if you
    * only use password-based authentication. But you may also want to
@@ -132,6 +132,13 @@ public:
   virtual void addIdentity(const User& user, const std::string& provider,
 			   const WT_USTRING& id) = 0;
 
+  /*! \brief Changes an identity for a user.
+   *
+   * The base implementation calls removeIdentity() followed by addIdentity().
+   */
+  virtual void setIdentity(const User& user, const std::string& provider,
+			   const WT_USTRING& id);
+
   /*! \brief Returns a user identity.
    *
    * Returns a user identity for the given provider, or an empty string
@@ -142,6 +149,12 @@ public:
   virtual WT_USTRING identity(const User& user, const std::string& provider)
     const = 0;
 
+  /*! \brief Removes a user identity.
+   *
+   * This removes all identities of a \p provider from the \p user.
+   *
+   * \sa addIdentity()
+   */
   virtual void removeIdentity(const User& user, const std::string& provider)
     = 0;
   //@}

src/Wt/Auth/AbstractUserDatabase.C

@@ -68,6 +68,14 @@ void AbstractUserDatabase::setPassword(const User& user,
   LOG_ERROR(Require("setPassword()", PASSWORDS).what());
 }
 
+void AbstractUserDatabase::setIdentity(const User& user,
+				       const std::string& provider,
+				       const WT_USTRING& id)
+{
+  removeIdentity(user, provider);
+  addIdentity(user, provider, id);
+}
+
 User AbstractUserDatabase::registerNew()
 {
   LOG_ERROR(Require("registerNew()", REGISTRATION).what());

src/Wt/Auth/Dbo/UserDatabase

@@ -162,6 +162,7 @@ public:
 	.where("provider = ?").bind(provider).resultList().size() != 0) {
       Wt::log("error") << "cannot add identity " << provider
 		       << ":'" << identity << "': already exists";
+      return;
     }
 
     /*
@@ -172,6 +173,23 @@ public:
 							   identity)));
   }
 
+  virtual void setIdentity(const User& user, const std::string& provider,
+			   const WT_USTRING& identity) {
+    WithUser find(*this, user);
+
+    AuthIdentities c
+      = user_->authIdentities().find().where("provider = ?").bind(provider);
+
+    typename AuthIdentities::const_iterator i = c.begin();
+
+    if (i != c.end())
+      i->modify()->setIdentity(identity);
+    else
+      user_.modify()->authIdentities().insert
+	(Wt::Dbo::ptr<AuthIdentityType>(new AuthIdentityType(provider,
+							     identity)));
+  }
+
   virtual bool setEmail(const User& user, const std::string& address) {
     WithUser find(*this, user);
 

src/Wt/Auth/User

@@ -106,14 +106,36 @@ public:
    */
   const std::string& id() const { return id_; }
 
-  /*! \brief Returns the user's identity.
+  /*! \brief Returns an identity.
    */
   WT_USTRING identity(const std::string& provider) const;
 
-  /*! \brief Adds (or modifies) a user's identity.
+  /*! \brief Adds an identity.
+   *
+   * Depending on whether the database supports multiple identities
+   * per provider, this may change (like setIdentity()), or add
+   * another identity to the user. For some identity providers (e.g. a
+   * 3rd party identity provider), it may be sensible to have more
+   * than one identity of the same provider for a single user
+   * (e.g. multiple email accounts managed by the same provider, that
+   * in fact identify the same user).
    */
   void addIdentity(const std::string& provider, const WT_USTRING& identity);
 
+  /*! \brief Sets an identity.
+   *
+   * Unlike addIdentity() this overrides any other identity of the
+   * given provider, in case the underlying database supports multiple
+   * identities per user.
+   */
+  void setIdentity(const std::string& provider, const WT_USTRING& identity);
+
+  /*! \brief Removes an identity.
+   *
+   * \sa addIdentity()
+   */
+  void removeIdentity(const std::string& provider);
+
   /*! \brief Sets a password.
    *
    * \sa AbstractUserDatabase::setPassword()