Attachment 95215 Details for Bug 75828 – Patch

Patch

0001-glib-Show-structure-element-standard-attributes-in-d.patch (text/plain), 26.97 KB, created by Adrian Perez de Castro on 2014-03-06 09:33:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adrian Perez de Castro

Created: 2014-03-06 09:33:41 UTC

Size: 26.97 KB

patch

obsolete

>From f9f2849b035b8de9ccf0ec2f45778e1078249733 Mon Sep 17 00:00:00 2001
>From: Adrian Perez de Castro <aperez@igalia.com>
>Date: Thu, 6 Mar 2014 10:36:32 +0200
>Subject: [PATCH] glib: Show structure element standard attributes in demo
>
>In poppler-glib-demo, display the values of the standard structure element
>attributes. This also makes the grid view scrollable to make it possible to
>see all the attributes when the window is small, and the horizontal GtkBox
>is changed to a GtkPane, to make it possible to resize the tree in the left
>column.
>---
> glib/demo/taggedstruct.c | 494 ++++++++++++++++++++++++++++++++++++++++++++---
> 1 file changed, 472 insertions(+), 22 deletions(-)
>
>diff --git a/glib/demo/taggedstruct.c b/glib/demo/taggedstruct.c
>index f5870f5..bf316ae 100644
>--- a/glib/demo/taggedstruct.c
>+++ b/glib/demo/taggedstruct.c
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (C) 2013 Igalia S.L.
>+ * Copyright (C) 2013-2014 Igalia S.L.
> *
> * This program is free software; you can redistribute it and/or modify
> * it under the terms of the GNU General Public License as published by
>@@ -24,11 +24,44 @@
> typedef struct {
> GtkWidget *view;
> GtkTreeStore *store;
>+ GdkPixbuf *checkerboard;
>+ GtkWidget *page_num;
>+ GtkWidget *bounding_box;
>+ GtkWidget *padding;
> GtkWidget *type_value;
> GtkWidget *lang_value;
> GtkWidget *abbr_value;
> GtkWidget *id_value;
> GtkWidget *title_value;
>+ GtkWidget *alt_text;
>+ GtkWidget *actual_text;
>+ GtkWidget *placement;
>+ GtkWidget *writing_mode;
>+ GtkWidget *text_align;
>+ GtkWidget *block_align;
>+ GtkWidget *inline_align;
>+ GtkWidget *line_height_shift;
>+ GtkWidget *text_decoration;
>+ GtkWidget *text_decoration_color;
>+ GtkWidget *text_decoration_thickness;
>+ GtkWidget *ruby_align;
>+ GtkWidget *ruby_position;
>+ GtkWidget *glyph_orientation;
>+ GtkWidget *list_numbering;
>+ GtkWidget *form_role;
>+ GtkWidget *form_state;
>+ GtkWidget *form_description;
>+ GtkWidget *table_scope;
>+ GtkWidget *space_before_after;
>+ GtkWidget *indent_start_end_text;
>+ GtkWidget *width_height;
>+ GtkWidget *colors[2];
>+ GtkWidget *border_style;
>+ GtkWidget *border_thickness;
>+ GtkWidget *border_colors[4];
>+ GtkWidget *column_count;
>+ GtkWidget *column_widths;
>+ GtkWidget *column_gaps;
> GtkTextBuffer *text_buffer;
> } PgdTaggedStructDemo;
> 
>@@ -39,6 +72,12 @@ pgd_taggedstruct_free (PgdTaggedStructDemo *demo)
> if (!demo)
> return;
> 
>+ if (demo->checkerboard)
>+ {
>+ g_object_unref (demo->checkerboard);
>+ demo->checkerboard = NULL;
>+ }
>+
> if (demo->store)
> {
> g_object_unref (demo->store);
>@@ -49,6 +88,67 @@ pgd_taggedstruct_free (PgdTaggedStructDemo *demo)
> }
> 
> 
>+static GdkPixbuf *
>+pgd_pixbuf_new_checkerboard (void)
>+{
>+ GdkPixbuf *pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
>+ TRUE, 8,
>+ 64, 16);
>+
>+ guchar *pixels = gdk_pixbuf_get_pixels (pixbuf);
>+ gint stride = gdk_pixbuf_get_rowstride (pixbuf);
>+ gint height = gdk_pixbuf_get_height (pixbuf);
>+ gint width = gdk_pixbuf_get_width (pixbuf);
>+
>+ gint x, y;
>+
>+ for (y = 0; y < height; y++)
>+ {
>+ for (x = 0; x < width; x++)
>+ {
>+ guchar *pixel = pixels + y * stride + x * 4;
>+ pixel[0] = pixel[1] = pixel[2] = 0x88;
>+ pixel[3] = ((y / 8 + x / 8) % 2 == 0) ? 0x00 : 0xFF;
>+ }
>+ }
>+
>+ return pixbuf;
>+}
>+
>+
>+static GtkWidget *
>+pgd_new_color_image (GtkWidget **imageptr, GdkPixbuf *pixbuf)
>+{
>+ GtkWidget *frame = gtk_frame_new (NULL);
>+ GtkWidget *image = gtk_image_new ();
>+
>+ if (pixbuf != NULL)
>+ gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf);
>+ gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
>+
>+ gtk_container_add (GTK_CONTAINER (frame), image);
>+ *imageptr = image;
>+
>+ return frame;
>+}
>+
>+
>+static GtkWidget *
>+pgd_new_color_image_box (GtkWidget **images, guint n_images, GdkPixbuf *pixbuf)
>+{
>+ GtkWidget *box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
>+
>+ while (n_images--)
>+ {
>+ GtkWidget *w = pgd_new_color_image (images, pixbuf);
>+ gtk_container_add (GTK_CONTAINER (box), w);
>+ images++;
>+ }
>+
>+ return box;
>+}
>+
>+
> static void
> populate_store_aux (GtkTreeStore *store, GtkTreeIter *parent, PopplerStructureElementIter *iter)
> {
>@@ -73,6 +173,28 @@ populate_store_aux (GtkTreeStore *store, GtkTreeIter *parent, PopplerStructureEl
> }
> 
> 
>+static const gchar *
>+enum_value_text (GType type, int value)
>+{
>+ GEnumClass *enum_class = G_ENUM_CLASS (g_type_class_ref (type));
>+ GEnumValue *enum_value = g_enum_get_value (enum_class, value);
>+ return enum_value->value_nick;
>+}
>+
>+
>+static gchar *
>+format_doubles_array (gdouble *values, guint n_values)
>+{
>+ GString *buffer = g_string_new ("(");
>+
>+ for (; n_values; n_values--, values++)
>+ g_string_append_printf (buffer, (n_values == 1) ? "%.2g" : "%.2g, ", *values);
>+ g_string_append_c (buffer, ')');
>+
>+ return g_string_free (buffer, FALSE);
>+}
>+
>+
> static GtkTreeStore *
> populate_store (PopplerStructureElementIter *iter)
> {
>@@ -100,10 +222,18 @@ pgd_row_activated (GtkTreeView *tree_view, GtkTreePath *path, GtkTreeViewColumn
> static void
> pgd_selection_changed (GtkTreeSelection *selection, PgdTaggedStructDemo *demo)
> {
>+ PopplerStructureBorderStyle border_style[4];
> GtkTreeModel *model;
> PopplerStructureElement *element;
>+ PopplerRectangle bbox;
> GtkTreeIter iter;
> gpointer elementptr;
>+ gchar *text;
>+ PopplerColor color[4];
>+ GdkPixbuf *pixbuf;
>+ gboolean is_table = FALSE;
>+ gdouble double_values[4];
>+ guint i;
> 
> if (!gtk_tree_selection_get_selected (selection, &model, &iter))
> return;
>@@ -111,6 +241,11 @@ pgd_selection_changed (GtkTreeSelection *selection, PgdTaggedStructDemo *demo)
> gtk_tree_model_get (model, &iter, 1, &elementptr, -1);
> element = POPPLER_STRUCTURE_ELEMENT (elementptr);
> 
>+ /* Common attributes */
>+ text = g_strdup_printf ("%i", poppler_structure_element_get_page (element));
>+ gtk_label_set_text (GTK_LABEL (demo->page_num), text);
>+ g_free (text);
>+
> gtk_label_set_text (GTK_LABEL (demo->id_value),
> poppler_structure_element_get_id (element));
> gtk_label_set_text (GTK_LABEL (demo->title_value),
>@@ -119,6 +254,276 @@ pgd_selection_changed (GtkTreeSelection *selection, PgdTaggedStructDemo *demo)
> poppler_structure_element_get_language (element));
> gtk_label_set_text (GTK_LABEL (demo->abbr_value),
> poppler_structure_element_get_abbreviation (element));
>+
>+ text = poppler_structure_element_get_alt_text (element);
>+ gtk_label_set_text (GTK_LABEL (demo->alt_text), (text == NULL) ? "" : text);
>+ g_free (text);
>+
>+ text = poppler_structure_element_get_actual_text (element);
>+ gtk_label_set_text (GTK_LABEL (demo->actual_text), (text == NULL) ? "" : text);
>+ g_free (text);
>+
>+ gtk_label_set_text (GTK_LABEL (demo->placement),
>+ enum_value_text (POPPLER_TYPE_STRUCTURE_PLACEMENT,
>+ poppler_structure_element_get_placement (element)));
>+ gtk_label_set_text (GTK_LABEL (demo->writing_mode),
>+ enum_value_text (POPPLER_TYPE_STRUCTURE_WRITING_MODE,
>+ poppler_structure_element_get_writing_mode (element)));
>+
>+ if (poppler_structure_element_is_block (element) &&
>+ poppler_structure_element_get_bounding_box (element, &bbox))
>+ {
>+ text = g_strdup_printf ("(%.2g, %.2g, %.2g, %.2g)", bbox.x1, bbox.y1, bbox.x2, bbox.y2);
>+ gtk_label_set_text (GTK_LABEL (demo->bounding_box), text);
>+ g_free (text);
>+ }
>+ else
>+ gtk_label_set_text (GTK_LABEL (demo->bounding_box), "");
>+
>+ /* Foreground color */
>+ if (poppler_structure_element_get_color (element, &color[0]))
>+ {
>+ pixbuf = pgd_pixbuf_new_for_color (&color[0]);
>+ gtk_image_set_from_pixbuf (GTK_IMAGE (demo->colors[0]), pixbuf);
>+ g_object_unref (pixbuf);
>+ }
>+ else
>+ gtk_image_set_from_pixbuf (GTK_IMAGE (demo->colors[0]), demo->checkerboard);
>+
>+ /* Background color */
>+ if (poppler_structure_element_get_background_color (element, &color[0]))
>+ {
>+ pixbuf = pgd_pixbuf_new_for_color (&color[0]);
>+ gtk_image_set_from_pixbuf (GTK_IMAGE (demo->colors[1]), pixbuf);
>+ g_object_unref (pixbuf);
>+ }
>+ else
>+ gtk_image_set_from_pixbuf (GTK_IMAGE (demo->colors[1]), demo->checkerboard);
>+
>+ /* Border color */
>+ if (poppler_structure_element_get_border_color (element, color))
>+ {
>+ for (i = 0; i < 4; i++)
>+ {
>+ pixbuf = pgd_pixbuf_new_for_color (&color[i]);
>+ gtk_image_set_from_pixbuf (GTK_IMAGE (demo->border_colors[i]), pixbuf);
>+ g_object_unref (pixbuf);
>+ }
>+ }
>+ else
>+ {
>+ for (i = 0; i < 4; i++)
>+ gtk_image_set_from_pixbuf (GTK_IMAGE (demo->border_colors[i]), demo->checkerboard);
>+ }
>+
>+ /* Border thickness */
>+ if (poppler_structure_element_get_border_thickness (element, double_values))
>+ {
>+ text = g_strdup_printf ("(%.2g, %.2g, %.2g, %.2g)",
>+ double_values[0], double_values[1],
>+ double_values[2], double_values[3]);
>+ gtk_label_set_text (GTK_LABEL (demo->border_thickness), text);
>+ g_free (text);
>+ }
>+ else
>+ gtk_label_set_text (GTK_LABEL (demo->border_thickness), "");
>+
>+ /* Border style / padding */
>+ if (poppler_structure_element_get_kind (element) == POPPLER_STRUCTURE_ELEMENT_TABLE)
>+ {
>+ poppler_structure_element_get_table_border_style (element, border_style);
>+ poppler_structure_element_get_table_padding (element, double_values);
>+ is_table = TRUE;
>+ }
>+ else
>+ {
>+ poppler_structure_element_get_border_style (element, border_style);
>+ poppler_structure_element_get_padding (element, double_values);
>+ }
>+
>+ text = g_strdup_printf ("%s(%s, %s, %s, %s)", is_table ? "Table " : "",
>+ enum_value_text (POPPLER_TYPE_STRUCTURE_BORDER_STYLE, border_style[0]),
>+ enum_value_text (POPPLER_TYPE_STRUCTURE_BORDER_STYLE, border_style[1]),
>+ enum_value_text (POPPLER_TYPE_STRUCTURE_BORDER_STYLE, border_style[2]),
>+ enum_value_text (POPPLER_TYPE_STRUCTURE_BORDER_STYLE, border_style[3]));
>+ gtk_label_set_text (GTK_LABEL (demo->border_style), text);
>+ g_free (text);
>+
>+ text = g_strdup_printf ("%s(%.2g, %.2g, %.2g, %.2g)", is_table ? "Table " : "",
>+ double_values[0], double_values[1], double_values[2], double_values[3]);
>+ gtk_label_set_text (GTK_LABEL (demo->padding), text);
>+ g_free (text);
>+
>+ /* Block element attributes */
>+ if (poppler_structure_element_is_block (element))
>+ {
>+ gtk_label_set_text (GTK_LABEL (demo->text_align),
>+ enum_value_text (POPPLER_TYPE_STRUCTURE_TEXT_ALIGN,
>+ poppler_structure_element_get_text_align (element)));
>+ gtk_label_set_text (GTK_LABEL (demo->block_align),
>+ enum_value_text (POPPLER_TYPE_STRUCTURE_BLOCK_ALIGN,
>+ poppler_structure_element_get_block_align (element)));
>+ gtk_label_set_text (GTK_LABEL (demo->inline_align),
>+ enum_value_text (POPPLER_TYPE_STRUCTURE_INLINE_ALIGN,
>+ poppler_structure_element_get_inline_align (element)));
>+
>+ text = g_strdup_printf ("%.2g â¨ %.2g",
>+ poppler_structure_element_get_width (element),
>+ poppler_structure_element_get_height (element));
>+ gtk_label_set_text (GTK_LABEL (demo->width_height), text);
>+ g_free (text);
>+
>+ text = g_strdup_printf ("%.2g / %.2g",
>+ poppler_structure_element_get_space_before (element),
>+ poppler_structure_element_get_space_after (element));
>+ gtk_label_set_text (GTK_LABEL (demo->space_before_after), text);
>+ g_free (text);
>+
>+ text = g_strdup_printf ("%.2g / %.2g / %.2g",
>+ poppler_structure_element_get_start_indent (element),
>+ poppler_structure_element_get_end_indent (element),
>+ poppler_structure_element_get_text_indent (element));
>+ gtk_label_set_text (GTK_LABEL (demo->indent_start_end_text), text);
>+ g_free (text);
>+ }
>+ else
>+ {
>+ gtk_label_set_text (GTK_LABEL (demo->text_align), "");
>+ gtk_label_set_text (GTK_LABEL (demo->block_align), "");
>+ gtk_label_set_text (GTK_LABEL (demo->inline_align), "");
>+ gtk_label_set_text (GTK_LABEL (demo->width_height), "");
>+ gtk_label_set_text (GTK_LABEL (demo->space_before_after), "");
>+ gtk_label_set_text (GTK_LABEL (demo->indent_start_end_text), "");
>+ }
>+
>+ /* Inline element attributes */
>+ if (poppler_structure_element_is_inline (element))
>+ {
>+ if (poppler_structure_element_get_text_decoration_color (element, &color[0]))
>+ {
>+ pixbuf = pgd_pixbuf_new_for_color (&color[0]);
>+ gtk_image_set_from_pixbuf (GTK_IMAGE (demo->text_decoration_color), pixbuf);
>+ g_object_unref (pixbuf);
>+ }
>+ else
>+ gtk_image_set_from_pixbuf (GTK_IMAGE (demo->text_decoration_color), demo->checkerboard);
>+
>+ gtk_label_set_text (GTK_LABEL (demo->text_decoration),
>+ enum_value_text (POPPLER_TYPE_STRUCTURE_TEXT_DECORATION,
>+ poppler_structure_element_get_text_decoration_type (element)));
>+ gtk_label_set_text (GTK_LABEL (demo->ruby_align),
>+ enum_value_text (POPPLER_TYPE_STRUCTURE_RUBY_ALIGN,
>+ poppler_structure_element_get_ruby_align (element)));
>+ gtk_label_set_text (GTK_LABEL (demo->ruby_position),
>+ enum_value_text (POPPLER_TYPE_STRUCTURE_RUBY_POSITION,
>+ poppler_structure_element_get_ruby_position (element)));
>+ gtk_label_set_text (GTK_LABEL (demo->glyph_orientation),
>+ enum_value_text (POPPLER_TYPE_STRUCTURE_GLYPH_ORIENTATION,
>+ poppler_structure_element_get_glyph_orientation (element)));
>+
>+ text = g_strdup_printf ("%.2g", poppler_structure_element_get_text_decoration_thickness (element));
>+ gtk_label_set_text (GTK_LABEL (demo->text_decoration_thickness), text);
>+ g_free (text);
>+
>+ text = g_strdup_printf ("%.2g / %.2g",
>+ poppler_structure_element_get_line_height (element),
>+ poppler_structure_element_get_baseline_shift (element));
>+ gtk_label_set_text (GTK_LABEL (demo->line_height_shift), text);
>+ g_free (text);
>+ }
>+ else
>+ {
>+ gtk_label_set_text (GTK_LABEL (demo->text_decoration), "");
>+ gtk_label_set_text (GTK_LABEL (demo->ruby_align), "");
>+ gtk_label_set_text (GTK_LABEL (demo->ruby_position), "");
>+ gtk_label_set_text (GTK_LABEL (demo->glyph_orientation), "");
>+ gtk_label_set_text (GTK_LABEL (demo->line_height_shift), "");
>+ gtk_label_set_text (GTK_LABEL (demo->text_decoration_thickness), "");
>+ gtk_image_set_from_pixbuf (GTK_IMAGE (demo->text_decoration_color), demo->checkerboard);
>+ }
>+
>+ /* List-item element attributes */
>+ if (poppler_structure_element_get_kind (element) == POPPLER_STRUCTURE_ELEMENT_LIST_ITEM)
>+ {
>+ gtk_label_set_text (GTK_LABEL (demo->list_numbering),
>+ enum_value_text (POPPLER_TYPE_STRUCTURE_LIST_NUMBERING,
>+ poppler_structure_element_get_list_numbering (element)));
>+ }
>+ else
>+ {
>+ gtk_label_set_text (GTK_LABEL (demo->list_numbering), "");
>+ }
>+
>+ /* Form element attributes */
>+ if (poppler_structure_element_get_kind (element) == POPPLER_STRUCTURE_ELEMENT_FORM)
>+ {
>+ gtk_label_set_text (GTK_LABEL (demo->form_role),
>+ enum_value_text (POPPLER_TYPE_STRUCTURE_FORM_ROLE,
>+ poppler_structure_element_get_form_role (element)));
>+ gtk_label_set_text (GTK_LABEL (demo->form_state),
>+ enum_value_text (POPPLER_TYPE_STRUCTURE_FORM_STATE,
>+ poppler_structure_element_get_form_state (element)));
>+
>+ text = poppler_structure_element_get_form_description (element);
>+ gtk_label_set_text (GTK_LABEL (demo->form_description), (text == NULL) ? "" : text);
>+ g_free (text);
>+ }
>+ else
>+ {
>+ gtk_label_set_text (GTK_LABEL (demo->form_role), "");
>+ gtk_label_set_text (GTK_LABEL (demo->form_state), "");
>+ gtk_label_set_text (GTK_LABEL (demo->form_description), "");
>+ }
>+
>+ /* Table element attributes */
>+ if (poppler_structure_element_get_kind (element) == POPPLER_STRUCTURE_ELEMENT_TABLE)
>+ {
>+ gtk_label_set_text (GTK_LABEL (demo->table_scope),
>+ enum_value_text (POPPLER_TYPE_STRUCTURE_TABLE_SCOPE,
>+ poppler_structure_element_get_table_scope (element)));
>+
>+ text = poppler_structure_element_get_table_summary (element);
>+ gtk_label_set_text (GTK_LABEL (demo->form_description), (text == NULL) ? "" : text);
>+ g_free (text);
>+ }
>+ else
>+ {
>+ gtk_label_set_text (GTK_LABEL (demo->table_scope), "");
>+ gtk_label_set_text (GTK_LABEL (demo->form_description), "");
>+ }
>+
>+ /* Grouping element attributes */
>+ gtk_label_set_text (GTK_LABEL (demo->column_widths), "");
>+ gtk_label_set_text (GTK_LABEL (demo->column_gaps), "");
>+
>+ if (poppler_structure_element_is_grouping (element))
>+ {
>+ gdouble *values;
>+ guint n_values;
>+
>+ text = g_strdup_printf ("%i", poppler_structure_element_get_column_count (element));
>+ gtk_label_set_text (GTK_LABEL (demo->column_count), text);
>+ g_free (text);
>+
>+ if ((values = poppler_structure_element_get_column_widths (element, &n_values)) != NULL)
>+ {
>+ text = format_doubles_array (values, n_values);
>+ g_free (values);
>+ gtk_label_set_text (GTK_LABEL (demo->column_widths), text);
>+ g_free (text);
>+ }
>+
>+ if ((values = poppler_structure_element_get_column_gaps (element, &n_values)) != NULL)
>+ {
>+ text = format_doubles_array (values, n_values);
>+ g_free (values);
>+ gtk_label_set_text (GTK_LABEL (demo->column_gaps), text);
>+ g_free (text);
>+ }
>+ }
>+ else
>+ gtk_label_set_text (GTK_LABEL (demo->column_count), "");
>+
> gtk_text_buffer_set_text (demo->text_buffer, "", -1);
> 
> if (poppler_structure_element_is_content (element))
>@@ -135,6 +540,8 @@ pgd_selection_changed (GtkTreeSelection *selection, PgdTaggedStructDemo *demo)
> gtk_label_set_text (GTK_LABEL (demo->type_value), "Inline");
> else if (poppler_structure_element_is_block (element))
> gtk_label_set_text (GTK_LABEL (demo->type_value), "Block");
>+ else if (poppler_structure_element_is_grouping (element))
>+ gtk_label_set_text (GTK_LABEL (demo->type_value), "Grouping");
> else
> gtk_label_set_text (GTK_LABEL (demo->type_value), "Structure");
> }
>@@ -148,15 +555,17 @@ pgd_taggedstruct_create_widget (PopplerDocument *document)
> PgdTaggedStructDemo *demo;
> GtkCellRenderer *renderer;
> GtkTreeSelection *selection;
>- GtkWidget *hbox;
>- GtkWidget *vbox;
>+ GtkWidget *pane;
> GtkWidget *grid;
> GtkWidget *scroll;
> GtkWidget *w;
>+ GtkWidget *box;
> gint row;
> 
> demo = g_new0 (PgdTaggedStructDemo, 1);
> 
>+ demo->checkerboard = pgd_pixbuf_new_checkerboard ();
>+
> iter = poppler_structure_element_iter_new (document);
> demo->store = populate_store (iter);
> poppler_structure_element_iter_free (iter);
>@@ -178,55 +587,96 @@ pgd_taggedstruct_create_widget (PopplerDocument *document)
> gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW (demo->view), FALSE);
> gtk_tree_view_set_activate_on_single_click (GTK_TREE_VIEW (demo->view), TRUE);
> 
>- hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
>+ pane = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
> scroll = gtk_scrolled_window_new (NULL, NULL);
> gtk_container_add (GTK_CONTAINER (scroll), demo->view);
>- gtk_widget_show (demo->view);
>- gtk_box_pack_start (GTK_BOX (hbox), scroll, TRUE, TRUE, 0);
>- gtk_widget_show (scroll);
>+ gtk_paned_add1 (GTK_PANED (pane), scroll);
> 
> row = 0;
> grid = gtk_grid_new ();
> gtk_container_set_border_width (GTK_CONTAINER (grid), 12);
> gtk_grid_set_row_homogeneous (GTK_GRID (grid), FALSE);
> gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
>- gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
>+ gtk_grid_set_row_spacing (GTK_GRID (grid), 2);
>+ pgd_table_add_property_with_value_widget (GTK_GRID (grid), "Page:", &demo->page_num, NULL, &row);
> pgd_table_add_property_with_value_widget (GTK_GRID (grid), "Type:", &demo->type_value, NULL, &row);
> pgd_table_add_property_with_value_widget (GTK_GRID (grid), "ID:", &demo->id_value, NULL, &row);
> pgd_table_add_property_with_value_widget (GTK_GRID (grid), "Title:", &demo->title_value, NULL, &row);
> pgd_table_add_property_with_value_widget (GTK_GRID (grid), "Language:", &demo->lang_value, NULL, &row);
> pgd_table_add_property_with_value_widget (GTK_GRID (grid), "Abbreviation:", &demo->abbr_value, NULL, &row);
>+ pgd_table_add_property_with_value_widget (GTK_GRID (grid), "Alt. Text:", &demo->alt_text, NULL, &row);
>+ pgd_table_add_property_with_value_widget (GTK_GRID (grid), "Actual Text:", &demo->actual_text, NULL, &row);
>+ pgd_table_add_property_with_value_widget (GTK_GRID (grid), "Placement:", &demo->placement, NULL, &row);
>+ pgd_table_add_property_with_value_widget (GTK_GRID (grid), "Writing Mode:", &demo->writing_mode, NULL, &row);
>+ pgd_table_add_property_with_value_widget (GTK_GRID (grid), "Bounding Box:", &demo->bounding_box, NULL, &row);
> 
>- vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
>- gtk_box_pack_start (GTK_BOX (vbox), grid, FALSE, FALSE, 0);
>- gtk_widget_show (grid);
>+ /* Used both for table-padding and other elements' padding */
>+ pgd_table_add_property_with_value_widget (GTK_GRID (grid), "Padding:", &demo->padding, NULL, &row);
>+
>+ /* Put both foreground and background color in a single row */
>+ box = pgd_new_color_image_box (demo->colors, 2, demo->checkerboard);
>+ pgd_table_add_property_with_custom_widget (GTK_GRID (grid), "FG/BG Color:", box, &row);
>+
>+ /* Used both for table-border-style and border-style */
>+ pgd_table_add_property_with_value_widget (GTK_GRID (grid), "Border Style:", &demo->border_style, NULL, &row);
>+ pgd_table_add_property_with_value_widget (GTK_GRID (grid), "Border Thickness:", &demo->border_thickness, NULL, &row);
>+
>+ /* Border colors */
>+ box = pgd_new_color_image_box (demo->border_colors, 4, demo->checkerboard);
>+ pgd_table_add_property_with_custom_widget (GTK_GRID (grid), "Border Colors:", box, &row);
>+
>+ pgd_table_add_property_with_value_widget (GTK_GRID (grid), "Width â¨ Height", &demo->width_height, NULL, &row);
>+ pgd_table_add_property_with_value_widget (GTK_GRID (grid), "Text Align:", &demo->text_align, NULL, &row);
>+ pgd_table_add_property_with_value_widget (GTK_GRID (grid), "Block Align:", &demo->block_align, NULL, &row);
>+ pgd_table_add_property_with_value_widget (GTK_GRID (grid), "Inline Align:", &demo->inline_align, NULL, &row);
>+ pgd_table_add_property_with_value_widget (GTK_GRID (grid), "Space Before/After:", &demo->space_before_after, NULL, &row);
>+ pgd_table_add_property_with_value_widget (GTK_GRID (grid), "Indent Start/End/Text:", &demo->indent_start_end_text, NULL, &row);
>+ pgd_table_add_property_with_value_widget (GTK_GRID (grid), "Line Heigt/Shift:", &demo->line_height_shift, NULL, &row);
>+
>+ /* Text decoration color */
>+ pgd_table_add_property_with_value_widget (GTK_GRID (grid), "Text Decoration:", &demo->text_decoration, NULL, &row);
>+ box = pgd_new_color_image_box (&demo->text_decoration_color, 1, demo->checkerboard);
>+ pgd_table_add_property_with_value_widget (GTK_GRID (grid), "Text Decoration Thickness:", &demo->text_decoration_thickness, NULL, &row);
>+ pgd_table_add_property_with_custom_widget (GTK_GRID (grid), "Text Decoration Color:", box, &row);
>+
>+ pgd_table_add_property_with_value_widget (GTK_GRID (grid), "Ruby Align:", &demo->ruby_align, NULL, &row);
>+ pgd_table_add_property_with_value_widget (GTK_GRID (grid), "Ruby Position:", &demo->ruby_position, NULL, &row);
>+ pgd_table_add_property_with_value_widget (GTK_GRID (grid), "Glyph Orientation:", &demo->glyph_orientation, NULL, &row);
>+ pgd_table_add_property_with_value_widget (GTK_GRID (grid), "List Numbering:", &demo->list_numbering, NULL, &row);
>+ pgd_table_add_property_with_value_widget (GTK_GRID (grid), "Form Role:", &demo->form_role, NULL, &row);
>+ pgd_table_add_property_with_value_widget (GTK_GRID (grid), "Form State:", &demo->form_state, NULL, &row);
>+ pgd_table_add_property_with_value_widget (GTK_GRID (grid), "Form Description:", &demo->form_description, NULL, &row);
>+ pgd_table_add_property_with_value_widget (GTK_GRID (grid), "Table Scope:", &demo->table_scope, NULL, &row);
>+
>+ /* Column count, widths and gaps */
>+ pgd_table_add_property_with_value_widget (GTK_GRID (grid), "Column Count:", &demo->column_count, NULL, &row);
>+ pgd_table_add_property_with_value_widget (GTK_GRID (grid), "Column Widths:", &demo->column_widths, NULL, &row);
>+ pgd_table_add_property_with_value_widget (GTK_GRID (grid), "Column Gaps:", &demo->column_gaps, NULL, &row);
> 
> scroll = gtk_scrolled_window_new (NULL, NULL);
>- gtk_container_set_border_width (GTK_CONTAINER (scroll), 12);
>- gtk_box_pack_end (GTK_BOX (vbox), scroll, TRUE, TRUE, 0);
>- gtk_widget_show (scroll);
>+ gtk_container_add (GTK_CONTAINER (scroll), grid);
>+ gtk_paned_add2 (GTK_PANED (pane), scroll);
> 
>+ scroll = gtk_scrolled_window_new (NULL, NULL);
> gtk_container_add (GTK_CONTAINER (scroll), (w = gtk_text_view_new ()));
>- gtk_widget_show (w);
> 
> demo->text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (w));
> gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (w), GTK_WRAP_WORD_CHAR);
> gtk_text_view_set_editable (GTK_TEXT_VIEW (w), FALSE);
> gtk_text_buffer_set_text (demo->text_buffer, "", -1);
>- gtk_widget_show (w);
>+
>+ gtk_grid_attach (GTK_GRID (grid), scroll, 0, row, 2, 1);
> 
> selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (demo->view));
> g_signal_connect (selection, "changed",
> G_CALLBACK (pgd_selection_changed),
> demo);
> 
>- gtk_box_pack_end (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
>- gtk_widget_show (vbox);
>-
>- g_object_weak_ref (G_OBJECT (hbox),
>+ g_object_weak_ref (G_OBJECT (pane),
> (GWeakNotify) pgd_taggedstruct_free,
> demo);
> 
>- gtk_widget_show (hbox);
>- return hbox;
>+ gtk_paned_set_position (GTK_PANED (pane), 250);
>+ gtk_widget_show_all (pane);
>+ return pane;
> }
>-- 
>1.9.0
>

Actions: View

Attachments on bug 75828: 95215

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.