renewed set of icons

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@169644 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Massimiliano Assante 2018-07-03 16:09:33 +00:00
parent 337d72cb66
commit b63f679d33
9 changed files with 115 additions and 347 deletions

View File

@ -13,7 +13,7 @@
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="src" path="src/main/resources"/> <classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/> <classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER/gwt-2.7.0"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>

View File

@ -79,7 +79,10 @@
<version>${gwtVersion}</version> <version>${gwtVersion}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>org.gcube.portal</groupId>
<artifactId>storagehub-icons-library</artifactId>
</dependency>
<dependency> <dependency>
<groupId>com.sencha.gxt</groupId> <groupId>com.sencha.gxt</groupId>
<artifactId>gxt2.2.5-gwt2.X</artifactId> <artifactId>gxt2.2.5-gwt2.X</artifactId>

View File

@ -11,7 +11,7 @@
<!-- Moduel GXT --> <!-- Moduel GXT -->
<inherits name='com.extjs.gxt.ui.GXT' /> <inherits name='com.extjs.gxt.ui.GXT' />
<inherits name='org.gcube.portal.clientcontext.GCubeClientContext' /> <inherits name='org.gcube.portal.clientcontext.GCubeClientContext' />
<inherits name="org.gcube.portal.stohubicons.StorageHubIcons" />
<inherits <inherits
name="org.gcube.portlets.widgets.workspacesharingwidget.WorkspaceSharingWidget" /> name="org.gcube.portlets.widgets.workspacesharingwidget.WorkspaceSharingWidget" />

View File

@ -1053,7 +1053,7 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt
private void doChangeScope(String scopeId) { private void doChangeScope(String scopeId) {
explorerPanel.getAsycTreePanel().loadRootItem(scopeId,selectRootItem); // RELOAD ROOT BY SCOPE explorerPanel.getAsycTreePanel().loadRootItem(scopeId,selectRootItem); // RELOAD ROOT BY SCOPE
explorerPanel.getSmartFolderPanel().reloadPanelSmartFolder(); //RELOAD SMART FOLDER
} }
}); });
@ -1295,8 +1295,7 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt
@Override @Override
public void onSuccess(Boolean result) { public void onSuccess(Boolean result) {
if(result)
explorerPanel.getSmartFolderPanel().removeSmartFolder(smartIdentifier);
} }
@Override @Override
@ -1356,7 +1355,7 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt
@Override @Override
public void onSuccess(SmartFolderModel smart) { public void onSuccess(SmartFolderModel smart) {
explorerPanel.getShortuctsPanel().loadSmartFolder(smart);
} }
}); });
} }

View File

@ -5,9 +5,6 @@ import com.google.gwt.resources.client.ImageResource;
public interface Icons extends ClientBundle { public interface Icons extends ClientBundle {
@Source("icons/cloud-drive.png")
ImageResource cloudDrive();
@Source("icons/table.png") @Source("icons/table.png")
ImageResource table(); ImageResource table();
@ -47,9 +44,6 @@ public interface Icons extends ClientBundle {
@Source("icons/mime/movie.png") @Source("icons/mime/movie.png")
ImageResource movie(); ImageResource movie();
@Source("icons/new-folder.png")
ImageResource addFolder();
@Source("icons/mime/deletefolder.jpg") @Source("icons/mime/deletefolder.jpg")
ImageResource deleteFolder(); ImageResource deleteFolder();
@ -233,21 +227,9 @@ public interface Icons extends ClientBundle {
@Source("icons/reporttemplate.png") @Source("icons/reporttemplate.png")
ImageResource reportTemplate(); ImageResource reportTemplate();
@Source("icons/workflowreport.png")
ImageResource workflowReport();
@Source("icons/workflowtemplate.png")
ImageResource workflowTemplate();
@Source("icons/webdav.png") @Source("icons/webdav.png")
ImageResource webDav(); ImageResource webDav();
@Source("icons/mail-reply.png")
ImageResource replyMail();
@Source("icons/mail-reply-all.png")
ImageResource replyAllMail();
@Source("icons/application-link.png") @Source("icons/application-link.png")
ImageResource resourceLink(); ImageResource resourceLink();

View File

@ -1,5 +1,6 @@
package org.gcube.portlets.user.workspace.client.resources; package org.gcube.portlets.user.workspace.client.resources;
import org.gcube.portal.stohubicons.shared.resources.StorageHubIconResources;
import org.gcube.portlets.user.workspace.client.interfaces.GXTFolderItemTypeEnum; import org.gcube.portlets.user.workspace.client.interfaces.GXTFolderItemTypeEnum;
import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.GWT;
@ -15,6 +16,7 @@ public class Resources {
public static final Icons ICONS = GWT.create(Icons.class); public static final Icons ICONS = GWT.create(Icons.class);
private static final String CAL = "calendar";
private static final String XML = "xml"; private static final String XML = "xml";
private static final String JAVA = "java"; private static final String JAVA = "java";
private static final String HTML = "html"; private static final String HTML = "html";
@ -65,7 +67,7 @@ public class Resources {
*/ */
public static AbstractImagePrototype getCloudDriveIcon(){ public static AbstractImagePrototype getCloudDriveIcon(){
return AbstractImagePrototype.create(ICONS.cloudDrive()); return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.USER_CIRCLE());
} }
/** /**
@ -74,8 +76,7 @@ public class Resources {
* @return the icon x tex * @return the icon x tex
*/ */
public static AbstractImagePrototype getIconXTex(){ public static AbstractImagePrototype getIconXTex(){
return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.TXT());
return AbstractImagePrototype.create(ICONS.tex());
} }
@ -97,8 +98,8 @@ public class Resources {
* @return the icon postscript * @return the icon postscript
*/ */
public static AbstractImagePrototype getIconPostscript(){ public static AbstractImagePrototype getIconPostscript(){
return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.TXT());
return AbstractImagePrototype.create(ICONS.postscript());
} }
/** /**
@ -112,16 +113,6 @@ public class Resources {
} }
/**
* Gets the icon information.
*
* @return the icon information
*/
public static AbstractImagePrototype getIconInformation(){
return AbstractImagePrototype.create(ICONS.information());
}
/** /**
* Gets the icon folder shared public. * Gets the icon folder shared public.
@ -140,8 +131,7 @@ public class Resources {
* @return the icon information * @return the icon information
*/ */
public static AbstractImagePrototype getIconAbout(){ public static AbstractImagePrototype getIconAbout(){
return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.INFO());
return AbstractImagePrototype.create(ICONS.about());
} }
/** /**
@ -150,8 +140,18 @@ public class Resources {
* @return the icon shell * @return the icon shell
*/ */
public static AbstractImagePrototype getIconShell(){ public static AbstractImagePrototype getIconShell(){
return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.SCRIPT());
}
return AbstractImagePrototype.create(ICONS.shell());
/**
* Gets the icon information.
*
* @return the icon information
*/
public static AbstractImagePrototype getIconInformation(){
return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.INFO());
} }
/** /**
@ -160,8 +160,7 @@ public class Resources {
* @return the icon zip * @return the icon zip
*/ */
public static AbstractImagePrototype getIconZip(){ public static AbstractImagePrototype getIconZip(){
return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.ARCHIVE());
return AbstractImagePrototype.create(ICONS.zip());
} }
@ -171,8 +170,7 @@ public class Resources {
* @return the icon odp * @return the icon odp
*/ */
public static AbstractImagePrototype getIconOdp(){ public static AbstractImagePrototype getIconOdp(){
return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.DOC());
return AbstractImagePrototype.create(ICONS.odp());
} }
/** /**
@ -181,8 +179,7 @@ public class Resources {
* @return the icon odp * @return the icon odp
*/ */
public static AbstractImagePrototype getIconOds(){ public static AbstractImagePrototype getIconOds(){
return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.DOC());
return AbstractImagePrototype.create(ICONS.ods());
} }
@ -192,8 +189,7 @@ public class Resources {
* @return the icon odp * @return the icon odp
*/ */
public static AbstractImagePrototype getIconOdg(){ public static AbstractImagePrototype getIconOdg(){
return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.DOC());
return AbstractImagePrototype.create(ICONS.odg());
} }
@ -203,8 +199,7 @@ public class Resources {
* @return the icon folder link * @return the icon folder link
*/ */
public static AbstractImagePrototype getIconFolderPublic(){ public static AbstractImagePrototype getIconFolderPublic(){
return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.FOLDER_LINK());
return AbstractImagePrototype.create(ICONS.folderPublic());
} }
@ -214,8 +209,7 @@ public class Resources {
* @return the icon odp * @return the icon odp
*/ */
public static AbstractImagePrototype getIconOtt(){ public static AbstractImagePrototype getIconOtt(){
return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.DOC());
return AbstractImagePrototype.create(ICONS.ott());
} }
/** /**
@ -225,7 +219,7 @@ public class Resources {
*/ */
public static AbstractImagePrototype getIconOdt(){ public static AbstractImagePrototype getIconOdt(){
return AbstractImagePrototype.create(ICONS.odt()); return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.DOC());
} }
/** /**
@ -235,7 +229,7 @@ public class Resources {
*/ */
public static AbstractImagePrototype getIconTable(){ public static AbstractImagePrototype getIconTable(){
return AbstractImagePrototype.create(ICONS.table()); return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.unknown());
} }
/** /**
@ -266,7 +260,7 @@ public class Resources {
*/ */
public static AbstractImagePrototype getIconArchive(){ public static AbstractImagePrototype getIconArchive(){
return AbstractImagePrototype.create(ICONS.archive()); return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.ARCHIVE());
} }
/** /**
@ -275,7 +269,7 @@ public class Resources {
* @return the icon link * @return the icon link
*/ */
public static AbstractImagePrototype getIconLink(){ public static AbstractImagePrototype getIconLink(){
return AbstractImagePrototype.create(ICONS.extLink()); return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.LINK());
} }
/** /**
@ -284,8 +278,7 @@ public class Resources {
* @return the icon share link * @return the icon share link
*/ */
public static AbstractImagePrototype getIconShareLink(){ public static AbstractImagePrototype getIconShareLink(){
return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.GET_LINK());
return AbstractImagePrototype.create(ICONS.shareLink());
} }
/** /**
@ -295,7 +288,7 @@ public class Resources {
*/ */
public static AbstractImagePrototype getTrashFull(){ public static AbstractImagePrototype getTrashFull(){
return AbstractImagePrototype.create(ICONS.trash_full()); return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.BIN());
} }
/** /**
@ -305,7 +298,7 @@ public class Resources {
*/ */
public static AbstractImagePrototype getTrashEmpty(){ public static AbstractImagePrototype getTrashEmpty(){
return AbstractImagePrototype.create(ICONS.trash_empty()); return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.BIN());
} }
/** /**
@ -325,7 +318,7 @@ public class Resources {
*/ */
public static AbstractImagePrototype getIconVREFolder(){ public static AbstractImagePrototype getIconVREFolder(){
return AbstractImagePrototype.create(ICONS.vreFolder()); return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.VRE_FOLDER());
} }
/** /**
@ -335,7 +328,7 @@ public class Resources {
*/ */
public static AbstractImagePrototype getIconPpt(){ public static AbstractImagePrototype getIconPpt(){
return AbstractImagePrototype.create(ICONS.ppt()); return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.PPT());
} }
/** /**
@ -345,7 +338,7 @@ public class Resources {
*/ */
public static AbstractImagePrototype getIconExcel(){ public static AbstractImagePrototype getIconExcel(){
return AbstractImagePrototype.create(ICONS.excel()); return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.XLS());
} }
/** /**
@ -354,8 +347,7 @@ public class Resources {
* @return the icon users * @return the icon users
*/ */
public static AbstractImagePrototype getIconUsers(){ public static AbstractImagePrototype getIconUsers(){
return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.GROUP());
return AbstractImagePrototype.create(ICONS.users());
} }
/** /**
@ -374,8 +366,7 @@ public class Resources {
* @return the icon share user * @return the icon share user
*/ */
public static AbstractImagePrototype getIconShareUser(){ public static AbstractImagePrototype getIconShareUser(){
return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.GROUP());
return AbstractImagePrototype.create(ICONS.user());
} }
/** /**
@ -384,8 +375,7 @@ public class Resources {
* @return the icon share group * @return the icon share group
*/ */
public static AbstractImagePrototype getIconShareGroup(){ public static AbstractImagePrototype getIconShareGroup(){
return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.GROUP());
return AbstractImagePrototype.create(ICONS.groupusers());
} }
/** /**
@ -394,8 +384,7 @@ public class Resources {
* @return the icon special folder * @return the icon special folder
*/ */
public static AbstractImagePrototype getIconSpecialFolder(){ public static AbstractImagePrototype getIconSpecialFolder(){
return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.FOLDER_SPECIAL());
return AbstractImagePrototype.create(ICONS.specialFolder());
} }
/** /**
@ -424,8 +413,7 @@ public class Resources {
* @return the icon info * @return the icon info
*/ */
public static AbstractImagePrototype getIconInfo(){ public static AbstractImagePrototype getIconInfo(){
return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.INFO());
return AbstractImagePrototype.create(ICONS.info());
} }
/** /**
@ -435,7 +423,7 @@ public class Resources {
*/ */
public static AbstractImagePrototype getIconSharedFolder(){ public static AbstractImagePrototype getIconSharedFolder(){
return AbstractImagePrototype.create(ICONS.sharedFolder()); return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.SHARED_FOLDER());
} }
/** /**
@ -445,7 +433,7 @@ public class Resources {
*/ */
public static AbstractImagePrototype getIconCsv(){ public static AbstractImagePrototype getIconCsv(){
return AbstractImagePrototype.create(ICONS.csv()); return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.CSV());
} }
/** /**
@ -486,7 +474,7 @@ public class Resources {
*/ */
public static AbstractImagePrototype getIconGif(){ public static AbstractImagePrototype getIconGif(){
return AbstractImagePrototype.create(ICONS.gif()); return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.IMAGE());
} }
/** /**
@ -496,7 +484,7 @@ public class Resources {
*/ */
public static AbstractImagePrototype getIconJpeg(){ public static AbstractImagePrototype getIconJpeg(){
return AbstractImagePrototype.create(ICONS.jpeg()); return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.IMAGE());
} }
/** /**
@ -506,7 +494,7 @@ public class Resources {
*/ */
public static AbstractImagePrototype getIconSvg(){ public static AbstractImagePrototype getIconSvg(){
return AbstractImagePrototype.create(ICONS.svg()); return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.IMAGE());
} }
/** /**
@ -516,7 +504,7 @@ public class Resources {
*/ */
public static AbstractImagePrototype getIconPng(){ public static AbstractImagePrototype getIconPng(){
return AbstractImagePrototype.create(ICONS.png()); return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.IMAGE());
} }
/** /**
@ -526,7 +514,7 @@ public class Resources {
*/ */
public static AbstractImagePrototype getIconTiff(){ public static AbstractImagePrototype getIconTiff(){
return AbstractImagePrototype.create(ICONS.tiff()); return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.IMAGE());
} }
/** /**
@ -536,7 +524,7 @@ public class Resources {
*/ */
public static AbstractImagePrototype getIconPdf(){ public static AbstractImagePrototype getIconPdf(){
return AbstractImagePrototype.create(ICONS.pdf()); return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.PDF());
} }
/** /**
@ -546,9 +534,16 @@ public class Resources {
*/ */
public static AbstractImagePrototype getIconXml(){ public static AbstractImagePrototype getIconXml(){
return AbstractImagePrototype.create(ICONS.xml()); return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.XML());
}
/**
* Gets the icon permissions.
*
* @return the icon permissions
*/
public static AbstractImagePrototype getIconCalendar() {
return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.CALENDAR());
} }
/** /**
* Gets the icon html. * Gets the icon html.
* *
@ -556,7 +551,7 @@ public class Resources {
*/ */
public static AbstractImagePrototype getIconHtml(){ public static AbstractImagePrototype getIconHtml(){
return AbstractImagePrototype.create(ICONS.html()); return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.HTML());
} }
/** /**
@ -566,7 +561,7 @@ public class Resources {
*/ */
public static AbstractImagePrototype getIconJava(){ public static AbstractImagePrototype getIconJava(){
return AbstractImagePrototype.create(ICONS.java()); return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.SCRIPT());
} }
/** /**
@ -576,7 +571,7 @@ public class Resources {
*/ */
public static AbstractImagePrototype getIconDoc(){ public static AbstractImagePrototype getIconDoc(){
return AbstractImagePrototype.create(ICONS.doc()); return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.DOC());
} }
/** /**
@ -586,7 +581,7 @@ public class Resources {
*/ */
public static AbstractImagePrototype getIconTxt(){ public static AbstractImagePrototype getIconTxt(){
return AbstractImagePrototype.create(ICONS.txt()); return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.TXT());
} }
/** /**
@ -596,7 +591,7 @@ public class Resources {
*/ */
public static AbstractImagePrototype getIconMovie(){ public static AbstractImagePrototype getIconMovie(){
return AbstractImagePrototype.create(ICONS.movie()); return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.MOVIE());
} }
/** /**
@ -606,7 +601,7 @@ public class Resources {
*/ */
public static AbstractImagePrototype getIconAddFolder(){ public static AbstractImagePrototype getIconAddFolder(){
return AbstractImagePrototype.create(ICONS.addFolder()); return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.NEW_FOLDER());
} }
/** /**
@ -626,7 +621,7 @@ public class Resources {
*/ */
public static AbstractImagePrototype getIconRenameItem(){ public static AbstractImagePrototype getIconRenameItem(){
return AbstractImagePrototype.create(ICONS.renameItem()); return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.EDIT());
} }
/** /**
@ -638,6 +633,16 @@ public class Resources {
return AbstractImagePrototype.create(ICONS.renameItem32()); return AbstractImagePrototype.create(ICONS.renameItem32());
} }
/**
* Gets the icon rename item32.
*
* @return the icon rename item32
*/
public static AbstractImagePrototype getSearchIcon(){
return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.SEARCH());
}
/** /**
* Gets the icon file upload. * Gets the icon file upload.
@ -646,7 +651,7 @@ public class Resources {
*/ */
public static AbstractImagePrototype getIconFileUpload(){ public static AbstractImagePrototype getIconFileUpload(){
return AbstractImagePrototype.create(ICONS.uploadFile()); return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.FILE_UPLOAD());
} }
/** /**
@ -665,8 +670,7 @@ public class Resources {
* @return the icon delete folder * @return the icon delete folder
*/ */
public static AbstractImagePrototype getIconDeleteFolder(){ public static AbstractImagePrototype getIconDeleteFolder(){
return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.DELETE());
return AbstractImagePrototype.create(ICONS.deleteFolder());
} }
/** /**
@ -675,8 +679,7 @@ public class Resources {
* @return the icon delete item * @return the icon delete item
*/ */
public static AbstractImagePrototype getIconDeleteItem(){ public static AbstractImagePrototype getIconDeleteItem(){
return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.DELETE());
return AbstractImagePrototype.create(ICONS.deleteItem());
} }
/** /**
@ -685,8 +688,7 @@ public class Resources {
* @return the icon delete item32 * @return the icon delete item32
*/ */
public static AbstractImagePrototype getIconDeleteItem32(){ public static AbstractImagePrototype getIconDeleteItem32(){
return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.DELETE());
return AbstractImagePrototype.create(ICONS.deleteItem32());
} }
/** /**
@ -695,8 +697,7 @@ public class Resources {
* @return the icon folder * @return the icon folder
*/ */
public static AbstractImagePrototype getIconFolder(){ public static AbstractImagePrototype getIconFolder(){
return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.FOLDER());
return AbstractImagePrototype.create(ICONS.folder());
} }
/** /**
@ -705,8 +706,7 @@ public class Resources {
* @return the icon audio * @return the icon audio
*/ */
public static AbstractImagePrototype getIconAudio(){ public static AbstractImagePrototype getIconAudio(){
return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.MOVIE());
return AbstractImagePrototype.create(ICONS.audio());
} }
/** /**
@ -715,8 +715,7 @@ public class Resources {
* @return the icon archive upload * @return the icon archive upload
*/ */
public static AbstractImagePrototype getIconArchiveUpload(){ public static AbstractImagePrototype getIconArchiveUpload(){
return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.UNARCHIVE());
return AbstractImagePrototype.create(ICONS.archiveUpload());
} }
/** /**
@ -735,8 +734,7 @@ public class Resources {
* @return the icon images * @return the icon images
*/ */
public static AbstractImagePrototype getIconImages(){ public static AbstractImagePrototype getIconImages(){
return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.IMAGE());
return AbstractImagePrototype.create(ICONS.images());
} }
/** /**
@ -745,8 +743,7 @@ public class Resources {
* @return the icon documents * @return the icon documents
*/ */
public static AbstractImagePrototype getIconDocuments(){ public static AbstractImagePrototype getIconDocuments(){
return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.TXT());
return AbstractImagePrototype.create(ICONS.documents());
} }
/** /**
@ -775,8 +772,7 @@ public class Resources {
* @return the icon history * @return the icon history
*/ */
public static AbstractImagePrototype getIconHistory(){ public static AbstractImagePrototype getIconHistory(){
return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.HISTORY());
return AbstractImagePrototype.create(ICONS.history());
} }
/** /**
@ -826,7 +822,7 @@ public class Resources {
* @return the icon grid view * @return the icon grid view
*/ */
public static AbstractImagePrototype getIconGridView(){ public static AbstractImagePrototype getIconGridView(){
return AbstractImagePrototype.create(ICONS.gridView()); return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.CATEGORY());
} }
/** /**
@ -853,7 +849,7 @@ public class Resources {
* @return the icon download * @return the icon download
*/ */
public static AbstractImagePrototype getIconDownload(){ public static AbstractImagePrototype getIconDownload(){
return AbstractImagePrototype.create(ICONS.download()); return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.FILE_DOWNLOAD());
} }
/** /**
@ -916,7 +912,7 @@ public class Resources {
* @return the icon preview * @return the icon preview
*/ */
public static AbstractImagePrototype getIconPreview() { public static AbstractImagePrototype getIconPreview() {
return AbstractImagePrototype.create(ICONS.preview()); return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.PREVIEW());
} }
/** /**
@ -925,7 +921,7 @@ public class Resources {
* @return the icon show * @return the icon show
*/ */
public static AbstractImagePrototype getIconShow() { public static AbstractImagePrototype getIconShow() {
return AbstractImagePrototype.create(ICONS.show()); return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.OPEN());
} }
/** /**
@ -934,7 +930,7 @@ public class Resources {
* @return the icon open url * @return the icon open url
*/ */
public static AbstractImagePrototype getIconOpenUrl() { public static AbstractImagePrototype getIconOpenUrl() {
return AbstractImagePrototype.create(ICONS.openUrl()); return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.OPEN());
} }
/** /**
@ -943,16 +939,7 @@ public class Resources {
* @return the icon add url * @return the icon add url
*/ */
public static AbstractImagePrototype getIconAddUrl() { public static AbstractImagePrototype getIconAddUrl() {
return AbstractImagePrototype.create(ICONS.addUrl()); return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.LINK());
}
/**
* Gets the icon send to.
*
* @return the icon send to
*/
public static AbstractImagePrototype getIconSendTo() {
return AbstractImagePrototype.create(ICONS.sendTo());
} }
/** /**
@ -963,43 +950,6 @@ public class Resources {
public static AbstractImagePrototype getIconCheckUser() { public static AbstractImagePrototype getIconCheckUser() {
return AbstractImagePrototype.create(ICONS.checkUser()); return AbstractImagePrototype.create(ICONS.checkUser());
} }
/**
* Gets the icon messages received.
*
* @return the icon messages received
*/
public static AbstractImagePrototype getIconMessagesReceived() {
return AbstractImagePrototype.create(ICONS.inboxReceived());
}
/**
* Gets the icon messages sent.
*
* @return the icon messages sent
*/
public static AbstractImagePrototype getIconMessagesSent() {
return AbstractImagePrototype.create(ICONS.inboxSent());
}
/**
* Gets the icon email.
*
* @return the icon email
*/
public static AbstractImagePrototype getIconEmail() {
return AbstractImagePrototype.create(ICONS.email());
}
/**
* Gets the icon open email.
*
* @return the icon open email
*/
public static AbstractImagePrototype getIconOpenEmail() {
return AbstractImagePrototype.create(ICONS.openEmail());
}
/** /**
* Gets the icon hand. * Gets the icon hand.
* *
@ -1017,59 +967,13 @@ public class Resources {
public static AbstractImagePrototype getIconSaveAttachments() { public static AbstractImagePrototype getIconSaveAttachments() {
return AbstractImagePrototype.create(ICONS.saveAttachs()); return AbstractImagePrototype.create(ICONS.saveAttachs());
} }
/**
* Gets the icon download emails.
*
* @return the icon download emails
*/
public static AbstractImagePrototype getIconDownloadEmails() {
return AbstractImagePrototype.create(ICONS.downloadEmail());
}
/**
* Gets the icon email read.
*
* @return the icon email read
*/
public static AbstractImagePrototype getIconEmailRead() {
return AbstractImagePrototype.create(ICONS.emailRead());
}
/**
* Gets the icon email not read.
*
* @return the icon email not read
*/
public static AbstractImagePrototype getIconEmailNotRead() {
return AbstractImagePrototype.create(ICONS.emailNotRead());
}
/**
* Gets the icon delete message.
*
* @return the icon delete message
*/
public static AbstractImagePrototype getIconDeleteMessage() {
return AbstractImagePrototype.create(ICONS.emailDelete());
}
/**
* Gets the icon email forward.
*
* @return the icon email forward
*/
public static AbstractImagePrototype getIconEmailForward() {
return AbstractImagePrototype.create(ICONS.emailForward());
}
/** /**
* Gets the icon copy. * Gets the icon copy.
* *
* @return the icon copy * @return the icon copy
*/ */
public static AbstractImagePrototype getIconCopy() { public static AbstractImagePrototype getIconCopy() {
return AbstractImagePrototype.create(ICONS.copy()); return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.COPY());
} }
/** /**
@ -1078,7 +982,7 @@ public class Resources {
* @return the icon paste * @return the icon paste
*/ */
public static AbstractImagePrototype getIconPaste() { public static AbstractImagePrototype getIconPaste() {
return AbstractImagePrototype.create(ICONS.paste()); return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.PASTE());
} }
/** /**
@ -1087,7 +991,7 @@ public class Resources {
* @return the icon refresh * @return the icon refresh
*/ */
public static AbstractImagePrototype getIconRefresh() { public static AbstractImagePrototype getIconRefresh() {
return AbstractImagePrototype.create(ICONS.refreshFolder()); return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.RELOAD());
} }
/** /**
@ -1153,23 +1057,6 @@ public class Resources {
return AbstractImagePrototype.create(ICONS.removeFilter()); return AbstractImagePrototype.create(ICONS.removeFilter());
} }
/**
* Gets the icon new mail.
*
* @return the icon new mail
*/
public static AbstractImagePrototype getIconNewMail() {
return AbstractImagePrototype.create(ICONS.createNewMail());
}
/**
* Gets the icon reply mail.
*
* @return the icon reply mail
*/
public static AbstractImagePrototype getIconReplyMail() {
return AbstractImagePrototype.create(ICONS.replyMail());
}
/** /**
* Gets the icon public link. * Gets the icon public link.
@ -1177,35 +1064,21 @@ public class Resources {
* @return the icon public link * @return the icon public link
*/ */
public static AbstractImagePrototype getIconPublicLink() { public static AbstractImagePrototype getIconPublicLink() {
return AbstractImagePrototype.create(ICONS.publicLink()); return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.PUBLIC_LINK());
} }
/**
* Gets the icon reply all mail.
*
* @return the icon reply all mail
*/
public static AbstractImagePrototype getIconReplyAllMail() {
return AbstractImagePrototype.create(ICONS.replyAllMail());
}
/** /**
* Gets the icon workflow report. * Gets the icon versioning.
* *
* @return the icon workflow report * @return the icon versioning
*/ */
public static AbstractImagePrototype getIconWorkflowReport() { public static AbstractImagePrototype getIconVersioning() {
return AbstractImagePrototype.create(ICONS.workflowReport()); return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.VERSIONS());
} }
/**
* Gets the icon workflow template.
*
* @return the icon workflow template
*/
public static AbstractImagePrototype getIconWorkflowTemplate() {
return AbstractImagePrototype.create(ICONS.workflowTemplate());
}
/** /**
* Gets the icon web dav. * Gets the icon web dav.
@ -1231,7 +1104,7 @@ public class Resources {
* @return the icon share folder * @return the icon share folder
*/ */
public static AbstractImagePrototype getIconShareFolder() { public static AbstractImagePrototype getIconShareFolder() {
return AbstractImagePrototype.create(ICONS.shareFolder()); return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.GROUP());
} }
/** /**
@ -1314,7 +1187,7 @@ public class Resources {
public static AbstractImagePrototype getSelectedRight() { public static AbstractImagePrototype getSelectedRight() {
return AbstractImagePrototype.create(ICONS.selectedRight()); return AbstractImagePrototype.create(ICONS.selectedRight());
} }
/** /**
* Gets the icon permissions. * Gets the icon permissions.
* *
@ -1353,15 +1226,6 @@ public class Resources {
} }
/**
* Gets the icon versioning.
*
* @return the icon versioning
*/
public static AbstractImagePrototype getIconVersioning() {
return AbstractImagePrototype.create(ICONS.versioning());
}
/** /**
* Gets the icon thredds publish. * Gets the icon thredds publish.
@ -1481,7 +1345,9 @@ public class Resources {
return Resources.getIconDoc(); return Resources.getIconDoc();
} else if (XML.equals(mediaTypeName)) { } else if (XML.equals(mediaTypeName)) {
return Resources.getIconXml(); return Resources.getIconXml();
} else if (CSV.equals(mediaTypeName)) { } else if (mediaTypeName.contains(CAL)) {
return Resources.getIconCalendar();
}else if (CSV.equals(mediaTypeName)) {
return Resources.getIconCsv(); return Resources.getIconCsv();
} else if (JAVA.equals(mediaTypeName)) { } else if (JAVA.equals(mediaTypeName)) {
return Resources.getIconJava(); return Resources.getIconJava();
@ -1576,15 +1442,11 @@ public class Resources {
return Resources.getIconReportTemplate(); return Resources.getIconReportTemplate();
}else if(itemType.equals(GXTFolderItemTypeEnum.URL_DOCUMENT)){ }else if(itemType.equals(GXTFolderItemTypeEnum.URL_DOCUMENT)){
return Resources.getIconLink(); return Resources.getIconLink();
}else if(itemType.equals(GXTFolderItemTypeEnum.WORKFLOW_REPORT)){
return Resources.getIconWorkflowReport();
}else if(itemType.equals(GXTFolderItemTypeEnum.WORKFLOW_TEMPLATE)){
return Resources.getIconWorkflowTemplate();
}else if(itemType.equals(GXTFolderItemTypeEnum.EXTERNAL_RESOURCE_LINK)){ }else if(itemType.equals(GXTFolderItemTypeEnum.EXTERNAL_RESOURCE_LINK)){
return Resources.getIconResourceLink(); return Resources.getIconResourceLink();
} }
} }
return Resources.getIconTable(); return Resources.getIconTxt();
} }
@ -1596,16 +1458,6 @@ public class Resources {
* @return the icon by type * @return the icon by type
*/ */
public static AbstractImagePrototype getIconByType(String name, String type){ public static AbstractImagePrototype getIconByType(String name, String type){
/*if(type.equals(GXTFolderItemTypeEnum.FOLDER.toString()))
return Resources.getIconFolder();
else if(type.equals(GXTFolderItemTypeEnum.FOLDER_PUBLIC.toString()))
return Resources.getIconFolderPublic();
else if(type.equals(GXTFolderItemTypeEnum.FOLDER_SHARED.toString()))
return Resources.getIconSharedFolder();
else if(type.equals(GXTFolderItemTypeEnum.FOLDER_SHARED_PUBLIC.toString()))
return Resources.getIconFolderSharedPublic();*/
//RECOVERING "media type name" from type / media type name [+suffix] //RECOVERING "media type name" from type / media type name [+suffix]
int sl = type.indexOf("/"); int sl = type.indexOf("/");
String mediaTypeName = type.substring(sl+1, type.length()); String mediaTypeName = type.substring(sl+1, type.length());

View File

@ -5,7 +5,6 @@ import org.gcube.portlets.user.workspace.client.ConstantsExplorer;
import org.gcube.portlets.user.workspace.client.ConstantsExplorer.ViewSwitchType; import org.gcube.portlets.user.workspace.client.ConstantsExplorer.ViewSwitchType;
import org.gcube.portlets.user.workspace.client.event.SwitchViewEvent; import org.gcube.portlets.user.workspace.client.event.SwitchViewEvent;
import org.gcube.portlets.user.workspace.client.resources.Resources; import org.gcube.portlets.user.workspace.client.resources.Resources;
import org.gcube.portlets.user.workspace.client.view.smartfolder.SmartFolderPanel;
import org.gcube.portlets.user.workspace.client.view.tree.AsyncTreePanel; import org.gcube.portlets.user.workspace.client.view.tree.AsyncTreePanel;
import com.extjs.gxt.ui.client.event.BaseEvent; import com.extjs.gxt.ui.client.event.BaseEvent;
@ -29,7 +28,6 @@ public class ExplorerPanel extends LayoutContainer {
private Radio radioTree = null; private Radio radioTree = null;
private Radio radioSmartFolder = null; private Radio radioSmartFolder = null;
private AsyncTreePanel asycTreePanel = null; private AsyncTreePanel asycTreePanel = null;
private SmartFolderPanel smartFolderPanel = null;
private final RadioGroup radioGroup = new RadioGroup(); private final RadioGroup radioGroup = new RadioGroup();
private ContentPanel expPanel = null; private ContentPanel expPanel = null;
private ToolBar toolBar = new ToolBar(); private ToolBar toolBar = new ToolBar();
@ -55,16 +53,10 @@ public class ExplorerPanel extends LayoutContainer {
initToolBar(); initToolBar();
this.asycTreePanel = new AsyncTreePanel(); this.asycTreePanel = new AsyncTreePanel();
if(isSmartFolderInstanced)
this.smartFolderPanel = new SmartFolderPanel();
this.expPanel = new ContentPanel(); this.expPanel = new ContentPanel();
this.expPanel.setHeaderVisible(false); this.expPanel.setHeaderVisible(false);
this.expPanel.setTopComponent(toolBar);
// smartFolderPanel.setVisible(false); // smartFolderPanel.setVisible(false);
// messagesPanel.setVisible(false); // messagesPanel.setVisible(false);
asycTreePanel.setVisible(true); asycTreePanel.setVisible(true);
@ -73,11 +65,6 @@ public class ExplorerPanel extends LayoutContainer {
// expPanel.add(messagesPanel); // expPanel.add(messagesPanel);
if(instancingSmartFolder){
smartFolderPanel.setVisible(false);
expPanel.add(smartFolderPanel);
}
//BULK //BULK
//REMOVED 2016-09-15 CHECK SVN //REMOVED 2016-09-15 CHECK SVN
@ -191,8 +178,6 @@ public class ExplorerPanel extends LayoutContainer {
if (type.compareTo(ViewSwitchType.Tree)==0) { if (type.compareTo(ViewSwitchType.Tree)==0) {
if(isSmartFolderInstanced)
smartFolderPanel.setVisible(false);
asycTreePanel.setVisible(true); asycTreePanel.setVisible(true);
@ -204,8 +189,6 @@ public class ExplorerPanel extends LayoutContainer {
smartFolderPanel.unPressedAllToogle();
smartFolderPanel.setVisible(true);
AppControllerExplorer.getEventBus().fireEvent(new SwitchViewEvent(ViewSwitchType.SmartFolder)); AppControllerExplorer.getEventBus().fireEvent(new SwitchViewEvent(ViewSwitchType.SmartFolder));
@ -216,8 +199,6 @@ public class ExplorerPanel extends LayoutContainer {
asycTreePanel.setVisible(false); asycTreePanel.setVisible(false);
if(isSmartFolderInstanced)
smartFolderPanel.setVisible(false);
} }
@ -227,13 +208,6 @@ public class ExplorerPanel extends LayoutContainer {
return asycTreePanel; return asycTreePanel;
} }
public SmartFolderPanel getShortuctsPanel() {
return smartFolderPanel;
}
public SmartFolderPanel getSmartFolderPanel() {
return smartFolderPanel;
}
public boolean isSmartFolderInstanced() { public boolean isSmartFolderInstanced() {
return isSmartFolderInstanced; return isSmartFolderInstanced;

View File

@ -55,7 +55,6 @@ import com.google.gwt.user.client.rpc.AsyncCallback;
* The Class ContextMenuTree. * The Class ContextMenuTree.
* *
* @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it
* Nov 17, 2015
*/ */
public class ContextMenuTree { public class ContextMenuTree {
@ -71,7 +70,7 @@ public class ContextMenuTree {
* Instantiates a new context menu tree. * Instantiates a new context menu tree.
*/ */
public ContextMenuTree() { public ContextMenuTree() {
this.contextMenu.setWidth(140); this.contextMenu.setWidth(200);
this.listSelectedItems = new ArrayList<FileModel>(); this.listSelectedItems = new ArrayList<FileModel>();
createContextMenu(); createContextMenu();
@ -121,47 +120,6 @@ public class ContextMenuTree {
}); });
contextMenu.add(openUrl); contextMenu.add(openUrl);
//Open Report Template
//TODO REMOVE
// MenuItem openReportTemplate = new MenuItem();
// openReportTemplate.setId(WorkspaceOperation.OPEN_REPORT_TEMPLATE.getId());
// openReportTemplate.setText(ConstantsExplorer.MESSAGE_OPEN_REPORT_TEMPLATE);
// openReportTemplate.setIcon(Resources.getIconShow());
//
// openReportTemplate.addSelectionListener(new SelectionListener<MenuEvent>() {
// public void componentSelected(MenuEvent ce) {
//
// FileModel selected = listSelectedItems.get(0);
//
// if(selected!=null){
// eventBus.fireEvent(new OpenReportsEvent(selected));
// }
// }
// });
//contextMenu.add(openReportTemplate);
//Open Report Template
//TODO REMOVE
// MenuItem openReport = new MenuItem();
// openReport.setId(WorkspaceOperation.OPEN_REPORT.getId());
// openReport.setText(ConstantsExplorer.MESSAGE_OPEN_REPORT);
// openReport.setIcon(Resources.getIconShow());
//
// openReport.addSelectionListener(new SelectionListener<MenuEvent>() {
// public void componentSelected(MenuEvent ce) {
//
// FileModel selected = listSelectedItems.get(0);
//
// if (selected != null){
// eventBus.fireEvent(new OpenReportsEvent(selected));
// }
//
// }
// });
//contextMenu.add(openReport);
contextMenu.add(new SeparatorMenuItem()); contextMenu.add(new SeparatorMenuItem());
//END SPECIFIC OPERATION //END SPECIFIC OPERATION

View File

@ -11,7 +11,7 @@
<!-- Moduel GXT --> <!-- Moduel GXT -->
<inherits name='com.extjs.gxt.ui.GXT' /> <inherits name='com.extjs.gxt.ui.GXT' />
<inherits name='org.gcube.portal.clientcontext.GCubeClientContext' /> <inherits name='org.gcube.portal.clientcontext.GCubeClientContext' />
<inherits name="org.gcube.portal.stohubicons.StorageHubIcons" />
<inherits <inherits
name="org.gcube.portlets.widgets.workspacesharingwidget.WorkspaceSharingWidget" /> name="org.gcube.portlets.widgets.workspacesharingwidget.WorkspaceSharingWidget" />