diff --git a/CMakeLists.txt b/CMakeLists.txt
index c4ad9e37d4293..f1a74e4574a48 100644
--- a/CMakeLists.txt
+++ b/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")
@@ -364,6 +367,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)
diff --git a/nmctheme_v1.rcc b/nmctheme_v1.rcc
new file mode 100644
index 0000000000000..1e673f886e4f5
Binary files /dev/null and b/nmctheme_v1.rcc differ
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 66a73d7e912e4..4e14de31aea69 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -602,6 +602,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
diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index fe1089110940f..db9b63386e7fc 100644
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -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);
diff --git a/theme.qrc.in b/theme.qrc.in
index 4bf77d90807bc..dcbfa6be2f52b 100644
--- a/theme.qrc.in
+++ b/theme.qrc.in
@@ -291,5 +291,36 @@
theme/chevron-double-up.svg
theme/call-notification.wav
theme/info.svg
+
+
+ theme/NMCIcons/accountAvatarIcon.svg
+ theme/NMCIcons/action-add.svg
+ theme/NMCIcons/cloud-security.svg
+ theme/NMCIcons/collapse-down.svg
+ theme/NMCIcons/collapse-right.svg
+ theme/NMCIcons/configuration1.png
+ theme/NMCIcons/configuration2.png
+ theme/NMCIcons/configuration3.png
+ theme/NMCIcons/logout.svg
+ theme/NMCIcons/navigation-left.svg
+ theme/NMCIcons/navigation-right.svg
+ theme/NMCIcons/pause.svg
+ theme/NMCIcons/remove.svg
+ theme/NMCIcons/website.svg
+
+
+ theme/NMCIcons/accountAvatarIcon-white.svg
+ theme/NMCIcons/logout-white.svg
+ theme/NMCIcons/pause-white.svg
+ theme/NMCIcons/remove-white.svg
+ theme/NMCIcons/website-white.svg
+ theme/close-white.svg
+ theme/more-white.svg
+ theme/settings-white.svg
+
+
+ theme/NMCIcons/ApplicationLogo.svg
+ theme/NMCIcons/folderLogo.svg
+ theme/NMCIcons/tlogocarrier.svg
diff --git a/theme/NMCIcons/ApplicationLogo.svg b/theme/NMCIcons/ApplicationLogo.svg
new file mode 100644
index 0000000000000..efc8c94e1df28
--- /dev/null
+++ b/theme/NMCIcons/ApplicationLogo.svg
@@ -0,0 +1,16 @@
+
diff --git a/theme/NMCIcons/accountAvatarIcon-white.svg b/theme/NMCIcons/accountAvatarIcon-white.svg
new file mode 100644
index 0000000000000..1071c83ea6ef8
--- /dev/null
+++ b/theme/NMCIcons/accountAvatarIcon-white.svg
@@ -0,0 +1,7 @@
+
+
\ No newline at end of file
diff --git a/theme/NMCIcons/accountAvatarIcon.svg b/theme/NMCIcons/accountAvatarIcon.svg
new file mode 100644
index 0000000000000..ba966999fc6cf
--- /dev/null
+++ b/theme/NMCIcons/accountAvatarIcon.svg
@@ -0,0 +1,7 @@
+
+
diff --git a/theme/NMCIcons/action-add.svg b/theme/NMCIcons/action-add.svg
new file mode 100644
index 0000000000000..46df2f888cc15
--- /dev/null
+++ b/theme/NMCIcons/action-add.svg
@@ -0,0 +1,12 @@
+
+
+
diff --git a/theme/NMCIcons/cloud-security.svg b/theme/NMCIcons/cloud-security.svg
new file mode 100644
index 0000000000000..bfa4b9cfc802a
--- /dev/null
+++ b/theme/NMCIcons/cloud-security.svg
@@ -0,0 +1,7 @@
+
+
\ No newline at end of file
diff --git a/theme/NMCIcons/collapse-down.svg b/theme/NMCIcons/collapse-down.svg
new file mode 100644
index 0000000000000..b63406256c813
--- /dev/null
+++ b/theme/NMCIcons/collapse-down.svg
@@ -0,0 +1,7 @@
+
+
\ No newline at end of file
diff --git a/theme/NMCIcons/collapse-right.svg b/theme/NMCIcons/collapse-right.svg
new file mode 100644
index 0000000000000..c353781f763c1
--- /dev/null
+++ b/theme/NMCIcons/collapse-right.svg
@@ -0,0 +1,7 @@
+
+
\ No newline at end of file
diff --git a/theme/NMCIcons/configuration1.png b/theme/NMCIcons/configuration1.png
new file mode 100644
index 0000000000000..7a20bc1a11347
Binary files /dev/null and b/theme/NMCIcons/configuration1.png differ
diff --git a/theme/NMCIcons/configuration2.png b/theme/NMCIcons/configuration2.png
new file mode 100644
index 0000000000000..dbdac7d23fca2
Binary files /dev/null and b/theme/NMCIcons/configuration2.png differ
diff --git a/theme/NMCIcons/configuration3.png b/theme/NMCIcons/configuration3.png
new file mode 100644
index 0000000000000..66d2d513c8ad3
Binary files /dev/null and b/theme/NMCIcons/configuration3.png differ
diff --git a/theme/NMCIcons/folderLogo.svg b/theme/NMCIcons/folderLogo.svg
new file mode 100644
index 0000000000000..45f4cb770d6bb
--- /dev/null
+++ b/theme/NMCIcons/folderLogo.svg
@@ -0,0 +1,83 @@
+
+
+
+
diff --git a/theme/NMCIcons/logout-white.svg b/theme/NMCIcons/logout-white.svg
new file mode 100644
index 0000000000000..f449764e1a279
--- /dev/null
+++ b/theme/NMCIcons/logout-white.svg
@@ -0,0 +1,7 @@
+
+
\ No newline at end of file
diff --git a/theme/NMCIcons/logout.svg b/theme/NMCIcons/logout.svg
new file mode 100644
index 0000000000000..babca11ccf863
--- /dev/null
+++ b/theme/NMCIcons/logout.svg
@@ -0,0 +1,7 @@
+
+
\ No newline at end of file
diff --git a/theme/NMCIcons/navigation-left.svg b/theme/NMCIcons/navigation-left.svg
new file mode 100644
index 0000000000000..bfa5fa38304b4
--- /dev/null
+++ b/theme/NMCIcons/navigation-left.svg
@@ -0,0 +1,12 @@
+
+
+
diff --git a/theme/NMCIcons/navigation-right.svg b/theme/NMCIcons/navigation-right.svg
new file mode 100644
index 0000000000000..a008c1d637d63
--- /dev/null
+++ b/theme/NMCIcons/navigation-right.svg
@@ -0,0 +1,12 @@
+
+
+
diff --git a/theme/NMCIcons/pause-white.svg b/theme/NMCIcons/pause-white.svg
new file mode 100644
index 0000000000000..41fd92da98393
--- /dev/null
+++ b/theme/NMCIcons/pause-white.svg
@@ -0,0 +1,7 @@
+
+
\ No newline at end of file
diff --git a/theme/NMCIcons/pause.svg b/theme/NMCIcons/pause.svg
new file mode 100644
index 0000000000000..7d8cc0999d9e9
--- /dev/null
+++ b/theme/NMCIcons/pause.svg
@@ -0,0 +1,7 @@
+
+
\ No newline at end of file
diff --git a/theme/NMCIcons/remove-white.svg b/theme/NMCIcons/remove-white.svg
new file mode 100644
index 0000000000000..9a71790bcff30
--- /dev/null
+++ b/theme/NMCIcons/remove-white.svg
@@ -0,0 +1,7 @@
+
+
\ No newline at end of file
diff --git a/theme/NMCIcons/remove.svg b/theme/NMCIcons/remove.svg
new file mode 100644
index 0000000000000..9896ad3ca78a7
--- /dev/null
+++ b/theme/NMCIcons/remove.svg
@@ -0,0 +1,7 @@
+
+
\ No newline at end of file
diff --git a/theme/NMCIcons/tlogocarrier.svg b/theme/NMCIcons/tlogocarrier.svg
new file mode 100644
index 0000000000000..8fb2ff11a1050
--- /dev/null
+++ b/theme/NMCIcons/tlogocarrier.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/theme/NMCIcons/website-white.svg b/theme/NMCIcons/website-white.svg
new file mode 100644
index 0000000000000..4db891a1afe17
--- /dev/null
+++ b/theme/NMCIcons/website-white.svg
@@ -0,0 +1,7 @@
+
+
\ No newline at end of file
diff --git a/theme/NMCIcons/website.svg b/theme/NMCIcons/website.svg
new file mode 100644
index 0000000000000..4cdf4813f3dbe
--- /dev/null
+++ b/theme/NMCIcons/website.svg
@@ -0,0 +1,7 @@
+
+
diff --git a/theme/close-white.svg b/theme/close-white.svg
new file mode 100644
index 0000000000000..f4f3c0c23cc5e
--- /dev/null
+++ b/theme/close-white.svg
@@ -0,0 +1,7 @@
+
+
\ No newline at end of file
diff --git a/theme/more-white.svg b/theme/more-white.svg
new file mode 100644
index 0000000000000..7efdfcbc6c514
--- /dev/null
+++ b/theme/more-white.svg
@@ -0,0 +1,7 @@
+
+
\ No newline at end of file
diff --git a/theme/settings-white.svg b/theme/settings-white.svg
new file mode 100644
index 0000000000000..9004d38106663
--- /dev/null
+++ b/theme/settings-white.svg
@@ -0,0 +1,7 @@
+
+
\ No newline at end of file