Skip to content

Commit 0cb6b48

Browse files
author
Federico Fissore
committed
Boards/Lib managers: use system proxy settings (got rid of our proxy settings
in File > Preferences)
1 parent e9d6601 commit 0cb6b48

File tree

5 files changed

+40
-394
lines changed

5 files changed

+40
-394
lines changed

Diff for: ‎app/src/cc/arduino/view/preferences/Preferences.form

+15-211
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,32 @@
3131
<Group type="102" attributes="0">
3232
<EmptySpace max="-2" attributes="0"/>
3333
<Group type="103" groupAlignment="0" attributes="0">
34-
<Component id="proxySettingsPanel" max="32767" attributes="0"/>
3534
<Group type="102" attributes="0">
3635
<Component id="sketchbookLocationField" max="32767" attributes="0"/>
3736
<EmptySpace max="-2" attributes="0"/>
3837
<Component id="browseButton" min="-2" max="-2" attributes="0"/>
3938
</Group>
4039
<Component id="checkboxesContainer" max="32767" attributes="0"/>
40+
<Group type="102" alignment="1" attributes="0">
41+
<Component id="okButton" min="-2" max="-2" attributes="0"/>
42+
<EmptySpace max="-2" attributes="0"/>
43+
<Component id="cancelButton" min="-2" max="-2" attributes="0"/>
44+
</Group>
45+
<Group type="102" alignment="1" attributes="0">
46+
<Component id="additionalBoardsManagerLabel" min="-2" max="-2" attributes="0"/>
47+
<EmptySpace max="-2" attributes="0"/>
48+
<Component id="additionalBoardsManagerField" min="-2" pref="500" max="-2" attributes="0"/>
49+
<EmptySpace max="-2" attributes="0"/>
50+
<Component id="extendedAdditionalUrlFieldWindow" min="-2" pref="36" max="-2" attributes="0"/>
51+
</Group>
4152
<Group type="102" attributes="0">
4253
<Group type="103" groupAlignment="0" attributes="0">
43-
<Component id="arduinoNotRunningLabel" alignment="0" min="-2" max="-2" attributes="0"/>
4454
<Component id="sketchbookLocationLabel" min="-2" max="-2" attributes="0"/>
4555
<Group type="102" alignment="0" attributes="0">
4656
<Component id="comboWarningsLabel" min="-2" max="-2" attributes="0"/>
4757
<EmptySpace max="-2" attributes="0"/>
4858
<Component id="comboWarnings" min="-2" max="-2" attributes="0"/>
4959
</Group>
50-
<Component id="morePreferencesLabel" alignment="0" min="-2" max="-2" attributes="0"/>
5160
<Group type="102" alignment="0" attributes="0">
5261
<Component id="showVerboseLabel" min="-2" max="-2" attributes="0"/>
5362
<EmptySpace max="-2" attributes="0"/>
@@ -70,22 +79,12 @@
7079
</Group>
7180
</Group>
7281
</Group>
82+
<Component id="arduinoNotRunningLabel" alignment="0" min="-2" max="-2" attributes="0"/>
83+
<Component id="morePreferencesLabel" alignment="0" min="-2" max="-2" attributes="0"/>
7384
<Component id="preferencesFileLabel" alignment="0" min="-2" max="-2" attributes="0"/>
7485
</Group>
7586
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
7687
</Group>
77-
<Group type="102" alignment="1" attributes="0">
78-
<Component id="okButton" min="-2" max="-2" attributes="0"/>
79-
<EmptySpace max="-2" attributes="0"/>
80-
<Component id="cancelButton" min="-2" max="-2" attributes="0"/>
81-
</Group>
82-
<Group type="102" alignment="1" attributes="0">
83-
<Component id="additionalBoardsManagerLabel" min="-2" max="-2" attributes="0"/>
84-
<EmptySpace max="-2" attributes="0"/>
85-
<Component id="additionalBoardsManagerField" min="-2" pref="500" max="-2" attributes="0"/>
86-
<EmptySpace max="-2" attributes="0"/>
87-
<Component id="extendedAdditionalUrlFieldWindow" min="-2" pref="36" max="-2" attributes="0"/>
88-
</Group>
8988
</Group>
9089
<EmptySpace max="-2" attributes="0"/>
9190
</Group>
@@ -126,8 +125,6 @@
126125
<EmptySpace max="-2" attributes="0"/>
127126
<Component id="checkboxesContainer" min="-2" max="-2" attributes="0"/>
128127
<EmptySpace max="-2" attributes="0"/>
129-
<Component id="proxySettingsPanel" min="-2" max="-2" attributes="0"/>
130-
<EmptySpace max="-2" attributes="0"/>
131128
<Group type="103" groupAlignment="0" attributes="0">
132129
<Group type="103" alignment="0" groupAlignment="3" attributes="0">
133130
<Component id="additionalBoardsManagerLabel" alignment="3" min="-2" max="-2" attributes="0"/>
@@ -146,7 +143,7 @@
146143
<Component id="cancelButton" alignment="3" min="-2" max="-2" attributes="0"/>
147144
<Component id="okButton" alignment="3" min="-2" max="-2" attributes="0"/>
148145
</Group>
149-
<EmptySpace max="32767" attributes="0"/>
146+
<EmptySpace max="-2" attributes="0"/>
150147
</Group>
151148
</Group>
152149
</DimensionLayout>
@@ -269,199 +266,6 @@
269266
<AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="new JComboBox(warningItems)"/>
270267
</AuxValues>
271268
</Component>
272-
<Container class="javax.swing.JPanel" name="proxySettingsPanel">
273-
<Properties>
274-
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
275-
<Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
276-
<TitledBorder title="&lt;User Code&gt;">
277-
<Connection PropertyName="titleX" code="_(&quot;Proxy Settings&quot;)" type="code"/>
278-
</TitledBorder>
279-
</Border>
280-
</Property>
281-
</Properties>
282-
<AuxValues>
283-
<AuxValue name="JavaCodeGenerator_VariableLocal" type="java.lang.Boolean" value="true"/>
284-
<AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="0"/>
285-
</AuxValues>
286-
287-
<Layout>
288-
<DimensionLayout dim="0">
289-
<Group type="103" groupAlignment="0" attributes="0">
290-
<Group type="102" alignment="0" attributes="0">
291-
<EmptySpace max="-2" attributes="0"/>
292-
<Group type="103" groupAlignment="1" attributes="0">
293-
<Group type="103" groupAlignment="0" attributes="0">
294-
<Component id="proxyHTTPSServerLabel" alignment="0" min="-2" max="-2" attributes="0"/>
295-
<Group type="102" alignment="0" attributes="0">
296-
<EmptySpace min="-2" pref="8" max="-2" attributes="0"/>
297-
<Component id="proxyHTTPServerLabel" min="-2" max="-2" attributes="0"/>
298-
</Group>
299-
</Group>
300-
<Component id="proxyUserLabel" min="-2" max="-2" attributes="0"/>
301-
</Group>
302-
<EmptySpace max="-2" attributes="0"/>
303-
<Group type="103" groupAlignment="0" attributes="0">
304-
<Component id="proxyHTTPServer" max="32767" attributes="0"/>
305-
<Component id="proxyHTTPSServer" max="32767" attributes="0"/>
306-
<Component id="proxyUser" alignment="1" max="32767" attributes="0"/>
307-
</Group>
308-
<EmptySpace type="unrelated" max="-2" attributes="0"/>
309-
<Group type="103" groupAlignment="0" attributes="0">
310-
<Component id="proxyHTTPSPortLabel" alignment="0" min="-2" max="-2" attributes="0"/>
311-
<Component id="proxyPasswordLabel" alignment="1" min="-2" max="-2" attributes="0"/>
312-
<Component id="proxyHTTPPortLabel" alignment="1" min="-2" max="-2" attributes="0"/>
313-
</Group>
314-
<EmptySpace max="-2" attributes="0"/>
315-
<Group type="103" groupAlignment="1" attributes="0">
316-
<Component id="proxyHTTPSPort" alignment="0" max="32767" attributes="0"/>
317-
<Component id="proxyHTTPPort" alignment="0" max="32767" attributes="0"/>
318-
<Component id="proxyPassword" alignment="0" max="32767" attributes="0"/>
319-
</Group>
320-
<EmptySpace max="-2" attributes="0"/>
321-
</Group>
322-
</Group>
323-
</DimensionLayout>
324-
<DimensionLayout dim="1">
325-
<Group type="103" groupAlignment="0" attributes="0">
326-
<Group type="102" alignment="0" attributes="0">
327-
<Group type="103" groupAlignment="0" attributes="0">
328-
<Group type="102" attributes="0">
329-
<Group type="103" groupAlignment="3" attributes="0">
330-
<Component id="proxyHTTPServerLabel" alignment="3" min="-2" max="-2" attributes="0"/>
331-
<Component id="proxyHTTPServer" alignment="3" min="-2" max="-2" attributes="0"/>
332-
</Group>
333-
<EmptySpace max="-2" attributes="0"/>
334-
<Group type="103" groupAlignment="3" attributes="0">
335-
<Component id="proxyHTTPSServerLabel" alignment="3" min="-2" max="-2" attributes="0"/>
336-
<Component id="proxyHTTPSServer" alignment="3" min="-2" max="-2" attributes="0"/>
337-
</Group>
338-
<EmptySpace max="-2" attributes="0"/>
339-
<Group type="103" groupAlignment="3" attributes="0">
340-
<Component id="proxyUser" alignment="3" min="-2" max="-2" attributes="0"/>
341-
<Component id="proxyUserLabel" alignment="3" min="-2" max="-2" attributes="0"/>
342-
</Group>
343-
</Group>
344-
<Group type="102" attributes="0">
345-
<Group type="103" groupAlignment="3" attributes="0">
346-
<Component id="proxyHTTPPortLabel" alignment="3" min="-2" max="-2" attributes="0"/>
347-
<Component id="proxyHTTPPort" alignment="3" min="-2" max="-2" attributes="0"/>
348-
</Group>
349-
<EmptySpace max="-2" attributes="0"/>
350-
<Group type="103" groupAlignment="3" attributes="0">
351-
<Component id="proxyHTTPSPort" alignment="3" min="-2" max="-2" attributes="0"/>
352-
<Component id="proxyHTTPSPortLabel" alignment="3" min="-2" max="-2" attributes="0"/>
353-
</Group>
354-
<EmptySpace max="-2" attributes="0"/>
355-
<Group type="103" groupAlignment="3" attributes="0">
356-
<Component id="proxyPasswordLabel" alignment="3" min="-2" max="-2" attributes="0"/>
357-
<Component id="proxyPassword" alignment="3" min="-2" max="-2" attributes="0"/>
358-
</Group>
359-
</Group>
360-
</Group>
361-
<EmptySpace max="32767" attributes="0"/>
362-
</Group>
363-
</Group>
364-
</DimensionLayout>
365-
</Layout>
366-
<SubComponents>
367-
<Component class="javax.swing.JLabel" name="proxyHTTPServerLabel">
368-
<Properties>
369-
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
370-
<Connection code="_(&quot;Server (HTTP):&quot;)" type="code"/>
371-
</Property>
372-
</Properties>
373-
<AuxValues>
374-
<AuxValue name="JavaCodeGenerator_VariableLocal" type="java.lang.Boolean" value="true"/>
375-
<AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="0"/>
376-
</AuxValues>
377-
</Component>
378-
<Component class="javax.swing.JTextField" name="proxyHTTPServer">
379-
<Properties>
380-
<Property name="columns" type="int" value="10"/>
381-
</Properties>
382-
</Component>
383-
<Component class="javax.swing.JLabel" name="proxyHTTPPortLabel">
384-
<Properties>
385-
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
386-
<Connection code="_(&quot;Port (HTTP):&quot;)" type="code"/>
387-
</Property>
388-
</Properties>
389-
<AuxValues>
390-
<AuxValue name="JavaCodeGenerator_VariableLocal" type="java.lang.Boolean" value="true"/>
391-
<AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="0"/>
392-
</AuxValues>
393-
</Component>
394-
<Component class="javax.swing.JTextField" name="proxyHTTPPort">
395-
<Properties>
396-
<Property name="columns" type="int" value="10"/>
397-
</Properties>
398-
</Component>
399-
<Component class="javax.swing.JLabel" name="proxyHTTPSServerLabel">
400-
<Properties>
401-
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
402-
<Connection code="_(&quot;Server (HTTPS):&quot;)" type="code"/>
403-
</Property>
404-
</Properties>
405-
<AuxValues>
406-
<AuxValue name="JavaCodeGenerator_VariableLocal" type="java.lang.Boolean" value="true"/>
407-
<AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="0"/>
408-
</AuxValues>
409-
</Component>
410-
<Component class="javax.swing.JTextField" name="proxyHTTPSServer">
411-
<Properties>
412-
<Property name="columns" type="int" value="10"/>
413-
</Properties>
414-
</Component>
415-
<Component class="javax.swing.JLabel" name="proxyHTTPSPortLabel">
416-
<Properties>
417-
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
418-
<Connection code="_(&quot;Port (HTTPS):&quot;)" type="code"/>
419-
</Property>
420-
</Properties>
421-
<AuxValues>
422-
<AuxValue name="JavaCodeGenerator_VariableLocal" type="java.lang.Boolean" value="true"/>
423-
<AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="0"/>
424-
</AuxValues>
425-
</Component>
426-
<Component class="javax.swing.JTextField" name="proxyHTTPSPort">
427-
<Properties>
428-
<Property name="columns" type="int" value="10"/>
429-
</Properties>
430-
</Component>
431-
<Component class="javax.swing.JLabel" name="proxyUserLabel">
432-
<Properties>
433-
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
434-
<Connection code="_(&quot;Username:&quot;)" type="code"/>
435-
</Property>
436-
</Properties>
437-
<AuxValues>
438-
<AuxValue name="JavaCodeGenerator_VariableLocal" type="java.lang.Boolean" value="true"/>
439-
<AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="0"/>
440-
</AuxValues>
441-
</Component>
442-
<Component class="javax.swing.JTextField" name="proxyUser">
443-
<Properties>
444-
<Property name="columns" type="int" value="10"/>
445-
</Properties>
446-
</Component>
447-
<Component class="javax.swing.JLabel" name="proxyPasswordLabel">
448-
<Properties>
449-
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
450-
<Connection code="_(&quot;Password:&quot;)" type="code"/>
451-
</Property>
452-
</Properties>
453-
<AuxValues>
454-
<AuxValue name="JavaCodeGenerator_VariableLocal" type="java.lang.Boolean" value="true"/>
455-
<AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="0"/>
456-
</AuxValues>
457-
</Component>
458-
<Component class="javax.swing.JPasswordField" name="proxyPassword">
459-
<Properties>
460-
<Property name="columns" type="int" value="10"/>
461-
</Properties>
462-
</Component>
463-
</SubComponents>
464-
</Container>
465269
<Component class="javax.swing.JLabel" name="additionalBoardsManagerLabel">
466270
<Properties>
467271
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">

0 commit comments

Comments
 (0)