Changeset 6748

Timestamp:

2004-02-09T15:55:22+13:00 (20 years ago)

Author:

kjdon

Message:

tidied up preview stuff. if windows and mac, just uses the start/open command and never prompts the user for a browser. if linux, prompts the user (should be changed to look for netscape and mozilla first). now use new prompt, PreviewCommandDialog, to get the browser, not the file association dialog which is really confusing

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• file/FileAssociationManager.java (modified) (3 diffs)
• gui/FileAssociationDialog.java (modified) (8 diffs)
• gui/PreviewCommandDialog.java (added)

trunk/gli/src/org/greenstone/gatherer/file/FileAssociationManager.java

@@ -32 +32 @@
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.gui.FileAssociationDialog;
+import org.greenstone.gatherer.gui.PreviewCommandDialog;
 import org.greenstone.gatherer.msm.MSMUtils;
 import org.greenstone.gatherer.util.StaticStrings;
@@ -104 +105 @@
         return command;
     }
-    // Failing that we have to prompt the user for what they want to do, but we do our best to provide a sensible default (if available).
-    // For windows we can have a pretty good guess
+    command = null;
+    // Failing that we have a guess at a sensible default 
     if(Utility.isWindows()) {
         // we use cmd and start
@@ -113 +114 @@
         command = StaticStrings.WIN_OPEN_COMMAND;//"cmd.exe /c start \"\" \""+url+"\"";
         }
-    }
-
-    // Now prompt the user
-    FileAssociationDialog dialog = new FileAssociationDialog(this);
-    command = dialog.display(true, command);
-    dialog.dispose();
-    dialog = null;
+    } else if (Utility.isMac()) {
+        command = StaticStrings.MAC_OPEN_COMMAND; // "open %1"
+    } else {
+        // we try to look for a browser
+    }
+    
+    // if we still haven't found something, prompt the user
+    if (command == null) {
+        PreviewCommandDialog dialog = new PreviewCommandDialog();
+        command = dialog.display();
+        dialog.dispose();
+        dialog = null;
+    }
 
     // Store the result if any
-    if(command != null) {
+    if(command != null && !command.equals("")) {
         Gatherer.config.setPreviewCommand(command);
-    }
-
-    // for now uder linux get the fileassoc thing. but eventually want a separate thing.
-    // pretend we are trying to open an html file
-    // Mmmoooo. - jmt12
-
+        command = command.replaceAll(FILENAME_ARG, url);
+        Gatherer.println("Result = " + command);
+        return command;
+    }
     // if we haven't got a command by now, we'll never get one
-    if (command == null) {
-        Gatherer.println("Result = " + command);
-        return null;
-    }
-    // Replace %1 with the url in quotes
-    command = command.replaceAll(FILENAME_ARG, url);
-    Gatherer.println("Result = " + command);
-    return command;
+    Gatherer.println("Result = null");
+    return null;
+    
     }
 

trunk/gli/src/org/greenstone/gatherer/gui/FileAssociationDialog.java

@@ -64 +64 @@
     extends ModalDialog {
 
-    static final private String NORMAL = "normal";
-    static final private String PREVIEW = "preview";
-
     /** The default size of a label. */
     static final private Dimension LABEL_SIZE = new Dimension(150, 25);
@@ -73 +70 @@
 
     private boolean ignore = false;
-    private boolean preview_type;
-    private CardLayout card_layout;
     private FileAssociationDialog self;
     private FileAssociationManager file_association_manager;
@@ -82 +77 @@
     private JButton remove_button;
     private JButton replace_button;
-    private JPanel swap_pane;
     private JTable existing_associations_table;
     private JTextField command_field;
@@ -117 +111 @@
     existing_associations_table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
     JPanel lower_pane = new JPanel();
-    
     JPanel details_pane = new JPanel();
-
-    card_layout = new CardLayout();
-    swap_pane = new JPanel(card_layout);
 
     JPanel extension_pane = new JPanel();
@@ -127 +117 @@
     extension_label.setPreferredSize(LABEL_SIZE);   
     extension_field = new NonWhitespaceField();
-
-    JLabel preview_label = new JLabel();
-    Dictionary.setText(preview_label, "FileAssociationDialog.Preview");
 
     JLabel command_label = new JLabel();
@@ -192 +179 @@
     command_pane.add(browse_button, BorderLayout.EAST);
 
-    swap_pane.add(extension_pane, NORMAL);
-    swap_pane.add(preview_label, PREVIEW);
-
     details_pane.setBorder(BorderFactory.createTitledBorder(Dictionary.get("FileAssociationDialog.Details")));
     details_pane.setLayout(new GridLayout(3,1));
-    details_pane.add(swap_pane);
+    details_pane.add(extension_pane);
     details_pane.add(command_label);
     details_pane.add(command_pane);
@@ -242 +226 @@
      */
     public String display(String new_extension) {
-    preview_type = false;
-
     // Clear the current selection
     existing_associations_table.clearSelection();
-
-    // Now ensable the components that aren't important for the preview collection command
-    existing_associations_table.setEnabled(true);
-    Dictionary.setBoth(close_button, "FileAssociationDialog.Close", "FileAssociationDialog.Close_Tooltip");
-    // And display the extension chooser
-    card_layout.show(swap_pane, NORMAL);
-    swap_pane.updateUI();
-
     if(new_extension != null) {
         extension_field.setText(new_extension);
     }
-
     setVisible(true);
-
     if(new_extension != null) {
         return file_association_manager.getCommandString(new_extension);
     }
-
     return null;
-    }
-
-    public String display(boolean is_preview_type, String command) {
-    System.err.println("Preview type");
-
-    preview_type = true;
-
-    if(command != null) {
-        command_field.setText(command);
-    }
-
-    // Clear the current selection
-    existing_associations_table.clearSelection();
-
-    // Now disable the components that aren't important for the preview collection command
-    existing_associations_table.setEnabled(false);
-
-    Dictionary.setBoth(close_button, "General.OK", "FileAssociationDialog.Close_Tooltip");
-
-    // And display the preview collection message
-    card_layout.show(swap_pane, PREVIEW);
-    swap_pane.updateUI();
-
-    setVisible(true);
-    return command_field.getText();
     }
 
@@ -305 +251 @@
     
     public void actionPerformed(ActionEvent event) {
-        if(!preview_type) {
-        String extension_str = extension_field.getText();
-        file_association_manager.setCommand(extension_str, command_field.getText());
-        // Select the appropriate entry in the table
-        int index = -1;
-        for(int i = 0; index == -1 && i < file_association_manager.size(); i++) {
-            if(file_association_manager.getExtension(i).equals(extension_str)) {
-            index = i;
-            }
-        }
-        if(index > -1) {
-            existing_associations_table.setRowSelectionInterval(index, index);
-        }
-        // And update buttons
-        add_button.setEnabled(false);
-        remove_button.setEnabled(true);
-        }
+        String extension_str = extension_field.getText();
+        file_association_manager.setCommand(extension_str, command_field.getText());
+        // Select the appropriate entry in the table
+        int index = -1;
+        for(int i = 0; index == -1 && i < file_association_manager.size(); i++) {
+        if(file_association_manager.getExtension(i).equals(extension_str)) {
+            index = i;
+        }
+        }
+        if(index > -1) {
+        existing_associations_table.setRowSelectionInterval(index, index);
+        }
+        // And update buttons
+        add_button.setEnabled(false);
+        remove_button.setEnabled(true);
     }
     }