[gnome-software] Improve the update details dialog

[Matthias Clasen <matthiasc src gnome org>]

commit db8cc516fc8d7e13fab4bc527e6ccd0f844fdde5
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Sep 1 02:34:53 2013 -0400

    Improve the update details dialog
    
    Use a list box instead of a tree view, add separators,
    disable selection.

 src/gnome-software.ui  |   23 +--------
 src/gs-shell-updates.c |  123 ++++++++++++++++--------------------------------
 2 files changed, 42 insertions(+), 104 deletions(-)
---
diff --git a/src/gnome-software.ui b/src/gnome-software.ui
index facb20d..7e32f4d 100644
--- a/src/gnome-software.ui
+++ b/src/gnome-software.ui
@@ -2,16 +2,6 @@
 <!-- Generated with glade 3.15.2 on Thu Aug 15 17:13:59 2013 -->
 <interface>
   <!-- interface-requires gtk+ 3.10 -->
-  <object class="GtkListStore" id="liststore_update">
-    <columns>
-      <!-- column-name app -->
-      <column type="GObject"/>
-      <!-- column-name name -->
-      <column type="gchararray"/>
-      <!-- column-name version -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
   <object class="GtkApplicationWindow" id="window_software">
     <property name="can_focus">False</property>
     <property name="default-width">1200</property>
@@ -1037,19 +1027,10 @@ with multi-level undo.
                 <property name="shadow_type">in</property>
                 <property name="kinetic_scrolling">False</property>
                 <child>
-                  <object class="GtkTreeView" id="treeview_update">
+                  <object class="GtkListBox" id="list_box_update">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="vscroll_policy">natural</property>
-                    <property name="model">liststore_update</property>
-                    <property name="headers_visible">False</property>
-                    <property name="enable_search">False</property>
-                    <property name="search_column">1</property>
-                    <property name="show_expanders">False</property>
-                    <property name="activate_on_single_click">True</property>
-                    <child internal-child="selection">
-                      <object class="GtkTreeSelection" id="treeview-selection1"/>
-                    </child>
+                    <property name="selection_mode">none</property>
                   </object>
                 </child>
               </object>
diff --git a/src/gs-shell-updates.c b/src/gs-shell-updates.c
index eaa1473..5a53aba 100644
--- a/src/gs-shell-updates.c
+++ b/src/gs-shell-updates.c
@@ -217,60 +217,22 @@ gs_shell_updates_set_updates_description_ui (GsShellUpdates *shell_updates, GsAp
        gtk_label_set_label (GTK_LABEL (widget), gs_app_get_summary (app));
 }
 
-/**
- * gs_shell_updates_row_activated_cb:
- **/
 static void
-gs_shell_updates_row_activated_cb (GtkTreeView *treeview,
-                                  GtkTreePath *path,
-                                  GtkTreeViewColumn *col,
+gs_shell_updates_row_activated_cb (GtkListBox *list_box,
+                                   GtkListBoxRow *row,
                                   GsShellUpdates *shell_updates)
 {
        GsShellUpdatesPrivate *priv = shell_updates->priv;
-       gboolean ret;
        GsApp *app = NULL;
-       GtkTreeIter iter;
-       GtkTreeModel *model;
        GtkWidget *widget;
 
-       /* get selection */
-       model = gtk_tree_view_get_model (treeview);
-       ret = gtk_tree_model_get_iter (model, &iter, path);
-       if (!ret) {
-               g_warning ("failed to get selection");
-               goto out;
-       }
-
-       /* get data */
-       gtk_tree_model_get (model, &iter,
-                           COLUMN_UPDATE_APP, &app,
-                           -1);
-
+        app = GS_APP (g_object_get_data (G_OBJECT (gtk_bin_get_child (GTK_BIN (row))), "app"));
        /* setup package view */
        widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "scrolledwindow_update"));
        gtk_widget_hide (widget);
        gs_shell_updates_set_updates_description_ui (shell_updates, app);
        widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "button_update_back"));
        gtk_widget_show (widget);
-out:
-       if (app != NULL)
-               g_object_unref (app);
-}
-
-/**
- * gs_shell_updates_unselect_treeview_cb:
- **/
-static gboolean
-gs_shell_updates_unselect_treeview_cb (gpointer user_data)
-{
-       GsShellUpdates *shell_updates = GS_SHELL_UPDATES (user_data);
-       GsShellUpdatesPrivate *priv = shell_updates->priv;
-       GtkTreeView *treeview;
-
-       treeview = GTK_TREE_VIEW (gtk_builder_get_object (priv->builder, "treeview_update"));
-       gtk_tree_selection_unselect_all (gtk_tree_view_get_selection (treeview));
-
-       return FALSE;
 }
 
 static void
@@ -293,27 +255,42 @@ show_update_details (GsApp *app, GsShellUpdates *shell_updates)
        /* set update description */
        if (kind == GS_APP_KIND_OS_UPDATE) {
                GPtrArray *related;
-               GtkListStore *liststore;
-               GtkTreeIter iter;
+                GtkListBox *list_box;
                guint i;
+                GtkWidget *row, *label;
 
-               /* add the related packages to the list view */
-               liststore = GTK_LIST_STORE (gtk_builder_get_object (priv->builder, "liststore_update"));
-               gtk_list_store_clear (liststore);
+                list_box = GTK_LIST_BOX (gtk_builder_get_object (priv->builder, "list_box_update"));
+                gs_container_remove_all (GTK_CONTAINER (list_box));
                related = gs_app_get_related (app);
                for (i = 0; i < related->len; i++) {
                        app_related = g_ptr_array_index (related, i);
-                       gtk_list_store_append (liststore, &iter);
-                       gtk_list_store_set (liststore,
-                                           &iter,
-                                           COLUMN_UPDATE_APP, app_related,
-                                           COLUMN_UPDATE_NAME, gs_app_get_name (app_related),
-                                           COLUMN_UPDATE_VERSION, gs_app_get_version (app_related),
-                                           -1);
+                        row = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+                        g_object_set_data_full (G_OBJECT (row), "app", g_object_ref (app_related), 
g_object_unref);
+                        label = gtk_label_new (gs_app_get_name (app_related));
+                        g_object_set (label,
+                                      "margin-left", 20,
+                                      "margin-right", 20,
+                                      "margin-top", 6,
+                                      "margin-bottom", 6,
+                                      "xalign", 0.0,
+                                      NULL);
+                        gtk_widget_set_halign (label, GTK_ALIGN_START);
+                        gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
+                        gtk_box_pack_start (GTK_BOX (row), label, TRUE, TRUE, 0);
+                        label = gtk_label_new (gs_app_get_version (app_related));
+                        g_object_set (label,
+                                      "margin-left", 20,
+                                      "margin-right", 20,
+                                      "margin-top", 6,
+                                      "margin-bottom", 6,
+                                      "xalign", 1.0,
+                                      NULL);
+                        gtk_widget_set_halign (label, GTK_ALIGN_END);
+                        gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
+                        gtk_box_pack_start (GTK_BOX (row), label, FALSE, FALSE, 0);
+                        gtk_widget_show_all (row);
+                        gtk_list_box_insert (list_box,row, -1);
                }
-
-               /* unselect treeview by default */
-               g_idle_add (gs_shell_updates_unselect_treeview_cb, shell_updates);
        }
 
        widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "dialog_update"));
@@ -493,9 +470,6 @@ gs_shell_updates_setup (GsShellUpdates *shell_updates,
                        GCancellable *cancellable)
 {
        GsShellUpdatesPrivate *priv = shell_updates->priv;
-       GtkCellRenderer *renderer;
-       GtkTreeViewColumn *column;
-       GtkTreeView *treeview;
        GtkWidget *widget;
         GtkWidget *sw;
 
@@ -524,30 +498,13 @@ gs_shell_updates_setup (GsShellUpdates *shell_updates,
        gtk_container_add (GTK_CONTAINER (widget), GTK_WIDGET (priv->list_box_updates));
        gtk_widget_show (GTK_WIDGET (priv->list_box_updates));
 
-       /* column for name */
-       treeview = GTK_TREE_VIEW (gtk_builder_get_object (priv->builder, "treeview_update"));
-       renderer = gtk_cell_renderer_text_new ();
-       g_object_set (renderer,
-                     "xpad", 6,
-                     "ypad", 6,
-                     NULL);
-       column = gtk_tree_view_column_new_with_attributes ("name", renderer,
-                                                          "markup", COLUMN_UPDATE_NAME, NULL);
-       gtk_tree_view_column_set_sort_column_id (column, COLUMN_UPDATE_NAME);
-       gtk_tree_view_column_set_expand (column, TRUE);
-       gtk_tree_view_append_column (treeview, column);
-
-       renderer = gtk_cell_renderer_text_new ();
-       g_object_set (renderer,
-                     "xpad", 6,
-                     "ypad", 6,
-                     NULL);
-       column = gtk_tree_view_column_new_with_attributes ("version", renderer,
-                                                          "markup", COLUMN_UPDATE_VERSION, NULL);
-       gtk_tree_view_append_column (treeview, column);
-       g_signal_connect (treeview, "row-activated",
-                         G_CALLBACK (gs_shell_updates_row_activated_cb),
-                         shell_updates);
+        widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "list_box_update"));
+       g_signal_connect (GTK_LIST_BOX (widget), "row-activated",
+                         G_CALLBACK (gs_shell_updates_row_activated_cb), shell_updates);
+       gtk_list_box_set_header_func (GTK_LIST_BOX (widget),
+                                     gs_shell_updates_list_header_func,
+                                     shell_updates,
+                                     NULL);
 
        widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "button_update_all"));
         g_signal_connect (widget, "clicked", G_CALLBACK (gs_shell_updates_button_update_all_cb), 
shell_updates);