alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* <many>: updates for new MIME-part handling

Browse Source
This commit is contained in:
Dirk-Jan C. Binnema
2011-01-11 00:46:46 +02:00
parent 1de81553a6
commit 923549e2bb
7 changed files with 228 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

156
toys/mug2/mug-msg-view.c
View File

@ -38,47 +38,9 @@ enum {
LAST_SIGNAL
};
enum _HeaderRow {
HEADER_ROW_FROM,
HEADER_ROW_TO,
HEADER_ROW_SUBJECT,
HEADER_ROW_CC,
HEADER_ROW_DATE,
HEADER_ROW_PATH,
HEADER_ROW_MSGID,
HEADER_ROW_SIZE,
HEADER_ROW_NUM
};
typedef enum _HeaderRow HeaderRow;
struct _HeaderInfo {
HeaderRow row;
const char *title;
};
typedef struct _HeaderInfo HeaderInfo;
static const HeaderInfo HEADER_INFO[] = {
{HEADER_ROW_CC, "Cc"},
{HEADER_ROW_SUBJECT, "Subject"},
{HEADER_ROW_DATE, "Date"}
};
static const HeaderInfo HEADER_INFO_EXPANDER[] = {
{HEADER_ROW_FROM, "From"},
{HEADER_ROW_TO, "To"},
{HEADER_ROW_PATH, "Path"},
{HEADER_ROW_MSGID, "Message-Id"},
{HEADER_ROW_SIZE, "Size"}
};
typedef struct _MugMsgViewPrivate MugMsgViewPrivate;
struct _MugMsgViewPrivate {
GtkWidget *_headers_area;
GtkWidget *_tablemain, *_tableexpander;
GtkWidget *_headervals[HEADER_ROW_NUM];
GtkWidget *_expander_header, *_expander;
GtkWidget *_view;
};
#define MUG_MSG_VIEW_GET_PRIVATE(o)(G_TYPE_INSTANCE_GET_PRIVATE((o),MUG_TYPE_MSG_VIEW, MugMsgViewPrivate))
@ -109,76 +71,6 @@ mug_msg_view_class_init (MugMsgViewClass * klass)
/* etc. */
}
static GtkWidget *
create_table (MugMsgViewPrivate * priv, const HeaderInfo * hinfo, guint num)
{
guint i;
GtkWidget *table;
table = gtk_table_new (num, 2, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 5);
for (i = 0; i < num; ++i) {
char *str;
GtkWidget *l, *al;
l = gtk_label_new (NULL);
gtk_misc_set_alignment (GTK_MISC (l), 0.0, 0.5);
gtk_label_set_justify (GTK_LABEL (l), GTK_JUSTIFY_LEFT);
str = g_strdup_printf ("<b>%s</b>:", hinfo[i].title);
gtk_label_set_markup (GTK_LABEL (l), str);
g_free (str);
al = gtk_alignment_new (0.0, 0.0, 0.0, 0.0);
gtk_container_add (GTK_CONTAINER (al), l);
gtk_table_attach (GTK_TABLE (table), al, 0, 1, i, i + 1,
GTK_FILL, 0, 0, 0);
l = priv->_headervals[hinfo[i].row] = gtk_label_new (NULL);
al = gtk_alignment_new (0.0, 0.0, 0.0, 0.0);
gtk_label_set_selectable (GTK_LABEL (l), TRUE);
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 (GTK_LABEL (l), FALSE);
gtk_table_attach (GTK_TABLE (table), al,
1, 2, i, i + 1, GTK_FILL, 0, 0, 0);
}
return table;
}
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->_expander = gtk_expander_new ("Details");
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);
gtk_box_pack_start (GTK_BOX (vbox), priv->_expander, FALSE, FALSE, 0);
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);
return priv->_headers_area = scrolled;
}
static void
mug_msg_view_init (MugMsgView * obj)
{
@ -188,10 +80,6 @@ mug_msg_view_init (MugMsgView * obj)
priv = MUG_MSG_VIEW_GET_PRIVATE (obj);
priv->_view = mu_msg_view_new ();
/* priv->_view = gtk_text_view_new (); */
/* gtk_text_view_set_editable (GTK_TEXT_VIEW (priv->_view), FALSE); */
/* gtk_text_view_set_left_margin (GTK_TEXT_VIEW (priv->_view), 10); */
/* gtk_text_view_set_right_margin (GTK_TEXT_VIEW (priv->_view), 10); */
scrolled = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled),
@ -200,8 +88,6 @@ mug_msg_view_init (MugMsgView * obj)
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (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);
}
@ -219,39 +105,6 @@ mug_msg_view_new (void)
}
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));
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);
g_free (str);
}
}
}
gboolean
mug_msg_view_set_msg (MugMsgView * self, const char *msgpath)
@ -264,10 +117,13 @@ mug_msg_view_set_msg (MugMsgView * self, const char *msgpath)
if (!msgpath)
mu_msg_view_set_message (MU_MSG_VIEW(priv->_view), NULL);
else {
MuMsg *msg = mu_msg_new (msgpath, NULL, NULL);
MuMsg *msg;
msg = mu_msg_new (msgpath, NULL, NULL);
mu_msg_view_set_message (MU_MSG_VIEW(priv->_view), msg);
fill_header (priv, msg);
mu_msg_unref (msg);
if (msg)
mu_msg_unref (msg);
}
return TRUE;