Changeset 17569 for release-kits/shared

Timestamp:

2008-10-22T15:15:53+13:00 (16 years ago)

Author:

oranfry

Message:

HCI changes to the installer

Location:

release-kits/shared/ant-installer

Files:

• lib/ant-installer.jar (modified) ( previous)
• src/org/tp23/antinstaller/input/DirectoryInput.java (modified) (1 diff)
• src/org/tp23/antinstaller/renderer/swing/DirectoryInputRenderer.java (modified) (3 diffs)
• src/org/tp23/antinstaller/renderer/swing/ProgressPageRenderer.java (modified) (3 diffs)
• src/org/tp23/antinstaller/renderer/swing/TargetInputRenderer.java (modified) (5 diffs)
• src/org/tp23/gui/widget/DefaultingDirectoryChooser.java (modified) (1 diff)
• src/org/tp23/gui/widget/SystemOutJTextArea.java (modified) (1 diff)
• src/resources/help.png (added)

release-kits/shared/ant-installer/src/org/tp23/antinstaller/input/DirectoryInput.java

@@ -67 +67 @@
                             mr.printMessage(org.tp23.antinstaller.Installer.langPack.getString("dirNotCreated"));
                         }
+                    } else {
+                        //make them stay on the page until they manage to select an existent folder
+                        return false;
                     }
                 }

release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/swing/DirectoryInputRenderer.java

@@ -84 +84 @@
         jTextField.setText(inputField.getDefaultValue(true));
         browsePanel.add(jTextField, BorderLayout.CENTER);
-        browsePanel.add(browseButton, BorderLayout.EAST);
+
+        JPanel browseButtonWrapper = new JPanel( new BorderLayout() );
+        browseButtonWrapper.add( browseButton, BorderLayout.EAST );
+        browsePanel.add(browseButtonWrapper, BorderLayout.SOUTH);
         browseButton.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent e) {
@@ -106 +109 @@
                 chooser.setDefaultDirectory(new File(dirPath));
 
-                int returnVal = chooser.showDialog(parent, e.getActionCommand());
+                int returnVal = chooser.showDialog(parent, org.tp23.antinstaller.Installer.langPack.getString("selectFolder") );
                 if (returnVal == JFileChooser.APPROVE_OPTION) {
                     selectedFile = chooser.getSelectedFile();
@@ -117 +120 @@
             }
         });
-        browseButton.setText(org.tp23.antinstaller.Installer.langPack.getString("selectFolder"));
+        browseButton.setText(org.tp23.antinstaller.Installer.langPack.getString("browseDotDotDot"));
         browseButton.setPreferredSize(new Dimension(150, SizeConstants.FIELD_HEIGHT));
 

release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/swing/ProgressPageRenderer.java

@@ -100 +100 @@
         this.add(contentPanel,BorderLayout.CENTER);
         
-        //progressScrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS);
-
         messagesPanel.setLayout(null);
         Dimension messPanelSize = new Dimension(SizeConstants.PAGE_WIDTH,MESSAGE_PANEL_HEIGHT);
@@ -138 +136 @@
             }
         });
+
         jToggleButton.setIcon(getImage("/resources/icons/showdetails.png"));
         contentPanel.add(messagesPanel, BorderLayout.NORTH);
+
 
         if(showTargets){
@@ -160 +160 @@
         //jTabbedPane.setBounds(new Rectangle(4, MESSAGE_PANEL_HEIGHT, PAGE_WIDTH-12, 214));
 
+
         this.getNextButton().setVisible(false);
         this.getFinishButton().setText(ctx.getInstaller().getFinishButtonText());

release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/swing/TargetInputRenderer.java

@@ -26 +26 @@
 import javax.swing.JLabel;
 import javax.swing.JCheckBox;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JOptionPane;
 
 import org.tp23.antinstaller.input.InputField;
@@ -41 +44 @@
     protected JCheckBox targetCheckBox = new JCheckBox();
 
-
+    JPanel parent = null;
     public TargetInputRenderer() {
     }
     public void initComponent(JPanel parent){
+        this.parent = parent;
+
         try {
             jbInit();
@@ -99 +104 @@
 
 
-        JLabel hlp = new JLabel("help");
-        hlp.setToolTipText(outputField.getExplanatoryText());
+        ImageIcon helpIcon = createImageIcon("/resources/help.png");
+        JButton hlp = new JButton(org.tp23.antinstaller.Installer.langPack.getString("info"), helpIcon);
+
+        hlp.addActionListener(
+            new ActionListener() {
+                public void actionPerformed(ActionEvent e) {
+                    JOptionPane.showMessageDialog(parent, outputField.getExplanatoryText(), outputField.getDisplayText(), JOptionPane.QUESTION_MESSAGE);
+                }
+            }
+        );
+
+        //hlp.setToolTipText();
+
+        JPanel spacer = new JPanel();
+        spacer.setPreferredSize(new Dimension(50, 1));
 
         JPanel p;
@@ -108 +126 @@
         p.add( sizeLabel );
         p.add( targetCheckBox );
+        p.add( spacer );
         p.add( hlp );
         content.add(p);
@@ -121 +140 @@
     public void renderError() {
     }
+
+    /** Returns an ImageIcon, or null if the path was invalid. */
+    protected static ImageIcon createImageIcon(String path) {
+        java.net.URL imgURL = org.tp23.antinstaller.Installer.class.getResource(path);
+        if (imgURL != null) {
+            return new ImageIcon(imgURL);
+        } else {
+            //System.err.println("Couldn't find file: " + path);
+            return null;
+        }
+    }
+
 }

release-kits/shared/ant-installer/src/org/tp23/gui/widget/DefaultingDirectoryChooser.java

@@ -84 +84 @@
                 }
                 public String getDescription() {
-                    return "Directories";
+                    return "Folders";
                 }
             });

release-kits/shared/ant-installer/src/org/tp23/gui/widget/SystemOutJTextArea.java

@@ -47 +47 @@
         JButton jumpButton = new JButton("");
         setVerticalScrollBarPolicy(VERTICAL_SCROLLBAR_ALWAYS);
-        setHorizontalScrollBarPolicy(HORIZONTAL_SCROLLBAR_ALWAYS);
+        setHorizontalScrollBarPolicy(HORIZONTAL_SCROLLBAR_NEVER);
         setCorner(this.LOWER_RIGHT_CORNER,jumpButton);
         jumpButton.addActionListener(new ActionListener(){