Attachment 86865 Details for Bug 69978 – glib: Show widgets altogether in annotations demo

[patch] glib: Show widgets altogether in annotations demo

0004-glib-Show-widgets-altogether-in-annotations-demo.patch (text/plain), 6.12 KB, created by Germán Poo-Caamaño on 2013-09-30 18:58:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Germán Poo-Caamaño

Created: 2013-09-30 18:58:48 UTC

Size: 6.12 KB

patch

obsolete

>From 27adb0ec5466aa90f0b3c56bbe1359781263c1c6 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Germ=C3=A1n=20Poo-Caama=C3=B1o?= <gpoo@gnome.org>
>Date: Sat, 21 Sep 2013 10:22:45 -0700
>Subject: [PATCH 4/8] glib: Show widgets altogether in annotations demo
>
>Simplify the code by aggregating the calls to show widgets
>instead of showing them one by one.
>---
> glib/demo/annots.c |   33 ++++-----------------------------
> 1 file changed, 4 insertions(+), 29 deletions(-)
>
>diff --git a/glib/demo/annots.c b/glib/demo/annots.c
>index d48b11e..55eadd8 100644
>--- a/glib/demo/annots.c
>+++ b/glib/demo/annots.c
>@@ -758,7 +758,7 @@ pgd_annots_add_annot (GtkWidget     *button,
> 					  GTK_WINDOW (gtk_widget_get_toplevel (button)),
> 					  GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
> 					  GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
>-					  "Add annotation", GTK_RESPONSE_ACCEPT,
>+					  "_Add annotation", GTK_RESPONSE_ACCEPT,
> 					  NULL);
> 
>     vbox = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
>@@ -768,7 +768,6 @@ pgd_annots_add_annot (GtkWidget     *button,
>     gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (type_selector), "POPPLER_ANNOT_TEXT");
>     gtk_combo_box_set_active (GTK_COMBO_BOX (type_selector), 1);
>     gtk_box_pack_start (GTK_BOX (vbox), type_selector, TRUE, TRUE, 0);
>-    gtk_widget_show (type_selector);
> 
>     hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
> 
>@@ -776,37 +775,29 @@ pgd_annots_add_annot (GtkWidget     *button,
> 
>     label = gtk_label_new ("x1:");
>     gtk_box_pack_start (GTK_BOX (rect_hbox), label, TRUE, TRUE, 0);
>-    gtk_widget_show (label);
> 
>     rect_x1 = gtk_spin_button_new_with_range (0, width, 1.0);
>     gtk_box_pack_start (GTK_BOX (rect_hbox), rect_x1, TRUE, TRUE, 0);
>-    gtk_widget_show (rect_x1);
> 
>     gtk_box_pack_start (GTK_BOX (hbox), rect_hbox, FALSE, TRUE, 0);
>-    gtk_widget_show (rect_hbox);
> 
>     rect_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
> 
>     label = gtk_label_new ("x2:");
>     gtk_box_pack_start (GTK_BOX (rect_hbox), label, TRUE, TRUE, 0);
>-    gtk_widget_show (label);
> 
>     rect_x2 = gtk_spin_button_new_with_range (0, width, 1.0);
>     gtk_box_pack_start (GTK_BOX (rect_hbox), rect_x2, TRUE, TRUE, 0);
>-    gtk_widget_show (rect_x2);
> 
>     gtk_box_pack_start (GTK_BOX (hbox), rect_hbox, FALSE, TRUE, 0);
>-    gtk_widget_show (rect_hbox);
> 
>     rect_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
> 
>     label = gtk_label_new ("y1:");
>     gtk_box_pack_start (GTK_BOX (rect_hbox), label, TRUE, TRUE, 0);
>-    gtk_widget_show (label);
> 
>     rect_y1 = gtk_spin_button_new_with_range (0, height, 1.0);
>     gtk_box_pack_start (GTK_BOX (rect_hbox), rect_y1, TRUE, TRUE, 0);
>-    gtk_widget_show (rect_y1);
> 
>     gtk_box_pack_start (GTK_BOX (hbox), rect_hbox, FALSE, TRUE, 0);
>     gtk_widget_show (rect_hbox);
>@@ -815,17 +806,14 @@ pgd_annots_add_annot (GtkWidget     *button,
> 
>     label = gtk_label_new ("y2:");
>     gtk_box_pack_start (GTK_BOX (rect_hbox), label, TRUE, TRUE, 0);
>-    gtk_widget_show (label);
> 
>     rect_y2 = gtk_spin_button_new_with_range (0, height, 1.0);
>     gtk_box_pack_start (GTK_BOX (rect_hbox), rect_y2, TRUE, TRUE, 0);
>-    gtk_widget_show (rect_y2);
> 
>     gtk_box_pack_start (GTK_BOX (hbox), rect_hbox, FALSE, TRUE, 0);
>-    gtk_widget_show (rect_hbox);
> 
>     gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
>-    gtk_widget_show (hbox);
>+    gtk_widget_show_all (vbox);
> 
>     gtk_dialog_run (GTK_DIALOG (dialog));
> 
>@@ -945,19 +933,16 @@ pgd_annots_create_widget (PopplerDocument *document)
> 
>     label = gtk_label_new ("Page:");
>     gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
>-    gtk_widget_show (label);
> 
>     page_selector = gtk_spin_button_new_with_range (1, n_pages, 1);
>     g_signal_connect (G_OBJECT (page_selector), "value-changed",
>                       G_CALLBACK (pgd_annots_page_selector_value_changed),
>                       (gpointer) demo);
>     gtk_box_pack_start (GTK_BOX (hbox), page_selector, FALSE, TRUE, 0);
>-    gtk_widget_show (page_selector);
> 
>     str = g_strdup_printf ("of %d", n_pages);
>     label = gtk_label_new (str);
>     gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
>-    gtk_widget_show (label);
>     g_free (str);
> 
>     button = gtk_button_new_with_label ("Add Annot");
>@@ -965,16 +950,14 @@ pgd_annots_create_widget (PopplerDocument *document)
> 		      G_CALLBACK (pgd_annots_add_annot),
> 		      (gpointer) demo);
>     gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
>-    gtk_widget_show (button);
> 
>     gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
>-    gtk_widget_show (hbox);
>+    gtk_widget_show_all (hbox);
> 
>     demo->timer_label = gtk_label_new (NULL);
>     gtk_label_set_markup (GTK_LABEL (demo->timer_label), "<i>No annots found</i>");
>     g_object_set (G_OBJECT (demo->timer_label), "xalign", 1.0, NULL);
>     gtk_box_pack_start (GTK_BOX (vbox), demo->timer_label, FALSE, TRUE, 0);
>-    gtk_widget_show (demo->timer_label);
> 
>     hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
> 
>@@ -1070,17 +1053,11 @@ pgd_annots_create_widget (PopplerDocument *document)
> 
>     /* Annotation's list */
>     gtk_container_add (GTK_CONTAINER (swindow), treeview);
>-    gtk_widget_show (treeview);
>-
>     gtk_box_pack_start (GTK_BOX (vbox2), swindow, TRUE, TRUE, 0);
>-    gtk_widget_show (swindow);
> 
>     /* Annotation Properties */
>     gtk_box_pack_start (GTK_BOX (vbox2), demo->annot_view, FALSE, FALSE, 6);
>-    gtk_widget_show (demo->annot_view);
>-
>     gtk_paned_add1 (GTK_PANED (hpaned), vbox2);
>-    gtk_widget_show (vbox2);
> 
>     /* Demo Area (Render) */
>     demo->darea = gtk_drawing_area_new ();
>@@ -1094,15 +1071,13 @@ pgd_annots_create_widget (PopplerDocument *document)
> #else
>     gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (swindow), demo->darea);
> #endif
>-    gtk_widget_show (demo->darea);
> 
>     gtk_paned_add2 (GTK_PANED (hpaned), swindow);
>-    gtk_widget_show (swindow);
> 
>     gtk_paned_set_position (GTK_PANED (hpaned), 300);
> 
>     gtk_box_pack_start (GTK_BOX (vbox), hpaned, TRUE, TRUE, 0);
>-    gtk_widget_show (hpaned);
>+    gtk_widget_show_all (hpaned);
> 
>     g_object_weak_ref (G_OBJECT (vbox),
>                        (GWeakNotify)pgd_annots_free,
>-- 
>1.7.9.5
>

Actions: View | Splinter Review

Attachments on bug 69978: 86862 | 86863 | 86864 | 86865 | 86866 | 86867 | 86868 | 86869 | 87129 | 87139 | 87141 | 87142 | 88159 | 88160 | 88199

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.