Changeset 17578 for release-kits

Timestamp:

2008-10-23T10:58:03+13:00 (16 years ago)

Author:

oranfry

Message:

more HCI changes to the installer: an animated activity indicator during install, better target names for the greenstone2 installers

Location:

release-kits/shared/ant-installer

Files:

• lib/ant-installer.jar (modified) ( previous)
• src/org/tp23/antinstaller/input/InputField.java (modified) (2 diffs)
• src/org/tp23/antinstaller/renderer/swing/ProgressPageRenderer.java (modified) (6 diffs)
• src/org/tp23/antinstaller/renderer/swing/SwingPageRenderer.java (modified) (1 diff)
• src/org/tp23/antinstaller/runtime/SwingRunner.java (modified) (2 diffs)
• src/resources/progressOff.gif (added)
• src/resources/progressOn.gif (added)

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

@@ -45 +45 @@
         if( org.tp23.antinstaller.Installer.langPack != null){
             try {
-                String r = org.tp23.antinstaller.Installer.langPack.getString(getProperty() + ".displayText");
+                String r = org.tp23.antinstaller.Installer.langPack.getString(getProperty().replaceAll(" ","_") + ".displayText");
                 return r;
             } catch (MissingResourceException e) {}
@@ -54 +54 @@
         if( org.tp23.antinstaller.Installer.langPack != null ) {
             try {
-                return org.tp23.antinstaller.Installer.langPack.getString(getProperty() + ".explanatoryText");
+                return org.tp23.antinstaller.Installer.langPack.getString(getProperty().replaceAll(" ","_") + ".explanatoryText");
             } catch (MissingResourceException e) {
                 // ignore and return null explanatoryText is optional

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

@@ -27 +27 @@
 import javax.swing.BorderFactory;
 import javax.swing.JLabel;
+import javax.swing.JButton;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTabbedPane;
 import javax.swing.JToggleButton;
+import javax.swing.ImageIcon;
 
 import org.tp23.antinstaller.page.ProgressPage;
@@ -56 +58 @@
     private JToggleButton jToggleButton = new JToggleButton();
     private JLabel feedBackLabel = new JLabel();
+    private JLabel progressOn = null;
+    private JLabel progressOff = null;
+    private JPanel messagesLeft = null;
+    private JPanel messagesRight = null;
 
     private SystemOutJTextArea outPanel = new SystemOutJTextArea();
@@ -100 +106 @@
         this.add(contentPanel,BorderLayout.CENTER);
         
-        messagesPanel.setLayout(null);
-        Dimension messPanelSize = new Dimension(SizeConstants.PAGE_WIDTH,MESSAGE_PANEL_HEIGHT);
-        messagesPanel.setSize(messPanelSize);
-        messagesPanel.setPreferredSize(messPanelSize);
-        messagesPanel.setMaximumSize(messPanelSize);
-        messagesPanel.setMinimumSize(messPanelSize);
+        messagesPanel.setLayout( new BorderLayout() );
+        //Dimension messPanelSize = new Dimension(SizeConstants.PAGE_WIDTH,MESSAGE_PANEL_HEIGHT);
+        //messagesPanel.setSize(messPanelSize);
+        //messagesPanel.setPreferredSize(messPanelSize);
+        //messagesPanel.setMaximumSize(messPanelSize);
+        //messagesPanel.setMinimumSize(messPanelSize);
+
+        ImageIcon progressOnIcon = createImageIcon("/resources/progressOn.gif");
+        progressOn = new JLabel( progressOnIcon );
+        progressOnIcon.setImageObserver(progressOn);
+        progressOff = new JLabel( createImageIcon("/resources/progressOff.gif") );
 
         //FIXME not i18n properly since the sentence is not correct ordering in German
         feedBackLabel.setText(org.tp23.antinstaller.Installer.langPack.getString("click")+" "+ctx.getInstaller().getFinishButtonText()+" "+org.tp23.antinstaller.Installer.langPack.getString("toContinue"));
-        feedBackLabel.setBounds(new Rectangle(115, 7, 272, 22));
+        //feedBackLabel.setBounds(new Rectangle(115, 7, 272, 22));
         jToggleButton.setText(org.tp23.antinstaller.Installer.langPack.getString("showDetails"));
-        jToggleButton.setBounds(new Rectangle(5, 7, 104, 22));
-        jToggleButton.setMargin(new Insets(0,0,0,0));
-        messagesPanel.add(jToggleButton, null);
-        messagesPanel.add(feedBackLabel, null);
+        //jToggleButton.setBounds(new Rectangle(5, 7, 104, 22));
+        //jToggleButton.setMargin(new Insets(0,0,0,0));
+
+        messagesLeft = new JPanel();
+        messagesLeft.add(jToggleButton, null);
+        messagesLeft.add(feedBackLabel, null);
+
+        messagesRight = new JPanel();
+        messagesRight.add( progressOff );
+
+        messagesPanel.add(messagesLeft, BorderLayout.WEST);
+        messagesPanel.add(messagesRight, BorderLayout.EAST);
+        
         jToggleButton.addActionListener(new ActionListener(){
             public void actionPerformed(ActionEvent e) {
@@ -152 +172 @@
 //      }
 
+
         //jTabbedPane.setVisible(false);
         jTabbedPane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
@@ -164 +185 @@
         this.getFinishButton().setText(ctx.getInstaller().getFinishButtonText());
         this.getFinishButton().setVisible(true);
+        this.getFinishButton().addActionListener(
+            new ActionListener() {
+                public void actionPerformed( ActionEvent e ) {
+                    messagesRight.removeAll();
+                    messagesRight.add( progressOn );
+                }
+            }
+        );
+
     }
 
@@ -202 +232 @@
     public void updateDefaultValues() {
     }
+
+    /** 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;
+        }
+    }
+
+    public void stopPage() {
+        messagesRight.removeAll();
+        messagesRight.add( progressOff );
+    }
+
 }

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

@@ -175 +175 @@
     }
 
+    public void stopPage() {}
+
     private void setImage(String resource) throws Exception{
         if(resource == null){

release-kits/shared/ant-installer/src/org/tp23/antinstaller/runtime/SwingRunner.java

@@ -341 +341 @@
         renderer.getFinishButton().requestFocus();
         renderer.getTitleLabel().setText(org.tp23.antinstaller.Installer.langPack.getString("complete"));
+        renderer.stopPage();
         ctx.getAntOutputRenderer().getErr().flush();
         ctx.getAntOutputRenderer().getOut().flush();
@@ -356 +357 @@
             renderer.getFinishButton().setEnabled(true);
             renderer.getFinishButton().requestFocus();
+            renderer.stopPage();
             renderer.getTitleLabel().setText(org.tp23.antinstaller.Installer.langPack.getString("failed"));
         }