GNOME.org
 

[gtk+/composite-templates-new: 13/15] GtkAppChooserWidget: Define children with a GtkBuilder template

commit 3358ae4ec47a419444c5353da16f531f3a565017
Author: Tristan Van Berkom <tristanvb openismus com>
Date:   Sat Mar 23 21:59:30 2013 +0900

    GtkAppChooserWidget: Define children with a GtkBuilder template

 gtk/Makefile.am            |    1 +
 gtk/gtk.gresource.xml      |    1 +
 gtk/gtkappchooserwidget.c  |  159 ++++++++++++-------------------------------
 gtk/gtkappchooserwidget.ui |  116 ++++++++++++++++++++++++++++++++
 gtk/tests/templates.c      |   11 +++
 po/POTFILES.in             |    1 +
 6 files changed, 175 insertions(+), 114 deletions(-)
---
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 95e378c..9cf77ac 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1095,6 +1095,7 @@ DND_CURSORS = \
 
 COMPOSITE_TEMPLATES =                  \
        gtkaboutdialog.ui               \
+       gtkappchooserwidget.ui          \
        gtkassistant.ui                 \
        gtkdialog.ui                    \
        gtkinfobar.ui                   \
diff --git a/gtk/gtk.gresource.xml b/gtk/gtk.gresource.xml
index cf7b9ed..e7bd656 100644
--- a/gtk/gtk.gresource.xml
+++ b/gtk/gtk.gresource.xml
@@ -12,6 +12,7 @@
     <file alias="cursor/dnd-move.png">cursor_dnd_move.png</file>
     <file alias="cursor/dnd-copy.png">cursor_dnd_copy.png</file>
     <file>gtkaboutdialog.ui</file>
+    <file>gtkappchooserwidget.ui</file>
     <file>gtkassistant.ui</file>
     <file>gtkdialog.ui</file>
     <file>gtkinfobar.ui</file>
diff --git a/gtk/gtkappchooserwidget.c b/gtk/gtkappchooserwidget.c
index 36875df..16b529d 100644
--- a/gtk/gtkappchooserwidget.c
+++ b/gtk/gtkappchooserwidget.c
@@ -82,7 +82,9 @@ struct _GtkAppChooserWidgetPrivate {
   GtkWidget *program_list;
   GtkListStore *program_list_store;
 
+  GtkTreeViewColumn *column;
   GtkCellRenderer *padding_renderer;
+  GtkCellRenderer *secondary_padding;
 };
 
 enum {
@@ -799,95 +801,12 @@ gtk_app_chooser_widget_real_add_items (GtkAppChooserWidget *self)
 }
 
 static void
-gtk_app_chooser_widget_add_items (GtkAppChooserWidget *self)
+gtk_app_chooser_widget_initialize_items (GtkAppChooserWidget *self)
 {
-  GtkCellRenderer *renderer;
-  GtkTreeViewColumn *column;
-  GtkTreeModel *sort;
-
-  /* create list store */
-  self->priv->program_list_store = gtk_list_store_new (NUM_COLUMNS,
-                                                       G_TYPE_APP_INFO,
-                                                       G_TYPE_ICON,
-                                                       G_TYPE_STRING,
-                                                       G_TYPE_STRING,
-                                                       G_TYPE_STRING,
-                                                       G_TYPE_BOOLEAN,
-                                                       G_TYPE_BOOLEAN,
-                                                       G_TYPE_STRING,
-                                                       G_TYPE_BOOLEAN,
-                                                       G_TYPE_BOOLEAN);
-  sort = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (self->priv->program_list_store));
-
-  gtk_tree_view_set_model (GTK_TREE_VIEW (self->priv->program_list),
-                           GTK_TREE_MODEL (sort));
-  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sort),
-                                        COLUMN_NAME,
-                                        GTK_SORT_ASCENDING);
-  gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (sort),
-                                   COLUMN_NAME,
-                                   gtk_app_chooser_sort_func,
-                                   self, NULL);
-  gtk_tree_view_set_search_column (GTK_TREE_VIEW (self->priv->program_list),
-                                   COLUMN_NAME);
-  gtk_tree_view_set_search_equal_func (GTK_TREE_VIEW (self->priv->program_list),
-                                       gtk_app_chooser_search_equal_func,
-                                       NULL, NULL);
-
-  column = gtk_tree_view_column_new ();
-
   /* initial padding */
-  renderer = gtk_cell_renderer_text_new ();
-  gtk_tree_view_column_pack_start (column, renderer, FALSE);
-  g_object_set (renderer,
+  g_object_set (self->priv->padding_renderer,
                 "xpad", self->priv->show_all ? 0 : 6,
                 NULL);
-  self->priv->padding_renderer = renderer;
-
-  /* heading text renderer */
-  renderer = gtk_cell_renderer_text_new ();
-  gtk_tree_view_column_pack_start (column, renderer, FALSE);
-  gtk_tree_view_column_set_attributes (column, renderer,
-                                       "markup", COLUMN_HEADING_TEXT,
-                                       "visible", COLUMN_HEADING,
-                                       NULL);
-  g_object_set (renderer,
-                "ypad", 6,
-                "xpad", 0,
-                "wrap-width", 350,
-                "wrap-mode", PANGO_WRAP_WORD,
-                NULL);
-
-  /* padding renderer for non-heading cells */
-  renderer = gtk_cell_renderer_text_new ();
-  gtk_tree_view_column_pack_start (column, renderer, FALSE);
-  gtk_tree_view_column_set_cell_data_func (column, renderer,
-                                           padding_cell_renderer_func,
-                                           NULL, NULL);
-
-  /* app icon renderer */
-  renderer = gtk_cell_renderer_pixbuf_new ();
-  gtk_tree_view_column_pack_start (column, renderer, FALSE);
-  gtk_tree_view_column_set_attributes (column, renderer,
-                                       "gicon", COLUMN_GICON,
-                                       NULL);
-  g_object_set (renderer,
-                "stock-size", GTK_ICON_SIZE_MENU,
-                NULL);
-
-  /* app name renderer */
-  renderer = gtk_cell_renderer_text_new ();
-  gtk_tree_view_column_pack_start (column, renderer, TRUE);
-  gtk_tree_view_column_set_attributes (column, renderer,
-                                       "markup", COLUMN_DESC,
-                                       NULL);
-  g_object_set (renderer,
-                "ellipsize", PANGO_ELLIPSIZE_END,
-                "ellipsize-set", TRUE,
-                NULL);
-  
-  gtk_tree_view_column_set_sort_column_id (column, COLUMN_NAME);
-  gtk_tree_view_append_column (GTK_TREE_VIEW (self->priv->program_list), column);
 
   /* populate the widget */
   gtk_app_chooser_widget_real_add_items (self);
@@ -975,7 +894,7 @@ gtk_app_chooser_widget_constructed (GObject *object)
   if (G_OBJECT_CLASS (gtk_app_chooser_widget_parent_class)->constructed != NULL)
     G_OBJECT_CLASS (gtk_app_chooser_widget_parent_class)->constructed (object);
 
-  gtk_app_chooser_widget_add_items (self);
+  gtk_app_chooser_widget_initialize_items (self);
 }
 
 static void
@@ -1003,6 +922,7 @@ static void
 gtk_app_chooser_widget_class_init (GtkAppChooserWidgetClass *klass)
 {
   GObjectClass *gobject_class;
+  GtkContainerClass *container_class;
   GParamSpec *pspec;
 
   gobject_class = G_OBJECT_CLASS (klass);
@@ -1160,48 +1080,59 @@ gtk_app_chooser_widget_class_init (GtkAppChooserWidgetClass *klass)
                   G_TYPE_NONE,
                   2, GTK_TYPE_MENU, G_TYPE_APP_INFO);
 
+  /* Bind class to template
+   */
+  container_class = GTK_CONTAINER_CLASS (klass);
+  gtk_container_class_set_template_from_resource (container_class,
+                                                 "/org/gtk/libgtk/gtkappchooserwidget.ui");
+  gtk_container_class_bind_child (container_class, GtkAppChooserWidgetPrivate, program_list);
+  gtk_container_class_bind_child (container_class, GtkAppChooserWidgetPrivate, program_list_store);
+  gtk_container_class_bind_child (container_class, GtkAppChooserWidgetPrivate, column);
+  gtk_container_class_bind_child (container_class, GtkAppChooserWidgetPrivate, padding_renderer);
+  gtk_container_class_bind_child (container_class, GtkAppChooserWidgetPrivate, secondary_padding);
+  gtk_container_class_bind_callback (container_class, refresh_and_emit_app_selected);
+  gtk_container_class_bind_callback (container_class, program_list_selection_activated);
+  gtk_container_class_bind_callback (container_class, widget_button_press_event_cb);
+
   g_type_class_add_private (klass, sizeof (GtkAppChooserWidgetPrivate));
 }
 
 static void
 gtk_app_chooser_widget_init (GtkAppChooserWidget *self)
 {
-  GtkWidget *scrolled_window;
   GtkTreeSelection *selection;
+  GtkTreeModel *sort;
 
   self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTK_TYPE_APP_CHOOSER_WIDGET,
                                             GtkAppChooserWidgetPrivate);
-  gtk_orientable_set_orientation (GTK_ORIENTABLE (self), GTK_ORIENTATION_VERTICAL);
-
-  scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-  gtk_widget_set_size_request (scrolled_window, 400, 300);
-  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window),
-                                       GTK_SHADOW_IN);
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
-                                  GTK_POLICY_NEVER,
-                                  GTK_POLICY_AUTOMATIC);
-  gtk_widget_show (scrolled_window);
-
-  self->priv->program_list = gtk_tree_view_new ();
-  gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (self->priv->program_list),
-                                     FALSE);
-  gtk_container_add (GTK_CONTAINER (scrolled_window), self->priv->program_list);
-  gtk_box_pack_start (GTK_BOX (self), scrolled_window, TRUE, TRUE, 0);
-  gtk_widget_show (self->priv->program_list);
 
+  gtk_container_init_template (GTK_CONTAINER (self));
+
+  /* Various parts of the GtkTreeView code need custom code to setup, mostly
+   * because we lack signals to connect to, or properties to set.
+   */
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (self->priv->program_list));
-  gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE);
   gtk_tree_selection_set_select_function (selection, gtk_app_chooser_selection_func,
                                           self, NULL);
-  g_signal_connect_swapped (selection, "changed",
-                            G_CALLBACK (refresh_and_emit_app_selected),
-                            self);
-  g_signal_connect (self->priv->program_list, "row-activated",
-                    G_CALLBACK (program_list_selection_activated),
-                    self);
-  g_signal_connect (self->priv->program_list, "button-press-event",
-                    G_CALLBACK (widget_button_press_event_cb),
-                    self);
+
+  sort = gtk_tree_view_get_model (GTK_TREE_VIEW (self->priv->program_list));
+  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sort),
+                                        COLUMN_NAME,
+                                        GTK_SORT_ASCENDING);
+  gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (sort),
+                                   COLUMN_NAME,
+                                   gtk_app_chooser_sort_func,
+                                   self, NULL);
+
+  gtk_tree_view_set_search_column (GTK_TREE_VIEW (self->priv->program_list), COLUMN_NAME);
+  gtk_tree_view_set_search_equal_func (GTK_TREE_VIEW (self->priv->program_list),
+                                       gtk_app_chooser_search_equal_func,
+                                       NULL, NULL);
+
+  gtk_tree_view_column_set_cell_data_func (self->priv->column,
+                                          self->priv->secondary_padding,
+                                           padding_cell_renderer_func,
+                                           NULL, NULL);
 }
 
 static GAppInfo *
diff --git a/gtk/gtkappchooserwidget.ui b/gtk/gtkappchooserwidget.ui
new file mode 100644
index 0000000..ee46e27
--- /dev/null
+++ b/gtk/gtkappchooserwidget.ui
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface domain="gtk30">
+  <!-- interface-requires gtk+ 3.10 -->
+  <template class="GtkAppChooserWidget" parent="GtkBox">
+    <property name="can_focus">False</property>
+    <property name="orientation">vertical</property>
+    <child>
+      <object class="GtkScrolledWindow" id="scrolled_window">
+        <property name="width_request">400</property>
+        <property name="height_request">300</property>
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="hscrollbar_policy">never</property>
+        <property name="shadow_type">in</property>
+        <child>
+          <object class="GtkTreeView" id="program_list">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="model">program_list_sort</property>
+            <property name="headers_visible">False</property>
+            <signal name="button-press-event" handler="widget_button_press_event_cb" swapped="no"/>
+            <signal name="row-activated" handler="program_list_selection_activated" swapped="no"/>
+            <child internal-child="selection">
+              <object class="GtkTreeSelection" id="treeview-selection2">
+                <property name="mode">browse</property>
+                <signal name="changed" handler="refresh_and_emit_app_selected" swapped="yes"/>
+              </object>
+            </child>
+            <child>
+              <object class="GtkTreeViewColumn" id="column">
+                <child>
+                  <object class="GtkCellRendererText" id="padding_renderer"/>
+                 <cell-packing>
+                   <property name="expand">False</property>
+                 </cell-packing>
+                </child>
+                <child>
+                  <object class="GtkCellRendererText" id="heading">
+                    <property name="ypad">6</property>
+                    <property name="wrap_mode">word</property>
+                    <property name="wrap_width">350</property>
+                  </object>
+                  <attributes>
+                    <attribute name="visible">6</attribute>
+                    <attribute name="markup">7</attribute>
+                  </attributes>
+                 <cell-packing>
+                   <property name="expand">False</property>
+                 </cell-packing>
+                </child>
+                <child>
+                  <object class="GtkCellRendererText" id="secondary_padding"/>
+                 <cell-packing>
+                   <property name="expand">False</property>
+                 </cell-packing>
+                </child>
+                <child>
+                  <object class="GtkCellRendererPixbuf" id="app_icon"/>
+                  <attributes>
+                    <attribute name="gicon">1</attribute>
+                  </attributes>
+                 <cell-packing>
+                   <property name="expand">False</property>
+                 </cell-packing>
+                </child>
+                <child>
+                  <object class="GtkCellRendererText" id="app_name">
+                    <property name="ellipsize">end</property>
+                  </object>
+                  <attributes>
+                    <attribute name="markup">3</attribute>
+                  </attributes>
+                 <cell-packing>
+                   <property name="expand">True</property>
+                 </cell-packing>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">True</property>
+        <property name="fill">True</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
+  </template>
+  <object class="GtkListStore" id="program_list_store">
+    <columns>
+      <!-- column-name app-info -->
+      <column type="GAppInfo"/>
+      <!-- column-name app-icon -->
+      <column type="GIcon"/>
+      <!-- column-name name -->
+      <column type="gchararray"/>
+      <!-- column-name description -->
+      <column type="gchararray"/>
+      <!-- column-name exec -->
+      <column type="gchararray"/>
+      <!-- column-name default -->
+      <column type="gboolean"/>
+      <!-- column-name heading -->
+      <column type="gboolean"/>
+      <!-- column-name heading-text -->
+      <column type="gchararray"/>
+      <!-- column-name recommended -->
+      <column type="gboolean"/>
+      <!-- column-name fallback -->
+      <column type="gboolean"/>
+    </columns>
+  </object>
+  <object class="GtkTreeModelSort" id="program_list_sort">
+    <property name="model">program_list_store</property>
+  </object>
+</interface>
diff --git a/gtk/tests/templates.c b/gtk/tests/templates.c
index 24fd951..5bb96a4 100644
--- a/gtk/tests/templates.c
+++ b/gtk/tests/templates.c
@@ -119,6 +119,16 @@ test_statusbar_basic (void)
   gtk_widget_destroy (widget);
 }
 
+static void
+test_app_chooser_widget_basic (void)
+{
+  GtkWidget *widget;
+
+  widget = gtk_app_chooser_widget_new (NULL);
+  g_assert (GTK_IS_APP_CHOOSER_WIDGET (widget));
+  gtk_widget_destroy (widget);
+}
+
 int
 main (int argc, char **argv)
 {
@@ -134,6 +144,7 @@ main (int argc, char **argv)
   g_test_add_func ("/Template/GtkAssistant/Basic", test_assistant_basic);
   g_test_add_func ("/Template/GtkScaleButton/Basic", test_scale_button_basic);
   g_test_add_func ("/Template/GtkStatusBar/Basic", test_statusbar_basic);
+  g_test_add_func ("/Template/GtkAppChooserWidget/Basic", test_app_chooser_widget_basic);
 
   return g_test_run();
 }
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1cd015a..8f7d476 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -275,6 +275,7 @@ modules/printbackends/lpr/gtkprintbackendlpr.c
 modules/printbackends/papi/gtkprintbackendpapi.c
 modules/printbackends/test/gtkprintbackendtest.c
 [type: gettext/glade]gtk/gtkaboutdialog.ui
+[type: gettext/glade]gtk/gtkappchooserwidget.ui
 [type: gettext/glade]gtk/gtkassistant.ui
 [type: gettext/glade]gtk/gtkdialog.ui
 [type: gettext/glade]gtk/gtkinfobar.ui
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]