Merge branch 'develop' into kdesktop-240-delay-logs-removal

Infomaniak · Mar 22, 2024 · b067974 · b067974
2 parents 865fe80 + 0125814
commit b067974
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -22,6 +22,7 @@ install/
 *.user
 *.sln.docstates
 .drone-secrets.env
+*.vscode
 
 # Build results
 [Dd]ebug/

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -2,6 +2,7 @@ project(gui)
 
 find_package(Qt6 REQUIRED COMPONENTS Network Sql Widgets SvgWidgets WebEngineWidgets)
 find_package(Qt6LinguistTools)
+find_package(Poco 1.12.5 REQUIRED Foundation Net)
 
 add_definitions(-DUNICODE)
 add_definitions(-D_UNICODE)
@@ -254,6 +255,7 @@ endif()
 target_link_libraries(${APPLICATION_CLIENT_EXECUTABLE}
     Qt6::Network Qt6::Sql Qt6::SvgWidgets Qt6::WebEngineWidgets
     sentry::sentry
+    Poco::Foundation Poco::Net
     ${libcommon_NAME}
     ${libcommongui_NAME})
 

diff --git a/src/gui/parametersdialog.cpp b/src/gui/parametersdialog.cpp
@@ -820,8 +820,7 @@ QString ParametersDialog::getErrorMessage(ErrorInfo &errorInfo) {
                                   "The file/directory has been temporarily blacklisted.")
                             .arg(errorInfo.path());
                     } else if (errorInfo.exitCause() == ExitCauseFileTooBig) {
-                        return tr("Impossible to upload a file bigger than 100GB.<br>"
-                                  "The file \"%1\" has been temporarily blacklisted")
+                        return tr("The file \"%1\" is too large to be uploaded. It has been temporarily blacklisted.")
                             .arg(errorInfo.path());
                     } else if (errorInfo.exitCause() == ExitCauseNotFound) {
                         return tr("Impossible to download file \"%1\"").arg(errorInfo.path());

diff --git a/src/libcommonserver/CMakeLists.txt b/src/libcommonserver/CMakeLists.txt
@@ -1,7 +1,7 @@
 project(libcommonserver)
 
 find_package(SQLite3 3.8.0 REQUIRED)
-find_package(Poco 1.12.5 REQUIRED Foundation JSON Util)
+find_package(Poco 1.12.5 REQUIRED Foundation Net JSON Util)
 find_package(OpenSSL 3.1.0 REQUIRED SSL Crypto)
 find_package(log4cplus 2.1.0 REQUIRED)
 find_package(xxHash 0.8.1 REQUIRED)
@@ -84,7 +84,7 @@ endif()
 target_link_libraries(${libcommonserver_NAME}
     ${libcommon_NAME}
     ${SQLITE3_LIBRARIES}
-    Poco::Foundation Poco::JSON Poco::Util
+    Poco::Foundation Poco::Net Poco::JSON Poco::Util
     OpenSSL::SSL OpenSSL::Crypto)
 
 if (WIN32)

diff --git a/test/libparms/CMakeLists.txt b/test/libparms/CMakeLists.txt
@@ -1,7 +1,7 @@
 project(testparms)
 
 find_package(SQLite3 3.8.0 REQUIRED)
-find_package(Poco 1.12.5 REQUIRED Foundation Net)
+find_package(Poco REQUIRED Foundation)
 find_package(log4cplus 2.1.0 REQUIRED)
 
 set(testparms_NAME ${APPLICATION_NAME}_test_parms)
@@ -31,7 +31,6 @@ set_target_properties(${testparms_NAME} PROPERTIES
 target_link_libraries(${testparms_NAME}
     ${libparms_NAME}
     ${SQLITE3_LIBRARIES}
-    Poco::Foundation Poco::Net
 )
 
 if (WIN32)

diff --git a/uninstaller/MacOSX/kDriveUninstaller/kDriveUninstaller.xcodeproj/project.pbxproj b/uninstaller/MacOSX/kDriveUninstaller/kDriveUninstaller.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 53;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */

diff --git a/...kDriveUninstaller.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/...kDriveUninstaller.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -0,0 +1,5 @@
+<?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/>
+</plist>
diff --git a/...ninstaller/kDriveUninstaller.xcodeproj/xcshareddata/xcschemes/kDrive Uninstaller.xcscheme b/...ninstaller/kDriveUninstaller.xcodeproj/xcshareddata/xcschemes/kDrive Uninstaller.xcscheme
@@ -17,7 +17,7 @@
                BlueprintIdentifier = "94E0FC3A1BD7FC3600A3C537"
                BuildableName = "kDrive Uninstaller.app"
                BlueprintName = "kDrive Uninstaller"
-               ReferencedContainer = "container:kDrive Uninstaller.xcodeproj">
+               ReferencedContainer = "container:kDriveUninstaller.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -47,9 +47,18 @@
             BlueprintIdentifier = "94E0FC3A1BD7FC3600A3C537"
             BuildableName = "kDrive Uninstaller.app"
             BlueprintName = "kDrive Uninstaller"
-            ReferencedContainer = "container:kDrive Uninstaller.xcodeproj">
+            ReferencedContainer = "container:kDriveUninstaller.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "94E0FC3A1BD7FC3600A3C537"
+            BuildableName = "kDrive Uninstaller.app"
+            BlueprintName = "kDrive Uninstaller"
+            ReferencedContainer = "container:kDriveUninstaller.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -64,9 +73,18 @@
             BlueprintIdentifier = "94E0FC3A1BD7FC3600A3C537"
             BuildableName = "kDrive Uninstaller.app"
             BlueprintName = "kDrive Uninstaller"
-            ReferencedContainer = "container:kDrive Uninstaller.xcodeproj">
+            ReferencedContainer = "container:kDriveUninstaller.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "94E0FC3A1BD7FC3600A3C537"
+            BuildableName = "kDrive Uninstaller.app"
+            BlueprintName = "kDrive Uninstaller"
+            ReferencedContainer = "container:kDriveUninstaller.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">