Merge branch 'master' into bugfix/logLessVerbose

nextcloud · Jun 6, 2023 · f098de6 · f098de6
2 parents 6ee2a6d + fe42736
commit f098de6
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 6 deletions.
diff --git a/shell_integration/MacOSX/CMakeLists.txt b/shell_integration/MacOSX/CMakeLists.txt
@@ -41,13 +41,19 @@ if(APPLE)
     endif()
 
     if (BUILD_OWNCLOUD_OSX_BUNDLE)
-        install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Release/FinderSyncExt.appex
-            DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/PlugIns
+        set(OSX_PLUGINS_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${XCODE_TARGET_CONFIGURATION})
+        set(OSX_PLUGINS_INSTALL_DIR ${OWNCLOUD_OSX_BUNDLE}/Contents/PlugIns)
+
+        install(DIRECTORY ${OSX_PLUGINS_BINARY_DIR}/FinderSyncExt.appex
+            DESTINATION ${OSX_PLUGINS_INSTALL_DIR}
             USE_SOURCE_PERMISSIONS)
 
+        # HACK: Launch Services expects there to be a Library folder within the FinderSyncExt.appex.
+        install(DIRECTORY DESTINATION ${OSX_PLUGINS_INSTALL_DIR}/FinderSyncExt.appex/Contents/Library)
+
         if (BUILD_FILE_PROVIDER_MODULE)
-            install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Release/FileProviderExt.appex
-                DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/PlugIns
+            install(DIRECTORY ${OSX_PLUGINS_BINARY_DIR}/FileProviderExt.appex
+                DESTINATION ${OSX_PLUGINS_INSTALL_DIR}
                 USE_SOURCE_PERMISSIONS)
         endif()
     endif()

diff --git a/src/gui/tray/SyncStatus.qml b/src/gui/tray/SyncStatus.qml
@@ -69,8 +69,28 @@ RowLayout {
                 id: syncProgressBar
 
                 // TODO: Rather than setting all these palette colours manually,
-                // create a custom style and do it for all components globally
-                palette.window: palette.dark // NOTE: Fusion theme uses darker window colour for the border of the progress bar
+                // create a custom style and do it for all components globally.
+                //
+                // Additionally, we need to override the entire palette when we
+                // set one palette property, as otherwise we default back to the
+                // theme palette -- not the parent palette
+                palette {
+                    text: Style.ncTextColor
+                    windowText: Style.ncTextColor
+                    buttonText: Style.ncTextColor
+                    brightText: Style.ncTextBrightColor
+                    highlight: Style.lightHover
+                    highlightedText: Style.ncTextColor
+                    light: Style.lightHover
+                    midlight: Style.ncSecondaryTextColor
+                    mid: Style.darkerHover
+                    dark: Style.menuBorder
+                    button: Style.buttonBackgroundColor
+                    window: palette.dark // NOTE: Fusion theme uses darker window colour for the border of the progress bar
+                    base: Style.backgroundColor
+                    toolTipBase: Style.backgroundColor
+                    toolTipText: Style.ncTextColor
+                }
                 value: syncStatus.syncProgress
             }
         }