From 7bf7b7eab56617b786cacb8ff5bf06fffde83783 Mon Sep 17 00:00:00 2001
From: Nicola Fontana <ntd@entidi.it>
Date: Tue, 19 Mar 2013 22:24:50 +0100
Subject: [PATCH] demo: improved consistency in widgets names

Always prepend "edit" followed by uppercase name on widgets bound to
model data. This will make possible to connect signals automatically.
---
 demo/adg-demo.c     | 10 +++++-----
 demo/adg-demo.ui.in | 18 +++++++++---------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/demo/adg-demo.c b/demo/adg-demo.c
index f3a8fc46..a0179117 100644
--- a/demo/adg-demo.c
+++ b/demo/adg-demo.c
@@ -997,7 +997,7 @@ _adg_part_new(GtkBuilder *builder)
     g_signal_connect(part->area, "button-press-event",
                      G_CALLBACK(_adg_button_press), NULL);
 
-    toggle_object = gtk_builder_get_object(builder, "GROOVE");
+    toggle_object = gtk_builder_get_object(builder, "editGROOVE");
     _adg_part_link(part, &part->GROOVE, toggle_object);
 
     object = gtk_builder_get_object(builder, "editZGROOVE");
@@ -1024,10 +1024,10 @@ _adg_part_new(GtkBuilder *builder)
     g_signal_connect(toggle_object, "toggled",
                      G_CALLBACK(adg_gtk_toggle_button_sensitivize), object);
 
-    _adg_part_link(part, &part->TITLE, gtk_builder_get_object(builder, "txtTitle"));
-    _adg_part_link(part, &part->DRAWING, gtk_builder_get_object(builder, "txtDrawing"));
-    _adg_part_link(part, &part->AUTHOR, gtk_builder_get_object(builder, "txtAuthor"));
-    _adg_part_link(part, &part->DATE, gtk_builder_get_object(builder, "txtDate"));
+    _adg_part_link(part, &part->TITLE, gtk_builder_get_object(builder, "editTITLE"));
+    _adg_part_link(part, &part->DRAWING, gtk_builder_get_object(builder, "editDRAWING"));
+    _adg_part_link(part, &part->AUTHOR, gtk_builder_get_object(builder, "editAUTHOR"));
+    _adg_part_link(part, &part->DATE, gtk_builder_get_object(builder, "editDATE"));
 
     part->D5 = 4.5;
     part->RD34 = 1;
diff --git a/demo/adg-demo.ui.in b/demo/adg-demo.ui.in
index e3d2851a..8a21d2ea 100644
--- a/demo/adg-demo.ui.in
+++ b/demo/adg-demo.ui.in
@@ -774,7 +774,7 @@ Boston, MA  02110-1301, USA.</property>
                         <property name="n_columns">5</property>
                         <property name="row_spacing">6</property>
                         <child>
-                          <object class="GtkCheckButton" id="GROOVE">
+                          <object class="GtkCheckButton" id="editGROOVE">
                             <property name="label" translatable="yes">Groove machining</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -945,7 +945,7 @@ Boston, MA  02110-1301, USA.</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">_Title:</property>
                             <property name="use-underline">True</property>
-                            <property name="mnemonic-widget">txtTitle</property>
+                            <property name="mnemonic-widget">editTITLE</property>
                           </object>
                           <packing>
                             <property name="x-options">GTK_FILL</property>
@@ -953,7 +953,7 @@ Boston, MA  02110-1301, USA.</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkEntry" id="txtTitle">
+                          <object class="GtkEntry" id="editTITLE">
                             <property name="visible">True</property>
                             <property name="can-focus">True</property>
                             <property name="text" translatable="yes">SAMPLE DRAWING</property>
@@ -969,7 +969,7 @@ Boston, MA  02110-1301, USA.</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">_Drawing:</property>
                             <property name="use-underline">True</property>
-                            <property name="mnemonic-widget">txtDrawing</property>
+                            <property name="mnemonic-widget">editDRAWING</property>
                           </object>
                           <packing>
                             <property name="x-options">GTK_FILL</property>
@@ -979,7 +979,7 @@ Boston, MA  02110-1301, USA.</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkEntry" id="txtDrawing">
+                          <object class="GtkEntry" id="editDRAWING">
                             <property name="visible">True</property>
                             <property name="can-focus">True</property>
                             <property name="text" translatable="yes">EXAMPLE</property>
@@ -997,7 +997,7 @@ Boston, MA  02110-1301, USA.</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">A_uthor:</property>
                             <property name="use-underline">True</property>
-                            <property name="mnemonic-widget">txtAuthor</property>
+                            <property name="mnemonic-widget">editAUTHOR</property>
                           </object>
                           <packing>
                             <property name="x-options">GTK_FILL</property>
@@ -1007,7 +1007,7 @@ Boston, MA  02110-1301, USA.</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkEntry" id="txtAuthor">
+                          <object class="GtkEntry" id="editAUTHOR">
                             <property name="visible">True</property>
                             <property name="can-focus">True</property>
                             <property name="text" translatable="no">adg-demo</property>
@@ -1025,7 +1025,7 @@ Boston, MA  02110-1301, USA.</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">D_ate:</property>
                             <property name="use-underline">True</property>
-                            <property name="mnemonic-widget">txtDate</property>
+                            <property name="mnemonic-widget">editDATE</property>
                           </object>
                           <packing>
                             <property name="x-options">GTK_FILL</property>
@@ -1035,7 +1035,7 @@ Boston, MA  02110-1301, USA.</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkEntry" id="txtDate">
+                          <object class="GtkEntry" id="editDATE">
                             <property name="visible">True</property>
                             <property name="can-focus">True</property>
                             <property name="text" translatable="no">09/03/2011</property>
-- 
2.11.4.GIT