git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-4298 comment markers
[jalview.git]
/
src
/
jalview
/
gui
/
SplashScreen.java
diff --git
a/src/jalview/gui/SplashScreen.java
b/src/jalview/gui/SplashScreen.java
index
97de08a
..
1060d8a
100755
(executable)
--- a/
src/jalview/gui/SplashScreen.java
+++ b/
src/jalview/gui/SplashScreen.java
@@
-114,6
+114,10
@@
public class SplashScreen extends JPanel
public SplashScreen(boolean isTransient)
{
this.transientDialog = isTransient;
public SplashScreen(boolean isTransient)
{
this.transientDialog = isTransient;
+ if (this.transientDialog)
+ {
+ Desktop.instance.acquireDialogQueue();
+ }
if (Platform.isJS()) // BH 2019
{
if (Platform.isJS()) // BH 2019
{
@@
-171,7
+175,7
@@
public class SplashScreen extends JPanel
}
if (mt.isErrorAny())
{
}
if (mt.isErrorAny())
{
- System.err.println("Error when loading images!");
+ jalview.bin.Console.errPrintln("Error when loading images!");
}
} while (!mt.checkAll());
Desktop.instance.setIconImages(ChannelProperties.getIconList());
}
} while (!mt.checkAll());
Desktop.instance.setIconImages(ChannelProperties.getIconList());
@@
-227,7
+231,8
@@
public class SplashScreen extends JPanel
protected boolean refreshText()
{
String newtext = Desktop.instance.getAboutMessage();
protected boolean refreshText()
{
String newtext = Desktop.instance.getAboutMessage();
- // System.err.println("Text found: \n"+newtext+"\nEnd of newtext.");
+ // jalview.bin.Console.errPrintln("Text found: \n"+newtext+"\nEnd of
+ // newtext.");
if (oldTextLength != newtext.length())
{
iframe.setVisible(false);
if (oldTextLength != newtext.length())
{
iframe.setVisible(false);
@@
-267,7
+272,7
@@
public class SplashScreen extends JPanel
splashText.setVisible(true);
splashText.setSize(new Dimension(750,
splashText.setVisible(true);
splashText.setSize(new Dimension(750,
- 375 + logoSize + (Platform.isJS() ? 40 : 0)));
+ 425 + logoSize + (Platform.isJS() ? 40 : 0)));
splashText.setBackground(bg);
splashText.setForeground(fg);
splashText.setFont(font);
splashText.setBackground(bg);
splashText.setForeground(fg);
splashText.setFont(font);
@@
-323,7
+328,6
@@
public class SplashScreen extends JPanel
}
closeSplash();
}
closeSplash();
- Desktop.instance.startDialogQueue();
}
/**
}
/**
@@
-331,10
+335,14
@@
public class SplashScreen extends JPanel
*/
public void closeSplash()
{
*/
public void closeSplash()
{
+ if (this.transientDialog)
+ {
+ Desktop.instance.releaseDialogQueue();
+ }
try
{
try
{
- iframe.setClosed(true);
+ iframe.setClosed(true); // ##### implicated BLOCKED
} catch (Exception ex)
{
}
} catch (Exception ex)
{
}