set interval to correct integer

fix executeable name in systemd service
fix failing build --> exchange libs
2021-05-05 16:36:38 +02:00 · 2021-05-05 16:28:33 +02:00 · 2021-04-09 18:45:01 +02:00 · 2021-04-09 16:10:13 +02:00 · 2021-02-01 18:33:36 +01:00 · 2020-06-08 11:17:08 +02:00
21 changed files with 765 additions and 206 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -1,49 +1,68 @@
-image: luki42/dynuiprefresher_build:latest
-
 stages:
-  - cmake
  - build
-  - build_package
-  - test
-
-cache:
-  paths:
-    - build/
-    - src/
-    - inc/
-    - tests/
-    - postinst
-
-cmake:
-  stage: cmake
-  script:
-    - cmake -S . -B build
+  - post

+# Unix Build
 build:
  stage: build
+  image: luki42/dynuiprefresher_build:latest
  script:
+    - cmake -S . -B build -D WinBuild=OFF -D GUI=OFF
    - cd build
-    - make
+    - make dynuiprefresher
  artifacts:
    paths:
-      - "build/bin/*"
+      - build/bin/


 build_package:
-  stage: build_package
+  stage: post
+  image: luki42/dynuiprefresher_build:latest
  script:
+    - cmake -S . -B build -D WinBuild=OFF -D GUI=OFF
    - cd build
    - make package
  artifacts:
    paths:
-      - "build/packages/*"
+      - build/packages/
+  needs:
+    - build

 test:
-  stage: test
+  stage: post
+  image: luki42/dynuiprefresher_build:latest
  script:
+    - cmake -S . -B build -D WinBuild=OFF -D GUI=OFF
    - cd build
-    - make test
-    - make build-xml
+    - make build-test
  artifacts:
    reports:
-      junit: build/report.xml
+      junit: build/*.xml
+  needs:
+    - build
+
+# Windows Build
+build_win64:
+  stage: build
+  image: luki42/dynuiprefresher_build:windows
+  script:
+    - cmake -S . -B build -D WinBuild=ON
+    - cd build
+    - make dynuiprefresher
+  artifacts:
+    paths:
+      - build/bin/
+
+
+build_package_win64:
+  stage: post
+  image: luki42/dynuiprefresher_build:windows
+  script:
+    - cmake -S . -B build -D WinBuild=ON
+    - cd build
+    - make package
+  artifacts:
+    paths:
+      - build/packages/
+  needs:
+    - build_win64
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -9,8 +9,8 @@
 # for test build gtest needs to be installed.

 cmake_minimum_required(VERSION 3.13)
-project(iprefresher DESCRIPTION "Dynu ip refresher")
-SET(PROJECT_VERSION 1.3.3)
+project(dynuiprefresher DESCRIPTION "Dynu ip refresher" LANGUAGES)
+SET(PROJECT_VERSION 1.3.4)

 # CONFIGURATION
 SET(CMAKE_BUILD_TYPE Release) # manually SET build type (Release / Debug)
@ -20,11 +20,12 @@ option(BUILD_DOC "Build documentation" ON) # additional dependency for Doxygen
 option(PACKAGING "Allow Packaging to <exe>, <deb> or <rpm>" ON) # additional dependencies for RPMbuild,dpkg  or NSIS
 option(TESTS "Build Tests" ON) # additional dependencies for GTEST - to build tests
 option(GUI "Build GUI elements" ON) # additional dependencies to QT libraries needed
-set(WinBuild false)
+option(WinBuild "cross compile for Windows Platform" ON)

 # helper variables
 SET(CMAKE_CXX_STANDARD 17)
 string(TIMESTAMP TIMESTAMP_NOW "%d.%m.%Y")
+SET(Application_Name "dynuiprefresher")

 SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
@ -32,6 +33,7 @@ SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)

 # setup winbuild compilers
 if (${WinBuild})
+    message(STATUS "setup Mingw Toolchain for cross compile.")
    set(LIBSUFFIX .dll)
    set(SUFFIX .exe)

@ -41,9 +43,9 @@ if (${WinBuild})
    #set(TOOLCHAIN_PREFIX i686-w64-mingw32)

    # cross compilers to use for C and C++
-    set(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}-gcc)
-    set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}-g++)
-    set(CMAKE_RC_COMPILER ${TOOLCHAIN_PREFIX}-windres)
+    set(CMAKE_C_COMPILER /usr/bin/${TOOLCHAIN_PREFIX}-gcc)
+    set(CMAKE_CXX_COMPILER /usr/bin/${TOOLCHAIN_PREFIX}-g++)
+    set(CMAKE_RC_COMPILER /usr/bin/${TOOLCHAIN_PREFIX}-windres)

    # target environment on the build host system
    set(CMAKE_FIND_ROOT_PATH /usr/${TOOLCHAIN_PREFIX})
@ -65,18 +67,31 @@ if (${WinBuild})
    # or set(CMAKE_CXX_STANDARD_LIBRARIES -lcurl -lpthread -static-libgcc -static-libstdc++ -lcrypto -lssl -lws2_32 -static -DCURL_STATICLIB)
    # or add_definitions(-DCURL_STATICLIB)

-    # windows config path is same as executable
-    set(CONFIG_PATH "./iprefresher.cfg")
+    # windows config path is in %appdata% folder of user
+    set(CONFIG_PATH "std::string(std::getenv(\"USERPROFILE\")) + \"\\\\AppData\\\\Roaming\\\\DynuIPrefresher\\\\\"")
+    # temp file is also stored in appdata folder
+    set(TempFilePath "std::string(std::getenv(\"USERPROFILE\")) + \"\\\\AppData\\\\Roaming\\\\DynuIPrefresher\\\\\"")
 else ()
+    message(STATUS "using nativ gcc toolchain.")
    set(LIBSUFFIX .so)
    set(SUFFIX "")

-    # set /etc/ config path
-    set(CONFIG_PATH "/etc/iprefresher.cfg")
+    # set linux config path
+    set(CONFIG_PATH "\"/etc/\"")
+    # set path of temp file
+    set(TempFilePath "\"/var/tmp/\"")
 endif ()

+# test compiler settings and enable languages here
+message("")
+message(STATUS "Testing the C++ compiler!")
+enable_language(CXX)
+message("")
+message(STATUS "Testing the C compiler!")
+enable_language(C)

 # config libs
+message("")
 message(STATUS "Config of Libraries")
 # libcurl
 if (${WinBuild})
@ -89,7 +104,7 @@ if (${WinBuild})
    message(STATUS "Using CURL lib(s): ${CURL_LIBRARIES}")
    message(STATUS "")

-    include_directories(${CURL_INCLUDE_DIRS} inc)
+    include_directories(${CURL_INCLUDE_DIRS})

    # configure libconfig
    FIND_PATH(LIBCONFIG++_INCLUDE_DIRS libconfig.h++ /usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/include/) # search for libconfig include headers
@ -98,11 +113,11 @@ if (${WinBuild})
    message(STATUS "Using LIBCONFIG++ include dir(s): ${LIBCONFIG++_INCLUDE_DIRS}")
    message(STATUS "Using LIBCONFIG++ lib(s): ${LIBCONFIG++_LIBRARIES}")

-    include_directories(${LIBCONFIG++_INCLUDE_DIRS} inc)
-
    if (${GUI})
        set(CMAKE_PREFIX_PATH "/usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/lib/cmake")
    endif ()
+
+    include_directories(${LIBCONFIG++_INCLUDE_DIRS})
 else ()
    find_package(CURL REQUIRED)
    if (CURL_INCLUDE_DIRS AND CURL_LIBRARIES)
@ -112,7 +127,7 @@ else ()
    else ()
        message(FATAL_ERROR "Could not find CURL")
    endif ()
-    include_directories(${CURL_INCLUDE_DIR} inc)
+    include_directories(${CURL_INCLUDE_DIR})

    message("")
    # libconfig
@ -134,6 +149,7 @@ else ()
    include_directories(${LIBCONFIG_INCLUDE_DIRS})
 endif ()

+
 if (${GUI})
    set(CMAKE_AUTOMOC ON)
    set(CMAKE_INCLUDE_CURRENT_DIR ON)
@ -143,14 +159,16 @@ if (${GUI})
    find_package(Qt5Sql REQUIRED)
 endif ()

+include_directories(inc)
+
 message("")

 #read sample config
-FILE(READ ${CMAKE_SOURCE_DIR}/config/iprefresher.cfg SAMPLECONFIG)
-#add version header
-FILE(WRITE ${CMAKE_SOURCE_DIR}/inc/Version.h
+FILE(READ ${CMAKE_SOURCE_DIR}/config/dynuiprefresher.cfg SAMPLECONFIG)
+#add StaticData header
+FILE(WRITE ${CMAKE_SOURCE_DIR}/inc/StaticData.h
        "/**
- * Version header to store Version, Config dir and a Sample config
+ * StaticData header to store Version, Config dir and a Sample config
 * Do not edit this file manually, it is generated by the cmake script!
 *
 * @author Lukas Heiligenbrunner
@ -161,9 +179,11 @@ FILE(WRITE ${CMAKE_SOURCE_DIR}/inc/Version.h

 #include <string>

-namespace Version {
+namespace StaticData {
  const std::string VERSION = \"${PROJECT_VERSION}\";
-  const std::string ConfigDir = \"${CONFIG_PATH}\";
+  const std::string TempFilePath = ${TempFilePath};
+  const std::string ConfigDir = ${CONFIG_PATH};
+  const std::string ConfName = \"${Application_Name}.cfg\";
  const std::string SAMPLECONFIG = R\"(${SAMPLECONFIG})\";
 }"
        )
@ -174,7 +194,7 @@ add_library(api ${LIB_METHOD}
        src/api/DynuAPI.cpp
        src/api/IPAPI.cpp)

-add_library(dynuiprefresher ${LIB_METHOD}
+add_library(libdynuiprefresher ${LIB_METHOD}
        src/IPRefresher.cpp
        src/Config.cpp
        src/IpHelper.cpp
@ -182,10 +202,10 @@ add_library(dynuiprefresher ${LIB_METHOD}
        src/Logger.cpp
        )

-add_executable(iprefresher src/main.cpp)
+add_executable(${Application_Name} src/main.cpp)

 # LINK generated LIBS #
-target_link_libraries(iprefresher dynuiprefresher api ${CURL_LIBRARIES} ${LIBCONFIG++_LIBRARIES})
+target_link_libraries(${Application_Name} libdynuiprefresher api ${CURL_LIBRARIES} ${LIBCONFIG++_LIBRARIES})

 if (${GUI})
    set(QT5_LIBRARIES Qt5::Widgets Qt5::PrintSupport Qt5::Sql)
@ -200,13 +220,19 @@ if (${GUI})
    #
    qt5_wrap_ui(UI_GENERATED_HEADERS ${UI_SOURCES})

-    add_executable(iprefresher-gui
+    add_executable(${Application_Name}-gui
            src/maingui.cpp
            src/gui/MainWindow.cpp
-            src/gui/MainWindow.h ${UI_GENERATED_HEADERS})
+            inc/gui/MainWindow.h
+            ${UI_GENERATED_HEADERS})
+
+    if (${WinBuild})
+        # hide console window when starting ui on windows
+        set_target_properties(${Application_Name}-gui PROPERTIES LINK_FLAGS "-mwindows")
+    endif ()

    # LINK generated LIBS #
-    target_link_libraries(iprefresher-gui -lpthread dynuiprefresher api ${CURL_LIBRARIES} ${LIBCONFIG++_LIBRARIES} ${QT5_LIBRARIES})
+    target_link_libraries(${Application_Name}-gui -lpthread libdynuiprefresher api ${CURL_LIBRARIES} ${LIBCONFIG++_LIBRARIES} ${QT5_LIBRARIES})
 endif ()

 # setting install targets
@ -214,29 +240,79 @@ IF (NOT ${WinBuild})
    # INSTALL to Linux SYSTEM #

    # install binaries
-    install(TARGETS iprefresher DESTINATION usr/bin)
+    install(
+            TARGETS ${Application_Name}
+            DESTINATION usr/bin
+            COMPONENT ${Application_Name})
    # install systemd service and enable it
-    install(FILES service/iprefresher.service DESTINATION lib/systemd/system)
+    install(
+            FILES service/${Application_Name}.service
+            DESTINATION lib/systemd/system
+            COMPONENT ${Application_Name})
+
+    if (${GUI})
+        # install binaries
+        install(
+                TARGETS ${Application_Name}-gui
+                DESTINATION usr/bin
+                COMPONENT ${Application_Name}gui)
+    endif ()
 ELSE ()
    # INSTALL to Windows SYSTEM #

    # install binary to current folder
-    set_target_properties(iprefresher PROPERTIES SUFFIX ".exe")
-    install(TARGETS iprefresher DESTINATION .)
+    set_target_properties(${Application_Name} PROPERTIES SUFFIX ".exe")
+    install(
+            TARGETS ${Application_Name}
+            DESTINATION .
+            COMPONENT ${Application_Name})

    # install .dll dependencies
    # todo check if files exist...
+    SET(LIBBINARYPATH "/usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/bin")
    install(FILES /usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/bin/libcurl-4.dll
-            /usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/bin/libssh2-1.dll
-            /usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/bin/libstdc++-6.dll
-            /usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/bin/libgcc_s_seh-1.dll
-            /usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/bin/libcrypto-1_1-x64.dll
-            /usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/bin/libssl-1_1-x64.dll
-            /usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/bin/libwinpthread-1.dll
-            /usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/bin/zlib1.dll
-            /usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/bin/libidn2-0.dll
-            /usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/bin/libconfig++-11.dll
-            DESTINATION .)
+            ${LIBBINARYPATH}/libssh2-1.dll
+            ${LIBBINARYPATH}/libstdc++-6.dll
+            ${LIBBINARYPATH}/libgcc_s_seh-1.dll
+            ${LIBBINARYPATH}/libcrypto-1_1-x64.dll
+            ${LIBBINARYPATH}/libssl-1_1-x64.dll
+            ${LIBBINARYPATH}/libwinpthread-1.dll
+            ${LIBBINARYPATH}/zlib1.dll
+            ${LIBBINARYPATH}/libidn2-0.dll
+            ${LIBBINARYPATH}/libconfig++-11.dll
+            DESTINATION .
+            COMPONENT ${Application_Name})
+
+    if (${GUI})
+        # install binaries
+        set_target_properties(${Application_Name}-gui PROPERTIES SUFFIX ".exe")
+        install(
+                TARGETS ${Application_Name}-gui
+                DESTINATION .
+                COMPONENT ${Application_Name}gui)
+
+        # install .dll dependencies
+        install(FILES
+                ${LIBBINARYPATH}/Qt5Widgets.dll
+                ${LIBBINARYPATH}/Qt5Core.dll
+                ${LIBBINARYPATH}/Qt5Gui.dll
+                ${LIBBINARYPATH}/iconv.dll
+                ${LIBBINARYPATH}/libpcre2-16-0.dll
+                ${LIBBINARYPATH}/libpng16-16.dll
+                ${LIBBINARYPATH}/libharfbuzz-0.dll
+                ${LIBBINARYPATH}/libglib-2.0-0.dll
+                ${LIBBINARYPATH}/libintl-8.dll
+                ${LIBBINARYPATH}/libpcre-1.dll
+                ${LIBBINARYPATH}/libbz2-1.dll
+                ${LIBBINARYPATH}/libfreetype-6.dll
+                DESTINATION .
+                COMPONENT ${Application_Name}gui)
+
+        install(FILES
+                /usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/lib/qt5/plugins/platforms/qwindows.dll
+                DESTINATION ./platforms
+                COMPONENT ${Application_Name}gui)
+    endif ()
 ENDIF ()

 if (${PACKAGING})
@ -262,8 +338,10 @@ if (${PACKAGING})
 if [ ! -f ${CONFIG_PATH} ]; then
    cat > ${CONFIG_PATH} <<- EOM
 ${SAMPLECONFIG}EOM
-fi\n"
-                )
+fi
+
+systemctl enable ${Application_Name}.service
+systemctl restart ${Application_Name}.service")


        SET(CPACK_DEB_COMPONENT_INSTALL 1)
@ -280,8 +358,19 @@ fi\n"
            message(STATUS "found rpm build executeable --> able to build rpm")
            SET(CPACK_GENERATOR "${CPACK_GENERATOR};RPM")
            SET(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/postinst")
-            SET(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/lib/systemd/system" "/lib/systemd" "/lib" "/usr/local/bin" "/usr/local") # --> needed to not override existing folders
+            SET(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION
+                    "/lib/systemd/system"
+                    "/lib/systemd"
+                    "/lib"
+                    "/usr/local/bin"
+                    "/usr/local") # --> not override existing folders
+
+            # dependency management tested with fedora!
            set(CPACK_RPM_PACKAGE_REQUIRES "libcurl,libconfig")
+            if (${GUI})
+                # append rpm GUI dependencies (qt5)
+                set(CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES},qt5-qtbase")
+            endif ()
        else (NOT ${RPMBUILD_EXECUTABLE} STREQUAL "RPMBUILD_EXECUTABLE-NOTFOUND")
            message(STATUS "not found rpm build tools --> not building rpm")
        endif (NOT ${RPMBUILD_EXECUTABLE} STREQUAL "RPMBUILD_EXECUTABLE-NOTFOUND")
@ -291,7 +380,13 @@ fi\n"
            message(STATUS "found deb build tools --> able to build deb")
            SET(CPACK_GENERATOR "${CPACK_GENERATOR};DEB") # add deb generator
            set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/postinst") # set post inst file
+
+            # dependency management tested with fedora!
            set(CPACK_DEBIAN_PACKAGE_DEPENDS "libcurl4,libconfig++9v5") # add debian dependencies
+            if (${GUI})
+                # append debian GUI dependencies (qt5)
+                set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS},qt5-default")
+            endif ()
        else (NOT ${DEB_EXECUTABLE} STREQUAL "DEB_EXECUTABLE-NOTFOUND")
            message(STATUS "not found  deb build tools --> not building deb")
        endif (NOT ${DEB_EXECUTABLE} STREQUAL "DEB_EXECUTABLE-NOTFOUND")
@ -306,17 +401,45 @@ fi\n"
        set(CPACK_GENERATOR NSIS)
        message(STATUS "Using NSIS Package build.")

-        set(CPACK_NSIS_testcomp_INSTALL_DIRECTORY /)
+        set(CPACK_NSIS_EXECUTABLES_DIRECTORY "DynuIpRefresher")
        set(CPACK_PACKAGE_INSTALL_DIRECTORY "DynuIpRefresher")
        SET(CPACK_NSIS_MODIFY_PATH ON)
+        set(CPACK_NSIS_MENU_LINKS
+                "${Application_Name}.exe" "DynuIpRefresher Console"
+                "${Application_Name}-gui.exe" "DynuIpRefresher GUI")
+
+        # varnames need uppercase strings
+        string(TOUPPER ${Application_Name} APPLICATION_NAME_UPPER)
+        # Define components and their display names
+        set (CPACK_COMPONENTS_ALL ${Application_Name} ${Application_Name}gui)
+        set (CPACK_COMPONENT_${APPLICATION_NAME_UPPER}_DISPLAY_NAME "Dynu IP Refresher Console")
+        set (CPACK_COMPONENT_${APPLICATION_NAME_UPPER}GUI_DISPLAY_NAME "Dynu IP Refresher GUI")
+
+        # Human readable component descriptions
+        set(CPACK_COMPONENT_${APPLICATION_NAME_UPPER}_DESCRIPTION "An extremely useful application that makes use of MyLib")
+        set(CPACK_COMPONENT_${APPLICATION_NAME_UPPER}GUI_DESCRIPTION "Static libraries used to build programs with MyLib")
+
+        # Define dependencies between components
+        set(CPACK_COMPONENT_${APPLICATION_NAME_UPPER}GUI_DEPENDS ${Application_Name})
+
+        # Define groups
+        set(CPACK_COMPONENT_${APPLICATION_NAME_UPPER}_GROUP "Runtime")
+        set(CPACK_COMPONENT_${APPLICATION_NAME_UPPER}GUI_GROUP "Development")
+
+        set(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION "All of the tools you'll ever need to develop software")
+
+        # Define NSIS installation types
+        set(CPACK_ALL_INSTALL_TYPES Full Developer)
+        set(CPACK_COMPONENT_${APPLICATION_NAME_UPPER}_INSTALL_TYPES Developer Full)
+        set(CPACK_COMPONENT_${APPLICATION_NAME_UPPER}GUI_INSTALL_TYPES Full)
    ENDIF ()

    INCLUDE(CPack)

    add_custom_target(build-packages
            "${CMAKE_COMMAND}" --build "${CMAKE_BINARY_DIR}" --target package
-            DEPENDS ${PROJECT_NAME}
-            COMMENT "Packing ${PROJECT_NAME}")
+            DEPENDS ${Application_Name}
+            COMMENT "Packing ${Application_Name}")
    message("")
 ENDIF ()

@ -347,39 +470,40 @@ endif (BUILD_DOC)

 # Test Cases
 if (TESTS)
-    include(GoogleTest)
+    #    include(GoogleTest)
+    message(STATUS "Configuring GTEST")
+    find_package(GTest)
+    if (GTEST_FOUND)

-    mark_as_advanced(
-            BUILD_GMOCK BUILD_GTEST BUILD_SHARED_LIBS
-            gmock_build_tests gtest_build_samples gtest_build_tests
-            gtest_disable_pthreads gtest_force_shared_crt gtest_hide_internal_symbols
-    )
+        mark_as_advanced(
+                BUILD_GMOCK BUILD_GTEST BUILD_SHARED_LIBS
+                gmock_build_tests gtest_build_samples gtest_build_tests
+                gtest_disable_pthreads gtest_force_shared_crt gtest_hide_internal_symbols
+        )

-    enable_testing()
+        enable_testing()

-    macro(package_add_test TESTNAME)
-        # create an exectuable in which the tests will be stored
-        add_executable(${TESTNAME} ${ARGN})
-        # link the Google test infrastructure, mocking library, and a default main fuction to
-        target_link_libraries(${TESTNAME} gtest gtest_main -lpthread -lm dynuiprefresher api ${CURL_LIBRARIES} ${LIBCONFIG++_LIBRARIES})
-        # see https://cmake.org/cmake/help/v3.10/module/GoogleTest.html for more options to pass to it
-        gtest_discover_tests(${TESTNAME}
-                WORKING_DIRECTORY ${PROJECT_DIR}
-                EXTRA_ARGS --gtest_output=xml:report.xml -VV
-                PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${PROJECT_DIR}"
-                )
-        set_target_properties(${TESTNAME} PROPERTIES FOLDER tests)
-    endmacro()
+        macro(package_add_test TESTNAME)
+            # create an exectuable in which the tests will be stored
+            add_executable(${TESTNAME} ${ARGN})
+            # link the Google test infrastructure, mocking library, and a default main fuction to
+            target_link_libraries(${TESTNAME} gtest gtest_main -lpthread -lm api libdynuiprefresher ${CURL_LIBRARIES} ${LIBCONFIG++_LIBRARIES})
+            # see https://cmake.org/cmake/help/v3.10/module/GoogleTest.html for more options to pass to it
+            gtest_discover_tests(${TESTNAME})

-    package_add_test(test1 tests/UnitTest.cpp ${SOURCE})
+            add_custom_command(TARGET build-test
+                    POST_BUILD
+                    COMMAND "${CMAKE_COMMAND}" --build "${CMAKE_BINARY_DIR}" --target ${TESTNAME}
+                    COMMAND "bin/${TESTNAME}" --gtest_output=xml:${TESTNAME}-report.xml)
+        endmacro()

-    add_custom_target(build-test
-            "${CMAKE_COMMAND}" --build "${CMAKE_BINARY_DIR}" --target test
-            DEPENDS ${PROJECT_NAME}
-            COMMENT "Packing ${PROJECT_NAME}")
+        add_custom_target(build-test
+                DEPENDS ${PROJECT_NAME}
+                COMMENT "Testing ${PROJECT_NAME}")

-    add_custom_target(build-xml
-            "bin/test1" --gtest_output="xml:report.xml"
-            DEPENDS ${PROJECT_NAME}
-            COMMENT "Packing ${PROJECT_NAME}")
+        package_add_test(test1 tests/UnitTest.cpp ${SOURCE})
+
+    else ()
+        message(STATUS "GTEST environment not found!")
+    endif ()
 ENDIF ()
--- a/Docker/Linux/Dockerfile
+++ b/Docker/Linux/Dockerfile
@ -0,0 +1,19 @@
+FROM gcc:latest
+MAINTAINER luki42
+
+RUN \
+    \
+    # Install texlive
+    echo "instaling cmake" && \
+    apt-get update && \
+    apt-get install -y --no-install-recommends cmake libgtest-dev && \
+    echo "installing build dependencies" && \
+    apt-get install -y --no-install-recommends libcurl4-openssl-dev libconfig++-dev && \
+    echo "installing packaging tools" && \
+    apt-get install -y --no-install-recommends dpkg rpm && \
+    # clean up
+    apt-get clean
+
+# Expose /home as workin dir
+WORKDIR /home
+VOLUME ["/home"]
--- a/Docker/Windows/Dockerfile
+++ b/Docker/Windows/Dockerfile
@ -0,0 +1,20 @@
+FROM fedora:33
+MAINTAINER luki42
+
+RUN \
+    \
+    # Install texlive
+    echo "instaling cmake" && \
+    dnf install -y mingw64-gcc-c++ mingw64-curl-static mingw64-qt5-qtbase wget cmake make tar xz mingw32-nsis gtest gtest-devel && \
+    wget http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libconfig-1.7.2-1-any.pkg.tar.xz && \
+    tar -xf mingw-w64-x86_64-libconfig-1.7.2-1-any.pkg.tar.xz && \
+    mv ./mingw64/bin/* /usr/x86_64-w64-mingw32/sys-root/mingw/bin && \
+    mv ./mingw64/include/* /usr/x86_64-w64-mingw32/sys-root/mingw/include && \
+    mv ./mingw64/lib/*.a /usr/x86_64-w64-mingw32/sys-root/mingw/lib && \
+    mv ./mingw64/lib/cmake/* /usr/x86_64-w64-mingw32/sys-root/mingw/lib/cmake && \
+    rm -Rv mingw-w64-x86_64-libconfig-1.7.2-1-any.pkg.tar.xz mingw64 && \
+    #cleanup
+    dnf clean dbcache && dnf clean packages
+# Expose /home as workin dir
+WORKDIR /home
+VOLUME ["/home"]
--- a/README.md
+++ b/README.md
@ -2,6 +2,7 @@
 # DynuIPRefresher
 A lightweight C++ application to setup a service for refreshing a dynamic IP to the Dynu servers. 
 Dynu.com is a free DDns service and provides an API.
+There is also a GUI for Windows Users and beginners.

 ## Installation
 Download the latest Release at [Release_Page](https://github.com/Lukas-Heiligenbrunner/DynuIPRefresher/releases).
@ -9,11 +10,38 @@ I'm providing executables for Debian/Ubuntu (.deb) and RHEL/Debian (.rpm).
 But you can still compile the code my your own (see build section).

 ## Configuration
-There is a configuration file `/etc/iprefresher.cfg` where you have to specify the DYNU API key (get it from their homepage), the domainid and your domain.
+There is a configuration file `/etc/dynuiprefresher.cfg` where you have to specify the DYNU API key (get it from their homepage), the domainid and your domain.
 Furthermore, you can optionally specify a Telegram API key and a Chat ID if you want to be notfied when your local ip changes.

 To enable and start the service: 
-`systemctl enable iprefresher.service` and `systemctl start iprefresher.service`
+`systemctl enable dynuiprefresher.service` and `systemctl start dynuiprefresher.service`
+
+## Usage
+First of all configure the right keys in the `/etc/dynuiprefresher.cfg` or `%appdata%\DynuIpRefresher\dynuiprefresher.cfg` config file.
+
+Afterwards use the following options: 
+
+```
+help page: 
+[-h] [--help]  print this help page
+[-v] [--version] print the software version
+[-f] [--force] force refresh of ip
+[-l] [--loop] infinite loop to refresh ip every five minutes
+[-c] [--checkconfig] validate configuration
+[-ip] [--currentip] get current global ip
+[no argument] normal ip check and refresh
+```
+
+### GUI 
+
+You can also build the grapical user inteface if you want. 
+There you can manually trigger a refresh in a gui and set all the config parameters.
+
+Home Page:
+![couldn't load image](https://i.ibb.co/syDwWQg/Screenshot-20200608-104253.png)
+
+Config Page:
+![couldn't load image](https://i.ibb.co/89vnJXY/Screenshot-20200608-104308.png)


 ## Build
@ -69,6 +97,10 @@ cd into downloaded files and Generate makefiles:

 `make package`

+### GUI Build
+
+please use the predefined Docker-Image here: 
+[DockerHub](https://hub.docker.com/repository/docker/luki42/dynuiprefresher_build)


 ### Windows cross build
@ -83,5 +115,7 @@ Optional dependencies
 * NSIS Pack tool (for creating installer)
 * doxygen (for generating html doc)

-Some addition configuration of lib paths may be needed in CMakeList.txt. 
+The Simplest way to install all dependencies is the preconfigured Docker-Image:
+[DockerHub](https://hub.docker.com/repository/docker/luki42/dynuiprefresher_build)
+
 `make package` will pack it into a NSIS installer for Windows. 
--- a/config/dynuiprefresher.cfg
+++ b/config/dynuiprefresher.cfg
--- a/inc/Config.h
+++ b/inc/Config.h
@ -18,6 +18,13 @@ public:
    */
    static bool readConfig();

+    /**
+     * save back configuration to file
+     *
+     * @return success of config write
+     */
+    static bool saveConfig();
+
    /**
     * validate config file
     *
@ -63,12 +70,32 @@ public:
     */
    static const std::string &getChatId();

+    /**
+     * set all parameters without telegram support
+     *
+     * @param domainname Dynu Domain name
+     * @param dynuapikey Dynu api key
+     * @param domainid Dynu domain id
+     */
+    static void setValues(const std::string &domainname, const std::string &dynuapikey, const std::string &domainid);
+
+    /**
+     * set all parameters with telegram support
+     *
+     * @param domainname Dynu Domain name
+     * @param dynuapikey Dynu api key
+     * @param domainid Dynu domain id
+     * @param telegramApiKey Telegram api key
+     * @param chatId Telegram chat id
+     */
+    static void setValues(const std::string &domainname, const std::string &dynuapikey, const std::string &domainid,
+                          const std::string &telegramApiKey, const std::string &chatId);

 private:
    /**
     * private constructor --> don't allow instance of this class
     */
-    Config();
+    Config() = default;

    /**
     * helper variable for managing telegram Support
--- a/inc/IpHelper.h
+++ b/inc/IpHelper.h
@ -16,7 +16,7 @@ public:
     * @param ip ip address to test
     * @return validity
     */
-    static bool isIpValid(std::string ip);
+    static bool isIpValid(const std::string& ip);

 private:
 };
--- a/inc/gui/MainWindow.h
+++ b/inc/gui/MainWindow.h
@ -29,7 +29,14 @@ public:

 private:
    Ui::MainWindow *ui;
+
+    /**
+     * all static initializations of custom gui elements
+     */
+    void initGui();
+
 private slots:
+
    /**
     * executed click handler for config button
     */
@ -40,7 +47,13 @@ private slots:
     */
    void refreshIPBtn();

+    /**
+     * executed click handler for save config btn
+     */
+    void saveConfigBtn();
+
 signals:
+
    /**
     * append a String line to the Log field
     *
--- a/service/dynuiprefresher.service
+++ b/service/dynuiprefresher.service
@ -2,7 +2,7 @@
 Description=IP Refresher
 After=network.target
 [Service]
-ExecStart=iprefresher -l
+ExecStart=dynuiprefresher -l
 WorkingDirectory=/root
 StandardOutput=inherit
 StandardError=inherit
--- a/src/Config.cpp
+++ b/src/Config.cpp
@ -1,11 +1,12 @@
 #include "Config.h"
 #include "Logger.h"
-#include "Version.h"
+#include "StaticData.h"

 #include <iostream>
 #include <cstring>
 #include <fstream>
 #include <libconfig.h++>
+#include <sys/stat.h>

 std::string Config::dynuapikey;
 std::string Config::domainid; //id of the dynu domain
@ -19,15 +20,41 @@ bool Config::telegramSupport;
 bool Config::readConfig() {
    libconfig::Config cfg;
    try {
-        cfg.readFile(Version::ConfigDir.c_str());
+        cfg.readFile(std::string(StaticData::ConfigDir + StaticData::ConfName).c_str());
    }
    catch (const libconfig::FileIOException &fioex) {
        std::cout << "I/O error while reading config file." << std::endl << "creating new config file!" << std::endl;

+        // check if config folder exists
+        struct stat info{};
+
+        if (stat(StaticData::ConfigDir.c_str(), &info) != 0) {
+            Logger::warning("The config folder doesn't exist. Trying to create it.");
+
+// mkdir command is different defined for windows
+#ifdef __unix
+            int check = mkdir(StaticData::ConfigDir.c_str(), 777);
+#else
+            int check = mkdir(StaticData::ConfigDir.c_str());
+#endif
+
+            // check if directory is created or not
+            if (!check)
+                Logger::message("config directory successfully created. ");
+            else
+                Logger::error("unable to create config directory.");
+
+        } else if (info.st_mode & S_IFDIR) {
+            Logger::debug("config directory exists already");
+        } else {
+            Logger::error("A file exists with the same name as the config dir should be");
+        }
+
+
        std::ofstream myfile;
-        myfile.open(Version::ConfigDir);
+        myfile.open(StaticData::ConfigDir + StaticData::ConfName);
        if (myfile.is_open()) {
-            myfile << Version::SAMPLECONFIG;
+            myfile << StaticData::SAMPLECONFIG;
            myfile.close();
        } else {
            Logger::error("error creating file");
@ -64,11 +91,16 @@ bool Config::readConfig() {
    return !(Config::dynuapikey.empty() || Config::domainid.empty() || Config::domainname.empty());
 }

+bool Config::saveConfig() {
+    // todo save config
+    return false;
+}
+
 bool Config::validateConfig() {
    libconfig::Config cfg;
    try {
        Logger::message("reading config file");
-        cfg.readFile(Version::ConfigDir.c_str());
+        cfg.readFile(std::string(StaticData::ConfigDir + StaticData::ConfName).c_str());
    }
    catch (const libconfig::FileIOException &fioex) {
        Logger::warning("config file doesn't exist or permission denied!");
@ -137,4 +169,14 @@ const std::string &Config::getChatId() {
    return chatId;
 }

-Config::Config() = default;
+void Config::setValues(const std::string &domainname, const std::string &dynuapikey, const std::string &domainid) {
+    Config::domainname = domainname;
+    Config::dynuapikey = dynuapikey;
+    Config::domainid = domainid;
+}
+
+void Config::setValues(const std::string &domainname, const std::string &dynuapikey, const std::string &domainid, const std::string &telegramApiKey, const std::string &chatId) {
+    setValues(domainname, dynuapikey, domainid);
+    Config::telegramApiKey = telegramApiKey;
+    Config::chatId = chatId;
+}
--- a/src/FileLogger.cpp
+++ b/src/FileLogger.cpp
@ -1,12 +1,13 @@
 #include "FileLogger.h"
 #include "IpHelper.h"
+#include "StaticData.h"

 #include <fstream>
 #include <iostream>

 void FileLogger::safeip(std::string ip) {
    std::ofstream out;
-    out.open("ip.txt", std::ios::out);
+    out.open(StaticData::TempFilePath + "temp-dynuiprefresher.txt", std::ios::out);

    out << ip;

@ -15,15 +16,12 @@ void FileLogger::safeip(std::string ip) {

 std::string FileLogger::readip() {
    std::ifstream in;
-    in.open("ip.txt", std::ios::in);
+    in.open(StaticData::TempFilePath + "temp-dynuiprefresher.txt", std::ios::in);

    std::string ip;

    in >> ip;

    // when received ip has no . return 0.0.0.0
-    if (!IpHelper::isIpValid(ip))
-        return "0.0.0.0";
-    else
-        return ip;
+    return (IpHelper::isIpValid(ip) ? ip : "0.0.0.0");
 }
--- a/src/IPRefresher.cpp
+++ b/src/IPRefresher.cpp
@ -4,15 +4,13 @@
 #include "api/DynuAPI.h"
 #include "api/TelegramAPI.h"
 #include "Config.h"
-#include "Version.h"
+#include "StaticData.h"
 #include "IpHelper.h"

 #include <chrono>
 #include <thread>
 #include <Logger.h>

-using namespace IPRefresher;
-
 bool IPRefresher::checkIPAdress(bool force) {
    FileLogger logger;

@ -59,15 +57,15 @@ bool IPRefresher::checkIPAdress(bool force) {

 void IPRefresher::startUpService(int interval) {
    Logger::message("startup of service");
-    Logger::message("Version: " + Version::VERSION);
-    if (Config::readConfig()) {
-        while (true) {
-            Logger::message("starting check");
-            checkIPAdress(false);
-            std::this_thread::sleep_for(std::chrono::milliseconds(interval * 1000));
-        }
-    } else {
-        std::cout << "incorrect credentials!" << std::endl;
-    }
+    Logger::message("Version: " + StaticData::VERSION);

+    while (true) {
+        Logger::message("starting check");
+        if (Config::readConfig()) {
+            checkIPAdress(false);
+        } else {
+            std::cout << "incorrect credentials!" << std::endl;
+        }
+        std::this_thread::sleep_for(std::chrono::milliseconds(interval * 1000));
+    }
 }
--- a/src/IpHelper.cpp
+++ b/src/IpHelper.cpp
@ -1,7 +1,7 @@
+#include <regex>
 #include "IpHelper.h"

-#include <climits>
-
-bool IpHelper::isIpValid(std::string ip) {
-    return (ip.find('.') != ULONG_MAX);
+bool IpHelper::isIpValid(const std::string& ip) {
+    const std::regex rgx(R"(^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$)");
+    return (std::regex_match(ip, rgx));
 }
--- a/src/api/IPAPI.cpp
+++ b/src/api/IPAPI.cpp
@ -1,5 +1,11 @@
+#include <IpHelper.h>
+#include <Logger.h>
 #include "api/IPAPI.h"

 std::string IPAPI::getGlobalIp() {
-    return request("https://api.ipify.org");
+    const std::string ip = request("https://api.ipify.org");
+    if(!IpHelper::isIpValid(ip))
+        Logger::warning("no valid ip returned from ipapi");
+
+    return ip;
 }
--- a/src/api/TelegramAPI.cpp
+++ b/src/api/TelegramAPI.cpp
@ -1,8 +1,6 @@
 #include "api/TelegramAPI.h"
 #include "Logger.h"

-#include <climits>
-
 int TelegramAPI::sendMessage(const std::string &text) {
    Hashmap<std::string, std::string> args;
    args.add("chat_id", chatid);
@ -12,8 +10,8 @@ int TelegramAPI::sendMessage(const std::string &text) {

    std::string reply = request("https://api.telegram.org/bot" + apikey + "/sendmessage", false, args, headers);

-    if (reply.find("\"error_code\"") != ULONG_MAX) {
-        Logger::error("failed to refresh the ip (Dynu API)");
+    if (reply.find("\"error_code\"") != SIZE_MAX) {
+        Logger::error("failed to send the Telegram Message");
        return -1;
    }
    return 1;
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@ -1,4 +1,4 @@
-#include "MainWindow.h"
+#include "inc/gui/MainWindow.h"
 #include "ui_mainwindow.h"

 #include "api/IPAPI.h"
@ -11,20 +11,12 @@
 MainWindow::MainWindow() : QMainWindow(), ui(new Ui::MainWindow) {
    ui->setupUi(this);

-    // needs to be defined with new -- would be termintated after this constructor.
-    new std::thread([this]() {
-        IPAPI ipapi;
-        std::string ip = ipapi.getGlobalIp();
-        Logger::message("Current global IP: " + ip);
-        std::string msg = "Your current global IP: " + ip;
-        this->ui->labelCurrentIP->setText(msg.c_str());
-    });
-
-    // set config info label and initial check if config is valid
-    ui->labelConfig->setText(Config::validateConfig() ? "Config is: OK" : "Config is: NOT OK");
+    // initialize gui with start parameters
+    initGui();

    connect(ui->buttonCheckConfig, SIGNAL(clicked()), this, SLOT(checkConfigBtn()));
    connect(ui->buttonRefreshIP, SIGNAL(clicked()), this, SLOT(refreshIPBtn()));
+    connect(ui->buttonSaveConfig, SIGNAL(clicked()), this, SLOT(saveConfigBtn()));

    connect(this, SIGNAL(appendLogField(QString)), ui->textLog, SLOT(appendPlainText(QString)));
 }
@ -33,6 +25,7 @@ MainWindow::~MainWindow() {
    // todo check if disconnects are really necessary
    disconnect(ui->buttonCheckConfig);
    disconnect(ui->buttonRefreshIP);
+    this->destroy();
    delete ui;
 }

@ -82,3 +75,55 @@ void MainWindow::refreshIPBtn() {
        this->appendLogField("Finished refreshing Dynu IP.");
    });
 }
+
+void MainWindow::saveConfigBtn() {
+    if (ui->telegramsupportCheckbox->isChecked()) {
+        Config::setValues(
+                ui->domainnameedit->text().toStdString(),
+                ui->dynuapikeyedit->text().toStdString(),
+                ui->domainidedit->text().toStdString(),
+                ui->telegramapikeyedit->text().toStdString(),
+                ui->chatidedit->text().toStdString());
+    } else {
+        Config::setValues(
+                ui->domainnameedit->text().toStdString(),
+                ui->dynuapikeyedit->text().toStdString(),
+                ui->domainidedit->text().toStdString());
+    }
+    Config::saveConfig();
+}
+
+void MainWindow::initGui() {
+    // needs to be defined with new -- would be termintated after the constructor call.
+    new std::thread([this]() {
+        IPAPI ipapi;
+        std::string ip = ipapi.getGlobalIp();
+        Logger::message("Current global IP: " + ip);
+        std::string msg = "Your current global IP: " + ip;
+        this->ui->labelCurrentIP->setText(msg.c_str());
+    });
+
+    // set config info label and initial check if config is valid
+    ui->labelConfig->setText(Config::validateConfig() ? "Config is: OK" : "Config is: NOT OK");
+
+    if (Config::readConfig()) {
+        ui->dynuapikeyedit->setText(Config::getDynuapikey().c_str());
+        ui->domainidedit->setText(Config::getDomainid().c_str());
+        ui->domainnameedit->setText(Config::getDomainname().c_str());
+
+        if (Config::isTelegramSupported()) {
+            ui->telegramsupportCheckbox->setCheckState(Qt::Checked);
+            ui->telegramapikeyedit->setText(Config::getTelegramApiKey().c_str());
+            ui->chatidedit->setText(Config::getChatId().c_str());
+        } else {
+            ui->telegramsupportCheckbox->setCheckState(Qt::Unchecked);
+            ui->telegramapikeyedit->setDisabled(true);
+            ui->chatidedit->setDisabled(true);
+        }
+    } else {
+        // todo duplicate code with above
+        ui->telegramsupportCheckbox->setCheckState(Qt::Unchecked);
+        ui->telegramapikeyedit->setDisabled(true);
+        ui->chatidedit->setDisabled(true);
+    }
+}
--- a/src/gui/mainwindow.ui
+++ b/src/gui/mainwindow.ui
@ -10,36 +10,16 @@
    <height>618</height>
   </rect>
  </property>
+  <property name="cursor">
+   <cursorShape>ArrowCursor</cursorShape>
+  </property>
  <property name="windowTitle">
   <string>MainWindow</string>
  </property>
+  <property name="styleSheet">
+   <string notr="true">/*background-color: rgb(69, 196, 255);</string>
+  </property>
  <widget class="QWidget" name="centralwidget">
-   <widget class="QPushButton" name="buttonRefreshIP">
-    <property name="geometry">
-     <rect>
-      <x>290</x>
-      <y>300</y>
-      <width>91</width>
-      <height>33</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string>Refresh IP</string>
-    </property>
-   </widget>
-   <widget class="QLabel" name="labelCurrentIP">
-    <property name="geometry">
-     <rect>
-      <x>40</x>
-      <y>60</y>
-      <width>301</width>
-      <height>17</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string>Your current global IP:</string>
-    </property>
-   </widget>
   <widget class="QPlainTextEdit" name="textLog">
    <property name="enabled">
     <bool>false</bool>
@ -48,7 +28,7 @@
     <rect>
      <x>40</x>
      <y>410</y>
-      <width>691</width>
+      <width>741</width>
      <height>191</height>
     </rect>
    </property>
@ -69,31 +49,268 @@
     <string>Log:</string>
    </property>
   </widget>
-   <widget class="QPushButton" name="buttonCheckConfig">
+   <widget class="QTabWidget" name="tabWidget">
    <property name="geometry">
     <rect>
-      <x>270</x>
-      <y>140</y>
-      <width>91</width>
-      <height>33</height>
+      <x>40</x>
+      <y>20</y>
+      <width>741</width>
+      <height>351</height>
     </rect>
    </property>
-    <property name="text">
-     <string>Check Config</string>
-    </property>
-   </widget>
-   <widget class="QLabel" name="labelConfig">
-    <property name="geometry">
-     <rect>
-      <x>270</x>
-      <y>180</y>
-      <width>141</width>
-      <height>17</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string>Config is: undefined</string>
+    <property name="currentIndex">
+     <number>0</number>
    </property>
+    <widget class="QWidget" name="basic">
+     <attribute name="title">
+      <string>Basic</string>
+     </attribute>
+     <widget class="QLabel" name="labelCurrentIP">
+      <property name="geometry">
+       <rect>
+        <x>20</x>
+        <y>30</y>
+        <width>301</width>
+        <height>17</height>
+       </rect>
+      </property>
+      <property name="text">
+       <string>Your current global IP:</string>
+      </property>
+     </widget>
+     <widget class="QLabel" name="labelConfig">
+      <property name="geometry">
+       <rect>
+        <x>20</x>
+        <y>70</y>
+        <width>141</width>
+        <height>17</height>
+       </rect>
+      </property>
+      <property name="text">
+       <string>Config is: undefined</string>
+      </property>
+     </widget>
+     <widget class="QGroupBox" name="groupBox">
+      <property name="geometry">
+       <rect>
+        <x>20</x>
+        <y>120</y>
+        <width>231</width>
+        <height>151</height>
+       </rect>
+      </property>
+      <property name="title">
+       <string>Actions</string>
+      </property>
+      <widget class="QPushButton" name="buttonCheckConfig">
+       <property name="geometry">
+        <rect>
+         <x>30</x>
+         <y>50</y>
+         <width>91</width>
+         <height>33</height>
+        </rect>
+       </property>
+       <property name="cursor">
+        <cursorShape>ArrowCursor</cursorShape>
+       </property>
+       <property name="text">
+        <string>Check Config</string>
+       </property>
+      </widget>
+      <widget class="QPushButton" name="buttonRefreshIP">
+       <property name="geometry">
+        <rect>
+         <x>30</x>
+         <y>100</y>
+         <width>91</width>
+         <height>33</height>
+        </rect>
+       </property>
+       <property name="text">
+        <string>Refresh IP</string>
+       </property>
+      </widget>
+     </widget>
+    </widget>
+    <widget class="QWidget" name="config">
+     <attribute name="title">
+      <string>Config</string>
+     </attribute>
+     <widget class="QCheckBox" name="telegramsupportCheckbox">
+      <property name="geometry">
+       <rect>
+        <x>30</x>
+        <y>120</y>
+        <width>181</width>
+        <height>21</height>
+       </rect>
+      </property>
+      <property name="text">
+       <string>Telegram Notifications</string>
+      </property>
+     </widget>
+     <widget class="QPushButton" name="buttonSaveConfig">
+      <property name="geometry">
+       <rect>
+        <x>630</x>
+        <y>270</y>
+        <width>91</width>
+        <height>33</height>
+       </rect>
+      </property>
+      <property name="text">
+       <string>Save Config</string>
+      </property>
+     </widget>
+     <widget class="QLabel" name="label">
+      <property name="geometry">
+       <rect>
+        <x>30</x>
+        <y>20</y>
+        <width>101</width>
+        <height>17</height>
+       </rect>
+      </property>
+      <property name="text">
+       <string>Dynu API Key</string>
+      </property>
+     </widget>
+     <widget class="QLabel" name="label_3">
+      <property name="geometry">
+       <rect>
+        <x>460</x>
+        <y>20</y>
+        <width>111</width>
+        <height>17</height>
+       </rect>
+      </property>
+      <property name="text">
+       <string>Domain ID</string>
+      </property>
+     </widget>
+     <widget class="QLabel" name="label_4">
+      <property name="geometry">
+       <rect>
+        <x>30</x>
+        <y>170</y>
+        <width>131</width>
+        <height>17</height>
+       </rect>
+      </property>
+      <property name="text">
+       <string>Telegram API Key</string>
+      </property>
+     </widget>
+     <widget class="QLabel" name="label_5">
+      <property name="geometry">
+       <rect>
+        <x>30</x>
+        <y>240</y>
+        <width>64</width>
+        <height>17</height>
+       </rect>
+      </property>
+      <property name="text">
+       <string>Chat ID</string>
+      </property>
+     </widget>
+     <widget class="QLineEdit" name="dynuapikeyedit">
+      <property name="geometry">
+       <rect>
+        <x>30</x>
+        <y>40</y>
+        <width>211</width>
+        <height>31</height>
+       </rect>
+      </property>
+     </widget>
+     <widget class="QLineEdit" name="domainidedit">
+      <property name="geometry">
+       <rect>
+        <x>460</x>
+        <y>40</y>
+        <width>113</width>
+        <height>31</height>
+       </rect>
+      </property>
+     </widget>
+     <widget class="QLineEdit" name="chatidedit">
+      <property name="geometry">
+       <rect>
+        <x>30</x>
+        <y>260</y>
+        <width>113</width>
+        <height>31</height>
+       </rect>
+      </property>
+     </widget>
+     <widget class="QLineEdit" name="telegramapikeyedit">
+      <property name="geometry">
+       <rect>
+        <x>30</x>
+        <y>190</y>
+        <width>311</width>
+        <height>31</height>
+       </rect>
+      </property>
+     </widget>
+     <widget class="QLineEdit" name="domainnameedit">
+      <property name="geometry">
+       <rect>
+        <x>280</x>
+        <y>40</y>
+        <width>161</width>
+        <height>31</height>
+       </rect>
+      </property>
+      <property name="placeholderText">
+       <string>domain.dynu.net</string>
+      </property>
+     </widget>
+     <widget class="QLabel" name="label_6">
+      <property name="geometry">
+       <rect>
+        <x>280</x>
+        <y>20</y>
+        <width>111</width>
+        <height>17</height>
+       </rect>
+      </property>
+      <property name="text">
+       <string>Domainname</string>
+      </property>
+     </widget>
+    </widget>
+    <widget class="QWidget" name="settings">
+     <attribute name="title">
+      <string>Settings</string>
+     </attribute>
+     <widget class="QLabel" name="label_7">
+      <property name="geometry">
+       <rect>
+        <x>20</x>
+        <y>30</y>
+        <width>161</width>
+        <height>17</height>
+       </rect>
+      </property>
+      <property name="text">
+       <string>Select your language:</string>
+      </property>
+     </widget>
+     <widget class="QComboBox" name="languageComboBox">
+      <property name="geometry">
+       <rect>
+        <x>20</x>
+        <y>60</y>
+        <width>94</width>
+        <height>31</height>
+       </rect>
+      </property>
+     </widget>
+    </widget>
   </widget>
  </widget>
  <widget class="QStatusBar" name="statusbar"/>
--- a/src/main.cpp
+++ b/src/main.cpp
@ -1,4 +1,4 @@
-#include "Version.h"
+#include "StaticData.h"
 #include "IPRefresher.h"
 #include "Logger.h"
 #include "Config.h"
@ -19,7 +19,7 @@ int main(int argc, char *argv[]) {
                      << "[-ip] [--currentip] get current global ip" << std::endl
                      << "[no argument] normal ip check and refresh" << std::endl;
        } else if (firstarg == "-v" || firstarg == "--version") {
-            std::cout << "Version " << Version::VERSION << std::endl;
+            std::cout << "Version " << StaticData::VERSION << std::endl;
        } else if (firstarg == "-f" || firstarg == "--force") {
            if (Config::readConfig()) {
                IPRefresher::checkIPAdress(true);
@ -28,7 +28,7 @@ int main(int argc, char *argv[]) {
            }

        } else if (firstarg == "-l" || firstarg == "--loop") {
-            IPRefresher::startUpService(true);
+            IPRefresher::startUpService(600);
        } else if (firstarg == "-c" || firstarg == "--checkconfig") {
            if (Config::validateConfig()) {
                Logger::message("Config file is OK");
--- a/src/maingui.cpp
+++ b/src/maingui.cpp
@ -7,7 +7,7 @@
 int main(int argc, char *argv[]) {
    QApplication a(argc, argv);
    MainWindow w;
-    w.setWindowTitle("startUpService");
+    w.setWindowTitle("Dynu IP Refresher");
    w.show();

    return QApplication::exec();
--- a/tests/UnitTest.cpp
+++ b/tests/UnitTest.cpp
@ -4,7 +4,6 @@

 #include <FileLogger.h>
 #include <api/IPAPI.h>
-#include <climits>
 #include "gtest/gtest.h"

 /**
@ -21,7 +20,7 @@ TEST(ReadIp, testzeroIpIfNotExists) {
 TEST(IPAPI, testIpAPIcheckIPSyntax) {
    IPAPI ipapi;
    std::string ip = ipapi.getGlobalIp();
-    if (ip.find('.') == ULONG_MAX) {
+    if (ip.find('.') == SIZE_MAX) {
        // error when ip doesn't contain a .
        ASSERT_TRUE(false);
    } else {
Author	SHA1	Message	Date
lukas	891330825a	set interval to correct integer	2021-05-05 16:36:38 +02:00
lukas	ad452feca2	fix executeable name in systemd service	2021-05-05 16:28:33 +02:00
lukas	05ca1ff60b	fix failing build --> exchange libs	2021-04-09 18:45:01 +02:00
lukas	94964d69be	remove cmake task from gitlab ci and run it within every task	2021-04-09 16:10:13 +02:00
lukas	2d1e99260d	better error correction if ip syntax not correct	2021-02-01 18:33:36 +01:00
lukas	095eb5c0cd	fixed incorrect merge of branches	2020-06-08 11:17:08 +02:00
lukas	a231e6c852	improved gitlab ci	2020-06-08 11:03:08 +02:00
Lukas-Heiligenbrunner	8d688716eb	Merge pull request #12 from Lukas-Heiligenbrunner/GUI Gui	2020-06-08 10:55:28 +02:00
lukas	4b19ecf3c3	added dockerfiles and edited readme	2020-06-08 10:54:22 +02:00
lukas	85ba334c21	added options in nsis install what to install.	2020-05-26 19:59:23 +02:00
Lukas-Heiligenbrunner	2762605ca4	Merge branch 'master' into GUI	2020-05-26 18:04:16 +02:00
lukas	81de98bf6c	rename Version.h to StaticData.h new temp file path for windows and linux temp file now writeable on windows compare string find method with SIZE_MAX instead of ULONG_MAX	2020-05-26 16:51:29 +02:00
lukas	3f75484f77	improved inc directory inclusion	2020-05-22 21:58:51 +02:00
lukas	f4069d02bf	right naming in gitlab ci	2020-05-21 14:27:16 +02:00
lukas	ce4a3a830e	release version v1.3.4	2020-05-21 14:18:29 +02:00
Lukas-Heiligenbrunner	af4a9c8350	Merge pull request #20 from Lukas-Heiligenbrunner/servicebinarypackagesamename Servicebinarypackagesamename	2020-05-21 14:16:35 +02:00
lukas	86fd995923	some minor renamings edited README.md	2020-05-21 14:09:17 +02:00
lukas	12ff16dc8e	renamed service-binarayname and config file name to dynuiprefresher	2020-05-21 11:52:55 +02:00
lukas	ea648d5946	added usage info to readme	2020-05-21 11:38:39 +02:00
Lukas-Heiligenbrunner	8c0c888472	Merge pull request #19 from Lukas-Heiligenbrunner/configfilewriteable Configfilewriteable	2020-05-21 11:28:49 +02:00
Lukas-Heiligenbrunner	fed6d251be	Merge branch 'master' into configfilewriteable	2020-05-21 11:28:33 +02:00
lukas	ca47949a38	check if config folder exists if not create it right appdata folder for windows hosts seperate config path and config name in cmake header	2020-05-21 11:26:15 +02:00
lukas	8199fc2c1e	correct build of test targets correct upload of report.xml	2020-05-20 19:37:39 +02:00
lukas	998f3ea5e8	right xml export of unit test cases for test target	2020-05-20 19:25:37 +02:00
lukas	d8c3d4ffb8	correct build of gtests in one target with xml output	2020-05-19 23:57:16 +02:00
lukas	ede1afcce3	correct build dependencies for unit test	2020-05-19 21:50:43 +02:00
lukas	1239ae015a	right ci camke dependencies for win and unix build	2020-05-19 21:29:36 +02:00
lukas	5271a25cbc	use artifacts instead of cache	2020-05-19 21:13:53 +02:00
lukas	fb65ef98fa	new gitlab ci for windows build cmake- check if gtest is installed on build system validate compiler after setting of compiler paths	2020-05-19 20:58:18 +02:00
Lukas-Heiligenbrunner	da53941cba	enable and start iprefresher service automatically after package installation (#18 ) - dont terminate service if config not valid.	2020-05-19 16:35:57 +02:00
lukas	4344e7c118	added tabbed view new config page with ability to edit config file new features in config class - setting member variables new button locations in gui	2020-05-19 16:23:00 +02:00
lukas	a356bca964	install config in other folder win	2020-05-18 19:46:19 +02:00
lukas	268aa3a1ad	hide console window - windows gui right windows gui dll dependencies linux package qt dependencies for packaging	2020-05-18 17:18:41 +02:00
lukas	3be8203111	begin of gui implementations in cmake install script	2020-05-16 20:30:23 +02:00