* mug: cleanups/indentation
This commit is contained in:
Dirk-Jan C. Binnema
291
toys/mug/mug.cc
291
toys/mug/mug.cc
@ -44,19 +44,20 @@ 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
|
||||
(GTK_WINDOW(mugdata->win), GTK_DIALOG_MODAL,
|
||||
(GTK_WINDOW (mugdata->win), GTK_DIALOG_MODAL,
|
||||
GTK_MESSAGE_INFO, GTK_BUTTONS_OK,
|
||||
"Mug version %s\n"
|
||||
"A graphical frontend to the 'mu' e-mail search engine\n\n"
|
||||
"(c) 2010 Dirk-Jan C. Binnema\n"
|
||||
"Released under the terms of the GPLv3+", VERSION);
|
||||
|
||||
gtk_dialog_run(GTK_DIALOG(about));
|
||||
gtk_widget_destroy(about);
|
||||
gtk_dialog_run (GTK_DIALOG (about));
|
||||
gtk_widget_destroy (about);
|
||||
}
|
||||
|
||||
enum _ToolAction {
|
||||
@ -68,32 +69,50 @@ 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();
|
||||
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);
|
||||
about_mug (mugdata);
|
||||
break;
|
||||
default:
|
||||
g_print("%u\n", action);
|
||||
g_print ("%u\n", action);
|
||||
}
|
||||
}
|
||||
|
||||
static GtkWidget *mug_toolbar(MugData * mugdata)
|
||||
static GtkToolItem*
|
||||
get_connected_tool_button (const char* stock_id, ToolAction action,
|
||||
MugData *mugdata)
|
||||
{
|
||||
GtkToolItem *btn;
|
||||
|
||||
btn = gtk_tool_button_new_from_stock (stock_id);
|
||||
g_object_set_data (G_OBJECT (btn), "action",
|
||||
GUINT_TO_POINTER (action));
|
||||
g_signal_connect (G_OBJECT (btn), "clicked",
|
||||
G_CALLBACK (on_tool_button_clicked),
|
||||
mugdata);
|
||||
return btn;
|
||||
}
|
||||
|
||||
static GtkWidget *
|
||||
mug_toolbar (MugData * mugdata)
|
||||
{
|
||||
GtkWidget *toolbar;
|
||||
int i;
|
||||
@ -101,99 +120,95 @@ static GtkWidget *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}};
|
||||
|
||||
toolbar = gtk_toolbar_new();
|
||||
for (i = 0; i != G_N_ELEMENTS(tools); ++i) {
|
||||
GtkToolItem *btn;
|
||||
if (tools[i].action == ACTION_SEPARATOR) { /* separator */
|
||||
gtk_toolbar_insert(GTK_TOOLBAR(toolbar),
|
||||
gtk_separator_tool_item_new(), i);
|
||||
toolbar = gtk_toolbar_new ();
|
||||
for (i = 0; i != G_N_ELEMENTS (tools); ++i) {
|
||||
if (tools[i].action == ACTION_SEPARATOR) { /* separator? */
|
||||
gtk_toolbar_insert (GTK_TOOLBAR (toolbar),
|
||||
gtk_separator_tool_item_new (), i);
|
||||
continue;
|
||||
}
|
||||
|
||||
/* nope: a real item */
|
||||
btn = gtk_tool_button_new_from_stock(tools[i].stock_id);
|
||||
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);
|
||||
gtk_toolbar_insert(GTK_TOOLBAR(toolbar), btn, i);
|
||||
gtk_widget_show(GTK_WIDGET(btn));
|
||||
} else /* nope: a real item */
|
||||
gtk_toolbar_insert (GTK_TOOLBAR (toolbar),
|
||||
get_connected_tool_button
|
||||
(tools[i].stock_id, tools[i].action,
|
||||
mugdata), i);
|
||||
}
|
||||
|
||||
|
||||
return toolbar;
|
||||
}
|
||||
|
||||
static void
|
||||
on_shortcut_clicked(GtkWidget * w, const gchar * query, MugData * mdata)
|
||||
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());
|
||||
data->shortcuts = mug_shortcuts_new (mu_runtime_bookmarks_file ());
|
||||
|
||||
g_signal_connect(G_OBJECT(data->shortcuts), "clicked",
|
||||
G_CALLBACK(on_shortcut_clicked), data);
|
||||
g_signal_connect (G_OBJECT (data->shortcuts), "clicked",
|
||||
G_CALLBACK (on_shortcut_clicked), data);
|
||||
|
||||
return data->shortcuts;
|
||||
}
|
||||
|
||||
static GtkWidget *mug_statusbar(void)
|
||||
static GtkWidget *
|
||||
mug_statusbar (void)
|
||||
{
|
||||
GtkWidget *statusbar;
|
||||
|
||||
statusbar = gtk_statusbar_new();
|
||||
statusbar = gtk_statusbar_new ();
|
||||
|
||||
return statusbar;
|
||||
}
|
||||
|
||||
static void
|
||||
on_query_changed(MugQueryBar * bar, const char *query, MugData * mugdata)
|
||||
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_msg(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);
|
||||
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'",
|
||||
count,
|
||||
count > 1 ? "s" : "",
|
||||
mug_msg_list_view_get_query
|
||||
(MUG_MSG_LIST_VIEW
|
||||
(mugdata->mlist)));
|
||||
gtk_statusbar_push(GTK_STATUSBAR(mugdata->statusbar), 0, msg);
|
||||
g_free(msg);
|
||||
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)));
|
||||
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));
|
||||
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));
|
||||
mug_query_bar_grab_focus (MUG_QUERY_BAR (bar));
|
||||
}
|
||||
|
||||
static void
|
||||
on_msg_selected(MugMsgListView * mlist, const char *mpath, MugData * mugdata)
|
||||
on_msg_selected (MugMsgListView * mlist, const char *mpath, MugData * mugdata)
|
||||
{
|
||||
// g_warning ("msg selected: %s", mpath);
|
||||
mug_msg_view_set_msg(MUG_MSG_VIEW(mugdata->msgview), mpath);
|
||||
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;
|
||||
@ -217,112 +232,118 @@ on_list_view_error(MugMsgListView * mlist, MugError err, MugData * mugdata)
|
||||
}
|
||||
|
||||
errdialog = gtk_message_dialog_new
|
||||
(GTK_WINDOW(mugdata->win), GTK_DIALOG_MODAL,
|
||||
(GTK_WINDOW (mugdata->win), GTK_DIALOG_MODAL,
|
||||
GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", msg);
|
||||
|
||||
gtk_dialog_run(GTK_DIALOG(errdialog));
|
||||
gtk_widget_destroy(errdialog);
|
||||
gtk_dialog_run (GTK_DIALOG (errdialog));
|
||||
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;
|
||||
|
||||
querybar = mug_query_bar_new();
|
||||
querybar = mug_query_bar_new ();
|
||||
|
||||
return querybar;
|
||||
}
|
||||
|
||||
static GtkWidget *mug_query_area(MugData * mugdata)
|
||||
static GtkWidget *
|
||||
mug_query_area (MugData * mugdata)
|
||||
{
|
||||
GtkWidget *queryarea;
|
||||
GtkWidget *paned;
|
||||
GtkWidget *scrolled;
|
||||
|
||||
queryarea = gtk_vbox_new(FALSE, 2);
|
||||
paned = gtk_vpaned_new();
|
||||
queryarea = gtk_vbox_new (FALSE, 2);
|
||||
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,
|
||||
GTK_POLICY_AUTOMATIC);
|
||||
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,
|
||||
GTK_POLICY_AUTOMATIC);
|
||||
|
||||
gtk_container_add(GTK_CONTAINER(scrolled), mugdata->mlist);
|
||||
gtk_paned_add1(GTK_PANED(paned), scrolled);
|
||||
gtk_container_add (GTK_CONTAINER (scrolled), mugdata->mlist);
|
||||
gtk_paned_add1 (GTK_PANED (paned), scrolled);
|
||||
|
||||
mugdata->msgview = mug_msg_view_new();
|
||||
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);
|
||||
g_signal_connect(G_OBJECT(mugdata->mlist), "error-occured",
|
||||
G_CALLBACK(on_list_view_error), mugdata);
|
||||
gtk_paned_add2(GTK_PANED(paned), mugdata->msgview);
|
||||
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);
|
||||
g_signal_connect (G_OBJECT (mugdata->mlist), "error-occured",
|
||||
G_CALLBACK (on_list_view_error), mugdata);
|
||||
gtk_paned_add2 (GTK_PANED (paned), mugdata->msgview);
|
||||
|
||||
mugdata->querybar = mug_querybar();
|
||||
g_signal_connect(G_OBJECT(mugdata->querybar), "query-changed",
|
||||
G_CALLBACK(on_query_changed), mugdata);
|
||||
mugdata->querybar = mug_querybar ();
|
||||
g_signal_connect (G_OBJECT (mugdata->querybar), "query-changed",
|
||||
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),
|
||||
mugdata->querybar, FALSE, FALSE, 2);
|
||||
gtk_box_pack_start (GTK_BOX (queryarea), paned, TRUE, TRUE, 2);
|
||||
|
||||
gtk_widget_show_all(queryarea);
|
||||
gtk_widget_show_all (queryarea);
|
||||
return queryarea;
|
||||
}
|
||||
|
||||
static GtkWidget *mug_main_area(MugData * mugdata)
|
||||
static GtkWidget *
|
||||
mug_main_area (MugData * mugdata)
|
||||
{
|
||||
GtkWidget *mainarea, *w;
|
||||
mainarea = gtk_hbox_new(FALSE, 5);
|
||||
mainarea = gtk_hbox_new (FALSE, 5);
|
||||
|
||||
w = mug_shortcuts_bar(mugdata);
|
||||
gtk_box_pack_start(GTK_BOX(mainarea), w, FALSE, FALSE, 0);
|
||||
gtk_widget_show(w);
|
||||
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);
|
||||
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;
|
||||
|
||||
mugdata->win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
|
||||
gtk_window_set_title(GTK_WINDOW(mugdata->win), "Mug Mail Search");
|
||||
mugdata->win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
|
||||
gtk_window_set_title (GTK_WINDOW (mugdata->win), "Mug Mail Search");
|
||||
|
||||
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);
|
||||
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);
|
||||
|
||||
mugdata->statusbar = mug_statusbar();
|
||||
gtk_box_pack_start(GTK_BOX(vbox), mugdata->statusbar, FALSE, FALSE, 2);
|
||||
mugdata->statusbar = mug_statusbar ();
|
||||
gtk_box_pack_start (GTK_BOX (vbox), mugdata->statusbar, FALSE, FALSE,
|
||||
2);
|
||||
|
||||
gtk_container_add(GTK_CONTAINER(mugdata->win), vbox);
|
||||
gtk_widget_show_all(vbox);
|
||||
gtk_container_add (GTK_CONTAINER (mugdata->win), vbox);
|
||||
gtk_widget_show_all (vbox);
|
||||
|
||||
gtk_window_set_default_size(GTK_WINDOW(mugdata->win), 700, 500);
|
||||
gtk_window_set_resizable(GTK_WINDOW(mugdata->win), TRUE);
|
||||
gtk_window_set_default_size (GTK_WINDOW (mugdata->win), 700, 500);
|
||||
gtk_window_set_resizable (GTK_WINDOW (mugdata->win), TRUE);
|
||||
|
||||
icon = g_strdup_printf("%s%cmug.svg", ICONDIR, G_DIR_SEPARATOR);
|
||||
gtk_window_set_icon_from_file(GTK_WINDOW(mugdata->win), icon, NULL);
|
||||
g_free(icon);
|
||||
icon = g_strdup_printf ("%s%cmug.svg", ICONDIR, G_DIR_SEPARATOR);
|
||||
gtk_window_set_icon_from_file (GTK_WINDOW (mugdata->win), icon, NULL);
|
||||
g_free (icon);
|
||||
|
||||
return mugdata->win;
|
||||
}
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
int
|
||||
main (int argc, char *argv[])
|
||||
{
|
||||
MugData mugdata;
|
||||
GtkWidget *mugshell;
|
||||
@ -333,30 +354,30 @@ int main(int argc, char *argv[])
|
||||
{NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL} /* sentinel */
|
||||
};
|
||||
|
||||
gtk_init(&argc, &argv);
|
||||
gtk_init (&argc, &argv);
|
||||
|
||||
octx = g_option_context_new("- mug options");
|
||||
g_option_context_add_main_entries(octx, entries, "Mug");
|
||||
octx = g_option_context_new ("- mug options");
|
||||
g_option_context_add_main_entries (octx, entries, "Mug");
|
||||
|
||||
memset(&mugdata, 0, sizeof(MugData));
|
||||
if (!g_option_context_parse(octx, &argc, &argv, NULL)) {
|
||||
g_printerr("mug: error in options\n");
|
||||
memset (&mugdata, 0, sizeof (MugData));
|
||||
if (!g_option_context_parse (octx, &argc, &argv, NULL)) {
|
||||
g_printerr ("mug: error in options\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
mu_runtime_init(mugdata.muhome);
|
||||
mu_runtime_init (mugdata.muhome);
|
||||
|
||||
mugshell = mug_shell(&mugdata);
|
||||
g_signal_connect(G_OBJECT(mugshell), "destroy",
|
||||
G_CALLBACK(gtk_main_quit), NULL);
|
||||
mugshell = mug_shell (&mugdata);
|
||||
g_signal_connect (G_OBJECT (mugshell), "destroy",
|
||||
G_CALLBACK (gtk_main_quit), NULL);
|
||||
|
||||
gtk_widget_show(mugshell);
|
||||
mug_query_bar_grab_focus(MUG_QUERY_BAR(mugdata.querybar));
|
||||
gtk_widget_show (mugshell);
|
||||
mug_query_bar_grab_focus (MUG_QUERY_BAR (mugdata.querybar));
|
||||
|
||||
gtk_main();
|
||||
g_free(mugdata.muhome);
|
||||
gtk_main ();
|
||||
g_free (mugdata.muhome);
|
||||
|
||||
mu_runtime_uninit();
|
||||
mu_runtime_uninit ();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user