rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-29 18:52:13 +01:00
Code Issues Releases Activity

MacOSX: removed old Quaqua references

Browse Source
This commit is contained in:
Federico Fissore 2015-07-08 17:21:24 +02:00
parent a9d10e069d
commit 110a6e20d4
3 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/build.xml
View File

@ -111,7 +111,6 @@
<classpath>
<pathelement location="bin"/>
<pathelement location="test-bin"/>
<pathelement path="../build/macosx/work/Arduino.app/Contents/Resources/Java/quaqua.jar"/>
<path refid="class.path.test"/>
</classpath>

16
app/src/processing/app/Base.java
View File

@ -213,12 +213,7 @@ public class Base {
try {
BaseNoGui.getPlatform().setLookAndFeel();
} catch (Exception e) {
String mess = e.getMessage();
if (mess.indexOf("ch.randelshofer.quaqua.QuaquaLookAndFeel") == -1) {
System.err.println(_("Non-fatal error while setting the Look & Feel."));
System.err.println(_("The error message follows, however Arduino should run fine."));
System.err.println(mess);
}
// ignore
}
// Create a location for untitled sketches
@ -2068,8 +2063,6 @@ public class Base {
// }
} else {
// Pane formatting adapted from the Quaqua guide
// http://www.randelshofer.ch/quaqua/guide/joptionpane.html
JOptionPane pane =
new JOptionPane("<html> " +
"<head> <style type=\"text/css\">" +
@ -2089,11 +2082,6 @@ public class Base {
// highlight the safest option ala apple hig
pane.setInitialValue(options[0]);
// on macosx, setting the destructive property places this option
// away from the others at the lefthand side
pane.putClientProperty("Quaqua.OptionPane.destructiveOption",
new Integer(2));
JDialog dialog = pane.createDialog(editor, null);
dialog.setVisible(true);
@ -2133,8 +2121,6 @@ public class Base {
JOptionPane.YES_NO_OPTION,
JOptionPane.QUESTION_MESSAGE);
} else {
// Pane formatting adapted from the Quaqua guide
// http://www.randelshofer.ch/quaqua/guide/joptionpane.html
JOptionPane pane =
new JOptionPane("<html> " +
"<head> <style type=\"text/css\">" +

7
app/src/processing/app/Editor.java
View File

@ -2082,8 +2082,6 @@ public class Editor extends JFrame implements RunnerListener {
// suck--workarounds for the Mac and Apple's snobby attitude about it!
// I think it's nifty that they treat their developers like dirt.
// Pane formatting adapted from the quaqua guide
// http://www.randelshofer.ch/quaqua/guide/joptionpane.html
JOptionPane pane =
new JOptionPane(_("<html> " +
"<head> <style type=\"text/css\">"+
@ -2103,11 +2101,6 @@ public class Editor extends JFrame implements RunnerListener {
// highlight the safest option ala apple hig
pane.setInitialValue(options[0]);
// on macosx, setting the destructive property places this option
// away from the others at the lefthand side
pane.putClientProperty("Quaqua.OptionPane.destructiveOption",
2);
JDialog dialog = pane.createDialog(this, null);
dialog.setVisible(true);