revert

Author: memurats

src/gui/CMakeLists.txt

@@ -20,9 +20,12 @@ if(APPLICATION_NAME STREQUAL "Nextcloud")
     set(STATE_SUBDIR "nextcloud/")
 endif()
 
-configure_file(${CMAKE_SOURCE_DIR}/magenta_theme.qrc.in ${CMAKE_SOURCE_DIR}/magenta_theme.qrc)
+configure_file(${CMAKE_SOURCE_DIR}/theme.qrc.in ${CMAKE_SOURCE_DIR}/theme.qrc)
 set(theme_dir ${CMAKE_SOURCE_DIR}/theme)
 
+#NMC customization: needed to find the ui file in a different location than the header file
+set(CMAKE_AUTOUIC_SEARCH_PATHS "${CMAKE_SOURCE_DIR}/src/gui")
+
 set(client_UI_SRCS
     accountsettings.ui
     conflictdialog.ui
@@ -54,7 +57,7 @@ set(client_UI_SRCS
     wizard/proxysettings.ui
 )
 
-qt_add_resources(client_UI_SRCS ../../resources.qrc ${CMAKE_SOURCE_DIR}/magenta_theme.qrc)
+qt_add_resources(client_UI_SRCS ../../resources.qrc ${CMAKE_SOURCE_DIR}/theme.qrc)
 
 set(client_SRCS
     accountmanager.h
@@ -258,6 +261,10 @@ set(client_SRCS
     wizard/wizardproxysettingsdialog.cpp
     )
 
+file(GLOB NMC_FILES "nmcgui/*")
+set(NMC_SRCS ${NMC_FILES})
+list(APPEND client_SRCS ${NMC_SRCS})
+
 if (NOT DISABLE_ACCOUNT_MIGRATION)
     list(APPEND client_SRCS
         legacyaccountselectiondialog.h

theme.qrc.in

@@ -291,5 +291,36 @@
 		<file>theme/chevron-double-up.svg</file>
 		<file>theme/call-notification.wav</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>