Merge #396 [master] Central_Customization

Author: memurats

CMakeLists.txt

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

nmctheme_v1.rcc

@@ -597,6 +597,7 @@ if(NOT BUILD_OWNCLOUD_OSX_BUNDLE)
         install(FILES ${VISUAL_ELEMENTS} DESTINATION bin/visualelements)
         install(FILES "${theme_dir}/${APPLICATION_EXECUTABLE}.VisualElementsManifest.xml" DESTINATION bin)
         install(FILES ${client_I18N} DESTINATION i18n)
+        install(FILES ${CMAKE_SOURCE_DIR}/nmctheme_v1.rcc DESTINATION bin)
     endif()
 
     # we may not add MACOSX_BUNDLE here, if not building one

src/gui/CMakeLists.txt

@@ -64,6 +64,17 @@ int main(int argc, char **argv)
     qputenv("QML_IMPORT_PATH", (QDir::currentPath() + QStringLiteral("/qml")).toLatin1());
 #endif
 
+    bool resourceLoaded = false;
+    const QString currentPath = QDir::currentPath();
+
+    if (Utility::isMac()) {
+        resourceLoaded = QResource::registerResource(QDir::toNativeSeparators("/Applications/MagentaCLOUD.app/Contents/Resources/nmctheme_v1.rcc"));
+    }
+
+    if (Utility::isWindows() || !resourceLoaded) {
+        resourceLoaded = QResource::registerResource(QDir::toNativeSeparators(currentPath + "/nmctheme_v1.rcc"));
+    }
+
     Q_INIT_RESOURCE(resources);
     Q_INIT_RESOURCE(theme);
 

src/gui/main.cpp

@@ -290,9 +290,37 @@
 		<file>theme/talk-app.svg</file>
 		<file>theme/chevron-double-up.svg</file>
 		<file>theme/call-notification.wav</file>
-  		<file>theme/info.svg</file>
-		<file>theme/file-open.svg</file>
-		<file>theme/backup.svg</file>
-		<file>theme/convert_to_text.svg</file>
+  	<file>theme/info.svg</file>
+
+		<!-- NMC CC icons -->
+		<file>theme/NMCIcons/accountAvatarIcon.svg</file>
+        <file>theme/NMCIcons/action-add.svg</file>
+        <file>theme/NMCIcons/cloud-security.svg</file>
+        <file>theme/NMCIcons/collapse-down.svg</file>
+        <file>theme/NMCIcons/collapse-right.svg</file>
+        <file>theme/NMCIcons/configuration1.png</file>
+        <file>theme/NMCIcons/configuration2.png</file>
+        <file>theme/NMCIcons/configuration3.png</file>
+        <file>theme/NMCIcons/logout.svg</file>
+        <file>theme/NMCIcons/navigation-left.svg</file>
+        <file>theme/NMCIcons/navigation-right.svg</file>
+        <file>theme/NMCIcons/pause.svg</file>
+        <file>theme/NMCIcons/remove.svg</file>
+        <file>theme/NMCIcons/website.svg</file>
+
+		<!-- NMC CMW icons -->
+        <file>theme/NMCIcons/accountAvatarIcon-white.svg</file>
+        <file>theme/NMCIcons/logout-white.svg</file>
+        <file>theme/NMCIcons/pause-white.svg</file>
+        <file>theme/NMCIcons/remove-white.svg</file>
+        <file>theme/NMCIcons/website-white.svg</file>
+        <file>theme/close-white.svg</file>
+        <file>theme/more-white.svg</file>
+        <file>theme/settings-white.svg</file>
+
+		<!-- NMC RWI icons -->
+		<file>theme/NMCIcons/ApplicationLogo.svg</file>
+        <file>theme/NMCIcons/folderLogo.svg</file>
+        <file>theme/NMCIcons/tlogocarrier.svg</file>
     </qresource>
 </RCC>