mirror of
https://github.com/processing/processing4.git
synced 2026-02-12 18:10:43 +01:00
finishing up with breaking the build
This commit is contained in:
@@ -136,7 +136,7 @@ public class PdePreferences extends JComponent {
|
||||
}
|
||||
|
||||
} catch (Exception e) {
|
||||
System.err.println("Error reading pde.properties");
|
||||
System.err.println("Error reading default settings");
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
@@ -238,13 +238,13 @@ public class PdePreferences extends JComponent {
|
||||
|
||||
externalEditorBox = new JCheckBox("Use external editor");
|
||||
pain.add(externalEditorBox);
|
||||
d = newSketchPromptBox.getPreferredSize();
|
||||
newSketchPromptBox.setBounds(left, top, d.width, d.height);
|
||||
d = externalEditorBox.getPreferredSize();
|
||||
externalEditorBox.setBounds(left, top, d.width, d.height);
|
||||
right = Math.max(right, left + d.width);
|
||||
top += d.height + BETWEEN;
|
||||
|
||||
|
||||
//
|
||||
// More preferences are in the ...
|
||||
|
||||
String blather =
|
||||
"More preferences are in the 'lib' folder inside text files\n" +
|
||||
@@ -261,6 +261,9 @@ public class PdePreferences extends JComponent {
|
||||
textarea.setBounds(left, top, d.width, d.height);
|
||||
top += d.height + BETWEEN;
|
||||
|
||||
// OK Cancel
|
||||
|
||||
|
||||
//
|
||||
|
||||
wide = right + BIG;
|
||||
@@ -338,12 +341,6 @@ public class PdePreferences extends JComponent {
|
||||
windowX = -1;
|
||||
}
|
||||
|
||||
String name = skprops.getProperty("sketch.name");
|
||||
String path = skprops.getProperty("sketch.directory");
|
||||
String user = skprops.getProperty("user.name");
|
||||
|
||||
String what = path + File.separator + name + ".pde";
|
||||
|
||||
if (windowX != -1) {
|
||||
String dividerLocation =
|
||||
skprops.getProperty("editor.divider.location");
|
||||
@@ -352,6 +349,14 @@ public class PdePreferences extends JComponent {
|
||||
}
|
||||
}
|
||||
|
||||
//
|
||||
|
||||
String name = skprops.getProperty("sketch.name");
|
||||
String path = skprops.getProperty("sketch.directory");
|
||||
//String user = skprops.getProperty("user.name");
|
||||
|
||||
String what = path + File.separator + name + ".pde";
|
||||
|
||||
if (new File(what).exists()) {
|
||||
userName = user;
|
||||
skOpen(path, name);
|
||||
@@ -361,6 +366,8 @@ public class PdePreferences extends JComponent {
|
||||
skNew();
|
||||
}
|
||||
|
||||
//
|
||||
|
||||
String serialPort = skprops.getProperty("serial.port");
|
||||
if (serialPort != null) {
|
||||
properties.put("serial.port", serialPort);
|
||||
|
||||
Reference in New Issue
Block a user