[gnome-logs] Move GlEventView to GlEventViewList
- From: David King <davidk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-logs] Move GlEventView to GlEventViewList
- Date: Mon, 21 Jul 2014 20:36:51 +0000 (UTC)
commit d215e1a2ddceff61d5327d96d573420390c9e53a
Author: David King <davidk gnome org>
Date: Mon Jul 21 15:17:13 2014 +0100
Move GlEventView to GlEventViewList
This will make it easier to add a GlEventView, which can contain both
the category list and event view pair, as well as a detail view.
Makefile.am | 6 +-
data/gl-window.ui | 2 +-
po/POTFILES.in | 2 +-
src/gl-application.c | 4 +-
src/gl-categorylist.c | 24 ++--
src/gl-eventtoolbar.c | 2 +-
src/gl-eventview.h | 91 -----------
src/{gl-eventview.c => gl-eventviewlist.c} | 230 ++++++++++++++--------------
src/gl-eventviewlist.h | 91 +++++++++++
src/gl-window.c | 28 ++--
10 files changed, 241 insertions(+), 239 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index d1446bd..381955d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,8 +27,8 @@ gnome_logs_SOURCES = \
src/gl-application.c \
src/gl-categorylist.c \
src/gl-eventtoolbar.c \
- src/gl-eventview.c \
src/gl-eventviewdetail.c \
+ src/gl-eventviewlist.c \
src/gl-eventviewrow.c \
src/gl-journal.c \
src/gl-main.c \
@@ -45,7 +45,7 @@ enum_data = \
gnome_logs_enum_headers = \
$(srcdir)/src/gl-eventtoolbar.h \
- $(srcdir)/src/gl-eventview.h \
+ $(srcdir)/src/gl-eventviewlist.h \
$(srcdir)/src/gl-eventviewrow.h \
$(srcdir)/src/gl-util.h
@@ -53,8 +53,8 @@ noinst_gnome_logs_headers = \
src/gl-application.h \
src/gl-categorylist.h \
src/gl-eventtoolbar.h \
- src/gl-eventview.h \
src/gl-eventviewdetail.h \
+ src/gl-eventviewlist.h \
src/gl-eventviewrow.h \
src/gl-journal.h \
src/gl-util.h \
diff --git a/data/gl-window.ui b/data/gl-window.ui
index 6a5c32c..4c67596 100644
--- a/data/gl-window.ui
+++ b/data/gl-window.ui
@@ -48,7 +48,7 @@
</object>
</child>
<child>
- <object class="GlEventView" id="events">
+ <object class="GlEventViewList" id="events">
<property name="expand">True</property>
<property name="visible">True</property>
</object>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d1dfd10..90d9d55 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -5,6 +5,6 @@
data/org.gnome.Logs.appdata.xml.in
data/org.gnome.Logs.desktop.in
src/gl-application.c
-src/gl-eventview.c
src/gl-eventviewdetail.c
+src/gl-eventviewlist.c
src/gl-util.c
diff --git a/src/gl-application.c b/src/gl-application.c
index 3395170..49ccaaa 100644
--- a/src/gl-application.c
+++ b/src/gl-application.c
@@ -23,7 +23,7 @@
#include "gl-categorylist.h"
#include "gl-eventtoolbar.h"
-#include "gl-eventview.h"
+#include "gl-eventviewlist.h"
#include "gl-util.h"
#include "gl-window.h"
@@ -177,7 +177,7 @@ gl_application_startup (GApplication *application)
gl_window_get_type ();
gl_category_list_get_type ();
gl_event_toolbar_get_type ();
- gl_event_view_get_type ();
+ gl_event_view_list_get_type ();
}
static void
diff --git a/src/gl-categorylist.c b/src/gl-categorylist.c
index f8b947b..4d7e20f 100644
--- a/src/gl-categorylist.c
+++ b/src/gl-categorylist.c
@@ -21,7 +21,7 @@
#include <glib/gi18n.h>
#include "gl-enums.h"
-#include "gl-eventview.h"
+#include "gl-eventviewlist.h"
typedef struct
{
@@ -97,47 +97,47 @@ on_gl_category_list_row_selected (GlCategoryList *listbox,
return;
}
- eclass = g_type_class_ref (GL_TYPE_EVENT_VIEW_FILTER);
+ eclass = g_type_class_ref (GL_TYPE_EVENT_VIEW_LIST_FILTER);
if (row == GTK_LIST_BOX_ROW (priv->important))
{
- evalue = g_enum_get_value (eclass, GL_EVENT_VIEW_FILTER_IMPORTANT);
+ evalue = g_enum_get_value (eclass, GL_EVENT_VIEW_LIST_FILTER_IMPORTANT);
}
else if (row == GTK_LIST_BOX_ROW (priv->alerts))
{
- evalue = g_enum_get_value (eclass, GL_EVENT_VIEW_FILTER_ALERTS);
+ evalue = g_enum_get_value (eclass, GL_EVENT_VIEW_LIST_FILTER_ALERTS);
}
else if (row == GTK_LIST_BOX_ROW (priv->starred))
{
- evalue = g_enum_get_value (eclass, GL_EVENT_VIEW_FILTER_STARRED);
+ evalue = g_enum_get_value (eclass, GL_EVENT_VIEW_LIST_FILTER_STARRED);
}
else if (row == GTK_LIST_BOX_ROW (priv->all))
{
- evalue = g_enum_get_value (eclass, GL_EVENT_VIEW_FILTER_ALL);
+ evalue = g_enum_get_value (eclass, GL_EVENT_VIEW_LIST_FILTER_ALL);
}
else if (row == GTK_LIST_BOX_ROW (priv->applications))
{
- evalue = g_enum_get_value (eclass, GL_EVENT_VIEW_FILTER_APPLICATIONS);
+ evalue = g_enum_get_value (eclass, GL_EVENT_VIEW_LIST_FILTER_APPLICATIONS);
}
else if (row == GTK_LIST_BOX_ROW (priv->system))
{
- evalue = g_enum_get_value (eclass, GL_EVENT_VIEW_FILTER_SYSTEM);
+ evalue = g_enum_get_value (eclass, GL_EVENT_VIEW_LIST_FILTER_SYSTEM);
}
else if (row == GTK_LIST_BOX_ROW (priv->security))
{
- evalue = g_enum_get_value (eclass, GL_EVENT_VIEW_FILTER_SECURITY);
+ evalue = g_enum_get_value (eclass, GL_EVENT_VIEW_LIST_FILTER_SECURITY);
}
else if (row == GTK_LIST_BOX_ROW (priv->hardware))
{
- evalue = g_enum_get_value (eclass, GL_EVENT_VIEW_FILTER_HARDWARE);
+ evalue = g_enum_get_value (eclass, GL_EVENT_VIEW_LIST_FILTER_HARDWARE);
}
else if (row == GTK_LIST_BOX_ROW (priv->updates))
{
- evalue = g_enum_get_value (eclass, GL_EVENT_VIEW_FILTER_UPDATES);
+ evalue = g_enum_get_value (eclass, GL_EVENT_VIEW_LIST_FILTER_UPDATES);
}
else if (row == GTK_LIST_BOX_ROW (priv->usage))
{
- evalue = g_enum_get_value (eclass, GL_EVENT_VIEW_FILTER_USAGE);
+ evalue = g_enum_get_value (eclass, GL_EVENT_VIEW_LIST_FILTER_USAGE);
}
else
{
diff --git a/src/gl-eventtoolbar.c b/src/gl-eventtoolbar.c
index 28cfaeb..50f1351 100644
--- a/src/gl-eventtoolbar.c
+++ b/src/gl-eventtoolbar.c
@@ -21,7 +21,7 @@
#include <glib/gi18n.h>
#include "gl-enums.h"
-#include "gl-eventview.h"
+#include "gl-eventviewlist.h"
enum
{
diff --git a/src/gl-eventview.c b/src/gl-eventviewlist.c
similarity index 81%
rename from src/gl-eventview.c
rename to src/gl-eventviewlist.c
index 67c48f3..c609665 100644
--- a/src/gl-eventview.c
+++ b/src/gl-eventviewlist.c
@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "gl-eventview.h"
+#include "gl-eventviewlist.h"
#include <glib/gi18n.h>
#include <glib-unix.h>
@@ -42,7 +42,7 @@ typedef struct
{
GlJournal *journal;
GlUtilClockFormat clock_format;
- GlEventViewFilter filter;
+ GlEventViewListFilter filter;
GtkListBox *active_listbox;
GlEventViewMode mode;
gchar *search_text;
@@ -51,9 +51,9 @@ typedef struct
GQueue *pending_results;
GList *results;
guint insert_idle_id;
-} GlEventViewPrivate;
+} GlEventViewListPrivate;
-G_DEFINE_TYPE_WITH_PRIVATE (GlEventView, gl_event_view, GTK_TYPE_STACK)
+G_DEFINE_TYPE_WITH_PRIVATE (GlEventViewList, gl_event_view_list, GTK_TYPE_STACK)
static GParamSpec *obj_properties[N_PROPERTIES] = { NULL, };
static const gssize N_RESULTS = -1;
@@ -62,12 +62,12 @@ static const gchar DESKTOP_SCHEMA[] = "org.gnome.desktop.interface";
static const gchar CLOCK_FORMAT[] = "clock-format";
static gboolean
-gl_event_view_search_is_case_sensitive (GlEventView *view)
+gl_event_view_search_is_case_sensitive (GlEventViewList *view)
{
- GlEventViewPrivate *priv;
+ GlEventViewListPrivate *priv;
const gchar *search_text;
- priv = gl_event_view_get_instance_private (view);
+ priv = gl_event_view_list_get_instance_private (view);
for (search_text = priv->search_text; search_text && *search_text;
search_text = g_utf8_next_char (search_text))
@@ -87,7 +87,7 @@ gl_event_view_search_is_case_sensitive (GlEventView *view)
static gboolean
search_in_result (GlJournalResult *result,
- const gchar *search_text)
+ const gchar *search_text)
{
if ((result->comm ? strstr (result->comm, search_text) : NULL)
|| (result->message ? strstr (result->message, search_text) : NULL)
@@ -104,11 +104,11 @@ search_in_result (GlJournalResult *result,
static gboolean
listbox_search_filter_func (GtkListBoxRow *row,
- GlEventView *view)
+ GlEventViewList *view)
{
- GlEventViewPrivate *priv;
+ GlEventViewListPrivate *priv;
- priv = gl_event_view_get_instance_private (view);
+ priv = gl_event_view_list_get_instance_private (view);
if (!priv->search_text || !*(priv->search_text))
{
@@ -169,14 +169,14 @@ listbox_search_filter_func (GtkListBoxRow *row,
static void
on_listbox_row_activated (GtkListBox *listbox,
GtkListBoxRow *row,
- GlEventView *view)
+ GlEventViewList *view)
{
- GlEventViewPrivate *priv;
+ GlEventViewListPrivate *priv;
GlJournalResult *result;
GtkWidget *detail;
GtkStack *stack;
- priv = gl_event_view_get_instance_private (view);
+ priv = gl_event_view_list_get_instance_private (view);
result = gl_event_view_row_get_result (GL_EVENT_VIEW_ROW (row));
detail = gl_event_view_detail_new (result, priv->clock_format);
@@ -185,11 +185,11 @@ on_listbox_row_activated (GtkListBox *listbox,
stack = GTK_STACK (view);
gtk_stack_add_named (stack, detail, "detail");
- gl_event_view_set_mode (view, GL_EVENT_VIEW_MODE_DETAIL);
+ gl_event_view_list_set_mode (view, GL_EVENT_VIEW_MODE_DETAIL);
}
static GtkWidget *
-gl_event_view_create_empty (G_GNUC_UNUSED GlEventView *view)
+gl_event_view_create_empty (G_GNUC_UNUSED GlEventViewList *view)
{
GtkWidget *box;
GtkStyleContext *context;
@@ -225,7 +225,7 @@ gl_event_view_create_empty (G_GNUC_UNUSED GlEventView *view)
}
static GtkWidget *
-gl_event_view_list_box_new (GlEventView *view)
+gl_event_view_list_box_new (GlEventViewList *view)
{
GtkWidget *listbox;
@@ -245,11 +245,11 @@ gl_event_view_list_box_new (GlEventView *view)
}
static gboolean
-insert_devices_idle (GlEventView *view)
+insert_devices_idle (GlEventViewList *view)
{
- GlEventViewPrivate *priv;
+ GlEventViewListPrivate *priv;
- priv = gl_event_view_get_instance_private (view);
+ priv = gl_event_view_list_get_instance_private (view);
if (priv->pending_results)
{
@@ -298,15 +298,15 @@ insert_devices_idle (GlEventView *view)
}
static void
-insert_journal_query_devices (GlEventView *view,
+insert_journal_query_devices (GlEventViewList *view,
const GlJournalQuery *query,
GtkListBox *listbox)
{
- GlEventViewPrivate *priv;
+ GlEventViewListPrivate *priv;
GList *l;
gsize n_results;
- priv = gl_event_view_get_instance_private (view);
+ priv = gl_event_view_list_get_instance_private (view);
priv->results = gl_journal_query (priv->journal, query);
priv->results_listbox = listbox;
@@ -330,11 +330,11 @@ insert_journal_query_devices (GlEventView *view,
}
static gboolean
-insert_security_idle (GlEventView *view)
+insert_security_idle (GlEventViewList *view)
{
- GlEventViewPrivate *priv;
+ GlEventViewListPrivate *priv;
- priv = gl_event_view_get_instance_private (view);
+ priv = gl_event_view_list_get_instance_private (view);
if (priv->pending_results)
{
@@ -383,15 +383,15 @@ insert_security_idle (GlEventView *view)
}
static void
-insert_journal_query_security (GlEventView *view,
+insert_journal_query_security (GlEventViewList *view,
const GlJournalQuery *query,
GtkListBox *listbox)
{
- GlEventViewPrivate *priv;
+ GlEventViewListPrivate *priv;
GList *l;
gsize n_results;
- priv = gl_event_view_get_instance_private (view);
+ priv = gl_event_view_list_get_instance_private (view);
priv->results = gl_journal_query (priv->journal, query);
priv->results_listbox = listbox;
@@ -415,11 +415,11 @@ insert_journal_query_security (GlEventView *view,
}
static gboolean
-insert_simple_idle (GlEventView *view)
+insert_simple_idle (GlEventViewList *view)
{
- GlEventViewPrivate *priv;
+ GlEventViewListPrivate *priv;
- priv = gl_event_view_get_instance_private (view);
+ priv = gl_event_view_list_get_instance_private (view);
if (priv->pending_results)
{
@@ -463,15 +463,15 @@ insert_simple_idle (GlEventView *view)
}
static void
-insert_journal_query_simple (GlEventView *view,
+insert_journal_query_simple (GlEventViewList *view,
const GlJournalQuery *query,
GtkListBox *listbox)
{
- GlEventViewPrivate *priv;
+ GlEventViewListPrivate *priv;
GList *l;
gsize n_results;
- priv = gl_event_view_get_instance_private (view);
+ priv = gl_event_view_list_get_instance_private (view);
priv->results = gl_journal_query (priv->journal, query);
priv->results_listbox = listbox;
@@ -493,11 +493,11 @@ insert_journal_query_simple (GlEventView *view,
}
static gboolean
-insert_cmdline_idle (GlEventView *view)
+insert_cmdline_idle (GlEventViewList *view)
{
- GlEventViewPrivate *priv;
+ GlEventViewListPrivate *priv;
- priv = gl_event_view_get_instance_private (view);
+ priv = gl_event_view_list_get_instance_private (view);
if (priv->pending_results)
{
@@ -541,15 +541,15 @@ insert_cmdline_idle (GlEventView *view)
}
static void
-insert_journal_query_cmdline (GlEventView *view,
+insert_journal_query_cmdline (GlEventViewList *view,
const GlJournalQuery *query,
GtkListBox *listbox)
{
- GlEventViewPrivate *priv;
+ GlEventViewListPrivate *priv;
GList *l;
gsize n_results;
- priv = gl_event_view_get_instance_private (view);
+ priv = gl_event_view_list_get_instance_private (view);
priv->results = gl_journal_query (priv->journal, query);
priv->results_listbox = listbox;
@@ -573,7 +573,7 @@ insert_journal_query_cmdline (GlEventView *view,
}
static void
-gl_event_view_add_listbox_important (GlEventView *view)
+gl_event_view_list_add_listbox_important (GlEventViewList *view)
{
/* Alert or emergency priority. */
const GlJournalQuery query = { N_RESULTS,
@@ -597,7 +597,7 @@ gl_event_view_add_listbox_important (GlEventView *view)
}
static void
-gl_event_view_add_listbox_alerts (GlEventView *view)
+gl_event_view_list_add_listbox_alerts (GlEventViewList *view)
{
GtkWidget *label;
@@ -607,7 +607,7 @@ gl_event_view_add_listbox_alerts (GlEventView *view)
}
static void
-gl_event_view_add_listbox_starred (GlEventView *view)
+gl_event_view_list_add_listbox_starred (GlEventViewList *view)
{
GtkWidget *label;
@@ -617,7 +617,7 @@ gl_event_view_add_listbox_starred (GlEventView *view)
}
static void
-gl_event_view_add_listbox_all (GlEventView *view)
+gl_event_view_list_add_listbox_all (GlEventViewList *view)
{
const GlJournalQuery query = { N_RESULTS, NULL };
GtkWidget *listbox;
@@ -634,7 +634,7 @@ gl_event_view_add_listbox_all (GlEventView *view)
}
static void
-gl_event_view_add_listbox_applications (GlEventView *view)
+gl_event_view_list_add_listbox_applications (GlEventViewList *view)
{
GCredentials *creds;
uid_t uid;
@@ -685,7 +685,7 @@ gl_event_view_add_listbox_applications (GlEventView *view)
}
static void
-gl_event_view_add_listbox_system (GlEventView *view)
+gl_event_view_list_add_listbox_system (GlEventViewList *view)
{
GlJournalQuery query = { N_RESULTS,
(gchar *[2]){ "_TRANSPORT=kernel", NULL } };
@@ -703,7 +703,7 @@ gl_event_view_add_listbox_system (GlEventView *view)
}
static void
-gl_event_view_add_listbox_hardware (GlEventView *view)
+gl_event_view_list_add_listbox_hardware (GlEventViewList *view)
{
GlJournalQuery query = { N_RESULTS,
(gchar *[2]){ "_TRANSPORT=kernel", NULL } };
@@ -721,7 +721,7 @@ gl_event_view_add_listbox_hardware (GlEventView *view)
}
static void
-gl_event_view_add_listbox_security (GlEventView *view)
+gl_event_view_list_add_listbox_security (GlEventViewList *view)
{
const GlJournalQuery query = { N_RESULTS, NULL };
GtkWidget *listbox;
@@ -738,7 +738,7 @@ gl_event_view_add_listbox_security (GlEventView *view)
}
static void
-gl_event_view_add_listbox_updates (GlEventView *view)
+gl_event_view_list_add_listbox_updates (GlEventViewList *view)
{
GtkWidget *label;
@@ -748,7 +748,7 @@ gl_event_view_add_listbox_updates (GlEventView *view)
}
static void
-gl_event_view_add_listbox_usage (GlEventView *view)
+gl_event_view_list_add_listbox_usage (GlEventViewList *view)
{
GtkWidget *label;
@@ -758,16 +758,16 @@ gl_event_view_add_listbox_usage (GlEventView *view)
}
static void
-on_notify_filter (GlEventView *view,
+on_notify_filter (GlEventViewList *view,
G_GNUC_UNUSED GParamSpec *pspec,
G_GNUC_UNUSED gpointer user_data)
{
- GlEventViewPrivate *priv;
+ GlEventViewListPrivate *priv;
GtkStack *stack;
GtkWidget *scrolled;
GtkWidget *viewport;
- priv = gl_event_view_get_instance_private (view);
+ priv = gl_event_view_list_get_instance_private (view);
stack = GTK_STACK (view);
if (priv->active_listbox)
@@ -780,44 +780,44 @@ on_notify_filter (GlEventView *view,
switch (priv->filter)
{
- case GL_EVENT_VIEW_FILTER_IMPORTANT:
- gl_event_view_add_listbox_important (view);
+ case GL_EVENT_VIEW_LIST_FILTER_IMPORTANT:
+ gl_event_view_list_add_listbox_important (view);
gtk_stack_set_visible_child_name (stack, "listbox-important");
break;
- case GL_EVENT_VIEW_FILTER_ALERTS:
- gl_event_view_add_listbox_alerts (view);
+ case GL_EVENT_VIEW_LIST_FILTER_ALERTS:
+ gl_event_view_list_add_listbox_alerts (view);
gtk_stack_set_visible_child_name (stack, "listbox-alerts");
break;
- case GL_EVENT_VIEW_FILTER_STARRED:
- gl_event_view_add_listbox_starred (view);
+ case GL_EVENT_VIEW_LIST_FILTER_STARRED:
+ gl_event_view_list_add_listbox_starred (view);
gtk_stack_set_visible_child_name (stack, "listbox-starred");
break;
- case GL_EVENT_VIEW_FILTER_ALL:
- gl_event_view_add_listbox_all (view);
+ case GL_EVENT_VIEW_LIST_FILTER_ALL:
+ gl_event_view_list_add_listbox_all (view);
gtk_stack_set_visible_child_name (stack, "listbox-all");
break;
- case GL_EVENT_VIEW_FILTER_APPLICATIONS:
- gl_event_view_add_listbox_applications (view);
+ case GL_EVENT_VIEW_LIST_FILTER_APPLICATIONS:
+ gl_event_view_list_add_listbox_applications (view);
gtk_stack_set_visible_child_name (stack, "listbox-applications");
break;
- case GL_EVENT_VIEW_FILTER_SYSTEM:
- gl_event_view_add_listbox_system (view);
+ case GL_EVENT_VIEW_LIST_FILTER_SYSTEM:
+ gl_event_view_list_add_listbox_system (view);
gtk_stack_set_visible_child_name (stack, "listbox-system");
break;
- case GL_EVENT_VIEW_FILTER_HARDWARE:
- gl_event_view_add_listbox_hardware (view);
+ case GL_EVENT_VIEW_LIST_FILTER_HARDWARE:
+ gl_event_view_list_add_listbox_hardware (view);
gtk_stack_set_visible_child_name (stack, "listbox-hardware");
break;
- case GL_EVENT_VIEW_FILTER_SECURITY:
- gl_event_view_add_listbox_security (view);
+ case GL_EVENT_VIEW_LIST_FILTER_SECURITY:
+ gl_event_view_list_add_listbox_security (view);
gtk_stack_set_visible_child_name (stack, "listbox-security");
break;
- case GL_EVENT_VIEW_FILTER_UPDATES:
- gl_event_view_add_listbox_updates (view);
+ case GL_EVENT_VIEW_LIST_FILTER_UPDATES:
+ gl_event_view_list_add_listbox_updates (view);
gtk_stack_set_visible_child_name (stack, "listbox-updates");
break;
- case GL_EVENT_VIEW_FILTER_USAGE:
- gl_event_view_add_listbox_usage (view);
+ case GL_EVENT_VIEW_LIST_FILTER_USAGE:
+ gl_event_view_list_add_listbox_usage (view);
gtk_stack_set_visible_child_name (stack, "listbox-usage");
break;
default:
@@ -828,19 +828,19 @@ on_notify_filter (GlEventView *view,
viewport = gtk_bin_get_child (GTK_BIN (scrolled));
priv->active_listbox = GTK_LIST_BOX (gtk_bin_get_child (GTK_BIN (viewport)));
- gl_event_view_set_mode (view, GL_EVENT_VIEW_MODE_LIST);
+ gl_event_view_list_set_mode (view, GL_EVENT_VIEW_MODE_LIST);
}
static void
-on_notify_mode (GlEventView *view,
+on_notify_mode (GlEventViewList *view,
GParamSpec *pspec,
gpointer user_data)
{
- GlEventViewPrivate *priv;
+ GlEventViewListPrivate *priv;
GtkStack *stack;
GtkWidget *toplevel;
- priv = gl_event_view_get_instance_private (view);
+ priv = gl_event_view_list_get_instance_private (view);
stack = GTK_STACK (view);
switch (priv->mode)
@@ -894,10 +894,10 @@ on_notify_mode (GlEventView *view,
}
static void
-gl_event_view_finalize (GObject *object)
+gl_event_view_list_finalize (GObject *object)
{
- GlEventView *view = GL_EVENT_VIEW (object);
- GlEventViewPrivate *priv = gl_event_view_get_instance_private (view);
+ GlEventViewList *view = GL_EVENT_VIEW_LIST (object);
+ GlEventViewListPrivate *priv = gl_event_view_list_get_instance_private (view);
if (priv->insert_idle_id)
{
@@ -909,13 +909,13 @@ gl_event_view_finalize (GObject *object)
}
static void
-gl_event_view_get_property (GObject *object,
+gl_event_view_list_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec)
{
- GlEventView *view = GL_EVENT_VIEW (object);
- GlEventViewPrivate *priv = gl_event_view_get_instance_private (view);
+ GlEventViewList *view = GL_EVENT_VIEW_LIST (object);
+ GlEventViewListPrivate *priv = gl_event_view_list_get_instance_private (view);
switch (prop_id)
{
@@ -931,13 +931,13 @@ gl_event_view_get_property (GObject *object,
}
static void
-gl_event_view_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
+gl_event_view_list_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
- GlEventView *view = GL_EVENT_VIEW (object);
- GlEventViewPrivate *priv = gl_event_view_get_instance_private (view);
+ GlEventViewList *view = GL_EVENT_VIEW_LIST (object);
+ GlEventViewListPrivate *priv = gl_event_view_list_get_instance_private (view);
switch (prop_id)
{
@@ -954,18 +954,18 @@ gl_event_view_set_property (GObject *object,
}
static void
-gl_event_view_class_init (GlEventViewClass *klass)
+gl_event_view_list_class_init (GlEventViewListClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
- gobject_class->finalize = gl_event_view_finalize;
- gobject_class->get_property = gl_event_view_get_property;
- gobject_class->set_property = gl_event_view_set_property;
+ gobject_class->finalize = gl_event_view_list_finalize;
+ gobject_class->get_property = gl_event_view_list_get_property;
+ gobject_class->set_property = gl_event_view_list_set_property;
obj_properties[PROP_FILTER] = g_param_spec_enum ("filter", "Filter",
"Filter events by",
- GL_TYPE_EVENT_VIEW_FILTER,
- GL_EVENT_VIEW_FILTER_IMPORTANT,
+ GL_TYPE_EVENT_VIEW_LIST_FILTER,
+ GL_EVENT_VIEW_LIST_FILTER_IMPORTANT,
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS);
@@ -981,12 +981,12 @@ gl_event_view_class_init (GlEventViewClass *klass)
}
static void
-gl_event_view_init (GlEventView *view)
+gl_event_view_list_init (GlEventViewList *view)
{
- GlEventViewPrivate *priv;
+ GlEventViewListPrivate *priv;
GSettings *settings;
- priv = gl_event_view_get_instance_private (view);
+ priv = gl_event_view_list_get_instance_private (view);
priv->search_text = NULL;
priv->active_listbox = NULL;
priv->insert_idle_id = 0;
@@ -1007,14 +1007,14 @@ gl_event_view_init (GlEventView *view)
}
void
-gl_event_view_search (GlEventView *view,
- const gchar *needle)
+gl_event_view_list_search (GlEventViewList *view,
+ const gchar *needle)
{
- GlEventViewPrivate *priv;
+ GlEventViewListPrivate *priv;
- g_return_if_fail (GL_EVENT_VIEW (view));
+ g_return_if_fail (GL_EVENT_VIEW_LIST (view));
- priv = gl_event_view_get_instance_private (view);
+ priv = gl_event_view_list_get_instance_private (view);
g_free (priv->search_text);
priv->search_text = g_strdup (needle);
@@ -1023,13 +1023,14 @@ gl_event_view_search (GlEventView *view,
}
void
-gl_event_view_set_filter (GlEventView *view, GlEventViewFilter filter)
+gl_event_view_list_set_filter (GlEventViewList *view,
+ GlEventViewListFilter filter)
{
- GlEventViewPrivate *priv;
+ GlEventViewListPrivate *priv;
- g_return_if_fail (GL_EVENT_VIEW (view));
+ g_return_if_fail (GL_EVENT_VIEW_LIST (view));
- priv = gl_event_view_get_instance_private (view);
+ priv = gl_event_view_list_get_instance_private (view);
if (priv->filter != filter)
{
@@ -1040,13 +1041,14 @@ gl_event_view_set_filter (GlEventView *view, GlEventViewFilter filter)
}
void
-gl_event_view_set_mode (GlEventView *view, GlEventViewMode mode)
+gl_event_view_list_set_mode (GlEventViewList *view,
+ GlEventViewMode mode)
{
- GlEventViewPrivate *priv;
+ GlEventViewListPrivate *priv;
- g_return_if_fail (GL_EVENT_VIEW (view));
+ g_return_if_fail (GL_EVENT_VIEW_LIST (view));
- priv = gl_event_view_get_instance_private (view);
+ priv = gl_event_view_list_get_instance_private (view);
if (priv->mode != mode)
{
@@ -1057,7 +1059,7 @@ gl_event_view_set_mode (GlEventView *view, GlEventViewMode mode)
}
GtkWidget *
-gl_event_view_new (void)
+gl_event_view_list_new (void)
{
- return g_object_new (GL_TYPE_EVENT_VIEW, NULL);
+ return g_object_new (GL_TYPE_EVENT_VIEW_LIST, NULL);
}
diff --git a/src/gl-eventviewlist.h b/src/gl-eventviewlist.h
new file mode 100644
index 0000000..d25cb57
--- /dev/null
+++ b/src/gl-eventviewlist.h
@@ -0,0 +1,91 @@
+/*
+ * GNOME Logs - View and search logs
+ * Copyright (C) 2013 Red Hat, Inc.
+ *
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GL_EVENT_VIEW_LIST_H_
+#define GL_EVENT_VIEW_LIST_H_
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+typedef struct
+{
+ /*< private >*/
+ GtkListBox parent_instance;
+} GlEventViewList;
+
+typedef struct
+{
+ /*< private >*/
+ GtkListBoxClass parent_class;
+} GlEventViewListClass;
+
+/*
+ * GlEventViewListFilter:
+ * @GL_EVENT_VIEW_LIST_FILTER_IMPORTANT:
+ * @GL_EVENT_VIEW_LIST_FILTER_ALERTS:
+ * @GL_EVENT_VIEW_LIST_FILTER_STARRED:
+ * @GL_EVENT_VIEW_LIST_FILTER_ALL:
+ * @GL_EVENT_VIEW_LIST_FILTER_APPLICATIONS:
+ * @GL_EVENT_VIEW_LIST_FILTER_SYSTEM:
+ * @GL_EVENT_VIEW_LIST_FILTER_SECURITY:
+ * @GL_EVENT_VIEW_LIST_FILTER_HARDWARE:
+ * @GL_EVENT_VIEW_LIST_FILTER_UPDATES:
+ * @GL_EVENT_VIEW_LIST_FILTER_USAGE:
+ *
+ * The category, selected in #GlCategoryList, to filter the events by.
+ */
+typedef enum
+{
+ GL_EVENT_VIEW_LIST_FILTER_IMPORTANT,
+ GL_EVENT_VIEW_LIST_FILTER_ALERTS,
+ GL_EVENT_VIEW_LIST_FILTER_STARRED,
+ GL_EVENT_VIEW_LIST_FILTER_ALL,
+ GL_EVENT_VIEW_LIST_FILTER_APPLICATIONS,
+ GL_EVENT_VIEW_LIST_FILTER_SYSTEM,
+ GL_EVENT_VIEW_LIST_FILTER_SECURITY,
+ GL_EVENT_VIEW_LIST_FILTER_HARDWARE,
+ GL_EVENT_VIEW_LIST_FILTER_UPDATES,
+ GL_EVENT_VIEW_LIST_FILTER_USAGE
+} GlEventViewListFilter;
+
+/*
+ * GlEventViewMode:
+ * @GL_EVENT_VIEW_MODE_LIST:
+ * @GL_EVENT_VIEW_MODE_DETAIL:
+ *
+ * The mode, mirroring the GlEventToolbar mode, used to show events.
+ */
+typedef enum
+{
+ GL_EVENT_VIEW_MODE_LIST,
+ GL_EVENT_VIEW_MODE_DETAIL
+} GlEventViewMode;
+
+#define GL_TYPE_EVENT_VIEW_LIST (gl_event_view_list_get_type ())
+#define GL_EVENT_VIEW_LIST(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GL_TYPE_EVENT_VIEW_LIST,
GlEventViewList))
+
+GType gl_event_view_list_get_type (void);
+GtkWidget * gl_event_view_list_new (void);
+void gl_event_view_list_search (GlEventViewList *view, const gchar *needle);
+void gl_event_view_list_set_filter (GlEventViewList *view, GlEventViewListFilter filter);
+void gl_event_view_list_set_mode (GlEventViewList *view, GlEventViewMode mode);
+
+G_END_DECLS
+
+#endif /* GL_EVENT_VIEW_LIST_H_ */
diff --git a/src/gl-window.c b/src/gl-window.c
index ce268c3..fbd93ae 100644
--- a/src/gl-window.c
+++ b/src/gl-window.c
@@ -22,7 +22,7 @@
#include "gl-categorylist.h"
#include "gl-eventtoolbar.h"
-#include "gl-eventview.h"
+#include "gl-eventviewlist.h"
#include "gl-enums.h"
#include "gl-util.h"
@@ -65,20 +65,20 @@ on_category (GSimpleAction *action,
{
GlWindowPrivate *priv;
const gchar *category;
- GlEventView *events;
+ GlEventViewList *events;
GEnumClass *eclass;
GEnumValue *evalue;
priv = gl_window_get_instance_private (GL_WINDOW (user_data));
category = g_variant_get_string (variant, NULL);
- events = GL_EVENT_VIEW (priv->events);
- eclass = g_type_class_ref (GL_TYPE_EVENT_VIEW_FILTER);
+ events = GL_EVENT_VIEW_LIST (priv->events);
+ eclass = g_type_class_ref (GL_TYPE_EVENT_VIEW_LIST_FILTER);
evalue = g_enum_get_value_by_nick (eclass, category);
/* First switch the event view back to list mode if the category
tab is clicked. */
- gl_event_view_set_mode (events, GL_EVENT_VIEW_MODE_LIST);
- gl_event_view_set_filter (events, evalue->value);
+ gl_event_view_list_set_mode (events, GL_EVENT_VIEW_MODE_LIST);
+ gl_event_view_list_set_filter (events, evalue->value);
g_simple_action_set_state (action, variant);
@@ -118,11 +118,11 @@ on_toolbar_mode (GSimpleAction *action,
{
/* Switch the event view back to list mode if the back button is
* clicked. */
- GlEventView *view;
+ GlEventViewList *view;
- view = GL_EVENT_VIEW (priv->events);
+ view = GL_EVENT_VIEW_LIST (priv->events);
- gl_event_view_set_mode (view, GL_EVENT_VIEW_MODE_LIST);
+ gl_event_view_list_set_mode (view, GL_EVENT_VIEW_MODE_LIST);
g_simple_action_set_enabled (G_SIMPLE_ACTION (search), TRUE);
}
@@ -238,10 +238,10 @@ on_gl_window_key_press_event (GlWindow *window,
(GdkEventKey*)event)
== GDK_EVENT_STOP)
{
- GlEventView *events;
+ GlEventViewList *events;
- events = GL_EVENT_VIEW (priv->events);
- gl_event_view_set_mode (events, GL_EVENT_VIEW_MODE_LIST);
+ events = GL_EVENT_VIEW_LIST (priv->events);
+ gl_event_view_list_set_mode (events, GL_EVENT_VIEW_MODE_LIST);
g_type_class_unref (eclass);
return GDK_EVENT_STOP;
@@ -262,8 +262,8 @@ on_gl_window_search_entry_changed (GtkSearchEntry *entry,
priv = gl_window_get_instance_private (GL_WINDOW (user_data));
- gl_event_view_search (GL_EVENT_VIEW (priv->events),
- gtk_entry_get_text (GTK_ENTRY (priv->search_entry)));
+ gl_event_view_list_search (GL_EVENT_VIEW_LIST (priv->events),
+ gtk_entry_get_text (GTK_ENTRY (priv->search_entry)));
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
