rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-03-15 12:29:26 +01:00
Code Issues Releases Activity

Preferences: added proxy settings

Browse Source
This commit is contained in:
Federico Fissore 2015-03-17 11:40:58 +01:00
parent 9add5f74e7
commit 4db6c737be
3 changed files with 193 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

217
app/src/processing/app/Preferences.java
View File

@ -21,40 +21,19 @@
package processing.app; package processing.app;
import static processing.app.I18n._;
import java.awt.Color;
import java.awt.Container;
import java.awt.Dimension;
import java.awt.Font;
import java.awt.Insets;
import java.awt.SystemColor;
import java.awt.Toolkit;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.io.File;
import javax.swing.Box;
import javax.swing.JButton;
import javax.swing.JCheckBox;
import javax.swing.JComboBox;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JTextField;
import javax.swing.KeyStroke;
import processing.app.helpers.FileUtils; import processing.app.helpers.FileUtils;
import processing.app.helpers.OSUtils; import processing.app.helpers.OSUtils;
import processing.app.helpers.PreferencesHelper; import processing.app.helpers.PreferencesHelper;
import processing.app.helpers.PreferencesMap; import processing.app.helpers.PreferencesMap;
import processing.app.legacy.PApplet; import processing.app.legacy.PApplet;
import javax.swing.*;
import java.awt.*;
import java.awt.event.*;
import java.io.File;
import static processing.app.I18n._;
/** /**
* Storage class for user preferences and environment settings. * Storage class for user preferences and environment settings.
@ -236,6 +215,10 @@ public class Preferences {
JCheckBox autoAssociateBox; JCheckBox autoAssociateBox;
JComboBox comboLanguage; JComboBox comboLanguage;
JCheckBox saveVerifyUploadBox; JCheckBox saveVerifyUploadBox;
JTextField proxyServer;
JTextField proxyPort;
JTextField proxyUser;
JPasswordField proxyPassword;
// the calling editor, so updates can be applied // the calling editor, so updates can be applied
@ -260,8 +243,8 @@ public class Preferences {
dialog = new JFrame(_("Preferences")); dialog = new JFrame(_("Preferences"));
dialog.setResizable(false); dialog.setResizable(false);
Container pain = dialog.getContentPane(); Container pane = dialog.getContentPane();
pain.setLayout(null); pane.setLayout(null);
int top = GUI_BIG; int top = GUI_BIG;
int left = GUI_BIG; int left = GUI_BIG;
@ -278,13 +261,13 @@ public class Preferences {
// [...............................] [ Browse ] // [...............................] [ Browse ]
label = new JLabel(_("Sketchbook location:")); label = new JLabel(_("Sketchbook location:"));
pain.add(label); pane.add(label);
d = label.getPreferredSize(); d = label.getPreferredSize();
label.setBounds(left, top, d.width, d.height); label.setBounds(left, top, d.width, d.height);
top += d.height; // + GUI_SMALL; top += d.height; // + GUI_SMALL;
sketchbookLocationField = new JTextField(40); sketchbookLocationField = new JTextField(40);
pain.add(sketchbookLocationField); pane.add(sketchbookLocationField);
d = sketchbookLocationField.getPreferredSize(); d = sketchbookLocationField.getPreferredSize();
button = new JButton(I18n.PROMPT_BROWSE); button = new JButton(I18n.PROMPT_BROWSE);
@ -305,7 +288,7 @@ public class Preferences {
} }
} }
}); });
pain.add(button); pane.add(button);
d2 = button.getPreferredSize(); d2 = button.getPreferredSize();
// take max height of all components to vertically align em // take max height of all components to vertically align em
@ -333,7 +316,7 @@ public class Preferences {
box.add(comboLanguage); box.add(comboLanguage);
label = new JLabel(_(" (requires restart of Arduino)")); label = new JLabel(_(" (requires restart of Arduino)"));
box.add(label); box.add(label);
pain.add(box); pane.add(box);
d = box.getPreferredSize(); d = box.getPreferredSize();
box.setForeground(Color.gray); box.setForeground(Color.gray);
box.setBounds(left, top, d.width, d.height); box.setBounds(left, top, d.width, d.height);
@ -349,7 +332,7 @@ public class Preferences {
box.add(fontSizeField); box.add(fontSizeField);
label = new JLabel(_(" (requires restart of Arduino)")); label = new JLabel(_(" (requires restart of Arduino)"));
box.add(label); box.add(label);
pain.add(box); pane.add(box);
d = box.getPreferredSize(); d = box.getPreferredSize();
box.setBounds(left, top, d.width, d.height); box.setBounds(left, top, d.width, d.height);
Font editorFont = Preferences.getFont("editor.font"); Font editorFont = Preferences.getFont("editor.font");
@ -366,7 +349,7 @@ public class Preferences {
box.add(verboseCompilationBox); box.add(verboseCompilationBox);
verboseUploadBox = new JCheckBox(_("upload")); verboseUploadBox = new JCheckBox(_("upload"));
box.add(verboseUploadBox); box.add(verboseUploadBox);
pain.add(box); pane.add(box);
d = box.getPreferredSize(); d = box.getPreferredSize();
box.setBounds(left, top, d.width, d.height); box.setBounds(left, top, d.width, d.height);
top += d.height + GUI_BETWEEN; top += d.height + GUI_BETWEEN;
@ -374,7 +357,7 @@ public class Preferences {
// [ ] Display line numbers // [ ] Display line numbers
displayLineNumbersBox = new JCheckBox(_("Display line numbers")); displayLineNumbersBox = new JCheckBox(_("Display line numbers"));
pain.add(displayLineNumbersBox); pane.add(displayLineNumbersBox);
d = displayLineNumbersBox.getPreferredSize(); d = displayLineNumbersBox.getPreferredSize();
displayLineNumbersBox.setBounds(left, top, d.width + 10, d.height); displayLineNumbersBox.setBounds(left, top, d.width + 10, d.height);
right = Math.max(right, left + d.width); right = Math.max(right, left + d.width);
@ -383,7 +366,7 @@ public class Preferences {
// [ ] Verify code after upload // [ ] Verify code after upload
verifyUploadBox = new JCheckBox(_("Verify code after upload")); verifyUploadBox = new JCheckBox(_("Verify code after upload"));
pain.add(verifyUploadBox); pane.add(verifyUploadBox);
d = verifyUploadBox.getPreferredSize(); d = verifyUploadBox.getPreferredSize();
verifyUploadBox.setBounds(left, top, d.width + 10, d.height); verifyUploadBox.setBounds(left, top, d.width + 10, d.height);
right = Math.max(right, left + d.width); right = Math.max(right, left + d.width);
@ -392,7 +375,7 @@ public class Preferences {
// [ ] Use external editor // [ ] Use external editor
externalEditorBox = new JCheckBox(_("Use external editor")); externalEditorBox = new JCheckBox(_("Use external editor"));
pain.add(externalEditorBox); pane.add(externalEditorBox);
d = externalEditorBox.getPreferredSize(); d = externalEditorBox.getPreferredSize();
externalEditorBox.setBounds(left, top, d.width + 10, d.height); externalEditorBox.setBounds(left, top, d.width + 10, d.height);
right = Math.max(right, left + d.width); right = Math.max(right, left + d.width);
@ -402,7 +385,7 @@ public class Preferences {
// [ ] Check for updates on startup // [ ] Check for updates on startup
checkUpdatesBox = new JCheckBox(_("Check for updates on startup")); checkUpdatesBox = new JCheckBox(_("Check for updates on startup"));
pain.add(checkUpdatesBox); pane.add(checkUpdatesBox);
d = checkUpdatesBox.getPreferredSize(); d = checkUpdatesBox.getPreferredSize();
checkUpdatesBox.setBounds(left, top, d.width + 10, d.height); checkUpdatesBox.setBounds(left, top, d.width + 10, d.height);
right = Math.max(right, left + d.width); right = Math.max(right, left + d.width);
@ -411,7 +394,7 @@ public class Preferences {
// [ ] Update sketch files to new extension on save (.pde -> .ino) // [ ] Update sketch files to new extension on save (.pde -> .ino)
updateExtensionBox = new JCheckBox(_("Update sketch files to new extension on save (.pde -> .ino)")); updateExtensionBox = new JCheckBox(_("Update sketch files to new extension on save (.pde -> .ino)"));
pain.add(updateExtensionBox); pane.add(updateExtensionBox);
d = updateExtensionBox.getPreferredSize(); d = updateExtensionBox.getPreferredSize();
updateExtensionBox.setBounds(left, top, d.width + 10, d.height); updateExtensionBox.setBounds(left, top, d.width + 10, d.height);
right = Math.max(right, left + d.width); right = Math.max(right, left + d.width);
@ -422,7 +405,7 @@ public class Preferences {
if (OSUtils.isWindows()) { if (OSUtils.isWindows()) {
autoAssociateBox = autoAssociateBox =
new JCheckBox(_("Automatically associate .ino files with Arduino")); new JCheckBox(_("Automatically associate .ino files with Arduino"));
pain.add(autoAssociateBox); pane.add(autoAssociateBox);
d = autoAssociateBox.getPreferredSize(); d = autoAssociateBox.getPreferredSize();
autoAssociateBox.setBounds(left, top, d.width + 10, d.height); autoAssociateBox.setBounds(left, top, d.width + 10, d.height);
right = Math.max(right, left + d.width); right = Math.max(right, left + d.width);
@ -436,16 +419,24 @@ public class Preferences {
// [ ] save when verifying or uploading // [ ] save when verifying or uploading
saveVerifyUploadBox = new JCheckBox(_("Save when verifying or uploading")); saveVerifyUploadBox = new JCheckBox(_("Save when verifying or uploading"));
pain.add(saveVerifyUploadBox); pane.add(saveVerifyUploadBox);
d = saveVerifyUploadBox.getPreferredSize(); d = saveVerifyUploadBox.getPreferredSize();
saveVerifyUploadBox.setBounds(left, top, d.width + 10, d.height); saveVerifyUploadBox.setBounds(left, top, d.width + 10, d.height);
right = Math.max(right, left + d.width); right = Math.max(right, left + d.width);
top += d.height + GUI_BETWEEN; top += d.height + GUI_BETWEEN;
JPanel proxySettingsContainer = new JPanel();
pane.add(proxySettingsContainer);
setupProxySettingsFieldSet(proxySettingsContainer);
d = proxySettingsContainer.getMinimumSize();
proxySettingsContainer.setBounds(left, top, d.width + 10, d.height);
right = Math.max(right, left + d.width);
top += d.height + GUI_BETWEEN;
// More preferences are in the ... // More preferences are in the ...
label = new JLabel(_("More preferences can be edited directly in the file")); label = new JLabel(_("More preferences can be edited directly in the file"));
pain.add(label); pane.add(label);
d = label.getPreferredSize(); d = label.getPreferredSize();
label.setForeground(Color.gray); label.setForeground(Color.gray);
label.setBounds(left, top, d.width, d.height); label.setBounds(left, top, d.width, d.height);
@ -467,14 +458,14 @@ public class Preferences {
clickable.setForeground(Color.BLACK); clickable.setForeground(Color.BLACK);
} }
}); });
pain.add(label); pane.add(label);
d = label.getPreferredSize(); d = label.getPreferredSize();
label.setBounds(left, top, d.width, d.height); label.setBounds(left, top, d.width, d.height);
right = Math.max(right, left + d.width); right = Math.max(right, left + d.width);
top += d.height; top += d.height;
label = new JLabel(_("(edit only when Arduino is not running)")); label = new JLabel(_("(edit only when Arduino is not running)"));
pain.add(label); pane.add(label);
d = label.getPreferredSize(); d = label.getPreferredSize();
label.setForeground(Color.gray); label.setForeground(Color.gray);
label.setBounds(left, top, d.width, d.height); label.setBounds(left, top, d.width, d.height);
@ -491,7 +482,7 @@ public class Preferences {
disposeFrame(); disposeFrame();
} }
}); });
pain.add(button); pane.add(button);
d2 = button.getPreferredSize(); d2 = button.getPreferredSize();
BUTTON_HEIGHT = d2.height; BUTTON_HEIGHT = d2.height;
@ -505,7 +496,7 @@ public class Preferences {
disposeFrame(); disposeFrame();
} }
}); });
pain.add(button); pane.add(button);
button.setBounds(h, top, BUTTON_WIDTH, BUTTON_HEIGHT); button.setBounds(h, top, BUTTON_WIDTH, BUTTON_HEIGHT);
top += BUTTON_HEIGHT + GUI_BETWEEN; top += BUTTON_HEIGHT + GUI_BETWEEN;
@ -545,7 +536,7 @@ public class Preferences {
// handle window closing commands for ctrl/cmd-W or hitting ESC. // handle window closing commands for ctrl/cmd-W or hitting ESC.
pain.addKeyListener(new KeyAdapter() { pane.addKeyListener(new KeyAdapter() {
public void keyPressed(KeyEvent e) { public void keyPressed(KeyEvent e) {
//System.out.println(e); //System.out.println(e);
KeyStroke wc = Editor.WINDOW_CLOSE_KEYSTROKE; KeyStroke wc = Editor.WINDOW_CLOSE_KEYSTROKE;
@ -557,6 +548,87 @@ public class Preferences {
}); });
} }
@SuppressWarnings("unchecked")
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
private void setupProxySettingsFieldSet(Container pane) {
JPanel proxySettingsPanel = new JPanel();
JLabel jLabel2 = new JLabel();
proxyServer = new JTextField();
JLabel jLabel3 = new JLabel();
proxyPort = new JTextField();
JLabel jLabel4 = new JLabel();
proxyUser = new JTextField();
JLabel jLabel5 = new JLabel();
proxyPassword = new JPasswordField();
proxySettingsPanel.setBorder(BorderFactory.createTitledBorder(_("Proxy Settings")));
jLabel2.setText(_("Server:"));
proxyServer.setColumns(10);
jLabel3.setText(_("Port:"));
proxyPort.setColumns(10);
jLabel4.setText(_("Username:"));
jLabel5.setText(_("Password:"));
GroupLayout proxySettingsPanelLayout = new GroupLayout(proxySettingsPanel);
proxySettingsPanel.setLayout(proxySettingsPanelLayout);
proxySettingsPanelLayout.setHorizontalGroup(
proxySettingsPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
.addGroup(proxySettingsPanelLayout.createSequentialGroup()
.addContainerGap()
.addGroup(proxySettingsPanelLayout.createParallelGroup(GroupLayout.Alignment.TRAILING)
.addComponent(jLabel4)
.addComponent(jLabel2))
.addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
.addGroup(proxySettingsPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING, false)
.addComponent(proxyServer)
.addComponent(proxyUser))
.addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
.addGroup(proxySettingsPanelLayout.createParallelGroup(GroupLayout.Alignment.TRAILING)
.addComponent(jLabel5)
.addComponent(jLabel3))
.addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
.addGroup(proxySettingsPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING, false)
.addComponent(proxyPassword)
.addComponent(proxyPort))
.addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
proxySettingsPanelLayout.setVerticalGroup(
proxySettingsPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
.addGroup(proxySettingsPanelLayout.createSequentialGroup()
.addGroup(proxySettingsPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
.addComponent(jLabel2)
.addComponent(proxyServer, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
.addComponent(jLabel3)
.addComponent(proxyPort, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))
.addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
.addGroup(proxySettingsPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
.addComponent(jLabel4)
.addComponent(proxyUser, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
.addComponent(jLabel5)
.addComponent(proxyPassword, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)))
);
GroupLayout layout = new GroupLayout(pane);
pane.setLayout(layout);
layout.setHorizontalGroup(
layout.createParallelGroup(GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addComponent(proxySettingsPanel, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
layout.setVerticalGroup(
layout.createParallelGroup(GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addComponent(proxySettingsPanel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))
);
}// </editor-fold>//GEN-END:initComponents
// ................................................................. // .................................................................
@ -628,8 +700,7 @@ public class Preferences {
} }
if (autoAssociateBox != null) { if (autoAssociateBox != null) {
PreferencesData.setBoolean("platform.auto_file_type_associations", PreferencesData.setBoolean("platform.auto_file_type_associations", autoAssociateBox.isSelected());
autoAssociateBox.isSelected());
} }
PreferencesData.setBoolean("editor.update_extension", updateExtensionBox.isSelected()); PreferencesData.setBoolean("editor.update_extension", updateExtensionBox.isSelected());
@ -638,6 +709,15 @@ public class Preferences {
Language newLanguage = (Language) comboLanguage.getSelectedItem(); Language newLanguage = (Language) comboLanguage.getSelectedItem();
PreferencesData.set("editor.languages.current", newLanguage.isoCode); PreferencesData.set("editor.languages.current", newLanguage.isoCode);
Preferences.set("proxy.server", proxyServer.getText());
try {
Preferences.set("proxy.port", Integer.valueOf(proxyPort.getText()).toString());
} catch (NumberFormatException e) {
Preferences.remove("proxy.port");
}
Preferences.set("proxy.user", proxyUser.getText());
Preferences.set("proxy.password", new String(proxyPassword.getPassword()));
editor.applyPreferences(); editor.applyPreferences();
} }
@ -658,22 +738,25 @@ public class Preferences {
//sketchCleanBox. //sketchCleanBox.
// setSelected(getBoolean("sketchbook.auto_clean")); // setSelected(getBoolean("sketchbook.auto_clean"));
sketchbookLocationField. sketchbookLocationField.setText(PreferencesData.get("sketchbook.path"));
setText(PreferencesData.get("sketchbook.path")); externalEditorBox.setSelected(PreferencesData.getBoolean("editor.external"));
externalEditorBox. checkUpdatesBox.setSelected(PreferencesData.getBoolean("update.check"));
setSelected(PreferencesData.getBoolean("editor.external")); saveVerifyUploadBox.setSelected(PreferencesData.getBoolean("editor.save_on_verify"));
checkUpdatesBox.
setSelected(PreferencesData.getBoolean("update.check"));
saveVerifyUploadBox.
setSelected(PreferencesData.getBoolean("editor.save_on_verify"));
if (autoAssociateBox != null) { if (autoAssociateBox != null) {
autoAssociateBox. autoAssociateBox.setSelected(PreferencesData.getBoolean("platform.auto_file_type_associations"));
setSelected(PreferencesData.getBoolean("platform.auto_file_type_associations"));
} }
updateExtensionBox.setSelected(PreferencesData.get("editor.update_extension") == null || updateExtensionBox.setSelected(PreferencesData.get("editor.update_extension") == null || PreferencesData.getBoolean("editor.update_extension"));
PreferencesData.getBoolean("editor.update_extension"));
proxyServer.setText(Preferences.get("proxy.server"));
try {
proxyPort.setText(Integer.toString(Preferences.getInteger("proxy.port")));
} catch (NumberFormatException e) {
proxyPort.setText("");
}
proxyUser.setText(Preferences.get("proxy.user"));
proxyPassword.setText(Preferences.get("proxy.password"));
dialog.setLocationRelativeTo(editor); dialog.setLocationRelativeTo(editor);
dialog.setVisible(true); dialog.setVisible(true);
@ -723,6 +806,14 @@ public class Preferences {
return PreferencesData.getInteger(attribute); return PreferencesData.getInteger(attribute);
} }
static public int getInteger(String attribute, int defaultValue) {
if (PreferencesData.has(attribute)) {
return PreferencesData.getInteger(attribute);
}
return defaultValue;
}
static public void setInteger(String key, int value) { static public void setInteger(String key, int value) {
PreferencesData.setInteger(key, value); PreferencesData.setInteger(key, value);

2
arduino-core/src/cc/arduino/packages/contributions/DownloadableContributionsDownloader.java
View File

@ -96,7 +96,7 @@ public class DownloadableContributionsDownloader {
}); });
downloader.download(); downloader.download();
if (!downloader.isCompleted()) { if (!downloader.isCompleted()) {
throw new Exception(format(_("Error dowloading {0}"), url), downloader.getError()); throw new Exception(format(_("Error downloading {0}"), url), downloader.getError());
} }
} }

15
arduino-core/src/cc/arduino/utils/network/FileDownloader.java
View File

@ -29,6 +29,8 @@
package cc.arduino.utils.network; package cc.arduino.utils.network;
import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.binary.Base64;
import processing.app.PreferencesData;
import processing.app.helpers.StringUtils;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@ -120,6 +122,19 @@ public class FileDownloader extends Observable {
setStatus(Status.CONNECTING); setStatus(Status.CONNECTING);
if (PreferencesData.has("proxy.server") && PreferencesData.get("proxy.server") != null && !PreferencesData.get("proxy.server").equals("")) {
System.getProperties().put("http.proxyHost", PreferencesData.get("proxy.server"));
System.getProperties().put("http.proxyPort", PreferencesData.get("proxy.port"));
if (PreferencesData.has("proxy.user")) {
System.getProperties().put("http.proxyUser", PreferencesData.get("proxy.user"));
System.getProperties().put("http.proxyPassword", PreferencesData.get("proxy.password"));
}
} else {
System.getProperties().remove("http.proxyHost");
System.getProperties().remove("http.proxyPort");
System.getProperties().remove("http.proxyUser");
System.getProperties().remove("http.proxyPassword");
}
HttpURLConnection connection = (HttpURLConnection) downloadUrl.openConnection(); HttpURLConnection connection = (HttpURLConnection) downloadUrl.openConnection();
if (downloadUrl.getUserInfo() != null) { if (downloadUrl.getUserInfo() != null) {