[gtk/matthiasc/for-master] gtk-demo: Polish all entry demos

[Matthias Clasen <matthiasc src gnome org>]

commit 4e745f06e9fb730d291556c4a744d4f4802c6e49
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Nov 2 12:01:11 2020 -0500

    gtk-demo: Polish all entry demos
    
    Make the spacing a bit more consistent, and tweak
    some strings here and there.

 demos/gtk-demo/entry_completion.c | 10 +++++-----
 demos/gtk-demo/entry_undo.c       | 12 ++++++------
 demos/gtk-demo/search_entry.c     | 23 +++++++++--------------
 3 files changed, 20 insertions(+), 25 deletions(-)
---
diff --git a/demos/gtk-demo/entry_completion.c b/demos/gtk-demo/entry_completion.c
index 40d64bd8b6..9afa30f22b 100644
--- a/demos/gtk-demo/entry_completion.c
+++ b/demos/gtk-demo/entry_completion.c
@@ -78,11 +78,11 @@ do_entry_completion (GtkWidget *do_widget)
       gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
-      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-      gtk_widget_set_margin_start (vbox, 5);
-      gtk_widget_set_margin_end (vbox, 5);
-      gtk_widget_set_margin_top (vbox, 5);
-      gtk_widget_set_margin_bottom (vbox, 5);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
+      gtk_widget_set_margin_start (vbox, 18);
+      gtk_widget_set_margin_end (vbox, 18);
+      gtk_widget_set_margin_top (vbox, 18);
+      gtk_widget_set_margin_bottom (vbox, 18);
       gtk_window_set_child (GTK_WINDOW (window), vbox);
 
       label = gtk_label_new (NULL);
diff --git a/demos/gtk-demo/entry_undo.c b/demos/gtk-demo/entry_undo.c
index 41c4965ecf..37cbe7037b 100644
--- a/demos/gtk-demo/entry_undo.c
+++ b/demos/gtk-demo/entry_undo.c
@@ -27,16 +27,16 @@ do_entry_undo (GtkWidget *do_widget)
       gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
-      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-      gtk_widget_set_margin_start (vbox, 5);
-      gtk_widget_set_margin_end (vbox, 5);
-      gtk_widget_set_margin_top (vbox, 5);
-      gtk_widget_set_margin_bottom (vbox, 5);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
+      gtk_widget_set_margin_start (vbox, 18);
+      gtk_widget_set_margin_end (vbox, 18);
+      gtk_widget_set_margin_top (vbox, 18);
+      gtk_widget_set_margin_bottom (vbox, 18);
       gtk_window_set_child (GTK_WINDOW (window), vbox);
 
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label),
-                            "Use Primary+z or Primary+Shift+z to undo or redo changes");
+                            "Use Control+z or Control+Shift+z to undo or redo changes");
       gtk_box_append (GTK_BOX (vbox), label);
 
       /* Create our entry */
diff --git a/demos/gtk-demo/search_entry.c b/demos/gtk-demo/search_entry.c
index 7e2f1d8f76..ce92b85c01 100644
--- a/demos/gtk-demo/search_entry.c
+++ b/demos/gtk-demo/search_entry.c
@@ -110,17 +110,17 @@ set_search_by (GSimpleAction *action,
   if (g_str_equal (term, "name"))
     {
       gtk_entry_set_icon_tooltip_text (entry, GTK_ENTRY_ICON_PRIMARY, "Search by name");
-      gtk_entry_set_placeholder_text (entry, "name");
+      gtk_entry_set_placeholder_text (entry, "Name…");
     }
   else if (g_str_equal (term, "description"))
     {
       gtk_entry_set_icon_tooltip_text (entry, GTK_ENTRY_ICON_PRIMARY, "Search by description");
-      gtk_entry_set_placeholder_text (entry, "description");
+      gtk_entry_set_placeholder_text (entry, "Description…");
     }
   else if (g_str_equal (term, "filename"))
     {
       gtk_entry_set_icon_tooltip_text (entry, GTK_ENTRY_ICON_PRIMARY, "Search by file name");
-      gtk_entry_set_placeholder_text (entry, "file name");
+      gtk_entry_set_placeholder_text (entry, "File name…");
     }
 }
 
@@ -254,7 +254,6 @@ do_search_entry (GtkWidget *do_widget)
 {
   GtkWidget *vbox;
   GtkWidget *hbox;
-  GtkWidget *label;
   GtkWidget *entry;
   GtkWidget *find_button;
   GtkWidget *cancel_button;
@@ -268,18 +267,14 @@ do_search_entry (GtkWidget *do_widget)
 
       g_object_weak_ref (G_OBJECT (window), search_entry_destroyed, &window);
 
-      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-      gtk_widget_set_margin_start (vbox, 5);
-      gtk_widget_set_margin_end (vbox, 5);
-      gtk_widget_set_margin_top (vbox, 5);
-      gtk_widget_set_margin_bottom (vbox, 5);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
+      gtk_widget_set_margin_start (vbox, 18);
+      gtk_widget_set_margin_end (vbox, 18);
+      gtk_widget_set_margin_top (vbox, 18);
+      gtk_widget_set_margin_bottom (vbox, 18);
       gtk_window_set_child (GTK_WINDOW (window), vbox);
 
-      label = gtk_label_new (NULL);
-      gtk_label_set_markup (GTK_LABEL (label), "Search entry demo");
-      gtk_box_append (GTK_BOX (vbox), label);
-
-      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
       gtk_box_append (GTK_BOX (vbox), hbox);
 
       /* Create our entry */