From aa6195b8e01aa1f82b6a5d0ec562a0aeaf9aeef2 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 5 Dec 2017 11:17:32 +0100 Subject: [PATCH] Simplify suite specific branding --- .../icons/types}/dashboard.gif | Bin org.argeo.suite.theme.argeo2/plugin.xml | 10 +++------- org.argeo.suite.workbench.rap/icons/favicon.ico | Bin 1150 -> 0 bytes org.argeo.suite.workbench.rap/icons/search.png | Bin 306 -> 0 bytes org.argeo.suite.workbench.rap/plugin.xml | 12 ++++-------- .../workbench/parts/DefaultDashboardEditor.java | 10 ++++++++++ .../suite/workbench/parts/QuickSearchView.java | 9 +++++++++ .../suite/workbench/rap/AsSecureEntryPoint.java | 2 +- 8 files changed, 27 insertions(+), 16 deletions(-) rename {org.argeo.suite.workbench.rap/icons => org.argeo.suite.theme.argeo2/icons/types}/dashboard.gif (100%) delete mode 100644 org.argeo.suite.workbench.rap/icons/favicon.ico delete mode 100644 org.argeo.suite.workbench.rap/icons/search.png diff --git a/org.argeo.suite.workbench.rap/icons/dashboard.gif b/org.argeo.suite.theme.argeo2/icons/types/dashboard.gif similarity index 100% rename from org.argeo.suite.workbench.rap/icons/dashboard.gif rename to org.argeo.suite.theme.argeo2/icons/types/dashboard.gif 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/favicon.ico b/org.argeo.suite.workbench.rap/icons/favicon.ico deleted file mode 100644 index 6e6a050224d967e89af5faa3113edd5151a0d97e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmaizUr19?9LKMfy;;6g4^d7Nvk7BR!$Lzd%|8vbw3eYPacqfVE{a)hWNDI340Y1H zbDNephnjA4e@XmPbd@;=6yb2n#bd@xm>Of4u@l%=lON3)%uazq0Y|E z6Mqw7Y$Oti4F-d@si`T@S{RK+=yW=$)oN5%SEI495gi>Juvjc3xw*M}WHMO{(_$=H zEZHJsX&!ajYGhw)hC<4E-r3|sA2Q_{czX^ zP<6KlNBVvuaR5jnW39vq$l8{0PI&=^1qIM*wJ@1XFNobuex+m>8yiF2<6$J&h~uNi z`iH155&xN9rp^pyVLl870~#6{vWVpafdF{B6G_(JQI@#0hi{<1{Rr)rK{P&FLaJ>; zn3LE6rNM@lmV0nIokPSg`=@=l%)i_6oATr{3bN8sQd$a)MuWE2R@fbbIA#AXtV!lK z;C}9a*Xw;x{942}ft3DVTYM7vm-c;yvi1Q=l?5m-FGqcSJzC8@I6bh6k#R5l{s0)u zY}6CN!TxB@%y(+<7bLR0Dc|E=E4Wyth4OqMR4NskZs|ew0CrX)zwGkOZ1HmaC@L#1 zp`v>h$>LtJoE4@pGBYwzR8)kfrY2B*f$C+MH2C?j7YU+&xp4-0XU{-WQ-k~M9VoKA z72;rL!eTn9>q7G#1Ke&m^Usq>BcUKv!=Ix0Q_Oi+>qsL9#l^+AQdWYDn?qoG!ZZ|= z&r?e`sLmNL-K?L9v_~fc7~o?3K7?6XU+^<+wSzi7hn3?0-)STT3># HlM~oK1ZrJU 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 6588de86ba3c4981b19492eb5322f6b21b9834f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 306 zcmV-20nPr2P)*O41)JQSpYp`y@7M? zqkZOh1C=vI%Of<#h^A>o2to9H&-xzYeB_LjZ*qhaGINP8?)WZ_8iz*{^N)#wLD6z0 zH#NeB#j3#ILRb;j;8()AD(vDo?hRo_c+UNs#Y=zz0OIpn+a 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); -- 2.30.2