Skip to content

Commit 0c7e0d6

Browse files
author
Federico Fissore
committed
CustomProxySelector: auto proxy (PAC) needs login info too
1 parent 916de93 commit 0c7e0d6

File tree

5 files changed

+158
-41
lines changed

5 files changed

+158
-41
lines changed

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

Lines changed: 67 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -483,25 +483,39 @@
483483
<Group type="102" attributes="0">
484484
<EmptySpace max="-2" attributes="0"/>
485485
<Group type="103" groupAlignment="0" attributes="0">
486-
<Group type="102" attributes="0">
487-
<Group type="103" groupAlignment="0" attributes="0">
488-
<Component id="noProxy" alignment="0" min="-2" max="-2" attributes="0"/>
489-
<Component id="autoProxy" alignment="0" min="-2" max="-2" attributes="0"/>
490-
<Component id="manualProxy" alignment="0" min="-2" max="-2" attributes="0"/>
491-
</Group>
492-
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
493-
</Group>
494486
<Group type="102" alignment="0" attributes="0">
495487
<EmptySpace min="12" pref="12" max="-2" attributes="0"/>
496488
<Group type="103" groupAlignment="0" attributes="0">
497-
<Group type="102" attributes="0">
498-
<Component id="autoProxyUsePAC" min="-2" max="-2" attributes="0"/>
499-
<EmptySpace max="-2" attributes="0"/>
500-
<Component id="autoProxyPACURL" max="32767" attributes="0"/>
489+
<Component id="autoProxyUsePAC" alignment="0" min="-2" max="-2" attributes="0"/>
490+
<Group type="102" alignment="0" attributes="0">
491+
<EmptySpace min="12" pref="12" max="-2" attributes="0"/>
492+
<Group type="103" groupAlignment="0" attributes="0">
493+
<Component id="autoProxyUsernameLabel" alignment="0" min="-2" max="-2" attributes="0"/>
494+
<Component id="autoProxyPasswordLabel" alignment="0" min="-2" max="-2" attributes="0"/>
495+
</Group>
501496
</Group>
497+
</Group>
498+
<EmptySpace max="-2" attributes="0"/>
499+
<Group type="103" groupAlignment="0" attributes="0">
500+
<Component id="autoProxyPACURL" max="32767" attributes="0"/>
502501
<Group type="102" attributes="0">
503502
<Group type="103" groupAlignment="0" attributes="0">
504-
<Group type="102" attributes="0">
503+
<Component id="autoProxyUsername" min="-2" pref="178" max="-2" attributes="0"/>
504+
<Component id="autoProxyPassword" min="-2" pref="180" max="-2" attributes="0"/>
505+
</Group>
506+
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
507+
</Group>
508+
</Group>
509+
</Group>
510+
<Group type="102" attributes="0">
511+
<Group type="103" groupAlignment="0" attributes="0">
512+
<Component id="noProxy" alignment="0" min="-2" max="-2" attributes="0"/>
513+
<Component id="autoProxy" alignment="0" min="-2" max="-2" attributes="0"/>
514+
<Component id="manualProxy" alignment="0" min="-2" max="-2" attributes="0"/>
515+
<Group type="102" alignment="0" attributes="0">
516+
<EmptySpace min="12" pref="12" max="-2" attributes="0"/>
517+
<Group type="103" groupAlignment="0" attributes="0">
518+
<Group type="102" alignment="0" attributes="0">
505519
<Component id="manualProxyHTTP" min="-2" max="-2" attributes="0"/>
506520
<EmptySpace max="-2" attributes="0"/>
507521
<Component id="manualProxySOCKS" min="-2" max="-2" attributes="0"/>
@@ -518,15 +532,15 @@
518532
<Component id="manualProxyHostName" min="-2" pref="541" max="-2" attributes="0"/>
519533
<Component id="manualProxyPort" alignment="0" min="-2" pref="74" max="-2" attributes="0"/>
520534
<Group type="103" alignment="0" groupAlignment="1" max="-2" attributes="0">
521-
<Component id="manualProxyPassword" alignment="0" pref="180" max="32767" attributes="0"/>
522-
<Component id="manualProxyUsername" alignment="0" max="32767" attributes="0"/>
535+
<Component id="manualProxyPassword" alignment="0" max="32767" attributes="0"/>
536+
<Component id="manualProxyUsername" alignment="0" min="-2" pref="180" max="-2" attributes="0"/>
523537
</Group>
524538
</Group>
525539
</Group>
526540
</Group>
527-
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
528541
</Group>
529542
</Group>
543+
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
530544
</Group>
531545
</Group>
532546
<EmptySpace max="-2" attributes="0"/>
@@ -546,6 +560,16 @@
546560
<Component id="autoProxyPACURL" alignment="3" min="-2" max="-2" attributes="0"/>
547561
</Group>
548562
<EmptySpace max="-2" attributes="0"/>
563+
<Group type="103" groupAlignment="3" attributes="0">
564+
<Component id="autoProxyUsername" alignment="3" min="-2" max="-2" attributes="0"/>
565+
<Component id="autoProxyUsernameLabel" alignment="3" min="-2" max="-2" attributes="0"/>
566+
</Group>
567+
<EmptySpace max="-2" attributes="0"/>
568+
<Group type="103" groupAlignment="3" attributes="0">
569+
<Component id="autoProxyPasswordLabel" alignment="3" min="-2" max="-2" attributes="0"/>
570+
<Component id="autoProxyPassword" alignment="3" min="-2" max="-2" attributes="0"/>
571+
</Group>
572+
<EmptySpace max="-2" attributes="0"/>
549573
<Component id="manualProxy" min="-2" max="-2" attributes="0"/>
550574
<EmptySpace max="-2" attributes="0"/>
551575
<Group type="103" groupAlignment="3" attributes="0">
@@ -572,7 +596,7 @@
572596
<Component id="manualProxyPassword" alignment="3" min="-2" max="-2" attributes="0"/>
573597
<Component id="manualProxyPasswordLabel" alignment="3" min="-2" max="-2" attributes="0"/>
574598
</Group>
575-
<EmptySpace pref="225" max="32767" attributes="0"/>
599+
<EmptySpace pref="163" max="32767" attributes="0"/>
576600
</Group>
577601
</Group>
578602
</DimensionLayout>
@@ -587,7 +611,7 @@
587611
<Connection code="tr(&quot;No proxy&quot;)" type="code"/>
588612
</Property>
589613
<Property name="actionCommand" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
590-
<Connection code="PROXY_TYPE_NONE" type="code"/>
614+
<Connection code="Constants.PROXY_TYPE_NONE" type="code"/>
591615
</Property>
592616
</Properties>
593617
</Component>
@@ -600,7 +624,7 @@
600624
<Connection code="tr(&quot;Auto-detect proxy settings&quot;)" type="code"/>
601625
</Property>
602626
<Property name="actionCommand" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
603-
<Connection code="PROXY_TYPE_AUTO" type="code"/>
627+
<Connection code="Constants.PROXY_TYPE_AUTO" type="code"/>
604628
</Property>
605629
</Properties>
606630
<Events>
@@ -616,7 +640,7 @@
616640
<Connection code="tr(&quot;Manual proxy configuration&quot;)" type="code"/>
617641
</Property>
618642
<Property name="actionCommand" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
619-
<Connection code="PROXY_TYPE_MANUAL" type="code"/>
643+
<Connection code="Constants.PROXY_TYPE_MANUAL" type="code"/>
620644
</Property>
621645
</Properties>
622646
<Events>
@@ -642,7 +666,7 @@
642666
</Property>
643667
<Property name="text" type="java.lang.String" value="HTTP"/>
644668
<Property name="actionCommand" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
645-
<Connection code="PROXY_MANUAL_TYPE_HTTP" type="code"/>
669+
<Connection code="Constants.PROXY_MANUAL_TYPE_HTTP" type="code"/>
646670
</Property>
647671
</Properties>
648672
</Component>
@@ -653,7 +677,7 @@
653677
</Property>
654678
<Property name="text" type="java.lang.String" value="SOCKS"/>
655679
<Property name="actionCommand" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
656-
<Connection code="PROXY_MANUAL_TYPE_SOCKS" type="code"/>
680+
<Connection code="Constants.PROXY_MANUAL_TYPE_SOCKS" type="code"/>
657681
</Property>
658682
</Properties>
659683
</Component>
@@ -696,6 +720,27 @@
696720
<Property name="toolTipText" type="java.lang.String" value=""/>
697721
</Properties>
698722
</Component>
723+
<Component class="javax.swing.JLabel" name="autoProxyUsernameLabel">
724+
<Properties>
725+
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
726+
<Connection code="tr(&quot;Username:&quot;)" type="code"/>
727+
</Property>
728+
</Properties>
729+
</Component>
730+
<Component class="javax.swing.JTextField" name="autoProxyUsername">
731+
</Component>
732+
<Component class="javax.swing.JPasswordField" name="autoProxyPassword">
733+
<Properties>
734+
<Property name="toolTipText" type="java.lang.String" value=""/>
735+
</Properties>
736+
</Component>
737+
<Component class="javax.swing.JLabel" name="autoProxyPasswordLabel">
738+
<Properties>
739+
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
740+
<Connection code="tr(&quot;Password:&quot;)" type="code"/>
741+
</Property>
742+
</Properties>
743+
</Component>
699744
</SubComponents>
700745
</Container>
701746
</SubComponents>

0 commit comments

Comments
 (0)