Revision e85f2ab5

b/src/gr/ebs/gss/client/FileMenu.java
25 25
import gr.ebs.gss.client.commands.UploadFileCommand;
26 26
import gr.ebs.gss.client.rest.RestCommand;
27 27
import gr.ebs.gss.client.rest.resource.FileResource;
28
import gr.ebs.gss.client.rest.resource.FolderResource;
29 28
import gr.ebs.gss.client.rest.resource.GroupUserResource;
30 29

  
31 30
import com.google.gwt.http.client.URL;
......
96 95
		final int left = sender.getAbsoluteLeft();
97 96
		final int top = sender.getAbsoluteTop() + sender.getOffsetHeight();
98 97
		menu.setPopupPosition(left, top);
99

  
100 98
		menu.show();
101 99
	}
102 100

  
......
164 162
		Folders folders = GSS.get().getFolders();
165 163
		TreeItem selectedItem = folders.getCurrent();
166 164
		boolean downloadVisible = GSS.get().getCurrentSelection() != null && GSS.get().getCurrentSelection() instanceof FileResource;
167
		boolean uploadVisible = GSS.get().getFolders().getCurrent().getUserObject() instanceof FolderResource;
168
		boolean propertiesNotVisible = selectedItem != null && (folders.isTrash(selectedItem) || folders.isMyShares(selectedItem) || folders.isOthersShared(selectedItem) || selectedItem.getUserObject() instanceof GroupUserResource);
165
		boolean propertiesVisible = !(selectedItem != null && (folders.isTrash(selectedItem) || folders.isMyShares(selectedItem) || folders.isOthersShared(selectedItem) || selectedItem.getUserObject() instanceof GroupUserResource)) && downloadVisible;
169 166
		contextMenu.addItem("<span>" + images.folderNew().getHTML() + "&nbsp;New Folder</span>", true, new NewFolderCommand(this, images));
170 167
		contextMenu.addItem("<span>" + images.fileUpdate().getHTML() + "&nbsp;Upload</span>", true, new UploadFileCommand(this));
171 168
		if (downloadVisible) {
......
178 175
		contextMenu.addItem("<span>" + images.emptyTrash().getHTML() + "&nbsp;Empty Trash</span>", true, new EmptyTrashCommand(this));
179 176
		contextMenu.addItem("<span>" + images.refresh().getHTML() + "&nbsp;Refresh</span>", true, new RefreshCommand(this, images));
180 177
		contextMenu.addItem("<span>" + images.sharing().getHTML() + "&nbsp;Sharing</span>", true, new PropertiesCommand(this, images, 1))
181
		   			.setVisible(!propertiesNotVisible);
178
		   			.setVisible(propertiesVisible);
182 179
		contextMenu.addItem("<span>" + images.viewText().getHTML() + "&nbsp;Properties</span>", true, new PropertiesCommand(this, images, 0))
183
		   			.setVisible(!propertiesNotVisible);
180
		   			.setVisible(propertiesVisible);
184 181
		return contextMenu;
185 182
	}
186 183

  

Also available in: Unified diff