opensourcemirror
/
nextcloud-desktop
mirror of https://github.com/nextcloud/desktop.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove conditional logic for OEM.cmake 

This file is not used in Brander and in the desktop client and just
confused people.

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
This commit is contained in:
Felix Weilbach 2021-06-02 17:13:40 +02:00 committed by Felix Weilbach (Rebase PR Action)
parent ec521e1d4c
commit e7c65a71b8
7 changed files with 210 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -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)

7
CPackOptions.cmake.in
View File

@ -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@)

6
NextcloudCPack.cmake
View File

@ -2,11 +2,7 @@ include( InstallRequiredSystemLibraries )
set( CPACK_PACKAGE_CONTACT "Dominik Schmidt <domme@tomahawk-player.org>" )
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} )

4
admin/osx/CMakeLists.txt
View File

@ -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.

13
src/gui/CMakeLists.txt
View File

@ -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

1
theme.qrc
View File

@ -190,7 +190,6 @@
<file>theme/colored/add.svg</file>
<file>theme/colored/delete.svg</file>
<file>theme/colored/Nextcloud-icon.svg</file>
<file>theme/colored/Nextcloud-sidebar.svg</file>
<file>theme/add.svg</file>
<file>theme/share.svg</file>
<file>theme/reply.svg</file>

202
theme.qrc.in Normal file
View File

@ -0,0 +1,202 @@
<RCC>
<qresource prefix="/client">
<file alias="theme/colored/@APPLICATION_ICON_NAME@-icon-16.png">theme/colored/16-@APPLICATION_ICON_NAME@-icon.png</file>
<file alias="theme/colored/@APPLICATION_ICON_NAME@-icon-24.png">theme/colored/24-@APPLICATION_ICON_NAME@-icon.png</file>
<file alias="theme/colored/@APPLICATION_ICON_NAME@-icon-32.png">theme/colored/32-@APPLICATION_ICON_NAME@-icon.png</file>
<file alias="theme/colored/@APPLICATION_ICON_NAME@-icon-48.png">theme/colored/48-@APPLICATION_ICON_NAME@-icon.png</file>
<file alias="theme/colored/@APPLICATION_ICON_NAME@-icon-64.png">theme/colored/64-@APPLICATION_ICON_NAME@-icon.png</file>
<file alias="theme/colored/@APPLICATION_ICON_NAME@-icon-128.png">theme/colored/128-@APPLICATION_ICON_NAME@-icon.png</file>
<file alias="theme/colored/@APPLICATION_ICON_NAME@-icon-256.png">theme/colored/256-@APPLICATION_ICON_NAME@-icon.png</file>
<file alias="theme/colored/@APPLICATION_ICON_NAME@-icon-512.png">theme/colored/512-@APPLICATION_ICON_NAME@-icon.png</file>
<file alias="theme/colored/@APPLICATION_ICON_NAME@-icon-1024.png">theme/colored/1024-@APPLICATION_ICON_NAME@-icon.png</file>
<file>theme/colored/state-error-32.png</file>
<file>theme/colored/state-error-64.png</file>
<file>theme/colored/state-error-128.png</file>
<file>theme/colored/state-error-256.png</file>
<file>theme/colored/state-ok-32.png</file>
<file>theme/colored/state-ok-64.png</file>
<file>theme/colored/state-ok-128.png</file>
<file>theme/colored/state-ok-256.png</file>
<file>theme/colored/state-pause-32.png</file>
<file>theme/colored/state-pause-64.png</file>
<file>theme/colored/state-pause-128.png</file>
<file>theme/colored/state-pause-256.png</file>
<file>theme/colored/state-sync-32.png</file>
<file>theme/colored/state-sync-64.png</file>
<file>theme/colored/state-sync-128.png</file>
<file>theme/colored/state-sync-256.png</file>
<file>theme/colored/wizard_logo.png</file>
<file>theme/colored/wizard_logo@2x.png</file>
<file>theme/colored/wizard_logo.svg</file>
<file>theme/white/state-error-32.png</file>
<file>theme/white/state-error-64.png</file>
<file>theme/white/state-error-128.png</file>
<file>theme/white/state-error-256.png</file>
<file>theme/white/state-ok-32.png</file>
<file>theme/white/state-ok-64.png</file>
<file>theme/white/state-ok-128.png</file>
<file>theme/white/state-ok-256.png</file>
<file>theme/white/state-pause-32.png</file>
<file>theme/white/state-pause-64.png</file>
<file>theme/white/state-pause-128.png</file>
<file>theme/white/state-pause-256.png</file>
<file>theme/white/state-sync-32.png</file>
<file>theme/white/state-sync-64.png</file>
<file>theme/white/state-sync-128.png</file>
<file>theme/white/state-sync-256.png</file>
<file>theme/black/state-error-32.png</file>
<file>theme/black/state-error-64.png</file>
<file>theme/black/state-error-128.png</file>
<file>theme/black/state-error-256.png</file>
<file>theme/black/state-ok-32.png</file>
<file>theme/black/state-ok-64.png</file>
<file>theme/black/state-ok-128.png</file>
<file>theme/black/state-ok-256.png</file>
<file>theme/black/state-pause-32.png</file>
<file>theme/black/state-pause-64.png</file>
<file>theme/black/state-pause-128.png</file>
<file>theme/black/state-pause-256.png</file>
<file>theme/black/state-sync-32.png</file>
<file>theme/black/state-sync-64.png</file>
<file>theme/black/state-sync-128.png</file>
<file>theme/black/state-sync-256.png</file>
<file>theme/colored/state-error.svg</file>
<file>theme/colored/state-error-16.png</file>
<file>theme/colored/state-offline.svg</file>
<file>theme/colored/state-offline-16.png</file>
<file>theme/colored/state-offline-32.png</file>
<file>theme/colored/state-offline-64.png</file>
<file>theme/colored/state-offline-128.png</file>
<file>theme/colored/state-offline-256.png</file>
<file>theme/colored/state-ok.svg</file>
<file>theme/colored/state-ok-16.png</file>
<file>theme/colored/state-pause.svg</file>
<file>theme/colored/state-pause-16.png</file>
<file>theme/colored/state-sync.svg</file>
<file>theme/colored/state-sync-16.png</file>
<file>theme/colored/state-warning.svg</file>
<file>theme/colored/state-warning-16.png</file>
<file>theme/colored/state-warning-32.png</file>
<file>theme/colored/state-warning-64.png</file>
<file>theme/colored/state-warning-128.png</file>
<file>theme/colored/state-warning-256.png</file>
<file>theme/black/folder.png</file>
<file>theme/black/folder@2x.png</file>
<file>theme/white/folder.png</file>
<file>theme/white/folder@2x.png</file>
<file>theme/colored/folder.png</file>
<file>theme/colored/folder@2x.png</file>
<file>theme/black/control-next.svg</file>
<file>theme/black/control-prev.svg</file>
<file>theme/black/state-error.svg</file>
<file>theme/black/state-error-16.png</file>
<file>theme/black/state-offline.svg</file>
<file>theme/black/state-offline-16.png</file>
<file>theme/black/state-offline-32.png</file>
<file>theme/black/state-offline-64.png</file>
<file>theme/black/state-offline-128.png</file>
<file>theme/black/state-offline-256.png</file>
<file>theme/black/state-ok.svg</file>
<file>theme/black/state-ok-16.png</file>
<file>theme/black/state-pause.svg</file>
<file>theme/black/state-pause-16.png</file>
<file>theme/black/state-sync.svg</file>
<file>theme/black/state-sync-16.png</file>
<file>theme/black/state-warning.svg</file>
<file>theme/black/state-warning-16.png</file>
<file>theme/black/state-warning-32.png</file>
<file>theme/black/state-warning-64.png</file>
<file>theme/black/state-warning-128.png</file>
<file>theme/black/state-warning-256.png</file>
<file>theme/white/control-next.svg</file>
<file>theme/white/control-prev.svg</file>
<file>theme/white/state-error.svg</file>
<file>theme/white/state-error-16.png</file>
<file>theme/white/state-offline.svg</file>
<file>theme/white/state-offline-16.png</file>
<file>theme/white/state-offline-32.png</file>
<file>theme/white/state-offline-64.png</file>
<file>theme/white/state-offline-128.png</file>
<file>theme/white/state-offline-256.png</file>
<file>theme/white/state-ok.svg</file>
<file>theme/white/state-ok-16.png</file>
<file>theme/white/state-pause.svg</file>
<file>theme/white/state-pause-16.png</file>
<file>theme/white/state-sync.svg</file>
<file>theme/white/state-sync-16.png</file>
<file>theme/white/state-warning.svg</file>
<file>theme/white/state-warning-16.png</file>
<file>theme/white/state-warning-32.png</file>
<file>theme/white/state-warning-64.png</file>
<file>theme/white/state-warning-128.png</file>
<file>theme/white/state-warning-256.png</file>
<file>theme/white/wizard-files.png</file>
<file>theme/white/wizard-files@2x.png</file>
<file>theme/white/wizard-groupware.png</file>
<file>theme/white/wizard-groupware@2x.png</file>
<file>theme/white/wizard-nextcloud.png</file>
<file>theme/white/wizard-nextcloud@2x.png</file>
<file>theme/white/wizard-talk.png</file>
<file>theme/white/wizard-talk@2x.png</file>
<file>theme/black/wizard-files.png</file>
<file>theme/black/wizard-files@2x.png</file>
<file>theme/black/wizard-groupware.png</file>
<file>theme/black/wizard-groupware@2x.png</file>
<file>theme/black/wizard-nextcloud.png</file>
<file>theme/black/wizard-nextcloud@2x.png</file>
<file>theme/black/wizard-talk.png</file>
<file>theme/black/wizard-talk@2x.png</file>
<file>theme/black/wizard-files.png</file>
<file>theme/colored/wizard-files.png</file>
<file>theme/colored/wizard-files@2x.png</file>
<file>theme/colored/wizard-groupware.png</file>
<file>theme/colored/wizard-groupware@2x.png</file>
<file>theme/colored/wizard-nextcloud.png</file>
<file>theme/colored/wizard-nextcloud@2x.png</file>
<file>theme/colored/wizard-talk.png</file>
<file>theme/colored/wizard-talk@2x.png</file>
<file>theme/sync-arrow.svg</file>
<file>theme/white/external.png</file>
<file>theme/white/external@2x.png</file>
<file>theme/black/external.png</file>
<file>theme/black/external@2x.png</file>
<file>theme/colored/external.png</file>
<file>theme/colored/external@2x.png</file>
<file>theme/white/folder.svg</file>
<file>theme/white/more-apps.svg</file>
<file>theme/white/talk-app.svg</file>
<file>theme/white/caret-down.svg</file>
<file>theme/black/caret-down.svg</file>
<file>theme/white/user.svg</file>
<file>theme/black/user.svg</file>
<file>theme/white/add.svg</file>
<file>theme/black/add.svg</file>
<file>theme/black/activity.svg</file>
<file>theme/black/bell.svg</file>
<file>theme/black/state-info.svg</file>
<file>theme/close.svg</file>
<file>theme/files.svg</file>
<file>theme/public.svg</file>
<file>theme/settings.svg</file>
<file>theme/confirm.svg</file>
<file>theme/copy.svg</file>
<file>theme/more.svg</file>
<file>theme/change.svg</file>
<file>theme/lock-http.svg</file>
<file>theme/lock-https.svg</file>
<file>theme/lock-broken.svg</file>
<file>theme/network.svg</file>
<file>theme/account.svg</file>
<file>theme/colored/add.svg</file>
<file>theme/colored/delete.svg</file>
<file>theme/colored/@APPLICATION_ICON_NAME@-icon.svg</file>
<file>theme/add.svg</file>
<file>theme/share.svg</file>
<file>theme/reply.svg</file>
<file>theme/magnifying-glass.svg</file>
<file>theme/colored/user-status-online.svg</file>
<file>theme/colored/user-status-invisible.svg</file>
<file>theme/colored/user-status-away.svg</file>
<file>theme/colored/user-status-dnd.svg</file>
</qresource>
</RCC>