arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-26 17:42:18 +03:00
Code Activity

core/lib installer: bottom of window used only for error messages

Browse Source
This commit is contained in:
Federico Fissore
2015-03-12 12:01:55 +01:00
parent dc27ff8b70
commit d8ef27887e
1 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
app/src/cc/arduino/ui/InstallerJDialog.java
View File

@ -88,7 +88,7 @@ public abstract class InstallerJDialog extends JDialog {
// - Progress bar // - Progress bar
protected ProgressJProgressBar progressBar; protected ProgressJProgressBar progressBar;
protected Box progressBox; protected Box progressBox;
protected Box updateBox; protected Box errorMessageBox;
private final JLabel errorMessage; private final JLabel errorMessage;
protected InstallerTableCell cellEditor; protected InstallerTableCell cellEditor;
@ -187,10 +187,20 @@ public abstract class InstallerJDialog extends JDialog {
progressBox.add(Box.createHorizontalStrut(5)); progressBox.add(Box.createHorizontalStrut(5));
progressBox.add(cancelButton); progressBox.add(cancelButton);
updateBox = Box.createHorizontalBox(); JButton dismissErrorMessageButton = new JButton(_("OK"));
updateBox.add(Box.createHorizontalGlue()); dismissErrorMessageButton.addActionListener(new ActionListener() {
updateBox.add(errorMessage); @Override
updateBox.add(Box.createHorizontalGlue()); public void actionPerformed(ActionEvent arg0) {
clearErrorMessage();
}
});
errorMessageBox = Box.createHorizontalBox();
errorMessageBox.add(Box.createHorizontalGlue());
errorMessageBox.add(errorMessage);
errorMessageBox.add(Box.createHorizontalGlue());
errorMessageBox.add(dismissErrorMessageButton);
errorMessageBox.setVisible(false);
} }
{ {
@ -198,7 +208,7 @@ public abstract class InstallerJDialog extends JDialog {
progressPanel.setBorder(new EmptyBorder(7, 7, 7, 7)); progressPanel.setBorder(new EmptyBorder(7, 7, 7, 7));
progressPanel.setLayout(new BoxLayout(progressPanel, BoxLayout.Y_AXIS)); progressPanel.setLayout(new BoxLayout(progressPanel, BoxLayout.Y_AXIS));
progressPanel.add(progressBox); progressPanel.add(progressBox);
progressPanel.add(updateBox); progressPanel.add(errorMessageBox);
pane.add(progressPanel, BorderLayout.SOUTH); pane.add(progressPanel, BorderLayout.SOUTH);
} }
setProgressVisible(false, ""); setProgressVisible(false, "");
@ -224,22 +234,26 @@ public abstract class InstallerJDialog extends JDialog {
public void setErrorMessage(String message) { public void setErrorMessage(String message) {
errorMessage.setText(message); errorMessage.setText(message);
errorMessage.setVisible(true); errorMessageBox.setVisible(true);
} }
public void clearErrorMessage() { public void clearErrorMessage() {
errorMessage.setText(""); errorMessage.setText("");
errorMessage.setVisible(false); errorMessageBox.setVisible(false);
} }
public void setProgressVisible(boolean visible, String status) { public void setProgressVisible(boolean visible, String status) {
if (visible) {
setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
} else {
setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
}
progressBox.setVisible(visible); progressBox.setVisible(visible);
filterField.setEnabled(!visible); filterField.setEnabled(!visible);
categoryChooser.setEnabled(!visible); categoryChooser.setEnabled(!visible);
contribTable.setEnabled(!visible); contribTable.setEnabled(!visible);
updateBox.setVisible(!visible); errorMessageBox.setVisible(false);
updateBox.setEnabled(!visible);
cellEditor.setEnabled(!visible); cellEditor.setEnabled(!visible);
cellEditor.setStatus(status); cellEditor.setStatus(status);
} }