diff --git a/CMakeLists.txt b/CMakeLists.txt index 777907884..8739964e5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,13 +7,7 @@ include(FeatureSummary) set(BIN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") - -set(OEM_THEME_DIR "" CACHE STRING "Define directory containing a custom theme") -if ( EXISTS ${OEM_THEME_DIR}/OEM.cmake ) - include ( ${OEM_THEME_DIR}/OEM.cmake ) -else () - include ( ${CMAKE_SOURCE_DIR}/NEXTCLOUD.cmake ) -endif() +include(${CMAKE_SOURCE_DIR}/NEXTCLOUD.cmake) # Default suffix if the theme doesn't define one if(NOT DEFINED APPLICATION_VIRTUALFILE_SUFFIX) diff --git a/CPackOptions.cmake.in b/CPackOptions.cmake.in index 535421ad4..109af43d2 100644 --- a/CPackOptions.cmake.in +++ b/CPackOptions.cmake.in @@ -9,13 +9,8 @@ endif(CPACK_GENERATOR MATCHES "NSIS") set( CMAKE_SOURCE_DIR @CMAKE_SOURCE_DIR@ ) set( CMAKE_BINARY_DIR @CMAKE_BINARY_DIR@ ) -set( OEM_THEME_DIR @OEM_THEME_DIR@ ) -if ( DEFINED OEM_THEME_DIR AND EXISTS ${OEM_THEME_DIR}/OEM.cmake ) - include ( ${OEM_THEME_DIR}/OEM.cmake ) -else () - include ( "${CMAKE_SOURCE_DIR}/NEXTCLOUD.cmake" ) -endif() +include("${CMAKE_SOURCE_DIR}/NEXTCLOUD.cmake") set( CRASHREPORTER_EXECUTABLE @CRASHREPORTER_EXECUTABLE@) diff --git a/NextcloudCPack.cmake b/NextcloudCPack.cmake index 2edb205e1..0682090c0 100644 --- a/NextcloudCPack.cmake +++ b/NextcloudCPack.cmake @@ -2,11 +2,7 @@ include( InstallRequiredSystemLibraries ) set( CPACK_PACKAGE_CONTACT "Dominik Schmidt " ) -if ( DEFINED OEM_THEME_DIR AND EXISTS ${OEM_THEME_DIR}/OEM.cmake ) - include ( "${OEM_THEME_DIR}/OEM.cmake" ) -else () - include ( "${CMAKE_SOURCE_DIR}/NEXTCLOUD.cmake" ) -endif() +include("${CMAKE_SOURCE_DIR}/NEXTCLOUD.cmake") include( VERSION.cmake ) set( CPACK_PACKAGE_VERSION_MAJOR ${MIRALL_VERSION_MAJOR} ) diff --git a/admin/osx/CMakeLists.txt b/admin/osx/CMakeLists.txt index 67229c4e9..ba818684f 100644 --- a/admin/osx/CMakeLists.txt +++ b/admin/osx/CMakeLists.txt @@ -1,7 +1,5 @@ -# Check if varialbe MAC_INSTALLER_BACKGROUND_FILE is defined. That might come -# from the OEM.cmake for branded clients or from NEXTCLOUD.cmake for the non -# branded client. +# Check if varialbe MAC_INSTALLER_BACKGROUND_FILE is defined. # Make sure that the MAC_INSTALLER_BACKGROUND_FILE contains the full path, ie. # includes CMAKE_SOURCE_DIR or so. diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 671b19d6b..ab0c65879 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -9,16 +9,11 @@ IF(BUILD_UPDATER) add_subdirectory(updater) endif() -set(MIRALL_RC_SRC ../../resources.qrc) -if (EXISTS "${OEM_THEME_DIR}/theme.qrc") - list(APPEND MIRALL_RC_SRC ${OEM_THEME_DIR}/theme.qrc) - set(theme_dir ${OEM_THEME_DIR}/theme) -else() - list(APPEND MIRALL_RC_SRC ../../theme.qrc) - set(theme_dir ${CMAKE_SOURCE_DIR}/theme) -endif() +configure_file(${CMAKE_SOURCE_DIR}/theme.qrc.in ${CMAKE_SOURCE_DIR}/theme.qrc) -#set (QML_IMPORT_PATH "${CMAKE_SOURCE_DIR}/src/gui/tray" CACHE STRING "Extra qml module import paths" FORCE) +set(MIRALL_RC_SRC ../../resources.qrc) +list(APPEND MIRALL_RC_SRC ${CMAKE_SOURCE_DIR}/theme.qrc) +set(theme_dir ${CMAKE_SOURCE_DIR}/theme) set(client_UI_SRCS accountsettings.ui diff --git a/theme.qrc b/theme.qrc index 4402bd2c2..8da6ba56b 100644 --- a/theme.qrc +++ b/theme.qrc @@ -190,7 +190,6 @@ theme/colored/add.svg theme/colored/delete.svg theme/colored/Nextcloud-icon.svg - theme/colored/Nextcloud-sidebar.svg theme/add.svg theme/share.svg theme/reply.svg diff --git a/theme.qrc.in b/theme.qrc.in new file mode 100644 index 000000000..63da54883 --- /dev/null +++ b/theme.qrc.in @@ -0,0 +1,202 @@ + + + theme/colored/16-@APPLICATION_ICON_NAME@-icon.png + theme/colored/24-@APPLICATION_ICON_NAME@-icon.png + theme/colored/32-@APPLICATION_ICON_NAME@-icon.png + theme/colored/48-@APPLICATION_ICON_NAME@-icon.png + theme/colored/64-@APPLICATION_ICON_NAME@-icon.png + theme/colored/128-@APPLICATION_ICON_NAME@-icon.png + theme/colored/256-@APPLICATION_ICON_NAME@-icon.png + theme/colored/512-@APPLICATION_ICON_NAME@-icon.png + theme/colored/1024-@APPLICATION_ICON_NAME@-icon.png + theme/colored/state-error-32.png + theme/colored/state-error-64.png + theme/colored/state-error-128.png + theme/colored/state-error-256.png + theme/colored/state-ok-32.png + theme/colored/state-ok-64.png + theme/colored/state-ok-128.png + theme/colored/state-ok-256.png + theme/colored/state-pause-32.png + theme/colored/state-pause-64.png + theme/colored/state-pause-128.png + theme/colored/state-pause-256.png + theme/colored/state-sync-32.png + theme/colored/state-sync-64.png + theme/colored/state-sync-128.png + theme/colored/state-sync-256.png + theme/colored/wizard_logo.png + theme/colored/wizard_logo@2x.png + theme/colored/wizard_logo.svg + theme/white/state-error-32.png + theme/white/state-error-64.png + theme/white/state-error-128.png + theme/white/state-error-256.png + theme/white/state-ok-32.png + theme/white/state-ok-64.png + theme/white/state-ok-128.png + theme/white/state-ok-256.png + theme/white/state-pause-32.png + theme/white/state-pause-64.png + theme/white/state-pause-128.png + theme/white/state-pause-256.png + theme/white/state-sync-32.png + theme/white/state-sync-64.png + theme/white/state-sync-128.png + theme/white/state-sync-256.png + theme/black/state-error-32.png + theme/black/state-error-64.png + theme/black/state-error-128.png + theme/black/state-error-256.png + theme/black/state-ok-32.png + theme/black/state-ok-64.png + theme/black/state-ok-128.png + theme/black/state-ok-256.png + theme/black/state-pause-32.png + theme/black/state-pause-64.png + theme/black/state-pause-128.png + theme/black/state-pause-256.png + theme/black/state-sync-32.png + theme/black/state-sync-64.png + theme/black/state-sync-128.png + theme/black/state-sync-256.png + theme/colored/state-error.svg + theme/colored/state-error-16.png + theme/colored/state-offline.svg + theme/colored/state-offline-16.png + theme/colored/state-offline-32.png + theme/colored/state-offline-64.png + theme/colored/state-offline-128.png + theme/colored/state-offline-256.png + theme/colored/state-ok.svg + theme/colored/state-ok-16.png + theme/colored/state-pause.svg + theme/colored/state-pause-16.png + theme/colored/state-sync.svg + theme/colored/state-sync-16.png + theme/colored/state-warning.svg + theme/colored/state-warning-16.png + theme/colored/state-warning-32.png + theme/colored/state-warning-64.png + theme/colored/state-warning-128.png + theme/colored/state-warning-256.png + theme/black/folder.png + theme/black/folder@2x.png + theme/white/folder.png + theme/white/folder@2x.png + theme/colored/folder.png + theme/colored/folder@2x.png + theme/black/control-next.svg + theme/black/control-prev.svg + theme/black/state-error.svg + theme/black/state-error-16.png + theme/black/state-offline.svg + theme/black/state-offline-16.png + theme/black/state-offline-32.png + theme/black/state-offline-64.png + theme/black/state-offline-128.png + theme/black/state-offline-256.png + theme/black/state-ok.svg + theme/black/state-ok-16.png + theme/black/state-pause.svg + theme/black/state-pause-16.png + theme/black/state-sync.svg + theme/black/state-sync-16.png + theme/black/state-warning.svg + theme/black/state-warning-16.png + theme/black/state-warning-32.png + theme/black/state-warning-64.png + theme/black/state-warning-128.png + theme/black/state-warning-256.png + theme/white/control-next.svg + theme/white/control-prev.svg + theme/white/state-error.svg + theme/white/state-error-16.png + theme/white/state-offline.svg + theme/white/state-offline-16.png + theme/white/state-offline-32.png + theme/white/state-offline-64.png + theme/white/state-offline-128.png + theme/white/state-offline-256.png + theme/white/state-ok.svg + theme/white/state-ok-16.png + theme/white/state-pause.svg + theme/white/state-pause-16.png + theme/white/state-sync.svg + theme/white/state-sync-16.png + theme/white/state-warning.svg + theme/white/state-warning-16.png + theme/white/state-warning-32.png + theme/white/state-warning-64.png + theme/white/state-warning-128.png + theme/white/state-warning-256.png + theme/white/wizard-files.png + theme/white/wizard-files@2x.png + theme/white/wizard-groupware.png + theme/white/wizard-groupware@2x.png + theme/white/wizard-nextcloud.png + theme/white/wizard-nextcloud@2x.png + theme/white/wizard-talk.png + theme/white/wizard-talk@2x.png + theme/black/wizard-files.png + theme/black/wizard-files@2x.png + theme/black/wizard-groupware.png + theme/black/wizard-groupware@2x.png + theme/black/wizard-nextcloud.png + theme/black/wizard-nextcloud@2x.png + theme/black/wizard-talk.png + theme/black/wizard-talk@2x.png + theme/black/wizard-files.png + theme/colored/wizard-files.png + theme/colored/wizard-files@2x.png + theme/colored/wizard-groupware.png + theme/colored/wizard-groupware@2x.png + theme/colored/wizard-nextcloud.png + theme/colored/wizard-nextcloud@2x.png + theme/colored/wizard-talk.png + theme/colored/wizard-talk@2x.png + theme/sync-arrow.svg + theme/white/external.png + theme/white/external@2x.png + theme/black/external.png + theme/black/external@2x.png + theme/colored/external.png + theme/colored/external@2x.png + theme/white/folder.svg + theme/white/more-apps.svg + theme/white/talk-app.svg + theme/white/caret-down.svg + theme/black/caret-down.svg + theme/white/user.svg + theme/black/user.svg + theme/white/add.svg + theme/black/add.svg + theme/black/activity.svg + theme/black/bell.svg + theme/black/state-info.svg + theme/close.svg + theme/files.svg + theme/public.svg + theme/settings.svg + theme/confirm.svg + theme/copy.svg + theme/more.svg + theme/change.svg + theme/lock-http.svg + theme/lock-https.svg + theme/lock-broken.svg + theme/network.svg + theme/account.svg + theme/colored/add.svg + theme/colored/delete.svg + theme/colored/@APPLICATION_ICON_NAME@-icon.svg + theme/add.svg + theme/share.svg + theme/reply.svg + theme/magnifying-glass.svg + theme/colored/user-status-online.svg + theme/colored/user-status-invisible.svg + theme/colored/user-status-away.svg + theme/colored/user-status-dnd.svg + +