emacs
/
mu
mirror of https://github.com/djcb/mu.git
1
0
Fork 0
Code Issues Releases Wiki Activity

* mug: fix header clearing + code reindentation

This commit is contained in:
Dirk-Jan C. Binnema 2010-11-27 13:31:26 +02:00
parent 2fabf5b564
commit ac1b942dd8
9 changed files with 664 additions and 756 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
toys/mug/mug-msg-list-view.c
View File

@ -34,7 +34,6 @@ enum {
LAST_SIGNAL
};
enum {
MUG_COL_DATESTR,
MUG_COL_MAILDIR,
@ -66,9 +65,7 @@ static guint signals[LAST_SIGNAL] = {0};
G_DEFINE_TYPE(MugMsgListView, mug_msg_list_view, GTK_TYPE_TREE_VIEW);
static void
mug_msg_list_view_class_init (MugMsgListViewClass *klass)
static void mug_msg_list_view_class_init(MugMsgListViewClass * klass)
{
GObjectClass *gobject_class;
gobject_class = (GObjectClass *) klass;
@ -76,8 +73,7 @@ mug_msg_list_view_class_init (MugMsgListViewClass *klass)
parent_class = g_type_class_peek_parent(klass);
gobject_class->finalize = mug_msg_list_view_finalize;
g_type_class_add_private (gobject_class,
sizeof(MugMsgListViewPrivate));
g_type_class_add_private(gobject_class, sizeof(MugMsgListViewPrivate));
signals[MUG_MSG_SELECTED] =
g_signal_new("msg-selected",
@ -99,9 +95,7 @@ mug_msg_list_view_class_init (MugMsgListViewClass *klass)
G_TYPE_NONE, 1, G_TYPE_UINT);
}
static void
on_cursor_changed (GtkTreeView *tview, MugMsgListView *lst)
static void on_cursor_changed(GtkTreeView * tview, MugMsgListView * lst)
{
GtkTreeSelection *sel;
GtkTreeIter iter;
@ -117,13 +111,11 @@ on_cursor_changed (GtkTreeView *tview, MugMsgListView *lst)
gtk_tree_model_get(GTK_TREE_MODEL(priv->_store), &iter,
MUG_COL_PATH, &path, -1);
g_signal_emit(G_OBJECT(lst),
signals[MUG_MSG_SELECTED], 0,
path);
signals[MUG_MSG_SELECTED], 0, path);
g_free(path);
}
}
static void
treecell_func(GtkTreeViewColumn * tree_column, GtkCellRenderer * renderer,
GtkTreeModel * tree_model, GtkTreeIter * iter, gpointer data)
@ -132,9 +124,7 @@ treecell_func (GtkTreeViewColumn *tree_column, GtkCellRenderer *renderer,
MuMsgPrio prio;
gtk_tree_model_get(tree_model, iter,
MUG_COL_FLAGS, &flags,
MUG_COL_PRIO, &prio,
-1);
MUG_COL_FLAGS, &flags, MUG_COL_PRIO, &prio, -1);
g_object_set(G_OBJECT(renderer),
"weight", (flags & MU_MSG_FLAG_NEW) ? 800 : 400,
@ -143,17 +133,17 @@ treecell_func (GtkTreeViewColumn *tree_column, GtkCellRenderer *renderer,
NULL);
}
/* sortcolidx == -1 means 'sortcolidx = colidx' */
static void
append_col (GtkTreeView *treeview, const char* label, int colidx, int sortcolidx,
gint maxwidth)
append_col(GtkTreeView * treeview, const char *label, int colidx,
int sortcolidx, gint maxwidth)
{
GtkTreeViewColumn *col;
GtkCellRenderer *renderer;
renderer = gtk_cell_renderer_text_new();
g_object_set (G_OBJECT(renderer),"ellipsize", PANGO_ELLIPSIZE_END, NULL);
g_object_set(G_OBJECT(renderer), "ellipsize", PANGO_ELLIPSIZE_END,
NULL);
col = gtk_tree_view_column_new_with_attributes(label, renderer, "text",
colidx, NULL);
@ -166,23 +156,21 @@ append_col (GtkTreeView *treeview, const char* label, int colidx, int sortcolidx
gtk_tree_view_column_set_sort_column_id(col, sortcolidx);
if (maxwidth) {
gtk_tree_view_column_set_sizing (col, GTK_TREE_VIEW_COLUMN_FIXED);
gtk_tree_view_column_set_sizing(col,
GTK_TREE_VIEW_COLUMN_FIXED);
gtk_tree_view_column_set_fixed_width(col, maxwidth);
gtk_tree_view_column_set_expand(col, FALSE);
} else {
//gtk_tree_view_column_set_sizing (col, GTK_TREE_VIEW_COLUMN_GROW_ONLY);
} else
gtk_tree_view_column_set_expand(col, TRUE);
}
gtk_tree_view_column_set_cell_data_func(col, renderer,
(GtkTreeCellDataFunc) treecell_func,
NULL, NULL);
(GtkTreeCellDataFunc)
treecell_func, NULL, NULL);
gtk_tree_view_append_column(treeview, col);
}
static void
mug_msg_list_view_init (MugMsgListView *obj)
static void mug_msg_list_view_init(MugMsgListView * obj)
{
MugMsgListViewPrivate *priv;
GtkTreeView *tview;
@ -190,8 +178,7 @@ mug_msg_list_view_init (MugMsgListView *obj)
priv = MUG_MSG_LIST_VIEW_GET_PRIVATE(obj);
priv->_xpath = priv->_query = NULL;
priv->_store = gtk_list_store_new (MUG_N_COLS,
G_TYPE_STRING, /* date */
priv->_store = gtk_list_store_new(MUG_N_COLS, G_TYPE_STRING, /* date */
G_TYPE_STRING, /* folder */
G_TYPE_STRING, /* flagstr */
G_TYPE_STRING, /* from */
@ -220,8 +207,7 @@ mug_msg_list_view_init (MugMsgListView *obj)
G_CALLBACK(on_cursor_changed), obj);
}
static void
mug_msg_list_view_finalize (GObject *obj)
static void mug_msg_list_view_finalize(GObject * obj)
{
MugMsgListViewPrivate *priv;
priv = MUG_MSG_LIST_VIEW_GET_PRIVATE(obj);
@ -235,23 +221,19 @@ mug_msg_list_view_finalize (GObject *obj)
G_OBJECT_CLASS(parent_class)->finalize(obj);
}
void
mug_msg_list_view_move_first (MugMsgListView *self)
void mug_msg_list_view_move_first(MugMsgListView * self)
{
GtkTreePath *path;
g_return_if_fail(MUG_IS_MSG_LIST_VIEW(self));
path = gtk_tree_path_new_first();
gtk_tree_view_set_cursor (GTK_TREE_VIEW(self), path,
NULL, FALSE);
gtk_tree_view_set_cursor(GTK_TREE_VIEW(self), path, NULL, FALSE);
gtk_tree_path_free(path);
}
static gboolean
msg_list_view_move (MugMsgListView *self, gboolean next)
static gboolean msg_list_view_move(MugMsgListView * self, gboolean next)
{
GtkTreePath *path;
@ -264,33 +246,27 @@ msg_list_view_move (MugMsgListView *self, gboolean next)
else
gtk_tree_path_prev(path);
gtk_tree_view_set_cursor (GTK_TREE_VIEW(self), path,
NULL, FALSE);
gtk_tree_view_set_cursor(GTK_TREE_VIEW(self), path, NULL, FALSE);
gtk_tree_path_free(path);
return TRUE;
}
gboolean
mug_msg_list_view_move_next (MugMsgListView *self)
gboolean mug_msg_list_view_move_next(MugMsgListView * self)
{
g_return_val_if_fail(MUG_IS_MSG_LIST_VIEW(self), FALSE);
return msg_list_view_move(self, TRUE);
}
gboolean
mug_msg_list_view_move_prev (MugMsgListView *self)
gboolean mug_msg_list_view_move_prev(MugMsgListView * self)
{
g_return_val_if_fail(MUG_IS_MSG_LIST_VIEW(self), FALSE);
return msg_list_view_move(self, FALSE);
}
GtkWidget*
mug_msg_list_view_new (const char *xpath)
GtkWidget *mug_msg_list_view_new(const char *xpath)
{
GtkWidget *w;
MugMsgListViewPrivate *priv;
@ -305,9 +281,7 @@ mug_msg_list_view_new (const char *xpath)
return w;
}
static gchar*
empty_or_display_contact (const gchar* str)
static gchar *empty_or_display_contact(const gchar * str)
{
if (!str || *str == '\0')
return g_strdup("-");
@ -316,8 +290,7 @@ empty_or_display_contact (const gchar* str)
}
static MugError
mu_result_to_mug_error (MuResult r)
static MugError mu_result_to_mug_error(MuResult r)
{
switch (r) {
case MU_ERROR_XAPIAN_DIR:
@ -331,9 +304,7 @@ mu_result_to_mug_error (MuResult r)
}
}
static MuMsgIter *
run_query (const char *xpath, const char *query,
static MuMsgIter *run_query(const char *xpath, const char *query,
MugMsgListView * self)
{
GError *err;
@ -351,9 +322,7 @@ run_query (const char *xpath, const char *query,
return NULL;
}
iter = mu_query_run (xapian, query,
MU_MSG_FIELD_ID_DATE,
TRUE, 0, &err);
iter = mu_query_run(xapian, query, MU_MSG_FIELD_ID_DATE, TRUE, 0, &err);
mu_query_destroy(xapian);
if (!iter) {
g_warning("Error: %s", err->message);
@ -367,8 +336,7 @@ run_query (const char *xpath, const char *query,
return iter;
}
static void
add_row (GtkListStore *store, MuMsgIter *iter)
static void add_row(GtkListStore * store, MuMsgIter * iter)
{
GtkTreeIter treeiter;
const gchar *datestr, *flagstr;
@ -392,13 +360,11 @@ add_row (GtkListStore *store, MuMsgIter *iter)
MUG_COL_PATH, mu_msg_iter_get_path(iter),
MUG_COL_PRIO, mu_msg_iter_get_prio(iter),
MUG_COL_FLAGS, mu_msg_iter_get_flags(iter),
MUG_COL_TIME, timeval,
-1);
MUG_COL_TIME, timeval, -1);
g_free(from);
g_free(to);
}
static int
update_model(GtkListStore * store, const char *xpath, const char *query,
MugMsgListView * self)
@ -421,9 +387,7 @@ update_model (GtkListStore *store, const char *xpath, const char *query,
return count;
}
int
mug_msg_list_view_query (MugMsgListView *self, const char *query)
int mug_msg_list_view_query(MugMsgListView * self, const char *query)
{
MugMsgListViewPrivate *priv;
gboolean rv;
@ -439,17 +403,14 @@ mug_msg_list_view_query (MugMsgListView *self, const char *query)
if (!query)
return TRUE;
rv = update_model (priv->_store, priv->_xpath, query,
self);
rv = update_model(priv->_store, priv->_xpath, query, self);
gtk_tree_view_columns_autosize(GTK_TREE_VIEW(self));
return rv;
}
const gchar*
mug_msg_list_view_get_query (MugMsgListView *self)
const gchar *mug_msg_list_view_get_query(MugMsgListView * self)
{
g_return_val_if_fail(MUG_IS_MSG_LIST_VIEW(self), NULL);

6
toys/mug/mug-msg-list-view.h
View File

@ -24,7 +24,6 @@
#include <mu-result.h>
G_BEGIN_DECLS
/* convenience macros */
#define MUG_TYPE_MSG_LIST_VIEW (mug_msg_list_view_get_type())
#define MUG_MSG_LIST_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),MUG_TYPE_MSG_LIST_VIEW,MugMsgListView))
@ -32,7 +31,6 @@ G_BEGIN_DECLS
#define MUG_IS_MSG_LIST_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),MUG_TYPE_MSG_LIST_VIEW))
#define MUG_IS_MSG_LIST_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),MUG_TYPE_MSG_LIST_VIEW))
#define MUG_MSG_LIST_VIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj),MUG_TYPE_MSG_LIST_VIEW,MugMsgListViewClass))
typedef struct _MugMsgListView MugMsgListView;
typedef struct _MugMsgListViewClass MugMsgListViewClass;
@ -49,7 +47,6 @@ enum _MugError {
};
typedef enum _MugError MugError;
struct _MugMsgListViewClass {
GtkTreeViewClass parent_class;
/* insert signal callback declarations, e.g. */
@ -66,7 +63,6 @@ GtkWidget* mug_msg_list_view_new (const char *xpath);
int mug_msg_list_view_query(MugMsgListView * self, const char *query);
void mug_msg_list_view_move_first(MugMsgListView * self);
gboolean mug_msg_list_view_move_prev(MugMsgListView * self);
@ -75,6 +71,4 @@ gboolean mug_msg_list_view_move_next (MugMsgListView *self);
const gchar *mug_msg_list_view_get_query(MugMsgListView * self);
G_END_DECLS
#endif /* __MUG_MSG_LIST_VIEW_H__ */

129
toys/mug/mug-msg-view.c
View File

@ -17,7 +17,6 @@
**
*/
#include "mug-msg-view.h"
#include "mu-msg.h"
#include "mu-str.h"
@ -77,19 +76,16 @@ struct _MugMsgViewPrivate {
GtkWidget *_expander_header, *_expander;
GtkWidget *_view;
};
#define MUG_MSG_VIEW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
MUG_TYPE_MSG_VIEW, MugMsgViewPrivate))
#define MUG_MSG_VIEW_GET_PRIVATE(o)(G_TYPE_INSTANCE_GET_PRIVATE((o),MUG_TYPE_MSG_VIEW, MugMsgViewPrivate))
/* globals */
static GtkVBoxClass *parent_class = NULL;
/* uncomment the following if you have defined any signals */
/* static guint signals[LAST_SIGNAL] = {0}; */
G_DEFINE_TYPE(MugMsgView, mug_msg_view, GTK_TYPE_VBOX);
static void
mug_msg_view_class_init (MugMsgViewClass *klass)
static void mug_msg_view_class_init(MugMsgViewClass * klass)
{
GObjectClass *gobject_class;
gobject_class = (GObjectClass *) klass;
@ -107,9 +103,8 @@ mug_msg_view_class_init (MugMsgViewClass *klass)
/* etc. */
}
static GtkWidget*
create_table (MugMsgViewPrivate *priv, const HeaderInfo *hinfo, guint num)
static GtkWidget *create_table(MugMsgViewPrivate * priv,
const HeaderInfo * hinfo, guint num)
{
guint i;
GtkWidget *table;
@ -141,29 +136,26 @@ create_table (MugMsgViewPrivate *priv, const HeaderInfo *hinfo, guint num)
gtk_container_add(GTK_CONTAINER(al), l);
gtk_label_set_justify(GTK_LABEL(l), GTK_JUSTIFY_LEFT);
gtk_label_set_line_wrap_mode (GTK_LABEL(l), PANGO_WRAP_WORD_CHAR);
gtk_label_set_line_wrap_mode(GTK_LABEL(l),
PANGO_WRAP_WORD_CHAR);
gtk_label_set_line_wrap(GTK_LABEL(l), FALSE);
gtk_table_attach(GTK_TABLE(table), al,
1, 2, i, i+1,
GTK_FILL,
0, 0, 0);
1, 2, i, i + 1, GTK_FILL, 0, 0, 0);
}
return table;
}
static GtkWidget*
headers_area (MugMsgViewPrivate *priv)
static GtkWidget *headers_area(MugMsgViewPrivate * priv)
{
GtkWidget *scrolled, *vbox;
priv->_tablemain = create_table(priv, HEADER_INFO,
G_N_ELEMENTS(HEADER_INFO));
priv->_tableexpander = create_table (priv, HEADER_INFO_EXPANDER,
G_N_ELEMENTS(HEADER_INFO_EXPANDER));
priv->_tableexpander = create_table
(priv, HEADER_INFO_EXPANDER, G_N_ELEMENTS(HEADER_INFO_EXPANDER));
priv->_expander = gtk_expander_new("Details");
gtk_container_add (GTK_CONTAINER(priv->_expander),
priv->_tableexpander);
gtk_container_add(GTK_CONTAINER(priv->_expander), priv->_tableexpander);
vbox = gtk_vbox_new(FALSE, FALSE);
gtk_box_pack_start(GTK_BOX(vbox), priv->_tablemain, FALSE, FALSE, 0);
@ -171,15 +163,15 @@ headers_area (MugMsgViewPrivate *priv)
scrolled = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW(scrolled), vbox);
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled),
vbox);
return priv->_headers_area = scrolled;
}
static void
mug_msg_view_init (MugMsgView *obj)
static void mug_msg_view_init(MugMsgView * obj)
{
MugMsgViewPrivate *priv;
GtkWidget *scrolled;
@ -193,32 +185,41 @@ mug_msg_view_init (MugMsgView *obj)
scrolled = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
gtk_container_add(GTK_CONTAINER(scrolled), priv->_view);
gtk_box_pack_start(GTK_BOX(obj), headers_area(priv), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(obj), scrolled, TRUE, TRUE, 0);
gtk_widget_hide (priv->_headers_area);
}
static void
mug_msg_view_finalize (GObject *obj)
static void mug_msg_view_finalize(GObject * obj)
{
/* free/unref instance resources here */
G_OBJECT_CLASS(parent_class)->finalize(obj);
}
GtkWidget*
mug_msg_view_new (void)
GtkWidget *mug_msg_view_new(void)
{
return GTK_WIDGET(g_object_new(MUG_TYPE_MSG_VIEW, NULL));
}
static void empty_message(MugMsgView * self)
{
int i;
MugMsgViewPrivate *priv;
GtkTextBuffer *buf;
priv = MUG_MSG_VIEW_GET_PRIVATE(self);
gboolean
mug_msg_view_set_text (MugMsgView *self, const char* txt)
for (i = 0; i != HEADER_ROW_NUM; ++i)
gtk_label_set_markup(GTK_LABEL(priv->_headervals[i]), "");
buf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(priv->_view));
gtk_text_buffer_set_text(buf, "", -1);
}
static gboolean set_text(MugMsgView * self, const char *txt)
{
MugMsgViewPrivate *priv;
GtkTextBuffer *buf;
@ -232,43 +233,52 @@ mug_msg_view_set_text (MugMsgView *self, const char* txt)
return TRUE;
}
static void
fill_header (MugMsgViewPrivate *priv, MuMsg* msg)
static void fill_header(MugMsgViewPrivate * priv, MuMsg * msg)
{
int i;
for (i = 0; i != HEADER_ROW_NUM; ++i) {
const gchar *val;
switch (i) {
case HEADER_ROW_FROM: val = mu_msg_get_from(msg); break;
case HEADER_ROW_TO: val = mu_msg_get_to(msg); break;
case HEADER_ROW_SUBJECT: val = mu_msg_get_subject(msg); break;
case HEADER_ROW_MSGID: val = mu_msg_get_msgid(msg); break;
case HEADER_ROW_CC: val = mu_msg_get_cc (msg); break;
case HEADER_ROW_PATH: val = mu_msg_get_path (msg); break;
case HEADER_ROW_DATE: val = mu_str_date_s(
"%c", mu_msg_get_date (msg));
case HEADER_ROW_FROM:
val = mu_msg_get_from(msg);
break;
case HEADER_ROW_SIZE: val = mu_str_size_s (mu_msg_get_size(msg));
case HEADER_ROW_TO:
val = mu_msg_get_to(msg);
break;
default: val = NULL;
case HEADER_ROW_SUBJECT:
val = mu_msg_get_subject(msg);
break;
case HEADER_ROW_MSGID:
val = mu_msg_get_msgid(msg);
break;
case HEADER_ROW_CC:
val = mu_msg_get_cc(msg);
break;
case HEADER_ROW_PATH:
val = mu_msg_get_path(msg);
break;
case HEADER_ROW_DATE:
val = mu_str_date_s("%c", mu_msg_get_date(msg));
break;
case HEADER_ROW_SIZE:
val = mu_str_size_s(mu_msg_get_size(msg));
break;
default:
val = NULL;
}
{
gchar *str;
str = g_markup_escape_text(val ? val : "", -1);
gtk_label_set_markup (GTK_LABEL(priv->_headervals[i]), str);
gtk_label_set_markup
(GTK_LABEL(priv->_headervals[i]), str);
g_free(str);
}
}
gtk_widget_show (priv->_tablemain);
gtk_widget_show (priv->_expander);
}
gboolean
mug_msg_view_set_msg (MugMsgView *self, const char* msgpath)
gboolean mug_msg_view_set_msg(MugMsgView * self, const char *msgpath)
{
MugMsgViewPrivate *priv;
MuMsg *msg;
@ -279,24 +289,19 @@ mug_msg_view_set_msg (MugMsgView *self, const char* msgpath)
priv = MUG_MSG_VIEW_GET_PRIVATE(self);
if (!msgpath) {
mug_msg_view_set_text (self, "");
gtk_widget_hide (priv->_headers_area);
empty_message(self);
return TRUE;
}
msg = mu_msg_new(msgpath, NULL, NULL);
if (!msg) {
gtk_widget_hide (priv->_tablemain);
gtk_widget_hide (priv->_expander);
mug_msg_view_set_text (self,
"Message not found; "
"please run 'mu index'");
empty_message(self);
set_text(self, "Message not found; " "please run 'mu index'");
return FALSE;
}
rv = mug_msg_view_set_text (self, mu_msg_get_body_text(msg));
rv = set_text(self, mu_msg_get_body_text(msg));
fill_header(priv, msg);
gtk_widget_show (priv->_headers_area);
mu_msg_destroy(msg);

6
toys/mug/mug-msg-view.h
View File

@ -17,7 +17,6 @@
**
*/
#ifndef __MUG_MSG_VIEW_H__
#define __MUG_MSG_VIEW_H__
@ -25,7 +24,6 @@
/* other include files */
G_BEGIN_DECLS
/* convenience macros */
#define MUG_TYPE_MSG_VIEW (mug_msg_view_get_type())
#define MUG_MSG_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),MUG_TYPE_MSG_VIEW,MugMsgView))
@ -33,7 +31,6 @@ G_BEGIN_DECLS
#define MUG_IS_MSG_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),MUG_TYPE_MSG_VIEW))
#define MUG_IS_MSG_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),MUG_TYPE_MSG_VIEW))
#define MUG_MSG_VIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj),MUG_TYPE_MSG_VIEW,MugMsgViewClass))
typedef struct _MugMsgView MugMsgView;
typedef struct _MugMsgViewClass MugMsgViewClass;
@ -55,9 +52,6 @@ GType mug_msg_view_get_type (void) G_GNUC_CONST;
/* if this is a kind of GtkWidget, it should probably return at GtkWidget* */
GtkWidget *mug_msg_view_new(void);
gboolean mug_msg_view_set_msg(MugMsgView * self, const char *msgpath);
gboolean mug_msg_view_set_text (MugMsgView *self, const char* txt);
G_END_DECLS
#endif /* __MUG_MSG_VIEW_H__ */

32
toys/mug/mug-query-bar.c
View File

@ -28,8 +28,7 @@ static GtkContainerClass *parent_class = NULL;
static guint signals[LAST_SIGNAL] = { 0 };
GType
mug_query_bar_get_type (void)
GType mug_query_bar_get_type(void)
{
static GType my_type = 0;
if (!my_type) {
@ -46,14 +45,12 @@ mug_query_bar_get_type (void)
NULL
};
my_type = g_type_register_static(GTK_TYPE_HBOX,
"MugQueryBar",
&my_info, 0);
"MugQueryBar", &my_info, 0);
}
return my_type;
}
static void
mug_query_bar_class_init (MugQueryBarClass *klass)
static void mug_query_bar_class_init(MugQueryBarClass * klass)
{
GObjectClass *gobject_class;
gobject_class = (GObjectClass *) klass;
@ -74,9 +71,7 @@ mug_query_bar_class_init (MugQueryBarClass *klass)
G_TYPE_NONE, 1, G_TYPE_STRING);
}
static void
on_entry_activated (GtkWidget *w, MugQueryBar *bar)
static void on_entry_activated(GtkWidget * w, MugQueryBar * bar)
{
MugQueryBarPrivate *priv;
@ -86,8 +81,7 @@ on_entry_activated (GtkWidget *w, MugQueryBar *bar)
gtk_entry_get_text(GTK_ENTRY(w)));
}
static void
mug_query_bar_init (MugQueryBar *obj)
static void mug_query_bar_init(MugQueryBar * obj)
{
MugQueryBarPrivate *priv;
@ -95,26 +89,23 @@ mug_query_bar_init (MugQueryBar *obj)
priv->_entry = gtk_entry_new();
g_signal_connect (priv->_entry, "activate", G_CALLBACK(on_entry_activated),
obj);
g_signal_connect(priv->_entry, "activate",
G_CALLBACK(on_entry_activated), obj);
gtk_box_pack_start(GTK_BOX(obj), priv->_entry, TRUE, TRUE, 0);
}
static void
mug_query_bar_finalize (GObject *obj)
static void mug_query_bar_finalize(GObject * obj)
{
/* free/unref instance resources here */
G_OBJECT_CLASS(parent_class)->finalize(obj);
}
GtkWidget*
mug_query_bar_new (void)
GtkWidget *mug_query_bar_new(void)
{
return GTK_WIDGET(g_object_new(MUG_TYPE_QUERY_BAR, NULL));
}
void
mug_query_bar_set_query(MugQueryBar * self, const char *query, gboolean run)
{
@ -129,13 +120,10 @@ mug_query_bar_set_query (MugQueryBar *self, const char *query, gboolean run)
on_entry_activated(priv->_entry, self);
}
void
mug_query_bar_grab_focus (MugQueryBar *self)
void mug_query_bar_grab_focus(MugQueryBar * self)
{
g_return_if_fail(MUG_IS_QUERY_BAR(self));
gtk_widget_grab_focus
(GTK_WIDGET(MUG_QUERY_BAR_GET_PRIVATE(self)->_entry));
}

7
toys/mug/mug-query-bar.h
View File

@ -8,7 +8,6 @@
/* other include files */
G_BEGIN_DECLS
/* convenience macros */
#define MUG_TYPE_QUERY_BAR (mug_query_bar_get_type())
#define MUG_QUERY_BAR(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),MUG_TYPE_QUERY_BAR,MugQueryBar))
@ -16,7 +15,6 @@ G_BEGIN_DECLS
#define MUG_IS_QUERY_BAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),MUG_TYPE_QUERY_BAR))
#define MUG_IS_QUERY_BAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),MUG_TYPE_QUERY_BAR))
#define MUG_QUERY_BAR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj),MUG_TYPE_QUERY_BAR,MugQueryBarClass))
typedef struct _MugQueryBar MugQueryBar;
typedef struct _MugQueryBarClass MugQueryBarClass;
@ -40,9 +38,8 @@ GtkWidget* mug_query_bar_new (void);
void mug_query_bar_grab_focus(MugQueryBar * self);
void mug_query_bar_set_query (MugQueryBar *self, const char *query, gboolean run);
void mug_query_bar_set_query(MugQueryBar * self, const char *query,
gboolean run);
G_END_DECLS
#endif /* __MUG_QUERY_BAR_H__ */

28
toys/mug/mug-shortcuts.c
View File

@ -51,8 +51,7 @@ static guint signals[LAST_SIGNAL] = {0};
G_DEFINE_TYPE(MugShortcuts, mug_shortcuts, GTK_TYPE_VBOX);
static void
mug_shortcuts_class_init (MugShortcutsClass *klass)
static void mug_shortcuts_class_init(MugShortcutsClass * klass)
{
GObjectClass *gobject_class;
gobject_class = (GObjectClass *) klass;
@ -72,14 +71,12 @@ mug_shortcuts_class_init (MugShortcutsClass *klass)
g_cclosure_marshal_VOID__STRING,
G_TYPE_NONE, 1, G_TYPE_STRING);
/* signals[MY_SIGNAL_2] = */
/* g_signal_new ("my_signal_2",....); */
/* etc. */
}
static void
mug_shortcuts_init (MugShortcuts *obj)
static void mug_shortcuts_init(MugShortcuts * obj)
{
obj->_priv = MUG_SHORTCUTS_GET_PRIVATE(obj);
@ -89,15 +86,13 @@ mug_shortcuts_init (MugShortcuts *obj)
gtk_box_pack_start(GTK_BOX(obj), obj->_priv->_bbox, TRUE, TRUE, 0);
}
static void
mug_shortcuts_finalize (GObject *obj)
static void mug_shortcuts_finalize(GObject * obj)
{
/* free/unref instance resources here */
G_OBJECT_CLASS(parent_class)->finalize(obj);
}
static void
on_button_clicked (GtkWidget *button, MugShortcuts *self)
static void on_button_clicked(GtkWidget * button, MugShortcuts * self)
{
g_signal_emit(G_OBJECT(self),
signals[SHORTCUT_CLICKED], 0,
@ -105,23 +100,20 @@ on_button_clicked (GtkWidget *button, MugShortcuts *self)
MUG_SHORTCUT_BOOKMARK));
}
static void
each_bookmark (const char* key, const char* val, MugShortcuts *self)
static void each_bookmark(const char *key, const char *val, MugShortcuts * self)
{
GtkWidget *button;
button = gtk_button_new_with_label(key);
g_object_set_data_full(G_OBJECT(button), MUG_SHORTCUT_BOOKMARK,
g_strdup(val), g_free);
g_signal_connect (G_OBJECT(button), "clicked", G_CALLBACK(on_button_clicked),
self);
g_signal_connect(G_OBJECT(button), "clicked",
G_CALLBACK(on_button_clicked), self);
gtk_container_add(GTK_CONTAINER(self->_priv->_bbox), button);
}
static gboolean
init_shortcuts (MugShortcuts *self, const char* bmpath)
static gboolean init_shortcuts(MugShortcuts * self, const char *bmpath)
{
MuBookmarks *bookmarks;
@ -136,8 +128,7 @@ init_shortcuts (MugShortcuts *self, const char* bmpath)
return TRUE;
}
GtkWidget*
mug_shortcuts_new (const char *bmpath)
GtkWidget *mug_shortcuts_new(const char *bmpath)
{
MugShortcuts *self;
@ -152,4 +143,3 @@ mug_shortcuts_new (const char *bmpath)
/* following: other function implementations */
/* such as mug_shortcuts_do_something, or mug_shortcuts_has_foo */

6
toys/mug/mug-shortcuts.h
View File

@ -17,7 +17,6 @@
**
*/
#ifndef __MUG_SHORTCUTS_H__
#define __MUG_SHORTCUTS_H__
@ -25,7 +24,6 @@
/* other include files */
G_BEGIN_DECLS
/* convenience macros */
#define MUG_TYPE_SHORTCUTS (mug_shortcuts_get_type())
#define MUG_SHORTCUTS(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),MUG_TYPE_SHORTCUTS,MugShortcuts))
@ -33,7 +31,6 @@ G_BEGIN_DECLS
#define MUG_IS_SHORTCUTS(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),MUG_TYPE_SHORTCUTS))
#define MUG_IS_SHORTCUTS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),MUG_TYPE_SHORTCUTS))
#define MUG_SHORTCUTS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj),MUG_TYPE_SHORTCUTS,MugShortcutsClass))
typedef struct _MugShortcuts MugShortcuts;
typedef struct _MugShortcutsClass MugShortcutsClass;
typedef struct _MugShortcutsPrivate MugShortcutsPrivate;
@ -62,8 +59,5 @@ GtkWidget* mug_shortcuts_new (const char *bmpath);
/* void mug_shortcuts_do_something (MugShortcuts *self, const gchar* param); */
/* gboolean mug_shortcuts_has_foo (MugShortcuts *self, gint value); */
G_END_DECLS
#endif /* __MUG_SHORTCUTS_H__ */

135
toys/mug/mug.cc
View File

@ -44,9 +44,7 @@ struct _MugData {
};
typedef struct _MugData MugData;
static void
about_mug (MugData *mugdata)
static void about_mug(MugData * mugdata)
{
GtkWidget *about;
about = gtk_message_dialog_new
@ -70,24 +68,22 @@ enum _ToolAction {
};
typedef enum _ToolAction ToolAction;
static void
on_tool_button_clicked (GtkToolButton *btn, MugData *mugdata)
static void on_tool_button_clicked(GtkToolButton * btn, MugData * mugdata)
{
ToolAction action;
action = (ToolAction)GPOINTER_TO_UINT(
g_object_get_data(G_OBJECT(btn),"action"));
action =
(ToolAction)
GPOINTER_TO_UINT(g_object_get_data(G_OBJECT(btn), "action"));
switch (action) {
case ACTION_DO_QUIT:
gtk_main_quit();
break;
case ACTION_NEXT_MSG:
mug_msg_list_view_move_next
(MUG_MSG_LIST_VIEW(mugdata->mlist));
mug_msg_list_view_move_next(MUG_MSG_LIST_VIEW(mugdata->mlist));
break;
case ACTION_PREV_MSG:
mug_msg_list_view_move_prev
(MUG_MSG_LIST_VIEW(mugdata->mlist));
mug_msg_list_view_move_prev(MUG_MSG_LIST_VIEW(mugdata->mlist));
break;
case ACTION_ABOUT:
about_mug(mugdata);
@ -97,8 +93,7 @@ on_tool_button_clicked (GtkToolButton *btn, MugData *mugdata)
}
}
static GtkWidget*
mug_toolbar (MugData *mugdata)
static GtkWidget *mug_toolbar(MugData * mugdata)
{
GtkWidget *toolbar;
int i;
@ -106,19 +101,18 @@ mug_toolbar (MugData *mugdata)
const char *stock_id;
ToolAction action;
} tools[] = {
{ GTK_STOCK_GO_UP, ACTION_PREV_MSG },
{ GTK_STOCK_GO_DOWN, ACTION_NEXT_MSG },
{ NULL, ACTION_SEPARATOR },
{ GTK_STOCK_ABOUT, ACTION_ABOUT },
{ NULL, ACTION_SEPARATOR },
{ GTK_STOCK_QUIT, ACTION_DO_QUIT },
};
{
GTK_STOCK_GO_UP, ACTION_PREV_MSG}, {
GTK_STOCK_GO_DOWN, ACTION_NEXT_MSG}, {
NULL, ACTION_SEPARATOR}, {
GTK_STOCK_ABOUT, ACTION_ABOUT}, {
NULL, ACTION_SEPARATOR}, {
GTK_STOCK_QUIT, ACTION_DO_QUIT},};
for (toolbar = gtk_toolbar_new(), i = 0; i != G_N_ELEMENTS(tools); ++i) {
toolbar = gtk_toolbar_new();
for (i = 0; i != G_N_ELEMENTS(tools); ++i) {
GtkToolItem *btn;
/* separator item ? */
if (tools[i].action == ACTION_SEPARATOR) {
if (tools[i].action == ACTION_SEPARATOR) { /* separator */
gtk_toolbar_insert(GTK_TOOLBAR(toolbar),
gtk_separator_tool_item_new(), i);
continue;
@ -129,9 +123,9 @@ mug_toolbar (MugData *mugdata)
g_object_set_data(G_OBJECT(btn), "action",
GUINT_TO_POINTER(tools[i].action));
g_signal_connect(G_OBJECT(btn), "clicked",
G_CALLBACK(on_tool_button_clicked),
mugdata);
G_CALLBACK(on_tool_button_clicked), mugdata);
gtk_toolbar_insert(GTK_TOOLBAR(toolbar), btn, i);
gtk_widget_show(GTK_WIDGET(btn));
}
return toolbar;
@ -140,13 +134,10 @@ mug_toolbar (MugData *mugdata)
static void
on_shortcut_clicked(GtkWidget * w, const gchar * query, MugData * mdata)
{
mug_query_bar_set_query (MUG_QUERY_BAR(mdata->querybar),
query, TRUE);
mug_query_bar_set_query(MUG_QUERY_BAR(mdata->querybar), query, TRUE);
}
static GtkWidget*
mug_shortcuts_bar (MugData *data)
static GtkWidget *mug_shortcuts_bar(MugData * data)
{
data->shortcuts = mug_shortcuts_new(mu_runtime_bookmarks_file());
@ -156,9 +147,7 @@ mug_shortcuts_bar (MugData *data)
return data->shortcuts;
}
static GtkWidget*
mug_statusbar (void)
static GtkWidget *mug_statusbar(void)
{
GtkWidget *statusbar;
@ -173,25 +162,28 @@ on_query_changed (MugQueryBar *bar, const char* query, MugData *mugdata)
int count;
/* clear the old message */
mug_msg_view_set_text (MUG_MSG_VIEW(mugdata->msgview), NULL);
//mug_msg_view_set_text (MUG_MSG_VIEW(mugdata->msgview), NULL);
mug_msg_view_set_msg(MUG_MSG_VIEW(mugdata->msgview), NULL);
count = mug_msg_list_view_query(MUG_MSG_LIST_VIEW(mugdata->mlist),
query);
if (count >= 0) {
gchar *msg =
g_strdup_printf ("%d message%s found matching '%s'",
gchar *msg = g_strdup_printf("%d message%s found matching '%s'",
count,
count > 1 ? "s" : "",
mug_msg_list_view_get_query
(MUG_MSG_LIST_VIEW(mugdata->mlist)));
(MUG_MSG_LIST_VIEW
(mugdata->mlist)));
gtk_statusbar_push(GTK_STATUSBAR(mugdata->statusbar), 0, msg);
g_free(msg);
mug_msg_list_view_move_first(MUG_MSG_LIST_VIEW(mugdata->mlist));
gtk_widget_grab_focus(GTK_WIDGET(mugdata->mlist));
}
}
if (count == 0) /* nothing found */
mug_query_bar_grab_focus(MUG_QUERY_BAR(bar));
}
static void
on_msg_selected(MugMsgListView * mlist, const char *mpath, MugData * mugdata)
@ -200,10 +192,8 @@ on_msg_selected (MugMsgListView *mlist, const char* mpath, MugData *mugdata)
mug_msg_view_set_msg(MUG_MSG_VIEW(mugdata->msgview), mpath);
}
static void
on_list_view_error (MugMsgListView *mlist, MugError err,
MugData *mugdata)
on_list_view_error(MugMsgListView * mlist, MugError err, MugData * mugdata)
{
GtkWidget *errdialog;
const char *msg;
@ -211,15 +201,19 @@ on_list_view_error (MugMsgListView *mlist, MugError err,
switch (err) {
case MUG_ERROR_XAPIAN_NOT_UPTODATE:
msg = "The Xapian Database has the wrong version\n"
"Please run 'mu index --rebuild'"; break;
"Please run 'mu index --rebuild'";
break;
case MUG_ERROR_XAPIAN_DIR:
msg = "Cannot find the Xapian database dir\n"
"Please restart mug with --muhome=... pointing\n"
"to your mu home directory"; break;
"to your mu home directory";
break;
case MUG_ERROR_QUERY:
msg = "Error in query"; break;
msg = "Error in query";
break;
default:
msg = "Some error occured"; break;
msg = "Some error occured";
break;
}
errdialog = gtk_message_dialog_new
@ -230,15 +224,11 @@ on_list_view_error (MugMsgListView *mlist, MugError err,
gtk_widget_destroy(errdialog);
if (err == MUG_ERROR_QUERY) {
mug_query_bar_grab_focus
(MUG_QUERY_BAR(mugdata->querybar));
mug_query_bar_grab_focus(MUG_QUERY_BAR(mugdata->querybar));
}
}
static GtkWidget*
mug_querybar (void)
static GtkWidget *mug_querybar(void)
{
GtkWidget *querybar;
@ -247,9 +237,7 @@ mug_querybar (void)
return querybar;
}
static GtkWidget*
mug_query_area (MugData *mugdata)
static GtkWidget *mug_query_area(MugData * mugdata)
{
GtkWidget *queryarea;
GtkWidget *paned;
@ -259,7 +247,6 @@ mug_query_area (MugData *mugdata)
paned = gtk_vpaned_new();
mugdata->mlist = mug_msg_list_view_new(mu_runtime_xapian_dir());
scrolled = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
GTK_POLICY_AUTOMATIC,
@ -269,6 +256,7 @@ mug_query_area (MugData *mugdata)
gtk_paned_add1(GTK_PANED(paned), scrolled);
mugdata->msgview = mug_msg_view_new();
mug_msg_view_set_msg(MUG_MSG_VIEW(mugdata->msgview), NULL);
g_signal_connect(G_OBJECT(mugdata->mlist), "msg-selected",
G_CALLBACK(on_msg_selected), mugdata);
@ -278,36 +266,33 @@ mug_query_area (MugData *mugdata)
mugdata->querybar = mug_querybar();
g_signal_connect(G_OBJECT(mugdata->querybar), "query-changed",
G_CALLBACK(on_query_changed),
mugdata);
G_CALLBACK(on_query_changed), mugdata);
gtk_box_pack_start(GTK_BOX(queryarea),
mugdata->querybar, FALSE, FALSE, 2);
gtk_box_pack_start (GTK_BOX(queryarea),
paned, TRUE, TRUE, 2);
gtk_box_pack_start(GTK_BOX(queryarea), paned, TRUE, TRUE, 2);
gtk_widget_show_all(queryarea);
return queryarea;
}
static GtkWidget*
mug_main_area (MugData *mugdata)
static GtkWidget *mug_main_area(MugData * mugdata)
{
GtkWidget *mainarea;
GtkWidget *mainarea, *w;
mainarea = gtk_hbox_new(FALSE, 5);
gtk_box_pack_start (GTK_BOX(mainarea), mug_shortcuts_bar(mugdata),
FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX(mainarea), mug_query_area(mugdata),
TRUE, TRUE, 0);
w = mug_shortcuts_bar(mugdata);
gtk_box_pack_start(GTK_BOX(mainarea), w, FALSE, FALSE, 0);
gtk_widget_show(w);
w = mug_query_area(mugdata);
gtk_box_pack_start(GTK_BOX(mainarea), w, TRUE, TRUE, 0);
gtk_widget_show(w);
return mainarea;
}
GtkWidget*
mug_shell (MugData *mugdata)
GtkWidget *mug_shell(MugData * mugdata)
{
GtkWidget *vbox;
gchar *icon;
@ -318,7 +303,8 @@ mug_shell (MugData *mugdata)
vbox = gtk_vbox_new(FALSE, 2);
mugdata->toolbar = mug_toolbar(mugdata);
gtk_box_pack_start(GTK_BOX(vbox), mugdata->toolbar, FALSE, FALSE, 2);
gtk_box_pack_start (GTK_BOX(vbox), mug_main_area(mugdata), TRUE, TRUE, 2);
gtk_box_pack_start(GTK_BOX(vbox), mug_main_area(mugdata), TRUE,
TRUE, 2);
mugdata->statusbar = mug_statusbar();
gtk_box_pack_start(GTK_BOX(vbox), mugdata->statusbar, FALSE, FALSE, 2);
@ -336,8 +322,7 @@ mug_shell (MugData *mugdata)
return mugdata->win;
}
int
main (int argc, char *argv[])
int main(int argc, char *argv[])
{
MugData mugdata;
GtkWidget *mugshell;