aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog8
-rw-r--r--addressbook/gui/component/select-names/e-select-names.c23
-rw-r--r--addressbook/gui/component/select-names/e-select-names.h1
-rw-r--r--addressbook/gui/component/select-names/select-names.glade35
4 files changed, 61 insertions, 6 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 09cdfc33f6..970fb7be26 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,13 @@
2001-06-26 Christopher James Lahey <clahey@ximian.com>
+ * gui/component/select-names/e-select-names.c,
+ gui/component/select-names/e-select-names.h,
+ gui/component/select-names/select-names.glade
+ (e_select_names_create_categories): Added a categories combo here.
+ It's not used yet.
+
+2001-06-26 Christopher James Lahey <clahey@ximian.com>
+
* gui/search/addresstypes.xml: Added category searching to the
advanced search dialog here.
diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c
index 2a6be901b4..bd042fe53c 100644
--- a/addressbook/gui/component/select-names/e-select-names.c
+++ b/addressbook/gui/component/select-names/e-select-names.c
@@ -39,6 +39,8 @@
#include "e-select-names.h"
#include <addressbook/backend/ebook/e-card-simple.h>
#include "e-select-names-table-model.h"
+#include <gal/widgets/e-categories-master-list-combo.h>
+#include <e-util/e-categories-master-list-wombat.h>
static void e_select_names_init (ESelectNames *card);
static void e_select_names_class_init (ESelectNamesClass *klass);
@@ -383,6 +385,25 @@ e_select_names_hookup_shell_listener (ESelectNames *e_select_names)
CORBA_exception_free(&ev);
}
+GtkWidget *e_select_names_create_categories (gchar *name,
+ gchar *string1, gchar *string2,
+ gint int1, gint int2);
+
+GtkWidget *
+e_select_names_create_categories (gchar *name,
+ gchar *string1, gchar *string2,
+ gint int1, gint int2)
+{
+ ECategoriesMasterList *ecml;
+ GtkWidget *combo;
+
+ ecml = e_categories_master_list_wombat_new ();
+ combo = e_categories_master_list_combo_new (ecml);
+ gtk_object_unref (GTK_OBJECT (ecml));
+
+ return combo;
+}
+
static void
e_select_names_init (ESelectNames *e_select_names)
{
@@ -416,6 +437,8 @@ e_select_names_init (ESelectNames *e_select_names)
e_select_names->model = gtk_object_get_data(GTK_OBJECT(e_select_names->table), "model");
e_select_names->adapter = gtk_object_get_data(GTK_OBJECT(e_select_names->table), "adapter");
+ e_select_names->categories = glade_xml_get_widget (gui, "custom-categories");
+
e_select_names->currently_selected = -1;
e_select_names->folders = g_hash_table_new(g_str_hash, g_str_equal);
diff --git a/addressbook/gui/component/select-names/e-select-names.h b/addressbook/gui/component/select-names/e-select-names.h
index b3fc713623..14dcad325b 100644
--- a/addressbook/gui/component/select-names/e-select-names.h
+++ b/addressbook/gui/component/select-names/e-select-names.h
@@ -70,6 +70,7 @@ struct _ESelectNames
ETableScrolled *table;
ETableModel *adapter;
EAddressbookModel *model;
+ GtkWidget *categories;
int currently_selected;
EvolutionStorageListener *listener;
GHashTable *folders;
diff --git a/addressbook/gui/component/select-names/select-names.glade b/addressbook/gui/component/select-names/select-names.glade
index 4eb3599f85..4c793eaeef 100644
--- a/addressbook/gui/component/select-names/select-names.glade
+++ b/addressbook/gui/component/select-names/select-names.glade
@@ -78,7 +78,7 @@
<widget>
<class>GtkTable</class>
<name>table-top</name>
- <rows>4</rows>
+ <rows>5</rows>
<columns>2</columns>
<homogeneous>False</homogeneous>
<row_spacing>6</row_spacing>
@@ -118,7 +118,7 @@
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
- <text></text>
+ <text>=</text>
<child>
<padding>0</padding>
<expand>True</expand>
@@ -177,8 +177,8 @@
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
- <top_attach>3</top_attach>
- <bottom_attach>4</bottom_attach>
+ <top_attach>4</top_attach>
+ <bottom_attach>5</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>True</xexpand>
@@ -201,8 +201,8 @@
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
- <top_attach>3</top_attach>
- <bottom_attach>4</bottom_attach>
+ <top_attach>4</top_attach>
+ <bottom_attach>5</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>True</xexpand>
@@ -261,6 +261,29 @@
<yfill>False</yfill>
</child>
</widget>
+
+ <widget>
+ <class>Custom</class>
+ <name>custom-categories</name>
+ <creation_function>e_select_names_create_categories</creation_function>
+ <int1>0</int1>
+ <int2>0</int2>
+ <last_modification_time>Wed, 27 Jun 2001 01:47:01 GMT</last_modification_time>
+ <child>
+ <left_attach>0</left_attach>
+ <right_attach>1</right_attach>
+ <top_attach>3</top_attach>
+ <bottom_attach>4</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>False</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>True</yfill>
+ </child>
+ </widget>
</widget>
</widget>
</widget>