[PATCH 5/5] Update the BaseWindow and HubWindow example UI fragments

David Shea dshea at redhat.com
Tue Mar 25 17:52:36 UTC 2014


---
 widgets/src/BaseWindow.c | 37 ++++++++++++++++++++++++++++---------
 widgets/src/HubWindow.c  | 40 +++++++++++++++++++++++++++++-----------
 2 files changed, 57 insertions(+), 20 deletions(-)

diff --git a/widgets/src/BaseWindow.c b/widgets/src/BaseWindow.c
index fde2dbd..7fcb296 100644
--- a/widgets/src/BaseWindow.c
+++ b/widgets/src/BaseWindow.c
@@ -46,22 +46,41 @@
  * <refsect2 id="AnacondaBaseWindow-BUILDER-UI"><title>AnacondaBaseWindow as GtkBuildable</title>
  * <para>
  * The AnacondaBaseWindow implementation of the #GtkBuildable interface exposes
- * the @action_area as an internal child with the name "action_area".
+ * the @nav_area as an internal child with the name "nav_area" and the
+ * @action_area as an internal child with the name "action_area".
  * </para>
  * <example>
  * <title>A <structname>AnacondaBaseWindow</structname> UI definition fragment.</title>
  * <programlisting><![CDATA[
  * <object class="AnacondaBaseWindow" id="window1">
- *     <child internal-child="action_area">
- *         <object class="GtkVBox" id="vbox1">
- *             <child>
- *                 <object class="GtkLabel" id="label1">
- *                     <property name="label" translatable="yes">THIS IS ONE LABEL</property>
+ *     <child internal-child="main_box">
+ *         <object class="GtkBox" id="main_box1">
+ *             <child internal-child="nav_box">
+ *                 <object class="GtkEventBox" id="nav_box1">
+ *                     <child internal-child="nav_area">
+ *                         <object class="GtkGrid" id="nav_area1">
+ *                             <child>...</child>
+ *                             <child>...</child>
+ *                         </object>
+ *                     </child>
  *                 </object>
  *             </child>
- *             <child>
- *                 <object class="GtkLabel" id="label2">
- *                     <property name="label" translatable="yes">THIS IS ANOTHER LABEL</property>
+ *             <child internal-child="alignment">
+ *                 <object class="GtkAlignment" id="alignment1">
+ *                     <child internal-child="action_area">
+ *                         <object class="GtkBox" id="action_area1">
+ *                             <child>
+ *                                 <object class="GtkLabel" id="label1">
+ *                                     <property name="label" translatable="yes">THIS IS ONE LABEL</property>
+ *                                 </object>
+ *                             </child>
+ *                             <child>
+ *                                 <object class="GtkLabel" id="label2">
+ *                                     <property name="label" translatable="yes">THIS IS ANOTHER LABEL</property>
+ *                                 </object>
+ *                             </child>
+ *                         </object>
+ *                     </child>
  *                 </object>
  *             </child>
  *         </object>
diff --git a/widgets/src/HubWindow.c b/widgets/src/HubWindow.c
index def4e34..fe5142c 100644
--- a/widgets/src/HubWindow.c
+++ b/widgets/src/HubWindow.c
@@ -45,27 +45,45 @@
  * <refsect2 id="AnacondaHubWindow-BUILDER-UI"><title>AnacondaHubWindow as GtkBuildable</title>
  * <para>
  * The AnacondaHubWindow implementation of the #GtkBuildable interface exposes
- * the @action_area and @scrolled_window as internal children with the names
- * "action_area" and "scrolled_window".  action_area, in this case, is largely
- * there to give a box to contain both the scrolled_window and a #GtkButtonBox.
+ * the @nav_area, @action_area and @scrolled_window as internal children with the names
+ * "nav_area", "action_area" and "scrolled_window".  action_area, in this case,
+ * is largely there to give a box to contain both the scrolled_window and a
+ * #GtkButtonBox.
  * </para>
  * <example>
  * <title>A <structname>AnacondaHubWindow</structname> UI definition fragment.</title>
  * <programlisting><![CDATA[
  * <object class="AnacondaHubWindow" id="hub1">
- *     <child internal-child="action_area">
- *         <object class="GtkVBox" id="vbox1">
- *             <child internal-child="scrolled_window">
- *                 <object class="GtkScrolledWindow" id="window1">
- *                     <child>...</child>
+ *     <child internal-child="main_box">
+ *         <object class="GtkBox" id="main_box1">
+ *             <child internal-child="nav_box">
+ *                 <object class="GtkEventBox" id="nav_box1">
+ *                     <child internal-child="nav_area">
+ *                         <object class="GtkGrid" id="nav_area1">
+ *                             <child>...</child>
+ *                             <child>...</child>
+ *                         </object>
+ *                     </child>
  *                 </object>
  *             </child>
- *             <child>
- *                 <object class="GtkHButtonBox" id="buttonbox1">
- *                     <child>...</child>
+ *             <child internal-child="alignment">
+ *                 <object class="GtkAlignment" id="alignment1">
+ *                     <child internal-child="action_area">
+ *                         <object class="GtkBox" id="action_area1">
+ *                             <child internal-child="scrolled_window">
+ *                                 <object class="GtkScrolledWindow" id="scrolled_window1">
+ *                                     <child>...</child>
+ *                                 </object>
+ *                             </child>
+ *                         </object>
+ *                     </child>
  *                 </object>
  *             </child>
  *         </object>
+ *     <child>
+ *         <object class="GtkButtonBox" id="buttonbox1">
+ *             <child>...</child>
+ *         </object>
  *     </child>
  * </object>
  * ]]></programlisting>
-- 
1.9.0



More information about the anaconda-patches mailing list