[gnome-control-center] Network: fix some alignment and focus issues

[Matthias Clasen <matthiasc src gnome org>]

commit 243c11712b2bff2e970cd68c139bebb58198250a
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Mar 12 15:46:16 2011 -0500

    Network: fix some alignment and focus issues
    
    Make the wireless network combo focusable, but not editable.
    Make all the proxy labels right-aligned and equal size.
    There is still an overall size problem with the proxy page.

 panels/network/network.ui |   25 +++++++++++++++++++++++--
 1 files changed, 23 insertions(+), 2 deletions(-)
---
diff --git a/panels/network/network.ui b/panels/network/network.ui
index 4b665ec..ddfab74 100644
--- a/panels/network/network.ui
+++ b/panels/network/network.ui
@@ -883,13 +883,12 @@
                                     <child>
                                       <object class="GtkComboBox" id="combobox_network_name">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <property name="model">liststore_wireless_network</property>
                                         <property name="has_entry">True</property>
                                         <property name="entry_text_column">1</property>
                                         <child internal-child="entry">
                                           <object class="GtkEntry" id="comboboxentry-entry2">
-                                            <property name="can_focus">False</property>
+                                            <property name="editable">False</property>
                                           </object>
                                         </child>
                                       </object>
@@ -1651,6 +1650,7 @@
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="label" translatable="yes">_Method:</property>
+                                            <property name="xalign">1</property>
                                             <property name="use_underline">True</property>
                                             <property name="mnemonic_widget">combobox_proxy_mode</property>
                                           </object>
@@ -1698,6 +1698,7 @@
                                           <object class="GtkLabel" id="label31">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
+                                            <property name="xalign">1</property>
                                             <property name="label" translatable="yes">_Configuration URL:</property>
                                             <property name="use_underline">True</property>
                                             <property name="mnemonic_widget">entry_proxy_url</property>
@@ -1748,6 +1749,7 @@
                                           <object class="GtkLabel" id="label33">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
+                                            <property name="xalign">1</property>
                                             <property name="label" translatable="yes">_HTTP Proxy:</property>
                                             <property name="use_underline">True</property>
                                             <property name="mnemonic_widget">entry_proxy_http</property>
@@ -1784,6 +1786,7 @@
                                         <property name="can_focus">True</property>
                                         <property name="invisible_char">â??</property>
                                         <property name="adjustment">adjustment_proxy_port_http</property>
+                                        <property name="xalign">1</property>
                                       </object>
                                       <packing>
                                         <property name="expand">True</property>
@@ -1811,6 +1814,7 @@
                                           <object class="GtkLabel" id="label35">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
+                                            <property name="xalign">1</property>
                                             <property name="label" translatable="yes">H_TTPS Proxy:</property>
                                             <property name="use_underline">True</property>
                                             <property name="mnemonic_widget">entry_proxy_https</property>
@@ -1847,6 +1851,7 @@
                                         <property name="can_focus">True</property>
                                         <property name="invisible_char">â??</property>
                                         <property name="adjustment">adjustment_proxy_port_https</property>
+                                        <property name="xalign">1</property>
                                       </object>
                                       <packing>
                                         <property name="expand">True</property>
@@ -1874,6 +1879,7 @@
                                           <object class="GtkLabel" id="label30">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
+                                            <property name="xalign">1</property>
                                             <property name="label" translatable="yes">_FTP Proxy:</property>
                                             <property name="use_underline">True</property>
                                             <property name="mnemonic_widget">entry_proxy_ftp</property>
@@ -1910,6 +1916,7 @@
                                         <property name="can_focus">True</property>
                                         <property name="invisible_char">â??</property>
                                         <property name="adjustment">adjustment_proxy_port_ftp</property>
+                                        <property name="xalign">1</property>
                                       </object>
                                       <packing>
                                         <property name="expand">True</property>
@@ -1937,6 +1944,7 @@
                                           <object class="GtkLabel" id="label47">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
+                                            <property name="xalign">1</property>
                                             <property name="label" translatable="yes">_Socks Host:</property>
                                             <property name="use_underline">True</property>
                                             <property name="mnemonic_widget">entry_proxy_socks</property>
@@ -1973,6 +1981,7 @@
                                         <property name="can_focus">True</property>
                                         <property name="invisible_char">â??</property>
                                         <property name="adjustment">adjustment_proxy_port_socks</property>
+                                        <property name="xalign">1</property>
                                       </object>
                                       <packing>
                                         <property name="expand">True</property>
@@ -2165,4 +2174,16 @@
       <widget name="hbox25"/>
     </widgets>
   </object>
+  <object class="GtkSizeGroup" id="sizegroup2">
+    <property name="ignore-hidden">False</property>
+    <property name="mode">horizontal</property>
+    <widgets>
+      <widget name="label18"/>
+      <widget name="label31"/>
+      <widget name="label33"/>
+      <widget name="label35"/>
+      <widget name="label30"/>
+      <widget name="label47"/>
+    </widgets>
+  </object>
 </interface>