[gnome-logs] Remove the PROP_STYLE property from GlEventViewRow

[David King <davidk src gnome org>]

commit a2416e4118ff37249dad731295b58183f4f65f63
Author: Jonathan Kang <jonathan121537 gmail com>
Date:   Tue May 26 23:00:38 2015 +0800

    Remove the PROP_STYLE property from GlEventViewRow
    
    We use a single line for each log entry, so style property is no longer
    needed.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=749894

 src/gl-eventviewlist.c |   10 +----
 src/gl-eventviewrow.c  |   97 +++---------------------------------------------
 src/gl-eventviewrow.h  |   16 +-------
 3 files changed, 8 insertions(+), 115 deletions(-)
---
diff --git a/src/gl-eventviewlist.c b/src/gl-eventviewlist.c
index 7d21b99..14ed803 100644
--- a/src/gl-eventviewlist.c
+++ b/src/gl-eventviewlist.c
@@ -50,8 +50,6 @@ typedef struct
     GtkWidget *event_scrolled;
     GtkWidget *search_entry;
     gchar *search_text;
-
-    GlEventViewRowStyle current_row_style;
 } GlEventViewListPrivate;
 
 G_DEFINE_TYPE_WITH_PRIVATE (GlEventViewList, gl_event_view_list, GTK_TYPE_BOX)
@@ -337,7 +335,7 @@ gl_event_list_view_create_row_widget (gpointer item,
 
     GlEventViewListPrivate *priv = gl_event_view_list_get_instance_private (view);
 
-    rtn = gl_event_view_row_new (item, priv->current_row_style, priv->clock_format);
+    rtn = gl_event_view_row_new (item, priv->clock_format);
     message_label = gl_event_view_row_get_message_label (GL_EVENT_VIEW_ROW (rtn));
     time_label = gl_event_view_row_get_time_label (GL_EVENT_VIEW_ROW (rtn));
 
@@ -388,7 +386,6 @@ on_notify_category (GlCategoryList *list,
               /* Alert or emergency priority. */
               const gchar * query[] = { "PRIORITY=0", "PRIORITY=1", "PRIORITY=2", "PRIORITY=3", NULL };
 
-              priv->current_row_style = GL_EVENT_VIEW_ROW_STYLE_CMDLINE;
               gl_journal_model_set_matches (priv->journal_model, query);
             }
             break;
@@ -397,7 +394,6 @@ on_notify_category (GlCategoryList *list,
             {
                 const gchar *query[] = { NULL };
 
-                priv->current_row_style = GL_EVENT_VIEW_ROW_STYLE_CMDLINE;
                 gl_journal_model_set_matches (priv->journal_model, query);
             }
             break;
@@ -413,7 +409,6 @@ on_notify_category (GlCategoryList *list,
                                          NULL,
                                          NULL };
 
-                priv->current_row_style = GL_EVENT_VIEW_ROW_STYLE_CMDLINE;
                 uid_str = create_uid_match_string ();
                 query[3] = uid_str;
                 gl_journal_model_set_matches (priv->journal_model, query);
@@ -426,7 +421,6 @@ on_notify_category (GlCategoryList *list,
             {
                 const gchar *query[] = { "_TRANSPORT=kernel", NULL };
 
-                priv->current_row_style = GL_EVENT_VIEW_ROW_STYLE_SIMPLE;
                 gl_journal_model_set_matches (priv->journal_model, query);
             }
             break;
@@ -435,7 +429,6 @@ on_notify_category (GlCategoryList *list,
             {
                 const gchar *query[] = { "_TRANSPORT=kernel", "_KERNEL_DEVICE", NULL };
 
-                priv->current_row_style = GL_EVENT_VIEW_ROW_STYLE_SIMPLE;
                 gl_journal_model_set_matches (priv->journal_model, query);
             }
             break;
@@ -444,7 +437,6 @@ on_notify_category (GlCategoryList *list,
             {
                 const gchar *query[] = { "_AUDIT_SESSION", NULL };
 
-                priv->current_row_style = GL_EVENT_VIEW_ROW_STYLE_CMDLINE;
                 gl_journal_model_set_matches (priv->journal_model, query);
             }
             break;
diff --git a/src/gl-eventviewrow.c b/src/gl-eventviewrow.c
index f7494c7..4b883de 100644
--- a/src/gl-eventviewrow.c
+++ b/src/gl-eventviewrow.c
@@ -29,7 +29,6 @@ enum
     PROP_0,
     PROP_CLOCK_FORMAT,
     PROP_ENTRY,
-    PROP_STYLE,
     N_PROPERTIES
 };
 
@@ -43,7 +42,6 @@ typedef struct
 {
     GlUtilClockFormat clock_format;
     GlJournalEntry *entry;
-    GlEventViewRowStyle style;
     GtkWidget *message_label;
     GtkWidget *time_label;
 } GlEventViewRowPrivate;
@@ -98,9 +96,6 @@ gl_event_view_row_get_property (GObject *object,
         case PROP_ENTRY:
             g_value_set_object (value, priv->entry);
             break;
-        case PROP_STYLE:
-            g_value_set_enum (value, priv->style);
-            break;
         default:
             G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
             break;
@@ -124,9 +119,6 @@ gl_event_view_row_set_property (GObject *object,
         case PROP_ENTRY:
             priv->entry = g_value_dup_object (value);
             break;
-        case PROP_STYLE:
-            priv->style = g_value_get_enum (value);
-            break;
         default:
             G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
             break;
@@ -134,63 +126,16 @@ gl_event_view_row_set_property (GObject *object,
 }
 
 static void
-gl_event_view_row_create_cmdline (GlEventViewRow *row)
+gl_event_view_row_constructed (GObject *object)
 {
-    GlEventViewRowPrivate *priv;
     GtkStyleContext *context;
     GtkWidget *grid;
     gchar *time;
     gboolean rtl;
     GlJournalEntry *entry;
     GDateTime *now;
-
-    priv = gl_event_view_row_get_instance_private (row);
-    entry = priv->entry;
-
-    rtl = (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL);
-
-    context = gtk_widget_get_style_context (GTK_WIDGET (row));
-    gtk_style_context_add_class (context, "event");
-    grid = gtk_grid_new ();
-    gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
-    gtk_container_add (GTK_CONTAINER (row), grid);
-
-    priv->message_label = gtk_label_new (gl_journal_entry_get_message (entry));
-    gtk_widget_set_direction (priv->message_label, GTK_TEXT_DIR_LTR);
-    context = gtk_widget_get_style_context (GTK_WIDGET (priv->message_label));
-    gtk_style_context_add_class (context, "event-monospace");
-    gtk_widget_set_halign (priv->message_label, GTK_ALIGN_START);
-    gtk_label_set_ellipsize (GTK_LABEL (priv->message_label),
-                             PANGO_ELLIPSIZE_END);
-    gtk_label_set_xalign (GTK_LABEL (priv->message_label), 0);
-    gtk_grid_attach (GTK_GRID (grid), priv->message_label,
-                     rtl ? 1 : 0, 0, 1, 1);
-
-    now = g_date_time_new_now_local ();
-    time = gl_util_timestamp_to_display (gl_journal_entry_get_timestamp (entry),
-                                         now, priv->clock_format);
-    g_date_time_unref (now);
-    priv->time_label = gtk_label_new (time);
-    context = gtk_widget_get_style_context (GTK_WIDGET (priv->time_label));
-    gtk_style_context_add_class (context, "dim-label");
-    gtk_style_context_add_class (context, "event-time");
-    gtk_widget_set_halign (priv->time_label, GTK_ALIGN_END);
-    gtk_label_set_xalign (GTK_LABEL (priv->time_label), 1);
-    gtk_grid_attach (GTK_GRID (grid), priv->time_label, rtl ? 0 : 1, 0, 1, 1);
-
-    g_free (time);
-}
-
-static void
-gl_event_view_row_create_simple (GlEventViewRow *row)
-{
+    GlEventViewRow *row = GL_EVENT_VIEW_ROW (object);
     GlEventViewRowPrivate *priv;
-    GtkStyleContext *context;
-    GtkWidget *grid;
-    gchar *time;
-    gboolean rtl;
-    GlJournalEntry *entry;
-    GDateTime *now;
 
     priv = gl_event_view_row_get_instance_private (row);
     entry = priv->entry;
@@ -227,28 +172,6 @@ gl_event_view_row_create_simple (GlEventViewRow *row)
     gtk_grid_attach (GTK_GRID (grid), priv->time_label, rtl ? 0 : 1, 0, 1, 1);
 
     g_free (time);
-}
-
-static void
-gl_event_view_row_constructed (GObject *object)
-{
-    GlEventViewRow *row = GL_EVENT_VIEW_ROW (object);
-    GlEventViewRowPrivate *priv;
-
-    priv = gl_event_view_row_get_instance_private (row);
-
-    /* contruct-only properties have already been set. */
-    switch (priv->style)
-    {
-        case GL_EVENT_VIEW_ROW_STYLE_CMDLINE:
-            gl_event_view_row_create_cmdline (row);
-            break;
-        case GL_EVENT_VIEW_ROW_STYLE_SIMPLE:
-            gl_event_view_row_create_simple (row);
-            break;
-        default:
-            g_assert_not_reached ();
-    }
 
     G_OBJECT_CLASS (gl_event_view_row_parent_class)->constructed (object);
 }
@@ -278,14 +201,6 @@ gl_event_view_row_class_init (GlEventViewRowClass *klass)
                                                       G_PARAM_CONSTRUCT_ONLY |
                                                       G_PARAM_STATIC_STRINGS);
 
-    obj_properties[PROP_STYLE] = g_param_spec_enum ("style", "Style",
-                                                    "Row display style",
-                                                    GL_TYPE_EVENT_VIEW_ROW_STYLE,
-                                                    GL_EVENT_VIEW_ROW_STYLE_CMDLINE,
-                                                    G_PARAM_READWRITE |
-                                                    G_PARAM_CONSTRUCT_ONLY |
-                                                    G_PARAM_STATIC_STRINGS);
-
     g_object_class_install_properties (gobject_class, N_PROPERTIES,
                                        obj_properties);
 }
@@ -293,7 +208,8 @@ gl_event_view_row_class_init (GlEventViewRowClass *klass)
 static void
 gl_event_view_row_init (GlEventViewRow *row)
 {
-    /* See gl_event_view_row_constructed (). */
+    /* The widgets are initialized in gl_event_view_row_constructed (), because
+     * at _init() time the construct-only properties have not been set. */
 }
 
 GlJournalEntry *
@@ -310,9 +226,8 @@ gl_event_view_row_get_entry (GlEventViewRow *row)
 
 GtkWidget *
 gl_event_view_row_new (GlJournalEntry *entry,
-                       GlEventViewRowStyle style,
                        GlUtilClockFormat clock_format)
 {
-    return g_object_new (GL_TYPE_EVENT_VIEW_ROW, "style", style, "entry",
-                         entry, "clock-format", clock_format, NULL);
+    return g_object_new (GL_TYPE_EVENT_VIEW_ROW, "entry", entry,
+                         "clock-format", clock_format, NULL);
 }
diff --git a/src/gl-eventviewrow.h b/src/gl-eventviewrow.h
index 503e889..3e33814 100644
--- a/src/gl-eventviewrow.h
+++ b/src/gl-eventviewrow.h
@@ -26,24 +26,10 @@ G_BEGIN_DECLS
 #include "gl-journal.h"
 #include "gl-util.h"
 
-/*
- * GlEventViewRowStyle:
- * @GL_EVENT_VIEW_ROW_STYLE_CMDLINE: show the command-line in bold, if it
- * exists, as well as the log message
- * @GL_EVENT_VIEW_ROW_STYLE_SIMPLE: show only the event message and timestamp
- *
- * The style for the row.
- */
-typedef enum
-{
-    GL_EVENT_VIEW_ROW_STYLE_CMDLINE,
-    GL_EVENT_VIEW_ROW_STYLE_SIMPLE
-} GlEventViewRowStyle;
-
 #define GL_TYPE_EVENT_VIEW_ROW (gl_event_view_row_get_type ())
 G_DECLARE_FINAL_TYPE (GlEventViewRow, gl_event_view_row, GL, EVENT_VIEW_ROW, GtkListBoxRow)
 
-GtkWidget * gl_event_view_row_new (GlJournalEntry *entry, GlEventViewRowStyle style, GlUtilClockFormat 
clock_format);
+GtkWidget * gl_event_view_row_new (GlJournalEntry *entry, GlUtilClockFormat clock_format);
 GlJournalEntry * gl_event_view_row_get_entry (GlEventViewRow *row);
 GtkWidget * gl_event_view_row_get_message_label (GlEventViewRow *row);
 GtkWidget * gl_event_view_row_get_time_label (GlEventViewRow *row);