Skip to content

[stable-33.0] [master] Central_Customization #423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
github-actions wants to merge 18 commits into
base: stable-33.0
Choose a base branch
from
Open

[stable-33.0] [master] Central_Customization #423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
9d84d7a
central customization changes
memurats Oct 24, 2025
ef66139
restructured theme icons
memurats Oct 27, 2025
7406d62
updated theme icons
memurats Oct 27, 2025
8a7f159
solved merge conflict
memurats Oct 27, 2025
097171a
update theme
memurats Oct 27, 2025
6770e89
added assets
memurats Oct 27, 2025
fcc15ca
added missing files
memurats Oct 29, 2025
31fddc8
added asset files
memurats Oct 29, 2025
d38dfdd
Add NMC icons to theme.qrc.in
memurats May 26, 2026
0f77bb9
replace DEVELOPMENT_TEAM ID
memurats Sep 17, 2026
4ba0df4
Update copyright year in MacOSXBundleInfo.plist.in
memurats Sep 21, 2026
f71d054
Add keys for automatic updates in plist
memurats Sep 22, 2026
968b3b9
Refactor socket connection handling in FinderSync
memurats Sep 22, 2026
84006db
Update CMakeLists.txt for application icon naming
memurats Sep 23, 2026
9cb318d
customized source assets
memurats Sep 23, 2026
991da42
Modify OC_OEM_SHARE_ICNS logic for application icons
memurats Sep 23, 2026
58f9465
Add conditional window icon setting for non-macOS
memurats Sep 24, 2026
5e5102a
Merge branch 'stable-33.0' into backport/nmc/396/stable-33.0
memurats Sep 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ endif()

set(BIN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")

set(NMC_RCC_FILE "nmctheme_v1.rcc")
configure_file(${CMAKE_SOURCE_DIR}/${NMC_RCC_FILE} "${BIN_OUTPUT_DIRECTORY}/${NMC_RCC_FILE}" COPYONLY)

include(${CMAKE_SOURCE_DIR}/NEXTCLOUD.cmake)

set(QT_VERSION_MAJOR "6")
Expand Down Expand Up @@ -366,6 +369,7 @@ configure_file(version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
if(BUILD_OWNCLOUD_OSX_BUNDLE)
install(FILES sync-exclude.lst DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/)
configure_file(sync-exclude.lst bin/${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/sync-exclude.lst COPYONLY)
install(FILES nmctheme_v1.rcc DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/)
elseif(BUILD_CLIENT)
install( FILES sync-exclude.lst DESTINATION ${SYSCONFDIR}/${APPLICATION_SHORTNAME} )
configure_file(sync-exclude.lst bin/sync-exclude.lst COPYONLY)
Expand Down
6 changes: 5 additions & 1 deletion cmake/modules/MacOSXBundleInfo.plist.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,17 @@
<key>CFBundleShortVersionString</key>
<string>@MIRALL_VERSION_STRING@</string>
<key>NSHumanReadableCopyright</key>
<string>(C) 2014-2025 @APPLICATION_VENDOR_XML_ESCAPED@</string>
<string>(C) 2026 @APPLICATION_VENDOR_XML_ESCAPED@</string>
<key>NSSupportsAutomaticGraphicsSwitching</key>
<true/>
<key>NSRequiresAquaSystemAppearance</key>
<false/>
<key>SUShowReleaseNotes</key>
<false/>
<key>SUEnableAutomaticChecks</key>
<true/>
<key>SUAutomaticallyUpdate</key>
<false/>
<key>SUPublicDSAKeyFile</key>
<string>dsa_pub.pem</string>
<key>SUPublicEDKey</key>
Expand Down
Binary file added nmctheme_v1.rcc
View file
Open in desktop
Binary file not shown.
9 changes: 8 additions & 1 deletion shell_integration/MacOSX/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,14 @@
# SPDX-FileCopyrightText: 2014 ownCloud GmbH
# SPDX-License-Identifier: GPL-2.0-or-later
if(APPLE)
set(OC_OEM_SHARE_ICNS "${CMAKE_BINARY_DIR}/src/gui/${APPLICATION_ICON_NAME}.icns")
# src/gui uses the branded application short name for the generated
# .icns file, while Nextcloud.cmake may still define APPLICATION_ICON_NAME
# as "Nextcloud".
if(NOT APPLICATION_NAME STREQUAL "Nextcloud")
set(OC_OEM_SHARE_ICNS "${CMAKE_BINARY_DIR}/src/gui/${APPLICATION_SHORTNAME}.icns")
else()
set(OC_OEM_SHARE_ICNS "${CMAKE_BINARY_DIR}/src/gui/${APPLICATION_ICON_NAME}.icns")
endif()

if (NEXTCLOUD_DEV)
set(XCODE_TARGET_CONFIGURATION "Debug")
Expand Down
Loading
Loading