From: Mathieu Baudier Date: Wed, 14 Oct 2020 08:18:51 +0000 (+0200) Subject: Work on RCP styling. X-Git-Tag: argeo-suite-2.1.16~69 X-Git-Url: http://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=73d79969590ba9a2578fbef60e4eb2800923e33d Work on RCP styling. --- diff --git a/org.argeo.suite.theme.default/swt/app.css b/org.argeo.suite.theme.default/swt/app.css new file mode 100644 index 0000000..937d299 --- /dev/null +++ b/org.argeo.suite.theme.default/swt/app.css @@ -0,0 +1,121 @@ +.argeo-suite-header { + color: white; + background-color: #00294b; +} + +.argeo-suite-headerTitle { + font: bold 18px sans-serif; + color: white; + background-color: #00294b; +} + +.argeo-suite-leadPane { + background-color: #eee; +} + +Label.argeo-suite-leadPane { + font: 14px sans-serif; + color: #888; + background-color: #eee; +} + +Button.argeo-suite-leadPane:hover { + cursor:pointer; +} + +.argeo-suite-recentItems { + font: bold 14px sans-serif; + color: white; + background-color: #00294b; + padding: 8px 16px; +} + +.argeo-suite-titleContainer { + background-color: #00294b; + padding: 6px 8px 4px 8px; +} + +.argeo-suite-titleLabel { + font: bold 14px sans-serif; + color: white; + background-color: #00294b; +} + +.argeo-suite-subTitleLabel { + font: italic 14px sans-serif; + color: #777; + padding: 4px 8px; +} + +.argeo-suite-simpleLabel { + font: bold 14px sans-serif; + padding: 0 0 0 8px; +} + +.argeo-suite-simpleText { + +} + +.argeo-suite-titleCell { + font: bold 14px sans-serif; + background-color: #ddd; +} + +.argeo-suite-inlineButton { + padding: 0px 4px; + font: 12px sans-serif; + border: 1px solid white; + color: white; + background-image: none; + background-color: #00294b; +} + +.argeo-suite-inlineButton:hover { + color: #00294b; + background-color: white; +} + +Composite.argeo-suite-mainTabBody { + background-color: #eee; + border: 1px solid #bbb; +} + +.argeo-suite-mainTab { + background-color: #eee; + border: 1px solid #bbb; +} + +ToolItem.argeo-suite-mainTab { + border: none; + background-color: #eee; +} + +Button.argeo-suite-mainTab { + border: none; + background-color: #eee; +} + +.argeo-suite-mainTab:hover { + background-color: #eee; +} + +Button.argeo-suite-mainTab:hover { + cursor: pointer; + background-color: #eee; +} + +.argeo-suite-mainTabSelected { + font: bold 14px sans-serif; + color: white; + /*background-color: #00294b;*/ + background-color: #5882b5; + border: 1px solid #00294b; +} + +ToolItem.argeo-suite-mainTabSelected { + border: none; +} + +Button.argeo-suite-mainTabSelected { + border: none; +} \ No newline at end of file diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/ArgeoSuiteApp.java b/org.argeo.suite.ui/src/org/argeo/suite/ui/ArgeoSuiteApp.java index 29ba598..db71387 100644 --- a/org.argeo.suite.ui/src/org/argeo/suite/ui/ArgeoSuiteApp.java +++ b/org.argeo.suite.ui/src/org/argeo/suite/ui/ArgeoSuiteApp.java @@ -80,6 +80,8 @@ public class ArgeoSuiteApp extends AbstractCmsApp implements EventHandler { public Composite initUi(Composite parent) { String uiName = parent.getData(UI_NAME_PROPERTY) != null ? parent.getData(UI_NAME_PROPERTY).toString() : null; CmsView cmsView = CmsView.getCmsView(parent); + if (cmsView == null) + throw new IllegalStateException("No CMS view is registered."); CmsTheme theme = getTheme(uiName); if (theme != null) CmsTheme.registerCmsTheme(parent.getShell(), theme); @@ -266,9 +268,11 @@ public class ArgeoSuiteApp extends AbstractCmsApp implements EventHandler { if (isTopic(event, SuiteEvent.refreshPart)) { Node node = Jcr.getNodeById(ui.getSession(), get(event, SuiteEvent.NODE_ID)); ui.getTabbedArea().view(findUiProvider(DASHBOARD_PID, node), node); +// ui.layout(true, true); } else if (isTopic(event, SuiteEvent.openNewPart)) { Node node = Jcr.getNodeById(ui.getSession(), get(event, SuiteEvent.NODE_ID)); ui.getTabbedArea().open(findUiProvider(DASHBOARD_PID, node), node); +// ui.layout(true, true); } else if (isTopic(event, SuiteEvent.switchLayer)) { String layer = get(event, SuiteEvent.LAYER); ui.switchToLayer(layer); @@ -291,11 +295,4 @@ public class ArgeoSuiteApp extends AbstractCmsApp implements EventHandler { return value.toString(); } - -// public void setHeaderPart(CmsUiProvider headerPart) { -// this.headerPart = headerPart; -// if (log.isDebugEnabled()) -// log.debug("Header set."); -// } - } diff --git a/sdk/argeo-suite-rap.properties b/sdk/argeo-suite-rap.properties index 34153a8..ac30ba2 100644 --- a/sdk/argeo-suite-rap.properties +++ b/sdk/argeo-suite-rap.properties @@ -11,7 +11,6 @@ argeo.osgi.start.3.node=\ org.argeo.cms argeo.osgi.start.5.suite=\ -org.argeo.suite.cms,\ org.argeo.suite.ui,\ org.argeo.suite.theme.default,\ org.argeo.suite.ui.rap diff --git a/sdk/argeo-suite-rcp.properties b/sdk/argeo-suite-rcp.properties new file mode 100644 index 0000000..aff012d --- /dev/null +++ b/sdk/argeo-suite-rcp.properties @@ -0,0 +1,42 @@ +argeo.osgi.start.2.node=\ +org.eclipse.equinox.http.servlet,\ +org.eclipse.equinox.metatype,\ +org.eclipse.equinox.cm,\ +org.eclipse.rap.rwt.osgi + +argeo.osgi.start.2.suite=\ +org.apache.tika.parsers + +argeo.osgi.start.3.node=\ +org.argeo.cms + +argeo.osgi.start.5.suite=\ +org.argeo.suite.ui,\ +org.argeo.suite.theme.default,\ +org.argeo.cms.ui.rcp + +# Local +argeo.node.repo.type=h2 +org.osgi.service.http.port=7070 +#org.osgi.service.http.port.secure=7073 + +#argeo.node.useradmin.uris=ldap://cn=Directory%20Manager:argeoargeo@localhost:10389/dc=example,dc=com + +argeo.node.init=../../init + +argeo.i18n.locales=en,fr,de,ar +argeo.i18n.defaultLocale=en + +#tika.config=/home/mbaudier/dev/git/gpl/argeo-suite/sdk/exec/argeo-office-e4-rap/data/indexes/node/tika-config.xml + +# Logging +log4j.configuration=file:../../log4j.properties + +# DON'T CHANGE BELOW +org.eclipse.equinox.http.jetty.autostart=false +org.osgi.framework.bootdelegation=com.sun.jndi.ldap,\ +com.sun.jndi.ldap.sasl,\ +com.sun.security.jgss,\ +com.sun.jndi.dns,\ +com.sun.nio.file,\ +com.sun.nio.sctp