Changeset 22605 for main/trunk/gli/src/org/greenstone/gatherer/gui/Preferences.java

Timestamp:

2010-08-11T21:28:34+12:00 (14 years ago)

Author:

ak19

Message:

Ticket #152: Allowing different paths to collect dir so that GLI can work with collect dirs on pen drives. NONE OF THESE CHANGES ARE FOR Client-GLI AS YET. 1. Preferences (Connection tab), Open and New Collection dialogs allow one to change the current collect directory containing the collections to select from. 2. New Collection dialog allows one to base a new collection on an existing collection in a collect dir other than the current collect dir. 3. Collections in the Documents in Greenstone Collections Workspace Tree Node now have two additional rightclick options: to move and copy these collections to another location.

File:

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

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

@@ -68 +68 @@
     private JButton apply_button;
     private JButton cancel_button;
+    private JButton chdir_button;
     private JButton ok_button;
     private JCheckBox show_file_size_checkbox;
@@ -92 +93 @@
     private JTextField program_field;
     private JTextField proxy_host_field;
+    private JTextField collect_dir_field;
+
     private Preferences self;
 
@@ -298 +301 @@
         }
     }
+
+    JPanel collect_dir_pane = new JPanel();
+        collect_dir_pane.setComponentOrientation(Dictionary.getOrientation());
+    collect_dir_pane.setPreferredSize(ROW_SIZE);
+    JLabel collect_dir_label = new JLabel(Dictionary.get("Preferences.Connection.CollectDirectory"));
+    collect_dir_label.setPreferredSize(LABEL_SIZE);
+    collect_dir_label.setComponentOrientation(Dictionary.getOrientation());
+    collect_dir_field = new JTextField(Gatherer.getCollectDirectoryPath());
+    //collect_dir_field = new JTextField(Configuration.getString("general.open_collection"+Configuration.gliPropertyNameSuffix(), true));
+    collect_dir_field.setCaretPosition(0);
+    collect_dir_field.setToolTipText(Dictionary.get("Preferences.Connection.CollectDirectory_Tooltip"));
+    collect_dir_field.setEditable(false);
+    JButton chdir_button = new GLIButton(Dictionary.get("General.CD"), Dictionary.get("General.CD_Tooltip"));
+    chdir_button.addActionListener(new ChangeDirListener());
+    if(Gatherer.isGsdlRemote) { // disable changing directories for client GLI
+        chdir_button.setEnabled(false);
+    }
     
     boolean currently_enabled = Configuration.get("general.use_proxy", true);
@@ -370 +390 @@
     }
 
+    collect_dir_pane.setLayout(new BorderLayout());
+    collect_dir_pane.add(collect_dir_label, BorderLayout.LINE_START);
+    collect_dir_pane.add(collect_dir_field, BorderLayout.CENTER);
+    collect_dir_pane.add(chdir_button, BorderLayout.LINE_END);
+
     proxy_host_pane.setLayout(new BorderLayout());
     proxy_host_pane.add(proxy_host_label, BorderLayout.LINE_START);
@@ -389 +414 @@
         connection_pane.add(servlet_pane);
     }
+    connection_pane.add(collect_dir_pane);
+
     connection_pane.add(use_proxy_checkbox);
     connection_pane.add(proxy_host_pane);
@@ -731 +758 @@
     }
 
+    private class ChangeDirListener implements ActionListener {
+    public void actionPerformed(ActionEvent event) {
+        JFileChooser chooser = new JFileChooser(collect_dir_field.getText());
+        chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
+        int returnVal = chooser.showOpenDialog(Preferences.this);
+        if(returnVal == JFileChooser.APPROVE_OPTION) {
+        collect_dir_field.setText(chooser.getSelectedFile().getAbsolutePath() + File.separator);
+        } // else collect_dir_field text remains as it is
+    }
+    }
 
     private class OKButtonListener
@@ -826 +863 @@
         Configuration.setSiteAndServlet(new_site, (String)servlet_combobox.getSelectedItem());
         }
+
+        // collect directory change
+        String newCollectPath = collect_dir_field.getText();
+        if(!newCollectPath.endsWith(File.separator)) {
+        newCollectPath += File.separator;
+        }
+        Gatherer.collectDirectoryHasChanged(Gatherer.getCollectDirectoryPath(), newCollectPath);
+        // will tell the server that the collect directory has changed and that
+        // the workspace needs to be refreshed (Documents in Greenstone Collections)
+
        
         Configuration.set("general.use_proxy", true, use_proxy_checkbox.isSelected());