From 4d3bb22d33ea44aaacb8b45163ecb2cac3703d50 Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Tue, 23 Oct 2012 01:49:27 +0200 Subject: Rename edit window to detail window It won't function as an edit window much longer. --- src/Makefile.am | 2 +- src/eom-detail-window.c | 299 ++++++++++++++++++++++++++++++++++++++++++++++++ src/eom-detail-window.h | 58 ++++++++++ src/eom-edit-window.c | 298 ----------------------------------------------- src/eom-edit-window.h | 58 ---------- src/eom-main-window.c | 2 +- src/interface.c | 6 +- src/interface.h | 2 +- 8 files changed, 363 insertions(+), 362 deletions(-) create mode 100644 src/eom-detail-window.c create mode 100644 src/eom-detail-window.h delete mode 100644 src/eom-edit-window.c delete mode 100644 src/eom-edit-window.h diff --git a/src/Makefile.am b/src/Makefile.am index 18afa27..4fdcd55 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,7 +3,7 @@ bin_PROGRAMS = eye-on-manga eye_on_manga_SOURCES = \ data.c data.h \ eom.c eom.h \ - eom-edit-window.c eom-edit-window.h \ + eom-detail-window.c eom-detail-window.h \ eom-main-window.c eom-main-window.h \ eom-new-item-dialog.c eom-new-item-dialog.h \ interface.c interface.h diff --git a/src/eom-detail-window.c b/src/eom-detail-window.c new file mode 100644 index 0000000..8426831 --- /dev/null +++ b/src/eom-detail-window.c @@ -0,0 +1,299 @@ +#include "eom-detail-window.h" + +#include +#include +#include +#include + +#include "data.h" +#include "eom-main-window.h" + +#define COLUMNS 8 + +enum { + EOM_EDIT_PROP_0, + EOM_EDIT_PROP_CID +}; + +static GtkWidget *create_volume_button(gchar*, GtkTable*, int, int); +static void eom_detail_window_class_init(EomDetailWindowClass*); +static void eom_detail_window_init(EomDetailWindow *self); +static void finalize(GObject*); +static void get_property(GObject*, guint, GValue*, GParamSpec*); +static void on_volume_read_toggled(GtkToggleButton*, gpointer); +static void on_volume_toggled(GtkToggleButton*, gpointer); +static void set_manga_id(EomDetailWindow*, gint); +static void set_property(GObject*, guint, const GValue*, GParamSpec*); + +G_DEFINE_TYPE(EomDetailWindow, eom_detail_window, + HILDON_TYPE_STACKABLE_WINDOW) + +GtkWidget * +eom_detail_window_new(gint manga_id) +{ + return g_object_new(EOM_TYPE_EDIT_WINDOW, + "manga-id", manga_id, + NULL); +} + +static GtkWidget * +create_volume_button(gchar* text, GtkTable* table, int column, int row) +{ + GtkWidget *btn; + + btn = hildon_gtk_toggle_button_new(HILDON_SIZE_THUMB_HEIGHT + | HILDON_SIZE_AUTO_WIDTH); + gtk_button_set_label(GTK_BUTTON(btn), text); + gtk_toggle_button_set_mode(GTK_TOGGLE_BUTTON(btn), FALSE); + gtk_table_attach(GTK_TABLE(table), btn, + column, column + 1, + row, row + 1, + GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, + 0, 0); + + return btn; +} + +static void +eom_detail_window_class_init(EomDetailWindowClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS(klass); + GParamSpec *pspec; + + gobject_class->set_property = set_property; + gobject_class->get_property = get_property; + gobject_class->finalize = finalize; + pspec = g_param_spec_int("manga-id", "ID of the manga", + "Set the manga-id", 0, INT_MAX, 0, + G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE); + + g_object_class_install_property(gobject_class, EOM_EDIT_PROP_CID, + pspec); +} + +static void +eom_detail_window_init(EomDetailWindow *self) +{ + GtkWidget *panarea; + GtkWidget *table; + GtkWidget *nameclabel; + GtkWidget *haveclabel; + GtkWidget *totalclabel; + + panarea = hildon_pannable_area_new(); + g_object_set(G_OBJECT(panarea), + "mov-mode", HILDON_MOVEMENT_MODE_VERT, + NULL); + gtk_container_add(GTK_CONTAINER(self), panarea); + + table = gtk_table_new(4, 2, FALSE); + hildon_pannable_area_add_with_viewport(HILDON_PANNABLE_AREA(panarea), + table); + + /* Label for the name field */ + nameclabel = gtk_label_new("Name:"); + gtk_misc_set_alignment(GTK_MISC(nameclabel), 0.0, 0.5); + gtk_table_attach(GTK_TABLE(table), nameclabel, 0, 1, 0, 1, + GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); + + /* The name field */ + self->name_entry = hildon_entry_new(HILDON_SIZE_AUTO); + gtk_entry_set_alignment(GTK_ENTRY(self->name_entry), 1.0); + gtk_table_attach(GTK_TABLE(table), self->name_entry, 1, 2, 0, 1, + GTK_EXPAND | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); + + /* Label for the collected field */ + haveclabel = gtk_label_new("You have:"); + gtk_misc_set_alignment(GTK_MISC(haveclabel), 0.0, 0.5); + gtk_table_attach(GTK_TABLE(table), haveclabel, 0, 1, 1, 2, + GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); + + /* The collected field */ + self->have_label = gtk_label_new(""); + gtk_misc_set_alignment(GTK_MISC(self->have_label), 1.0, 0.5); + gtk_table_attach(GTK_TABLE(table), self->have_label, 1, 2, 1, 2, + GTK_EXPAND | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); + + /* Label for the total field */ + totalclabel = gtk_label_new("There are:"); + gtk_misc_set_alignment(GTK_MISC(totalclabel), 0.0, 0.5); + gtk_table_attach(GTK_TABLE(table), totalclabel, 0, 1, 2, 3, + GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); + + /* The total field */ + self->total_entry = hildon_entry_new(HILDON_SIZE_AUTO); + gtk_entry_set_alignment(GTK_ENTRY(self->total_entry), 1.0); + gtk_table_attach(GTK_TABLE(table), self->total_entry, 1, 2, 2, 3, + GTK_EXPAND | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); + + self->volsbox = gtk_vbox_new(FALSE, 0); + gtk_table_attach(GTK_TABLE(table), self->volsbox, 0, 2, 3, 4, + GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); +} + +static void +finalize(GObject *object) +{ + EomDetailWindow *self = EOM_DETAIL_WINDOW(object); + + g_free(self->manga); + + G_OBJECT_CLASS(eom_detail_window_parent_class)->finalize(object); +} + +static void +get_property(GObject *object, guint property_id, GValue *value, + GParamSpec *pspec) +{ + EomDetailWindow *self = EOM_DETAIL_WINDOW(object); + + switch (property_id) { + case EOM_EDIT_PROP_CID: + g_value_set_int(value, self->manga->id); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); + break; + } +} + +static void +on_volume_read_toggled(GtkToggleButton *togglebutton, gpointer user_data) +{ + EomDetailWindow *self = (EomDetailWindow *)user_data; + gboolean active = gtk_toggle_button_get_active(togglebutton); + gint volume = atoi(gtk_button_get_label(GTK_BUTTON(togglebutton))); + + if (!data_mark_volume_read(active, self->manga->id, volume)) + g_print("coulnd't mark volume as read\n"); +} + +static void +on_volume_toggled(GtkToggleButton *togglebutton, gpointer user_data) +{ + EomDetailWindow *self = (EomDetailWindow *)user_data; + gboolean active = gtk_toggle_button_get_active(togglebutton); + gint volume = atoi(gtk_button_get_label(GTK_BUTTON(togglebutton))); + gchar *txt; + + if (active) { + /* Add 1 to mangas collected */ + if (!data_add_to_manga(self->manga->id, 1)) { + return; + } + if (!data_add_volume_to_manga(self->manga->id, volume)) { + data_add_to_manga(self->manga->id, 1); + return; + } + self->manga->current_qty++; + } + else { + /* Remove 1 from mangas collected */ + if (!data_add_to_manga(self->manga->id, -1)) { + return; + } + if (!data_remove_volume_from_manga(self->manga->id, + volume)) { + data_add_to_manga(self->manga->id, 1); /* Undo */ + return; + } + self->manga->current_qty--; + } + + txt = g_strdup_printf("%d", self->manga->current_qty); + gtk_label_set_text(GTK_LABEL(self->have_label), txt); + g_free(txt); +} + +static void +set_manga_id(EomDetailWindow *self, gint manga_id) +{ + GtkWidget *bbox; + GtkWidget *clabel, *rlabel; + GtkWidget *ctable, *rtable; + Manga *manga; + gchar *txt; + gint i, j = 0, row = 0, col = 0; + + manga = data_get_manga_by_id(manga_id); + data_get_volumes_for_manga(manga); + self->manga = manga; + + gtk_window_set_title(GTK_WINDOW(self), manga->name); + gtk_entry_set_text(GTK_ENTRY(self->name_entry), manga->name); + + txt = g_strdup_printf("%d", manga->current_qty); + gtk_label_set_text(GTK_LABEL(self->have_label), txt); + g_free(txt); + + txt = g_strdup_printf("%d", manga->total_qty); + gtk_entry_set_text(GTK_ENTRY(self->total_entry), txt); + g_free(txt); + + clabel = gtk_label_new("Collected:"); + gtk_misc_set_alignment(GTK_MISC(clabel), 0.0, 0.5); + gtk_box_pack_start(GTK_BOX(self->volsbox), clabel, FALSE, FALSE, 0); + + ctable = gtk_table_new((int)floor(manga->total_qty / COLUMNS), + COLUMNS, TRUE); + gtk_box_pack_start(GTK_BOX(self->volsbox), ctable, TRUE, TRUE, 0); + + rlabel = gtk_label_new("Read:"); + gtk_misc_set_alignment(GTK_MISC(rlabel), 0.0, 0.5); + gtk_box_pack_start(GTK_BOX(self->volsbox), rlabel, FALSE, FALSE, 0); + + rtable = gtk_table_new((int)floor(manga->total_qty / COLUMNS), + COLUMNS, TRUE); + gtk_box_pack_start(GTK_BOX(self->volsbox), rtable, TRUE, TRUE, 0); + + for (i = 0; i < manga->total_qty; i++) { + GtkWidget *cbtn, *rbtn; + + if (i > 0 && i % COLUMNS == 0) { + row++; + col = 0; + } + + txt = g_strdup_printf("%d", i + 1); + + cbtn = create_volume_button(txt, GTK_TABLE(ctable), col, row); + rbtn = create_volume_button(txt, GTK_TABLE(rtable), col, row); + + if (j < manga->vol_count && manga->volumes[j].number == i + 1) { + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cbtn), TRUE); + + if (manga->volumes[j].read) + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(rbtn), + TRUE); + + j++; + } + + g_signal_connect(cbtn, "toggled", G_CALLBACK(on_volume_toggled), + (gpointer)self); + g_signal_connect(rbtn, "toggled", + G_CALLBACK(on_volume_read_toggled), + (gpointer)self); + + g_free(txt); + col++; + } +} + +static void +set_property(GObject *object, guint property_id, const GValue *value, + GParamSpec *pspec) +{ + EomDetailWindow *self = EOM_DETAIL_WINDOW(object); + gint manga_id = g_value_get_int(value); + + switch (property_id) { + case EOM_EDIT_PROP_CID: + set_manga_id(self, manga_id); + break; + default: + /* We don't have any other properties */ + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); + break; + } +} diff --git a/src/eom-detail-window.h b/src/eom-detail-window.h new file mode 100644 index 0000000..0230438 --- /dev/null +++ b/src/eom-detail-window.h @@ -0,0 +1,58 @@ +#ifndef __EOM_DETAIL_WINDOW_H__ +#define __EOM_DETAIL_WINDOW_H__ + +#include + +#include "data.h" + +G_BEGIN_DECLS + +#define EOM_TYPE_EDIT_WINDOW \ + (eom_detail_window_get_type()) + +#define EOM_DETAIL_WINDOW(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ + EOM_TYPE_EDIT_WINDOW, \ + EomDetailWindow)) + +#define EOM_DETAIL_WINDOW_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), \ + EOM_TYPE_EDIT_WINDOW, \ + EomDetailWindowClass)) + +#define EOM_IS_EDIT_WINDOW(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ + EOM_TYPE_EDIT_WINDOW)) + +#define EOM_IS_EDIT_WINDOW_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), \ + EOM_TYPE_EDIT_WINDOW)) + +#define EOM_DETAIL_WINDOW_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), \ + EOM_TYPE_EDIT_WINDOW, \ + EomDetailWindowClass)) + +typedef struct +{ + HildonStackableWindowClass parent_class; +} EomDetailWindowClass; + +typedef struct +{ + HildonStackableWindow parent; + + GtkWidget *name_entry; + GtkWidget *have_label; + GtkWidget *total_entry; + GtkWidget *volsbox; + + Manga *manga; +} EomDetailWindow; + +GType eom_detail_window_get_type(void); +GtkWidget *eom_detail_window_new(gint); + +G_END_DECLS + +#endif /* __EOM_DETAIL_WINDOW_H__ */ diff --git a/src/eom-edit-window.c b/src/eom-edit-window.c deleted file mode 100644 index 1a11cb1..0000000 --- a/src/eom-edit-window.c +++ /dev/null @@ -1,298 +0,0 @@ -#include "eom-edit-window.h" - -#include -#include -#include -#include - -#include "data.h" -#include "eom-main-window.h" - -#define COLUMNS 8 - -enum { - EOM_EDIT_PROP_0, - EOM_EDIT_PROP_CID -}; - -static GtkWidget *create_volume_button(gchar*, GtkTable*, int, int); -static void eom_edit_window_class_init(EomEditWindowClass*); -static void eom_edit_window_init(EomEditWindow *self); -static void finalize(GObject*); -static void get_property(GObject*, guint, GValue*, GParamSpec*); -static void on_volume_read_toggled(GtkToggleButton*, gpointer); -static void on_volume_toggled(GtkToggleButton*, gpointer); -static void set_manga_id(EomEditWindow*, gint); -static void set_property(GObject*, guint, const GValue*, GParamSpec*); - -G_DEFINE_TYPE(EomEditWindow, eom_edit_window, HILDON_TYPE_STACKABLE_WINDOW) - -GtkWidget * -eom_edit_window_new(gint manga_id) -{ - return g_object_new(EOM_TYPE_EDIT_WINDOW, - "manga-id", manga_id, - NULL); -} - -static GtkWidget * -create_volume_button(gchar* text, GtkTable* table, int column, int row) -{ - GtkWidget *btn; - - btn = hildon_gtk_toggle_button_new(HILDON_SIZE_THUMB_HEIGHT - | HILDON_SIZE_AUTO_WIDTH); - gtk_button_set_label(GTK_BUTTON(btn), text); - gtk_toggle_button_set_mode(GTK_TOGGLE_BUTTON(btn), FALSE); - gtk_table_attach(GTK_TABLE(table), btn, - column, column + 1, - row, row + 1, - GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, - 0, 0); - - return btn; -} - -static void -eom_edit_window_class_init(EomEditWindowClass *klass) -{ - GObjectClass *gobject_class = G_OBJECT_CLASS(klass); - GParamSpec *pspec; - - gobject_class->set_property = set_property; - gobject_class->get_property = get_property; - gobject_class->finalize = finalize; - pspec = g_param_spec_int("manga-id", "ID of the manga", - "Set the manga-id", 0, INT_MAX, 0, - G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE); - - g_object_class_install_property(gobject_class, EOM_EDIT_PROP_CID, - pspec); -} - -static void -eom_edit_window_init(EomEditWindow *self) -{ - GtkWidget *panarea; - GtkWidget *table; - GtkWidget *nameclabel; - GtkWidget *haveclabel; - GtkWidget *totalclabel; - - panarea = hildon_pannable_area_new(); - g_object_set(G_OBJECT(panarea), - "mov-mode", HILDON_MOVEMENT_MODE_VERT, - NULL); - gtk_container_add(GTK_CONTAINER(self), panarea); - - table = gtk_table_new(4, 2, FALSE); - hildon_pannable_area_add_with_viewport(HILDON_PANNABLE_AREA(panarea), - table); - - /* Label for the name field */ - nameclabel = gtk_label_new("Name:"); - gtk_misc_set_alignment(GTK_MISC(nameclabel), 0.0, 0.5); - gtk_table_attach(GTK_TABLE(table), nameclabel, 0, 1, 0, 1, - GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); - - /* The name field */ - self->name_entry = hildon_entry_new(HILDON_SIZE_AUTO); - gtk_entry_set_alignment(GTK_ENTRY(self->name_entry), 1.0); - gtk_table_attach(GTK_TABLE(table), self->name_entry, 1, 2, 0, 1, - GTK_EXPAND | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); - - /* Label for the collected field */ - haveclabel = gtk_label_new("You have:"); - gtk_misc_set_alignment(GTK_MISC(haveclabel), 0.0, 0.5); - gtk_table_attach(GTK_TABLE(table), haveclabel, 0, 1, 1, 2, - GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); - - /* The collected field */ - self->have_label = gtk_label_new(""); - gtk_misc_set_alignment(GTK_MISC(self->have_label), 1.0, 0.5); - gtk_table_attach(GTK_TABLE(table), self->have_label, 1, 2, 1, 2, - GTK_EXPAND | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); - - /* Label for the total field */ - totalclabel = gtk_label_new("There are:"); - gtk_misc_set_alignment(GTK_MISC(totalclabel), 0.0, 0.5); - gtk_table_attach(GTK_TABLE(table), totalclabel, 0, 1, 2, 3, - GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); - - /* The total field */ - self->total_entry = hildon_entry_new(HILDON_SIZE_AUTO); - gtk_entry_set_alignment(GTK_ENTRY(self->total_entry), 1.0); - gtk_table_attach(GTK_TABLE(table), self->total_entry, 1, 2, 2, 3, - GTK_EXPAND | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); - - self->volsbox = gtk_vbox_new(FALSE, 0); - gtk_table_attach(GTK_TABLE(table), self->volsbox, 0, 2, 3, 4, - GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); -} - -static void -finalize(GObject *object) -{ - EomEditWindow *self = EOM_EDIT_WINDOW(object); - - g_free(self->manga); - - G_OBJECT_CLASS(eom_edit_window_parent_class)->finalize(object); -} - -static void -get_property(GObject *object, guint property_id, GValue *value, - GParamSpec *pspec) -{ - EomEditWindow *self = EOM_EDIT_WINDOW(object); - - switch (property_id) { - case EOM_EDIT_PROP_CID: - g_value_set_int(value, self->manga->id); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); - break; - } -} - -static void -on_volume_read_toggled(GtkToggleButton *togglebutton, gpointer user_data) -{ - EomEditWindow *self = (EomEditWindow *)user_data; - gboolean active = gtk_toggle_button_get_active(togglebutton); - gint volume = atoi(gtk_button_get_label(GTK_BUTTON(togglebutton))); - - if (!data_mark_volume_read(active, self->manga->id, volume)) - g_print("coulnd't mark volume as read\n"); -} - -static void -on_volume_toggled(GtkToggleButton *togglebutton, gpointer user_data) -{ - EomEditWindow *self = (EomEditWindow *)user_data; - gboolean active = gtk_toggle_button_get_active(togglebutton); - gint volume = atoi(gtk_button_get_label(GTK_BUTTON(togglebutton))); - gchar *txt; - - if (active) { - /* Add 1 to mangas collected */ - if (!data_add_to_manga(self->manga->id, 1)) { - return; - } - if (!data_add_volume_to_manga(self->manga->id, volume)) { - data_add_to_manga(self->manga->id, 1); - return; - } - self->manga->current_qty++; - } - else { - /* Remove 1 from mangas collected */ - if (!data_add_to_manga(self->manga->id, -1)) { - return; - } - if (!data_remove_volume_from_manga(self->manga->id, - volume)) { - data_add_to_manga(self->manga->id, 1); /* Undo */ - return; - } - self->manga->current_qty--; - } - - txt = g_strdup_printf("%d", self->manga->current_qty); - gtk_label_set_text(GTK_LABEL(self->have_label), txt); - g_free(txt); -} - -static void -set_manga_id(EomEditWindow *self, gint manga_id) -{ - GtkWidget *bbox; - GtkWidget *clabel, *rlabel; - GtkWidget *ctable, *rtable; - Manga *manga; - gchar *txt; - gint i, j = 0, row = 0, col = 0; - - manga = data_get_manga_by_id(manga_id); - data_get_volumes_for_manga(manga); - self->manga = manga; - - gtk_window_set_title(GTK_WINDOW(self), manga->name); - gtk_entry_set_text(GTK_ENTRY(self->name_entry), manga->name); - - txt = g_strdup_printf("%d", manga->current_qty); - gtk_label_set_text(GTK_LABEL(self->have_label), txt); - g_free(txt); - - txt = g_strdup_printf("%d", manga->total_qty); - gtk_entry_set_text(GTK_ENTRY(self->total_entry), txt); - g_free(txt); - - clabel = gtk_label_new("Collected:"); - gtk_misc_set_alignment(GTK_MISC(clabel), 0.0, 0.5); - gtk_box_pack_start(GTK_BOX(self->volsbox), clabel, FALSE, FALSE, 0); - - ctable = gtk_table_new((int)floor(manga->total_qty / COLUMNS), - COLUMNS, TRUE); - gtk_box_pack_start(GTK_BOX(self->volsbox), ctable, TRUE, TRUE, 0); - - rlabel = gtk_label_new("Read:"); - gtk_misc_set_alignment(GTK_MISC(rlabel), 0.0, 0.5); - gtk_box_pack_start(GTK_BOX(self->volsbox), rlabel, FALSE, FALSE, 0); - - rtable = gtk_table_new((int)floor(manga->total_qty / COLUMNS), - COLUMNS, TRUE); - gtk_box_pack_start(GTK_BOX(self->volsbox), rtable, TRUE, TRUE, 0); - - for (i = 0; i < manga->total_qty; i++) { - GtkWidget *cbtn, *rbtn; - - if (i > 0 && i % COLUMNS == 0) { - row++; - col = 0; - } - - txt = g_strdup_printf("%d", i + 1); - - cbtn = create_volume_button(txt, GTK_TABLE(ctable), col, row); - rbtn = create_volume_button(txt, GTK_TABLE(rtable), col, row); - - if (j < manga->vol_count && manga->volumes[j].number == i + 1) { - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cbtn), TRUE); - - if (manga->volumes[j].read) - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(rbtn), - TRUE); - - j++; - } - - g_signal_connect(cbtn, "toggled", G_CALLBACK(on_volume_toggled), - (gpointer)self); - g_signal_connect(rbtn, "toggled", - G_CALLBACK(on_volume_read_toggled), - (gpointer)self); - - g_free(txt); - col++; - } -} - -static void -set_property(GObject *object, guint property_id, const GValue *value, - GParamSpec *pspec) -{ - EomEditWindow *self = EOM_EDIT_WINDOW(object); - gint manga_id = g_value_get_int(value); - - switch (property_id) { - case EOM_EDIT_PROP_CID: - set_manga_id(self, manga_id); - break; - default: - /* We don't have any other properties */ - G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); - break; - } -} diff --git a/src/eom-edit-window.h b/src/eom-edit-window.h deleted file mode 100644 index 52cf886..0000000 --- a/src/eom-edit-window.h +++ /dev/null @@ -1,58 +0,0 @@ -#ifndef __EOM_EDIT_WINDOW_H__ -#define __EOM_EDIT_WINDOW_H__ - -#include - -#include "data.h" - -G_BEGIN_DECLS - -#define EOM_TYPE_EDIT_WINDOW \ - (eom_edit_window_get_type()) - -#define EOM_EDIT_WINDOW(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ - EOM_TYPE_EDIT_WINDOW, \ - EomEditWindow)) - -#define EOM_EDIT_WINDOW_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), \ - EOM_TYPE_EDIT_WINDOW, \ - EomEditWindowClass)) - -#define EOM_IS_EDIT_WINDOW(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ - EOM_TYPE_EDIT_WINDOW)) - -#define EOM_IS_EDIT_WINDOW_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), \ - EOM_TYPE_EDIT_WINDOW)) - -#define EOM_EDIT_WINDOW_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), \ - EOM_TYPE_EDIT_WINDOW, \ - EomEditWindowClass)) - -typedef struct -{ - HildonStackableWindowClass parent_class; -} EomEditWindowClass; - -typedef struct -{ - HildonStackableWindow parent; - - GtkWidget *name_entry; - GtkWidget *have_label; - GtkWidget *total_entry; - GtkWidget *volsbox; - - Manga *manga; -} EomEditWindow; - -GType eom_edit_window_get_type(void); -GtkWidget *eom_edit_window_new(gint); - -G_END_DECLS - -#endif /* __EOM_EDIT_WINDOW_H__ */ diff --git a/src/eom-main-window.c b/src/eom-main-window.c index 1183972..67d0429 100644 --- a/src/eom-main-window.c +++ b/src/eom-main-window.c @@ -274,7 +274,7 @@ on_row_activated(GtkWidget *treeview, GtkTreePath *path, return; gtk_tree_model_get(model, &iter, COL_ID, &id, -1); - window = interface_show_edit_window(id); + window = interface_show_detail_window(id); g_signal_connect(window, "delete-event", G_CALLBACK(on_edit_closed), self); } diff --git a/src/interface.c b/src/interface.c index aa8b5b3..4483c07 100644 --- a/src/interface.c +++ b/src/interface.c @@ -1,7 +1,7 @@ #include #include "interface.h" #include "eom-main-window.h" -#include "eom-edit-window.h" +#include "eom-detail-window.h" #include "eom-new-item-dialog.h" #include "data.h" @@ -15,11 +15,11 @@ void interface_show_main_window(void) eom_main_window_load(EOM_MAIN_WINDOW(window)); } -GtkWidget *interface_show_edit_window(gint manga_id) +GtkWidget *interface_show_detail_window(gint manga_id) { GtkWidget *window; - window = eom_edit_window_new(manga_id); + window = eom_detail_window_new(manga_id); gtk_widget_show_all(window); return window; diff --git a/src/interface.h b/src/interface.h index a62e34a..a49519d 100644 --- a/src/interface.h +++ b/src/interface.h @@ -1,5 +1,5 @@ #include void interface_show_main_window(void); -GtkWidget *interface_show_edit_window(gint manga_id); +GtkWidget *interface_show_detail_window(gint manga_id); GtkWidget *interface_show_new_item_dialog(GtkWindow *window); -- cgit v1.2.3-54-g00ecf