Use matching icons for upload and download menu items.

diff --git a/gss/src/gr/ebs/gss/client/FileContextMenu.java b/gss/src/gr/ebs/gss/client/FileContextMenu.java
index 8265559..cf18455 100644 (file)
--- a/gss/src/gr/ebs/gss/client/FileContextMenu.java
+++ b/gss/src/gr/ebs/gss/client/FileContextMenu.java
@@ -128,14 +128,14 @@ public class FileContextMenu extends PopupPanel implements ClickListener {
                if (isEmpty) {
                        if (GSS.get().getFolders().getCurrent() != null)
                                if (GSS.get().getFolders().isFileItem(GSS.get().getFolders().getCurrent()))
-                                       contextMenu.addItem("<span>" + newImages.fileNew().getHTML() + "&nbsp;Upload</span>", true, new UploadFileCommand(this, images));
+                                       contextMenu.addItem("<span>" + newImages.fileUpdate().getHTML() + "&nbsp;Upload</span>", true, new UploadFileCommand(this, images));
                                else if (GSS.get().getFolders().isMySharedItem(GSS.get().getFolders().getCurrent()) || GSS      .get()
                                                                                                                                                                                                                        .getFolders()
                                                                                                                                                                                                                        .isOthersSharedItem(GSS .get()
                                                                                                                                                                                                                                                                        .getFolders()
                                                                                                                                                                                                                                                                        .getCurrent()))
                                        if(GSS.get().getFolders().getCurrent().getUserObject() instanceof FolderResource)
-                                               contextMenu.addItem("<span>" + newImages.fileNew().getHTML() + "&nbsp;Upload</span>", true, new UploadFileCommand(this, images));
+                                               contextMenu.addItem("<span>" + newImages.fileUpdate().getHTML() + "&nbsp;Upload</span>", true, new UploadFileCommand(this, images));
                } else if (isTrash) {
                        contextMenu.addItem("<span>" + newImages.versions().getHTML() + "&nbsp;Restore</span>", true, new RestoreTrashCommand(this));
                        contextMenu.addItem("<span>" + newImages.delete().getHTML() + "&nbsp;Delete</span>", true, new DeleteCommand(this, images));

diff --git a/gss/src/gr/ebs/gss/client/FileMenu.java b/gss/src/gr/ebs/gss/client/FileMenu.java
index 0f4b38d..f956cac 100644 (file)
--- a/gss/src/gr/ebs/gss/client/FileMenu.java
+++ b/gss/src/gr/ebs/gss/client/FileMenu.java
@@ -55,57 +55,18 @@ public class FileMenu extends PopupPanel implements ClickListener {
         */\r
        public interface Images extends FilePropertiesDialog.Images {\r
 \r
-               /**\r
-                * Will bundle the file 'folder_new.png' residing in the package\r
-                * 'gr.ebs.gss.resources'.\r
-                *\r
-                * @return the image prototype\r
-                */\r
                @Resource("gr/ebs/gss/resources/folder_new.png")\r
                AbstractImagePrototype folderNew();\r
 \r
-               /**\r
-                * Will bundle the file 'filenew.png' residing in the package\r
-                * 'gr.ebs.gss.resources'.\r
-                *\r
-                * @return the image prototype\r
-                */\r
-               @Resource("gr/ebs/gss/resources/filenew.png")\r
-               AbstractImagePrototype fileNew();\r
-\r
-               /**\r
-                * Will bundle the file 'update.png' residing in the package\r
-                * 'gr.ebs.gss.resources'.\r
-                *\r
-                * @return the image prototype\r
-                */\r
-               @Resource("gr/ebs/gss/resources/update.png")\r
+               @Resource("gr/ebs/gss/resources/folder_outbox.png")\r
                AbstractImagePrototype fileUpdate();\r
 \r
-               /**\r
-                * Will bundle the file 'view_text.png' residing in the package\r
-                * 'gr.ebs.gss.resources'.\r
-                *\r
-                * @return the image prototype\r
-                */\r
                @Resource("gr/ebs/gss/resources/view_text.png")\r
                AbstractImagePrototype viewText();\r
 \r
-               /**\r
-                * Will bundle the file 'download_manager.png' residing in the package\r
-                * 'gr.ebs.gss.resources'.\r
-                *\r
-                * @return the image prototype\r
-                */\r
-               @Resource("gr/ebs/gss/resources/download_manager.png")\r
+               @Resource("gr/ebs/gss/resources/folder_inbox.png")\r
                AbstractImagePrototype download();\r
 \r
-               /**\r
-                * Will bundle the file 'trashcan_empty.png' residing in the package\r
-                * 'gr.ebs.gss.resources'.\r
-                *\r
-                * @return the image prototype\r
-                */\r
                @Resource("gr/ebs/gss/resources/trashcan_empty.png")\r
                AbstractImagePrototype emptyTrash();\r
        }\r
@@ -188,7 +149,7 @@ public class FileMenu extends PopupPanel implements ClickListener {
                boolean downloadVisible = GSS.get().getCurrentSelection() != null && GSS.get().getCurrentSelection() instanceof FileResource;\r
                boolean propertiesNotVisible = selectedItem != null && (folders.isTrash(selectedItem) || folders.isMyShares(selectedItem) || folders.isOthersShared(selectedItem) || selectedItem.getUserObject() instanceof GroupUserResource);\r
                contextMenu.addItem("<span>" + images.folderNew().getHTML() + "&nbsp;New Folder</span>", true, new NewFolderCommand(this, images));\r
-               contextMenu.addItem("<span>" + images.fileNew().getHTML() + "&nbsp;Upload</span>", true, new UploadFileCommand(this, images));\r
+               contextMenu.addItem("<span>" + images.fileUpdate().getHTML() + "&nbsp;Upload</span>", true, new UploadFileCommand(this, images));\r
                if (downloadVisible) {\r
                        String[] link = {"", ""};\r
                        createDownloadLink(link);\r

diff --git a/gss/src/gr/ebs/gss/client/FilePropertiesDialog.java b/gss/src/gr/ebs/gss/client/FilePropertiesDialog.java
index 9920f03..fe160d4 100644 (file)
--- a/gss/src/gr/ebs/gss/client/FilePropertiesDialog.java
+++ b/gss/src/gr/ebs/gss/client/FilePropertiesDialog.java
@@ -88,7 +88,7 @@ public class FilePropertiesDialog extends DialogBox {
                @Resource("gr/ebs/gss/resources/db_update.png")\r
                AbstractImagePrototype restore();\r
 \r
-               @Resource("gr/ebs/gss/resources/download_manager.png")\r
+               @Resource("gr/ebs/gss/resources/folder_inbox.png")\r
                AbstractImagePrototype download();\r
        }\r
 \r

diff --git a/gss/src/gr/ebs/gss/client/FolderContextMenu.java b/gss/src/gr/ebs/gss/client/FolderContextMenu.java
index 28d9295..17d61b1 100644 (file)
--- a/gss/src/gr/ebs/gss/client/FolderContextMenu.java
+++ b/gss/src/gr/ebs/gss/client/FolderContextMenu.java
@@ -105,7 +105,7 @@ public class FolderContextMenu extends PopupPanel {
 
                                boolean notRootFolder = !folders.getRootItem().equals(selectedItem);
                                contextMenu.addItem("<span>" + newImages.folderNew().getHTML() + "&nbsp;New Folder</span>", true, new NewFolderCommand(this, images));
-                               contextMenu.addItem("<span>" + newImages.fileNew().getHTML() + "&nbsp;Upload</span>", true, new UploadFileCommand(this, images));
+                               contextMenu.addItem("<span>" + newImages.fileUpdate().getHTML() + "&nbsp;Upload</span>", true, new UploadFileCommand(this, images));
                                // do not show the copy & cut option for the user's root folder
                                contextMenu.addItem("<span>" + newImages.cut().getHTML() + "&nbsp;Cut</span>", true, new CutCommand(this)).setVisible(notRootFolder);
                                contextMenu.addItem("<span>" + newImages.copy().getHTML() + "&nbsp;Copy</span>", true, new CopyCommand(this)).setVisible(notRootFolder);
@@ -117,7 +117,7 @@ public class FolderContextMenu extends PopupPanel {
                        }
                        else if(!folders.isMyShares(selectedItem) && folders.isMySharedItem(selectedItem)){
                                contextMenu.addItem("<span>" + newImages.folderNew().getHTML() + "&nbsp;New Folder</span>", true, new NewFolderCommand(this, images));
-                               contextMenu.addItem("<span>" + newImages.fileNew().getHTML() + "&nbsp;Upload</span>", true, new UploadFileCommand(this, images));
+                               contextMenu.addItem("<span>" + newImages.fileUpdate().getHTML() + "&nbsp;Upload</span>", true, new UploadFileCommand(this, images));
                                // do not show the copy & cut option for the user's root folder
                                contextMenu.addItem("<span>" + newImages.cut().getHTML() + "&nbsp;Cut</span>", true, new CutCommand(this));
                                contextMenu.addItem("<span>" + newImages.copy().getHTML() + "&nbsp;Copy</span>", true, new CopyCommand(this));
@@ -129,7 +129,7 @@ public class FolderContextMenu extends PopupPanel {
                        }
                        else if(!folders.isOthersShared(selectedItem) && folders.isOthersSharedItem(selectedItem) && !(GSS.get().getCurrentSelection() instanceof OtherUserResource)){
                                contextMenu.addItem("<span>" + newImages.folderNew().getHTML() + "&nbsp;New Folder</span>", true, new NewFolderCommand(this, images));
-                               contextMenu.addItem("<span>" + newImages.fileNew().getHTML() + "&nbsp;Upload</span>", true, new UploadFileCommand(this, images));
+                               contextMenu.addItem("<span>" + newImages.fileUpdate().getHTML() + "&nbsp;Upload</span>", true, new UploadFileCommand(this, images));
                                // do not show the copy & cut option for the user's root folder
                                //contextMenu.addItem("<span>" + newImages.cut().getHTML() + "&nbsp;Cut</span>", true, new CutCommand(this));
                                contextMenu.addItem("<span>" + newImages.copy().getHTML() + "&nbsp;Copy</span>", true, new CopyCommand(this));

diff --git a/gss/src/gr/ebs/gss/resources/download_manager.png b/gss/src/gr/ebs/gss/resources/download_manager.png
deleted file mode 100644 (file)
index a384e80..0000000
Binary files a/gss/src/gr/ebs/gss/resources/download_manager.png and /dev/null differ

diff --git a/gss/src/gr/ebs/gss/resources/filenew.png b/gss/src/gr/ebs/gss/resources/filenew.png
deleted file mode 100644 (file)
index bfe1d06..0000000
Binary files a/gss/src/gr/ebs/gss/resources/filenew.png and /dev/null differ

diff --git a/gss/src/gr/ebs/gss/resources/folder_inbox.png b/gss/src/gr/ebs/gss/resources/folder_inbox.png
new file mode 100644 (file)
index 0000000..cafac61
Binary files /dev/null and b/gss/src/gr/ebs/gss/resources/folder_inbox.png differ

diff --git a/gss/src/gr/ebs/gss/resources/folder_outbox.png b/gss/src/gr/ebs/gss/resources/folder_outbox.png
new file mode 100644 (file)
index 0000000..91e3b24
Binary files /dev/null and b/gss/src/gr/ebs/gss/resources/folder_outbox.png differ

diff --git a/gss/src/gr/ebs/gss/resources/update.png b/gss/src/gr/ebs/gss/resources/update.png
deleted file mode 100644 (file)
index abceb0d..0000000
Binary files a/gss/src/gr/ebs/gss/resources/update.png and /dev/null differ