From 4b4437787f739ebd4112229d12179b4e81371a1a Mon Sep 17 00:00:00 2001 From: Kevin Ottens Date: Wed, 20 Jan 2021 10:41:16 +0100 Subject: [PATCH] Add the APPLICATION_ICON_SET option Also mention the svg possibly used in the wizard Signed-off-by: Kevin Ottens --- NEXTCLOUD.cmake | 3 ++- config.h.in | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/NEXTCLOUD.cmake b/NEXTCLOUD.cmake index 6f034094c..e9edb7b80 100644 --- a/NEXTCLOUD.cmake +++ b/NEXTCLOUD.cmake @@ -6,6 +6,7 @@ set( APPLICATION_VENDOR "Nextcloud GmbH" ) set( APPLICATION_UPDATE_URL "https://updates.nextcloud.org/client/" CACHE STRING "URL for updater" ) set( APPLICATION_HELP_URL "" CACHE STRING "URL for the help menu" ) set( APPLICATION_ICON_NAME "Nextcloud" ) +set( APPLICATION_ICON_SET "SVG" ) set( APPLICATION_SERVER_URL "" CACHE STRING "URL for the server to use. If entered, the UI field will be pre-filled with it" ) set( APPLICATION_SERVER_URL_ENFORCE ON ) # If set and APPLICATION_SERVER_URL is defined, the server can only connect to the pre-defined URL set( APPLICATION_REV_DOMAIN "com.nextcloud.desktopclient" ) @@ -35,7 +36,7 @@ option( WITH_PROVIDERS "Build with providers list" ON ) ## Theming options set( APPLICATION_WIZARD_HEADER_BACKGROUND_COLOR "#0082c9" CACHE STRING "Hex color of the wizard header background") set( APPLICATION_WIZARD_HEADER_TITLE_COLOR "#ffffff" CACHE STRING "Hex color of the text in the wizard header") -option( APPLICATION_WIZARD_USE_CUSTOM_LOGO "Use the logo from ':/client/theme/colored/wizard_logo.png' else the default application icon is used" ON ) +option( APPLICATION_WIZARD_USE_CUSTOM_LOGO "Use the logo from ':/client/theme/colored/wizard_logo.(png|svg)' else the default application icon is used" ON ) # diff --git a/config.h.in b/config.h.in index a07a4f9a6..d69788752 100644 --- a/config.h.in +++ b/config.h.in @@ -20,6 +20,7 @@ #cmakedefine APPLICATION_UPDATE_URL "@APPLICATION_UPDATE_URL@" #cmakedefine APPLICATION_HELP_URL "@APPLICATION_HELP_URL@" #cmakedefine APPLICATION_ICON_NAME "@APPLICATION_ICON_NAME@" +#cmakedefine APPLICATION_ICON_SET "@APPLICATION_ICON_SET@" #cmakedefine APPLICATION_SERVER_URL "@APPLICATION_SERVER_URL@" #cmakedefine APPLICATION_SERVER_URL_ENFORCE "@APPLICATION_SERVER_URL_ENFORCE@" #cmakedefine LINUX_APPLICATION_ID "@LINUX_APPLICATION_ID@"