From aa77d2a2f5039f0397f358958b2e5d702bdf9e16 Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Sun, 21 Oct 2012 16:24:45 +0200 Subject: Restyle, reindent, refactor (a little) --- src/eom-main-window.c | 445 +++++++++++++++++++++++++------------------------- 1 file changed, 220 insertions(+), 225 deletions(-) (limited to 'src/eom-main-window.c') diff --git a/src/eom-main-window.c b/src/eom-main-window.c index fa1253e..1183972 100644 --- a/src/eom-main-window.c +++ b/src/eom-main-window.c @@ -10,276 +10,271 @@ #include "data.h" #include "interface.h" -G_DEFINE_TYPE(EomMainWindow, eom_main_window, HILDON_TYPE_STACKABLE_WINDOW) +G_DEFINE_TYPE(EomMainWindow, eom_main_window, + HILDON_TYPE_STACKABLE_WINDOW) enum { - COL_ID = 0, - COL_NAME, - COL_CURRENT, - COL_TOTAL, - NUM_COLS + COL_ID = 0, + COL_NAME, + COL_CURRENT, + COL_TOTAL, + NUM_COLS }; struct filter_args { - EomMainWindow *window; - gint state; + EomMainWindow *window; + gint state; }; -static void eom_main_window_add_menu(EomMainWindow *window); -static void eom_main_window_on_new(GtkWidget *widget, GtkWindow *window); -static void eom_main_window_on_filter(GtkWidget *widget, struct filter_args *arg); -static void eom_main_window_on_add_clicked(GtkWidget *widget, - gpointer user_data); -static void eom_main_window_on_remove_clicked(GtkWidget *widget, - gpointer user_data); -static gboolean eom_main_window_on_edit_closed(GtkWidget *widget, - GdkEvent *event, - gpointer user_data); -static void eom_main_window_on_row_activated(GtkWidget *treeview, - GtkTreePath *path, - GtkTreeViewColumn *column, - gpointer user_data); - -GtkWidget *eom_main_window_new(void) +static void add_menu(EomMainWindow*); +static void eom_main_window_class_init(EomMainWindowClass*); +static void eom_main_window_init(EomMainWindow*); +static gboolean on_edit_closed(GtkWidget*, GdkEvent*, gpointer); +static void on_filter(GtkWidget*, struct filter_args*); +static void on_new(GtkWidget*, GtkWindow*); +static void on_row_activated(GtkWidget*, GtkTreePath*, GtkTreeViewColumn*, gpointer); + +void +eom_main_window_add_line(EomMainWindow *window, gint id, + const gchar *name, gint current_qty, + gint total_qty) { - return g_object_new(EOM_TYPE_MAIN_WINDOW, - "state", 0, - NULL); + gtk_list_store_append(window->store, &window->iter); + gtk_list_store_set(window ->store, &window->iter, + COL_ID, id, + COL_NAME, name, + COL_CURRENT, current_qty, + COL_TOTAL, total_qty, + -1); } -void eom_main_window_load(EomMainWindow *self) +void +eom_main_window_load(EomMainWindow *self) { - GList *list; - int i; + GList *list; + int i; - gtk_list_store_clear(self->store); + gtk_list_store_clear(self->store); - if (self->state) - list = data_get_incomplete_manga(); - else - list = data_get_manga(); + if (self->state) + list = data_get_incomplete_manga(); + else + list = data_get_manga(); - while (list) { - Manga *manga = list->data; - eom_main_window_add_line(self, manga->id, manga->name, - manga->current_qty, manga->total_qty); + while (list) { + Manga *manga = list->data; - free(manga->name); - if (manga->volumes != NULL) { - for (i = 0; i < manga->vol_count; i++) - free(manga->volumes + i); + eom_main_window_add_line(self, manga->id, manga->name, + manga->current_qty, manga->total_qty); + free(manga->name); + + if (manga->volumes != NULL) { + for (i = 0; i < manga->vol_count; i++) + free(manga->volumes + i); + } + + free(manga); + list = g_list_next(list); } - free(manga); - list = g_list_next(list); - } - g_list_free_1(list); + g_list_free_1(list); } -void eom_main_window_add_line(EomMainWindow *window, - gint id, - const gchar *name, - gint current_qty, - gint total_qty) +GtkWidget * +eom_main_window_new(void) { - gtk_list_store_append(window->store, &window->iter); - gtk_list_store_set(window ->store, &window->iter, - COL_ID, id, - COL_NAME, name, - COL_CURRENT, current_qty, - COL_TOTAL, total_qty, - -1); + return g_object_new(EOM_TYPE_MAIN_WINDOW, NULL); } -static void eom_main_window_class_init(EomMainWindowClass *class) +static void +add_menu(EomMainWindow *window) +{ + HildonAppMenu *appmenu; + GtkWidget *new_button; + GtkWidget *all_filter, *collect_filter; + struct filter_args *args0 = malloc(sizeof(struct filter_args)); + struct filter_args *args1 = malloc(sizeof(struct filter_args)); + + args0->window = window; + args0->state = 0; + args1->window = window; + args1->state = 1; + appmenu = HILDON_APP_MENU(hildon_app_menu_new()); + + new_button = hildon_gtk_button_new(HILDON_SIZE_AUTO); + gtk_button_set_label(GTK_BUTTON(new_button), "New Manga"); + g_signal_connect_after(new_button, "clicked", G_CALLBACK(on_new), + GTK_WINDOW(window)); + hildon_app_menu_append(appmenu, GTK_BUTTON(new_button)); + + all_filter = hildon_gtk_radio_button_new(HILDON_SIZE_AUTO, NULL); + gtk_button_set_label(GTK_BUTTON(all_filter), "All"); + g_signal_connect_after(all_filter, "clicked", G_CALLBACK(on_filter), + args0); + hildon_app_menu_add_filter(appmenu, GTK_BUTTON(all_filter)); + gtk_toggle_button_set_mode(GTK_TOGGLE_BUTTON(all_filter), FALSE); + + collect_filter = + hildon_gtk_radio_button_new_from_widget(HILDON_SIZE_AUTO, + GTK_RADIO_BUTTON(all_filter)); + gtk_button_set_label(GTK_BUTTON(collect_filter), "Collect"); + g_signal_connect_after(collect_filter, "clicked", + G_CALLBACK(on_filter), args1); + hildon_app_menu_add_filter(appmenu, GTK_BUTTON(collect_filter)); + gtk_toggle_button_set_mode(GTK_TOGGLE_BUTTON(collect_filter), FALSE); + + gtk_widget_show_all(GTK_WIDGET(appmenu)); + + hildon_stackable_window_set_main_menu(HILDON_STACKABLE_WINDOW(window), + HILDON_APP_MENU(appmenu)); +} + +static void +eom_main_window_class_init(EomMainWindowClass *class) {} -static void eom_main_window_init(EomMainWindow *window) +static void +eom_main_window_init(EomMainWindow *window) { - GtkCellRenderer *renderer; - GtkWidget *view; - GtkWidget *pannablearea; - GtkTreeViewColumn *current_column; - GtkTreeSelection *selection; - int index; - - index = -1; - - eom_main_window_add_menu(window); - - g_signal_connect(window, "destroy", G_CALLBACK(gtk_main_quit), NULL); - g_signal_connect(window, "delete-event", G_CALLBACK(gtk_main_quit), NULL); - - window->store = gtk_list_store_new(NUM_COLS, - G_TYPE_INT, - G_TYPE_STRING, - G_TYPE_INT, - G_TYPE_INT); - - pannablearea = hildon_pannable_area_new(); - g_object_set(G_OBJECT(pannablearea), - "mov-mode", HILDON_MOVEMENT_MODE_VERT, - NULL); - gtk_container_add(GTK_CONTAINER(window), pannablearea); - - view = hildon_gtk_tree_view_new(HILDON_UI_MODE_NORMAL); - g_signal_connect(view, "row-activated", - G_CALLBACK(eom_main_window_on_row_activated), window); - gtk_container_add(GTK_CONTAINER(pannablearea), view); - - selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(view)); - gtk_tree_selection_set_mode(selection, GTK_SELECTION_SINGLE); - - renderer = gtk_cell_renderer_text_new(); - gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(view), - ++index, - "Naam", - renderer, - "text", COL_NAME, - NULL); - current_column = gtk_tree_view_get_column(GTK_TREE_VIEW(view), index); - gtk_tree_view_column_set_expand(current_column, TRUE); - - renderer = gtk_cell_renderer_text_new(); - gtk_object_set(GTK_OBJECT(renderer), - "xalign", 1.0, - "width", 100, - NULL); - gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(view), - ++index, - "", - renderer, - "text", COL_CURRENT, - NULL); - - renderer = gtk_cell_renderer_text_new(); - gtk_object_set(GTK_OBJECT(renderer), - "xalign", 1.0, - "width", 100, + GtkCellRenderer *renderer; + GtkWidget *view; + GtkWidget *pannablearea; + GtkTreeViewColumn *current_column; + GtkTreeSelection *selection; + int index; + + index = -1; + + add_menu(window); + + g_signal_connect(window, "destroy", G_CALLBACK(gtk_main_quit), NULL); + g_signal_connect(window, "delete-event", G_CALLBACK(gtk_main_quit), + NULL); + + window->store = gtk_list_store_new(NUM_COLS, + G_TYPE_INT, + G_TYPE_STRING, + G_TYPE_INT, + G_TYPE_INT); + + pannablearea = hildon_pannable_area_new(); + g_object_set(G_OBJECT(pannablearea), + "mov-mode", HILDON_MOVEMENT_MODE_VERT, NULL); - gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(view), - ++index, - "", - renderer, - "text", COL_TOTAL, - NULL); - - gtk_tree_view_set_model(GTK_TREE_VIEW(view), - GTK_TREE_MODEL(window->store)); - g_object_unref(window->store); + gtk_container_add(GTK_CONTAINER(window), pannablearea); + + view = hildon_gtk_tree_view_new(HILDON_UI_MODE_NORMAL); + g_signal_connect(view, "row-activated", G_CALLBACK(on_row_activated), + window); + gtk_container_add(GTK_CONTAINER(pannablearea), view); + + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(view)); + gtk_tree_selection_set_mode(selection, GTK_SELECTION_SINGLE); + + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(view), + ++index, + "Naam", + renderer, + "text", COL_NAME, + NULL); + current_column = + gtk_tree_view_get_column(GTK_TREE_VIEW(view), index); + gtk_tree_view_column_set_expand(current_column, TRUE); + + renderer = gtk_cell_renderer_text_new(); + gtk_object_set(GTK_OBJECT(renderer), + "xalign", 1.0, + "width", 100, + NULL); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(view), + ++index, + "", + renderer, + "text", COL_CURRENT, + NULL); + + renderer = gtk_cell_renderer_text_new(); + gtk_object_set(GTK_OBJECT(renderer), + "xalign", 1.0, + "width", 100, + NULL); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(view), + ++index, + "", + renderer, + "text", COL_TOTAL, + NULL); + + gtk_tree_view_set_model(GTK_TREE_VIEW(view), + GTK_TREE_MODEL(window->store)); + g_object_unref(window->store); } -static void eom_main_window_add_menu(EomMainWindow *window) +static gboolean +on_edit_closed(GtkWidget *widget, GdkEvent *event, gpointer user_data) { - HildonAppMenu *appmenu; - GtkWidget *new_button; - GtkWidget *all_filter, *collect_filter; - struct filter_args *args0 = malloc(sizeof(struct filter_args)); - struct filter_args *args1 = malloc(sizeof(struct filter_args)); - - args0->window = window; - args0->state = 0; - args1->window = window; - args1->state = 1; - appmenu = HILDON_APP_MENU(hildon_app_menu_new()); - - new_button = hildon_gtk_button_new(HILDON_SIZE_AUTO); - gtk_button_set_label(GTK_BUTTON(new_button), "New Manga"); - g_signal_connect_after(new_button, - "clicked", - G_CALLBACK(eom_main_window_on_new), - GTK_WINDOW(window)); - - hildon_app_menu_append(appmenu, GTK_BUTTON(new_button)); - - all_filter = hildon_gtk_radio_button_new(HILDON_SIZE_AUTO, NULL); - gtk_button_set_label(GTK_BUTTON(all_filter), "All"); - g_signal_connect_after(all_filter, "clicked", - G_CALLBACK(eom_main_window_on_filter), - args0); - hildon_app_menu_add_filter(appmenu, GTK_BUTTON(all_filter)); - gtk_toggle_button_set_mode(GTK_TOGGLE_BUTTON(all_filter), FALSE); - - collect_filter = - hildon_gtk_radio_button_new_from_widget(HILDON_SIZE_AUTO, - GTK_RADIO_BUTTON(all_filter)); - gtk_button_set_label(GTK_BUTTON(collect_filter), "Collect"); - g_signal_connect_after(collect_filter, "clicked", - G_CALLBACK(eom_main_window_on_filter), - args1); - hildon_app_menu_add_filter(appmenu, GTK_BUTTON(collect_filter)); - gtk_toggle_button_set_mode(GTK_TOGGLE_BUTTON(collect_filter), FALSE); - - gtk_widget_show_all(GTK_WIDGET(appmenu)); - - hildon_stackable_window_set_main_menu(HILDON_STACKABLE_WINDOW(window), - HILDON_APP_MENU(appmenu)); + EomMainWindow *self = user_data; + + eom_main_window_load(self); + + return FALSE; } -static void eom_main_window_on_filter(GtkWidget *widget, struct filter_args *arg) +static void +on_filter(GtkWidget *widget, struct filter_args *arg) { - arg->window->state = arg->state; - eom_main_window_load(arg->window); + arg->window->state = arg->state; + eom_main_window_load(arg->window); } -static void eom_main_window_on_new(GtkWidget *widget, GtkWindow *window) +static void +on_new(GtkWidget *widget, GtkWindow *window) { - GtkWidget *dialog; - gint result; - gchar *name = NULL; - gint total_qty; - - dialog = interface_show_new_item_dialog(window); + GtkWidget *dialog; + gint result; + gchar *name = NULL; + gint total_qty; - result = gtk_dialog_run(GTK_DIALOG(dialog)); + dialog = interface_show_new_item_dialog(window); + result = gtk_dialog_run(GTK_DIALOG(dialog)); - if (result == GTK_RESPONSE_OK) { - const gchar *tmp; - tmp = eom_new_item_dialog_get_name(EOM_NEW_ITEM_DIALOG(dialog)); - name = (gchar *)malloc(strlen(tmp) + 1); + if (result == GTK_RESPONSE_OK) { + const gchar *tmp; + tmp = eom_new_item_dialog_get_name(EOM_NEW_ITEM_DIALOG(dialog)); + name = (gchar *)malloc(strlen(tmp) + 1); - strcpy(name, tmp); - strcat(name, "\0"); + strcpy(name, tmp); + strcat(name, "\0"); - total_qty = eom_new_item_dialog_get_total_qty(EOM_NEW_ITEM_DIALOG(dialog)); + total_qty = eom_new_item_dialog_get_total_qty(EOM_NEW_ITEM_DIALOG(dialog)); - gtk_widget_destroy(dialog); - } + gtk_widget_destroy(dialog); + } - if (name != NULL) { - if (data_add_manga(name, total_qty)) - eom_main_window_load(EOM_MAIN_WINDOW(window)); - } + if (name != NULL) { + if (data_add_manga(name, total_qty)) + eom_main_window_load(EOM_MAIN_WINDOW(window)); + } } -static gboolean eom_main_window_on_edit_closed(GtkWidget *widget, - GdkEvent *event, - gpointer user_data) +static void +on_row_activated(GtkWidget *treeview, GtkTreePath *path, + GtkTreeViewColumn *column, gpointer user_data) { - EomMainWindow *self = user_data; + EomMainWindow *self = user_data; + GtkTreeIter iter; + GtkTreeModel *model; + gint id; + GtkWidget *window; - eom_main_window_load(self); + model = gtk_tree_view_get_model(GTK_TREE_VIEW(treeview)); - return FALSE; -} + if (!gtk_tree_model_get_iter(model, &iter, path)) + return; -static void eom_main_window_on_row_activated(GtkWidget *treeview, - GtkTreePath *path, - GtkTreeViewColumn *column, - gpointer user_data) -{ - EomMainWindow *self = user_data; - GtkTreeIter iter; - GtkTreeModel *model; - gint id; - GtkWidget *window; - - model = gtk_tree_view_get_model(GTK_TREE_VIEW(treeview)); - if (!gtk_tree_model_get_iter(model, &iter, path)) - return; - - gtk_tree_model_get(model, &iter, COL_ID, &id, -1); - window = interface_show_edit_window(id); - g_signal_connect(window, "delete-event", - G_CALLBACK(eom_main_window_on_edit_closed), self); + gtk_tree_model_get(model, &iter, COL_ID, &id, -1); + window = interface_show_edit_window(id); + g_signal_connect(window, "delete-event", G_CALLBACK(on_edit_closed), + self); } -- cgit v1.2.3-54-g00ecf