Merge pull request #98 from jacquetc/develop

Develop

3rdparty/icons.qrc

@@ -82,5 +82,12 @@
         <file>icons/backup/tag.svg</file>
         <file>icons/backup/tag-new.svg</file>
         <file>icons/backup/lock.svg</file>
+        <file>icons/backup/help-about.svg</file>
+        <file>icons/backup/system-help.svg</file>
+        <file>icons/backup/data-error.svg</file>
+        <file>icons/backup/data-information.svg</file>
+        <file>icons/backup/data-warning.svg</file>
+        <file>icons/backup/emblem-checked.svg</file>
+        <file>icons/backup/object-rows.svg</file>
     </qresource>
 </RCC>

CMakeLists.txt

@@ -7,6 +7,7 @@ cmake_minimum_required(VERSION 3.5.0)
 #    cmake_policy(SET CMP0071 NEW)
 #endif()
 set(QT_MIN_VERSION "5.15.0")
+set(QT_DEFAULT_MAJOR_VERSION 5)
 
 find_package(ECM REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/ ${CMAKE_SOURCE_DIR}/cmake/3rdparty/ ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
@@ -28,6 +29,7 @@ add_compile_definitions(SKR_VERSION_MAJOR=${VERSION_MAJOR})
 add_compile_definitions(SKR_VERSION_MINOR=${VERSION_MINOR})
 add_compile_definitions(SKR_VERSION_PATCH=${VERSION_PATCH})
 
+
 project(skribisto LANGUAGES CXX VERSION ${VERSION})
 
 # Include GNUInstallDirs, which sets sensible defaults for install directories.

src/app/src/main.cpp

@@ -24,6 +24,7 @@ using namespace std;
 #include "skrresult.h"
 #include "plmprojecthub.h"
 #include "skrprojectdicthub.h"
+#include "skrerrorhub.h"
 #include "plmpropertyhub.h"
 #include "skrstathub.h"
 #include "documenthandler.h"
@@ -139,7 +140,6 @@ int main(int argc, char *argv[])
 
 
     QApplication app(argc, argv);
-
     // icons :
     // qDebug() << "icon search paths :" << QIcon::themeSearchPaths();
 
@@ -235,6 +235,13 @@ int main(int argc, char *argv[])
                                                "SKRStatHub",
                                                "Can't instantiate SKRStatHub");
 
+    qmlRegisterUncreatableType<SKRErrorHub>("eu.skribisto.errorhub",
+                                               1,
+                                               0,
+                                               "SKRStatHub",
+                                               "Can't instantiate SKRErrorHub");
+
+
     qmlRegisterUncreatableType<SKR>("eu.skribisto.skr",
                                                1,
                                                0,

src/app/src/qml.qrc

@@ -118,5 +118,11 @@
         <file>qml/Welcome/FileMenuPage.qml</file>
         <file>qml/Welcome/FileMenuPageForm.ui.qml</file>
         <file>qml/Commons/ListItemAttributes.qml</file>
+        <file>qml/Welcome/HelpContents.qml</file>
+        <file>qml/Welcome/HelpContentsForm.ui.qml</file>
+        <file>qml/Welcome/FAQ.qml</file>
+        <file>qml/Welcome/FAQForm.ui.qml</file>
+        <file>qml/Welcome/About.qml</file>
+        <file>qml/Welcome/AboutForm.ui.qml</file>
     </qresource>
 </RCC>

src/app/src/qml/Commons/DocumentListViewForm.ui.qml

@@ -10,14 +10,18 @@ Item {
     width: 400
     height: 400
 
+    implicitHeight: columnLayout.childrenRect.height
+
     SkrPane {
         id: pane
         clip: true
         anchors.fill: parent
         padding: 0
         ColumnLayout {
-            id: columnLayout
-            anchors.fill: parent
+            id: columnLayout            
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
 
             ScrollView {
                 focusPolicy: Qt.WheelFocus