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

Changed package_index and library_index json urls to use download.php proxy

Browse Source 
Installed a ESC key listener: it allows to close the dialog pressing the ESC key
This commit is contained in:
Federico Fissore 2015-02-23 17:14:56 +01:00
parent 589f514a47
commit 86f84c8a3e
3 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/cc/arduino/libraries/contributions/ui/LibraryInstaller.java
View File

@ -63,7 +63,7 @@ public class LibraryInstaller {
final MultiStepProgress progress = new MultiStepProgress(2);
// Step 1: Download index
URL url = new URL("http://arduino.cc/library_index.json");
URL url = new URL("http://arduino.cc/download.php?f=/libraries/library_index.json");
File outputFile = indexer.getIndexFile();
File tmpFile = new File(outputFile.getAbsolutePath() + ".tmp");
try {

45
app/src/cc/arduino/ui/InstallerJDialog.java
View File

@ -28,29 +28,10 @@
*/
package cc.arduino.ui;
import static cc.arduino.packages.contributions.ui.ContributionIndexTableModel.DESCRIPTION_COL;
import static processing.app.I18n._;
import processing.app.Base;
import processing.app.Theme;
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.Container;
import java.awt.Dimension;
import java.awt.Frame;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.Box;
import javax.swing.BoxLayout;
import javax.swing.JButton;
import javax.swing.JComboBox;
import javax.swing.JDialog;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTable;
import javax.swing.ListSelectionModel;
import javax.swing.ScrollPaneConstants;
import javax.swing.SwingUtilities;
import javax.swing.*;
import javax.swing.border.EmptyBorder;
import javax.swing.event.TableModelEvent;
import javax.swing.event.TableModelListener;
@ -58,8 +39,14 @@ import javax.swing.table.TableCellEditor;
import javax.swing.table.TableCellRenderer;
import javax.swing.table.TableColumn;
import javax.swing.table.TableColumnModel;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyEvent;
import java.awt.event.WindowEvent;
import processing.app.Theme;
import static cc.arduino.packages.contributions.ui.ContributionIndexTableModel.DESCRIPTION_COL;
import static processing.app.I18n._;
public abstract class InstallerJDialog extends JDialog {
@ -156,8 +143,7 @@ public abstract class InstallerJDialog extends JDialog {
contribTable.setDragEnabled(false);
contribTable.setIntercellSpacing(new Dimension(0, 1));
contribTable.setShowVerticalLines(false);
contribTable
.setSelectionBackground(Theme.getColor("status.notice.bgcolor"));
contribTable.setSelectionBackground(Theme.getColor("status.notice.bgcolor"));
{
TableColumnModel tcm = contribTable.getColumnModel();
@ -222,6 +208,15 @@ public abstract class InstallerJDialog extends JDialog {
setProgressVisible(false);
setMinimumSize(new Dimension(600, 450));
setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
Base.registerWindowCloseKeys(getRootPane(), new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
InstallerJDialog.this.dispatchEvent(new WindowEvent(InstallerJDialog.this, WindowEvent.WINDOW_CLOSING));
}
});
}
public void setProgressVisible(boolean visible) {

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

@ -172,7 +172,7 @@ public class ContributionInstaller {
final MultiStepProgress progress = new MultiStepProgress(1);
final String statusText = _("Downloading platforms index...");
URL url = new URL("http://arduino.cc/package_index.json");
URL url = new URL("http://arduino.cc/download.php?f=/packages/package_index.json");
File outputFile = indexer.getIndexFile();
File tmpFile = new File(outputFile.getAbsolutePath() + ".tmp");
downloader.download(url, tmpFile, progress, statusText);