Changeset 37224

Timestamp:

2023-01-31T11:50:39+13:00 (15 months ago)

Author:

kjdon

Message:

added a new file button, can use it instead of draging and dropping from the workspace tree. Mainly needed for webswing gli, where you don't have access in workspace to your local files. currently using new folder image, until get a nice image for new file

File:

• main/trunk/gli/src/org/greenstone/gatherer/gui/GatherPane.java (modified) (8 diffs)

main/trunk/gli/src/org/greenstone/gatherer/gui/GatherPane.java

@@ -92 +92 @@
     /** The button used to create a new folder in the collection tree. */
     private JButton new_folder =  null;
+    /** The button used to add a new file in the collection tree */
+    private JButton new_file = null;
     /** The label shown at the top of the collection tree. */
     private JLabel collection_label = null;
@@ -139 +141 @@
     new_folder.setMinimumSize(MIN_SIZE);
     new_folder.setPreferredSize(MIN_SIZE);
+
+    new_file = new GLIButton(JarTools.getImage("folder.gif"), Dictionary.get("Collection.New_File_Tooltip"));
+    new_file.addActionListener(this);
+    new_file.setEnabled(false);
+    new_file.setMinimumSize(MIN_SIZE);
+    new_file.setPreferredSize(MIN_SIZE);
     
     }
@@ -165 +173 @@
         }
     }
-    // If a user has clicked on new_folder create a new folder under
+    // If a user has clicked on new_folder/new_file, create a new folder 
+    // or upload a new file under
     // whatever node is selected.
-    else if(event.getSource() == new_folder && collection_tree != null) {
+    else if((event.getSource() == new_folder || event.getSource() == new_file) && collection_tree != null) {
+        boolean adding_folder = false; // folder or file?
+        if (event.getSource() == new_folder) {
+        adding_folder = true;
+        }
         int count = collection_tree.getSelectionCount();
         boolean error = false;
@@ -174 +187 @@
         CollectionTreeNode node = (CollectionTreeNode) path.getLastPathComponent();
         if (node.getAllowsChildren()) {
-            Gatherer.f_man.newFolder(collection_tree, node);
+            if (adding_folder) {
+            Gatherer.f_man.newFolder(collection_tree, node);
+            } else {
+            Gatherer.f_man.newCollectionFile(collection_tree, node);
+            }
         }
         else {
@@ -180 +197 @@
             CollectionTreeNode parent = (CollectionTreeNode) node.getParent();
             if (parent!=null && parent.getAllowsChildren()) {
-            Gatherer.f_man.newFolder(collection_tree, parent);
+            if (adding_folder) {
+                Gatherer.f_man.newFolder(collection_tree, parent);
+            } else {
+                Gatherer.f_man.newCollectionFile(collection_tree, node);
+            }
             } else {
             error = true;
@@ -192 +213 @@
         // instead of an error, we now create a new folder at the root
         CollectionTreeNode node = (CollectionTreeNode) collection_tree.getModel().getRoot();
-        Gatherer.f_man.newFolder(collection_tree, node);
+        if (adding_folder) {
+            Gatherer.f_man.newFolder(collection_tree, node);
+        } else {
+            Gatherer.f_man.newCollectionFile(collection_tree, node);
+        }
         }
     }
@@ -344 +369 @@
 
     button_pane.add(new_folder);
+    button_pane.add(new_file);
     button_pane.add(recycle_bin);
 
@@ -429 +455 @@
     collection_filter.setEnabled(collection_loaded);
     new_folder.setEnabled(collection_loaded);
+    new_file.setEnabled(collection_loaded);
     }