--- a/pidgin/resources/Prefs/proxy.ui Mon May 23 20:27:22 2022 -0500
+++ b/pidgin/resources/Prefs/proxy.ui Mon May 23 20:29:05 2022 -0500
@@ -72,28 +72,44 @@
<property name="can-focus">False</property>
<property name="title" translatable="yes">Proxy Server</property>
<child>
- <object class="GtkAlignment">
+ <object class="GtkStack" id="stack">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="left-padding">12</property>
+ <property name="margin-start">12</property>
+ <property name="hhomogeneous">False</property>
+ <property name="vhomogeneous">False</property>
<child>
- <object class="GtkStack" id="stack">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="hhomogeneous">False</property>
- <property name="vhomogeneous">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes">Proxy preferences are configured in GNOME preferences</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkLabel">
+ <object class="GtkLabel" id="gnome_not_found">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="label" translatable="yes">Proxy preferences are configured in GNOME preferences</property>
- <property name="xalign">0</property>
+ <property name="label" translatable="yes">Proxy configuration program was not found.</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -102,39 +118,82 @@
</packing>
</child>
<child>
- <object class="GtkBox">
+ <object class="GtkButton" id="gnome_program">
+ <property name="label" translatable="yes">Configure _Proxy</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
+ <property name="use-underline">True</property>
+ <signal name="clicked" handler="proxy_button_clicked_cb" object="PidginProxyPrefs" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="name">gnome</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkCheckButton" id="socks4_remotedns">
+ <property name="label" translatable="yes">Use remote _DNS with SOCKS4 proxies</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="spacing">6</property>
+ <property name="label" translatable="yes">Proxy t_ype:</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">type.combo</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="type.combo">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="model">type.store</property>
<child>
- <object class="GtkLabel" id="gnome_not_found">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes">Proxy configuration program was not found.</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="gnome_program">
- <property name="label" translatable="yes">Configure _Proxy</property>
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">True</property>
- <property name="use-underline">True</property>
- <signal name="clicked" handler="proxy_button_clicked_cb" object="PidginProxyPrefs" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
+ <object class="GtkCellRendererText"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
</child>
</object>
<packing>
@@ -145,221 +204,156 @@
</child>
</object>
<packing>
- <property name="name">gnome</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkBox">
+ <!-- n-columns=4 n-rows=3 -->
+ <object class="GtkGrid" id="options">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="row-spacing">10</property>
+ <property name="column-spacing">5</property>
<child>
- <object class="GtkCheckButton" id="socks4_remotedns">
- <property name="label" translatable="yes">Use remote _DNS with SOCKS4 proxies</property>
+ <object class="GtkLabel">
<property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">False</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes">_Host:</property>
<property name="use-underline">True</property>
- <property name="draw-indicator">True</property>
+ <property name="mnemonic-widget">host</property>
+ <property name="xalign">1</property>
+ <accessibility>
+ <relation type="label-for" target="host"/>
+ </accessibility>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
- <object class="GtkBox">
+ <object class="GtkEntry" id="host">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <signal name="changed" handler="proxy_print_option" object="PidginProxyPrefs" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes">Proxy t_ype:</property>
- <property name="use-underline">True</property>
- <property name="mnemonic-widget">type.combo</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="type.combo">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="model">type.store</property>
- <child>
- <object class="GtkCellRendererText"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="label" translatable="yes">P_ort:</property>
+ <property name="use-underline">True</property>
+ <property name="xalign">1</property>
+ <accessibility>
+ <relation type="label-for" target="port"/>
+ </accessibility>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="left-attach">2</property>
+ <property name="top-attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="port">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="text" translatable="yes">0</property>
+ <property name="adjustment">port.adjustment</property>
+ <property name="numeric">True</property>
+ <signal name="changed" handler="proxy_print_option" object="PidginProxyPrefs" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left-attach">3</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
- <!-- n-columns=4 n-rows=3 -->
- <object class="GtkGrid" id="options">
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes">User_name:</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">username</property>
+ <property name="xalign">1</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="username">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <signal name="changed" handler="proxy_print_option" object="PidginProxyPrefs" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="row-spacing">10</property>
- <property name="column-spacing">5</property>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes">_Host:</property>
- <property name="use-underline">True</property>
- <property name="mnemonic-widget">host</property>
- <property name="xalign">1</property>
- <accessibility>
- <relation type="label-for" target="host"/>
- </accessibility>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="host">
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <signal name="changed" handler="proxy_print_option" object="PidginProxyPrefs" swapped="no"/>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes">P_ort:</property>
- <property name="use-underline">True</property>
- <property name="xalign">1</property>
- <accessibility>
- <relation type="label-for" target="port"/>
- </accessibility>
- </object>
- <packing>
- <property name="left-attach">2</property>
- <property name="top-attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="port">
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="text" translatable="yes">0</property>
- <property name="adjustment">port.adjustment</property>
- <property name="numeric">True</property>
- <signal name="changed" handler="proxy_print_option" object="PidginProxyPrefs" swapped="no"/>
- </object>
- <packing>
- <property name="left-attach">3</property>
- <property name="top-attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes">User_name:</property>
- <property name="use-underline">True</property>
- <property name="mnemonic-widget">username</property>
- <property name="xalign">1</property>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="username">
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <signal name="changed" handler="proxy_print_option" object="PidginProxyPrefs" swapped="no"/>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes">Pa_ssword:</property>
- <property name="use-underline">True</property>
- <property name="mnemonic-widget">password</property>
- <property name="xalign">1</property>
- <accessibility>
- <relation type="label-for" target="password"/>
- </accessibility>
- </object>
- <packing>
- <property name="left-attach">2</property>
- <property name="top-attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="password">
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="visibility">False</property>
- <property name="invisible-char">●</property>
- <property name="input-purpose">password</property>
- <signal name="changed" handler="proxy_print_option" object="PidginProxyPrefs" swapped="no"/>
- </object>
- <packing>
- <property name="left-attach">3</property>
- <property name="top-attach">1</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
+ <property name="label" translatable="yes">Pa_ssword:</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">password</property>
+ <property name="xalign">1</property>
+ <accessibility>
+ <relation type="label-for" target="password"/>
+ </accessibility>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
+ <property name="left-attach">2</property>
+ <property name="top-attach">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkEntry" id="password">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="visibility">False</property>
+ <property name="invisible-char">●</property>
+ <property name="input-purpose">password</property>
+ <signal name="changed" handler="proxy_print_option" object="PidginProxyPrefs" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left-attach">3</property>
+ <property name="top-attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
- <property name="name">nongnome</property>
- <property name="position">1</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
+ <packing>
+ <property name="name">nongnome</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
</child>