[gnome-logs/wip/detail] Show application icons if a desktop file is found
- From: David King <davidk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-logs/wip/detail] Show application icons if a desktop file is found
- Date: Thu, 16 Jan 2014 14:01:33 +0000 (UTC)
commit 2b9ec0003de3fd1d634bdbc42c3bc3d7b3909800
Author: David King <davidk gnome org>
Date: Thu Jan 16 13:59:00 2014 +0000
Show application icons if a desktop file is found
configure.ac | 3 +-
src/gl-eventviewdetail.c | 70 ++++++++++++++++++++++++++++++++++++++++++----
2 files changed, 66 insertions(+), 7 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index de7c7a0..3f0285f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,9 +65,10 @@ dnl AppData XML
APPDATA_XML
dnl Libraries
+GIO_REQUIRED="gio-unix-2.0"
GTK_REQUIRED="gtk+-3.0 >= 3.9.6"
SYSTEMD_JOURNAL_REQUIRED="libsystemd-journal"
-PKG_CHECK_MODULES([LOGS], [$GTK_REQUIRED $SYSTEMD_JOURNAL_REQUIRED])
+PKG_CHECK_MODULES([LOGS], [$GIO_REQUIRED $GTK_REQUIRED $SYSTEMD_JOURNAL_REQUIRED])
AC_CONFIG_FILES([
data/version.xml
diff --git a/src/gl-eventviewdetail.c b/src/gl-eventviewdetail.c
index 39316c7..25eb67c 100644
--- a/src/gl-eventviewdetail.c
+++ b/src/gl-eventviewdetail.c
@@ -18,6 +18,7 @@
#include "gl-eventviewdetail.h"
+#include <gio/gdesktopappinfo.h>
#include <glib/gi18n.h>
#include "gl-enums.h"
@@ -40,6 +41,66 @@ G_DEFINE_TYPE_WITH_PRIVATE (GlEventViewDetail, gl_event_view_detail, GTK_TYPE_BI
static GParamSpec *obj_properties[N_PROPERTIES] = { NULL, };
+static GtkWidget *
+create_widget_for_comm (const gchar *comm)
+{
+ if (comm && *comm)
+ {
+ /* Command-line, look for a desktop file. */
+ gchar *str;
+ GDesktopAppInfo *desktop;
+
+ /* TODO: Use g_desktop_app_info_search? */
+ str = g_strconcat (comm, ".desktop", NULL);
+ desktop = g_desktop_app_info_new (str);
+ g_free (str);
+
+ if (desktop)
+ {
+ GtkWidget *box;
+ GIcon *icon;
+ GtkWidget *image;
+ GtkWidget *label;
+ GtkStyleContext *context;
+
+ box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+
+ icon = g_app_info_get_icon (G_APP_INFO (desktop));
+ image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_DIALOG);
+ gtk_box_pack_end (GTK_BOX (box), image, TRUE, TRUE, 0);
+
+ label = gtk_label_new (g_app_info_get_name (G_APP_INFO (desktop)));
+ gtk_widget_set_direction (label, GTK_TEXT_DIR_LTR);
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ context = gtk_widget_get_style_context (label);
+ gtk_style_context_add_class (context, "detail-comm");
+ gtk_box_pack_end (GTK_BOX (box), label, TRUE, TRUE, 0);
+
+ g_object_unref (desktop);
+
+ return box;
+ }
+ else
+ {
+ GtkWidget *label;
+ GtkStyleContext *context;
+
+ label = gtk_label_new (comm);
+ gtk_widget_set_direction (label, GTK_TEXT_DIR_LTR);
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ context = gtk_widget_get_style_context (label);
+ gtk_style_context_add_class (context, "detail-comm");
+
+ return label;
+ }
+ }
+ else
+ {
+ /* No command-line. */
+ return gtk_label_new (NULL);
+ }
+}
+
static void
gl_event_view_detail_create_detail (GlEventViewDetail *detail)
{
@@ -48,6 +109,7 @@ gl_event_view_detail_create_detail (GlEventViewDetail *detail)
gchar *str;
gboolean rtl;
GtkWidget *box;
+ GtkWidget *description;
GtkWidget *grid;
GtkWidget *label;
GtkStyleContext *context;
@@ -59,12 +121,8 @@ gl_event_view_detail_create_detail (GlEventViewDetail *detail)
rtl = gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL;
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- label = gtk_label_new (result->comm);
- gtk_widget_set_direction (label, GTK_TEXT_DIR_LTR);
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- context = gtk_widget_get_style_context (label);
- gtk_style_context_add_class (context, "detail-comm");
- gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
+ description = create_widget_for_comm (result->comm);
+ gtk_box_pack_start (GTK_BOX (box), description, TRUE, TRUE, 0);
str = gl_util_timestamp_to_display (result->timestamp, priv->clock_format);
label = gtk_label_new (str);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]