Changeset 17578 for release-kits
- Timestamp:
- 2008-10-23T10:58:03+13:00 (15 years ago)
- Location:
- release-kits/shared/ant-installer
- Files:
-
- 2 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
release-kits/shared/ant-installer/src/org/tp23/antinstaller/input/InputField.java
r17517 r17578 45 45 if( org.tp23.antinstaller.Installer.langPack != null){ 46 46 try { 47 String r = org.tp23.antinstaller.Installer.langPack.getString(getProperty() + ".displayText");47 String r = org.tp23.antinstaller.Installer.langPack.getString(getProperty().replaceAll(" ","_") + ".displayText"); 48 48 return r; 49 49 } catch (MissingResourceException e) {} … … 54 54 if( org.tp23.antinstaller.Installer.langPack != null ) { 55 55 try { 56 return org.tp23.antinstaller.Installer.langPack.getString(getProperty() + ".explanatoryText");56 return org.tp23.antinstaller.Installer.langPack.getString(getProperty().replaceAll(" ","_") + ".explanatoryText"); 57 57 } catch (MissingResourceException e) { 58 58 // ignore and return null explanatoryText is optional -
release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/swing/ProgressPageRenderer.java
r17569 r17578 27 27 import javax.swing.BorderFactory; 28 28 import javax.swing.JLabel; 29 import javax.swing.JButton; 29 30 import javax.swing.JPanel; 30 31 import javax.swing.JScrollPane; 31 32 import javax.swing.JTabbedPane; 32 33 import javax.swing.JToggleButton; 34 import javax.swing.ImageIcon; 33 35 34 36 import org.tp23.antinstaller.page.ProgressPage; … … 56 58 private JToggleButton jToggleButton = new JToggleButton(); 57 59 private JLabel feedBackLabel = new JLabel(); 60 private JLabel progressOn = null; 61 private JLabel progressOff = null; 62 private JPanel messagesLeft = null; 63 private JPanel messagesRight = null; 58 64 59 65 private SystemOutJTextArea outPanel = new SystemOutJTextArea(); … … 100 106 this.add(contentPanel,BorderLayout.CENTER); 101 107 102 messagesPanel.setLayout(null); 103 Dimension messPanelSize = new Dimension(SizeConstants.PAGE_WIDTH,MESSAGE_PANEL_HEIGHT); 104 messagesPanel.setSize(messPanelSize); 105 messagesPanel.setPreferredSize(messPanelSize); 106 messagesPanel.setMaximumSize(messPanelSize); 107 messagesPanel.setMinimumSize(messPanelSize); 108 messagesPanel.setLayout( new BorderLayout() ); 109 //Dimension messPanelSize = new Dimension(SizeConstants.PAGE_WIDTH,MESSAGE_PANEL_HEIGHT); 110 //messagesPanel.setSize(messPanelSize); 111 //messagesPanel.setPreferredSize(messPanelSize); 112 //messagesPanel.setMaximumSize(messPanelSize); 113 //messagesPanel.setMinimumSize(messPanelSize); 114 115 ImageIcon progressOnIcon = createImageIcon("/resources/progressOn.gif"); 116 progressOn = new JLabel( progressOnIcon ); 117 progressOnIcon.setImageObserver(progressOn); 118 progressOff = new JLabel( createImageIcon("/resources/progressOff.gif") ); 108 119 109 120 //FIXME not i18n properly since the sentence is not correct ordering in German 110 121 feedBackLabel.setText(org.tp23.antinstaller.Installer.langPack.getString("click")+" "+ctx.getInstaller().getFinishButtonText()+" "+org.tp23.antinstaller.Installer.langPack.getString("toContinue")); 111 feedBackLabel.setBounds(new Rectangle(115, 7, 272, 22));122 //feedBackLabel.setBounds(new Rectangle(115, 7, 272, 22)); 112 123 jToggleButton.setText(org.tp23.antinstaller.Installer.langPack.getString("showDetails")); 113 jToggleButton.setBounds(new Rectangle(5, 7, 104, 22)); 114 jToggleButton.setMargin(new Insets(0,0,0,0)); 115 messagesPanel.add(jToggleButton, null); 116 messagesPanel.add(feedBackLabel, null); 124 //jToggleButton.setBounds(new Rectangle(5, 7, 104, 22)); 125 //jToggleButton.setMargin(new Insets(0,0,0,0)); 126 127 messagesLeft = new JPanel(); 128 messagesLeft.add(jToggleButton, null); 129 messagesLeft.add(feedBackLabel, null); 130 131 messagesRight = new JPanel(); 132 messagesRight.add( progressOff ); 133 134 messagesPanel.add(messagesLeft, BorderLayout.WEST); 135 messagesPanel.add(messagesRight, BorderLayout.EAST); 136 117 137 jToggleButton.addActionListener(new ActionListener(){ 118 138 public void actionPerformed(ActionEvent e) { … … 152 172 // } 153 173 174 154 175 //jTabbedPane.setVisible(false); 155 176 jTabbedPane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5)); … … 164 185 this.getFinishButton().setText(ctx.getInstaller().getFinishButtonText()); 165 186 this.getFinishButton().setVisible(true); 187 this.getFinishButton().addActionListener( 188 new ActionListener() { 189 public void actionPerformed( ActionEvent e ) { 190 messagesRight.removeAll(); 191 messagesRight.add( progressOn ); 192 } 193 } 194 ); 195 166 196 } 167 197 … … 202 232 public void updateDefaultValues() { 203 233 } 234 235 /** Returns an ImageIcon, or null if the path was invalid. */ 236 protected static ImageIcon createImageIcon(String path) { 237 java.net.URL imgURL = org.tp23.antinstaller.Installer.class.getResource(path); 238 if (imgURL != null) { 239 return new ImageIcon(imgURL); 240 } else { 241 System.err.println("Couldn't find file: " + path); 242 return null; 243 } 244 } 245 246 public void stopPage() { 247 messagesRight.removeAll(); 248 messagesRight.add( progressOff ); 249 } 250 204 251 } -
release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/swing/SwingPageRenderer.java
r17517 r17578 175 175 } 176 176 177 public void stopPage() {} 178 177 179 private void setImage(String resource) throws Exception{ 178 180 if(resource == null){ -
release-kits/shared/ant-installer/src/org/tp23/antinstaller/runtime/SwingRunner.java
r17517 r17578 341 341 renderer.getFinishButton().requestFocus(); 342 342 renderer.getTitleLabel().setText(org.tp23.antinstaller.Installer.langPack.getString("complete")); 343 renderer.stopPage(); 343 344 ctx.getAntOutputRenderer().getErr().flush(); 344 345 ctx.getAntOutputRenderer().getOut().flush(); … … 356 357 renderer.getFinishButton().setEnabled(true); 357 358 renderer.getFinishButton().requestFocus(); 359 renderer.stopPage(); 358 360 renderer.getTitleLabel().setText(org.tp23.antinstaller.Installer.langPack.getString("failed")); 359 361 }
Note:
See TracChangeset
for help on using the changeset viewer.