*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
#include "expldifdlg.h"
#include "browseldap.h"
+typedef enum
+{
+ COL_SOURCES = 0,
+ N_INDEX_COLS = 1
+} AddressIndexColumns;
+
typedef enum
{
COL_NAME = 0,
COL_ADDRESS = 1,
- COL_REMARKS = 2
-} AddressBookColumnPos;
+ COL_REMARKS = 2,
+ N_LIST_COLS = 3
+} AddressListColumns;
-#define N_COLS 3
#define COL_NAME_WIDTH 164
#define COL_ADDRESS_WIDTH 156
static void addressbook_person_collapse_node (GtkCTree *ctree,
GList *node,
gpointer *data );
-static void addressbook_entry_gotfocus (GtkWidget *widget);
#if 0
static void addressbook_entry_changed (GtkWidget *widget);
static gboolean addressbook_tree_button_released(GtkWidget *ctree,
GdkEventButton *event,
gpointer data);
-static void addressbook_popup_close (GtkMenuShell *menu_shell,
- gpointer data);
static void addressbook_new_folder_cb (gpointer data,
guint action,
GtkCTreeNode *node);
static GtkCTreeNode *addressbook_find_group_node (GtkCTreeNode *parent,
ItemGroup *group);
-static gboolean key_pressed (GtkWidget *widget,
+static gboolean addressbook_entry_key_pressed (GtkWidget *widget,
GdkEventKey *event,
gpointer data);
static gint addressbook_treenode_compare_func (GtkCList *clist,
static void addressbook_folder_remove_node (GtkCTree *clist,
GtkCTreeNode *node);
-#ifdef USE_LDAP
-static void addressbook_ldap_show_message ( LdapServer *server );
-#endif
-
/* LUT's and IF stuff */
static void addressbook_free_treenode ( gpointer data );
AddressTypeControlItem *addrbookctl_lookup (gint ot);
guint info,
guint time,
void *pdata);
+static void addressbook_list_menu_setup( void );
static GtkTargetEntry addressbook_drag_types[] =
{
{N_("/_Book/New _Server"), "<control><shift>S", addressbook_new_ldap_cb, 0, NULL},
#endif
{N_("/_Book/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Book/_Edit book name"), NULL, addressbook_treenode_edit_cb, 0, NULL},
+ {N_("/_Book/_Edit book"), NULL, addressbook_treenode_edit_cb, 0, NULL},
{N_("/_Book/_Delete book"), NULL, addressbook_treenode_delete_cb, 0, NULL},
{N_("/_Book/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Book/_Save"), "<control>S", addressbook_file_save_cb, 0, NULL},
{N_("/_Address/New _Group"), "<control>G", addressbook_new_group_cb, 0, NULL},
{N_("/_Address/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Address/_Mail To"), NULL, addressbook_mail_to_cb, 0, NULL},
- {N_("/_Tools/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Tools"), NULL, NULL, 0, "<Branch>"},
{N_("/_Tools/Import _LDIF file..."), NULL, addressbook_import_ldif_cb, 0, NULL},
{N_("/_Tools/Import M_utt file..."), NULL, addressbook_import_mutt_cb, 0, NULL},
{N_("/_Tools/Import _Pine file..."), NULL, addressbook_import_pine_cb, 0, NULL},
{N_("/_Tools/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Tools/Export _HTML..."), NULL, addressbook_export_html_cb, 0, NULL},
{N_("/_Tools/Export LDI_F..."), NULL, addressbook_export_ldif_cb, 0, NULL},
- {N_("/_Help"), NULL, NULL, 0, "<LastBranch>"},
+ {N_("/_Help"), NULL, NULL, 0, "<Branch>"},
{N_("/_Help/_About"), NULL, about_show, 0, NULL}
};
addressbook_export_to_file();
}
+static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
+{
+ if (event && event->keyval == GDK_Escape)
+ addressbook_close();
+ else if (event && event->keyval == GDK_Delete)
+ addressbook_del_clicked(NULL, NULL);
+ return FALSE;
+}
+
+/*!
+ *\brief Save Gtk object size to prefs dataset
+ */
+static void addressbook_size_allocate_cb(GtkWidget *widget,
+ GtkAllocation *allocation)
+{
+ g_return_if_fail(allocation != NULL);
+
+ prefs_common.addressbookwin_width = allocation->width;
+ prefs_common.addressbookwin_height = allocation->height;
+}
+
/*
* Create the address book widgets. The address book contains two CTree widgets: the
* address index tree on the left and the address list on the right.
gint n_entries;
GList *nodeIf;
- gchar *titles[N_COLS];
- gchar *dummy_titles[1];
+ gchar *index_titles[N_INDEX_COLS];
+ gchar *list_titles[N_LIST_COLS];
gchar *text;
gint i;
+ static GdkGeometry geometry;
+
debug_print("Creating addressbook window...\n");
- titles[COL_NAME] = _("Name");
- titles[COL_ADDRESS] = _("E-Mail address");
- titles[COL_REMARKS] = _("Remarks");
- dummy_titles[0] = "";
+ index_titles[COL_SOURCES] = _("Sources");
+ list_titles[COL_NAME] = _("Name");
+ list_titles[COL_ADDRESS] = _("E-Mail address");
+ list_titles[COL_REMARKS] = _("Remarks");
+ /* Address book window */
window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(window), _("Address book"));
- gtk_widget_set_size_request(window, ADDRESSBOOK_WIDTH, ADDRESSBOOK_HEIGHT);
gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
gtk_widget_realize(window);
g_signal_connect(G_OBJECT(window), "delete_event",
G_CALLBACK(addressbook_close), NULL);
+ g_signal_connect(G_OBJECT(window), "size_allocate",
+ G_CALLBACK(addressbook_size_allocate_cb), NULL);
g_signal_connect(G_OBJECT(window), "key_press_event",
G_CALLBACK(key_pressed), NULL);
MANAGE_WINDOW_SIGNALS_CONNECT(window);
- vbox = gtk_vbox_new(FALSE, 4);
+ vbox = gtk_vbox_new(FALSE, 0);
gtk_container_add(GTK_CONTAINER(window), vbox);
+ /* Menu bar */
n_entries = sizeof(addressbook_entries) /
sizeof(addressbook_entries[0]);
menubar = menubar_create(window, addressbook_entries, n_entries,
gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
menu_factory = gtk_item_factory_from_widget(menubar);
- vbox2 = gtk_vbox_new(FALSE, 4);
- gtk_container_set_border_width(GTK_CONTAINER(vbox), 4);
+ vbox2 = gtk_vbox_new(FALSE, BORDER_WIDTH);
+ gtk_container_set_border_width(GTK_CONTAINER(vbox2), BORDER_WIDTH);
gtk_box_pack_start(GTK_BOX(vbox), vbox2, TRUE, TRUE, 0);
ctree_swin = gtk_scrolled_window_new(NULL, NULL);
gtk_widget_set_size_request(ctree_swin, COL_FOLDER_WIDTH + 40, -1);
/* Address index */
- ctree = gtk_sctree_new_with_titles(1, 0, dummy_titles);
+ ctree = gtk_sctree_new_with_titles(N_INDEX_COLS, 0, index_titles);
gtk_container_add(GTK_CONTAINER(ctree_swin), ctree);
gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_BROWSE);
gtk_clist_set_column_width(GTK_CLIST(ctree), 0, COL_FOLDER_WIDTH);
gtk_box_pack_start(GTK_BOX(clist_vbox), clist_swin, TRUE, TRUE, 0);
/* Address list */
- clist = gtk_sctree_new_with_titles(N_COLS, 0, titles);
+ clist = gtk_sctree_new_with_titles(N_LIST_COLS, 0, list_titles);
gtk_container_add(GTK_CONTAINER(clist_swin), clist);
gtk_clist_set_selection_mode(GTK_CLIST(clist), GTK_SELECTION_EXTENDED);
gtk_ctree_set_line_style(GTK_CTREE(clist), GTK_CTREE_LINES_NONE);
gtk_clist_set_compare_func(GTK_CLIST(clist),
addressbook_list_compare_func);
- for (i = 0; i < N_COLS; i++)
+ for (i = 0; i < N_LIST_COLS; i++)
GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(clist)->column[i].button,
GTK_CAN_FOCUS);
gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
address_completion_register_entry(GTK_ENTRY(entry));
- g_signal_connect(G_OBJECT(entry), "focus_in_event",
- G_CALLBACK(addressbook_entry_gotfocus), NULL);
+ g_signal_connect(G_OBJECT(entry), "key_press_event",
+ G_CALLBACK(addressbook_entry_key_pressed),
+ NULL);
#if 0
g_signal_connect(G_OBJECT(entry), "changed",
G_CALLBACK(addressbook_entry_changed), NULL);
hbbox = gtk_hbutton_box_new();
gtk_button_box_set_layout(GTK_BUTTON_BOX(hbbox), GTK_BUTTONBOX_END);
gtk_button_box_set_spacing(GTK_BUTTON_BOX(hbbox), 2);
+ gtk_container_set_border_width(GTK_CONTAINER(hbbox), 4);
gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
#if GTK_CHECK_VERSION(2, 6, 0)
n_entries,
"<AddressBookTree>", &tree_factory,
NULL);
- g_signal_connect(G_OBJECT(tree_popup), "selection_done",
- G_CALLBACK(addressbook_popup_close), NULL);
n_entries = sizeof(addressbook_list_popup_entries) /
sizeof(addressbook_list_popup_entries[0]);
list_popup = menu_create_items(addressbook_list_popup_entries,
addrbook.listSelected = NULL;
address_completion_start(window);
+
+ if (!geometry.min_height) {
+ geometry.min_width = ADDRESSBOOK_WIDTH;
+ geometry.min_height = ADDRESSBOOK_HEIGHT;
+ }
+
+ gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
+ GDK_HINT_MIN_SIZE);
+ gtk_widget_set_size_request(window, prefs_common.addressbookwin_width,
+ prefs_common.addressbookwin_height);
+
gtk_widget_show_all(window);
}
/* Test whether anything selected for deletion */
nodeList = addrbook.listSelected;
+
aio = gtk_ctree_node_get_row_data( clist, nodeList );
if( aio == NULL) return;
ds = addressbook_find_datasource( addrbook.treeSelected );
if( pobj->type == ADDR_DATASOURCE || pobj->type == ADDR_ITEM_FOLDER ) {
/* Items inside folders */
list = addrselect_get_list( _addressSelect_ );
+
node = list;
while( node ) {
item = node->data;
gtk_sctree_select( GTK_SCTREE(ctree), addrbook.opened);
addrbook_set_dirty(abf, TRUE);
addressbook_export_to_file();
+ addressbook_list_menu_setup();
return;
}
else if( pobj->type == ADDR_ITEM_GROUP ) {
gtk_sctree_select( GTK_SCTREE(ctree), addrbook.opened);
addrbook_set_dirty(abf, TRUE);
addressbook_export_to_file();
+ addressbook_list_menu_setup();
return;
}
}
else if( aio->type == ADDR_ITEM_GROUP ) {
ItemGroup *group = ( ItemGroup * ) aio;
+ AddressDataSource *ds = NULL;
+ AddressBookFile *abf = NULL;
GList *nodeMail = group->listEMail;
+ if (nodeMail == NULL) {
+ if(addrbook.treeSelected ) {
+ ds = addressbook_find_datasource( addrbook.treeSelected );
+ abf = ds->rawDataSource;
+ if( abf != NULL )
+ nodeMail = addrbook_get_available_email_list( abf, group );
+ }
+ }
while( nodeMail ) {
ItemEMail *email = nodeMail->data;
}
static void addressbook_menubar_set_sensitive( gboolean sensitive ) {
- menu_set_sensitive( addrbook.menu_factory, "/Book/Edit book name", sensitive );
+ menu_set_sensitive( addrbook.menu_factory, "/Book/Edit book", sensitive );
menu_set_sensitive( addrbook.menu_factory, "/Book/Delete book", sensitive );
menu_set_sensitive( addrbook.menu_factory, "/Book/New Folder", sensitive );
menu_set_sensitive( addrbook.menu_factory, "/Address/Cut", sensitive );
menu_set_sensitive( addrbook.menu_factory, "/Address/Copy", sensitive );
menu_set_sensitive( addrbook.menu_factory, "/Address/Paste", sensitive );
-/* menu_set_sensitive( addrbook.menu_factory, "/Edit/Paste Address", sensitive ); */
menu_set_sensitive( addrbook.menu_factory, "/Address/New Address", sensitive );
menu_set_sensitive( addrbook.menu_factory, "/Address/New Group", sensitive );
static void addressbook_menuitem_set_sensitive( AddressObject *obj, GtkCTreeNode *node ) {
gboolean canEdit = FALSE;
+ gboolean canDelete = TRUE;
gboolean canAdd = FALSE;
gboolean canEditTr = TRUE;
gboolean editAddress = FALSE;
ds = ads->dataSource;
iface = ds->interface;
if( ! iface->readOnly ) {
- canAdd = canEdit = editAddress = TRUE;
+ canAdd = canEdit = editAddress = canDelete = TRUE;
}
if( ! iface->haveLibrary ) {
- canAdd = canEdit = editAddress = canExport = FALSE;
+ canAdd = canEdit = editAddress = canExport = canDelete = FALSE;
}
}
else if( obj->type == ADDR_ITEM_FOLDER ) {
iface = ds->interface;
if( iface->readOnly ) {
canEditTr = FALSE;
+ canDelete = FALSE;
}
else {
canAdd = editAddress = TRUE;
/* Enable edit */
menu_set_sensitive( addrbook.menu_factory, "/Address/Edit", canEdit );
- menu_set_sensitive( addrbook.menu_factory, "/Address/Delete", canEdit );
+ menu_set_sensitive( addrbook.menu_factory, "/Address/Delete", canDelete );
gtk_widget_set_sensitive( addrbook.edit_btn, canEdit );
- gtk_widget_set_sensitive( addrbook.del_btn, canEdit );
+ gtk_widget_set_sensitive( addrbook.del_btn, canDelete );
- menu_set_sensitive( addrbook.menu_factory, "/Book/Edit book name", canEditTr );
+ menu_set_sensitive( addrbook.menu_factory, "/Book/Edit book", canEditTr );
menu_set_sensitive( addrbook.menu_factory, "/Book/Delete book", canEditTr );
/* Export data */
addressbook_menuitem_set_sensitive( obj, node );
addressbook_list_select_clear();
-
+ addressbook_list_menu_setup();
return FALSE;
}
if( ! addrselect_test_empty( _addressSelect_ ) ) canCut = TRUE;
if( obj ) canEdit = TRUE;
}
+ canDelete = canEdit;
}
else if( pobj->type != ADDR_INTERFACE ) {
/* Parent object is not an interface */
}
if( ! addrclip_is_empty( _clipBoard_ ) ) canPaste = TRUE;
if( ! addrselect_test_empty( _addressSelect_ ) ) canCut = TRUE;
+ canDelete = canEdit;
}
if( iface->type == ADDR_IF_LDAP ) {
if( obj ) canBrowse = TRUE;
+ canEdit = TRUE;
+ canDelete = FALSE;
}
}
if( ! addrselect_test_empty( _addressSelect_ ) ) canCopy = TRUE;
- canDelete = canEdit;
-
/* Disable edit or browse if more than one row selected */
if( GTK_CLIST(clist)->selection && GTK_CLIST(clist)->selection->next ) {
canEdit = FALSE;
}
}
-static void addressbook_entry_gotfocus( GtkWidget *widget ) {
- gtk_editable_select_region( GTK_EDITABLE(addrbook.entry), 0, -1 );
-}
-
/* from gdkevents.c */
#define DOUBLE_CLICK_TIME 250
if( gtk_clist_get_selection_info( clist, event->x, event->y, &row, &column ) ) {
gtk_clist_select_row( clist, row, column );
+
gtkut_clist_set_focus_row(clist, row);
obj = gtk_clist_get_row_data( clist, row );
}
if( ! iface->readOnly ) {
canEdit = TRUE;
canDelete = TRUE;
- menu_set_sensitive( addrbook.tree_factory, "/New Address", TRUE );
+ menu_set_sensitive( addrbook.list_factory, "/New Address", TRUE );
gtk_widget_set_sensitive( addrbook.reg_btn, TRUE );
}
}
menu_set_sensitive( addrbook.tree_factory, "/Copy", canTreeCopy );
menu_set_sensitive( addrbook.tree_factory, "/Paste", canTreePaste );
- menu_set_sensitive( addrbook.menu_factory, "/Book/Edit book name", canEdit );
+ menu_set_sensitive( addrbook.menu_factory, "/Book/Edit book", canEdit );
menu_set_sensitive( addrbook.menu_factory, "/Book/Delete book", canEdit );
menu_set_sensitive( addrbook.menu_factory, "/Address/Cut", canCut );
menu_set_sensitive( addrbook.menu_factory, "/Address/Copy", canCopy );
gpointer data)
{
gtk_sctree_select( GTK_SCTREE(addrbook.ctree), addrbook.opened);
+
gtkut_ctree_set_focus_row(GTK_CTREE(addrbook.ctree), addrbook.opened);
return FALSE;
}
-static void addressbook_popup_close(GtkMenuShell *menu_shell, gpointer data)
-{
- if (!addrbook.opened) return;
-
- gtk_sctree_select( GTK_SCTREE(addrbook.ctree), addrbook.opened);
- gtkut_ctree_set_focus_row(GTK_CTREE(addrbook.ctree),
- addrbook.opened);
-}
-
static void addressbook_new_folder_cb(gpointer data, guint action,
GtkWidget *widget)
{
if( ds == NULL ) return;
abf = addressbook_get_book_file();
- if( abf == NULL ) return;
+
if( obj->type == ADDR_ITEM_EMAIL ) {
ItemEMail *email = ( ItemEMail * ) obj;
if( email == NULL ) return;
/* Edit parent group */
AdapterGroup *adapter = ADAPTER_GROUP(pobj);
ItemGroup *itemGrp = adapter->itemGroup;
+ if( abf == NULL ) return;
if( addressbook_edit_group( abf, NULL, itemGrp ) == NULL ) return;
name = ADDRITEM_NAME(itemGrp);
node = addrbook.treeSelected;
AddressTypeControlItem *atci = addrbookctl_lookup( ADDR_ITEM_EMAIL );
for( ; items != NULL; items = g_list_next( items ) ) {
GtkCTreeNode *nodeEMail = NULL;
- gchar *text[N_COLS];
+ gchar *text[N_LIST_COLS];
ItemEMail *email = items->data;
ItemPerson *person;
gchar *str = NULL;
{
GtkCTreeNode *nodePerson = NULL;
GtkCTreeNode *nodeEMail = NULL;
- gchar *text[N_COLS];
+ gchar *text[N_LIST_COLS];
gboolean flgFirst = TRUE, haveAddr = FALSE;
GList *node;
items = addritem_folder_get_group_list( itemFolder );
for( ; items != NULL; items = g_list_next( items ) ) {
GtkCTreeNode *nodeGroup = NULL;
- gchar *text[N_COLS];
+ gchar *text[N_LIST_COLS];
ItemGroup *group = items->data;
if( group == NULL ) continue;
text[COL_NAME] = ADDRITEM_NAME(group);
}
}
-static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
+static gboolean addressbook_entry_key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
- if (event && event->keyval == GDK_Escape)
- addressbook_close();
- else if (event && event->keyval == GDK_Delete)
- addressbook_del_clicked(NULL, NULL);
+ if (event && event->keyval == GDK_Return)
+ addressbook_lup_clicked(NULL, NULL);
return FALSE;
}
parentNode = node;
}
addressbook_perform_search( ds, searchTerm, parentNode );
+
gtk_widget_grab_focus( addrbook.entry );
g_free( searchTerm );
projects / claws.git / blobdiff