Skip to content

Commit 7816ee3

Browse files
author
Federico Fissore
committed
New Preferences window: renders fine on every OS and it's easier to adapt using NetBeans as visual editor. Fixes #3140
1 parent 40c0741 commit 7816ee3

File tree

9 files changed

+1457
-17
lines changed

9 files changed

+1457
-17
lines changed

app/src/cc/arduino/view/SplashScreenHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public void close() {
8989
splash.close();
9090
}
9191

92-
public void printText(String str) {
92+
private void printText(String str) {
9393
System.out.println(str);
9494
}
9595

app/src/cc/arduino/view/StubMenuListener.java

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,32 @@
1+
/*
2+
* This file is part of Arduino.
3+
*
4+
* Copyright 2015 Arduino LLC (http://www.arduino.cc/)
5+
*
6+
* Arduino is free software; you can redistribute it and/or modify
7+
* it under the terms of the GNU General Public License as published by
8+
* the Free Software Foundation; either version 2 of the License, or
9+
* (at your option) any later version.
10+
*
11+
* This program is distributed in the hope that it will be useful,
12+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
* GNU General Public License for more details.
15+
*
16+
* You should have received a copy of the GNU General Public License
17+
* along with this program; if not, write to the Free Software
18+
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
19+
*
20+
* As a special exception, you may use this file as part of a free software
21+
* library without restriction. Specifically, if other files instantiate
22+
* templates or use macros or inline functions from this file, or you compile
23+
* this file and link it with other files to produce an executable, this
24+
* file does not by itself cause the resulting executable to be covered by
25+
* the GNU General Public License. This exception does not however
26+
* invalidate any other reasons why the executable file might be covered by
27+
* the GNU General Public License.
28+
*/
29+
130
package cc.arduino.view;
231

332
import javax.swing.event.MenuEvent;

app/src/cc/arduino/view/preferences/AdditionalBoardsManagerURLTextArea.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import com.google.common.collect.FluentIterable;
3636
import processing.app.Base;
3737

38+
import java.awt.*;
3839
import java.awt.event.ActionEvent;
3940
import java.awt.event.ActionListener;
4041
import java.awt.event.WindowEvent;
@@ -47,7 +48,7 @@ public class AdditionalBoardsManagerURLTextArea extends javax.swing.JDialog {
4748

4849
private ActionListener onOkListener;
4950

50-
public AdditionalBoardsManagerURLTextArea(java.awt.Frame parent) {
51+
public AdditionalBoardsManagerURLTextArea(Window parent) {
5152
super(parent);
5253
initComponents();
5354
setLocationRelativeTo(parent);

app/src/cc/arduino/view/preferences/Preferences.form

Lines changed: 634 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)