[PATCH 02/10] Vlan support: GUI - add "Parent" and "Vlan ID" info (glade) (#906272)

Radek Vykydal rvykydal at redhat.com
Mon Mar 11 13:15:24 UTC 2013


---
 pyanaconda/ui/gui/spokes/network.glade | 231 ++++++++++++++++++++++-----------
 1 file changed, 156 insertions(+), 75 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/network.glade b/pyanaconda/ui/gui/spokes/network.glade
index 7f084dd..11b9c99 100644
--- a/pyanaconda/ui/gui/spokes/network.glade
+++ b/pyanaconda/ui/gui/spokes/network.glade
@@ -432,71 +432,81 @@ updates available for you.</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkLabel" id="heading_wired_mac">
+                                          <object class="GtkAlignment" id="alignment_wired_switch">
                                             <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="halign">end</property>
+                                            <property name="valign">start</property>
+                                            <child>
+                                              <object class="GtkSwitch" id="device_wired_off_switch">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="halign">end</property>
+                                                <property name="valign">start</property>
+                                              </object>
+                                            </child>
                                           </object>
                                           <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">2</property>
+                                            <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_wired_speed">
+                                          <object class="GtkLabel" id="heading_wired_slaves">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">Speed</property>
+                                            <property name="label" translatable="yes">Slaves</property>
                                           </object>
                                           <packing>
                                             <property name="left_attach">0</property>
-                                            <property name="top_attach">3</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_wired_ipv4">
+                                          <object class="GtkLabel" id="label_wired_slaves">
                                             <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="xalign">0</property>
                                           </object>
                                           <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">4</property>
+                                            <property name="left_attach">1</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_wired_ipv6">
+                                          <object class="GtkLabel" id="heading_wired_dns">
                                             <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="yalign">0</property>
+                                            <property name="label" translatable="yes">DNS</property>
                                           </object>
                                           <packing>
                                             <property name="left_attach">0</property>
-                                            <property name="top_attach">5</property>
+                                            <property name="top_attach">10</property>
                                             <property name="width">1</property>
                                             <property name="height">1</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkLabel" id="heading_wired_subnet">
+                                          <object class="GtkLabel" id="label_wired_dns">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">Subnet Mask</property>
+                                            <property name="xalign">0</property>
+                                            <property name="yalign">0</property>
+                                            <property name="label">127.0.0.1</property>
+                                            <property name="wrap">True</property>
                                           </object>
                                           <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">6</property>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">10</property>
                                             <property name="width">1</property>
                                             <property name="height">1</property>
                                           </packing>
@@ -510,18 +520,31 @@ updates available for you.</property>
                                           </object>
                                           <packing>
                                             <property name="left_attach">0</property>
-                                            <property name="top_attach">7</property>
+                                            <property name="top_attach">9</property>
                                             <property name="width">1</property>
                                             <property name="height">1</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkLabel" id="heading_wired_dns">
+                                          <object class="GtkLabel" id="label_wired_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>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">9</property>
+                                            <property name="width">1</property>
+                                            <property name="height">1</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_wired_subnet">
                                             <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="label" translatable="yes">Subnet Mask</property>
                                           </object>
                                           <packing>
                                             <property name="left_attach">0</property>
@@ -531,30 +554,58 @@ updates available for you.</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkLabel" id="label_wired_mac">
+                                          <object class="GtkLabel" id="label_wired_subnet">
                                             <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="label">127.0.0.1</property>
                                           </object>
                                           <packing>
                                             <property name="left_attach">1</property>
-                                            <property name="top_attach">2</property>
-                                            <property name="width">2</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_wired_speed">
+                                          <object class="GtkLabel" id="heading_wired_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>
+                                          </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="label_wired_ipv6">
                                             <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="label">::1</property>
                                           </object>
                                           <packing>
                                             <property name="left_attach">1</property>
-                                            <property name="top_attach">3</property>
-                                            <property name="width">2</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_wired_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>
+                                          </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>
@@ -567,120 +618,150 @@ updates available for you.</property>
                                           </object>
                                           <packing>
                                             <property name="left_attach">1</property>
-                                            <property name="top_attach">4</property>
-                                            <property name="width">2</property>
+                                            <property name="top_attach">6</property>
+                                            <property name="width">1</property>
                                             <property name="height">1</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkLabel" id="label_wired_ipv6">
+                                          <object class="GtkLabel" id="heading_wired_speed">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label">::1</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes">Speed</property>
                                           </object>
                                           <packing>
-                                            <property name="left_attach">1</property>
+                                            <property name="left_attach">0</property>
                                             <property name="top_attach">5</property>
-                                            <property name="width">2</property>
+                                            <property name="width">1</property>
                                             <property name="height">1</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkLabel" id="label_wired_subnet">
+                                          <object class="GtkLabel" id="label_wired_speed">
                                             <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="label">1 Mb/s</property>
                                           </object>
                                           <packing>
                                             <property name="left_attach">1</property>
-                                            <property name="top_attach">6</property>
-                                            <property name="width">2</property>
+                                            <property name="top_attach">5</property>
+                                            <property name="width">1</property>
                                             <property name="height">1</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkLabel" id="label_wired_route">
+                                          <object class="GtkLabel" id="heading_wired_mac">
                                             <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="xalign">1</property>
+                                            <property name="label" translatable="yes">Hardware Address</property>
                                           </object>
                                           <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">7</property>
-                                            <property name="width">2</property>
+                                            <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="label_wired_dns">
+                                          <placeholder/>
+                                        </child>
+                                        <child>
+                                          <placeholder/>
+                                        </child>
+                                        <child>
+                                          <placeholder/>
+                                        </child>
+                                        <child>
+                                          <placeholder/>
+                                        </child>
+                                        <child>
+                                          <placeholder/>
+                                        </child>
+                                        <child>
+                                          <placeholder/>
+                                        </child>
+                                        <child>
+                                          <placeholder/>
+                                        </child>
+                                        <child>
+                                          <placeholder/>
+                                        </child>
+                                        <child>
+                                          <placeholder/>
+                                        </child>
+                                        <child>
+                                          <placeholder/>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label_wired_mac">
                                             <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="label">AA:BB:CC:DD:55:66:77:88</property>
                                           </object>
                                           <packing>
                                             <property name="left_attach">1</property>
-                                            <property name="top_attach">8</property>
-                                            <property name="width">2</property>
+                                            <property name="top_attach">4</property>
+                                            <property name="width">1</property>
                                             <property name="height">1</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkAlignment" id="alignment_wired_switch">
+                                          <object class="GtkLabel" id="heading_wired_parent">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="halign">end</property>
-                                            <property name="valign">start</property>
-                                            <child>
-                                              <object class="GtkSwitch" id="device_wired_off_switch">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">True</property>
-                                                <property name="halign">end</property>
-                                                <property name="valign">start</property>
-                                              </object>
-                                            </child>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes">Parent</property>
                                           </object>
                                           <packing>
-                                            <property name="left_attach">2</property>
-                                            <property name="top_attach">0</property>
+                                            <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_wired_slaves">
+                                          <object class="GtkLabel" id="heading_wired_vlanid">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">Slaves</property>
+                                            <property name="label" translatable="yes">Vlan ID</property>
                                           </object>
                                           <packing>
                                             <property name="left_attach">0</property>
-                                            <property name="top_attach">1</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_wired_slaves">
+                                          <object class="GtkLabel" id="label_wired_parent">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="xalign">0</property>
                                           </object>
                                           <packing>
                                             <property name="left_attach">1</property>
-                                            <property name="top_attach">1</property>
+                                            <property name="top_attach">2</property>
                                             <property name="width">1</property>
                                             <property name="height">1</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <placeholder/>
+                                          <object class="GtkLabel" id="label_wired_vlanid">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="xalign">0</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">3</property>
+                                            <property name="width">1</property>
+                                            <property name="height">1</property>
+                                          </packing>
                                         </child>
                                       </object>
                                       <packing>
-- 
1.7.11.7



More information about the anaconda-patches mailing list