From: Mathieu Baudier Date: Tue, 5 Dec 2017 10:17:32 +0000 (+0100) Subject: Simplify suite specific branding X-Git-Tag: argeo-suite-0.1.12~15 X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=aa6195b8e01aa1f82b6a5d0ec562a0aeaf9aeef2;ds=inline Simplify suite specific branding --- diff --git a/org.argeo.suite.theme.argeo2/icons/types/dashboard.gif b/org.argeo.suite.theme.argeo2/icons/types/dashboard.gif new file mode 100644 index 0000000..fd0c669 Binary files /dev/null and b/org.argeo.suite.theme.argeo2/icons/types/dashboard.gif differ diff --git a/org.argeo.suite.theme.argeo2/plugin.xml b/org.argeo.suite.theme.argeo2/plugin.xml index 64e30ac..e6c1b8a 100644 --- a/org.argeo.suite.theme.argeo2/plugin.xml +++ b/org.argeo.suite.theme.argeo2/plugin.xml @@ -1,13 +1,9 @@ - - + + + - - diff --git a/org.argeo.suite.workbench.rap/icons/dashboard.gif b/org.argeo.suite.workbench.rap/icons/dashboard.gif deleted file mode 100644 index fd0c669..0000000 Binary files a/org.argeo.suite.workbench.rap/icons/dashboard.gif and /dev/null differ diff --git a/org.argeo.suite.workbench.rap/icons/favicon.ico b/org.argeo.suite.workbench.rap/icons/favicon.ico deleted file mode 100644 index 6e6a050..0000000 Binary files a/org.argeo.suite.workbench.rap/icons/favicon.ico and /dev/null differ diff --git a/org.argeo.suite.workbench.rap/icons/search.png b/org.argeo.suite.workbench.rap/icons/search.png deleted file mode 100644 index 6588de8..0000000 Binary files a/org.argeo.suite.workbench.rap/icons/search.png and /dev/null differ diff --git a/org.argeo.suite.workbench.rap/plugin.xml b/org.argeo.suite.workbench.rap/plugin.xml index 209173f..590481e 100644 --- a/org.argeo.suite.workbench.rap/plugin.xml +++ b/org.argeo.suite.workbench.rap/plugin.xml @@ -7,7 +7,7 @@ @@ -17,7 +17,6 @@ point="org.eclipse.ui.views"> @@ -31,7 +30,6 @@ @@ -94,11 +92,11 @@ base-name="js/leaflet.css"> @@ -121,9 +119,7 @@ title="Argeo Suite" favicon="img/favicon.ico"> - + diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java index 535dc7c..78f2f75 100644 --- a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java +++ b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java @@ -19,6 +19,7 @@ import org.argeo.cms.auth.CurrentUser; import org.argeo.cms.ui.workbench.util.CommandUtils; import org.argeo.cms.util.CmsUtils; import org.argeo.connect.ConnectNames; +import org.argeo.connect.ui.ConnectImages; import org.argeo.connect.ui.ConnectUiUtils; import org.argeo.connect.util.ConnectJcrUtils; import org.argeo.connect.workbench.Refreshable; @@ -52,6 +53,9 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Link; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IEditorSite; +import org.eclipse.ui.PartInitException; /** Argeo Suite Default Dashboard */ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Refreshable { @@ -67,6 +71,12 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re private Composite taskListCmp; private TaskVirtualListComposite tvlc; + @Override + public void init(IEditorSite site, IEditorInput input) throws PartInitException { + super.init(site, input); + setTitleImage(ConnectImages.DASHBOARD); + } + @Override public void createPartControl(Composite parent) { super.createPartControl(parent); diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/QuickSearchView.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/QuickSearchView.java index 89de0eb..7ec4188 100644 --- a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/QuickSearchView.java +++ b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/QuickSearchView.java @@ -15,6 +15,7 @@ import org.argeo.activities.ActivitiesService; import org.argeo.cms.util.CmsUtils; import org.argeo.connect.ConnectTypes; import org.argeo.connect.resources.ResourcesService; +import org.argeo.connect.ui.ConnectImages; import org.argeo.connect.ui.ConnectUiConstants; import org.argeo.connect.ui.util.BasicNodeListContentProvider; import org.argeo.connect.ui.widgets.DelayedText; @@ -46,6 +47,8 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.Text; +import org.eclipse.ui.IViewSite; +import org.eclipse.ui.PartInitException; import org.eclipse.ui.part.ViewPart; /** A table with a quick search field. */ @@ -65,6 +68,12 @@ public class QuickSearchView extends ViewPart implements Refreshable { private TableViewer entityViewer; private Text filterTxt; + @Override + public void init(IViewSite site) throws PartInitException { + super.init(site); + setTitleImage(ConnectImages.SEARCH); + } + @Override public void createPartControl(Composite parent) { session = ConnectJcrUtils.login(repository); diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/rap/AsSecureEntryPoint.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/rap/AsSecureEntryPoint.java index 37dc803..bae894d 100644 --- a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/rap/AsSecureEntryPoint.java +++ b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/rap/AsSecureEntryPoint.java @@ -39,7 +39,7 @@ public class AsSecureEntryPoint extends RapWorkbenchLogin { // Images are declared via the resources extension point in plugin.xml String headerStr = " " - + " " + ""; + + " " + ""; headerLbl.setText(headerStr); GridData gd = new GridData(SWT.LEFT, SWT.CENTER, true, false); headerLbl.setLayoutData(gd);