mirror of
https://github.com/arduino/Arduino.git
synced 2025-03-15 12:29:26 +01:00
Moving some other graphic related parts into GUI initialization
This commit is contained in:
parent
cf54cce660
commit
b73bc92a5c
@ -202,22 +202,11 @@ public class Base {
|
|||||||
|
|
||||||
SplashScreenHelper splash;
|
SplashScreenHelper splash;
|
||||||
if (parser.isGuiMode()) {
|
if (parser.isGuiMode()) {
|
||||||
|
// Setup all notification widgets
|
||||||
splash = new SplashScreenHelper(SplashScreen.getSplashScreen());
|
splash = new SplashScreenHelper(SplashScreen.getSplashScreen());
|
||||||
} else {
|
BaseNoGui.notifier = new GUIUserNotifier(this);
|
||||||
splash = new SplashScreenHelper(null);
|
|
||||||
}
|
|
||||||
|
|
||||||
splash.splashText(tr("Loading configuration..."));
|
// Setup the theme coloring fun
|
||||||
|
|
||||||
BaseNoGui.initVersion();
|
|
||||||
|
|
||||||
// Use native popups so they don't look so crappy on osx
|
|
||||||
JPopupMenu.setDefaultLightWeightPopupEnabled(false);
|
|
||||||
|
|
||||||
// Don't put anything above this line that might make GUI,
|
|
||||||
// because the platform has to be inited properly first.
|
|
||||||
|
|
||||||
// setup the theme coloring fun
|
|
||||||
Theme.init();
|
Theme.init();
|
||||||
System.setProperty("swing.aatext", PreferencesData.get("editor.antialias", "true"));
|
System.setProperty("swing.aatext", PreferencesData.get("editor.antialias", "true"));
|
||||||
|
|
||||||
@ -228,12 +217,23 @@ public class Base {
|
|||||||
// ignore
|
// ignore
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Use native popups so they don't look so crappy on osx
|
||||||
|
JPopupMenu.setDefaultLightWeightPopupEnabled(false);
|
||||||
|
} else {
|
||||||
|
splash = new SplashScreenHelper(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
splash.splashText(tr("Loading configuration..."));
|
||||||
|
|
||||||
|
BaseNoGui.initVersion();
|
||||||
|
|
||||||
|
// Don't put anything above this line that might make GUI,
|
||||||
|
// because the platform has to be inited properly first.
|
||||||
|
|
||||||
// Create a location for untitled sketches
|
// Create a location for untitled sketches
|
||||||
untitledFolder = FileUtils.createTempFolder("untitled" + new Random().nextInt(Integer.MAX_VALUE), ".tmp");
|
untitledFolder = FileUtils.createTempFolder("untitled" + new Random().nextInt(Integer.MAX_VALUE), ".tmp");
|
||||||
DeleteFilesOnShutdown.add(untitledFolder);
|
DeleteFilesOnShutdown.add(untitledFolder);
|
||||||
|
|
||||||
BaseNoGui.notifier = new GUIUserNotifier(this);
|
|
||||||
|
|
||||||
BaseNoGui.checkInstallationFolder();
|
BaseNoGui.checkInstallationFolder();
|
||||||
|
|
||||||
// If no path is set, get the default sketchbook folder for this platform
|
// If no path is set, get the default sketchbook folder for this platform
|
||||||
|
Loading…
x
Reference in New Issue
Block a user