From dab076114dd81c105e3b519701ae7f29f13badb2 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 17 Feb 2022 11:40:53 +0100
Subject: [PATCH] Improve theming customisation

---
 org.argeo.app.theme.default/OSGI-INF/cmsTheme.xml   |  1 +
 org.argeo.app.ui/src/org/argeo/app/ui/SuiteApp.java | 13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/org.argeo.app.theme.default/OSGI-INF/cmsTheme.xml b/org.argeo.app.theme.default/OSGI-INF/cmsTheme.xml
index 06df08e..1a4e589 100644
--- a/org.argeo.app.theme.default/OSGI-INF/cmsTheme.xml
+++ b/org.argeo.app.theme.default/OSGI-INF/cmsTheme.xml
@@ -4,4 +4,5 @@
    <service>
       <provide interface="org.argeo.api.cms.CmsTheme"/>
    </service>
+   <property name="themeId" type="String" value="org.argeo.app.theme.default"/>
 </scr:component>
diff --git a/org.argeo.app.ui/src/org/argeo/app/ui/SuiteApp.java b/org.argeo.app.ui/src/org/argeo/app/ui/SuiteApp.java
index 0d898f5..e4d40cf 100644
--- a/org.argeo.app.ui/src/org/argeo/app/ui/SuiteApp.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/SuiteApp.java
@@ -70,10 +70,9 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
 	private String adminLeadPanePid;
 	private String loginScreenPid;
 
-
 	private String defaultUiName = "app";
 	private String adminUiName = "admin";
-	
+
 	// FIXME such default names make refactoring more dangerous
 	@Deprecated
 	private String defaultLayerPid = "argeo.suite.ui.dashboardLayer";
@@ -92,7 +91,6 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
 
 	private Repository repository;
 
-
 	public void init(Map<String, Object> properties) {
 		if (log.isDebugEnabled())
 			log.info("Argeo Suite App started");
@@ -141,8 +139,9 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
 
 	@Override
 	public CmsUi initUi(Object parent) {
-		Composite uiParent =(Composite) parent;
-		String uiName = uiParent.getData(UI_NAME_PROPERTY) != null ? uiParent.getData(UI_NAME_PROPERTY).toString() : null;
+		Composite uiParent = (Composite) parent;
+		String uiName = uiParent.getData(UI_NAME_PROPERTY) != null ? uiParent.getData(UI_NAME_PROPERTY).toString()
+				: null;
 		CmsView cmsView = CmsSwtUtils.getCmsView(uiParent);
 		if (cmsView == null)
 			throw new IllegalStateException("No CMS view is registered.");
@@ -162,6 +161,9 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
 
 	@Override
 	public String getThemeId(String uiName) {
+		String themeId = System.getProperty("org.argeo.app.theme.default");
+		if (themeId != null)
+			return themeId;
 		return defaultThemeId;
 	}
 
@@ -637,5 +639,4 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
 		this.repository = repository;
 	}
 
-	
 }
-- 
2.30.2