From: Dimitris Routsis <droutsis@ebs.gr>
Date: Mon, 15 Jun 2009 09:45:25 +0000 (+0300)
Subject: Merge with 612ee1db5780de03ba2db24aae9513e7f28fea8a
X-Git-Tag: pithos/v0.7.8~323^2~14^2~404^2
X-Git-Url: https://code.grnet.gr/git/pithos/commitdiff_plain/c357d641c831d43f7e7ff6c81ebe070368e17605

Merge ... 612ee1db5780de03ba2db24aae9513e7f28fea8a
---

c357d641c831d43f7e7ff6c81ebe070368e17605
diff --cc src/gr/ebs/gss/client/FileMenu.java
index 0529543,636f411..08a2e4a
--- a/src/gr/ebs/gss/client/FileMenu.java
+++ b/src/gr/ebs/gss/client/FileMenu.java
@@@ -148,16 -144,13 +148,16 @@@ public class FileMenu extends PopupPane
  		Folders folders = GSS.get().getFolders();
  		TreeItem selectedItem = folders.getCurrent();
  		boolean downloadVisible = GSS.get().getCurrentSelection() != null && GSS.get().getCurrentSelection() instanceof FileResource;
 +		boolean uploadVisible = GSS.get().getFolders().getCurrent().getUserObject() instanceof FolderResource;
  		boolean propertiesNotVisible = selectedItem != null && (folders.isTrash(selectedItem) || folders.isMyShares(selectedItem) || folders.isOthersShared(selectedItem) || selectedItem.getUserObject() instanceof GroupUserResource);
  		contextMenu.addItem("<span>" + images.folderNew().getHTML() + "&nbsp;New Folder</span>", true, new NewFolderCommand(this, images));
- 		if (uploadVisible) contextMenu.addItem("<span>" + images.fileUpdate().getHTML() + "&nbsp;Upload</span>", true, new UploadFileCommand(this, images));
+ 		contextMenu.addItem("<span>" + images.fileUpdate().getHTML() + "&nbsp;Upload</span>", true, new UploadFileCommand(this));
  		if (downloadVisible) {
  			String[] link = {"", ""};
 -			createDownloadLink(link);
 +			createDownloadLink(link, false);
  			contextMenu.addItem("<span>" + link[0] + images.download().getHTML() + "&nbsp;Download" + link[1] + "</span>", true, downloadCmd);
 +			createDownloadLink(link, true);
 +			contextMenu.addItem("<span>" + link[0] + images.download().getHTML() + "&nbsp;Save file as" + link[1] + "</span>", true, downloadCmd);
  		}
  		contextMenu.addItem("<span>" + images.emptyTrash().getHTML() + "&nbsp;Empty Trash</span>", true, new EmptyTrashCommand(this));
  		contextMenu.addItem("<span>" + images.refresh().getHTML() + "&nbsp;Refresh</span>", true, new RefreshCommand(this, images));