[gnome-control-center/wip/wireless-list] Reindent and clean up network.ui



commit 7c12b1a3e101c6a2f7bc9d20f17750a9b54cbb81
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Jul 4 02:52:03 2012 -0400

    Reindent and clean up network.ui
    
    Also, implement strength in detail page.

 panels/network/cc-network-panel.c |   21 +-
 panels/network/network.ui         |  923 ++++++++++++++++++-------------------
 2 files changed, 467 insertions(+), 477 deletions(-)
---
diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
index 8fd78dc..0f7677a 100644
--- a/panels/network/cc-network-panel.c
+++ b/panels/network/cc-network-panel.c
@@ -1867,6 +1867,7 @@ device_refresh_wifi_ui (CcNetworkPanel *panel, NetDevice *device)
         gchar *hotspot_security;
         gboolean can_start_hotspot;
         GtkTreeIter iter;
+        gint strength;
 
         nm_device = net_device_get_nm_device (device);
         state = nm_device_get_state (nm_device);
@@ -1913,6 +1914,22 @@ device_refresh_wifi_ui (CcNetworkPanel *panel, NetDevice *device)
         panel_set_widget_data (panel, "wireless", "security", str_tmp);
         g_free (str_tmp);
 
+        if (active_ap)
+                strength = nm_access_point_get_strength (active_ap);
+        else
+                strength = 0;
+        if (strength < 20)
+                str_tmp = C_("Signal strength", "None");
+        else if (strength < 40)
+                str_tmp = C_("Signal strength", "Weak");
+        else if (strength < 50)
+                str_tmp = C_("Signal strength", "Ok");
+        else if (strength < 80)
+                str_tmp = C_("Signal strength", "Good");
+        else
+                str_tmp = C_("Signal strength", "Excellent");
+        panel_set_widget_data (panel, "wireless", "strength", str_tmp);
+
         /* populate wireless network list */
         liststore_wireless_network = GTK_LIST_STORE (gtk_builder_get_object (panel->priv->builder,
                                                                              "liststore_wireless_network"));
@@ -2378,7 +2395,7 @@ refresh_ui_idle (gpointer data)
 
                 widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
                                                              "notebook_types"));
-                gtk_notebook_set_current_page (GTK_NOTEBOOK (widget), 2);
+                gtk_notebook_set_current_page (GTK_NOTEBOOK (widget), 4);
 
                 /* hide the switch until we get some more detail in the mockup */
                 widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
@@ -4126,8 +4143,6 @@ cc_network_panel_init (CcNetworkPanel *panel)
         /* hide implementation details */
         widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder,
                                                      "notebook_types"));
-        gtk_notebook_set_show_tabs (GTK_NOTEBOOK (widget), FALSE);
-
         widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder,
                                                      "vbox1"));
         gtk_widget_reparent (widget, (GtkWidget *) panel);
diff --git a/panels/network/network.ui b/panels/network/network.ui
index d3bc679..7a046d5 100644
--- a/panels/network/network.ui
+++ b/panels/network/network.ui
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkAdjustment" id="adjustment_proxy_port_ftp">
@@ -342,7 +342,7 @@
                   <object class="GtkNotebook" id="notebook_types">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="show_border">False</property>
+                    <property name="show-tabs">False</property>
                     <child>
                       <object class="GtkVBox" id="vbox6">
                         <property name="visible">True</property>
@@ -714,516 +714,515 @@
                             <child>
                               <object class="GtkViewport" id="wireless-vport">
                                 <property name="visible">True</property>
-                        <child>
-                          <object class="GtkBox" id="wireless-list-box">
-                            <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="GtkBox" id="wireless-heading-box">
-                                <property name="visible">True</property>
-                                <property name="orientation">horizontal</property>
-                                <property name="margin-left">12</property>
-                                <property name="margin-right">12</property>
-                                <property name="margin-top">12</property>
-                                <property name="margin-bottom">6</property>
-                                <child>
-                                  <object class="GtkLabel" id="wireless-heading">
-                                    <property name="visible">True</property>
-                                    <property name="label">Wireless</property>
-                                    <property name="hexpand">True</property>
-                                    <property name="halign">start</property>
-                                    <attributes>
-                                       <attribute name="weight" value="bold"/>
-                                       <attribute name="scale" value="1.2"/>
-                                    </attributes>
-                                  </object>
-                               </child>
-                               <child>
-                                  <object class="GtkSwitch" id="device_wireless_off_switch">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="halign">end</property>
-                                    <property name="valign">start</property>
-                                    <child internal-child="accessible">
-                                      <object class="AtkObject" id="wireless_off_a11y">
-                                        <property name="accessible-name" translatable="yes">Device Off</property>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkTreeView" id="wireless-list">
-                                <property name="visible">True</property>
-                                <property name="headers-visible">False</property>
-                                <property name="margin-left">12</property>
-                                <property name="margin-right">12</property>
-                                <property name="margin-top">6</property>
-                                <property name="margin-bottom">6</property>
-                                <property name="model">liststore_wireless_network</property>
-                                <property name="hexpand">True</property>
-                                <property name="vexpand">False</property>
-                                <child internal-child="selection">
-                                  <object class="GtkTreeSelection" id="wireless-list-selection">
-                                    <property name="mode">none</property>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkTreeViewColumn" id="wireless-list-column">
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkButton" id="hidden-wireless-button">
-                                <property name="visible">True</property>
-                                <property name="label">Connect to a _Hidden Network</property>
-                                <property name="use-underline">True</property>
-                                <property name="margin-left">12</property>
-                                <property name="margin-right">12</property>
-                                <property name="margin-top">6</property>
-                                <property name="margin-bottom">12</property>
-                                <property name="halign">start</property>
-                              </object>
-                            </child>
-                          </object>
-                            </child>
-                          </object>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkVBox" id="vbox5">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="border_width">12</property>
-                                <property name="spacing">6</property>
                                 <child>
-                                  <object class="GtkBox" id="wireless-top-hbox">
+                                  <object class="GtkBox" id="wireless-list-box">
                                     <property name="visible">True</property>
-                                    <property name="orientation">horizontal</property>
-                                    <child>
-                                      <object class="GtkButton" id="wireless-back-button">
-                                        <property name="visible">True</property>
-                                        <property name="halign">start</property>
-                                        <property name="valign">center</property>
-                                        <property name="hexpand">True</property>
-                                        <property name="vexpand">False</property>
-                                        <child>
-                                          <object class="GtkArrow" id="wireless-back-arrow">
-                                            <property name="visible">True</property>
-                                            <property name="arrow-type">left</property>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
+                                    <property name="orientation">vertical</property>
                                     <child>
-                                      <object class="GtkBox" id="vbox3">
+                                      <object class="GtkBox" id="wireless-heading-box">
                                         <property name="visible">True</property>
-                                        <property name="orientation">vertical</property>
-                                        <property name="valign">center</property>
-                                        <property name="halign">fill</property>
-                                        <property name="hexpand">True</property>
-                                        <property name="vexpand">False</property>
-                                        <property name="spacing">3</property>
+                                        <property name="orientation">horizontal</property>
+                                        <property name="margin-left">12</property>
+                                        <property name="margin-right">12</property>
+                                        <property name="margin-top">12</property>
+                                        <property name="margin-bottom">6</property>
                                         <child>
-                                          <object class="GtkLabel" id="wireless-network-name-label">
+                                          <object class="GtkLabel" id="wireless-heading">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="label">Connected</property>
-                                            <property name="ellipsize">end</property>
+                                            <property name="label">Wireless</property>
+                                            <property name="hexpand">True</property>
+                                            <property name="halign">start</property>
                                             <attributes>
                                               <attribute name="weight" value="bold"/>
                                               <attribute name="scale" value="1.2"/>
                                             </attributes>
                                           </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="fill">True</property>
-                                            <property name="position">0</property>
-                                          </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkLabel" id="label_wireless_status">
+                                          <object class="GtkSwitch" id="device_wireless_off_switch">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="label">Not connected</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="halign">end</property>
+                                            <property name="valign">start</property>
+                                            <child internal-child="accessible">
+                                              <object class="AtkObject" id="wireless_off_a11y">
+                                                <property name="accessible-name" translatable="yes">Device Off</property>
+                                              </object>
+                                            </child>
                                           </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="fill">True</property>
-                                            <property name="position">1</property>
-                                          </packing>
                                         </child>
                                       </object>
                                     </child>
                                     <child>
-                                      <object class="GtkButton" id="wireless-disconnect-button">
-                                        <property name="visible">True</property> 
-                                        <property name="use-underline">True</property> 
-                                        <property name="label">_Disconnect</property> 
-                                        <property name="valign">center</property>
-                                        <property name="halign">end</property>
+                                      <object class="GtkTreeView" id="wireless-list">
+                                        <property name="visible">True</property>
+                                        <property name="headers-visible">False</property>
+                                        <property name="margin-left">12</property>
+                                        <property name="margin-right">12</property>
+                                        <property name="margin-top">6</property>
+                                        <property name="margin-bottom">6</property>
+                                        <property name="model">liststore_wireless_network</property>
                                         <property name="hexpand">True</property>
                                         <property name="vexpand">False</property>
+                                        <child internal-child="selection">
+                                          <object class="GtkTreeSelection" id="wireless-list-selection">
+                                            <property name="mode">none</property>
+                                          </object>
+                                        </child>
+                                        <child>
+                                          <object class="GtkTreeViewColumn" id="wireless-list-column"/>
+                                        </child>
                                       </object>
                                     </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkGrid" id="grid2">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="halign">center</property>
-                                    <property name="valign">start</property>
-                                    <property name="row_spacing">10</property>
-                                    <property name="column_spacing">6</property>
-                                    <child>
-                                      <object class="GtkLabel" id="heading_wireless_strength">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="xalign">1</property>
-                                        <property name="label" translatable="yes">Signal Strength</property>
-                                        <property name="mnemonic_widget">label_wireless_strength</property>
-                                        <style>
-                                          <class name="dim-label"/>
-                                        </style>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">0</property>
-                                        <property name="top_attach">1</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="heading_wireless_speed">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="xalign">1</property>
-                                        <property name="label" translatable="yes">Link Speed</property>
-                                        <property name="mnemonic_widget">label_wireless_speed</property>
-                                        <style>
-                                          <class name="dim-label"/>
-                                        </style>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">0</property>
-                                        <property name="top_attach">2</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="heading_wireless_mac">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="xalign">1</property>
-                                        <property name="label" translatable="yes">Hardware Address</property>
-                                        <property name="mnemonic_widget">label_wireless_mac</property>
-                                        <style>
-                                          <class name="dim-label"/>
-                                        </style>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">0</property>
-                                        <property name="top_attach">6</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="heading_wireless_ipv4">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="xalign">1</property>
-                                        <property name="label" translatable="yes">IPv4 Address</property>
-                                        <property name="mnemonic_widget">label_wireless_ipv4</property>
-                                        <style>
-                                          <class name="dim-label"/>
-                                        </style>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">0</property>
-                                        <property name="top_attach">4</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="heading_wireless_ipv6">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="xalign">1</property>
-                                        <property name="label" translatable="yes">IPv6 Address</property>
-                                        <property name="mnemonic_widget">label_wireless_ipv6</property>
-                                        <style>
-                                          <class name="dim-label"/>
-                                        </style>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">0</property>
-                                        <property name="top_attach">5</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="heading_wireless_route">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="xalign">1</property>
-                                        <property name="label" translatable="yes">Default Route</property>
-                                        <property name="mnemonic_widget">label_wireless_route</property>
-                                        <style>
-                                          <class name="dim-label"/>
-                                        </style>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">0</property>
-                                        <property name="top_attach">7</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="heading_wireless_dns">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="xalign">1</property>
-                                        <property name="yalign">0</property>
-                                        <property name="label" translatable="yes">DNS</property>
-                                        <property name="mnemonic_widget">label_wireless_dns</property>
-                                        <style>
-                                          <class name="dim-label"/>
-                                        </style>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">0</property>
-                                        <property name="top_attach">8</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="label_wireless_strength">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="xalign">0</property>
-                                        <property name="label">Good</property>
-                                        <property name="selectable">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="top_attach">1</property>
-                                        <property name="width">2</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="label_wireless_speed">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="xalign">0</property>
-                                        <property name="label">1 MB/s</property>
-                                        <property name="selectable">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="top_attach">2</property>
-                                        <property name="width">2</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="label_wireless_mac">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="xalign">0</property>
-                                        <property name="label">AA:BB:CC:DD:55:66:77:88</property>
-                                        <property name="selectable">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="top_attach">6</property>
-                                        <property name="width">2</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="label_wireless_ipv4">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="xalign">0</property>
-                                        <property name="label">127.0.0.1</property>
-                                        <property name="selectable">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="top_attach">4</property>
-                                        <property name="width">2</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="label_wireless_ipv6">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="xalign">0</property>
-                                        <property name="label">::1</property>
-                                        <property name="selectable">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="top_attach">5</property>
-                                        <property name="width">2</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="label_wireless_route">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="xalign">0</property>
-                                        <property name="label">127.0.0.1</property>
-                                        <property name="selectable">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="top_attach">7</property>
-                                        <property name="width">2</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
                                     <child>
-                                      <object class="GtkLabel" id="label_wireless_dns">
+                                      <object class="GtkButton" id="hidden-wireless-button">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="xalign">0</property>
-                                        <property name="yalign">0</property>
-                                        <property name="label">127.0.0.1</property>
-                                        <property name="wrap">True</property>
-                                        <property name="selectable">True</property>
+                                        <property name="label">Connect to a _Hidden Network</property>
+                                        <property name="use-underline">True</property>
+                                        <property name="margin-left">12</property>
+                                        <property name="margin-right">12</property>
+                                        <property name="margin-top">6</property>
+                                        <property name="margin-bottom">12</property>
+                                        <property name="halign">start</property>
                                       </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="top_attach">8</property>
-                                        <property name="width">2</property>
-                                        <property name="height">1</property>
-                                      </packing>
                                     </child>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkVBox" id="vbox5">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="border_width">12</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkBox" id="wireless-top-hbox">
+                                <property name="visible">True</property>
+                                <property name="orientation">horizontal</property>
+                                <child>
+                                  <object class="GtkButton" id="wireless-back-button">
+                                    <property name="visible">True</property>
+                                    <property name="halign">start</property>
+                                    <property name="valign">center</property>
+                                    <property name="hexpand">True</property>
+                                    <property name="vexpand">False</property>
                                     <child>
-                                      <object class="GtkAlignment" id="alignment_wireless_switch">
+                                      <object class="GtkArrow" id="wireless-back-arrow">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="halign">end</property>
-                                        <property name="valign">start</property>
+                                        <property name="arrow-type">left</property>
                                       </object>
-                                      <packing>
-                                        <property name="left_attach">2</property>
-                                        <property name="top_attach">0</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
                                     </child>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkBox" id="vbox3">
+                                    <property name="visible">True</property>
+                                    <property name="orientation">vertical</property>
+                                    <property name="valign">center</property>
+                                    <property name="halign">fill</property>
+                                    <property name="hexpand">True</property>
+                                    <property name="vexpand">False</property>
+                                    <property name="spacing">3</property>
                                     <child>
-                                      <object class="GtkLabel" id="heading_wireless_security">
+                                      <object class="GtkLabel" id="wireless-network-name-label">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="xalign">1</property>
-                                        <property name="label" translatable="yes">Security</property>
-                                        <property name="mnemonic_widget">label_wireless_security</property>
-                                        <style>
-                                          <class name="dim-label"/>
-                                        </style>
+                                        <property name="label">Connected</property>
+                                        <property name="ellipsize">end</property>
+                                        <attributes>
+                                          <attribute name="weight" value="bold"/>
+                                          <attribute name="scale" value="1.2"/>
+                                        </attributes>
                                       </object>
                                       <packing>
-                                        <property name="left_attach">0</property>
-                                        <property name="top_attach">3</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkLabel" id="label_wireless_security">
+                                      <object class="GtkLabel" id="label_wireless_status">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="xalign">0</property>
-                                        <property name="label">WPA</property>
-                                        <property name="selectable">True</property>
+                                        <property name="label">Not connected</property>
                                       </object>
                                       <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="top_attach">3</property>
-                                        <property name="width">2</property>
-                                        <property name="height">1</property>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
                                       </packing>
                                     </child>
                                   </object>
+                                </child>
+                                <child>
+                                  <object class="GtkButton" id="wireless-disconnect-button">
+                                    <property name="visible">True</property>
+                                    <property name="use-underline">True</property>
+                                    <property name="label">_Disconnect</property>
+                                    <property name="valign">center</property>
+                                    <property name="halign">end</property>
+                                    <property name="hexpand">True</property>
+                                    <property name="vexpand">False</property>
+                                  </object>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkGrid" id="grid2">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="halign">center</property>
+                                <property name="valign">start</property>
+                                <property name="row_spacing">10</property>
+                                <property name="column_spacing">6</property>
+                                <child>
+                                  <object class="GtkLabel" id="heading_wireless_strength">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">1</property>
+                                    <property name="label" translatable="yes">Signal Strength</property>
+                                    <property name="mnemonic_widget">label_wireless_strength</property>
+                                    <style>
+                                      <class name="dim-label"/>
+                                    </style>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">0</property>
+                                    <property name="top_attach">1</property>
+                                    <property name="width">1</property>
+                                    <property name="height">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="heading_wireless_speed">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">1</property>
+                                    <property name="label" translatable="yes">Link Speed</property>
+                                    <property name="mnemonic_widget">label_wireless_speed</property>
+                                    <style>
+                                      <class name="dim-label"/>
+                                    </style>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">0</property>
+                                    <property name="top_attach">2</property>
+                                    <property name="width">1</property>
+                                    <property name="height">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="heading_wireless_mac">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">1</property>
+                                    <property name="label" translatable="yes">Hardware Address</property>
+                                    <property name="mnemonic_widget">label_wireless_mac</property>
+                                    <style>
+                                      <class name="dim-label"/>
+                                    </style>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">0</property>
+                                    <property name="top_attach">6</property>
+                                    <property name="width">1</property>
+                                    <property name="height">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="heading_wireless_ipv4">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">1</property>
+                                    <property name="label" translatable="yes">IPv4 Address</property>
+                                    <property name="mnemonic_widget">label_wireless_ipv4</property>
+                                    <style>
+                                      <class name="dim-label"/>
+                                    </style>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">0</property>
+                                    <property name="top_attach">4</property>
+                                    <property name="width">1</property>
+                                    <property name="height">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="heading_wireless_ipv6">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">1</property>
+                                    <property name="label" translatable="yes">IPv6 Address</property>
+                                    <property name="mnemonic_widget">label_wireless_ipv6</property>
+                                    <style>
+                                      <class name="dim-label"/>
+                                    </style>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">0</property>
+                                    <property name="top_attach">5</property>
+                                    <property name="width">1</property>
+                                    <property name="height">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="heading_wireless_route">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">1</property>
+                                    <property name="label" translatable="yes">Default Route</property>
+                                    <property name="mnemonic_widget">label_wireless_route</property>
+                                    <style>
+                                      <class name="dim-label"/>
+                                    </style>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">0</property>
+                                    <property name="top_attach">7</property>
+                                    <property name="width">1</property>
+                                    <property name="height">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="heading_wireless_dns">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">1</property>
+                                    <property name="yalign">0</property>
+                                    <property name="label" translatable="yes">DNS</property>
+                                    <property name="mnemonic_widget">label_wireless_dns</property>
+                                    <style>
+                                      <class name="dim-label"/>
+                                    </style>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">0</property>
+                                    <property name="top_attach">8</property>
+                                    <property name="width">1</property>
+                                    <property name="height">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="label_wireless_strength">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label">Good</property>
+                                    <property name="selectable">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="top_attach">1</property>
+                                    <property name="width">2</property>
+                                    <property name="height">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="label_wireless_speed">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label">1 MB/s</property>
+                                    <property name="selectable">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="top_attach">2</property>
+                                    <property name="width">2</property>
+                                    <property name="height">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="label_wireless_mac">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label">AA:BB:CC:DD:55:66:77:88</property>
+                                    <property name="selectable">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="top_attach">6</property>
+                                    <property name="width">2</property>
+                                    <property name="height">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="label_wireless_ipv4">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label">127.0.0.1</property>
+                                    <property name="selectable">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="top_attach">4</property>
+                                    <property name="width">2</property>
+                                    <property name="height">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="label_wireless_ipv6">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label">::1</property>
+                                    <property name="selectable">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="top_attach">5</property>
+                                    <property name="width">2</property>
+                                    <property name="height">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="label_wireless_route">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label">127.0.0.1</property>
+                                    <property name="selectable">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="top_attach">7</property>
+                                    <property name="width">2</property>
+                                    <property name="height">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="label_wireless_dns">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">0</property>
+                                    <property name="yalign">0</property>
+                                    <property name="label">127.0.0.1</property>
+                                    <property name="wrap">True</property>
+                                    <property name="selectable">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="top_attach">8</property>
+                                    <property name="width">2</property>
+                                    <property name="height">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkAlignment" id="alignment_wireless_switch">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="halign">end</property>
+                                    <property name="valign">start</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">2</property>
+                                    <property name="top_attach">0</property>
+                                    <property name="width">1</property>
+                                    <property name="height">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="heading_wireless_security">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">1</property>
+                                    <property name="label" translatable="yes">Security</property>
+                                    <property name="mnemonic_widget">label_wireless_security</property>
+                                    <style>
+                                      <class name="dim-label"/>
+                                    </style>
+                                  </object>
                                   <packing>
-                                    <property name="expand">True</property>
+                                    <property name="left_attach">0</property>
+                                    <property name="top_attach">3</property>
+                                    <property name="width">1</property>
+                                    <property name="height">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="label_wireless_security">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label">WPA</property>
+                                    <property name="selectable">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="top_attach">3</property>
+                                    <property name="width">2</property>
+                                    <property name="height">1</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkBox" id="box2">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="margin_top">12</property>
+                                <child>
+                                  <object class="GtkButton" id="button_wireless_button">
+                                    <property name="label" translatable="yes">_Forget</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="halign">start</property>
+                                    <property name="valign">end</property>
+                                    <property name="hexpand">True</property>
+                                    <property name="vexpand">True</property>
+                                    <property name="use_underline">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
                                     <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkBox" id="box2">
+                                  <object class="GtkButton" id="button_wireless_options">
+                                    <property name="label" translatable="yes">_Settings</property>
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="margin_top">12</property>
-                                    <child>
-                                      <object class="GtkButton" id="button_wireless_button">
-                                        <property name="label" translatable="yes">_Forget</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="halign">start</property>
-                                        <property name="valign">end</property>
-                                        <property name="hexpand">True</property>
-                                        <property name="vexpand">True</property>
-                                        <property name="use_underline">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkButton" id="button_wireless_options">
-                                        <property name="label" translatable="yes">_Settings</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">True</property>
-                                        <property name="halign">end</property>
-                                        <property name="valign">end</property>
-                                        <property name="hexpand">True</property>
-                                        <property name="vexpand">True</property>
-                                        <property name="use_underline">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">2</property>
-                                      </packing>
-                                    </child>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">True</property>
+                                    <property name="halign">end</property>
+                                    <property name="valign">end</property>
+                                    <property name="hexpand">True</property>
+                                    <property name="vexpand">True</property>
+                                    <property name="use_underline">True</property>
                                   </object>
                                   <packing>
-                                    <property name="expand">True</property>
+                                    <property name="expand">False</property>
                                     <property name="fill">True</property>
                                     <property name="position">2</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
-                                <property name="position">1</property>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">2</property>
                               </packing>
-                         </child>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
                       </object>
                     </child>
                     <child type="tab">
@@ -1233,7 +1232,6 @@
                         <property name="label">wireless</property>
                       </object>
                       <packing>
-                        <property name="position">1</property>
                         <property name="tab_fill">False</property>
                       </packing>
                     </child>
@@ -1604,9 +1602,6 @@
                           </packing>
                         </child>
                       </object>
-                      <packing>
-                        <property name="position">2</property>
-                      </packing>
                     </child>
                     <child type="tab">
                       <object class="GtkLabel" id="label17">
@@ -1615,7 +1610,6 @@
                         <property name="label">mobilebb</property>
                       </object>
                       <packing>
-                        <property name="position">2</property>
                         <property name="tab_fill">False</property>
                       </packing>
                     </child>
@@ -1930,9 +1924,6 @@
                           </packing>
                         </child>
                       </object>
-                      <packing>
-                        <property name="position">2</property>
-                      </packing>
                     </child>
                     <child type="tab">
                       <object class="GtkLabel" id="label55">
@@ -1941,7 +1932,6 @@
                         <property name="label">vpn</property>
                       </object>
                       <packing>
-                        <property name="position">2</property>
                         <property name="tab_fill">False</property>
                       </packing>
                     </child>
@@ -2351,9 +2341,6 @@
                           </packing>
                         </child>
                       </object>
-                      <packing>
-                        <property name="position">2</property>
-                      </packing>
                     </child>
                     <child type="tab">
                       <object class="GtkLabel" id="label46">
@@ -2362,18 +2349,6 @@
                         <property name="label">proxy</property>
                       </object>
                       <packing>
-                        <property name="position">2</property>
-                        <property name="tab_fill">False</property>
-                      </packing>
-                    </child>
-                    <child type="tab">
-                      <object class="GtkLabel" id="label37">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label">other</property>
-                      </object>
-                      <packing>
-                        <property name="position">2</property>
                         <property name="tab_fill">False</property>
                       </packing>
                     </child>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]