documentation update

INSTALL

@@ -1 +0,0 @@
-/usr/share/automake-1.15/INSTALL

INSTALL

@@ -0,0 +1,136 @@
+Install Software
+================
+
+There are prebuilt software packages in the repositories, look in
+https://repository.mrw.sh for your operating system.
+
+Note: PublicKey has changed on Novmber 1st 2015, please import the new
+key.
+
+Linux
+-----
+
+There are package repositories for most distributions at https://repository.mrw.sh.
+
+### Ubuntu and Debian
+
+To accept my signature, install my key:
+
+        wget -O- https://repository.mrw.sh/PublicKey \
+            | sudo apt-key add -
+
+You can install all software using your package manager (`apt`), first install the repository:
+
+        sudo apt-get install -y wget software-properties-common apt-transport-https
+        sudo apt-add-repository https://repository.mrw.sh
+        sudo apt-get update -y
+Then you can install any project you wish, e.g. [`webtester`](https://mrw.sh/development/webtester):
+
+        sudo apt-get install webtester -y
+
+### OpenSUSE
+
+To accept my signature, install my key:
+
+        wget https://repository.mrw.sh/PublicKey
+        rpm --import PublicKey
+
+You can use your packagemanager (`zypper` or _YaST_). First install the repostitory:
+
+        zypper ar https://repository.mrw.sh/opensuse/marc-waeckerlin.repo
+
+Then install packages from the repository, e.g. [`webtester`](https://mrw.sh/development/webtester):
+
+        zypper install webtester
+
+In case of trouble: Check if your version of OpenSUSE is supported,
+use `lsb_release -rs` to get the version of your OpenSUSE:
+https://drepository.mrw.sh/opensuse
+
+### Fedora
+
+To accept my signature, install my key:
+
+        wget https://repository.mrw.sh/PublicKey
+        rpm --import PublicKey
+
+You can use your packagemanager (`dnf`). First install the repository:
+
+        dnf install 'dnf-command(config-manager)'
+        dnf config-manager --add-repo https://repository.mrw.sh/fedora/marc-waeckerlin.repo
+
+Then install packages from the repository, e.g. [`webtester`](https://mrw.sh/development/webtester):
+
+        dnf install webtester
+
+In case of trouble: Check if your version of Fedora is supported, use `lsb_release -rs` to get the version of your Fedora: https://repository.mrw.sh/fedora
+
+### CentOS
+
+To accept my signature, install my key:
+
+        wget https://repository.mrw.sh/PublicKey
+        rpm --import PublicKey
+
+You can use your packagemanager (`yum`). First install the repository:
+
+        yum install wget
+        wget -O/etc/yum.repos.d/marc-waeckerlin.repo https://repository.mrw.sh/centos/marc-waeckerlin.repo
+
+Then install packages from the repository, e.g. [`webtester`](https://mrw.sh/development/webtester):
+
+        yum install webtester
+
+In case of trouble: Check if your version of CentOS is supported, use lsb_release -rs to get the version of your CentOS: https://repository.mrw.sh/centos
+
+### Mageia
+
+To accept my signature, install my key:
+
+        wget https://repository.mrw.sh/PublicKey
+        rpm --import PublicKey
+
+You can use your packagemanager (`dnf`). First install the repository:
+
+        dnf install 'dnf-command(config-manager)'
+        dnf config-manager --add-repo https://repository.mrw.sh/mageia/marc-waeckerlin.repo
+
+Then install packages from the repository, e.g. [`webtester`](https://mrw.sh/development/webtester):
+
+        dnf install webtester
+
+### Other Linux Distributions
+
+Either use the nearest possible distribution, or use alien to convert from another distribution to your preferred package format, or compile the project yourself (see below).
+
+Windows
+-------
+
+Download from https://repository.mrw.sh/windows
+
+MacOSX
+------
+
+You need e.g. Mac Ports to compile. Install the following dependencies:
+
+        sudo port install subversion svn2cl doxygen graphviz cppunit libtool boost log4cxx qt5-mac
+
+Fix libtool-bug:
+
+        sudo ln -s /opt/local/bin/glibtoolize /opt/local/bin/libtoolize
+
+Compile from Source
+-------------------
+
+For all unsupported operating systems, including MacOSX.
+
+To compile, please download the tar-sources from: https://repository.mrw.sh/sources
+
+Then untar the package and use the common commands, e.g. for version `1.0.2` of a project named project, that means:
+
+        tar xzf project-1.0.2.tar.gz
+        cd project-1.0.2
+        ./bootstrap.sh
+        ./configure
+        make
+        sudo make install

ax_check_qt.m4

@@ -130,14 +130,6 @@ AC_DEFUN([AX_CHECK_QT], [
       QT_PLUGIN_PATH="${QTDIR}/plugins"
     elif test -d "${QTDIR}/share/qt5/plugins; then
       QT_PLUGIN_PATH="${QTDIR}/share/qt5/plugins"
-    else
-      AC_MSG_ERROR([QT_PLUGIN_PATH not found
- - not in: ${qt_libdir}/plugins
- - not in: ${qt_libdir}/qt5/plugins
- - not in: ${qt_host_bins}/../plugins
- - not in: ${QTDIR}/plugins
- - not in: ${QTDIR}/share/qt5/plugins
-])
     fi
     MOC_FLAGS+=" -DHAVE_$1=1 ${[$1]5_CFLAGS}"
     [$1]_CPPFLAGS="${[$1]5_CFLAGS}"
@@ -192,14 +184,6 @@ AC_DEFUN([AX_CHECK_QT], [
         QT_PLUGIN_PATH="${QTDIR}/plugins"
       elif test -d "${QTDIR}/share/qt5/plugins; then
         QT_PLUGIN_PATH="${QTDIR}/share/qt5/plugins"
-      else
-        AC_MSG_ERROR([QT_PLUGIN_PATH not found
- - not in: ${qt_libdir}/plugins
- - not in: ${qt_libdir}/qt5/plugins
- - not in: ${qt_host_bins}/../plugins
- - not in: ${QTDIR}/plugins
- - not in: ${QTDIR}/share/qt5/plugins
-])
       fi
       MOC_FLAGS+=" -DHAVE_$1=1 ${$1_CFLAGS}"
       [$1]_CPPFLAGS="${[$1]_CFLAGS}"

ax_cxx_compile_stdcxx.m4

@@ -0,0 +1,948 @@
+# ===========================================================================
+#  https://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional])
+#
+# DESCRIPTION
+#
+#   Check for baseline language coverage in the compiler for the specified
+#   version of the C++ standard.  If necessary, add switches to CXX and
+#   CXXCPP to enable support.  VERSION may be '11' (for the C++11 standard)
+#   or '14' (for the C++14 standard).
+#
+#   The second argument, if specified, indicates whether you insist on an
+#   extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
+#   -std=c++11).  If neither is specified, you get whatever works, with
+#   preference for an extended mode.
+#
+#   The third argument, if specified 'mandatory' or if left unspecified,
+#   indicates that baseline support for the specified C++ standard is
+#   required and that the macro should error out if no mode with that
+#   support is found.  If specified 'optional', then configuration proceeds
+#   regardless, after defining HAVE_CXX${VERSION} if and only if a
+#   supporting mode is found.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
+#   Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
+#   Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu>
+#   Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov <sokolov@google.com>
+#   Copyright (c) 2015 Paul Norman <penorman@mac.com>
+#   Copyright (c) 2015 Moritz Klammler <moritz@klammler.eu>
+#   Copyright (c) 2016, 2018 Krzesimir Nowak <qdlacz@gmail.com>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved.  This file is offered as-is, without any
+#   warranty.
+
+#serial 10
+
+dnl  This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro
+dnl  (serial version number 13).
+
+AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
+  m4_if([$1], [11], [ax_cxx_compile_alternatives="11 0x"],
+        [$1], [14], [ax_cxx_compile_alternatives="14 1y"],
+        [$1], [17], [ax_cxx_compile_alternatives="17 1z"],
+        [m4_fatal([invalid first argument `$1' to AX_CXX_COMPILE_STDCXX])])dnl
+  m4_if([$2], [], [],
+        [$2], [ext], [],
+        [$2], [noext], [],
+        [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX])])dnl
+  m4_if([$3], [], [ax_cxx_compile_cxx$1_required=true],
+        [$3], [mandatory], [ax_cxx_compile_cxx$1_required=true],
+        [$3], [optional], [ax_cxx_compile_cxx$1_required=false],
+        [m4_fatal([invalid third argument `$3' to AX_CXX_COMPILE_STDCXX])])
+  AC_LANG_PUSH([C++])dnl
+  ac_success=no
+
+  m4_if([$2], [noext], [], [dnl
+  if test x$ac_success = xno; then
+    for alternative in ${ax_cxx_compile_alternatives}; do
+      switch="-std=gnu++${alternative}"
+      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
+      AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
+                     $cachevar,
+        [ac_save_CXX="$CXX"
+         CXX="$CXX $switch"
+         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
+          [eval $cachevar=yes],
+          [eval $cachevar=no])
+         CXX="$ac_save_CXX"])
+      if eval test x\$$cachevar = xyes; then
+        CXX="$CXX $switch"
+        if test -n "$CXXCPP" ; then
+          CXXCPP="$CXXCPP $switch"
+        fi
+        ac_success=yes
+        break
+      fi
+    done
+  fi])
+
+  m4_if([$2], [ext], [], [dnl
+  if test x$ac_success = xno; then
+    dnl HP's aCC needs +std=c++11 according to:
+    dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf
+    dnl Cray's crayCC needs "-h std=c++11"
+    for alternative in ${ax_cxx_compile_alternatives}; do
+      for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do
+        cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
+        AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
+                       $cachevar,
+          [ac_save_CXX="$CXX"
+           CXX="$CXX $switch"
+           AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
+            [eval $cachevar=yes],
+            [eval $cachevar=no])
+           CXX="$ac_save_CXX"])
+        if eval test x\$$cachevar = xyes; then
+          CXX="$CXX $switch"
+          if test -n "$CXXCPP" ; then
+            CXXCPP="$CXXCPP $switch"
+          fi
+          ac_success=yes
+          break
+        fi
+      done
+      if test x$ac_success = xyes; then
+        break
+      fi
+    done
+  fi])
+  AC_LANG_POP([C++])
+  if test x$ax_cxx_compile_cxx$1_required = xtrue; then
+    if test x$ac_success = xno; then
+      AC_MSG_ERROR([*** A compiler with support for C++$1 language features is required.])
+    fi
+  fi
+  if test x$ac_success = xno; then
+    HAVE_CXX$1=0
+    AC_MSG_NOTICE([No compiler with C++$1 support was found])
+  else
+    HAVE_CXX$1=1
+    AC_DEFINE(HAVE_CXX$1,1,
+              [define if the compiler supports basic C++$1 syntax])
+  fi
+  AC_SUBST(HAVE_CXX$1)
+])
+
+
+dnl  Test body for checking C++11 support
+
+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_11],
+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
+)
+
+
+dnl  Test body for checking C++14 support
+
+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_14],
+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
+)
+
+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_17],
+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_17
+)
+
+dnl  Tests for new features in C++11
+
+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_11], [[
+
+// If the compiler admits that it is not ready for C++11, why torture it?
+// Hopefully, this will speed up the test.
+
+#ifndef __cplusplus
+
+#error "This is not a C++ compiler"
+
+#elif __cplusplus < 201103L
+
+#error "This is not a C++11 compiler"
+
+#else
+
+namespace cxx11
+{
+
+  namespace test_static_assert
+  {
+
+    template <typename T>
+    struct check
+    {
+      static_assert(sizeof(int) <= sizeof(T), "not big enough");
+    };
+
+  }
+
+  namespace test_final_override
+  {
+
+    struct Base
+    {
+      virtual void f() {}
+    };
+
+    struct Derived : public Base
+    {
+      virtual void f() override {}
+    };
+
+  }
+
+  namespace test_double_right_angle_brackets
+  {
+
+    template < typename T >
+    struct check {};
+
+    typedef check<void> single_type;
+    typedef check<check<void>> double_type;
+    typedef check<check<check<void>>> triple_type;
+    typedef check<check<check<check<void>>>> quadruple_type;
+
+  }
+
+  namespace test_decltype
+  {
+
+    int
+    f()
+    {
+      int a = 1;
+      decltype(a) b = 2;
+      return a + b;
+    }
+
+  }
+
+  namespace test_type_deduction
+  {
+
+    template < typename T1, typename T2 >
+    struct is_same
+    {
+      static const bool value = false;
+    };
+
+    template < typename T >
+    struct is_same<T, T>
+    {
+      static const bool value = true;
+    };
+
+    template < typename T1, typename T2 >
+    auto
+    add(T1 a1, T2 a2) -> decltype(a1 + a2)
+    {
+      return a1 + a2;
+    }
+
+    int
+    test(const int c, volatile int v)
+    {
+      static_assert(is_same<int, decltype(0)>::value == true, "");
+      static_assert(is_same<int, decltype(c)>::value == false, "");
+      static_assert(is_same<int, decltype(v)>::value == false, "");
+      auto ac = c;
+      auto av = v;
+      auto sumi = ac + av + 'x';
+      auto sumf = ac + av + 1.0;
+      static_assert(is_same<int, decltype(ac)>::value == true, "");
+      static_assert(is_same<int, decltype(av)>::value == true, "");
+      static_assert(is_same<int, decltype(sumi)>::value == true, "");
+      static_assert(is_same<int, decltype(sumf)>::value == false, "");
+      static_assert(is_same<int, decltype(add(c, v))>::value == true, "");
+      return (sumf > 0.0) ? sumi : add(c, v);
+    }
+
+  }
+
+  namespace test_noexcept
+  {
+
+    int f() { return 0; }
+    int g() noexcept { return 0; }
+
+    static_assert(noexcept(f()) == false, "");
+    static_assert(noexcept(g()) == true, "");
+
+  }
+
+  namespace test_constexpr
+  {
+
+    template < typename CharT >
+    unsigned long constexpr
+    strlen_c_r(const CharT *const s, const unsigned long acc) noexcept
+    {
+      return *s ? strlen_c_r(s + 1, acc + 1) : acc;
+    }
+
+    template < typename CharT >
+    unsigned long constexpr
+    strlen_c(const CharT *const s) noexcept
+    {
+      return strlen_c_r(s, 0UL);
+    }
+
+    static_assert(strlen_c("") == 0UL, "");
+    static_assert(strlen_c("1") == 1UL, "");
+    static_assert(strlen_c("example") == 7UL, "");
+    static_assert(strlen_c("another\0example") == 7UL, "");
+
+  }
+
+  namespace test_rvalue_references
+  {
+
+    template < int N >
+    struct answer
+    {
+      static constexpr int value = N;
+    };
+
+    answer<1> f(int&)       { return answer<1>(); }
+    answer<2> f(const int&) { return answer<2>(); }
+    answer<3> f(int&&)      { return answer<3>(); }
+
+    void
+    test()
+    {
+      int i = 0;
+      const int c = 0;
+      static_assert(decltype(f(i))::value == 1, "");
+      static_assert(decltype(f(c))::value == 2, "");
+      static_assert(decltype(f(0))::value == 3, "");
+    }
+
+  }
+
+  namespace test_uniform_initialization
+  {
+
+    struct test
+    {
+      static const int zero {};
+      static const int one {1};
+    };
+
+    static_assert(test::zero == 0, "");
+    static_assert(test::one == 1, "");
+
+  }
+
+  namespace test_lambdas
+  {
+
+    void
+    test1()
+    {
+      auto lambda1 = [](){};
+      auto lambda2 = lambda1;
+      lambda1();
+      lambda2();
+    }
+
+    int
+    test2()
+    {
+      auto a = [](int i, int j){ return i + j; }(1, 2);
+      auto b = []() -> int { return '0'; }();
+      auto c = [=](){ return a + b; }();
+      auto d = [&](){ return c; }();
+      auto e = [a, &b](int x) mutable {
+        const auto identity = [](int y){ return y; };
+        for (auto i = 0; i < a; ++i)
+          a += b--;
+        return x + identity(a + b);
+      }(0);
+      return a + b + c + d + e;
+    }
+
+    int
+    test3()
+    {
+      const auto nullary = [](){ return 0; };
+      const auto unary = [](int x){ return x; };
+      using nullary_t = decltype(nullary);
+      using unary_t = decltype(unary);
+      const auto higher1st = [](nullary_t f){ return f(); };
+      const auto higher2nd = [unary](nullary_t f1){
+        return [unary, f1](unary_t f2){ return f2(unary(f1())); };
+      };
+      return higher1st(nullary) + higher2nd(nullary)(unary);
+    }
+
+  }
+
+  namespace test_variadic_templates
+  {
+
+    template <int...>
+    struct sum;
+
+    template <int N0, int... N1toN>
+    struct sum<N0, N1toN...>
+    {
+      static constexpr auto value = N0 + sum<N1toN...>::value;
+    };
+
+    template <>
+    struct sum<>
+    {
+      static constexpr auto value = 0;
+    };
+
+    static_assert(sum<>::value == 0, "");
+    static_assert(sum<1>::value == 1, "");
+    static_assert(sum<23>::value == 23, "");
+    static_assert(sum<1, 2>::value == 3, "");
+    static_assert(sum<5, 5, 11>::value == 21, "");
+    static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, "");
+
+  }
+
+  // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae
+  // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function
+  // because of this.
+  namespace test_template_alias_sfinae
+  {
+
+    struct foo {};
+
+    template<typename T>
+    using member = typename T::member_type;
+
+    template<typename T>
+    void func(...) {}
+
+    template<typename T>
+    void func(member<T>*) {}
+
+    void test();
+
+    void test() { func<foo>(0); }
+
+  }
+
+}  // namespace cxx11
+
+#endif  // __cplusplus >= 201103L
+
+]])
+
+
+dnl  Tests for new features in C++14
+
+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_14], [[
+
+// If the compiler admits that it is not ready for C++14, why torture it?
+// Hopefully, this will speed up the test.
+
+#ifndef __cplusplus
+
+#error "This is not a C++ compiler"
+
+#elif __cplusplus < 201402L
+
+#error "This is not a C++14 compiler"
+
+#else
+
+namespace cxx14
+{
+
+  namespace test_polymorphic_lambdas
+  {
+
+    int
+    test()
+    {
+      const auto lambda = [](auto&&... args){
+        const auto istiny = [](auto x){
+          return (sizeof(x) == 1UL) ? 1 : 0;
+        };
+        const int aretiny[] = { istiny(args)... };
+        return aretiny[0];
+      };
+      return lambda(1, 1L, 1.0f, '1');
+    }
+
+  }
+
+  namespace test_binary_literals
+  {
+
+    constexpr auto ivii = 0b0000000000101010;
+    static_assert(ivii == 42, "wrong value");
+
+  }
+
+  namespace test_generalized_constexpr
+  {
+
+    template < typename CharT >
+    constexpr unsigned long
+    strlen_c(const CharT *const s) noexcept
+    {
+      auto length = 0UL;
+      for (auto p = s; *p; ++p)
+        ++length;
+      return length;
+    }
+
+    static_assert(strlen_c("") == 0UL, "");
+    static_assert(strlen_c("x") == 1UL, "");
+    static_assert(strlen_c("test") == 4UL, "");
+    static_assert(strlen_c("another\0test") == 7UL, "");
+
+  }
+
+  namespace test_lambda_init_capture
+  {
+
+    int
+    test()
+    {
+      auto x = 0;
+      const auto lambda1 = [a = x](int b){ return a + b; };
+      const auto lambda2 = [a = lambda1(x)](){ return a; };
+      return lambda2();
+    }
+
+  }
+
+  namespace test_digit_separators
+  {
+
+    constexpr auto ten_million = 100'000'000;
+    static_assert(ten_million == 100000000, "");
+
+  }
+
+  namespace test_return_type_deduction
+  {
+
+    auto f(int& x) { return x; }
+    decltype(auto) g(int& x) { return x; }
+
+    template < typename T1, typename T2 >
+    struct is_same
+    {
+      static constexpr auto value = false;
+    };
+
+    template < typename T >
+    struct is_same<T, T>
+    {
+      static constexpr auto value = true;
+    };
+
+    int
+    test()
+    {
+      auto x = 0;
+      static_assert(is_same<int, decltype(f(x))>::value, "");
+      static_assert(is_same<int&, decltype(g(x))>::value, "");
+      return x;
+    }
+
+  }
+
+}  // namespace cxx14
+
+#endif  // __cplusplus >= 201402L
+
+]])
+
+
+dnl  Tests for new features in C++17
+
+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_17], [[
+
+// If the compiler admits that it is not ready for C++17, why torture it?
+// Hopefully, this will speed up the test.
+
+#ifndef __cplusplus
+
+#error "This is not a C++ compiler"
+
+#elif __cplusplus < 201703L
+
+#error "This is not a C++17 compiler"
+
+#else
+
+#include <initializer_list>
+#include <utility>
+#include <type_traits>
+
+namespace cxx17
+{
+
+  namespace test_constexpr_lambdas
+  {
+
+    constexpr int foo = [](){return 42;}();
+
+  }
+
+  namespace test::nested_namespace::definitions
+  {
+
+  }
+
+  namespace test_fold_expression
+  {
+
+    template<typename... Args>
+    int multiply(Args... args)
+    {
+      return (args * ... * 1);
+    }
+
+    template<typename... Args>
+    bool all(Args... args)
+    {
+      return (args && ...);
+    }
+
+  }
+
+  namespace test_extended_static_assert
+  {
+
+    static_assert (true);
+
+  }
+
+  namespace test_auto_brace_init_list
+  {
+
+    auto foo = {5};
+    auto bar {5};
+
+    static_assert(std::is_same<std::initializer_list<int>, decltype(foo)>::value);
+    static_assert(std::is_same<int, decltype(bar)>::value);
+  }
+
+  namespace test_typename_in_template_template_parameter
+  {
+
+    template<template<typename> typename X> struct D;
+
+  }
+
+  namespace test_fallthrough_nodiscard_maybe_unused_attributes
+  {
+
+    int f1()
+    {
+      return 42;
+    }
+
+    [[nodiscard]] int f2()
+    {
+      [[maybe_unused]] auto unused = f1();
+
+      switch (f1())
+      {
+      case 17:
+        f1();
+        [[fallthrough]];
+      case 42:
+        f1();
+      }
+      return f1();
+    }
+
+  }
+
+  namespace test_extended_aggregate_initialization
+  {
+
+    struct base1
+    {
+      int b1, b2 = 42;
+    };
+
+    struct base2
+    {
+      base2() {
+        b3 = 42;
+      }
+      int b3;
+    };
+
+    struct derived : base1, base2
+    {
+        int d;
+    };
+
+    derived d1 {{1, 2}, {}, 4};  // full initialization
+    derived d2 {{}, {}, 4};      // value-initialized bases
+
+  }
+
+  namespace test_general_range_based_for_loop
+  {
+
+    struct iter
+    {
+      int i;
+
+      int& operator* ()
+      {
+        return i;
+      }
+
+      const int& operator* () const
+      {
+        return i;
+      }
+
+      iter& operator++()
+      {
+        ++i;
+        return *this;
+      }
+    };
+
+    struct sentinel
+    {
+      int i;
+    };
+
+    bool operator== (const iter& i, const sentinel& s)
+    {
+      return i.i == s.i;
+    }
+
+    bool operator!= (const iter& i, const sentinel& s)
+    {
+      return !(i == s);
+    }
+
+    struct range
+    {
+      iter begin() const
+      {
+        return {0};
+      }
+
+      sentinel end() const
+      {
+        return {5};
+      }
+    };
+
+    void f()
+    {
+      range r {};
+
+      for (auto i : r)
+      {
+        [[maybe_unused]] auto v = i;
+      }
+    }
+
+  }
+
+  namespace test_lambda_capture_asterisk_this_by_value
+  {
+
+    struct t
+    {
+      int i;
+      int foo()
+      {
+        return [*this]()
+        {
+          return i;
+        }();
+      }
+    };
+
+  }
+
+  namespace test_enum_class_construction
+  {
+
+    enum class byte : unsigned char
+    {};
+
+    byte foo {42};
+
+  }
+
+  namespace test_constexpr_if
+  {
+
+    template <bool cond>
+    int f ()
+    {
+      if constexpr(cond)
+      {
+        return 13;
+      }
+      else
+      {
+        return 42;
+      }
+    }
+
+  }
+
+  namespace test_selection_statement_with_initializer
+  {
+
+    int f()
+    {
+      return 13;
+    }
+
+    int f2()
+    {
+      if (auto i = f(); i > 0)
+      {
+        return 3;
+      }
+
+      switch (auto i = f(); i + 4)
+      {
+      case 17:
+        return 2;
+
+      default:
+        return 1;
+      }
+    }
+
+  }
+
+  namespace test_template_argument_deduction_for_class_templates
+  {
+
+    template <typename T1, typename T2>
+    struct pair
+    {
+      pair (T1 p1, T2 p2)
+        : m1 {p1},
+          m2 {p2}
+      {}
+
+      T1 m1;
+      T2 m2;
+    };
+
+    void f()
+    {
+      [[maybe_unused]] auto p = pair{13, 42u};
+    }
+
+  }
+
+  namespace test_non_type_auto_template_parameters
+  {
+
+    template <auto n>
+    struct B
+    {};
+
+    B<5> b1;
+    B<'a'> b2;
+
+  }
+
+  namespace test_structured_bindings
+  {
+
+    int arr[2] = { 1, 2 };
+    std::pair<int, int> pr = { 1, 2 };
+
+    auto f1() -> int(&)[2]
+    {
+      return arr;
+    }
+
+    auto f2() -> std::pair<int, int>&
+    {
+      return pr;
+    }
+
+    struct S
+    {
+      int x1 : 2;
+      volatile double y1;
+    };
+
+    S f3()
+    {
+      return {};
+    }
+
+    auto [ x1, y1 ] = f1();
+    auto& [ xr1, yr1 ] = f1();
+    auto [ x2, y2 ] = f2();
+    auto& [ xr2, yr2 ] = f2();
+    const auto [ x3, y3 ] = f3();
+
+  }
+
+  namespace test_exception_spec_type_system
+  {
+
+    struct Good {};
+    struct Bad {};
+
+    void g1() noexcept;
+    void g2();
+
+    template<typename T>
+    Bad
+    f(T*, T*);
+
+    template<typename T1, typename T2>
+    Good
+    f(T1*, T2*);
+
+    static_assert (std::is_same_v<Good, decltype(f(g1, g2))>);
+
+  }
+
+  namespace test_inline_variables
+  {
+
+    template<class T> void f(T)
+    {}
+
+    template<class T> inline T g(T)
+    {
+      return T{};
+    }
+
+    template<> inline void f<>(int)
+    {}
+
+    template<> int g<>(int)
+    {
+      return 5;
+    }
+
+  }
+
+}  // namespace cxx17
+
+#endif  // __cplusplus < 201703L
+
+]])

ax_cxx_compile_stdcxx_11.m4

@@ -1,231 +0,0 @@
-# ============================================================================
-#  http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html
-# ============================================================================
-#
-# SYNOPSIS
-#
-#   AX_REQUIRE_STDCXX_11
-#   AX_REQUIRE_STDCXX_14
-#   AX_CXX_COMPILE_STDCXX_11([ext|noext],[mandatory|optional])
-#   AX_CXX_COMPILE_STDCXX_14([ext|noext],[mandatory|optional])
-#
-# DESCRIPTION
-#
-#   Check for baseline language coverage in the compiler for the C++11
-#   or C++14 standard; if necessary, add switches to CXXFLAGS to
-#   enable support.
-#
-#   The first argument, if specified, indicates whether you insist on an
-#   extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
-#   -std=c++11).  If neither is specified, you get whatever works, with
-#   preference for an extended mode.
-#
-#   The second argument, if specified 'mandatory' or if left unspecified,
-#   indicates that baseline C++11 support is required and that the macro
-#   should error out if no mode with that support is found.  If specified
-#   'optional', then configuration proceeds regardless, after defining
-#   HAVE_CXX11 if and only if a supporting mode is found.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
-#   Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
-#   Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 3
-
-m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [
-  template <typename T>
-    struct check
-    {
-      static_assert(sizeof(int) <= sizeof(T), "not big enough");
-    };
-
-    typedef check<check<bool>> right_angle_brackets;
-
-    int a;
-    decltype(a) b;
-
-    typedef check<int> check_type;
-    check_type c;
-    check_type&& cr = static_cast<check_type&&>(c);
-
-    auto d = a;
-])
-
-AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dnl
-  m4_if([$1], [], [],
-        [$1], [ext], [],
-        [$1], [noext], [],
-        [m4_fatal([invalid argument `$1' to AX_CXX_COMPILE_STDCXX_11])])dnl
-  m4_if([$2], [], [ax_cxx_compile_cxx11_required=true],
-        [$2], [mandatory], [ax_cxx_compile_cxx11_required=true],
-        [$2], [optional], [ax_cxx_compile_cxx11_required=false],
-        [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX_11])])dnl
-  AC_LANG_PUSH([C++])dnl
-  ac_success=no
-  AC_CACHE_CHECK(whether $CXX supports C++11 features by default,
-  ax_cv_cxx_compile_cxx11,
-  [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
-    [ax_cv_cxx_compile_cxx11=yes],
-    [ax_cv_cxx_compile_cxx11=no])])
-  if test x$ax_cv_cxx_compile_cxx11 = xyes; then
-    ac_success=yes
-  fi
-
-  m4_if([$1], [noext], [], [dnl
-  if test x$ac_success = xno; then
-    for switch in -std=gnu++11 -std=gnu++0x; do
-      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch])
-      AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
-                     $cachevar,
-        [ac_save_CXXFLAGS="$CXXFLAGS"
-         CXXFLAGS="$CXXFLAGS $switch"
-         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
-          [eval $cachevar=yes],
-          [eval $cachevar=no])
-         CXXFLAGS="$ac_save_CXXFLAGS"])
-      if eval test x\$$cachevar = xyes; then
-        CXXFLAGS="$CXXFLAGS $switch"
-        ac_success=yes
-        break
-      fi
-    done
-  fi])
-
-  m4_if([$1], [ext], [], [dnl
-  if test x$ac_success = xno; then
-    for switch in -std=c++11 -std=c++0x; do
-      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch])
-      AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
-                     $cachevar,
-        [ac_save_CXXFLAGS="$CXXFLAGS"
-         CXXFLAGS="$CXXFLAGS $switch"
-         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
-          [eval $cachevar=yes],
-          [eval $cachevar=no])
-         CXXFLAGS="$ac_save_CXXFLAGS"])
-      if eval test x\$$cachevar = xyes; then
-        CXXFLAGS="$CXXFLAGS $switch"
-        ac_success=yes
-        break
-      fi
-    done
-  fi])
-  AC_LANG_POP([C++])
-  if test x$ax_cxx_compile_cxx11_required = xtrue; then
-    if test x$ac_success = xno; then
-      AC_MSG_ERROR([*** A compiler with support for C++11 language features is required.])
-    fi
-  else
-    if test x$ac_success = xno; then
-      HAVE_CXX11=0
-      AC_MSG_NOTICE([No compiler with C++11 support was found])
-    else
-      HAVE_CXX11=1
-      AC_DEFINE(HAVE_CXX11,1,
-                [define if the compiler supports basic C++11 syntax])
-    fi
-
-    AC_SUBST(HAVE_CXX11)
-  fi
-])
-
-AC_DEFUN([AX_CXX_COMPILE_STDCXX_14], [dnl
-  m4_if([$1], [], [],
-        [$1], [ext], [],
-        [$1], [noext], [],
-        [m4_fatal([invalid argument `$1' to AX_CXX_COMPILE_STDCXX_14])])dnl
-  m4_if([$2], [], [ax_cxx_compile_cxx14_required=true],
-        [$2], [mandatory], [ax_cxx_compile_cxx14_required=true],
-        [$2], [optional], [ax_cxx_compile_cxx14_required=false],
-        [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX_14])])dnl
-  AC_LANG_PUSH([C++])dnl
-  ac_success=no
-  AC_CACHE_CHECK(whether $CXX supports C++14 features by default,
-  ax_cv_cxx_compile_cxx14,
-  [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
-    [ax_cv_cxx_compile_cxx14=yes],
-    [ax_cv_cxx_compile_cxx14=no])])
-  if test x$ax_cv_cxx_compile_cxx14 = xyes; then
-    ac_success=yes
-  fi
-
-  m4_if([$1], [noext], [], [dnl
-  if test x$ac_success = xno; then
-    for switch in -std=gnu++14 -std=gnu++0y; do
-      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx14_$switch])
-      AC_CACHE_CHECK(whether $CXX supports C++14 features with $switch,
-                     $cachevar,
-        [ac_save_CXXFLAGS="$CXXFLAGS"
-         CXXFLAGS="$CXXFLAGS $switch"
-         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
-          [eval $cachevar=yes],
-          [eval $cachevar=no])
-         CXXFLAGS="$ac_save_CXXFLAGS"])
-      if eval test x\$$cachevar = xyes; then
-        CXXFLAGS="$CXXFLAGS $switch"
-        ac_success=yes
-        break
-      fi
-    done
-  fi])
-
-  m4_if([$1], [ext], [], [dnl
-  if test x$ac_success = xno; then
-    for switch in -std=c++14 -std=c++0y; do
-      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx14_$switch])
-      AC_CACHE_CHECK(whether $CXX supports C++14 features with $switch,
-                     $cachevar,
-        [ac_save_CXXFLAGS="$CXXFLAGS"
-         CXXFLAGS="$CXXFLAGS $switch"
-         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
-          [eval $cachevar=yes],
-          [eval $cachevar=no])
-         CXXFLAGS="$ac_save_CXXFLAGS"])
-      if eval test x\$$cachevar = xyes; then
-        CXXFLAGS="$CXXFLAGS $switch"
-        ac_success=yes
-        break
-      fi
-    done
-  fi])
-  AC_LANG_POP([C++])
-  if test x$ax_cxx_compile_cxx14_required = xtrue; then
-    if test x$ac_success = xno; then
-      AC_MSG_ERROR([*** A compiler with support for C++14 language features is required.])
-    fi
-  else
-    if test x$ac_success = xno; then
-      HAVE_CXX14=0
-      AC_MSG_NOTICE([No compiler with C++14 support was found])
-      AX_CXX_COMPILE_STDCXX_11([$1], [optional])
-    else
-      HAVE_CXX11=1
-      HAVE_CXX14=1
-      AC_DEFINE(HAVE_CXX14,1,
-                [define if the compiler supports basic C++14 syntax])
-      AC_DEFINE(HAVE_CXX11,1,
-                [define if the compiler supports basic C++14 syntax])
-    fi
-    AC_SUBST(HAVE_CXX11)
-    AC_SUBST(HAVE_CXX14)
-  fi
-])
-
-AC_DEFUN([AX_REQUIRE_STDCXX_11], [
-  if test x${HAVE_CXX11} != x1; then
-    AC_MSG_ERROR([*** A compiler with support for C++11 language features is required.])
-  fi
-])
-
-AC_DEFUN([AX_REQUIRE_STDCXX_14], [
-  if test x${HAVE_CXX14} != x1; then
-    AC_MSG_ERROR([*** A compiler with support for C++14 language features is required.])
-  fi
-])

ax_init_standard_project.m4

@@ -170,9 +170,11 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
   AX_SUBST(NUMBERS)
   AX_SUBST(HOME)
   if test -f README.md; then
+    README_FILE=README.md
     README=$(tail -n +3 README.md)
     DESCRIPTION=$(head -1 README.md | sed 's,^#\+ *,,;s, *#\+$,,')
   else
+    README_FILE=README
     README=$(tail -n +3 README)
     DESCRIPTION=$(head -1 README)
   fi
@@ -182,6 +184,7 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
   else
     README_HTML="${README}"
   fi
+  AX_SUBST(README_FILE)
   AX_SUBST(README)
   _AM_SUBST_NOTMAKE([README])
   AX_SUBST(README_ESCAPED)
@@ -218,8 +221,17 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
   AX_SUBST(AUTHOR_URL)
   AX_SUBST(AUTHOR_MAIL)
   AX_SUBST(PACKAGER)
-  #PROJECT_URL="${PROJECT_URL:-${AUTHOR_URL}}"
-  SOURCE_DOWNLOAD="${SOURCE_DOWNLOAD:-${AUTHOR_URL}/downloads/${PACKAGE_NAME}}"
+  PROJECT_URL="${PROJECT_URL:-${AUTHOR_URL}}"
+  for path in . .. ../.. ../../..; do
+    if test -d ${path}/.svn; then
+      PROJECT_URL="$(LANG= svn info | sed -n 's,^Repository Root: ,,p')"
+      break
+    elif test -d ${path}/.git; then
+      PROJECT_URL="$(git remote get-url origin)"
+      break
+    fi
+  done
+  SOURCE_DOWNLOAD="${SOURCE_DOWNLOAD:-${PROJECT_URL}}"
   AX_SUBST(PROJECT_URL)
   AX_SUBST(SOURCE_DOWNLOAD)
   VENDOR=$((lsb_release -is 2>/dev/null || echo unknown) | tr ' ' '_')
@@ -320,7 +332,7 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
   AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-standard-project-targets], [makefile.in])
   test -f makefile.in && cat >> makefile.in <<EOF
 #### Begin: Appended by $0
-EXTRA_DIST += bootstrap.sh ax_init_standard_project.m4 ax_cxx_compile_stdcxx_11.m4 \
+EXTRA_DIST += bootstrap.sh ax_init_standard_project.m4 ax_cxx_compile_stdcxx.m4 \
               ax_check_qt.m4 resolve-debbuilddeps.sh resolve-rpmbuilddeps.sh \
               build-resource-file.sh mac-create-app-bundle.sh
 
@@ -338,9 +350,9 @@ EOF
 
 # use this in configure.ac to support C++
 AC_DEFUN([AX_USE_CXX], [
-  m4_include(ax_cxx_compile_stdcxx_11.m4)
+  m4_include(ax_cxx_compile_stdcxx.m4)
   AC_LANG(C++)
-  AX_CXX_COMPILE_STDCXX_14(noext, optional)
+  AX_CXX_COMPILE_STDCXX([17], [noext], [optional])
   AC_PROG_CXX
   AC_PROG_CPP
 
@@ -353,7 +365,7 @@ AC_DEFUN([AX_USE_CXX], [
   CXXFLAGS="${CXXFLAGS//-g -O2/}"
   CFLAGS="${CFLAGS//-g -O2/}"
 
-# pass compile flags to make distcheck
+  # pass compile flags to make distcheck
   AM_DISTCHECK_CONFIGURE_FLAGS="CXXFLAGS='${CXXFLAGS}' CPPFLAGS='${CPPFLAGS}' CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'"
   AC_SUBST(AM_DISTCHECK_CONFIGURE_FLAGS)
 
@@ -379,6 +391,20 @@ maintainer-clean-cxx-targets:
 EOF
 ])
 
+# require specific C++ version
+AC_DEFUN([AX_USE_CXX_11], [
+  AX_USE_CXX
+  AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory])
+])
+AC_DEFUN([AX_USE_CXX_14], [
+  AX_USE_CXX
+  AX_CXX_COMPILE_STDCXX([14], [noext], [mandatory])
+])
+AC_DEFUN([AX_USE_CXX_17], [
+  AX_USE_CXX
+  AX_CXX_COMPILE_STDCXX([17], [noext], [mandatory])
+])
+
 # use this in configure.ac to support old school C
 AC_DEFUN([AX_USE_C], [
   AC_LANG(C)
@@ -625,7 +651,6 @@ AC_DEFUN([AX_USE_DOXYGEN], [
   AC_CHECK_PROG(have_doxygen, doxygen, yes, no)
   AC_CHECK_PROG(have_dot, dot, yes, no)
   AC_CHECK_PROG(have_mscgen, mscgen, yes, no)
-  AM_CONDITIONAL(NEED_PLANTUML, test "$have_doxygen" = "yes" -a "1.8.11" != $((echo "1.8.11"; doxygen -v 2>/dev/null) | sort -V | head -1))
   PDF_DOC=${PACKAGE_NAME}-${PACKAGE_VERSION}.pdf
   AC_SUBST(PDF_DOC)
   if test "$have_doxygen" = "no"; then
@@ -650,28 +675,12 @@ AC_DEFUN([AX_USE_DOXYGEN], [
   AX_ADD_MAKEFILE_TARGET_DEP([.PHONY], [pdf gen-uml-images], [doc/makefile.in])
   test -f doc/makefile.in && cat >> doc/makefile.in <<EOF
 #### Begin: Appended by $0
-doc: doxyfile @NEED_PLANTUML_TRUE@ gen-uml-images
-	@NEED_PLANTUML_TRUE@ doxyadd() { grep -q "\$\$[1] += \$\$[2]" doxyfile || sed -i '/^'"\$\$[1]"' *=/a'"\$\$[1]"' += '"\$\$[2]" doxyfile; }; \\
-	@NEED_PLANTUML_TRUE@ doxyadd ALIASES '"startuml{1}=@image html \\\\1\\\\n@image latex \\\\1\\\\n\\\\if DontIgnorePlantUMLCode"'; \\
-	@NEED_PLANTUML_TRUE@ doxyadd ALIASES '"enduml=\\\\endif"'; \\
-	@NEED_PLANTUML_TRUE@ doxyadd IMAGE_PATH '"gen-uml-images"';
+doc: doxyfile
 	doxygen doxyfile
 @PEDANTIC_TRUE@	test \! -s doxygen.errors
 
-@NEED_PLANTUML_TRUE@EXTRA_DIST = ${EXTRA_DIST} plantuml.jar
-@NEED_PLANTUML_TRUE@
-@NEED_PLANTUML_TRUE@gen-uml-images:
-@NEED_PLANTUML_TRUE@	test -d gen-uml-images || mkdir gen-uml-images
-@NEED_PLANTUML_TRUE@	eval \$\$(sed -n 's, *INPUT *\\(+\\?\\)= *\\(.*\\),INPUT\\1=" \\2",gp' doxyfile); \\
-@NEED_PLANTUML_TRUE@	eval \$\$(sed -n 's, *FILE_PATTERNS *\\(+\\?\\)= *\\(.*\\),FILE_PATTERNS\\1=" \\2",gp' doxyfile); \\
-@NEED_PLANTUML_TRUE@	SOURCES="**.("\$\$(echo \$\${FILE_PATTERNS} | sed 's,*.,,g;s, ,|,g')")"; \\
-@NEED_PLANTUML_TRUE@	for src in \$\$INPUT; do \\
-@NEED_PLANTUML_TRUE@	  java  -Djava.awt.headless=true -jar \${top_srcdir}/doc/plantuml.jar -v -o \$\$(pwd)/gen-uml-images "\$\$src/\$\$SOURCES"; \\
-@NEED_PLANTUML_TRUE@	done
-
 clean-documentation:
 	-rm doxygen.errors @PDF_DOC@
-	@NEED_PLANTUML_TRUE@ -rm -rf gen-uml-images
 distclean-documentation:
 	-rm -r html
 	-rm  @PACKAGE_NAME@.doxytag
@@ -858,7 +867,7 @@ AC_DEFUN([AX_PKG_REQUIRE], [
   DEV_DIST_PKG=
   pkg=m4_default([$2], [$1])
   $6
-  dep_pkg=${DEV_DEB_DIST_PKG:-${DEV_DIST_PKG:-${pkg}}-dev}
+  deb_pkg=${DEV_DEB_DIST_PKG:-${DEV_DIST_PKG:-${pkg}}-dev}
   rpm_pkg=${DEV_RPM_DIST_PKG:-${DEV_DIST_PKG:-${pkg}}-devel}
   if test -n "$4"; then
     for f in $pkg $4; do
@@ -953,8 +962,8 @@ AC_DEFUN([AX_PKG_CHECK], [
 #    $2 = pathes to search for
 AC_DEFUN([AX_REQUIRE_HEADER], [
   AC_CHECK_HEADER($1, [], [
+    found=0
     if test -n "$2"; then
-      found=0
       for d in $2; do
         if test -f "${d}/$1"; then
           AC_MSG_NOTICE([found file ${d}/$1])
@@ -1083,24 +1092,21 @@ AC_DEFUN([AX_DEB_DEPEND_IFEXISTS], [
 #  - parameter:
 #     $1 = package name
 AC_DEFUN([AX_DEB_BUILD_DEPEND], [
-  pkg="$1"
-  DEB_BUILD_DEPEND="${DEB_BUILD_DEPEND}, ${pkg}"
+  DEB_BUILD_DEPEND="${DEB_BUILD_DEPEND}, $1"
 ])
 
 # require package in debian/control.in append @DEB_DEPEND@ to Depends
 #  - parameter:
 #     $1 = package name
 AC_DEFUN([AX_DEB_DEPEND], [
-  pkg="$1"
-  DEB_DEPEND="${DEB_DEPEND}, ${pkg}"
+  DEB_DEPEND="${DEB_DEPEND}, $1"
 ])
 
 # require package in debian/control.in append @DEB_DEPEND@ to Depends
 #  - parameter:
 #     $1 = package name
 AC_DEFUN([AX_DEB_SECTION], [
-  pkg="$1"
-  DEB_SECTION="${pkg}"
+  DEB_SECTION="$1"
 ])
 
 # call after setting debian dependencies
@@ -1132,19 +1138,17 @@ AC_DEFUN([AX_RPM_DEPEND_IFEXISTS], [
 #  - parameter:
 #     $1 = package name
 AC_DEFUN([AX_RPM_BUILD_DEPEND], [
-  pkg="$1"
-  RPM_BUILD_DEPEND="${RPM_BUILD_DEPEND}, ${pkg}"
+  RPM_BUILD_DEPEND="${RPM_BUILD_DEPEND}, $1"
 ])
 
 # require package in .spec.in append @RPM_DEPEND@ to Depends
 #  - parameter:
 #     $1 = package name
 AC_DEFUN([AX_RPM_DEPEND], [
-  pkg="$1"
   if test -z "${RPM_DEPEND}"; then
-    RPM_DEPEND="${pkg}"
+    RPM_DEPEND="$1"
   else
-    RPM_DEPEND="${RPM_DEPEND}, ${pkg}"
+    RPM_DEPEND="${RPM_DEPEND}, $1"
   fi
 ])
 
@@ -1152,8 +1156,7 @@ AC_DEFUN([AX_RPM_DEPEND], [
 #  - parameter:
 #     $1 = package name
 AC_DEFUN([AX_RPM_GROUP], [
-  pkg="$1"
-  RPM_GROUP="${pkg}"
+  RPM_GROUP="$1"
 ])
 
 # call after setting rpmian dependencies
@@ -1194,6 +1197,15 @@ AC_DEFUN([AX_ALL_BUILD_DEPEND], [
   RPM_BUILD_DEPEND="${RPM_BUILD_DEPEND}, ${pkg}"
 ])
 
+# require package in .spec.in and control.in, append to runtime depends
+#  - parameter:
+#     $1 = package name
+AC_DEFUN([AX_ALL_DEPEND], [
+  pkg="$1"
+  DEB_DEPEND="${DEB_DEPEND}, ${pkg}"
+  RPM_DEPEND="${RPM_DEPEND}, ${pkg}"
+])
+
 # require package in .spec.in append @ALL_BUILD_DEPEND@ to Build-Depends
 #  - parameter:
 #     $1 = package name

bootstrap.sh

@@ -129,9 +129,8 @@ GENERATED FILES
     * ${MY_NAME}
     * autogen.sh - just the basics to initialize auto tools and create configure
     * ax_init_standard_project.m4 - auxiliary macro definition file
-    * ax_cxx_compile_stdcxx_11.m4 - auxiliary macro definition file
+    * ax_cxx_compile_stdcxx.m4 - auxiliary macro definition file
     * ax_check_qt.m4 - auxiliary macro definition file
-    * makefile_test.inc.am - makefile to be included in tests
     * resolve-debbuilddeps.sh - script to install debian package dependencies
     * resolve-rpmbuilddeps.sh - script to install RPM package dependencies
     * build-in-docker.sh - script to build the project encapsulated in a docker container
@@ -274,7 +273,7 @@ FILES
       * Enable C++ testing using CppUnit: AX_USE_CPPUNIT
       * Enable other tests: AX_BUILD_TEST
       * Enable C++ examples, i.e. for libraries: AX_BUILD_EXAMPLES
-      * Check for C++11 support: AX_CXX_COMPILE_STDCXX_11 (see ax_cxx_compile_stdcxx_11.m4)
+      * Require C++17 support: AX_CXX_COMPILE_STDCXX([17], [noext], [mandatory]) (see ax_cxx_compile_stdcxx.m4)
       * Require a QT module: AX_REQUIRE_QT (see ax_check_qt.m4)
       * Optionally use a QT module: AX_CHECK_QT  (see ax_check_qt.m4)
       * Require a module: AX_PKG_REQUIRE (see ax_init_standard_project.m4)
@@ -450,7 +449,7 @@ checkdir() {
     if ! test -d "$1"; then # create path
         run mkdir -p "$1"
         if test -n "${VCS}" -a $novcs -eq 0 && ! contains "$1" "${excludevcs[@]}"; then
-            run ${VCS} add "$1"
+            run --no-check ${VCS} add "$1"
         fi
     fi
 }
@@ -498,7 +497,7 @@ to() {
     run chmod $mode $1
     if test $exists -eq 0; then
         if test -n "${VCS}" -a $novcs -eq 0 && ! contains "$1" "${excludevcs[@]}"; then
-            run ${VCS} add "$1"
+            run --no-check ${VCS} add "$1"
             if test "${VCS}" = "svn"; then
                 run svn propset svn:keywords "Id" "$1"
             fi
@@ -523,10 +522,14 @@ copy() {
     if test "${1%/*}" != "$1"; then
         test -d "${1%/*}" || svn mkdir "${1%/*}"
     fi
+    if ! test -e "${source}"; then
+        ignored "$1" not found
+        return
+    fi
     run cp "${source}" "$1"
     if test $exists -eq 0; then
         if test -n "${VCS}" -a $novcs -eq 0 && ! contains "$1" "${excludevcs[@]}"; then
-            run ${VCS} add "$1"
+            run --no-check ${VCS} add "$1"
             if test "${VCS}" = "svn"; then
                 run svn propset svn:keywords "Id" "$1"
             fi
@@ -575,7 +578,7 @@ vcs2cl() {
     fi
     if test $exists -eq 0; then
         if test -n "${VCS}" -a $novcs -eq 0 && ! contains "ChangeLog" "${excludevcs[@]}"; then
-            run ${VCS} add ChangeLog
+            run --no-check ${VCS} add ChangeLog
         fi
     fi
 }
@@ -591,9 +594,8 @@ fi
 # Initialize the environment:
 copy ${MY_NAME}
 copy ax_init_standard_project.m4
-copy ax_cxx_compile_stdcxx_11.m4
+copy ax_cxx_compile_stdcxx.m4
 copy ax_check_qt.m4
-copy makefile_test.inc.am
 copy resolve-debbuilddeps.sh
 copy resolve-rpmbuilddeps.sh
 copy build-in-docker.sh
@@ -1352,7 +1354,7 @@ ${HEADER}AM_CPPFLAGS = -I\${top_srcdir}/src -I\${top_builddir}/src
 AM_LDFLAGS = -L\${abs_top_builddir}/src/.libs
 LDADD = -l${PACKAGE_NAME#lib}
 
-exampledir = ${docdir}/examples
+exampledir = \${docdir}/examples
 example_DATA = 
 
 MAINTAINERCLEANFILES = makefile.in
@@ -1505,9 +1507,10 @@ if testtag AX_USE_DOXYGEN; then
     if ! checkfile doc/doxyfile.in || \
         contains doc/doxyfile.in "${rebuildfiles[@]}"; then
         run doxygen -g doc/doxyfile.in
+        sed -i ':a;/\\$/{s///;N;s/ *\n */ /g;ba}' doc/doxyfile.in
         if test $exists -eq 0; then
             if test -n "${VCS}" -a $novcs -eq 0 && ! contains "doc/doxyfile" "${excludevcs[@]}"; then
-                run ${VCS} add doc/doxyfile.in
+                run --no-check ${VCS} add doc/doxyfile.in
                 if test "${VCS}" = "svn"; then
                     run svn propset svn:keywords "Id" doc/doxyfile.in
                 fi
@@ -1548,6 +1551,7 @@ if testtag AX_USE_DOXYGEN; then
         doxyreplace WARN_IF_UNDOCUMENTED NO
         doxyreplace WARN_LOGFILE doxygen.errors
         doxyreplace INPUT "@top_srcdir@/src"
+        doxyadd INPUT "@top_srcdir@/@README_FILE@"
         if testtag AX_USE_SCRIPTS; then
             doxyadd INPUT "@top_srcdir@/scripts"
         fi
@@ -1562,6 +1566,7 @@ if testtag AX_USE_DOXYGEN; then
             doxyadd EXCLUDE "@top_srcdir@/nodejs/node_modules"
 	    doxyadd EXCLUDE "@top_srcdir@/nodejs/public/javascripts/ext"
         fi
+        doxyreplace USE_MDFILE_AS_MAINPAGE "@top_srcdir@/@README_FILE@"
         doxyreplace FILE_PATTERNS '*.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.idl *.ddl *.odl *.h *.hh *.hxx *.hpp *.h++ *.cs *.d *.php *.php4 *.php5 *.phtml *.inc *.m *.markdown *.md *.mm *.dox *.py *.f90 *.f *.for *.tcl *.vhd *.vhdl *.ucf *.qsf *.as *.js *.wt *.sql'
         doxyreplace RECURSIVE YES
         doxyreplace EXCLUDE_PATTERNS "moc_* uic_* qrc_* version.[ch]xx"
@@ -1571,9 +1576,7 @@ if testtag AX_USE_DOXYGEN; then
         doxyreplace HTML_DYNAMIC_SECTIONS YES
         doxyreplace DISABLE_INDEX NO
         doxyreplace GENERATE_TREEVIEW YES 
-        if testtag AX_BUILD_EXAMPLES; then
-            doxyreplace EXAMPLE_PATH @top_srcdir@/examples
-        fi
+        doxyreplace EXAMPLE_PATH @top_srcdir@
         doxyreplace EXAMPLE_RECURSIVE YES
         doxyreplace FILTER_PATTERNS '*.wt=doxygen-webtester.sed *.sql=@top_srcdir@/sql-to-dot.sed'
         doxyreplace SOURCE_BROWSER YES
@@ -1605,8 +1608,8 @@ if testtag AX_USE_DEBIAN_PACKAGING; then
 
  -- @PACKAGER@  @BUILD_DATE@
 EOF
-    RUN_DEPENDS="$(if testtag AX_USE_NODEJS; then echo -n ", nodejs, npm"; fi)"
-    BUILD_DEPENDS="debhelper, fakeroot, ${VCSDEPENDS_DEB} pkg-config, automake, libtool, autotools-dev, pandoc, lsb-release$(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz, mscgen, default-jre-headless|default-jre"; fi; if testtag AX_USE_PERLDOC; then echo -n ", libpod-tree-perl"; fi; if testtag AX_USE_CPPUNIT; then echo -n ", libcppunit-dev"; fi; if testtag AX_CXX_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n ", qt5-default | libqt4-core | libqtcore4, qt5-qmake | qt4-qmake, qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools"; fi)"
+    RUN_DEPENDS="$(if testtag AX_USE_NODEJS; then echo -n ", nodejs, npm,"; fi)"
+    BUILD_DEPENDS="gnupg, debhelper, fakeroot, ${VCSDEPENDS_DEB} pkg-config, automake, libtool, libltdl-dev, autotools-dev, pandoc, lsb-release$(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz, mscgen, default-jre-headless|default-jre"; fi; if testtag AX_USE_PERLDOC; then echo -n ", libpod-tree-perl"; fi; if testtag AX_USE_CPPUNIT; then echo -n ", libcppunit-dev"; fi; if testtag AX_CXX_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n ", qt5-default | libqt4-core | libqtcore4, qt5-qmake | qt4-qmake, qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools, qttools5-dev | qt4-dev,"; fi)"
     to debian/control.in <<EOF
 Source: @PACKAGE_NAME@
 Priority: extra
@@ -1646,6 +1649,9 @@ usr/lib/lib*.so
 usr/lib/pkgconfig/*
 usr/lib/*.la
 usr/share/doc/${PACKAGE_NAME}/html
+$(if testtag AX_BUILD_EXAMPLES; then
+  echo usr/share/doc/${PACKAGE_NAME}/examples
+fi)
 EOF
     to --mode "u=rwx,g=rwx,o=rx" debian/rules <<EOF
 ${HEADER}%:
@@ -1871,7 +1877,7 @@ desktop_DATA = @PACKAGE_DESKTOP@
 dist_pkgdata_DATA = @PACKAGE_ICON@
 dist_noinst_DATA = ax_check_qt.m4 bootstrap.sh				\\
                    resolve-rpmbuilddeps.sh autogen.sh			\\
-                    ax_cxx_compile_stdcxx_11.m4 build-in-docker.sh	\\
+                    ax_cxx_compile_stdcxx.m4 build-in-docker.sh	        \\
                     build-resource-file.sh				\\
                     ax_init_standard_project.m4				\\
                     mac-create-app-bundle.sh resolve-debbuilddeps.sh    \\

build-in-docker.sh

@@ -6,8 +6,8 @@ myarch=$(dpkg --print-architecture)
 if test "${arch}" = "amd64"; then
     myarch="amd64|i386"
 fi
-mode="deb"
-img="mwaeckerlin/ubuntu:latest"
+mode=
+img=
 repos=()
 keys=()
 dns=()
@@ -81,24 +81,27 @@ while test $# -gt 0; do
             echo
             exit 0
             ;;
-        (-m|--mode) shift;
+        (-m|--mode)
+            shift;
             mode="$1"
-            case "$mode" in
-                (deb|apt) img="mwaeckerlin/ubuntu:latest";;
-                (rpm|zypper) img="opensuse:latest";;
-                (yum) img="centos:latest";;
-                (dnf) img="fedora:latest";;
-                (win)
-                    img="mwaeckerlin/ubuntu:latest"; host="${host:---host=i686-w64-mingw32}"
-                    targets="all install"
-                    flags+=("--prefix=/workdir/usr")
-                    packages+=("mingw-w64")
-                    ;;
-                (*)
-                    echo "**** ERROR: unknown mode '$1', try --help" 1>&2
-                    exit 1
-                    ;;
-            esac
+            if test -z "$img"; then
+                case "$mode" in
+                    (deb|apt) img="mwaeckerlin/debbuildenv";;
+                    (rpm|zypper) img="opensuse:latest";;
+                    (yum) img="centos:latest";;
+                    (dnf) img="fedora:latest";;
+                    (win)
+                        img="mwaeckerlin/debbuildenv"; host="${host:---host=i686-w64-mingw32}"
+                        targets="all install"
+                        flags+=("--prefix=/workdir/usr")
+                        packages+=("mingw-w64")
+                        ;;
+                    (*)
+                        echo "**** ERROR: unknown mode '$1', try --help" 1>&2
+                        exit 1
+                        ;;
+                esac
+            fi
             ;;
         (-i|--image) shift;
             img="$1"
@@ -200,11 +203,25 @@ function ifthenelse() {
     arg="$1"
     shift
     cmd="$*"
-    DISTRIBUTOR=$(docker exec ${DOCKER_ID} lsb_release -si | sed 's, .*,,' | tr [:upper:] [:lower:])
+    DISTRIBUTOR=$(docker exec ${DOCKER_ID} lsb_release -si | sed 's, .*,,;s,.*,\L&,g')
     CODENAME=$(docker exec ${DOCKER_ID} lsb_release -cs)
     ARCH=$((docker exec ${DOCKER_ID} which dpkg > /dev/null 2> /dev/null && docker exec ${DOCKER_ID} dpkg --print-architecture) || echo amd64)
+    case "$DISTRIBUTOR" in
+        (opensuse) # code name may be not available, then set leap or tumbleweed
+            if test "$CODENAME" = "n/a"; then
+                CODENAME=$(docker exec ${DOCKER_ID} lsb_release -ds | sed "s,\($(docker exec ${DOCKER_ID} lsb_release -si | sed 's, ,\\|,g')\) *,,"';s, .*,,g;s,",,g;s,.*,\L&,g')
+            fi
+            ;;
+        (fedora|mageia) # numeric code name
+            CODENAME=$(docker exec ${DOCKER_ID} lsb_release -rs)
+            ;;
+        (centos) # only look at major number in centos
+            CODENAME=$(docker exec ${DOCKER_ID} lsb_release -rs | sed 's,\..*,,')
+            ;;
+    esac
     if test "${arg/:::/}" = "${arg}"; then
-        docker exec ${DOCKER_ID} bash -c "${cmd//ARG/${arg//@DISTRIBUTOR@/${DISTRIBUTOR}}}"
+        cmd_tmp="${cmd//ARG/${arg//@DISTRIBUTOR@/${DISTRIBUTOR}}}"
+        docker exec ${DOCKER_ID} bash -c "${cmd_tmp//@CODENAME@/${CODENAME}}"
     else
         os="${arg%%:::*}"
         thenpart="${arg#*:::}"
@@ -215,11 +232,13 @@ function ifthenelse() {
         fi
         if [[ "${DISTRIBUTOR}-${CODENAME}-${ARCH}" =~ ${os} ]]; then
             if test -n "${thenpart}"; then
-                docker exec ${DOCKER_ID} bash -c "${cmd//ARG/${thenpart//@DISTRIBUTOR@/${DISTRIBUTOR}}}"
+                cmd_tmp="${cmd//ARG/${thenpart//@DISTRIBUTOR@/${DISTRIBUTOR}}}"
+                docker exec ${DOCKER_ID} bash -c "${cmd_tmp//@CODENAME@/${CODENAME}}"
             fi
         else
             if test -n "${elsepart}"; then
-                docker exec ${DOCKER_ID} bash -c "${cmd//ARG/${elsepart//@DISTRIBUTOR@/${DISTRIBUTOR}}}"
+                cmd_tmp="${cmd//ARG/${elsepart//@DISTRIBUTOR@/${DISTRIBUTOR}}}"
+                docker exec ${DOCKER_ID} bash -c "${cmd_tmp//@CODENAME@/${CODENAME}}"
             fi
         fi
     fi
@@ -227,6 +246,9 @@ function ifthenelse() {
 
 set -x
 
+if test -z "$img"; then
+    img="mwaeckerlin/debbuildenv"
+fi
 docker pull $img
 DOCKER_ID=$(docker create ${dns[@]} ${dirs[@]} ${envs[@]} -w /workdir $img sleep infinity)
 trap 'traperror '"${DOCKER_ID}"' "$? ${PIPESTATUS[@]}" $LINENO $BASH_LINENO "$BASH_COMMAND" "${FUNCNAME[@]}" "${FUNCTION}"' SIGINT INT TERM EXIT
@@ -241,38 +263,45 @@ if ! docker exec ${DOCKER_ID} getent passwd $(id -u) > /dev/null 2>&1; then
     docker exec ${DOCKER_ID} useradd -m -u $(id -u) -g $(id -g) -d"${HOME}" $(id -un)
 fi
 docker exec ${DOCKER_ID} chown $(id -u):$(id -g) "${HOME}"
-case $mode in
+if test -z "$mode"; then
+    case "$targets" in
+        (*deb*) mode=deb;;
+        (*rpm*) mode=rpm;;
+        (*) case "$img" in
+                (*deb*|*ubuntu*|*debian*|*mint*) mode=deb;;
+                (*rpm*|*fedora*|*centos*|*mageia*) mode=rpm;;
+                (*mingw*|*win*) mode=win;;
+                (*) mode=deb;;
+            esac;;
+    esac
+fi
+case "$mode" in
     (deb|apt|win)
+        OPTIONS='-o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confnew -y --force-yes --no-install-suggests --no-install-recommends'
+        docker exec ${DOCKER_ID} apt-get update ${OPTIONS}
+        #docker exec ${DOCKER_ID} apt-get upgrade ${OPTIONS}
+        docker exec ${DOCKER_ID} apt-get install ${OPTIONS} python-software-properties software-properties-common apt-transport-https dpkg-dev lsb-release wget || \
+            docker exec ${DOCKER_ID} apt-get install ${OPTIONS} software-properties-common apt-transport-https dpkg-dev lsb-release wget || \
+            docker exec ${DOCKER_ID} apt-get install ${OPTIONS} python-software-properties apt-transport-https dpkg-dev lsb-release wget;
         if [[ "${img}" =~ "ubuntu" ]]; then
+            docker exec ${DOCKER_ID} apt-get install ${OPTIONS} locales
             docker exec ${DOCKER_ID} locale-gen ${LANG}
             docker exec ${DOCKER_ID} update-locale LANG=${LANG}
         fi
-        OPTIONS='-o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confnew -y --force-yes --no-install-suggests --no-install-recommends'
-        PREVENT='libpam-systemd policykit.* colord dconf-service'
-        for f in ${PREVENT}; do
-            docker exec ${DOCKER_ID} bash -c "echo 'Package: ${f}' >> /etc/apt/preferences"
-            docker exec ${DOCKER_ID} bash -c "echo 'Pin-Priority: -100' >> /etc/apt/preferences"
-            docker exec ${DOCKER_ID} bash -c "echo >> /etc/apt/preferences"
-        done
-        docker exec ${DOCKER_ID} apt-get update ${OPTIONS}
-        docker exec ${DOCKER_ID} apt-mark hold ${PREVENT}
-        docker exec ${DOCKER_ID} apt-get upgrade ${OPTIONS}
-        docker exec ${DOCKER_ID} apt-get install ${OPTIONS} ${PREVENT// /- }- python-software-properties software-properties-common apt-transport-https dpkg-dev lsb-release wget || \
-            docker exec ${DOCKER_ID} apt-get install ${OPTIONS} ${PREVENT// /- }- software-properties-common apt-transport-https dpkg-dev lsb-release wget || \
-            docker exec ${DOCKER_ID} apt-get install ${OPTIONS} ${PREVENT// /- }- python-software-properties apt-transport-https dpkg-dev lsb-release wget;
-        for key in "${keys[@]}"; do
-            wget -O- "$key" \
-                | docker exec -i ${DOCKER_ID} apt-key add -
-        done
+        if test -n "${keys[*]}"; then # fix dependency bug in cosmic and stretch
+            docker exec ${DOCKER_ID} apt-get install ${OPTIONS} gnupg
+            for key in "${keys[@]}"; do
+                wget -O- "$key" \
+                    | docker exec -i ${DOCKER_ID} apt-key add -
+            done
+        fi
         for repo in "${repos[@]}"; do
             ifthenelse "${repo}" "apt-add-repository 'ARG'"
         done
 
-
-
         docker exec ${DOCKER_ID} apt-get update ${OPTIONS}
         for package in "${packages[@]}"; do
-            ifthenelse "${package}" "apt-get install ${OPTIONS} ${PREVENT} ARG"
+            ifthenelse "${package}" "apt-get install ${OPTIONS} ARG"
         done
         for command in "${commands[@]}"; do
             ifthenelse "${command}" "ARG"
@@ -281,7 +310,7 @@ case $mode in
         ;;
     (rpm|yum|dnf|zypper|urpmi)
         if [[ "$img" =~ "centos" ]]; then
-            docker exec ${DOCKER_ID} yum install -y redhat-lsb
+            docker exec ${DOCKER_ID} yum install -y redhat-lsb epel-release
             docker exec -i ${DOCKER_ID} bash -c 'cat > /etc/yum.repos.d/wandisco-svn.repo' <<EOF
 [WandiscoSVN]
 name=Wandisco SVN Repo
@@ -293,7 +322,7 @@ gpgcheck=0
 EOF
         fi
         INSTALL_TOOL=$((docker exec ${DOCKER_ID} test -x /usr/bin/zypper && echo zypper install -y) ||  (docker exec ${DOCKER_ID} test -x /usr/bin/dnf && echo dnf install -y) || (docker exec ${DOCKER_ID} test -x /usr/bin/yum && echo yum install -y) || (docker exec ${DOCKER_ID} test -x /usr/sbin/urpmi && echo urpmi --auto))
-        if test "$INSTALL_TOOL" = "urpmi --auto"; then
+        if test "$INSTALL_TOOL" = "urpmi --auto" -o "$INSTALL_TOOL" = "zypper install -y"; then
             LSB_RELEASE=lsb-release
         else
             LSB_RELEASE=/usr/bin/lsb_release
@@ -309,8 +338,8 @@ EOF
             docker exec -i ${DOCKER_ID} rm rpm-key
         done
         for repo in "${repos[@]}"; do
-            INSTALL_REPO=$((docker exec ${DOCKER_ID} test -x /usr/bin/zypper && echo zypper ar) || (docker exec ${DOCKER_ID} test -x /usr/bin/dnf && echo dnf config-manager --add-repo) || (docker exec ${DOCKER_ID} test -x /usr/bin/yum && echo wget -O/etc/yum.repos.d/additional$i.repo) || (docker exec ${DOCKER_ID} test -x /usr/sbin/urpmi && echo false))
-            ifthenelse "${repo}" "${INSTALL_REPO} 'ARG'"
+            INSTALL_REPO=$((docker exec ${DOCKER_ID} test -x /usr/bin/zypper && echo zypper ar) || (docker exec ${DOCKER_ID} test -x /usr/bin/dnf && echo dnf config-manager --add-repo) || (docker exec ${DOCKER_ID} test -x /usr/bin/yum && echo yum-config-manager --add-repo) || (docker exec ${DOCKER_ID} test -x /usr/sbin/urpmi && echo false))
+            ifthenelse "${repo}" "${INSTALL_REPO} ARG"
             ((++i))
         done
         for package in "${packages[@]}"; do
@@ -328,3 +357,17 @@ for f in "${flags[@]}"; do
 done
           
 docker exec -u $(id -u):$(id -g) ${DOCKER_ID} ./bootstrap.sh -t "${targets}" ${host} "${FLAGS[@]}"
+
+# last check: try to install built deb or rpm files (if not already cleaned up)
+# not supported in trusty and jessie
+if test "$mode" = deb -a "${img//trusty/}" = "${img}" -a "${img//jessie/}" = "${img}"; then
+   if test "${targets//deb/}" != "${targets}" && ls *.deb > /dev/null 2> /dev/null; then
+       docker exec ${DOCKER_ID} bash -c "apt-get install ${OPTIONS} /workdir/*.deb"
+   fi
+fi
+if test "$mode" = rpm -a "${targets//rpm/}" != "${targets}"; then
+    if ls *.rpm > /dev/null 2> /dev/null; then
+        docker exec ${DOCKER_ID} bash -c "${INSTALL_TOOL} /workdir/*.rpm"
+    fi
+fi
+echo "done."

configure.ac

@@ -8,8 +8,9 @@
 
 # change this:
 m4_define(x_package_name, webtester) # project's name
-m4_define(x_major, 2) # project's major version
-m4_define(x_minor, 2) # project's minor version
+m4_define(x_major, 3) # project's major version
+m4_define(x_minor, 1) # project's minor version
+m4_define(x_least_diff, 129)
 
 # never edit this block:
 m4_include(ax_init_standard_project.m4)
@@ -18,7 +19,7 @@ AM_INIT_AUTOMAKE([1.9 tar-pax])
 AX_INIT_STANDARD_PROJECT
 
 # requirements, uncomment, what you need:
-AX_USE_CXX
+AX_USE_CXX_11
 #AX_USE_LIBTOOL
 AX_USE_SCRIPTS
 AX_USE_DOXYGEN
@@ -30,7 +31,7 @@ AX_BUILD_TEST
 AX_USE_ETC
 
 # language requirements
-AX_CXX_COMPILE_STDCXX_11
+AX_CXX_COMPILE_STDCXX([17], [noext], [mandatory])
 export QT_SELECT=5
 AC_SUBST(QT_SELECT)
 

docker/Dockerfile

@@ -1,13 +1,9 @@
-# docker build --pull --force-rm --rm -t dev0004:5000/library/webtester .
-# docker push dev0004:5000/libray/webtester
-FROM ubuntu:latest
+FROM mwaeckerlin/ubutu-base
 MAINTAINER "Marc Wäckerlin"
 
-RUN apt-get install -y wget software-properties-common apt-transport-https
-RUN apt-add-repository https://dev.marc.waeckerlin.org/repository
-RUN wget -O- https://dev.marc.waeckerlin.org/repository/PublicKey | apt-key add -
-RUN apt-get update -y
-RUN apt-get install -y xvfb webtester
+RUN apt-get update \
+ && apt-get install --no-install-recommends --no-install-suggests -y xvfb webtester \
+ && /cleanup.sh
 
 ADD runtests.sh runtests.sh
 

etc/wt-mode.el

@@ -25,7 +25,7 @@
 ;;   echo $(webrunner -h | sed -n 's,  COMMAND: ,,p') | sed 's, ,\\\\|,g'
 (defconst wt-font-lock-keywords
   (list
-   '("^ *\\(auth\\|ca-certificate\\|call\\|case\\|default\\|check\\|clear-cookies\\|click\\|clicktype\\|client-certificate\\|do\\|download\\|echo\\|execute\\|exists\\|exit\\|expect\\|fail\\|for\\|function\\|if\\|else\\|while\\|ignore\\|unignore\\|ignoreto\\|include\\|label\\|load\\|not\\|offline-storage-path\\|open\\|screenshot\\|set\\|setvalue\\|sleep\\|testcase\\|testsuite\\|timeout\\|unset\\|upload\\)\\b" . font-lock-builtin-face)
+   '("^ *\\(auth\\|ca-certificate\\|call\\|case\\|default\\|check\\|clear-cookies\\|click\\|clicktype\\|client-certificate\\|do\\|download\\|echo\\|execute\\|exists\\|exit\\|expect\\|fail\\|for\\|function\\|if\\|else\\|while\\|ignore\\|unignore\\|ignoreto\\|include\\|label\\|load\\|not\\|offline-storage-path\\|open\\|screenshot\\|set\\|setvalue\\|sleep\\|testcase\\|testsuite\\|timeout\\|timeout-false\\|unset\\|upload\\)\\b" . font-lock-builtin-face)
    '("^ *#.*$" . font-lock-comment-face))
   "Highlighting expressions for Webtester")
 

mac-create-app-bundle.sh

@@ -59,7 +59,7 @@ while [ $found -ne 0 ]; do
     cd "${target}"
     for file in $(find . -type f); do
         for lib in $(otool -L ${file} | tail -n +2 \
-            | egrep '/usr/local/|/opt/local/|'"${HOME}" \
+            | egrep '/usr/local/|/opt/local/|/opt/X11/|'"${HOME}" \
             | grep -v $file | awk '{print $1}'); do
             found=1
             test -f ${lib##*/} \
@@ -86,20 +86,19 @@ if test -n "${QTDIR}"; then
     fi
 fi
 
-# Step 5: copy or create info.plist
-infoplist=$(find ${apptarget}/Contents/Resources -name Info.plist)
-if test -f "${infoplist}"; then
-    cp -a "${infoplist}" ${apptarget}/Contents/Info.plist
+# Step 5: copy local or create new info.plist
+if test -f Info.plist; then
+    cp -a Info.plist ${apptarget}/Contents/Info.plist
 else
     cat > ${apptarget}/Contents/Info.plist <<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-  <dict>
+  <qdict>
     <key>CFBundleIdentifier</key>
     <string>${project}</string>
     <key>CFBundleExecutable</key>
-    <string>${executablefile##/}</string>
+    <string>${executablefile##*/}</string>
   </dict>
 </plist>
 EOF

makefile.am

@@ -15,12 +15,10 @@ desktop_DATA = @PACKAGE_DESKTOP@
 dist_pkgdata_DATA = @PACKAGE_ICON@
 dist_noinst_DATA = ax_check_qt.m4 bootstrap.sh				\
                    resolve-rpmbuilddeps.sh autogen.sh			\
-                    ax_cxx_compile_stdcxx_11.m4 build-in-docker.sh	\
-                    build-resource-file.sh				\
-                    ax_init_standard_project.m4				\
-                    mac-create-app-bundle.sh resolve-debbuilddeps.sh    \
-                    dependency-graph.sh template.sh                     \
-                    sql-to-dot.sed
+                   ax_cxx_compile_stdcxx.m4 build-in-docker.sh		\
+                   build-resource-file.sh ax_init_standard_project.m4	\
+                   mac-create-app-bundle.sh resolve-debbuilddeps.sh	\
+                   dependency-graph.sh template.sh sql-to-dot.sed
 dist_doc_DATA = AUTHORS NEWS README.md COPYING INSTALL ChangeLog
 
 README: README.md

resolve-rpmbuilddeps.sh

@@ -97,12 +97,12 @@ fi
 
 if test -n "${SCHROOTNAME}"; then
     FILES=$(LANG= schroot -c ${SCHROOTNAME} -- rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec  2>&1 | sed -n 's, is needed by.*,,p')
-    if test -n "${FILES}${DEPS}"; then
+    if test -n "${FILES// /}${DEPS// /}"; then
         schroot -c ${SCHROOTNAME} -u root -- ${INSTALL_TOOL}  ${FILES} ${DEPS}
     fi
 else
     FILES=$(LANG= rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p')
-    if test -n "${FILES}${DEPS}"; then
+    if test -n "${FILES// /}${DEPS// /}"; then
         ${INSTALL_TOOL} ${FILES} ${DEPS}
     fi
 fi
@@ -112,7 +112,7 @@ if test -n "${SCHROOTNAME}"; then
 else
     FILES=$(LANG= rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p')
 fi
-if test -n "${FILES}"; then
+if test -n "${FILES// /}"; then
     echo "**** ERROR: Cannot install: " $FILES
     exit 1
 fi

src/commands.hxx

@@ -32,6 +32,8 @@
 #include <memory>
 #include <sstream>
 #include <cassert>
+#include <istream>
+#include <ostream>
 #include <xml-cxx/xml.hxx>
 #include <mrw/stdext.hxx>
 
@@ -48,7 +50,8 @@ inline QString demangle(const char* mangled) {
   return QString(mangled);
 }
 #endif
-
+/* redefinition of ‘class std::optional<_Tp>’ */
+/*
 namespace std {
   template<typename T> class optional {
     private:
@@ -87,6 +90,7 @@ namespace std {
       }
   };
 }
+*/
 
 class Script;
 class Command;
@@ -208,24 +212,27 @@ class Command: public QObject {
     }
     QStringList quotedStrings(QString value,
                               QString delimiter = " ",
-                              bool keepDelimiters = false) const {
+                              bool keepDelimiters = false,
+                              unsigned int max = 0) const {
       QStringList res;
       QString quot("'\"");
+      unsigned int found(0);
       while (value=value.trimmed(), value.size()) {
         QRegularExpression re;
         int start(0);
         if (quot.contains(value[0])) {
-          re = QRegularExpression(value[0]+" *(("+delimiter+" *)|$)");
+          re = QRegularExpression(value[0]+" *((("+delimiter+") *)|$)");
           start = 1;
         } else {
-          re = QRegularExpression("( *"+delimiter+" *)|$");
+          re = QRegularExpression(" *((("+delimiter+") *)|$)");
         }
         int pos(value.indexOf(re, start));
         if (pos<start) throw BadArgument("quote missmatch in "+value);
         QRegularExpressionMatch m(re.match(value, start));
         res += value.mid(start, m.capturedStart()-start);
         value.remove(0, m.capturedEnd());
-        if (keepDelimiters && m.capturedLength()) res+=m.captured().mid(start).trimmed();
+        if (keepDelimiters && !m.captured(3).isEmpty()) res+=m.captured(3).trimmed();
+        if (++found==max) return value.isEmpty() ? res : res += value;
       }
       return res;
     }
@@ -278,7 +285,7 @@ class Empty: public Command {
     QString description() const {
       return
         ""
-        "\n\n"
+        "\n\n--\n\n"
         "Empty lines are allowed";
     }
     QString command() const {
@@ -306,7 +313,7 @@ class Comment: public Command {
     QString description() const {
       return
         "# comment"
-        "\n\n"
+        "\n\n--\n\n"
         "Comments are lines that start with #";
     }
     QString command() const {
@@ -383,7 +390,7 @@ class Screenshot: public Command {
     QString description() const {
       return
         tag()+" <filename-base>"
-        "\n\n"
+        "\n\n--\n\n"
         "Create a PNG screenshot of the actual web page and store it in the "
         "file <filename-base>.png. If not already opened, a browser window "
         "will pop up to take the screenshot.";
@@ -448,8 +455,9 @@ class Script: public QObject {
     Q_OBJECT
   Q_SIGNALS:
     void logging(QString);
-    void progress(QString, int, int);
+    void progress(QString, int, int, int);
   public:
+    typedef std::map<QString, std::shared_ptr<Command>> Prototypes;
     typedef std::pair<QString, QStringList> Signal;
     enum ClickType {
       REAL_MOUSE_CLICK,
@@ -487,7 +495,9 @@ class Script: public QObject {
   public:
     Script():
         _step(0), _clicktype(JAVASCRIPT_CLICK),
-        _screenshots(true), _defaultTimeout(20) {
+        _screenshots(true),
+        _defaultTimeout(10),
+        _defaultTimeoutFalse(3) {
       initPrototypes();
     }
     Script(const Script& o):
@@ -500,57 +510,79 @@ class Script: public QObject {
     }
     QString syntax() const {
       return
-        "Script syntax is a text file that consists of list of commands. Each "
+        "Script syntax is a text file that consists of a list of commands. Each "
         "command starts at the begin of a new line. Empty lines are allowed. "
         "Lines that start with \"#\" are treated as comments."
         "\n\n"
         "Subcommands are indented. The first indented line defines the level of "
-        "indentation. All following lines must be indented by the same level."
+        "indentation. All following lines must be indented at least by the same level."
         "\n\n"
         "Note: When a selector is required as parameter, then the selector "
         "is a CSS selector."
         "\n\n"
-        "Thanks to the filter script doxygen-webtester.sed, you cab use the "
+        "Thanks to the filter script doxygen-webtester.sed, you can use the "
         "comments for producing doxygen documenation. Just start comments with "
         "\"##\" to import them to doxygen. This script is automatically configured, "
         "when you use the autotools bootstrap from:\n"
-        "https://dev.marc.waeckerlin.org/redmine/projects/bootstrap-build-environment";
+        "https://mrw.sh/development/bootstrap-build-environment";
     }
     /// set workdir
     void path(QString path) {
       _path = (path.size()?path:".")+QDir::separator();
     }
     /// get workdir
-    QString path() {
+    QString path() const {
       return _path;
     }
+    /// get all command prototypes
+    const Prototypes& prototypes() const {
+      return _prototypes;
+    }
     QString commands(Formatting f = PLAIN) const {
       QString cmds;
-      for (auto it(_prototypes.begin()); it!=_prototypes.end(); ++it)
-        switch (f) {
-          case PLAIN: {
+      switch (f) {
+        case PLAIN: {
+          for (auto it(_prototypes.begin()); it!=_prototypes.end(); ++it)
             cmds+="\n\n\nCOMMAND: "+it->first+"\n\n"+it->second->description();
-          } break;
-          case HTML: {
-            cmds+="<h1>"+it->first+"</h1><p>"
-              +it->second->description()
-              .replace("&", "&amp;")
-              .replace("<", "&lt;")
-              .replace(">", "&gt;")
-              .replace(QRegularExpression("&lt;([^ ]+)&gt;"),
-                       "<i>\\1</i>")
-              .replace(QRegularExpression("(\n[^ ][^\n]*)(\n +-)"),
-                       "\\1<ul>\\2")
-              .replace(QRegularExpression("(\n +-[^\n]*\n)([^ ])"),
-                       "\\1</ul>\\2")
-              .replace(QRegularExpression("\n +- ([^\n]*)(</ul>)?"),
-                       "<li>\\1</li>\\2")
-              .replace("</li>\n", "</li>")
-              .replace("\n  ", "\n&nbsp;&nbsp;")
-              .replace("\n\n", "</p><p>")
-              .replace("\n", "<br/>")
-              +"</p>";
-          } break;
+        } break;
+        case HTML: {
+          auto format = [](QString s) {
+            return s
+            .replace("&", "&amp;")
+            .replace("<", "&lt;")
+            .replace(">", "&gt;")
+            .replace(QRegularExpression("&lt;([-_A-Za-z0-9]+)&gt;"), "<i>\\1</i>")
+            .replace(QRegularExpression("(\n[^ ][^\n]*)(\n +-)"), "\\1<ul>\\2")
+            .replace(QRegularExpression("(\n +-[^\n]*\n)([^ ])"), "\\1</ul>\\2")
+            .replace(QRegularExpression("\n +- ([^\n]*)(</ul>)?"), "<li>\\1</li>\\2")
+            .replace("</li>\n", "</li>")
+            .replace("\n  ", "\n&nbsp;&nbsp;")
+            .replace("\n\n", "</p><p>")
+            .replace("\n", "<br/>")
+            .replace(QRegularExpression("(http(s)?://[-/^a-z0-9.]+)"), "<a href=\"\\1\">\\1</a>");
+          };
+          cmds = "<style>div#table-of-contents {border: 2px solid black; background-color: red; width: 100%; column-width: 5em;}</style>"
+            "<h1>Contents</h1><ul>"
+            "<li id=\"top-syntax-description\"><a href=\"#syntax-description\">Syntax</a></li>"
+            "<li id=\"top-command-list\"><a href=\"#command-list\">Commands</a><ul>";
+          for (auto[name,command]: _prototypes)
+            cmds += "<li id=\"top-"+name+"\"><a href=\"#"+name+"\">"+name+"</a></li>";
+          cmds += "</ul></li></ul>"
+            "<h1 id=\"syntax-description\"><a href=\"#top-syntax-description\">Syntax</a></h1>"
+            +format(syntax())+
+            "<h1 id=\"command-list\"><a href=\"#top-command-list\">Commands</a></h1>";
+          for (auto[name,command]: _prototypes) {
+            QStringList doc(command->description().split("\n\n--\n\n"));
+            assert(doc.size()==2); // description does not match expected format
+            QString usage(doc.takeFirst());
+            QString description(doc.takeFirst());
+            cmds += "<h2 id=\""+name+"\"><a href=\"#top-"+name+"\">"+name+"</a></h2><h3>Usage</h3><p>"
+              + format(usage)
+              + "</p><h3>Description</h3><p>"
+              + format(description)
+              + "</p>";
+          }
+        } break;
       }
       return cmds.trimmed();
     }
@@ -569,6 +601,7 @@ class Script: public QObject {
       _variables.clear();
       _rvariables.clear();
       _timeout = _defaultTimeout;
+      _timeoutFalse = _defaultTimeoutFalse;
       _step = 0;
       _clicktype = JAVASCRIPT_CLICK;
     }
@@ -621,7 +654,8 @@ class Script: public QObject {
       bool res(true);
       _step = 0;
       _testsuites = testsuites;
-      _timeout = _defaultTimeout; // defaults to 20s
+      _timeout = _defaultTimeout;
+      _timeoutFalse = _defaultTimeoutFalse;
       _ignoreSignalsUntil.clear();
       addSignals(frame);
       _screenshots = screenshots;
@@ -640,8 +674,7 @@ class Script: public QObject {
       int retries(0), back(0);
       for (auto cmd(_script.begin()); cmd!=_script.end();
            _step+=(*cmd)->steps(this), ++cmd) {
-        progress(QString("%1:%2").arg((*cmd)->file()).arg((*cmd)->line()),
-                 _step, countSteps());
+        progress((*cmd)->file(), (*cmd)->line(), _step, countSteps());
         xml::Node testcase("testcase");
         try {
           testcase.attr("classname") =
@@ -672,8 +705,7 @@ class Script: public QObject {
                 _testsuites->last()<<testcase;
                 break; // test is successfully finished
               }
-              progress(QString("%1:%2").arg((*cmd)->file()).arg((*cmd)->line()),
-                       _step, countSteps());
+              progress((*cmd)->file(), (*cmd)->line(), _step, countSteps());
             } catch (PossibleRetryLoad& e) {
               _timer.stop();
               // timeout may happen during load due to bad internet connection
@@ -777,7 +809,7 @@ class Script: public QObject {
       }
       removeSignals(frame);
       if (!_signals.empty()) error(UnhandledSignals(_signals));
-      progress("success", 0, 0);
+      progress(QString(), 0, 0, 0);
       return res;
     }
     std::shared_ptr<Command> command() {
@@ -901,7 +933,9 @@ class Script: public QObject {
       _variables = o._variables;
       _rvariables = o._rvariables;
       _timeout = o._timeout;
+      _timeoutFalse = o._timeoutFalse;
       _defaultTimeout = o._timeout;
+      _defaultTimeoutFalse = o._timeoutFalse;
       _clicktype = o._clicktype;
       _testsuites = o._testsuites;
       _testclass = o._testclass;
@@ -937,9 +971,18 @@ class Script: public QObject {
     int timeout() {
       return _timeout;
     }
+    void timeoutFalse(int t) {
+      _timeoutFalse = t;
+    }
+    int timeoutFalse() {
+      return _timeoutFalse;
+    }
     void defaultTimeout(int t) {
       _defaultTimeout = t;
     }
+    void defaultTimeoutFalse(int t) {
+      _defaultTimeoutFalse = t;
+    }
     void auth(const QString& realm, const QString& username, const QString& password) {
       if (!username.isEmpty() && !password.isEmpty())
         _auth[realm] = {username, password};
@@ -1074,8 +1117,8 @@ class Script: public QObject {
       _prototypes[c->tag()] = std::shared_ptr<Command>(c);
     }
   private Q_SLOTS:
-    void innerProgress(QString txt, int delta) {
-      progress(txt, _step+delta, countSteps());
+    void innerProgress(QString file, int line, int delta) {
+      progress(file, line, _step+delta, countSteps());
     }
     void authenticationRequired(QNetworkReply*, QAuthenticator* a) {
       if (_auth.contains(a->realm())) {
@@ -1157,7 +1200,6 @@ class Script: public QObject {
         QString username;
         QString password;
     };
-    typedef std::map<QString, std::shared_ptr<Command>> Prototypes;
     typedef std::vector<std::shared_ptr<Command>> Commands;
     Prototypes _prototypes;
     Commands _script;
@@ -1175,7 +1217,9 @@ class Script: public QObject {
     QMap<LenString, LenString> _rvariables; ///< reverse variable mapping
     QMap<QString, std::shared_ptr<Function> > _functions;
     int _timeout;
+    int _timeoutFalse;
     int _defaultTimeout;
+    int _defaultTimeoutFalse;
     ClickType _clicktype;
     QString _targetdir;
     std::shared_ptr<xml::Node> _testsuites; ///< only valid within run
@@ -1207,7 +1251,7 @@ class Do: public Command {
     QString description() const {
       return
         tag()+" [<selector>]\n  <javascript-line1>\n  <javascript-line2>"
-        "\n\n"
+        "\n\n--\n\n"
         "Execute JavaScript on a CSS selected object. The object is the first "
         "object in the DOM tree that matches the given CSS selector. You can "
         "refere to the selected object within the scripy by \"this\". The "
@@ -1250,7 +1294,7 @@ class Load: public Command {
     QString description() const {
       return
         tag()+" <url>"
-        "\n\n"
+        "\n\n--\n\n"
         "Load an URL, the URL is given as parameter in full syntax.";
     }
     QString command() const {
@@ -1279,7 +1323,7 @@ class Expect: public Command {
     QString description() const {
       return
         tag()+" <signal> [<parameter>]"
-        "\n\n"
+        "\n\n--\n\n"
         "Expect a signal. Signals are emitted by webkit and may contain "
         "parameter. If a parameter is given in the script, then the parameter "
         "must match exactly. If no parameter is given, then the signal must "
@@ -1348,7 +1392,7 @@ class Open: public Command {
     QString description() const {
       return
         tag()+
-        "\n\n"
+        "\n\n--\n\n"
         "Open the browser window, so you can follow the test steps visually.";
     }
     QString command() const {
@@ -1374,7 +1418,7 @@ class Sleep: public Command {
     QString description() const {
       return
         tag()+" <seconds>"
-        "\n\n"
+        "\n\n--\n\n"
         "Sleep for a certain amount of seconds. This helps, if you must wait "
         "for some javascript actions, i.e. AJAX or slow pages, and the "
         "excpeted signals are not sufficient.";
@@ -1412,7 +1456,7 @@ class Exit: public Command {
     QString description() const {
       return
         tag()+
-        "\n\n"
+        "\n\n--\n\n"
         "Successfully terminate script immediately. The following commands "
         "are not executed. This helps when you debug your scripts and you "
         "want the script stop at a certain point for investigations.";
@@ -1439,7 +1483,7 @@ class IgnoreTo: public Command {
     QString description() const {
       return
         tag()+" <label>"
-        "\n\n"
+        "\n\n--\n\n"
         "Ignore all following commands up to a given label. The following "
         "commands are not executed until the given label appears in the "
         "script. This helps when you debug your scripts and you "
@@ -1472,7 +1516,7 @@ class Label: public Command {
     QString description() const {
       return
         tag()+" <label>"
-        "\n\n"
+        "\n\n--\n\n"
         "This marks the label refered by command \"ignoreto\".";
     }
     QString command() const {
@@ -1502,7 +1546,7 @@ class Upload: public Command {
     QString description() const {
       return
         tag()+" <selector> -> <filename>"
-        "\n\n"
+        "\n\n--\n\n"
         "Presses the specified file upload button and passes a given file "
         "name. The command requires a CSS selector followed by a filename. "
         "The first object that matches the selector is used.";
@@ -1556,7 +1600,7 @@ class Exists: public Command {
     QString description() const {
       return
         tag()+" <selector> -> <text>"
-        "\n\n"
+        "\n\n--\n\n"
         "Assert that a certain text exists in the selected object, or if no "
         "text is given, assert that the specified object exists. The object "
         "is given by a CSS selector. All matching objects are search for the "
@@ -1612,7 +1656,7 @@ class Not: public Command {
     QString description() const {
       return
         tag()+" <selector> -> <text>"
-        "\n\n"
+        "\n\n--\n\n"
         "Assert that a certain text does not exists in the selected object, "
         "or if no text is given, assert that the specified object does not "
         "exists. The object is given by a CSS selector. All matching objects "
@@ -1637,8 +1681,7 @@ class Not: public Command {
       Logger log(this, script);
       QString selector(script->replacevars(_selector));
       QString text(script->replacevars(_text));
-      QWebElement firstelement(find(frame, selector,
-                                    mrw::max(mrw::min(script->timeout()/3, 10), 2)));
+      QWebElement firstelement(find(frame, selector, script->timeoutFalse()-1));
       for (QWebElement element: frame->findAllElements(selector)) {
         if (text.isEmpty())
           error(log, AssertionFailed("element must not exists: "+selector));
@@ -1661,7 +1704,7 @@ class Execute: public Command {
     QString description() const {
       return
         tag()+" <command>\n  <line1>\n  <line2>\n  <...>"
-        "\n\n"
+        "\n\n--\n\n"
         "Execute <command>. The command can have space separated arguments. "
         "Following lines that are intended by at least "
         "one space are streamed into the command. This way, you can e.g. "
@@ -1728,7 +1771,7 @@ class Download: public Command {
       return
         tag()+" <filename>\n"
         "  <command-to-start-download>"
-        "\n\n"
+        "\n\n--\n\n"
         "Set download file before loading a download link or clicking on a "
         "download button. The next line must be exactly one command that "
         "initiates the download.\n\n"
@@ -1809,7 +1852,7 @@ class Click: public Command {
     QString description() const {
       return
         tag()+" [<clicktype>] <selector>"
-        "\n\n"
+        "\n\n--\n\n"
         "Click on the specified element. Either you explicitely specify a click"
         " type, such as <realmouse> or <javascript>, or the previously set or"
         " the default clicktype is used.";
@@ -1863,16 +1906,24 @@ class Set: public Command {
     }
     QString description() const {
       return
-        tag()+" <variable>=<value>\n"+
+        tag()+" <variable>=<value>\n\n"+
         tag()+" <variable>\n"
         "  <command>"
-        "\n\n"
+        "\n\n--\n\n"
         "Sets the value of a variable either to a constant, or to the output"
         " of a command. A command should be a command that produces an"
         " output, such as <do>, which returns the result of JavaScript or"
         " <execute>, which returns the output of the executed command, or"
         " <call>, which returns the result of the last command."
-        " All variables are global with regard to functions.";
+        " All variables are global with regard to functions.\n\n"
+        "To set a variable to the value of an input field, you can use:\n\n"
+        "  "+tag()+" <variable>\n"
+        "    do <selector>\n"
+        "      this.value\n\n";
+        "To set a variable to the inner html content of an element, you can use:\n\n"
+        "  "+tag()+" <variable>\n"
+        "    do <selector>\n"
+        "      this.innerHTML";
     }
     QString command() const {
       if (_next)
@@ -1922,7 +1973,7 @@ class UnSet: public Command {
     QString description() const {
       return
         tag()+" <variable>"
-        "\n\n"
+        "\n\n--\n\n"
         "Undo the setting of a variable. The opposite of «set».";
     }
     QString command() const {
@@ -1951,8 +2002,8 @@ class Timeout: public Command {
     QString description() const {
       return
         tag()+" <seconds>"
-        "\n\n"
-        "Set the timeout in seconds (defaults to 10).";
+        "\n\n--\n\n"
+        "Set the timeout in seconds.";
     }
     QString command() const {
       return tag()+" "+_timeout;
@@ -1970,6 +2021,47 @@ class Timeout: public Command {
       if (!ok) error(log, BadArgument(script->replacevars(_timeout)
                                       +" should be a number of seconds"));
       script->timeout(timeout);
+      script->defaultTimeout(timeout);
+      return true;
+    }
+  private:
+    QString _timeout;
+};
+
+class TimeoutFalse: public Command {
+  public:
+    QString tag() const {
+      return "timeout-false";
+    }
+    QString description() const {
+      return
+        tag()+" <seconds>"
+        "\n\n--\n\n"
+        "Set the timeout for negative testcases in seconds."
+        " Time to wait until a negative testcase is accepted. It is used in"
+        " commands such as not, if or while, where a fail is the expected or at"
+        " least a valid result. Normally, this timeout can be lower than the"
+        " normal timeout. This is, because to verify that something does not"
+        " exists, the test run has always to wait for the full timeout. So"
+        " setting this to a lower value increases the speed of the test run.";
+    }
+    QString command() const {
+      return tag()+" "+_timeout;
+    }
+    std::shared_ptr<Command> parse(Script*, QString args,
+                                   QStringList&, QString, int, int) {
+      std::shared_ptr<TimeoutFalse> cmd(new TimeoutFalse());
+      cmd->_timeout = args;
+      return cmd;
+    }
+    bool execute(Script* script, QWebFrame*) {
+      Logger log(this, script);
+      bool ok;
+      int timeout(script->replacevars(_timeout).toInt(&ok));
+      if (!ok) error(log, BadArgument(script->replacevars(_timeout)
+                                      +" should be a number of seconds"));
+      script->timeoutFalse(timeout);
+      script->defaultTimeoutFalse(timeout);
       return true;
     }
   private:
@@ -1984,7 +2076,7 @@ class CaCertificate: public Command {
     QString description() const {
       return
         tag()+" <filename.pem>"
-        "\n\n"
+        "\n\n--\n\n"
         "Load a CA certificate that will be accepted on SSL connections.";
     }
     QString command() const {
@@ -2020,7 +2112,7 @@ class ClientCertificate: public Command {
     QString description() const {
       return
         tag()+" <certfile.pem> <keyfile.pem> <keypassword>"
-        "\n\n"
+        "\n\n--\n\n"
         "Load a client certificate to authenticate on SSL connections. "
         "The password for the keyfile should not contain spaces. "
         "Create the two files from a PKCS#12 file using OpenSSL:\n"
@@ -2080,7 +2172,7 @@ class ClickType: public Command {
     QString description() const {
       return
         tag()+" <type>"
-        "\n\n"
+        "\n\n--\n\n"
         "Set how mouseclicks should be mapped. The best solution depends on"
         " your problem. Normally it is good to call \"click()\" on the element"
         " using javascript. But with complex javascript infected websites, it"
@@ -2124,9 +2216,9 @@ class SetValue: public Command {
     }
     QString description() const {
       return
-        tag()+" <selector> -> '<value>'\n"+
+        tag()+" <selector> -> '<value>'\n\n"+
         tag()+" <selector> -> '<value1>', '<value2>', <...>"
-        "\n\n"
+        "\n\n--\n\n"
         "Set the selected element to a given value. It is mostly the same as"
         " the following constuct, except that options in a select are evaluated"
         " correctly:\n\n"
@@ -2193,7 +2285,7 @@ class Function: public CommandContainer {
         "  <command1>\n"
         "  <command2>\n"
         "  <...>"
-        "\n\n"
+        "\n\n--\n\n"
         "Define a function with arguments. The arguments are treated like"
         " local variables. In a sequence of scripts within the same testrun,"
         " functions are inherited from all followin scripts, so you can first"
@@ -2243,7 +2335,7 @@ class Call: public Command {
     QString description() const {
       return
         tag()+" <name> ['<arg1>', '<arg2>', ...]"
-        "\n\n"
+        "\n\n--\n\n"
         "Calls a function. The number of arguments must be exactly the same"
         " as in the function definition.\n\n"
         "If you quote the values, then quote all values with the same"
@@ -2281,7 +2373,7 @@ class If: public CommandContainer {
     }
     QString description() const {
       return
-        tag()+" <variable> <cmp> <value>\n"
+        tag()+" [not] <variable> <cmp> <value>\n"
         "  <command1>\n"
         "  <command2>\n"
         "  <...>\n"
@@ -2290,7 +2382,7 @@ class If: public CommandContainer {
         "  <command4>\n"
         "  <...>\n"
         "\n\n"+
-        tag()+" <selector> -> <text>\n"
+        tag()+" [not] <selector> -> <text>\n"
         "  <command1>\n"
         "  <command2>\n"
         "  <...>\n"
@@ -2298,7 +2390,7 @@ class If: public CommandContainer {
         "  <command3>\n"
         "  <command4>\n"
         "  <...>\n"
-        "\n\n"
+        "\n\n--\n\n"
         "Execute commands conditionally. "
         "The first variant compares a variable to a value. "
         "The comparision <cmp> can be = ! . ^ ~ < >, "
@@ -2308,10 +2400,11 @@ class If: public CommandContainer {
         "The second variant checks for a text in a selector, "
         "similar to command exists. The text can be empty to just "
         "check for the existence of a selector. "
-        "There is an optional else part.";
+        "There is an optional else part. Optionally start with "
+        "not to invert the test.";
     }
     QString command() const {
-      return tag()+" "+_variable+" "+_cmp+" "+_value
+      return tag()+(_not?" not ":" ")+_variable+" "+_cmp+" "+_value
         +(_script.get()?"\n  "+_script->print().join("\n  "):"")
         +(_else.get()?"\nelse\n  "+_else->print().join("\n  "):"");
     }
@@ -2319,6 +2412,11 @@ class If: public CommandContainer {
                                    QStringList& in, QString file, int line,
                                    int indent) {
       std::shared_ptr<If> cmd(new If());
+      QRegularExpressionMatch m;
+      if (args.contains(QRegularExpression("^ *not +"), &m)) {
+        args.remove(0, m.capturedLength());
+        cmd->_not = true;
+      }
       int pos(args.indexOf(QRegularExpression("[=!.^~<>]")));
       int len(1);
       if (args.contains("->")) {
@@ -2344,8 +2442,7 @@ class If: public CommandContainer {
       QString selector(script->replacevars(_variable));
       bool check(false);
       if (_cmp=="->") {
-        QWebElement firstelement(find(frame, selector,
-                                      mrw::max(mrw::min(script->timeout()/3, 10), 2)));
+        QWebElement firstelement(find(frame, selector, script->timeoutFalse()-1));
         for (QWebElement element: frame->findAllElements(selector)) {
           if (value.isEmpty() || // just find element
               element.toOuterXml().indexOf(value)!=-1 ||
@@ -2354,8 +2451,9 @@ class If: public CommandContainer {
             break;
           }
         }
-        log(QString("evaluated expression to ")+(check?"true":"false")+": "
-            +selector+" "+_cmp+" "+value);
+        if (_not) check=!check;
+        log(QString("evaluated expression to ")+(check?"true":"false")
+            +(_not?": not ":": ")+selector+" "+_cmp+" "+value);
       } else {
         switch (_cmp[0].toLatin1()) {
           case '=': check = script->variable(_variable)==value;
@@ -2375,8 +2473,9 @@ class If: public CommandContainer {
             break;
           default:;
         }
-        log(QString("evaluated expression to ")+(check?"true":"false")+": "
-            +script->variable(_variable)+" "+_cmp+" "+value);
+        if (_not) check=!check;
+        log(QString("evaluated expression to ")+(check?"true":"false")
+            +(_not?": not ":": ")+script->variable(_variable)+" "+_cmp+" "+value);
       }
       if (check) return runScript(log, this, _script, script, frame);
       else if (_else) return runScript(log, this, _else, script, frame);
@@ -2392,6 +2491,7 @@ class If: public CommandContainer {
     QString _cmp;
     QString _value;
     std::shared_ptr<Script> _else;
+    bool _not = false;
 };
 
 class While: public CommandContainer {
@@ -2401,16 +2501,16 @@ class While: public CommandContainer {
     }
     QString description() const {
       return
-        tag()+" <variable> <cmp> <value>\n"
+        tag()+ " [not] <variable> <cmp> <value>\n"
         "  <command1>\n"
         "  <command2>\n"
         "  <...>\n"
         "\n\n"+
-        tag()+" <selector> -> <text>\n"
+        tag()+" [not] <selector> -> <text>\n"
         "  <command1>\n"
         "  <command2>\n"
         "  <...>\n"
-        "\n\n"
+        "\n\n--\n\n"
         "Repeats commands conditionally. "
         "The first variant compares a variable to a value. "
         "The comparision <cmp> can be = ! . ^ ~ < >, "
@@ -2419,16 +2519,22 @@ class While: public CommandContainer {
         "Match allows a regular expression. "
         "The second variant checks for a text in a selector, "
         "similar to command exists. The text can be empty to just "
-        "check for the existence of a selector.";
+        "check for the existence of a selector. Optionally start with "
+        "not to invert the test.";
     }
     QString command() const {
-      return tag()+" "+_variable+" "+_cmp+" "+_value
+      return tag()+(_not?" not ":" ")+_variable+" "+_cmp+" "+_value
         +(_script.get()?"\n  "+_script->print().join("\n  "):"");
     }
     std::shared_ptr<Command> parse(Script* script, QString args,
                                    QStringList& in, QString file, int line,
                                    int indent) {
       std::shared_ptr<While> cmd(new While());
+      QRegularExpressionMatch m;
+      if (args.contains(QRegularExpression("^ *not +"), &m)) {
+        args.remove(0, m.capturedLength());
+        cmd->_not = true;
+      }
       int pos(args.indexOf(QRegularExpression("[=!.^~<>]")));
       int len(1);
       if (args.contains("->")) {
@@ -2451,8 +2557,7 @@ class While: public CommandContainer {
       for (bool check(true); check;) {
         if (_cmp=="->") {
           check = false;
-          QWebElement firstelement(find(frame, selector,
-                                        mrw::max(mrw::min(script->timeout()/3, 10), 2)));
+          QWebElement firstelement(find(frame, selector, script->timeoutFalse()-1));
           for (QWebElement element: frame->findAllElements(selector)) {
             if (value.isEmpty() || // just find element
                 element.toOuterXml().indexOf(value)!=-1 ||
@@ -2461,8 +2566,9 @@ class While: public CommandContainer {
               break;
             }
           }
-          log(QString("evaluated expression to ")+(check?"true":"false")+": "
-              +selector+" "+_cmp+" "+value);
+          if (_not) check=!check;
+          log(QString("evaluated expression to ")+(check?"true":"false")
+              +(_not?": not ":": ")+selector+" "+_cmp+" "+value);
         } else {
           switch (_cmp[0].toLatin1()) {
             case '=': check = script->variable(_variable)==value;
@@ -2482,8 +2588,9 @@ class While: public CommandContainer {
               break;
             default:;
           }
-          log(QString("evaluated expression to ")+(check?"true":"false")+": "
-              +script->variable(_variable)+" "+_cmp+" "+value);
+          if (_not) check=!check;
+          log(QString("evaluated expression to ")+(check?"true":"false")
+              +(_not?": not ":": ")+script->variable(_variable)+" "+_cmp+" "+value);
         }
         if (check) if (!runScript(log, this, _script, script, frame)) return false;
       }
@@ -2493,6 +2600,7 @@ class While: public CommandContainer {
     QString _variable;
     QString _cmp;
     QString _value;
+    bool _not = false;
 };
 
 class TestSuite: public Command {
@@ -2503,7 +2611,7 @@ class TestSuite: public Command {
     QString description() const {
       return
         tag()+" <name>"
-        "\n\n"
+        "\n\n--\n\n"
         "Start a testsuite and give it a name.";
     }
     QString command() const {
@@ -2532,7 +2640,7 @@ class TestCase: public Command {
     QString description() const {
       return
         tag()+" <name>"
-        "\n\n"
+        "\n\n--\n\n"
         "Start a testcase and give it a name.";
     }
     QString command() const {
@@ -2560,10 +2668,10 @@ class Check: public Command {
     }
     QString description() const {
       return
-        tag()+" <value1> <cmp> <value2>\n"+
+        tag()+" <value1> <cmp> <value2>\n\n"+
         tag()+" <value1> <cmp>\n"
         "  <command>"
-        "\n\n"
+        "\n\n--\n\n"
         "Compares two values (you can use variables) or compares a value to the"
         " result of a command. The command should be a command that produces an"
         " output, such as <do>, which returns the result of JavaScript or"
@@ -2587,12 +2695,12 @@ class Check: public Command {
       std::shared_ptr<Check> cmd(new Check());
       cmd->_next = 0;
       QString comp("[=!.^~<>]");
-      QStringList allargs = quotedStrings(args, comp, true);
+      QStringList allargs = quotedStrings(args, comp, true, 1);
       if (allargs.size()<2 || allargs[1].size()!=1 ||
           !QRegularExpression("^"+comp+"$").match(allargs[1]).hasMatch())
-        throw BadArgument(tag()+" needs a comparision, not: "+args);
+        throw BadArgument(tag()+" needs a comparision, not: "+args, allargs);
       if (allargs.size()>3)
-        throw BadArgument(tag()+" has at most three arguments");
+        throw BadArgument(tag()+" has at most three arguments", allargs);
       cmd->_value1 = allargs[0];
       cmd->_cmp = allargs[1][0].toLatin1();
       if (allargs.size()==3) {
@@ -2601,7 +2709,7 @@ class Check: public Command {
         if (in.size() && in.first().contains(QRegularExpression("^ "))) {
           cmd->_next = script->parseLine(in, file, line+1, indent+1);
           cmd->_next->log(false); // suppress logging of subcommand
-        } else throw BadArgument(tag()+" needs a third argument or a following command");
+        } else throw BadArgument(tag()+" needs a third argument or a following command", allargs);
       }
       return cmd;
     }
@@ -2646,7 +2754,7 @@ class For: public CommandContainer {
         "  <command1>\n"
         "  <command2>\n"
         "  <...>"
-        "\n\n"
+        "\n\n--\n\n"
         "Executes the given commands with the variable set to the specifier values,"
         "repeated once per given value. The variable is treated like a local variale"
         " in the loop.\n\n"
@@ -2698,7 +2806,7 @@ class Echo: public Command {
     QString description() const {
       return
         tag()+" <text>"
-        "\n\n"
+        "\n\n--\n\n"
         "Echoes a text to the log.";
     }
     QString command() const {
@@ -2727,7 +2835,7 @@ class OfflineStoragePath: public Command {
     QString description() const {
       return
         tag()+" <path>"
-        "\n\n"
+        "\n\n--\n\n"
         "Set offline storage path. Defaults to /tmp.";
     }
     QString command() const {
@@ -2760,7 +2868,7 @@ class ClearCookies: public Command {
     QString description() const {
       return
         tag()+" <url>"
-        "\n\n"
+        "\n\n--\n\n"
         "Clear all cookies of given URL <url>, or of the current URL if no"
         " <url> is specified.";
     }
@@ -2796,7 +2904,7 @@ class Include: public CommandContainer {
     QString description() const {
       return
         tag()+" <filename>"
-        "\n\n"
+        "\n\n--\n\n"
         "Include a test script.";
     }
     QString command() const {
@@ -2863,7 +2971,7 @@ class Case: public Command {
         "    <command>\n"
         "    <command>\n"
         "    <...>\n"
-        "\n\n"
+        "\n\n--\n\n"
         "Execute commands conditionally depending on a variable. "
         "It is equivalent to neested if-else-if commands."
         "The first variant compares a variable to a value. "
@@ -2915,8 +3023,7 @@ class Case: public Command {
           log("terminate with default branch");
           check = true;
         } else if (condition.cmp=="->") {
-          QWebElement firstelement(find(frame, selector,
-                                        mrw::max(mrw::min(script->timeout()/3, 10), 2)));
+          QWebElement firstelement(find(frame, selector, script->timeoutFalse()-1));
           for (QWebElement element: frame->findAllElements(selector)) {
             if (value.isEmpty() || // just find element
                 element.toOuterXml().indexOf(value)!=-1 ||
@@ -2983,7 +3090,7 @@ class Fail: public Command {
     QString description() const {
       return
         tag()+" <text>"
-        "\n\n"
+        "\n\n--\n\n"
         "Fail with error text.";
     }
     QString command() const {
@@ -3014,7 +3121,7 @@ class Auth: public Command {
         tag()+" <realm> <username> <password>"
         "\n\n"+
         tag()+" <realm>"
-        "\n\n"
+        "\n\n--\n\n"
         "Set basic authentication credentials for <realm> to"
         " <username> and <password>. If no realm is given,"
         " the credentials for the given realm are removed.";
@@ -3056,7 +3163,7 @@ class Ignore: public Command {
     QString description() const {
       return
         tag()+" <signal1> <signal2> <...>"
-        "\n\n"
+        "\n\n--\n\n"
         "Ignores a specific signal. It will not be placed in the queue "
         "and any expect for this signal is always true. You can call "
         "ignore with a space separated list of signal names. You cannot "
@@ -3088,7 +3195,7 @@ class UnIgnore: public Command {
     QString description() const {
       return
         tag()+" <signal1> <signal2> <...>"
-        "\n\n"
+        "\n\n--\n\n"
         "Undo ignoring a specific signal. It will be placed in the queue "
         "and any expect this signal checks the queue. You can call "
         "unignore with a space separated list of signal names. You cannot "
@@ -3121,7 +3228,7 @@ class : public Command {
     QString description() const {
       return
         tag()+
-        "\n\n"
+        "\n\n--\n\n"
         "";
     }
     QString command() const {
@@ -3211,13 +3318,13 @@ inline bool Command::runScript(Logger& log, Command* parentCommand,
   try {
     assert(connect(&scriptCopy, SIGNAL(logging(QString)),
                    parent, SLOT(parentlog(QString))));
-    assert(connect(&scriptCopy, SIGNAL(progress(QString, int, int)),
-                   parent, SLOT(innerProgress(QString, int))));
+    assert(connect(&scriptCopy, SIGNAL(progress(QString, int, int, int)),
+                   parent, SLOT(innerProgress(QString, int, int))));
     parent->removeSignals(frame);
     bool res(scriptCopy.run(frame));
     parent->addSignals(frame);
-    disconnect(&scriptCopy, SIGNAL(progress(QString, int, int)),
-               parent, SLOT(innerProgress(QString, int)));
+    disconnect(&scriptCopy, SIGNAL(progress(QString, int, int, int)),
+               parent, SLOT(innerProgress(QString, int, int)));
     disconnect(&scriptCopy, SIGNAL(logging(QString)),
                parent, SLOT(parentlog(QString)));
     parentCommand->_result = scriptCopy.result();
@@ -3229,8 +3336,8 @@ inline bool Command::runScript(Logger& log, Command* parentCommand,
     return res;
   } catch (const Exception& x) {
     parent->addSignals(frame);
-    disconnect(&scriptCopy, SIGNAL(progress(QString, int, int)),
-               parent, SLOT(innerProgress(QString, int)));
+    disconnect(&scriptCopy, SIGNAL(progress(QString, int, int, int)),
+               parent, SLOT(innerProgress(QString, int, int)));
     disconnect(&scriptCopy, SIGNAL(logging(QString)),
                parent, SLOT(parentlog(QString)));
     throw;
@@ -3256,6 +3363,7 @@ inline void Script::initPrototypes() {
   add(new Set);
   add(new UnSet);
   add(new Timeout);
+  add(new TimeoutFalse);
   add(new CaCertificate);
   add(new ClientCertificate);
   add(new ::ClickType);

src/editor.hxx

@@ -19,7 +19,7 @@ class Highlighter: public QSyntaxHighlighter {
     void include(QString);
   public:
     Highlighter(QTextDocument *parent): QSyntaxHighlighter(parent) {
-      QString commands="auth|ca-certificate|call|case|default|check|clear-cookies|click|clicktype|client-certificate|do|download|echo|execute|exists|exit|expect|fail|for|function|if|else|while|ignore|unignore|ignoreto|include|label|load|not|offline-storage-path|open|screenshot|set|setvalue|sleep|testcase|testsuite|timeout|unset|upload";
+      QString commands="auth|ca-certificate|call|case|default|check|clear-cookies|click|clicktype|client-certificate|do|download|echo|execute|exists|exit|expect|fail|for|function|if|else|while|ignore|unignore|ignoreto|include|label|load|not|offline-storage-path|open|screenshot|set|setvalue|sleep|testcase|testsuite|timeout|timeout-false|unset|upload";
       _expressions<<Expression("^ *("+commands+")\\b").weight(QFont::Bold).fg(Qt::darkBlue)
                   <<Expression("^ *#.*$").weight(QFont::Bold).fg(Qt::black);
     }
@@ -76,6 +76,13 @@ class CodeEditor: public QPlainTextEdit {
   Q_SIGNALS:
     void include(QString);
     void link(QString);
+  public Q_SLOTS:
+    void gotoLine(int line) {
+      if (textCursor().blockNumber()==line-1) return;
+      QTextCursor cursor(document()->findBlockByNumber(line-1));
+      setTextCursor(cursor);
+      highlightCurrentLine();
+    }
   public:
     CodeEditor(QWidget *parent = 0): QPlainTextEdit(parent) {
       Highlighter *highlighter(new Highlighter(document()));

src/exceptions.hxx

@@ -59,6 +59,9 @@ class UnknownCommand: public ParseError {
 class BadArgument: public ParseError {
   public:
     BadArgument(QString arg): ParseError("bad argument:"+p(arg)) {}
+    BadArgument(QString arg, QStringList args):
+        ParseError("bad argument:"+p(arg)+p("→ arguments:"+pq(args))) {
+    }
 };
 
 class MissingArguments: public ParseError {

src/help.hxx

@@ -0,0 +1,54 @@
+#ifndef __HELP__HXX
+#define __HELP__HXX
+
+#include <ui_help.hxx>
+#include <commands.hxx>
+#include <cassert>
+
+class Help: public QDockWidget, protected Ui::Help {
+    Q_OBJECT
+  public:
+    Help(QWidget* p = nullptr): QDockWidget(p) {
+      setupUi(this);
+      _search->hide();
+      _help->setText(script.commands(Script::HTML));
+    }
+  public Q_SLOTS:
+    void on__search_textEdited(const QString& txt) {
+      _help->moveCursor(QTextCursor::Start);
+      if (script.prototypes().count(txt))
+        _help->scrollToAnchor(txt);
+      else
+        _help->find(txt);
+    }
+    void on__search_returnPressed() {
+      next();
+    }
+    void next() {
+      _help->find(_search->text());
+    }
+    void previous() {
+      _help->find(_search->text(), QTextDocument::FindBackward);
+    }
+    void startSearch() {
+      _search->show();
+      _search->setFocus();
+      _search->selectAll();
+    }
+  protected:
+    void keyPressEvent(QKeyEvent *e) {
+      if (e->matches(QKeySequence::Find))
+        startSearch();
+      if (e->matches(QKeySequence::FindNext))
+        next();
+      if (e->matches(QKeySequence::FindPrevious))
+        previous();
+      if (e->matches(QKeySequence::Cancel))
+        _search->hide();
+      return QDockWidget::keyPressEvent(e);
+    }
+  private:
+    const Script script;
+};
+
+#endif

src/help.ui

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Help</class>
+ <widget class="QDockWidget" name="Help">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Help?!?</string>
+  </property>
+  <widget class="QWidget" name="dockWidgetContents">
+   <layout class="QVBoxLayout" name="verticalLayout">
+    <item>
+     <widget class="QTextBrowser" name="_help">
+      <property name="readOnly">
+       <bool>true</bool>
+      </property>
+      <property name="openExternalLinks">
+       <bool>true</bool>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QLineEdit" name="_search"/>
+    </item>
+   </layout>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

src/makefile.am

@@ -8,9 +8,10 @@
 
 bin_PROGRAMS = webtester webrunner
 
-webtester_MOCFILES = moc_testgui.cxx moc_scriptfile.cxx moc_commands.cxx moc_webpage.cxx	\
+webtester_MOCFILES = moc_testgui.cxx moc_scriptfile.cxx moc_help.cxx	\
+                     moc_commands.cxx moc_webpage.cxx			\
                      moc_networkaccessmanager.cxx moc_editor.cxx
-webtester_UIFILES = ui_testgui.hxx ui_scriptfile.hxx
+webtester_UIFILES = ui_testgui.hxx ui_scriptfile.hxx ui_help.hxx
 webtester_SOURCES = version.cxx webtester.cxx exceptions.hxx version.hxx \
                     ${webtester_MOCFILES} ${webtester_UIFILES}
 

src/scriptfile.hxx

@@ -1,23 +1,35 @@
 #ifndef __SCRIPTFILE__HXX
 #define __SCRIPTFILE__HXX
 
+#include <commands.hxx>
 #include <ui_scriptfile.hxx>
+#include <QMessageBox>
+#include <QScrollBar>
+#include <QShortcut>
+#include <QTextDocumentFragment>
 #include <cassert>
 
 class ScriptFile: public QDockWidget, protected Ui::ScriptFile {
     Q_OBJECT
   Q_SIGNALS:
+    void modified(ScriptFile*);
     void link(QString);
     void include(QString);
     void close(ScriptFile*);
+    void run(const QString&, const QString&, bool, Script&);
+    void progress(QString, int, int, int);
   public:
-    ScriptFile(QWidget* p=0): QDockWidget(p) {
+    ScriptFile(QWidget* p = nullptr, QString name = QString()): QDockWidget(p), _name(name) {
       setupUi(this);
+      setWindowTitle(_name+"[*]");
+      assert(connect(_editor, SIGNAL(textChanged()), SLOT(modified())));
       assert(connect(_editor, SIGNAL(include(QString)), SIGNAL(include(QString))));
       assert(connect(_editor, SIGNAL(link(QString)), SIGNAL(link(QString))));
+      assert(connect(_editor, SIGNAL(cursorPositionChanged()), SLOT(setLine())));
+      assert(connect(_line, SIGNAL(valueChanged(int)), SLOT(gotoLine(int))));
       _searchBar->hide();
       _replaceBar->hide();
-      _pageBar->hide();
+      _status->setCurrentIndex(STATUS_NONE);
     }
     CodeEditor* editor() {
       return _editor;
@@ -30,10 +42,260 @@ class ScriptFile: public QDockWidget, protected Ui::ScriptFile {
       setWindowTitle(name+"[*]");
       setWindowModified(false);
     }
+  public Q_SLOTS:
+    void setLine() {
+      int pos(_editor->textCursor().blockNumber()+1);
+      if (pos) _line->setValue(pos);
+    }
+    void gotoLine(int line) {
+      _editor->gotoLine(line);
+    }
+    void load(QString name = QString()) {
+      if (isWindowModified() &&
+          QMessageBox::question(this, tr("Changes Not Saved"),
+                                tr("Load script without saving changes?"))
+          != QMessageBox::Yes)
+        return;
+      QString oldname(_name);
+      if (!name.isEmpty()) _name = name;
+      QFileInfo info(name);
+      if (info.absoluteDir()==QDir::current()) _name = info.fileName();
+      try {
+        QFile file(_name);
+        if (!file.open(QIODevice::ReadOnly|QIODevice::Text))
+          throw std::runtime_error("file open failed");
+        _editor->setPlainText(QString::fromUtf8(file.readAll()));
+        if (file.error()!=QFileDevice::NoError)
+          throw std::runtime_error("file read failed");
+        setWindowTitle(_name+"[*]");
+        setWindowModified(false);
+        _status->setCurrentIndex(STATUS_NONE);
+      } catch(const std::exception& x) {
+          QMessageBox::critical(this, tr("Open Failed"),
+                                tr("Reading test script failed, %2. "
+                                   "Cannot read test script from file %1.")
+                                .arg(_name).arg(x.what()));
+          _name = oldname;
+      }
+    }
+    void save(QString name = QString()) {
+      QString oldname(_name);
+      if (!name.isEmpty()) _name = name;
+      QFile file(_name);
+      try {
+        if (!file.open(QIODevice::WriteOnly | QIODevice::Text))
+          throw std::runtime_error("file open failed");
+        QTextStream out(&file);
+        out<<_editor->toPlainText();
+        if (out.status()!=QTextStream::Ok)
+          throw std::runtime_error(std::string("file write failed (")
+                                   +char(out.status()+48)+")");
+        setWindowModified(false);
+        setWindowTitle(_name+"[*]");
+      } catch(const std::exception& x) {
+        QMessageBox::critical(this, tr("Save Failed"),
+                              tr("Saving test script failed, %2. "
+                                 "Cannot write test script to file %1.")
+                              .arg(_name).arg(x.what()));
+        _name = oldname;
+      }
+    }
+    void clear() {
+      if (isWindowModified() &&
+          QMessageBox::question(this, tr("Changes Not Saved"),
+                                tr("Clear script without saving changes?"))
+          != QMessageBox::Yes)
+        return;
+      _editor->clear();
+      setWindowModified(false);
+    }
+    void modified() {
+      setWindowModified(true);
+      modified(this);
+    }
+    void run() {
+      _status->setCurrentIndex(STATUS_RUNNING);
+      bool oldRecordState(_record->isChecked());
+      _record->setChecked(false);
+      _record->setEnabled(false);
+      _run->setEnabled(false);
+      Script script;
+      try {
+        assert(connect(&script, SIGNAL(progress(QString, int, int, int)),
+                       SIGNAL(progress(QString, int, int, int))));
+        QString text(_editor->textCursor().selection().toPlainText());
+        if (text.isEmpty()) text = _editor->toPlainText();
+        run(_name, text, _screenshots->isChecked(), script);
+        _status->setCurrentIndex(STATUS_SUCCESS);
+      } catch (std::exception &x) {
+        _status->setCurrentIndex(STATUS_ERROR);
+        std::shared_ptr<Command> cmd(script.command());
+        if (cmd)
+          QMessageBox::critical(this,
+                                tr("Test Failed"),
+                                tr("<html>"
+                                   "  <h1>Error [%1]</h1>"
+                                   "  <dl>"
+                                   "    <dt>Command:</dt><dd><code>%3</code></dd>"
+                                   "    <dt>File:</dt><dd>%4</dd>"
+                                   "    <dt>Line:</dt><dd>%5</dd>"
+                                   "    <dt>Error Message:</dt><dd><pre>%2</pre></dd>"
+                                   "  </dl>"
+                                   "</html>")
+                                .arg(demangle(typeid(x).name()))
+                                .arg(x.what())
+                                .arg(cmd->command())
+                                .arg(cmd->file())
+                                .arg(cmd->line()));
+        else
+          QMessageBox::critical(this,
+                                tr("Test Failed"),
+                                tr("<html>"
+                                   "  <h1>Error [%1]</h1>"
+                                   "  <p><code>%2</code></p>"
+                                   "</html>")
+                                .arg(demangle(typeid(x).name()))
+                                .arg(QString(x.what()).replace("\n", "<br/>")));
+      }
+      _run->setEnabled(true);
+      _record->setEnabled(true);
+      _record->setChecked(oldRecordState);
+    }
+    void appendCommand(const QString& txt) {
+      if (!_record->isChecked()) return;
+      _editor->appendPlainText(txt);
+      QScrollBar *vb(_editor->verticalScrollBar());
+      _editor->moveCursor(QTextCursor::End);
+      _editor->ensureCursorVisible();
+      if (!vb) return;
+      vb->setValue(vb->maximum());
+    }
+    void appendCommand(const QString& selector, const QString& txt) {
+      if (!_record->isChecked()) return;
+      QString text(_editor->toPlainText());
+      QStringList lines(text.split("\n"));
+      bool changed(false);
+      while (lines.size() &&
+             (lines.last()=="click "+selector ||
+              lines.last().startsWith("setvalue "+selector+" -> "))) {
+        lines.removeLast();
+        changed = true;
+      }
+      if (changed) {
+        _editor->setPlainText(lines.join("\n"));
+        _editor->moveCursor(QTextCursor::End);
+        _editor->ensureCursorVisible();
+      }
+      appendCommand(txt);
+    }
+    void appendWebLoadFinished(bool ok) {
+      if (!_record->isChecked()) return;
+      QString text(_editor->toPlainText());
+      QStringList lines(text.split("\n"));
+      if (ok && lines.size()>1 &&
+          lines.last().startsWith("expect urlChanged") &&
+          lines.at(lines.size()-2)=="expect loadStarted") {
+        // replace three expect lines by one single line
+        QString url(lines.last().replace("expect urlChanged", "").trimmed());
+        lines.removeLast(); lines.removeLast();
+        _editor->setPlainText(lines.join("\n"));
+        _editor->moveCursor(QTextCursor::End);
+        _editor->ensureCursorVisible();
+        appendCommand("expect load "+url);
+      } else {
+        appendCommand("expect loadFinished "+QString(ok?"true":"false"));
+      }
+    }
+    void unsupportedContent(QNetworkReply* reply) {
+      if (!_record->isChecked()) return;
+      QString filename(reply->url().toString().split('/').last());
+      if (reply->header(QNetworkRequest::ContentDispositionHeader).isValid()) {
+        QString part(reply->header(QNetworkRequest::ContentDispositionHeader)
+                     .toString());
+        if (part.contains(QRegularExpression("attachment; *filename="))) {
+          part.replace(QRegularExpression(".*attachment; *filename="), "");
+          if (part.size()) filename = part;
+        }
+      }
+      QString text(_editor->toPlainText());
+      int pos1(text.lastIndexOf(QRegularExpression("^do ")));
+      int pos2(text.lastIndexOf(QRegularExpression("^load ")));
+      int pos3(text.lastIndexOf(QRegularExpression("^click ")));
+      text.insert(std::max({pos1, pos2, pos3}), "download "+filename);
+      _editor->setPlainText(text);
+      _editor->moveCursor(QTextCursor::End);
+      _editor->ensureCursorVisible();
+    }
+    void runEnabled(bool f = true) {
+      _run->setEnabled(f);
+    }
+    void on__run_clicked() {
+      run();
+    }
+    void on__from_textEdited(const QString& txt) {
+      on__next_clicked();
+    }
+    void on__next_clicked() {
+      if (_regex->isChecked())
+        _editor->find(QRegExp(_from->text()));
+      else
+        _editor->find(_from->text());
+    }
+    void on__previous_clicked() {
+      if (_regex->isChecked())
+        _editor->find(QRegExp(_from->text()), QTextDocument::FindBackward);
+      else
+        _editor->find(_from->text(), QTextDocument::FindBackward);
+    }
+    void on__replace_clicked() {
+      QTextCursor tc(_editor->textCursor());
+      if (tc.hasSelection()) tc.insertText(_to->text());
+    }
+    void on__replaceAll_clicked() {
+      QTextCursor cursor(_editor->textCursor());
+      if (_regex->isChecked())
+        _editor->setPlainText(_editor->toPlainText().replace(QRegExp(_from->text()), _to->text()));
+      else
+        _editor->setPlainText(_editor->toPlainText().replace(_from->text(), _to->text()));
+      _editor->setTextCursor(cursor);
+    }
+    void startSearch() {
+      _searchBar->show();
+      _from->setFocus();
+      _from->selectAll();
+    }
+    void startReplace() {
+      _searchBar->show();
+      _replaceBar->show();
+      _to->setFocus();
+      _to->selectAll();
+    }
   protected:
-    void closeEvent (QCloseEvent*) {
+    void closeEvent(QCloseEvent*) {
       close(this);
     }
+    void keyPressEvent(QKeyEvent *e) {
+      if (e->matches(QKeySequence::Find))
+        startSearch();
+      if (e->matches(QKeySequence::Replace))
+        startReplace();
+      if (e->matches(QKeySequence::FindNext))
+        on__next_clicked();
+      if (e->matches(QKeySequence::FindPrevious))
+        on__previous_clicked();
+      if (e->matches(QKeySequence::Cancel)) {
+        _searchBar->hide();
+        _replaceBar->hide();
+      }        
+      return QDockWidget::keyPressEvent(e);
+    }
+  private:
+    enum RunStatus {
+      STATUS_NONE = 0,
+      STATUS_RUNNING,
+      STATUS_SUCCESS,
+      STATUS_ERROR
+    };
   private:
     QString _name;
 };

src/scriptfile.ui

@@ -7,16 +7,142 @@
     <x>0</x>
     <y>0</y>
     <width>628</width>
-    <height>378</height>
+    <height>593</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>DockW&amp;idget</string>
+   <string>Do&amp;ckWidget</string>
   </property>
   <widget class="QWidget" name="dockWidgetContents">
-   <layout class="QVBoxLayout" name="verticalLayout">
+   <layout class="QVBoxLayout" name="verticalLayout_2">
     <item>
-     <widget class="CodeEditor" name="_editor"/>
+     <layout class="QVBoxLayout" name="verticalLayout"/>
+    </item>
+    <item>
+     <layout class="QHBoxLayout" name="horizontalLayout_4">
+      <item>
+       <widget class="CodeEditor" name="_editor"/>
+      </item>
+      <item>
+       <layout class="QVBoxLayout" name="verticalLayout_8">
+        <item>
+         <widget class="QPushButton" name="_record">
+          <property name="text">
+           <string>Record</string>
+          </property>
+          <property name="checkable">
+           <bool>true</bool>
+          </property>
+          <property name="checked">
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="_run">
+          <property name="text">
+           <string>Run</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="_screenshots">
+          <property name="text">
+           <string>Screenshots</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="verticalSpacer">
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>28</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item alignment="Qt::AlignHCenter">
+         <widget class="QStackedWidget" name="_status">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="currentIndex">
+           <number>0</number>
+          </property>
+          <widget class="QWidget" name="page_6"/>
+          <widget class="QWidget" name="page_5">
+           <layout class="QGridLayout" name="gridLayout_9">
+            <item row="0" column="0" alignment="Qt::AlignHCenter">
+             <widget class="QLabel" name="label_6">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>&lt;div style=&quot;font-size: xx-large&quot;&gt;⌛&lt;/div&gt;</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </widget>
+          <widget class="QWidget" name="page_3">
+           <layout class="QGridLayout" name="gridLayout">
+            <item row="0" column="0" alignment="Qt::AlignHCenter">
+             <widget class="QLabel" name="label_4">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>&lt;div style=&quot;font-size: xx-large; color: green&quot;&gt;✔&lt;/div&gt;</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </widget>
+          <widget class="QWidget" name="page_4">
+           <layout class="QGridLayout" name="gridLayout_8">
+            <item row="0" column="0" alignment="Qt::AlignHCenter">
+             <widget class="QLabel" name="label_5">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>&lt;div style=&quot;font-size: xx-large; color: red&quot;&gt;✘&lt;/div&gt;</string>
+              </property>
+              <property name="scaledContents">
+               <bool>true</bool>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </widget>
+         </widget>
+        </item>
+        <item>
+         <widget class="QSpinBox" name="_line">
+          <property name="maximum">
+           <number>999999999</number>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
     </item>
     <item>
      <widget class="QWidget" name="_searchBar" native="true">
@@ -39,9 +165,9 @@
         </widget>
        </item>
        <item>
-        <widget class="QPushButton" name="_all">
+        <widget class="QCheckBox" name="_regex">
          <property name="text">
-          <string>all</string>
+          <string>RegularExpression</string>
          </property>
         </widget>
        </item>
@@ -62,25 +188,9 @@
         </widget>
        </item>
        <item>
-        <widget class="QCheckBox" name="_regex">
+        <widget class="QPushButton" name="_replaceAll">
          <property name="text">
-          <string>RegularExpression</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-    </item>
-    <item>
-     <widget class="QWidget" name="_pageBar" native="true">
-      <layout class="QHBoxLayout" name="horizontalLayout_3">
-       <item>
-        <widget class="QSpinBox" name="_page"/>
-       </item>
-       <item>
-        <widget class="QPushButton" name="_goPage">
-         <property name="text">
-          <string>page</string>
+          <string>replace all</string>
          </property>
         </widget>
        </item>
@@ -98,5 +208,38 @@
   </customwidget>
  </customwidgets>
  <resources/>
- <connections/>
+ <connections>
+  <connection>
+   <sender>_from</sender>
+   <signal>returnPressed()</signal>
+   <receiver>_next</receiver>
+   <slot>click()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>259</x>
+     <y>496</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>303</x>
+     <y>505</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>_to</sender>
+   <signal>returnPressed()</signal>
+   <receiver>_replace</receiver>
+   <slot>click()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>564</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>562</x>
+     <y>558</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>

src/testgui.hxx

@@ -1,7 +1,7 @@
 /*! @file
 
     @id $Id$
-*/
+    */
 //       1         2         3         4         5         6         7         8
 // 45678901234567890123456789012345678901234567890123456789012345678901234567890
 #ifndef TESTGUI_HXX
@@ -11,6 +11,8 @@
 #include <editor.hxx>
 #include <commands.hxx>
 #include <scriptfile.hxx>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wconversion"
 #include <QMainWindow>
 #include <QSettings>
 #include <QWebFrame>
@@ -19,12 +21,13 @@
 #include <QScrollBar>
 #include <QFile>
 #include <QMessageBox>
+#include <QShortcut>
 #include <QCompleter>
 #include <ui_testgui.hxx>
-#include <stdexcept>
 #include <QNetworkReply>
 #include <QEvent>
-#include <QTextDocumentFragment>
+#pragma GCC diagnostic pop
+#include <stdexcept>
 #include <mrw/stdext.hxx>
 
 class TestGUI: public QMainWindow, protected Ui::TestGUI {
@@ -39,20 +42,24 @@ class TestGUI: public QMainWindow, protected Ui::TestGUI {
         _inEventFilter(false) {
       setWindowTitle("[*]");
       setupUi(this);
-      menuViews->addAction(_scriptDock->toggleViewAction());
+      #if QT_VERSION >= 0x050600
+      setDockOptions(dockOptions()|QMainWindow::GroupedDragging);
+      #endif
       menuViews->addAction(_setupScriptDock->toggleViewAction());
-      menuViews->addAction(_scriptCommandsDock->toggleViewAction());
+      menuViews->addAction(_helpDock->toggleViewAction());
       menuViews->addAction(_domDock->toggleViewAction());
       menuViews->addAction(_linksDock->toggleViewAction());
       menuViews->addAction(_formsDock->toggleViewAction());
       menuViews->addAction(_logDock->toggleViewAction());
       menuViews->addAction(_sourceDock->toggleViewAction());
       menuViews->addAction(_executeDock->toggleViewAction());
+      menuHelp->addAction(_helpDock->toggleViewAction());
+      statusbar->addPermanentWidget(_progress = new QProgressBar(), 1);
       _progress->hide();
-      _status->setCurrentIndex(STATUS_NONE);
       QSettings settings("mrw", "webtester");
       restoreGeometry(settings.value("geometry").toByteArray());
       restoreState(settings.value("windowstate").toByteArray());
+      _actionCursorFollowsFiles->setChecked(settings.value("cursorfollowsfiles").toBool());
       _url->completer()->setFilterMode(Qt::MatchContains);
       _url->completer()->setCaseSensitivity(Qt::CaseInsensitive);
       _url->completer()->setCompletionMode(QCompleter::PopupCompletion);
@@ -63,23 +70,22 @@ class TestGUI: public QMainWindow, protected Ui::TestGUI {
       _web->setPage(pg);
       _web->installEventFilter(this); // track mouse and keyboard
       pg->setForwardUnsupportedContent(true);
-      _commands->setText(Script().commands(Script::HTML));
+      assert(connect(menuFile, SIGNAL(aboutToShow()), SLOT(fileMenuOpened())));
+      assert(connect(QApplication::instance(), SIGNAL(focusChanged(QWidget*, QWidget*)),
+                      SLOT(focusChanged(QWidget*, QWidget*))));
       assert(connect(pg, SIGNAL(uploadFile(QString)), SLOT(uploadFile(QString))));
       assert(connect(pg, SIGNAL(unsupportedContent(QNetworkReply*)),
                      SLOT(unsupportedContent(QNetworkReply*))));
       assert(connect(pg, SIGNAL(downloadRequested(const QNetworkRequest&)),
                      SLOT(downloadRequested(const QNetworkRequest&))));
-      //assert(connect(_testscript, SIGNAL(include(QString)), SLOT(include(QString))));
-      assert(connect(_testscript, SIGNAL(link(QString)), SLOT(include(QString))));
       if (setupScript.size()) loadSetup(setupScript);
-      if (scriptFile.size()) loadFile(scriptFile);
+      if (scriptFile.size()) load(scriptFile);
     }
     virtual ~TestGUI() {}
   public Q_SLOTS:
     void on__load_clicked() {
       enterText(true);
-      if (_record->isChecked())
-        appendCommand("load "+map(_url->currentText()));
+      appendCommand("load "+map(_url->currentText()));
       storeUrl(_url->currentText());
       _webprogress->setFormat(_url->currentText());
       _web->load(_url->currentText());
@@ -88,126 +94,53 @@ class TestGUI: public QMainWindow, protected Ui::TestGUI {
       enterText(true);
       _web->stop();
     }
+    void on__actionAbout_triggered() {
+      QMessageBox::about(this, tr("About"),
+                         tr("Webtester\n"
+                            "Version: %1\n"
+                            "Builddate: %2\n"
+                            "Release: %3\n"
+                            "Libraries:\n"
+                            "qt-%4 (%5)\n")
+                         .arg(VERSION)
+                         .arg(BUILD_DATE)
+                         .arg(PACKAGE_VERSION)
+                         .arg(qVersion())
+                         .arg(QT_VERSION_STR));
+    }
+    void on__actionNew_triggered() {
+      QString name(QFileDialog::getSaveFileName(this, tr("Filename for new Test Script")));
+      QFileInfo info(name);
+      if (info.absoluteDir()==QDir::current()) name = info.fileName();
+      if (!name.isEmpty()) newScript(name);
+    }
     void on__actionOpen_triggered() {
       QString name(QFileDialog::getOpenFileName(this, tr("Open Test Script")));
       if (name.isEmpty()) return;
-      loadFile(name);
-      _status->setCurrentIndex(STATUS_NONE);
+      load(name);
     }
     void on__actionOpenSetupScript_triggered() {
       QString name(QFileDialog::getOpenFileName(this, tr("Open Setup Script")));
       if (name.isEmpty()) return;
       loadSetup(name);
-      _status->setCurrentIndex(STATUS_NONE);
     }
     void on__actionRevertToSaved_triggered() {
-      loadFile(_filename);
-      _status->setCurrentIndex(STATUS_NONE);
+      ScriptFile* active(activeScriptFile());
+      if (active) active->load();
     }
     void on__actionSaveAs_triggered() {
+      ScriptFile* active(activeScriptFile());
+      if (!active) return;
       QString name(QFileDialog::getSaveFileName(this, tr("Save Test Script")));
-      if (name.isEmpty()) return;
-      _filename = name;
-      on__actionSave_triggered();
-      _status->setCurrentIndex(STATUS_NONE);
+      if (!name.isEmpty()) active->save(name);
     }
     void on__actionSave_triggered() {
-      QFile file(_filename);
-      try {
-        if (!file.open(QIODevice::WriteOnly | QIODevice::Text))
-          throw std::runtime_error("file open failed");
-        QTextStream out(&file);
-        out<<_testscript->toPlainText();
-        if (out.status()!=QTextStream::Ok)
-          throw std::runtime_error(std::string("file write failed (")
-                                   +char(out.status()+48)+")");
-        _actionSave->setEnabled(true);
-        _actionRevertToSaved->setEnabled(true);
-        setWindowModified(false);
-        setWindowTitle(_filename+"[*]");
-      } catch(const std::exception& x) {
-        QMessageBox::critical(this, tr("Save Failed"),
-                              tr("Saving test script failed, %2. "
-                                 "Cannot write test script to file %1.")
-                              .arg(_filename).arg(x.what()));
-      }
-      _status->setCurrentIndex(STATUS_NONE);
+      ScriptFile* active(activeScriptFile());
+      if (active) active->save();
     }
     void on__actionClear_triggered() {
-      if (isWindowModified() &&
-          QMessageBox::question(this, tr("Changes Not Saved"),
-                                tr("Clear script without saving changes?"))
-          != QMessageBox::Yes)
-        return;
-      _testscript->clear();
-      _log->clear();
-      _filename.clear();
-      _actionSave->setEnabled(false);
-      _actionRevertToSaved->setEnabled(false);
-      setWindowTitle("[*]");
-      setWindowModified(false);
-      _status->setCurrentIndex(STATUS_NONE);
-    }
-    void on__run_clicked() {
-      _progress->reset();
-      _progress->show();
-      _status->setCurrentIndex(STATUS_RUNNING);
-      bool oldRecordState(_record->isChecked());
-      _record->setChecked(false);
-      _record->setEnabled(false);
-      _run->setEnabled(false);
-      Script script;
-      try {
-        connect(&script, SIGNAL(logging(QString)), SLOT(logging(QString)));
-        connect(&script, SIGNAL(progress(QString, int, int)), SLOT(progress(QString, int, int)));
-        std::shared_ptr<xml::Node> testsuites(new xml::Node("testsuite"));
-        if (_setupscriptactive->isEnabled()
-            && _setupscriptactive->isChecked()) {
-          script.parse(_setupscript->toPlainText().split('\n'), "setup");
-          script.run(_web->page()->mainFrame(), testsuites, QString(),
-                     _screenshots->isChecked());
-          script.reset();
-        }
-        QString text(_testscript->textCursor().selection().toPlainText());
-        if (text.isEmpty()) text = _testscript->toPlainText();
-        script.parse(text.split('\n'), "script");
-        script.run(_web->page()->mainFrame(), testsuites, QString(),
-                   _screenshots->isChecked());
-        _status->setCurrentIndex(STATUS_SUCCESS);
-      } catch (std::exception &x) {
-        _status->setCurrentIndex(STATUS_ERROR);
-        std::shared_ptr<Command> cmd(script.command());
-        if (cmd)
-          QMessageBox::critical(this,
-                                tr("Test Failed"),
-                                tr("<html>"
-                                   "  <h1>Error [%1]</h1>"
-                                   "  <dl>"
-                                   "    <dt>Command:</dt><dd><code>%3</code></dd>"
-                                   "    <dt>File:</dt><dd>%4</dd>"
-                                   "    <dt>Line:</dt><dd>%5</dd>"
-                                   "    <dt>Error Message:</dt><dd><pre>%2</pre></dd>"
-                                   "  </dl>"
-                                   "</html>")
-                                .arg(demangle(typeid(x).name()))
-                                .arg(x.what())
-                                .arg(cmd->command())
-                                .arg(cmd->file())
-                                .arg(cmd->line()));
-        else
-          QMessageBox::critical(this,
-                                tr("Test Failed"),
-                                tr("<html>"
-                                   "  <h1>Error [%1]</h1>"
-                                   "  <p><code>%2</code></p>"
-                                   "</html>")
-                                .arg(demangle(typeid(x).name()))
-                                .arg(QString(x.what()).replace("\n", "<br/>")));
-      }
-      _run->setEnabled(true);
-      _record->setEnabled(true);
-      _record->setChecked(oldRecordState);
-      _progress->hide();
+      ScriptFile* active(activeScriptFile());
+      if (active) active->clear();
     }
     void on__focused_clicked() {
       enterText(true);
@@ -228,8 +161,7 @@ class TestGUI: public QMainWindow, protected Ui::TestGUI {
     }
     void on__web_linkClicked(const QUrl& url) {
       enterText(true);
-      if (_record->isChecked())
-        appendCommand("load "+map(url.url()));
+      appendCommand("load "+map(url.url()));
     }
     void on__web_loadProgress(int progress) {
       enterText(true);
@@ -237,8 +169,7 @@ class TestGUI: public QMainWindow, protected Ui::TestGUI {
     }
     void on__web_loadStarted() {
       enterText(true);
-      if (_record->isChecked())
-        appendCommand("expect "+map("loadStarted"));
+      appendCommand("expect "+map("loadStarted"));
       _webprogress->setValue(0);
       _urlStack->setCurrentIndex(PROGRESS_VIEW);
     }
@@ -252,8 +183,7 @@ class TestGUI: public QMainWindow, protected Ui::TestGUI {
       _webprogress->setFormat(url.url());
       storeUrl(url);
       enterText(true);
-      if (_record->isChecked())
-        appendCommand("expect "+map("urlChanged "+url.url()));
+      appendCommand("expect "+map("urlChanged "+url.url()));
     }
     void on__web_selectionChanged() {
       _source->setPlainText(_web->hasSelection()
@@ -262,24 +192,8 @@ class TestGUI: public QMainWindow, protected Ui::TestGUI {
     }
     void on__web_loadFinished(bool ok) {
       enterText(true);
-      if (_record->isChecked()) {
-        QString text(_testscript->toPlainText());
-        QStringList lines(text.split("\n"));
-        if (ok && lines.size()>1 &&
-            lines.last().startsWith("expect urlChanged") &&
-            lines.at(lines.size()-2)=="expect loadStarted") {
-          // replace three expect lines by one single line
-          QString url(lines.last().replace("expect urlChanged", "").trimmed());
-          lines.removeLast(); lines.removeLast();
-          _testscript->setPlainText(lines.join("\n"));
-          _testscript->moveCursor(QTextCursor::End);
-          _testscript->ensureCursorVisible();
-          appendCommand("expect "+map("load "+url));
-        } else {
-          appendCommand("expect "+map("loadFinished "
-                                      +QString(ok?"true":"false")));
-        }
-      }
+      for (auto testscript: _testscripts)
+        testscript->appendWebLoadFinished(ok);
       _urlStack->setCurrentIndex(URL_VIEW);
       on__web_selectionChanged();
       setLinks();
@@ -287,8 +201,7 @@ class TestGUI: public QMainWindow, protected Ui::TestGUI {
       setDom();
     }
     void on__setupscript_textChanged() {
-      bool oldRecordState(_record->isChecked());
-      _run->setEnabled(false);
+      for (auto testscript: _testscripts) testscript->runEnabled(false);
       _setupscriptactive->setEnabled(false);
       try {
         _setupscriptstatus->setText(trUtf8("?"));
@@ -305,8 +218,7 @@ class TestGUI: public QMainWindow, protected Ui::TestGUI {
       } catch (std::exception &x) {
         _setupscriptstatus->setText(trUtf8("✘"));
       }
-      _run->setEnabled(true);
-      _record->setChecked(oldRecordState);
+      for (auto testscript: _testscripts) testscript->runEnabled(true);
     }
     void on__forms_currentItemChanged(QTreeWidgetItem* item, QTreeWidgetItem*) {
       if (!item) return;
@@ -318,32 +230,13 @@ class TestGUI: public QMainWindow, protected Ui::TestGUI {
     }
     void uploadFile(QString filename) {
       enterText(true);
-      if (_record->isChecked())
-        appendCommand("upload "+map(filename));
+      appendCommand("upload "+map(filename));
     }
     void unsupportedContent(QNetworkReply* reply) {
-      if (!_record->isChecked()) return;
-      QString filename(reply->url().toString().split('/').last());
-      if (reply->header(QNetworkRequest::ContentDispositionHeader).isValid()) {
-        QString part(reply->header(QNetworkRequest::ContentDispositionHeader)
-                     .toString());
-        if (part.contains(QRegularExpression("attachment; *filename="))) {
-          part.replace(QRegularExpression(".*attachment; *filename="), "");
-          if (part.size()) filename = part;
-        }
-      }
-      QString text(_testscript->toPlainText());
-      int pos1(text.lastIndexOf(QRegularExpression("^do ")));
-      int pos2(text.lastIndexOf(QRegularExpression("^load ")));
-      int pos3(text.lastIndexOf(QRegularExpression("^click ")));
-      text.insert(std::max({pos1, pos2, pos3}), "download "+filename);
-      _testscript->setPlainText(text);
-      _testscript->moveCursor(QTextCursor::End);
-      _testscript->ensureCursorVisible();
+      for (auto testscript: _testscripts) testscript->unsupportedContent(reply);
     }
     void downloadRequested(const QNetworkRequest&) {
-      if (_record->isChecked())
-        appendCommand("download2");
+      appendCommand("download2");
     }
     void logging(const QString& txt) {
       _log->appendPlainText(txt);
@@ -351,53 +244,105 @@ class TestGUI: public QMainWindow, protected Ui::TestGUI {
       if (!vb) return;
       vb->setValue(vb->maximum());
     }
-    void progress(const QString& txt, int pos, int max) {
-      _progress->setFormat(QString("%1 — %p%").arg(txt));
-      _progress->setMinimum(0);
-      _progress->setMaximum(max);
-      _progress->setValue(pos);
+    void fileMenuOpened() {
+      focusChanged(nullptr, nullptr);
     }
-    void appendCommand(const QString& txt) {
-      _testscript->appendPlainText(txt);
-      QScrollBar *vb(_testscript->verticalScrollBar());
-      _testscript->moveCursor(QTextCursor::End);
-      _testscript->ensureCursorVisible();
-      if (!vb) return;
-      vb->setValue(vb->maximum());
+    void modified(ScriptFile* win) {
+      focusChanged(nullptr, win);
     }
-    void include(QString name) {
-      if (_testscripts.contains(name)) return;
-      _testscripts[name] = new ScriptFile(this);
-      // assert(connect(_testscripts[name], SIGNAL(include(QString)), SLOT(include(QString))));
-      assert(connect(_testscripts[name], SIGNAL(link(QString)), SLOT(include(QString))));
-      assert(connect(_testscripts[name], SIGNAL(close(ScriptFile*)), SLOT(remove(ScriptFile*))));
-      QFile file(name);
+    void focusChanged(QWidget*, QWidget* focus) {
+      ScriptFile* active(activeScriptFile(focus));
+      if (active)
+        setWindowFilePath(active->name());
+      else
+        setWindowFilePath(QString());
+      _actionRevertToSaved->setEnabled(active);
+      _actionSaveAs->setEnabled(active);
+      _actionSave->setEnabled(active&&active->isWindowModified());
+      _actionClear->setEnabled(active);
+    }
+    QString activate(QString name) {
+      QFileInfo info(name);
+      if (info.absoluteDir()==QDir::current()) name = info.fileName();
+      if (!_testscripts.contains(name)) return load(name);
+      _testscripts[name]->show();
+      _testscripts[name]->raise();
+      return name;
+    }
+    QString load(QString name) {
+      QFileInfo info(name);
+      if (info.absoluteDir()==QDir::current()) name = info.fileName();
+      if (_testscripts.contains(name)) try {
+          _testscripts[name]->load(name);
+          return activate(name);
+        } catch(const std::exception& x) {
+          remove(_testscripts[name]);
+        }
+      newScript(name);
       try {
-        if (!file.open(QIODevice::ReadOnly|QIODevice::Text))
-          throw std::runtime_error("file open failed");
-        _testscripts[name]->editor()->setPlainText(QString::fromUtf8(file.readAll()));
-        if (file.error()!=QFileDevice::NoError)
-          throw std::runtime_error("file read failed");
-        _testscripts[name]->name(name);
-        tabifyDockWidget(_scriptDock, _testscripts[name]);
-        // QDockWidget* d(0);
-        // for (QWidget* w(QApplication::focusWidget()); w&&!(d=qobject_cast<QDockWidget*>(w));
-        //      w=qobject_cast<QWidget*>(w->parent()));
-        // if (d) d->raise();
-        _testscripts[name]->raise();
+        _testscripts[name]->load(name);
+        return activate(name);
       } catch(const std::exception& x) {
         remove(_testscripts[name]);
+        return QString();
       }
     }
+    QString newScript(QString name) {
+      if (_testscripts.contains(name)) return activate(name);
+      QDockWidget* first(_testscripts.isEmpty()?_setupScriptDock:_testscripts.last());
+      _testscripts[name] = new ScriptFile(this, name);
+      assert(connect(_testscripts[name], SIGNAL(modified(ScriptFile*)), SLOT(modified(ScriptFile*))));
+      assert(connect(_testscripts[name], SIGNAL(link(QString)), SLOT(activate(QString))));
+      assert(connect(_testscripts[name], SIGNAL(close(ScriptFile*)), SLOT(remove(ScriptFile*))));
+      assert(connect(_testscripts[name], SIGNAL(run(const QString&, const QString&, bool, Script&)),
+                     SLOT(run(const QString&, const QString&, bool, Script&))));
+      assert(connect(_testscripts[name], SIGNAL(progress(QString, int, int, int)),
+                     SLOT(progress(QString, int, int, int))));
+      tabifyDockWidget(first, _testscripts[name]);
+      return name;
+    }
     void remove(ScriptFile* scriptfile) {
+      /// @todo check if modified
       _testscripts.remove(scriptfile->name());
       delete scriptfile;
     }
+    void run(const QString& name, const QString& text, bool screenshots, Script& script) {
+      std::shared_ptr<xml::Node> testsuites(new xml::Node("testsuite"));
+      assert(connect(&script, SIGNAL(logging(QString)), SLOT(logging(QString))));
+      if (_setupscriptactive->isEnabled()
+          && _setupscriptactive->isChecked()) {
+        script.parse(_setupscript->toPlainText().split('\n'), "setup");
+        script.run(_web->page()->mainFrame(), testsuites, QString(), screenshots);
+        script.reset();
+      }
+      script.parse(text.split('\n'), name);
+      script.run(_web->page()->mainFrame(), testsuites, QString(), screenshots);
+    }
+    void progress(QString file, int line, int pos, int max) {
+      _progress->setVisible(max>0&&pos!=max);
+      _progress->setFormat(QString("%1:%2 — %p%").arg(file).arg(line));
+      _progress->setMinimum(0);
+      _progress->setMaximum(max);
+      _progress->setValue(pos);
+      if (!_actionCursorFollowsFiles->isChecked() || file.isEmpty() || file=="setup") return;
+      try {
+        QString name(activate(file));
+        if (!name.isEmpty() && _testscripts.contains(name))
+          _testscripts[name]->gotoLine(line);
+      } catch (...) {} // ignore
+    }
   protected:
+    ScriptFile* activeScriptFile(QWidget* focus=nullptr) {
+      ScriptFile* active(nullptr);
+      for (QObject* wid(focus?focus:QApplication::focusWidget()); !active && wid; wid = wid->parent())
+        active = qobject_cast<ScriptFile*>(wid);
+      return active;
+    }
     void closeEvent(QCloseEvent* event) {
       QSettings settings("mrw", "webtester");
       settings.setValue("geometry", saveGeometry());
       settings.setValue("windowstate", saveState());
+      settings.setValue("cursorfollowsfiles", _actionCursorFollowsFiles->isChecked());
       if (isWindowModified() &&
           QMessageBox::question(this, tr("Changes Not Saved"),
                                 tr("Leave without saving changes?"))
@@ -407,7 +352,7 @@ class TestGUI: public QMainWindow, protected Ui::TestGUI {
       }
       QMainWindow::closeEvent(event);
     }
-    bool eventFilter(QObject*, QEvent* event) {
+    bool eventFilter(QObject* target, QEvent* event) {
       if (_inEventFilter) return false;
       _inEventFilter = true;
       enterText();
@@ -440,41 +385,39 @@ class TestGUI: public QMainWindow, protected Ui::TestGUI {
         case QEvent::MouseButtonRelease: {
           enterText(true);
           _lastFocused=element;
-          if (_record->isChecked()) {
-            if (!element.isNull()) {
-              QString selected(selector(element));
-              if (handleMooTools(_lastFocused)) {
-                // handled in handleMooTools
-              } else if (_lastFocused.tagName()=="SELECT") {
-                // click on a select results in a value change
-                // find all selected options ...
-                QStringList v;
-                for (QWebElement option: _lastFocused.findAll("option")) {
-                  //! @bug QT does not support selected
-                  if (option.evaluateJavaScript("this.selected").toBool())
-                    v += value(option);
-                }
-                setValue(selected, v);
-              } else if (_lastFocused.tagName()=="TEXTAREA" ||
-                         (_lastFocused.tagName()=="INPUT" &&
-                          _lastFocused.attribute("type")=="text")) {
-                // user clickt in a text edit field, so not the klick
-                // is important, but the text that will be typed
-                _typing = true;
-              } else {
-                if (_web->page()->selectedText() != "") {
-                  // user has selected a text, append a check
-                  appendCommand("exists "+map(selected)
-                                +" -> "+_web->page()->selectedText());
-                  _web->page()->findText(QString());
-                } else {
-                  // user has clicked without selection, append a click
-                  appendCommand("click "+map(selected));
-                }
+          if (!element.isNull()) {
+            QString selected(selector(element));
+            if (handleMooTools(_lastFocused)) {
+              // handled in handleMooTools
+            } else if (_lastFocused.tagName()=="SELECT") {
+              // click on a select results in a value change
+              // find all selected options ...
+              QStringList v;
+              for (QWebElement option: _lastFocused.findAll("option")) {
+                //! @bug QT does not support selected
+                if (option.evaluateJavaScript("this.selected").toBool())
+                  v += value(option);
               }
+              setValue(selected, v);
+            } else if (_lastFocused.tagName()=="TEXTAREA" ||
+                       (_lastFocused.tagName()=="INPUT" &&
+                        _lastFocused.attribute("type")=="text")) {
+              // user clickt in a text edit field, so not the klick
+              // is important, but the text that will be typed
+              _typing = true;
             } else {
-              appendCommand("# click, but where?");
+              if (_web->page()->selectedText() != "") {
+                // user has selected a text, append a check
+                appendCommand("exists "+map(selected)
+                              +" -> "+_web->page()->selectedText());
+                _web->page()->findText(QString());
+              } else {
+                // user has clicked without selection, append a click
+                appendCommand("click "+map(selected));
+              }
             }
+          } else {
+            appendCommand("# click, but where?");
           }
         } break;
         case QEvent::MouseButtonPress: {
@@ -505,26 +448,6 @@ class TestGUI: public QMainWindow, protected Ui::TestGUI {
         _url->setCurrentText(u.url());
       }
     }
-    void loadFile(QString name) {
-      QFile file(name);
-      try {
-        if (!file.open(QIODevice::ReadOnly|QIODevice::Text))
-          throw std::runtime_error("file open failed");
-        _testscript->setPlainText(QString::fromUtf8(file.readAll()));
-        if (file.error()!=QFileDevice::NoError)
-          throw std::runtime_error("file read failed");
-        _filename = name;
-        _actionSave->setEnabled(true);
-        _actionRevertToSaved->setEnabled(true);
-        setWindowTitle(name+"[*]");
-        setWindowModified(false);
-      } catch(const std::exception& x) {
-          QMessageBox::critical(this, tr("Open Failed"),
-                                tr("Reading test script failed, %2. "
-                                   "Cannot read test script from file %1.")
-                                .arg(name).arg(x.what()));
-      }
-    }
     void loadSetup(QString name) {
       QFile file(name);
       try {
@@ -535,10 +458,10 @@ class TestGUI: public QMainWindow, protected Ui::TestGUI {
           throw std::runtime_error("file read failed");
         on__setupscript_textChanged();
       } catch(const std::exception& x) {
-          QMessageBox::critical(this, tr("Open Failed"),
-                                tr("Reading test script failed, %2. "
-                                   "Cannot read test script from file %1.")
-                                .arg(name).arg(x.what()));
+        QMessageBox::critical(this, tr("Open Failed"),
+                              tr("Reading test script failed, %2. "
+                                 "Cannot read test script from file %1.")
+                              .arg(name).arg(x.what()));
       }
     }
     void enterText(bool force=false) {
@@ -561,9 +484,9 @@ class TestGUI: public QMainWindow, protected Ui::TestGUI {
         return QString(); // error
     }
     void highlight(QWebElement element) {
-        element
-          .evaluateJavaScript("var selection = window.getSelection();"
-                              "selection.setBaseAndExtent(this, 0, this, 1);");
+      element
+        .evaluateJavaScript("var selection = window.getSelection();"
+                            "selection.setBaseAndExtent(this, 0, this, 1);");
     }
     QWebElement focused(QMouseEvent* event = 0) {
       for (QWebElement element: _web->page()->currentFrame()->findAllElements("*")) {
@@ -644,41 +567,26 @@ class TestGUI: public QMainWindow, protected Ui::TestGUI {
       return in;
     }
     void javascript(const QString& selector, QString code) {
-      if (_record->isChecked())
-        appendCommand("do "+map(selector)+"\n  "
-                      +map(code).replace("\n", "\n  "));
-    }
-    void cleanup(const QString& selector) {
-      QString text(_testscript->toPlainText());
-      QStringList lines(text.split("\n"));
-      bool changed(false);
-      while (lines.size() &&
-             (lines.last()=="click "+selector ||
-              lines.last().startsWith("setvalue "+selector+" -> "))) {
-        lines.removeLast();
-        changed = true;
-      }
-      if (changed) {
-        _testscript->setPlainText(lines.join("\n"));
-        _testscript->moveCursor(QTextCursor::End);
-        _testscript->ensureCursorVisible();
-      }
+      appendCommand("do "+map(selector)+"\n  "
+                    +map(code).replace("\n", "\n  "));
     }
     void setValue(const QString& selector, QString code) {
-      if (_record->isChecked()) {
-        cleanup(selector);
-        appendCommand("setvalue "+map(selector)+" -> '"
-                      +map(code).replace("'", "\\'").replace("\n", "\\n")+"'");
-      }
+      appendCommand(selector,
+                    "setvalue "+map(selector)+" -> '"
+                    +map(code).replace("'", "\\'").replace("\n", "\\n")+"'");
     }
     void setValue(const QString& selector, QStringList code) {
-      if (_record->isChecked()) {
-        cleanup(selector);
-        appendCommand("setvalue "+map(selector)+" -> '"+
-                      map(code.replaceInStrings("'", "\\'")
-                          .replaceInStrings("\n", "\\n")
-                          .join("', '")+"'"));
-      }
+      appendCommand(selector,
+                    "setvalue "+map(selector)+" -> '"+
+                    map(code.replaceInStrings("'", "\\'")
+                        .replaceInStrings("\n", "\\n")
+                        .join("', '")+"'"));
+    }
+    void appendCommand(const QString& txt) {
+      for (auto testscript: _testscripts) testscript->appendCommand(txt);
+    }
+    void appendCommand(const QString& selector, const QString& txt) {
+      for (auto testscript: _testscripts) testscript->appendCommand(selector, txt);
     }
     bool handleMooTools(QWebElement element) {
       QString selected(selector(element));
@@ -697,10 +605,9 @@ class TestGUI: public QMainWindow, protected Ui::TestGUI {
         return true;
       } else if (mooComboItem.hasMatch()) {
         // special treatment for item in moo tools combobox
-        appendCommand
-          ("click realmouse "+map("li.active-result[data-option-array-index=\""
-                                  +element.attribute("data-option-array-index")
-                                  +"\"]"));
+        appendCommand("click realmouse "+map("li.active-result[data-option-array-index=\""
+                                             +element.attribute("data-option-array-index")
+                                             +"\"]"));
         appendCommand("sleep "+map("1"));
         return true;
       } else if (element.tagName()=="INPUT") {
@@ -861,7 +768,7 @@ class TestGUI: public QMainWindow, protected Ui::TestGUI {
         case QEvent::LayoutDirectionChange: return "QEvent::LayoutDirectionChange - The direction of layouts changed.";
         case QEvent::LayoutRequest: return "QEvent::LayoutRequest - Widget layout needs to be redone.";
         case QEvent::Leave: return "QEvent::Leave - Mouse leaves widget's boundaries.";
-        //case QEvent::LeaveEditFocus: return "QEvent::LeaveEditFocus - An editor widget loses focus for editing. QT_KEYPAD_NAVIGATION must be defined.";
+          //case QEvent::LeaveEditFocus: return "QEvent::LeaveEditFocus - An editor widget loses focus for editing. QT_KEYPAD_NAVIGATION must be defined.";
         case QEvent::LeaveWhatsThisMode: return "QEvent::LeaveWhatsThisMode - Send to toplevel widgets when the application leaves \"What's This?\" mode.";
         case QEvent::LocaleChange: return "QEvent::LocaleChange - The system locale has changed.";
         case QEvent::NonClientAreaMouseButtonDblClick: return "QEvent::NonClientAreaMouseButtonDblClick - A mouse double click occurred outside the client area.";
@@ -887,7 +794,7 @@ class TestGUI: public QMainWindow, protected Ui::TestGUI {
         case QEvent::Polish: return "QEvent::Polish - The widget is polished.";
         case QEvent::PolishRequest: return "QEvent::PolishRequest - The widget should be polished.";
         case QEvent::QueryWhatsThis: return "QEvent::QueryWhatsThis - The widget should accept the event if it has \"What's This?\" help.";
-        //case QEvent::ReadOnlyChange: return "QEvent::ReadOnlyChange - Widget's read-only state has changed (since Qt 5.4).";
+          //case QEvent::ReadOnlyChange: return "QEvent::ReadOnlyChange - Widget's read-only state has changed (since Qt 5.4).";
         case QEvent::RequestSoftwareInputPanel: return "QEvent::RequestSoftwareInputPanel - A widget wants to open a software input panel (SIP).";
         case QEvent::Resize: return "QEvent::Resize - Widget's size changed (QResizeEvent).";
         case QEvent::ScrollPrepare: return "QEvent::ScrollPrepare - The object needs to fill in its geometry information (QScrollPrepareEvent).";
@@ -942,12 +849,6 @@ class TestGUI: public QMainWindow, protected Ui::TestGUI {
       URL_VIEW = 0,
       PROGRESS_VIEW
     };
-    enum RunStatus {
-      STATUS_NONE = 0,
-      STATUS_RUNNING,
-      STATUS_SUCCESS,
-      STATUS_ERROR
-    };
   private:
     QString _filename;
     QWebElement _lastFocused; // cache for last focussed element
@@ -956,6 +857,7 @@ class TestGUI: public QMainWindow, protected Ui::TestGUI {
     bool _inEventFilter; // actually handling event filter
     Script _setupScript;
     QMap<QString, ScriptFile*> _testscripts;
+    QProgressBar* _progress = nullptr;
 };
 
 #endif // TESTGUI_HXX

src/testgui.ui

@@ -6,10 +6,13 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>888</width>
-    <height>1180</height>
+    <width>852</width>
+    <height>759</height>
    </rect>
   </property>
+  <property name="focusPolicy">
+   <enum>Qt::NoFocus</enum>
+  </property>
   <property name="windowTitle">
    <string/>
   </property>
@@ -100,8 +103,8 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>888</width>
-     <height>30</height>
+     <width>852</width>
+     <height>34</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuViews">
@@ -113,32 +116,38 @@
     <property name="title">
      <string>F&amp;ile</string>
     </property>
+    <addaction name="_actionNew"/>
     <addaction name="_actionOpen"/>
     <addaction name="_actionOpenSetupScript"/>
+    <addaction name="separator"/>
     <addaction name="_actionSave"/>
     <addaction name="_actionSaveAs"/>
-    <addaction name="separator"/>
-    <addaction name="_actionRun"/>
-    <addaction name="_actionRunLine"/>
-    <addaction name="separator"/>
     <addaction name="_actionRevertToSaved"/>
     <addaction name="_actionClear"/>
+    <addaction name="separator"/>
     <addaction name="_actionQuit"/>
    </widget>
    <widget class="QMenu" name="menuHelp">
     <property name="title">
-     <string>Help</string>
+     <string>&amp;Help</string>
     </property>
-    <addaction name="_actionCommands"/>
+    <addaction name="_actionAbout"/>
+   </widget>
+   <widget class="QMenu" name="menuOptions">
+    <property name="title">
+     <string>Options</string>
+    </property>
+    <addaction name="_actionCursorFollowsFiles"/>
    </widget>
    <addaction name="menuFile"/>
+   <addaction name="menuOptions"/>
    <addaction name="menuViews"/>
    <addaction name="menuHelp"/>
   </widget>
   <widget class="QStatusBar" name="statusbar"/>
   <widget class="QDockWidget" name="_domDock">
    <property name="windowTitle">
-    <string>D&amp;OM Tree</string>
+    <string>DOM &amp;Tree</string>
    </property>
    <attribute name="dockWidgetArea">
     <number>2</number>
@@ -245,7 +254,7 @@
     <string>Execute &amp;JavaScript on First Selected Item</string>
    </property>
    <attribute name="dockWidgetArea">
-    <number>8</number>
+    <number>1</number>
    </attribute>
    <widget class="QWidget" name="dockWidgetContents_10">
     <layout class="QVBoxLayout" name="verticalLayout_5">
@@ -393,144 +402,6 @@ this.dispatchEvent(evObj);</string>
     </layout>
    </widget>
   </widget>
-  <widget class="QDockWidget" name="_scriptDock">
-   <property name="windowTitle">
-    <string>&amp;Test Script</string>
-   </property>
-   <attribute name="dockWidgetArea">
-    <number>4</number>
-   </attribute>
-   <widget class="QWidget" name="dockWidgetContents_12">
-    <layout class="QVBoxLayout" name="verticalLayout_9">
-     <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_6">
-       <item>
-        <widget class="CodeEditor" name="_testscript"/>
-       </item>
-       <item>
-        <layout class="QVBoxLayout" name="verticalLayout_8">
-         <item>
-          <widget class="QPushButton" name="_record">
-           <property name="text">
-            <string>Record</string>
-           </property>
-           <property name="checkable">
-            <bool>true</bool>
-           </property>
-           <property name="checked">
-            <bool>false</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="_run">
-           <property name="text">
-            <string>Run</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QCheckBox" name="_screenshots">
-           <property name="text">
-            <string>Screenshots</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <spacer name="verticalSpacer">
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>28</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item alignment="Qt::AlignHCenter">
-          <widget class="QStackedWidget" name="_status">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="currentIndex">
-            <number>0</number>
-           </property>
-           <widget class="QWidget" name="page_6"/>
-           <widget class="QWidget" name="page_5">
-            <layout class="QGridLayout" name="gridLayout_9">
-             <item row="0" column="0" alignment="Qt::AlignHCenter">
-              <widget class="QLabel" name="label_6">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="text">
-                <string>&lt;div style=&quot;font-size: xx-large&quot;&gt;⌛&lt;/div&gt;</string>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-           <widget class="QWidget" name="page_3">
-            <layout class="QGridLayout" name="gridLayout">
-             <item row="0" column="0" alignment="Qt::AlignHCenter">
-              <widget class="QLabel" name="label_4">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="text">
-                <string>&lt;div style=&quot;font-size: xx-large; color: green&quot;&gt;✔&lt;/div&gt;</string>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-           <widget class="QWidget" name="page_4">
-            <layout class="QGridLayout" name="gridLayout_8">
-             <item row="0" column="0" alignment="Qt::AlignHCenter">
-              <widget class="QLabel" name="label_5">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="text">
-                <string>&lt;div style=&quot;font-size: xx-large; color: red&quot;&gt;✘&lt;/div&gt;</string>
-               </property>
-               <property name="scaledContents">
-                <bool>true</bool>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-          </widget>
-         </item>
-        </layout>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <widget class="QProgressBar" name="_progress">
-       <property name="value">
-        <number>24</number>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </widget>
-  </widget>
   <widget class="QDockWidget" name="_logDock">
    <property name="windowTitle">
     <string>Scri&amp;pt Run Log</string>
@@ -605,24 +476,13 @@ this.dispatchEvent(evObj);</string>
     </layout>
    </widget>
   </widget>
-  <widget class="QDockWidget" name="_scriptCommandsDock">
+  <widget class="Help" name="_helpDock">
    <property name="windowTitle">
-    <string>Script &amp;Commands</string>
+    <string>&amp;Help</string>
    </property>
    <attribute name="dockWidgetArea">
     <number>4</number>
    </attribute>
-   <widget class="QWidget" name="dockWidgetContents_3">
-    <layout class="QGridLayout" name="gridLayout_7">
-     <item row="0" column="0">
-      <widget class="QTextBrowser" name="_commands">
-       <property name="readOnly">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </widget>
   </widget>
   <action name="_actionDOMTree">
    <property name="checkable">
@@ -699,6 +559,9 @@ this.dispatchEvent(evObj);</string>
    </property>
   </action>
   <action name="_actionSaveAs">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
    <property name="text">
     <string>Save &amp;As ...</string>
    </property>
@@ -714,20 +577,15 @@ this.dispatchEvent(evObj);</string>
     <string>Ctrl+Q</string>
    </property>
   </action>
-  <action name="_actionRun">
-   <property name="text">
-    <string>&amp;Run</string>
-   </property>
-   <property name="shortcut">
-    <string>Ctrl+R</string>
-   </property>
-  </action>
   <action name="_actionRunLine">
    <property name="text">
     <string>Run &amp;Line</string>
    </property>
   </action>
   <action name="_actionClear">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
    <property name="text">
     <string>&amp;Clear</string>
    </property>
@@ -770,9 +628,28 @@ this.dispatchEvent(evObj);</string>
     <string>O&amp;pen Setup Script ...</string>
    </property>
   </action>
-  <action name="_actionCommands">
+  <action name="_actionAbout">
    <property name="text">
-    <string>&amp;Commands ...</string>
+    <string>&amp;About</string>
+   </property>
+  </action>
+  <action name="_actionCursorFollowsFiles">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;Cursor Follows Files</string>
+   </property>
+   <property name="toolTip">
+    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When running a script, the currently running file and line is highlighted. So the cursor follows the current file and line when running a script.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+   </property>
+  </action>
+  <action name="_actionNew">
+   <property name="text">
+    <string>&amp;New ...</string>
    </property>
   </action>
  </widget>
@@ -787,12 +664,20 @@ this.dispatchEvent(evObj);</string>
    <extends>QPlainTextEdit</extends>
    <header>editor.hxx</header>
   </customwidget>
+  <customwidget>
+   <class>Help</class>
+   <extends>QDockWidget</extends>
+   <header>help.hxx</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>_load</tabstop>
   <tabstop>_web</tabstop>
  </tabstops>
- <resources/>
+ <resources>
+  <include location="ressourcen.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>_selector</sender>
@@ -801,12 +686,12 @@ this.dispatchEvent(evObj);</string>
    <slot>click()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>785</x>
-     <y>1144</y>
+     <x>267</x>
+     <y>589</y>
     </hint>
     <hint type="destinationlabel">
-     <x>875</x>
-     <y>1075</y>
+     <x>360</x>
+     <y>496</y>
     </hint>
    </hints>
   </connection>
@@ -817,12 +702,12 @@ this.dispatchEvent(evObj);</string>
    <slot>click()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>785</x>
-     <y>1144</y>
+     <x>267</x>
+     <y>589</y>
     </hint>
     <hint type="destinationlabel">
-     <x>874</x>
-     <y>1144</y>
+     <x>359</x>
+     <y>589</y>
     </hint>
    </hints>
   </connection>
@@ -837,8 +722,8 @@ this.dispatchEvent(evObj);</string>
      <y>-1</y>
     </hint>
     <hint type="destinationlabel">
-     <x>630</x>
-     <y>971</y>
+     <x>369</x>
+     <y>599</y>
     </hint>
    </hints>
   </connection>
@@ -849,8 +734,8 @@ this.dispatchEvent(evObj);</string>
    <slot>setChecked(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>630</x>
-     <y>971</y>
+     <x>369</x>
+     <y>599</y>
     </hint>
     <hint type="destinationlabel">
      <x>-1</x>
@@ -869,8 +754,8 @@ this.dispatchEvent(evObj);</string>
      <y>-1</y>
     </hint>
     <hint type="destinationlabel">
-     <x>748</x>
-     <y>374</y>
+     <x>851</x>
+     <y>337</y>
     </hint>
    </hints>
   </connection>
@@ -881,8 +766,8 @@ this.dispatchEvent(evObj);</string>
    <slot>setChecked(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>748</x>
-     <y>374</y>
+     <x>851</x>
+     <y>337</y>
     </hint>
     <hint type="destinationlabel">
      <x>-1</x>
@@ -901,8 +786,8 @@ this.dispatchEvent(evObj);</string>
      <y>-1</y>
     </hint>
     <hint type="destinationlabel">
-     <x>748</x>
-     <y>537</y>
+     <x>851</x>
+     <y>468</y>
     </hint>
    </hints>
   </connection>
@@ -913,8 +798,8 @@ this.dispatchEvent(evObj);</string>
    <slot>setChecked(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>748</x>
-     <y>537</y>
+     <x>851</x>
+     <y>468</y>
     </hint>
     <hint type="destinationlabel">
      <x>-1</x>
@@ -933,8 +818,8 @@ this.dispatchEvent(evObj);</string>
      <y>-1</y>
     </hint>
     <hint type="destinationlabel">
-     <x>748</x>
-     <y>699</y>
+     <x>851</x>
+     <y>599</y>
     </hint>
    </hints>
   </connection>
@@ -945,8 +830,8 @@ this.dispatchEvent(evObj);</string>
    <slot>setChecked(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>748</x>
-     <y>699</y>
+     <x>851</x>
+     <y>599</y>
     </hint>
     <hint type="destinationlabel">
      <x>-1</x>
@@ -966,7 +851,7 @@ this.dispatchEvent(evObj);</string>
     </hint>
     <hint type="destinationlabel">
      <x>182</x>
-     <y>971</y>
+     <y>730</y>
     </hint>
    </hints>
   </connection>
@@ -978,39 +863,7 @@ this.dispatchEvent(evObj);</string>
    <hints>
     <hint type="sourcelabel">
      <x>182</x>
-     <y>971</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>-1</x>
-     <y>-1</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>_actionTestScript</sender>
-   <signal>triggered(bool)</signal>
-   <receiver>_scriptDock</receiver>
-   <slot>setVisible(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>-1</x>
-     <y>-1</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>443</x>
-     <y>155</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>_scriptDock</sender>
-   <signal>visibilityChanged(bool)</signal>
-   <receiver>_actionTestScript</receiver>
-   <slot>setChecked(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>443</x>
-     <y>155</y>
+     <y>730</y>
     </hint>
     <hint type="destinationlabel">
      <x>-1</x>
@@ -1029,8 +882,8 @@ this.dispatchEvent(evObj);</string>
      <y>-1</y>
     </hint>
     <hint type="destinationlabel">
-     <x>842</x>
-     <y>1004</y>
+     <x>851</x>
+     <y>730</y>
     </hint>
    </hints>
   </connection>
@@ -1041,8 +894,8 @@ this.dispatchEvent(evObj);</string>
    <slot>setChecked(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>842</x>
-     <y>1004</y>
+     <x>851</x>
+     <y>730</y>
     </hint>
     <hint type="destinationlabel">
      <x>-1</x>
@@ -1066,22 +919,6 @@ this.dispatchEvent(evObj);</string>
     </hint>
    </hints>
   </connection>
-  <connection>
-   <sender>_actionRun</sender>
-   <signal>triggered()</signal>
-   <receiver>_run</receiver>
-   <slot>click()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>-1</x>
-     <y>-1</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>299</x>
-     <y>90</y>
-    </hint>
-   </hints>
-  </connection>
   <connection>
    <sender>_url</sender>
    <signal>activated(int)</signal>
@@ -1089,28 +926,12 @@ this.dispatchEvent(evObj);</string>
    <slot>click()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>277</x>
-     <y>315</y>
+     <x>513</x>
+     <y>257</y>
     </hint>
     <hint type="destinationlabel">
-     <x>549</x>
-     <y>315</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>_testscript</sender>
-   <signal>modificationChanged(bool)</signal>
-   <receiver>TestGUI</receiver>
-   <slot>setWindowModified(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>126</x>
-     <y>144</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>443</x>
-     <y>589</y>
+     <x>603</x>
+     <y>258</y>
     </hint>
    </hints>
   </connection>

src/webpage.hxx

@@ -79,7 +79,9 @@ class TestWebPage: public QWebPage {
       if (_unattended) {
         return;
       } else {
-        return QWebPage::javaScriptAlert(frame, msg);
+        return;
+        /// @todo handle javascript alerts
+        //return QWebPage::javaScriptAlert(frame, msg);
       }
     }
     virtual bool javaScriptConfirm(QWebFrame* frame, const QString& msg) {
@@ -87,7 +89,9 @@ class TestWebPage: public QWebPage {
       if (_unattended) {
         return true;
       } else {
-        return QWebPage::javaScriptConfirm(frame, msg);
+        return true;
+        /// @todo handle javascript confirmations
+        //return QWebPage::javaScriptConfirm(frame, msg);
       }
     }
     virtual void javaScriptConsoleMessage(const QString& msg,
@@ -96,7 +100,9 @@ class TestWebPage: public QWebPage {
       if (_unattended) {
         return;
       } else {
-        return QWebPage::javaScriptConsoleMessage(msg, line, src);
+        return;
+        /// @todo handle javascript console messages
+        //return QWebPage::javaScriptConsoleMessage(msg, line, src);
       }
     }
     virtual bool javaScriptPrompt(QWebFrame* frame, const QString& msg,
@@ -105,7 +111,9 @@ class TestWebPage: public QWebPage {
       if (_unattended) {
         return true;
       } else {
-        return QWebPage::javaScriptPrompt(frame, msg, defaultValue, result);
+        return true;
+        /// @todo handle javascript prompts
+        //return QWebPage::javaScriptPrompt(frame, msg, defaultValue, result);
       }
     }
   private:

src/webtester.cxx

@@ -4,22 +4,22 @@
 #include <version.hxx>
 
 int main(int argc, char *argv[]) try {
-  QApplication a(argc, argv);
-  a.setApplicationDisplayName(a.tr("WebTester"));
-  a.setApplicationName(webtester::package_name().c_str());
-  a.setApplicationVersion(webtester::version().c_str());
+  QApplication app(argc, argv);
+  app.setApplicationDisplayName(app.tr("WebTester"));
+  app.setApplicationName(webtester::package_name().c_str());
+  app.setApplicationVersion(webtester::version().c_str());
   QCommandLineParser parser;
   parser.addHelpOption();
   parser.addOption(QCommandLineOption
                    (QStringList()<<"u"<<"url",
                     "set initial URL to <url>", "url"));
-  parser.process(a);
+  parser.process(app);
   QStringList scripts(parser.positionalArguments());
-  TestGUI w(0, parser.value("url"),
-            scripts.size()>1?scripts[0]:"",
-            scripts.size()>1?scripts[1]:scripts.size()?scripts[0]:"");
-  w.show();
-  return a.exec();
+  TestGUI win(0, parser.value("url"),
+              scripts.size()>1?scripts[0]:"",
+              scripts.size()>1?scripts[1]:scripts.size()?scripts[0]:"");
+  win.show();
+  return app.exec();
  } catch (std::exception &x) {
   std::cerr<<"**** error: "<<x.what()<<std::endl;
   return 1;

template.sh

@@ -1,5 +1,7 @@
 #!/bin/bash -e
 
+# documentation: run with option --help
+
 ##########################################################################################
 #### template for bash scripts #### START BELOW ##########################################
 ##########################################################################################
@@ -45,25 +47,25 @@ message() {
 # write a success message
 success() {
     echo -n "${bold}${green}success" 1>&2
-    append_msg $* 1>&2
+    append_msg "$*" 1>&2
 }
 
 # write a notice
 notice() {
     echo -n "${bold}${yellow}notice" 1>&2
-    append_msg $* 1>&2
+    append_msg "$*" 1>&2
 }
 
 # write a warning message
 warning() {
     echo -en "${bold}${red}warning" 1>&2
-    append_msg $* 1>&2
+    append_msg "$*" 1>&2
 }
 
 # write error message
 error() {
     echo -en "${bold}${red}error" 1>&2
-    append_msg $* 1>&2
+    append_msg "$*" 1>&2
 }
 
 # run a command, print the result and abort in case of error
@@ -91,9 +93,10 @@ run() {
             exit 1
         else
             warning "ignored return code: $res"
+            return 0
         fi
     else
-        success
+        return 1
     fi
 }
 
@@ -119,7 +122,6 @@ function traperror() {
             exit $e
         fi
     done
-    success
     exit 0
 }
 
@@ -135,7 +137,7 @@ trap 'traperror "$? ${PIPESTATUS[@]}" $LINENO $BASH_LINENO "$BASH_COMMAND" "${FU
 ######################################################### commandline parameter evaluation
 while test $# -gt 0; do
     case "$1" in
-        (--help|-h) less <<EOF
+        (--help|-h) cat <<EOF
 SYNOPSIS
 
   $0 [OPTIONS]
@@ -157,4 +159,3 @@ EOF
 done
 
 ##################################################################################### Main
-