From aebf9a45828bbbbf1b35ad1df17d24f41ca09d91 Mon Sep 17 00:00:00 2001 From: Camila Ayres Date: Mon, 9 Dec 2024 11:06:32 +0100 Subject: [PATCH] Add bool theme option to display legacy import dialog. Signed-off-by: Camila Ayres --- NEXTCLOUD.cmake | 1 + config.h.in | 1 + src/libsync/theme.cpp | 9 +++++++++ src/libsync/theme.h | 7 +++++++ 4 files changed, 18 insertions(+) diff --git a/NEXTCLOUD.cmake b/NEXTCLOUD.cmake index e2632dbcfb6d6..3cd8a49c09b41 100644 --- a/NEXTCLOUD.cmake +++ b/NEXTCLOUD.cmake @@ -28,6 +28,7 @@ set( APPLICATION_REV_DOMAIN "com.nextcloud.desktopclient" ) set( APPLICATION_VIRTUALFILE_SUFFIX "nextcloud" CACHE STRING "Virtual file suffix (not including the .)") set( APPLICATION_OCSP_STAPLING_ENABLED OFF ) set( APPLICATION_FORBID_BAD_SSL OFF ) +option( APPLICATION_DISPLAY_LEGACY_IMPORT_DIALOG "Display legacy import dialog" ON ) set( LINUX_PACKAGE_SHORTNAME "nextcloud" ) set( LINUX_APPLICATION_ID "${APPLICATION_REV_DOMAIN}.${LINUX_PACKAGE_SHORTNAME}") diff --git a/config.h.in b/config.h.in index be3005502032f..faaec1bea23f6 100644 --- a/config.h.in +++ b/config.h.in @@ -38,6 +38,7 @@ #cmakedefine01 ENFORCE_VIRTUAL_FILES_SYNC_FOLDER #cmakedefine DO_NOT_USE_PROXY "@DO_NOT_USE_PROXY@" #cmakedefine ENFORCE_SINGLE_ACCOUNT "@ENFORCE_SINGLE_ACCOUNT@" +#cmakedefine01 APPLICATION_DISPLAY_LEGACY_IMPORT_DIALOG #cmakedefine ZLIB_FOUND @ZLIB_FOUND@ diff --git a/src/libsync/theme.cpp b/src/libsync/theme.cpp index a77aa4450d7f1..6cb967ea3e441 100644 --- a/src/libsync/theme.cpp +++ b/src/libsync/theme.cpp @@ -1036,6 +1036,15 @@ bool Theme::darkMode() const return isDarkFromStyle(); } +bool Theme::displayLegacyImportDialog() const +{ +#if defined APPLICATION_DISPLAY_LEGACY_IMPORT_DIALOG + return true; +#else + return false; +#endif +} + void Theme::setOverrideServerUrl(const QString &overrideServerUrl) { auto validOverrideServerUrl = overrideServerUrl; diff --git a/src/libsync/theme.h b/src/libsync/theme.h index 9e12ba709f51c..1c1416ef64cdf 100644 --- a/src/libsync/theme.h +++ b/src/libsync/theme.h @@ -604,6 +604,13 @@ class OWNCLOUDSYNC_EXPORT Theme : public QObject [[nodiscard]] QVariantMap systemPalette() const; [[nodiscard]] bool darkMode() const; + /** + * Display legacy import dialog + * + * The user will interact with the dialog to import legacy account when set to true + */ + [[nodiscard]] bool displayLegacyImportDialog() const; + public slots: void setOverrideServerUrl(const QString &overrideServerUrl); void setForceOverrideServerUrl(bool forceOverride);