[stable-3.16] Brander Build 3.16.6

.github/workflows/clang-tidy-review.yml

@@ -1,8 +1,7 @@
 name: clang-tidy-review
 
 on:
-  pull_request:
-    types: [opened, synchronize, reopened]
+  workflow_dispatch:
 
 jobs:
   clang-tidy:

.github/workflows/linux-appimage.yml

@@ -1,7 +1,6 @@
 name: Linux Appimage Package
 on:
-  pull_request:
-    types: [opened, synchronize, reopened]
+  workflow_dispatch:
 jobs:
   build:
     name: Linux Appimage Package

.github/workflows/linux-clang-compile-tests.yml

@@ -1,7 +1,6 @@
 name: Linux Clang compilation and tests
 on:
-  pull_request:
-    types: [opened, synchronize, reopened]
+  workflow_dispatch:
 jobs:
   build:
     name: Linux Clang compilation and tests

.github/workflows/linux-gcc-compile-tests.yml

@@ -1,7 +1,6 @@
 name: Linux GCC compilation and tests
 on:
-  pull_request:
-    types: [opened, synchronize, reopened]
+  workflow_dispatch:
 jobs:
   build:
     name: Linux GCC compilation and tests

.github/workflows/sonarcloud.yml

@@ -1,7 +1,6 @@
 name: SonarCloud analysis
 on:
-  pull_request:
-    types: [opened, synchronize, reopened]
+  workflow_dispatch:
 jobs:
   build:
     name: SonarCloud analysis

.github/workflows/windows-build-and-test.yml

@@ -1,5 +1,10 @@
 name: Windows Build and Test
 on:
+  workflow_dispatch:
+  # push:
+  #   branches:
+  #     - master
+  #     - develop
   pull_request:
     types: [opened, synchronize, reopened]
 jobs:

.gitignore

@@ -19,7 +19,7 @@ t1.cfg
 ## Ignore Visual Studio Code config & environment files
 
 .vs/
-.vscode/
+# .vscode/
 
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
@@ -192,3 +192,7 @@ convert.exe
 *state-*.png
 theme.qrc
 *.AppImage
+
+.idea/
+
+shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/

.vscode/c_cpp_properties.json

@@ -0,0 +1,14 @@
+{
+    "configurations": [
+        {
+            "name": "Linux",
+            "compileCommands": [
+                "${workspaceFolder}/../build/win32-MSVC-x64/RelWithDebInfo/compile_commands.json"
+            ],
+            "intelliSenseMode": "linux-gcc-x64",
+            "cStandard": "c17",
+            "cppStandard": "c++17"
+        }
+    ],
+    "version": 4
+}

.vscode/launch.json

@@ -0,0 +1,97 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+            {
+            "name": "(Linux-IONOS-RelWithDebInfo) Launch HiDriveNext",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/build/linux-GCC-x64/RelWithDebInfo/bin/IONOS_HiDrive_Next",
+            "args": [],
+            "stopAtEntry": false,
+            "cwd": "${workspaceFolder}",
+            "environment": [
+                {
+                    "name": "LD_LIBRARY_PATH",
+                    "value": "/home/chaetty/CraftRoot/bin:${env:LD_LIBRARY_PATH}"
+                },
+                { "name": "QML_IMPORT_TRACE", "value": "1" },
+                { "name": "QT_LOGGING_RULES", "value": "qt.qml.debug=true" }
+            ],
+            "MIMode": "gdb",
+            "setupCommands": [
+            { "description": "Enable pretty-printing for gdb", "text": "-enable-pretty-printing", "ignoreFailures": true }
+        ]
+        },
+        {
+            "name": "(Linux-STRATO-RelWithDebInfo) Launch HiDriveNext",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/build/linux-GCC-x64/RelWithDebInfo/bin/STRATO_HiDrive_Next",
+            "args": [],
+            "stopAtEntry": false,
+            "cwd": "${workspaceFolder}",
+            "environment": [
+                {
+                    "name": "LD_LIBRARY_PATH",
+                    "value": "/home/chaetty/CraftRoot/bin:${env:LD_LIBRARY_PATH}"
+                },
+                { "name": "QML_IMPORT_TRACE", "value": "1" },
+                { "name": "QT_LOGGING_RULES", "value": "qt.qml.debug=true" }
+            ],
+            "MIMode": "gdb",
+            "setupCommands": [
+            { "description": "Enable pretty-printing for gdb", "text": "-enable-pretty-printing", "ignoreFailures": true }
+        ]
+        },
+        {
+            "name": "(RelWithDebInfo) Launch HiDriveNext",
+            "type": "cppvsdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/../build/win32-MSVC-x64/RelWithDebInfo/bin/IONOS_HiDrive_Next.exe",
+            "args": [],
+            "stopAtEntry": false,
+            "cwd": "${workspaceFolder}",
+            "environment": [
+                {
+                    "name": "PATH",
+                    "value": "C:/CraftRoot/bin;C:/Craft64/bin;%PATH%"
+                },
+                { "name": "QML_IMPORT_TRACE", "value": "1" },
+                { "name": "QT_LOGGING_RULES", "value": "qt.qml.debug=true" }
+            ],
+        },
+        {
+            "name": "(RelWithDebInfo) Launch NextCloud",
+            "type": "cppvsdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/../build/win32-MSVC-x64/RelWithDebInfo/bin/nextcloud.exe",
+            "args": [],
+            "stopAtEntry": false,
+            "cwd": "${workspaceFolder}",
+            "environment": [
+                {
+                    "name": "PATH",
+                    "value": "C:/CraftRoot/bin;C:/Craft64/bin;%PATH%"
+                },
+            ],
+        },
+        {
+            "name": "(Release) Launch NextCloud",
+            "type": "cppvsdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/../build/win32-MSVC-x64/Release/bin/nextcloud.exe",
+            "args": [],
+            "stopAtEntry": false,
+            "cwd": "${workspaceFolder}",
+            "environment": [
+                {
+                    "name": "PATH",
+                    "value": "C:/CraftRoot/bin;C:/Craft64/bin;%PATH%"
+                },
+            ],
+        },
+    ]
+}

.vscode/nc-desktop-snippets.code-snippets

@@ -0,0 +1,30 @@
+{
+	// Place your nc-desktop workspace snippets here. Each snippet is defined under a snippet name and has a scope, prefix, body and 
+	// description. Add comma separated ids of the languages where the snippet is applicable in the scope field. If scope 
+	// is left empty or omitted, the snippet gets applied to all languages. The prefix is what is 
+	// used to trigger the snippet and the body will be expanded and inserted. Possible variables are: 
+	// $1, $2 for tab stops, $0 for the final cursor position, and ${1:label}, ${2:another} for placeholders. 
+	// Placeholders with the same ids are connected.
+	// Example:
+	// "Print to console": {
+	// 	"scope": "javascript,typescript",
+	// 	"prefix": "log",
+	// 	"body": [
+	// 		"console.log('$1');",
+	// 		"$2"
+	// 	],
+	// 	"description": "Log output to console"
+	// }
+
+	"DebugLog": {
+		"scope": "cpp",
+		"prefix": "dlog",
+		"body": [
+				"char buffer$1[256];",
+				"sprintf(buffer$1, \"$2\\n\", $3);",
+				"OutputDebugStringA(buffer$1);"
+		],
+		"description": "Debug log output"
+	}
+
+}

.vscode/settings.json

@@ -0,0 +1,17 @@
+{
+    "cmake.generator": "Ninja",
+    "cmake.configureSettings": {
+        "CMAKE_PREFIX_PATH": [
+          "C:/CraftRoot",
+          "C:/CraftRoot/dev-utils/bin",
+          "C:/Craft64",
+          "C:/Craft64/dev-utils/bin"
+      ],
+        "BUILD_TESTING":"OFF",
+      },
+      "cmake.buildDirectory": "${workspaceFolder}/../build/${buildKitTargetOs}-${buildKitVendor}-${buildKitTargetArch}/${buildType}",
+      "files.associations": {
+        "qwizardpage": "cpp",
+        "xutility": "cpp"
+      },
+}

.vscode/tasks.json

@@ -0,0 +1,37 @@
+{
+	"version": "2.0.0",
+	"tasks": [
+        {
+            "label": "clean RelWithDebInfo",
+            "type": "shell",
+            "command": "powershell",
+            "args": [
+                "-NoProfile",
+                "-Command",
+                "Remove-Item -Recurse -Force ..\\build\\win32-MSVC-x64\\RelWithDebInfo"
+            ],
+            "problemMatcher": [],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "detail": "A task to clean the build directory using PowerShell"
+        },
+		{
+            "label": "clean Release",
+            "type": "shell",
+            "command": "powershell",
+            "args": [
+                "-NoProfile",
+                "-Command",
+                "Remove-Item -Recurse -Force ..\\build\\win32-MSVC-x64\\Release"
+            ],
+            "problemMatcher": [],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "detail": "A task to clean the build directory using PowerShell"
+        },
+	]
+}

CMakeLists.txt

@@ -3,6 +3,8 @@ cmake_policy(SET CMP0071 NEW) # Enable use of QtQuick compiler/generated code
 
 project(client)
 
+add_compile_definitions(IONOS_BUILD)
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 if(APPLE)
     set(CMAKE_OSX_DEPLOYMENT_TARGET "12.0" CACHE STRING "Minimum OSX deployment version")
 endif()
@@ -22,6 +24,7 @@ set(CMAKE_XCODE_ATTRIBUTE_ENABLE_HARDENED_RUNTIME YES)
 set(BIN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 
 include(${CMAKE_SOURCE_DIR}/NEXTCLOUD.cmake)
+include(${CMAKE_SOURCE_DIR}/IONOS.cmake)
 
 set(QT_VERSION_MAJOR "6")
 set(REQUIRED_QT_VERSION "6.8.0")
@@ -218,7 +221,7 @@ if(OWNCLOUD_5XX_NO_BLACKLIST)
 endif()
 
 if(APPLE)
-  set( SOCKETAPI_TEAM_IDENTIFIER_PREFIX "" CACHE STRING "SocketApi prefix (including a following dot) that must match the codesign key's TeamIdentifier/Organizational Unit" )
+  set( SOCKETAPI_TEAM_IDENTIFIER_PREFIX "5TDLCVD243." CACHE STRING "SocketApi prefix (including a following dot) that must match the codesign key's TeamIdentifier/Organizational Unit" )
 endif()
 
 if(BUILD_CLIENT)

CPackOptions.cmake.in

@@ -10,7 +10,7 @@ endif(CPACK_GENERATOR MATCHES "NSIS")
 set( CMAKE_SOURCE_DIR  @CMAKE_SOURCE_DIR@ )
 set( CMAKE_BINARY_DIR  @CMAKE_BINARY_DIR@ )
 
-include("${CMAKE_SOURCE_DIR}/NEXTCLOUD.cmake")
+include("${CMAKE_SOURCE_DIR}/IONOS.cmake")
 
 set( CRASHREPORTER_EXECUTABLE @CRASHREPORTER_EXECUTABLE@)
 

IONOS.cmake

@@ -0,0 +1,63 @@
+set( APPLICATION_REV_DOMAIN "com.ionos.hidrivenext.desktopclient" )
+
+option(LOCALBUILD "Local developer build" OFF)
+
+if(LOCALBUILD)
+    ## Only needed for local build
+    message(STATUS "Building in LOCAL mode")
+
+    set( APPLICATION_VIRTUALFILE_SUFFIX "${APPLICATION_SHORTNAME}_virtual" CACHE STRING "Virtual file suffix (not including the .)" FORCE)
+
+    ## Windows Shell Extensions & MSI - IMPORTANT: Generate new GUIDs for custom builds with "guidgen" or "uuidgen"
+    if(WIN32)
+        # Context Menu
+        set( WIN_SHELLEXT_CONTEXT_MENU_GUID      "{6B16FF7B-F242-4CE3-8FB9-F06EF127E0DC}" )
+
+        # Overlays
+        set( WIN_SHELLEXT_OVERLAY_GUID_ERROR     "{243D887B-9F74-41DD-BACA-BC5501AF10AC}" )
+        set( WIN_SHELLEXT_OVERLAY_GUID_OK        "{2D88D499-3272-4A76-84BF-D252254B40D6}" )
+        set( WIN_SHELLEXT_OVERLAY_GUID_OK_SHARED "{7BEF6B56-5B5B-4284-A70C-56D62254C97A}" )
+        set( WIN_SHELLEXT_OVERLAY_GUID_SYNC      "{5F2F493D-A683-426F-925E-4CA25F17C4A9}" )
+        set( WIN_SHELLEXT_OVERLAY_GUID_WARNING   "{7F256BB6-29D2-4E40-A6C4-E5E756E64C82}" )
+
+        # MSI Upgrade Code (without brackets)
+        set( WIN_MSI_UPGRADE_CODE                "6C9E5670-E8A9-4BBD-9BDF-D003794AC177" )
+    endif()
+
+    if("${WHITELABEL_NAME}" STREQUAL "strato")
+        set( APPLICATION_NAME       "STRATO HiDrive Next" )
+        set( APPLICATION_SHORTNAME  "STRATOHiDriveNext" )
+        set( APPLICATION_EXECUTABLE "strato-hidrive-next" )
+        set( APPLICATION_CONFIG_NAME "STRATO-HiDrive-Next" )
+        set( APPLICATION_ICON_NAME  "strato_hidrive_next" )
+        set( APPLICATION_DOMAIN     "strato.com" )
+        set( APPLICATION_UPDATE_URL "https://customerupdates.nextcloud.com/client/" CACHE STRING "URL for updater" FORCE)
+        set( APPLICATION_HELP_URL   "" CACHE STRING "URL for the help menu" FORCE)
+        set( APPLICATION_SERVER_URL "https://storage.ionos.fr" CACHE STRING "URL for the server to use. If entered, the UI field will be pre-filled with it" FORCE)
+    elseif("${WHITELABEL_NAME}" STREQUAL "ionos")
+        set( APPLICATION_NAME       "IONOS HiDrive Next" )
+        set( APPLICATION_SHORTNAME  "IONOSHiDriveNext" )
+        set( APPLICATION_EXECUTABLE "ionos-hidrive-next" )
+        set( APPLICATION_CONFIG_NAME "IONOS-HiDrive-Next" )
+        set( APPLICATION_ICON_NAME  "ionos_hidrive_next" )
+        set( APPLICATION_DOMAIN     "ionos.com" )
+        set( APPLICATION_UPDATE_URL "https://customerupdates.nextcloud.com/client/" CACHE STRING "URL for updater" FORCE)
+        set( APPLICATION_HELP_URL   "" CACHE STRING "URL for the help menu" FORCE)
+        set( APPLICATION_SERVER_URL "https://storage.ionos.fr" CACHE STRING "URL for the server to use. If entered, the UI field will be pre-filled with it" FORCE)
+    endif()
+
+endif()
+
+
+if(APPLE AND "${APPLICATION_NAME}" MATCHES "HiDrive Next")
+    set(APPLICATION_ICON_NAME "${APPLICATION_EXECUTABLE}-macOS")
+    message("Using macOS-specific application icon: ${APPLICATION_ICON_NAME}")
+endif()
+
+if(APPLICATION_NAME STREQUAL "STRATO HiDrive Next")
+    set( APPLICATION_VENDOR     "STRATO" )
+    add_compile_definitions(STRATO_WL_BUILD)
+elseif(APPLICATION_NAME STREQUAL "IONOS HiDrive Next")
+    set( APPLICATION_VENDOR     "IONOS SE" )
+    add_compile_definitions(IONOS_WL_BUILD)
+endif()