* Bug #13194 fixed - part help page improved.
+* Bug #13199 fixed - There was a thin blue line around acknowledgements button in about box.
+
* Bug #13200 fixed - about() ACKNOWLEDGEMENTS did not render utf-8 characters.
* Bug #13201 fixed - x_mdialog entries had no margin.
* Display the about box
*/
public static void displayAndWait() {
-
String filename = SCIDIR + "/ACKNOWLEDGEMENTS"; // Source version
if (!new File(filename).exists()) {
filename = SCIDIR + "/../../ACKNOWLEDGEMENTS"; // Linux binary
// version
}
- createAboutBox(Messages.gettext("About Scilab..."), filename);
+ if (SwingUtilities.isEventDispatchThread()) {
+ createAboutBox(Messages.gettext("About Scilab..."), filename);
+ } else {
+ final String fname = filename;
+ try {
+ SwingUtilities.invokeAndWait(new Runnable() {
+ public void run() {
+ createAboutBox(Messages.gettext("About Scilab..."), fname);
+ }
+ });
+ } catch (Exception e) { }
+ }
}
/**
ScilabSwingUtilities.closeOnEscape(aboutBox);
- aboutBox.setContentPane(new AboutPanel(aboutBox, ackFile));
+ AboutPanel ap = new AboutPanel(aboutBox, ackFile);
+ aboutBox.setContentPane(ap);
aboutBox.setResizable(false);
/*
/ 2 - (aboutBox.getHeight() / 2));
}
aboutBox.setVisible(true);
+ ap.close.requestFocus();
}
@SuppressWarnings("serial")
private JScrollPane ackScrollPane;
private JTextPane ackText;
private JToggleButton acknowledgements;
- private JButton close;
+ JButton close;
private JPanel topPane;
}
}