From 8078ec7c1f53897551f66503a602b15983ea47cb Mon Sep 17 00:00:00 2001 From: Miguel de Icaza Date: Thu, 30 Mar 2000 22:50:40 +0000 Subject: Add so I can go to the chillout hack room svn path=/trunk/; revision=2264 --- widgets/e-table/ChangeLog | 5 + widgets/e-table/Makefile.am | 19 +- widgets/e-table/e-table-config.c | 41 +++++ widgets/e-table/e-table-config.glade | 321 ++++++++++++++++++++++++--------- widgets/e-table/e-table-config.glade.h | 1 - widgets/e-table/e-table-config.h | 7 + widgets/e-table/e-table.h | 15 +- widgets/table/e-table-config.c | 41 +++++ widgets/table/e-table-config.glade | 321 ++++++++++++++++++++++++--------- widgets/table/e-table-config.glade.h | 1 - widgets/table/e-table-config.h | 7 + widgets/table/e-table.h | 15 +- 12 files changed, 616 insertions(+), 178 deletions(-) create mode 100644 widgets/e-table/e-table-config.c create mode 100644 widgets/e-table/e-table-config.h create mode 100644 widgets/table/e-table-config.c create mode 100644 widgets/table/e-table-config.h diff --git a/widgets/e-table/ChangeLog b/widgets/e-table/ChangeLog index b96f8c07df..4d9b7308b1 100644 --- a/widgets/e-table/ChangeLog +++ b/widgets/e-table/ChangeLog @@ -1,3 +1,8 @@ +2000-03-30 Miguel de Icaza + + * Makefile.am (EXTRA_DIST): Added Glade files to the + distribution. + 2000-03-28 Matt Loper * e-table-text-model.c (e_table_text_model_destroy): made diff --git a/widgets/e-table/Makefile.am b/widgets/e-table/Makefile.am index 8780789977..74facae1e1 100644 --- a/widgets/e-table/Makefile.am +++ b/widgets/e-table/Makefile.am @@ -1,3 +1,13 @@ + +gladedir = $(datadir)/evolution/glade +glade_DATA = \ + e-table-config.glade \ + e-table-group.glade + +glade_headers = \ + e-table-config.glade.h \ + e-table-group.glade.h + INCLUDES = \ $(EXTRA_GNOME_CFLAGS) \ $(GNOME_INCLUDEDIR) \ @@ -89,9 +99,14 @@ table_example_2_LDADD = \ table_example_2_LDFLAGS = `gnome-config --libs gdk_pixbuf` -EXTRA_DIST = \ - sample.table \ +icons = \ add-col.xpm \ check-empty.xpm \ check-filled.xpm \ remove-col.xpm + +EXTRA_DIST = \ + sample.table \ + $(icons) \ + $(glade_DATA) \ + $(glade_headers) \ No newline at end of file diff --git a/widgets/e-table/e-table-config.c b/widgets/e-table/e-table-config.c new file mode 100644 index 0000000000..da7dde1990 --- /dev/null +++ b/widgets/e-table/e-table-config.c @@ -0,0 +1,41 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ +/* + * E-table.c: A graphical view of a Table. + * + * Author: + * Miguel de Icaza (miguel@gnu.org) + * + * Copyright 1999, Helix Code, Inc + */ +#include +#include +#inclued +#include "e-util/e-util.h" +#include "e-util/e-xml-utils.h" +#include "e-util/e-canvas.h" +#include "e-table.h" +#include "e-table-header-item.h" +#include "e-table-subset.h" +#include "e-table-item.h" +#include "e-table-group.h" + +GtkWidget * +e_table_gui_config (ETable *etable) +{ + GladeXML *gui; + GnomeDialog *dialog; + + gui = glade_xml_new (ETABLE_GLADEDIR "/e-table-config.glade"); + if (!gui) + return NULL; + + dialog = GNOME_DIALOG (glade_xml_get_widget (gui, "e-table-config")); +} + + +void +e_table_do_gui_config (ETable *etable) +{ +} + + diff --git a/widgets/e-table/e-table-config.glade b/widgets/e-table/e-table-config.glade index 2605faefb7..176a8c3ab7 100644 --- a/widgets/e-table/e-table-config.glade +++ b/widgets/e-table/e-table-config.glade @@ -26,115 +26,274 @@ - GtkWindow + GnomeDialog e-table-config - window1 + False GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False False - True + False False + False + False - GtkFrame - top-frame - - 0 - GTK_SHADOW_ETCHED_IN + GtkVBox + GnomeDialog:vbox + dialog-vbox2 + False + 0 + + 0 + True + True + - GtkTable - table1 + GtkFrame + top-frame 2 - 4 - 2 - False - 2 - 0 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + True + True + - GtkButton - button3 - True - - - 0 - 1 - 0 - 1 + GtkTable + table1 + 2 + 4 + 2 + False + 2 + 4 + + + GtkButton + button3 + True + + + 0 + 1 + 0 + 1 + 0 + 0 + False + False + False + False + True + True + + + + + GtkButton + button4 + True + + + 0 + 1 + 1 + 2 + 0 + 0 + False + False + False + False + True + True + + + + + GtkButton + button5 + True + + + 0 + 1 + 2 + 3 + 0 + 0 + False + False + False + False + True + True + + + + + GtkButton + button6 + True + + + 0 + 1 + 3 + 4 + 0 + 0 + False + False + False + False + True + True + + + + + GtkLabel + label1 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 0 0 - False - False - False - False - True - True - - + + 1 + 2 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + - - GtkButton - button4 - True - - - 0 - 1 - 1 - 2 + + GtkLabel + label2 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 1 + 2 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label3 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 1 + 2 + 2 + 3 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label4 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 0 0 - False - False - False - False - True - True - + + 1 + 2 + 3 + 4 + 0 + 0 + False + False + False + False + True + False + + + + + + GtkHButtonBox + GnomeDialog:action_area + dialog-action_area2 + GTK_BUTTONBOX_END + 0 + 85 + 27 + 7 + 0 + + 0 + False + True + GTK_PACK_END + GtkButton - button5 + button12 + True True - - - 0 - 1 - 2 - 3 - 0 - 0 - False - False - False - False - True - True - + GNOME_STOCK_BUTTON_OK GtkButton - button6 + button14 + True True - - - 0 - 1 - 3 - 4 - 0 - 0 - False - False - False - False - True - True - + GNOME_STOCK_BUTTON_CANCEL diff --git a/widgets/e-table/e-table-config.glade.h b/widgets/e-table/e-table-config.glade.h index 72bac8e22a..4dc2ec8d31 100644 --- a/widgets/e-table/e-table-config.glade.h +++ b/widgets/e-table/e-table-config.glade.h @@ -4,7 +4,6 @@ * DO NOT compile it as part of your application. */ -gchar *s = N_("window1"); gchar *s = N_("Fields"); gchar *s = N_("Grouping"); gchar *s = N_("Sort"); diff --git a/widgets/e-table/e-table-config.h b/widgets/e-table/e-table-config.h new file mode 100644 index 0000000000..9bd16071a2 --- /dev/null +++ b/widgets/e-table/e-table-config.h @@ -0,0 +1,7 @@ +#ifndef _E_TABLE_CONFIG_H +#define _E_TABLE_CONFIG_H + +GtkWidget *e_table_gui_config (ETable *etable); +void e_table_do_gui_config (ETable *etable); + +#endif /* _E_TABLE_CONFIG_H */ diff --git a/widgets/e-table/e-table.h b/widgets/e-table/e-table.h index ecdeec1e83..3cca3422b3 100644 --- a/widgets/e-table/e-table.h +++ b/widgets/e-table/e-table.h @@ -63,13 +63,16 @@ void e_table_construct (ETable *e_table, ETableHeader *full_header, ETable const char *spec); GtkWidget *e_table_new (ETableHeader *full_header, ETableModel *etm, const char *spec); -void e_table_construct_from_spec_file (ETable *e_table, ETableHeader *full_header, ETableModel *etm, - const char *filename); -GtkWidget *e_table_new_from_spec_file (ETableHeader *full_header, ETableModel *etm, - const char *filename); -gchar *e_table_get_specification (ETable *e_table); -void e_table_save_specification (ETable *e_table, gchar *filename); +void e_table_construct_from_spec_file (ETable *e_table, + ETableHeader *full_header, + ETableModel *etm, + const char *filename); +GtkWidget *e_table_new_from_spec_file (ETableHeader *full_header, + ETableModel *etm, + const char *filename); +gchar *e_table_get_specification (ETable *e_table); +void e_table_save_specification (ETable *e_table, gchar *filename); END_GNOME_DECLS diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c new file mode 100644 index 0000000000..da7dde1990 --- /dev/null +++ b/widgets/table/e-table-config.c @@ -0,0 +1,41 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ +/* + * E-table.c: A graphical view of a Table. + * + * Author: + * Miguel de Icaza (miguel@gnu.org) + * + * Copyright 1999, Helix Code, Inc + */ +#include +#include +#inclued +#include "e-util/e-util.h" +#include "e-util/e-xml-utils.h" +#include "e-util/e-canvas.h" +#include "e-table.h" +#include "e-table-header-item.h" +#include "e-table-subset.h" +#include "e-table-item.h" +#include "e-table-group.h" + +GtkWidget * +e_table_gui_config (ETable *etable) +{ + GladeXML *gui; + GnomeDialog *dialog; + + gui = glade_xml_new (ETABLE_GLADEDIR "/e-table-config.glade"); + if (!gui) + return NULL; + + dialog = GNOME_DIALOG (glade_xml_get_widget (gui, "e-table-config")); +} + + +void +e_table_do_gui_config (ETable *etable) +{ +} + + diff --git a/widgets/table/e-table-config.glade b/widgets/table/e-table-config.glade index 2605faefb7..176a8c3ab7 100644 --- a/widgets/table/e-table-config.glade +++ b/widgets/table/e-table-config.glade @@ -26,115 +26,274 @@ - GtkWindow + GnomeDialog e-table-config - window1 + False GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False False - True + False False + False + False - GtkFrame - top-frame - - 0 - GTK_SHADOW_ETCHED_IN + GtkVBox + GnomeDialog:vbox + dialog-vbox2 + False + 0 + + 0 + True + True + - GtkTable - table1 + GtkFrame + top-frame 2 - 4 - 2 - False - 2 - 0 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + True + True + - GtkButton - button3 - True - - - 0 - 1 - 0 - 1 + GtkTable + table1 + 2 + 4 + 2 + False + 2 + 4 + + + GtkButton + button3 + True + + + 0 + 1 + 0 + 1 + 0 + 0 + False + False + False + False + True + True + + + + + GtkButton + button4 + True + + + 0 + 1 + 1 + 2 + 0 + 0 + False + False + False + False + True + True + + + + + GtkButton + button5 + True + + + 0 + 1 + 2 + 3 + 0 + 0 + False + False + False + False + True + True + + + + + GtkButton + button6 + True + + + 0 + 1 + 3 + 4 + 0 + 0 + False + False + False + False + True + True + + + + + GtkLabel + label1 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 0 0 - False - False - False - False - True - True - - + + 1 + 2 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + - - GtkButton - button4 - True - - - 0 - 1 - 1 - 2 + + GtkLabel + label2 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 1 + 2 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label3 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 1 + 2 + 2 + 3 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label4 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 0 0 - False - False - False - False - True - True - + + 1 + 2 + 3 + 4 + 0 + 0 + False + False + False + False + True + False + + + + + + GtkHButtonBox + GnomeDialog:action_area + dialog-action_area2 + GTK_BUTTONBOX_END + 0 + 85 + 27 + 7 + 0 + + 0 + False + True + GTK_PACK_END + GtkButton - button5 + button12 + True True - - - 0 - 1 - 2 - 3 - 0 - 0 - False - False - False - False - True - True - + GNOME_STOCK_BUTTON_OK GtkButton - button6 + button14 + True True - - - 0 - 1 - 3 - 4 - 0 - 0 - False - False - False - False - True - True - + GNOME_STOCK_BUTTON_CANCEL diff --git a/widgets/table/e-table-config.glade.h b/widgets/table/e-table-config.glade.h index 72bac8e22a..4dc2ec8d31 100644 --- a/widgets/table/e-table-config.glade.h +++ b/widgets/table/e-table-config.glade.h @@ -4,7 +4,6 @@ * DO NOT compile it as part of your application. */ -gchar *s = N_("window1"); gchar *s = N_("Fields"); gchar *s = N_("Grouping"); gchar *s = N_("Sort"); diff --git a/widgets/table/e-table-config.h b/widgets/table/e-table-config.h new file mode 100644 index 0000000000..9bd16071a2 --- /dev/null +++ b/widgets/table/e-table-config.h @@ -0,0 +1,7 @@ +#ifndef _E_TABLE_CONFIG_H +#define _E_TABLE_CONFIG_H + +GtkWidget *e_table_gui_config (ETable *etable); +void e_table_do_gui_config (ETable *etable); + +#endif /* _E_TABLE_CONFIG_H */ diff --git a/widgets/table/e-table.h b/widgets/table/e-table.h index ecdeec1e83..3cca3422b3 100644 --- a/widgets/table/e-table.h +++ b/widgets/table/e-table.h @@ -63,13 +63,16 @@ void e_table_construct (ETable *e_table, ETableHeader *full_header, ETable const char *spec); GtkWidget *e_table_new (ETableHeader *full_header, ETableModel *etm, const char *spec); -void e_table_construct_from_spec_file (ETable *e_table, ETableHeader *full_header, ETableModel *etm, - const char *filename); -GtkWidget *e_table_new_from_spec_file (ETableHeader *full_header, ETableModel *etm, - const char *filename); -gchar *e_table_get_specification (ETable *e_table); -void e_table_save_specification (ETable *e_table, gchar *filename); +void e_table_construct_from_spec_file (ETable *e_table, + ETableHeader *full_header, + ETableModel *etm, + const char *filename); +GtkWidget *e_table_new_from_spec_file (ETableHeader *full_header, + ETableModel *etm, + const char *filename); +gchar *e_table_get_specification (ETable *e_table); +void e_table_save_specification (ETable *e_table, gchar *filename); END_GNOME_DECLS -- cgit v1.2.3