/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002 Match Grun
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 2002-2018 Match Grun and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/*
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
#include "defs.h"
#include <glib.h>
#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkfilesel.h>
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
#include "main.h"
#include "inc.h"
#include "manage_window.h"
#include "folder.h"
#include "utils.h"
+#include "prefs_common.h"
+#include "prefs_gtk.h"
#include "addrharvest.h"
-#include "addrindex.h"
-#include "addrbook.h"
-
-#define PAGE_WARNING 0
-#define PAGE_FIELDS 1
-#define PAGE_FINISH 2
+#ifndef USE_ALT_ADDRBOOK
+ #include "addrindex.h"
+ #include "addrbook.h"
+#else
+ #include "addressbook-dbus.h"
+#endif
+#define PAGE_FIELDS 0
+#define PAGE_FINISH 1
#define NUM_FIELDS 6
GtkWidget *labelFolder;
GtkWidget *entryBook;
GtkWidget *checkHeader[ NUM_FIELDS ];
+#ifndef USE_ALT_ADDRBOOK
GtkWidget *spinbtnFolder;
+#endif
GtkWidget *checkRecurse;
GtkWidget *btnOk;
GtkWidget *btnCancel;
GtkWidget *statusbar;
gint status_cid;
gboolean cancelled;
+ gboolean done;
gchar *folderPath;
- GtkWidget *clistCount;
+ GtkWidget *viewCount;
} addrgather_dlg;
+#ifndef USE_ALT_ADDRBOOK
static AddressIndex *_harv_addressIndex_;
static AddressBookFile *_harv_addressBook_;
+#endif
static gchar *_harv_headerNames_[] = {
HEADER_FROM,
HEADER_REPLY_TO,
};
static GList *_harv_messageList_;
-void addrgather_dlg_status_show( gchar *msg ) {
+enum {
+ ADDRGATHER_COL_HEADER,
+ ADDRGATHER_COL_COUNT,
+ N_ADDRGATHER_COLS
+};
+
+static void addrgather_dlg_status_show( gchar *msg ) {
if( addrgather_dlg.statusbar != NULL ) {
gtk_statusbar_pop( GTK_STATUSBAR(addrgather_dlg.statusbar),
addrgather_dlg.status_cid );
static gboolean addrgather_dlg_key_pressed(
GtkWidget *widget, GdkEventKey *event, gpointer data )
{
- if( event && event->keyval == GDK_Escape ) {
+ if( event && event->keyval == GDK_KEY_Escape ) {
addrgather_dlg.cancelled = TRUE;
gtk_main_quit();
}
return FALSE;
}
+static void addrgather_size_allocate(
+ GtkWidget *widget, GtkAllocation *allocation )
+{
+ cm_return_if_fail( allocation != NULL );
+
+ prefs_common.addrgather_width = allocation->width;
+ prefs_common.addrgather_height = allocation->height;
+}
+
#define FMT_BUFSIZE 32
static gboolean addrgather_dlg_harvest() {
- GtkCList *clist;
- gchar *text[ FIELDS_N_COLS ];
+ GtkWidget *view;
+ GtkTreeModel *model;
+ GtkTreeIter iter;
AddressHarvester *harvester;
- AddressBookFile *abf;
gchar *name;
+#ifndef USE_ALT_ADDRBOOK
+ AddressBookFile *abf;
gchar *newFile;
+#else
+ GList* list;
+ ContactData* contact;
+ GError* error = NULL;
+#endif
gchar str[ FMT_BUFSIZE ];
gint cnt;
gint i;
+#ifndef USE_ALT_ADDRBOOK
gint sz;
name = gtk_editable_get_chars( GTK_EDITABLE(addrgather_dlg.entryBook), 0, -1 );
_( "Please specify name for address book." ) );
g_free( name );
return FALSE;
+#else
+ name = gtk_editable_get_chars( GTK_EDITABLE(addrgather_dlg.entryBook), 0, -1 );
+ if( name == NULL || strlen( name ) < 1 ) {
+ addrgather_dlg_status_show(
+ _("No available address book."));
+ g_free( name );
+ return FALSE;
+#endif
}
/* Create harvest helper */
}
/* Go fer it */
- addrgather_dlg_status_show( _( "Busy harvesting addresses..." ) );
+ addrgather_dlg_status_show( _( "Collecting addresses..." ) );
+ GTK_EVENTS_FLUSH();
+#ifndef USE_ALT_ADDRBOOK
sz = gtk_spin_button_get_value_as_int(
GTK_SPIN_BUTTON( addrgather_dlg.spinbtnFolder ) );
addrharvest_set_folder_size( harvester, sz );
+#endif
+#ifndef USE_ALT_ADDRBOOK
/* Create address book */
abf = addrbook_create_book();
addrbook_set_path( abf, _harv_addressIndex_->filePath );
addrbook_set_name( abf, name );
g_free( newFile );
g_free( name );
+#endif
/* Harvest addresses */
+#ifndef USE_ALT_ADDRBOOK
addrharvest_harvest(
harvester, abf->addressCache, _harv_messageList_ );
+ /* save address book */
addrbook_save_data( abf );
_harv_addressBook_ = abf;
+#else
+ addrharvest_harvest(
+ harvester, NULL, _harv_messageList_ );
+ list = g_hash_table_get_values(harvester->dupTable);
+ for (; list; list = g_list_next(list)) {
+ contact = g_new0(ContactData, 1);
+ ContactEntry* person = (ContactEntry *) list->data;
+ if (person->first_name)
+ contact->name = g_strconcat(
+ person->first_name, " ", person->last_name, NULL);
+ else
+ contact->name = g_strdup(person->last_name);
+ if (! contact->name || strlen(contact->name) < 1)
+ contact->name = g_strdup(person->email);
+ contact->remarks = g_strdup(N_("address added by Claws Mail"));
+ contact->email = g_strdup(person->email);
+ contact->book = g_strdup(name);
+ addressbook_dbus_add_contact(contact, &error);
+ contact_data_free(&contact);
+ }
+ g_list_free(list);
+ g_free(name);
+#endif
/* Update summary count */
- clist = GTK_CLIST(addrgather_dlg.clistCount);
- gtk_clist_clear( clist );
+ view = addrgather_dlg.viewCount;
+ model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
+ gtk_list_store_clear( GTK_LIST_STORE(model) );
for( i = 0; i < NUM_FIELDS; i++ ) {
cnt = addrharvest_get_count( harvester, _harv_headerNames_[i] );
if( cnt < 1 ) {
strcpy( str, "-" );
}
else {
- sprintf( str, "%d", cnt );
+ snprintf( str, FMT_BUFSIZE, "%d", cnt );
}
- text[ FIELD_COL_HEADER ] = _harv_headerNames_[i];
- text[ FIELD_COL_COUNT ] = str;
- gtk_clist_append( clist, text );
+ gtk_list_store_append(GTK_LIST_STORE(model), &iter);
+ gtk_list_store_set(GTK_LIST_STORE(model), &iter,
+ ADDRGATHER_COL_HEADER, _harv_headerNames_[i],
+ ADDRGATHER_COL_COUNT, str,
+ -1);
}
addrharvest_free( harvester );
- addrgather_dlg_status_show( _("Addresses gathered successfully.") );
+ addrgather_dlg_status_show(_("Addresses collected successfully."));
/* Display summary page */
gtk_notebook_set_current_page(
GTK_NOTEBOOK(addrgather_dlg.notebook), PAGE_FINISH );
- gtk_widget_set_sensitive( addrgather_dlg.btnOk, FALSE );
- gtk_widget_grab_default( addrgather_dlg.btnCancel );
+ addrgather_dlg.done = TRUE;
+ gtk_widget_set_sensitive( addrgather_dlg.btnCancel, FALSE );
+ gtk_widget_grab_default( addrgather_dlg.btnOk );
return TRUE;
}
static void addrgather_dlg_ok( GtkWidget *widget, gpointer data ) {
+ if(addrgather_dlg.done) {
+ addrgather_dlg.done = FALSE;
+ gtk_main_quit();
+ return;
+ }
if( addrgather_dlg_harvest() ) {
addrgather_dlg.cancelled = FALSE;
}
gtk_main_quit();
}
-#define PACK_CHECK_BUTTON(box, chkbtn, label) \
-{ \
- chkbtn = gtk_check_button_new_with_label(label); \
- gtk_widget_show(chkbtn); \
- gtk_box_pack_start(GTK_BOX(box), chkbtn, FALSE, TRUE, 0); \
-}
-
-/*
- * Create notebook page for warning message.
- * Enter: pageNum Page number.
- * pageLbl Page label.
- */
-static void addrgather_page_warning( gint pageNum, gchar *pageLbl ) {
- GtkWidget *vbox;
- GtkWidget *table;
- GtkWidget *label;
- gint top;
-
- vbox = gtk_vbox_new(FALSE, 8);
- gtk_container_add( GTK_CONTAINER( addrgather_dlg.notebook ), vbox );
- gtk_container_set_border_width( GTK_CONTAINER (vbox), BORDER_WIDTH );
-
- label = gtk_label_new( pageLbl );
- gtk_widget_show( label );
- gtk_notebook_set_tab_label(
- GTK_NOTEBOOK( addrgather_dlg.notebook ),
- gtk_notebook_get_nth_page( GTK_NOTEBOOK( addrgather_dlg.notebook ), pageNum ),
- label );
-
- table = gtk_table_new(3, 2, FALSE);
- gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
- gtk_container_set_border_width( GTK_CONTAINER(table), 8 );
- gtk_table_set_row_spacings(GTK_TABLE(table), 8);
- gtk_table_set_col_spacings(GTK_TABLE(table), 8 );
-
- /* First row */
- top = 0;
- label = gtk_label_new("");
- gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0);
- gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
-
- /* First row */
- top++;
- label = gtk_label_new( _("No folder or message was selected." ) );
- gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0);
- gtk_label_set_justify( GTK_LABEL(label), GTK_JUSTIFY_LEFT );
- gtk_misc_set_alignment( GTK_MISC(label), 0, 0.5 );
-
- /* Second row */
- top++;
- label = gtk_label_new( _(
- "Please select a folder to process from the folder\n"
- "list. Alternatively, select one or messages from\n"
- "the message list." ) );
-
- gtk_table_attach( GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0);
- gtk_label_set_justify( GTK_LABEL(label), GTK_JUSTIFY_LEFT );
- gtk_misc_set_alignment( GTK_MISC(label), 0, 0.5 );
-}
-
/*
* Create notebook page for mail headers.
* Enter: pageNum Page number.
* pageLbl Page label.
*/
-static void addrgather_page_fields( gint pageNum, gchar *pageLbl ) {
+static void addrgather_page_fields(gint pageNum, gchar *pageLbl)
+{
GtkWidget *vbox;
GtkWidget *vboxf;
- GtkWidget *hboxs;
GtkWidget *table;
GtkWidget *label;
GtkWidget *labelFolder;
GtkWidget *entryBook;
GtkWidget *frameHeader;
- GtkWidget *checkHeader[ NUM_FIELDS ];
+ GtkWidget *checkHeader[NUM_FIELDS];
+#ifndef USE_ALT_ADDRBOOK
+ GtkWidget *hboxs;
GtkWidget *spinbtnFolder;
- GtkObject *adjFolder;
+ GtkAdjustment *adjFolder;
+#endif
GtkWidget *checkRecurse;
gint top;
gint i;
+#ifdef USE_ALT_ADDRBOOK
+ GError* error = NULL;
+ GSList *books, *cur;
+#endif
/* Container */
- vbox = gtk_vbox_new(FALSE, 8);
- gtk_container_add( GTK_CONTAINER( addrgather_dlg.notebook ), vbox );
- gtk_container_set_border_width( GTK_CONTAINER (vbox), 4 );
+ vbox = gtk_vbox_new(FALSE, 6);
+ gtk_container_add(GTK_CONTAINER(addrgather_dlg.notebook), vbox);
+ gtk_container_set_border_width(GTK_CONTAINER(vbox), 4);
/* Notebook page */
- label = gtk_label_new( pageLbl );
- gtk_widget_show( label );
- gtk_notebook_set_tab_label(
- GTK_NOTEBOOK( addrgather_dlg.notebook ),
- gtk_notebook_get_nth_page( GTK_NOTEBOOK( addrgather_dlg.notebook ), pageNum ),
- label );
+ label = gtk_label_new(pageLbl);
+ gtk_widget_show(label);
+ gtk_notebook_set_tab_label(GTK_NOTEBOOK(addrgather_dlg.notebook),
+ gtk_notebook_get_nth_page(GTK_NOTEBOOK(addrgather_dlg.notebook),
+ pageNum), label);
/* Upper area - Field list */
- table = gtk_table_new( 4, 2, FALSE);
- gtk_box_pack_start( GTK_BOX(vbox), table, FALSE, FALSE, 0 );
- gtk_container_set_border_width( GTK_CONTAINER(table), 8 );
- gtk_table_set_row_spacings( GTK_TABLE(table), 8 );
- gtk_table_set_col_spacings( GTK_TABLE(table), 8 );
+ table = gtk_table_new(4, 2, FALSE);
+ gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
+ gtk_table_set_row_spacings(GTK_TABLE(table), 4);
+ gtk_table_set_col_spacings(GTK_TABLE(table), 4);
/* First row */
top = 0;
- label = gtk_label_new( _("Folder :") );
+ label = gtk_label_new(_("Current folder:"));
gtk_table_attach( GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0 );
gtk_misc_set_alignment( GTK_MISC(label), 1.0, 0.5 );
- labelFolder = gtk_label_new( "" );
+ labelFolder = gtk_label_new("");
gtk_table_attach( GTK_TABLE(table), labelFolder, 1, 2, top, (top + 1),
GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0 );
gtk_misc_set_alignment( GTK_MISC(labelFolder), 0, 0.5 );
/* Second row */
top = 1;
- label = gtk_label_new( _("Address Book :") );
+ label = gtk_label_new(_("Address book name:"));
gtk_table_attach( GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0 );
gtk_misc_set_alignment( GTK_MISC(label), 1.0, 0.5 );
+#ifndef USE_ALT_ADDRBOOK
entryBook = gtk_entry_new();
+#else
+ books = addressbook_dbus_get_books(&error);
+ entryBook = gtk_combo_box_text_new();
+ if (books) {
+ for (cur = books; cur; cur = g_slist_next(cur)) {
+ gchar* book = (gchar *) cur->data;
+ gtk_combo_box_text_prepend_text(GTK_COMBO_BOX_TEXT(entryBook), book);
+ g_free(book);
+ }
+ g_slist_free(books);
+ }
+ else
+ gtk_combo_box_text_prepend_text(GTK_COMBO_BOX_TEXT(entryBook), "");
+ gtk_combo_box_set_active(GTK_COMBO_BOX(entryBook), 0);
+#endif
gtk_table_attach( GTK_TABLE(table), entryBook, 1, 2, top, (top + 1),
GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0 );
+#ifndef USE_ALT_ADDRBOOK
/* Third row */
top = 2;
- label = gtk_label_new( _("Folder Size :") );
+ label = gtk_label_new(_("Address book folder size:"));
gtk_table_attach( GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0 );
gtk_misc_set_alignment( GTK_MISC(label), 1.0, 0.5 );
-
- hboxs = gtk_hbox_new( FALSE, 8 );
- adjFolder =
- gtk_adjustment_new( DFL_FOLDER_SIZE, MIN_FOLDER_SIZE, G_MAXINT, 1, 10, 100 );
- spinbtnFolder = gtk_spin_button_new( GTK_ADJUSTMENT(adjFolder), 1, 0 );
- gtk_box_pack_start( GTK_BOX(hboxs), spinbtnFolder, FALSE, FALSE, 0);
- gtk_widget_set_usize( spinbtnFolder, 100, -1);
- gtk_spin_button_set_numeric( GTK_SPIN_BUTTON(spinbtnFolder), TRUE );
- gtk_table_attach( GTK_TABLE(table), hboxs, 1, 2, top, (top + 1), GTK_FILL, 0, 0, 0 );
-
+ CLAWS_SET_TIP(label,
+ _("Maximum amount of entries per folder within the newly created address book"));
+
+ hboxs = gtk_hbox_new(FALSE, 8);
+ adjFolder = GTK_ADJUSTMENT(gtk_adjustment_new(DFL_FOLDER_SIZE, MIN_FOLDER_SIZE, G_MAXINT, 1, 10, 0));
+ spinbtnFolder = gtk_spin_button_new(GTK_ADJUSTMENT(adjFolder), 1, 0);
+ gtk_box_pack_start(GTK_BOX(hboxs), spinbtnFolder, FALSE, FALSE, 0);
+ gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(spinbtnFolder), TRUE);
+ gtk_table_attach(GTK_TABLE(table), hboxs, 1, 2, top, (top + 1), GTK_FILL, 0, 0, 0);
+ CLAWS_SET_TIP(spinbtnFolder,
+ _("Maximum amount of entries per folder within the newly created address book"));
+#endif
/* Fourth row */
top = 3;
- frameHeader = gtk_frame_new( _("Process these mail header fields") );
- gtk_widget_show( frameHeader );
- gtk_table_attach( GTK_TABLE(table), frameHeader, 0, 2, top, (top + 4), GTK_FILL, 0, 0, 0 );
- gtk_frame_set_label_align( GTK_FRAME(frameHeader), 0.01, 0.5 );
+ frameHeader = gtk_frame_new(_("Process these mail header fields"));
+ gtk_widget_show(frameHeader);
+ gtk_table_attach(GTK_TABLE(table), frameHeader, 0, 2, top, (top + 4), GTK_FILL, 0, 0, 0);
+ gtk_frame_set_label_align(GTK_FRAME(frameHeader), 0.01, 0.5);
/* Check boxes */
- vboxf = gtk_vbox_new( FALSE, 0 );
- gtk_widget_show( vboxf );
- gtk_container_add( GTK_CONTAINER( frameHeader ), vboxf );
- gtk_container_set_border_width (GTK_CONTAINER( vboxf ), 8);
-
- for( i = 0; i < NUM_FIELDS; i++ ) {
- PACK_CHECK_BUTTON( vboxf, checkHeader[i], _harv_headerNames_[i] );
+ vboxf = gtk_vbox_new(FALSE, 0);
+ gtk_widget_show(vboxf);
+ gtk_container_add(GTK_CONTAINER(frameHeader), vboxf);
+ gtk_container_set_border_width(GTK_CONTAINER(vboxf), 8);
+
+ for (i = 0; i < NUM_FIELDS; i++) {
+ PACK_CHECK_BUTTON(vboxf, checkHeader[i],
+ prefs_common_translated_header_name(_harv_headerNames_[i]));
addrgather_dlg.checkHeader[i] = checkHeader[i];
}
/* Recurse folders */
top += 4;
- checkRecurse = gtk_check_button_new_with_label( _("Include sub-folders" ) );
+ checkRecurse = gtk_check_button_new_with_label( _("Include subfolders" ) );
gtk_table_attach( GTK_TABLE(table), checkRecurse, 0, 2, top, (top + 1),
GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0 );
addrgather_dlg.labelFolder = labelFolder;
addrgather_dlg.entryBook = entryBook;
+#ifndef USE_ALT_ADDRBOOK
addrgather_dlg.spinbtnFolder = spinbtnFolder;
+#endif
addrgather_dlg.checkRecurse = checkRecurse;
}
static void addrgather_page_finish( gint pageNum, gchar *pageLbl ) {
GtkWidget *label;
GtkWidget *vbox;
- GtkWidget *clistSWin;
- GtkWidget *clistCount;
- gchar *titles[ FIELDS_N_COLS ];
- gint i;
-
- titles[ FIELD_COL_HEADER ] = _("Header Name");
- titles[ FIELD_COL_COUNT ] = _("Address Count");
+ GtkWidget *scrollwin;
+ GtkWidget *viewCount;
+ GtkTreeViewColumn *col;
+ GtkCellRenderer *rdr;
+ GtkTreeSelection *sel;
+ GtkTreeModel *model;
vbox = gtk_vbox_new(FALSE, 8);
gtk_container_add( GTK_CONTAINER( addrgather_dlg.notebook ), vbox );
label );
/* Summary count */
- clistSWin = gtk_scrolled_window_new( NULL, NULL );
- gtk_container_add( GTK_CONTAINER(vbox), clistSWin );
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(clistSWin),
+ scrollwin = gtk_scrolled_window_new( NULL, NULL );
+ gtk_container_add( GTK_CONTAINER(vbox), scrollwin );
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollwin),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
- clistCount = gtk_clist_new_with_titles( FIELDS_N_COLS, titles );
- gtk_container_add( GTK_CONTAINER(clistSWin), clistCount );
- gtk_clist_set_selection_mode( GTK_CLIST(clistCount), GTK_SELECTION_BROWSE );
- gtk_clist_set_column_width(
- GTK_CLIST(clistCount), FIELD_COL_HEADER, FIELDS_COL_WIDTH_HEADER );
- gtk_clist_set_column_width(
- GTK_CLIST(clistCount), FIELD_COL_COUNT, FIELDS_COL_WIDTH_COUNT );
-
- for( i = 0; i < FIELDS_N_COLS; i++ )
- GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(clistCount)->column[i].button, GTK_CAN_FOCUS);
-
- addrgather_dlg.clistCount = clistCount;
+ /* Treeview */
+ model = GTK_TREE_MODEL(gtk_list_store_new(N_ADDRGATHER_COLS,
+ G_TYPE_STRING, G_TYPE_STRING, -1));
+
+ viewCount = gtk_tree_view_new_with_model(GTK_TREE_MODEL(model));
+ g_object_unref(model);
+ gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(viewCount), TRUE);
+ gtk_tree_view_set_reorderable(GTK_TREE_VIEW(viewCount), FALSE);
+ sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(viewCount));
+ gtk_tree_selection_set_mode(sel, GTK_SELECTION_NONE);
+
+ /* Columns for the treeview */
+ rdr = gtk_cell_renderer_text_new();
+ col = gtk_tree_view_column_new_with_attributes(_("Header Name"), rdr,
+ "markup", ADDRGATHER_COL_HEADER,
+ NULL);
+ gtk_tree_view_column_set_min_width(col, FIELDS_COL_WIDTH_HEADER);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(viewCount), col);
+
+ col = gtk_tree_view_column_new_with_attributes(_("Address Count"), rdr,
+ "text", ADDRGATHER_COL_COUNT,
+ NULL);
+ gtk_tree_view_column_set_min_width(col, FIELDS_COL_WIDTH_COUNT);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(viewCount), col);
+
+ gtk_container_add( GTK_CONTAINER(scrollwin), viewCount );
+
+ addrgather_dlg.viewCount = viewCount;
}
/*
* Enter: pageNum Page number.
* pageLbl Page label.
*/
-static void addrgather_dlg_create( void ) {
+static void addrgather_dlg_create(void)
+{
GtkWidget *window;
GtkWidget *notebook;
GtkWidget *btnOk;
GtkWidget *btnCancel;
GtkWidget *statusbar;
GtkWidget *vbox;
- GtkWidget *vnbox;
GtkWidget *hbbox;
GtkWidget *hsbox;
-
- window = gtk_window_new( GTK_WINDOW_TOPLEVEL );
- gtk_widget_set_usize( window, 380, -1 );
- gtk_container_set_border_width(GTK_CONTAINER(window), 0);
- gtk_window_set_position( GTK_WINDOW(window), GTK_WIN_POS_CENTER );
- gtk_window_set_modal( GTK_WINDOW(window), TRUE );
+ static GdkGeometry geometry;
+
+ window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "addrgather");
+ gtk_container_set_border_width(GTK_CONTAINER(window), 4);
+ gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+ gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
+ gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG);
+
g_signal_connect(G_OBJECT(window), "delete_event",
G_CALLBACK(addrgather_dlg_delete_event), NULL);
g_signal_connect(G_OBJECT(window), "key_press_event",
G_CALLBACK(addrgather_dlg_key_pressed), NULL);
+ g_signal_connect(G_OBJECT(window), "size_allocate",
+ G_CALLBACK(addrgather_size_allocate), NULL);
- vbox = gtk_vbox_new( FALSE, 8 );
- gtk_container_add( GTK_CONTAINER(window), vbox );
- gtk_container_set_border_width( GTK_CONTAINER(vbox), 0 );
-
- vnbox = gtk_vbox_new(FALSE, 4);
- gtk_container_set_border_width(GTK_CONTAINER(vnbox), 4);
- gtk_widget_show(vnbox);
- gtk_box_pack_start(GTK_BOX(vbox), vnbox, TRUE, TRUE, 0);
+ vbox = gtk_vbox_new(FALSE, 6);
+ gtk_container_add(GTK_CONTAINER(window), vbox);
/* Notebook */
notebook = gtk_notebook_new();
- gtk_notebook_set_show_tabs( GTK_NOTEBOOK(notebook), FALSE );
+ gtk_notebook_set_show_tabs(GTK_NOTEBOOK(notebook), FALSE);
gtk_widget_show(notebook);
- gtk_box_pack_start(GTK_BOX(vnbox), notebook, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 0);
gtk_container_set_border_width(GTK_CONTAINER(notebook), 6);
/* Status line */
- hsbox = gtk_hbox_new( FALSE, 0 );
- gtk_box_pack_end( GTK_BOX(vbox), hsbox, FALSE, FALSE, BORDER_WIDTH );
+ hsbox = gtk_hbox_new(FALSE, 0);
+ gtk_box_pack_end(GTK_BOX(vbox), hsbox, FALSE, FALSE, 0);
statusbar = gtk_statusbar_new();
- gtk_box_pack_start( GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH );
+ gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, 0);
/* Button panel */
- gtkut_stock_button_set_create(&hbbox, &btnOk, GTK_STOCK_OK,
- &btnCancel, GTK_STOCK_CANCEL,
- NULL, NULL );
- gtk_box_pack_end( GTK_BOX(vbox), hbbox, FALSE, FALSE, 0 );
- gtk_container_set_border_width( GTK_CONTAINER(hbbox), 0 );
+ gtkut_stock_button_set_create(&hbbox, &btnCancel, GTK_STOCK_CANCEL,
+ &btnOk, GTK_STOCK_OK,
+ NULL, NULL);
+ gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
/* Signal handlers */
g_signal_connect(G_OBJECT(btnOk), "clicked",
g_signal_connect(G_OBJECT(btnCancel), "clicked",
G_CALLBACK(addrgather_dlg_cancel), NULL);
- gtk_widget_show_all( vbox );
+ if (!geometry.min_width) {
+ geometry.min_width = 450;
+ geometry.min_height = -1;
+ }
+
+ gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
+ GDK_HINT_MIN_SIZE);
+ gtk_window_set_default_size(GTK_WINDOW(window), prefs_common.addrgather_width,
+ prefs_common.addrgather_height);
+
addrgather_dlg.window = window;
addrgather_dlg.notebook = notebook;
addrgather_dlg.btnOk = btnOk;
addrgather_dlg.btnCancel = btnCancel;
addrgather_dlg.statusbar = statusbar;
- addrgather_dlg.status_cid = gtk_statusbar_get_context_id(
- GTK_STATUSBAR(statusbar), "Harvest E-Mail Address Dialog" );
+ addrgather_dlg.status_cid = gtk_statusbar_get_context_id(GTK_STATUSBAR(statusbar),
+ "Collect Email Address Dialog");
/* Create notebook pages */
- addrgather_page_warning( PAGE_WARNING, _( "Warning" ) );
- addrgather_page_fields( PAGE_FIELDS, _( "Header Fields" ) );
- addrgather_page_finish( PAGE_FINISH, _( "Finish" ) );
- gtk_widget_show_all( addrgather_dlg.window );
+ addrgather_page_fields(PAGE_FIELDS, _("Header Fields"));
+ addrgather_page_finish(PAGE_FINISH, _("Finish"));
+ gtk_widget_show_all(addrgather_dlg.window);
}
/*
* msgList List of message numbers, or NULL to process folder.
* Return: Populated address book file, or NULL if none created.
*/
-AddressBookFile *addrgather_dlg_execute(
- FolderItem *folderItem, AddressIndex *addrIndex, gboolean sourceInd,
- GList *msgList )
+#ifndef USE_ALT_ADDRBOOK
+AddressBookFile *addrgather_dlg_execute(FolderItem *folderItem, AddressIndex *addrIndex,
+ gboolean sourceInd, GList *msgList)
+#else
+void addrgather_dlg_execute(FolderItem *folderItem, gboolean sourceInd, GList *msgList)
+#endif
{
- gboolean errFlag;
gint i;
+#ifndef USE_ALT_ADDRBOOK
_harv_addressIndex_ = addrIndex;
_harv_addressBook_ = NULL;
+#endif
_harv_messageList_ = msgList;
/* Create dialog */
- if( ! addrgather_dlg.window ) {
+ if (!addrgather_dlg.window)
addrgather_dlg_create();
- }
+
+ addrgather_dlg.done = FALSE;
- errFlag = TRUE;
- if( folderItem && folderItem->path ) {
- gtk_notebook_set_current_page(
- GTK_NOTEBOOK(addrgather_dlg.notebook), PAGE_FIELDS );
- addrgather_dlg.folderPath = folder_item_get_path( folderItem );
-
- /* Setup some default values */
- gtk_label_set_text(
- GTK_LABEL(addrgather_dlg.labelFolder), folderItem->path );
- gtk_entry_set_text(
- GTK_ENTRY(addrgather_dlg.entryBook), folderItem->path );
-
- for( i = 0; i < NUM_FIELDS; i++ ) {
- gtk_toggle_button_set_active(
- GTK_TOGGLE_BUTTON(addrgather_dlg.checkHeader[i]),
- FALSE );
- if( g_utf8_collate( _harv_headerNames_[i], HEADER_FROM ) == 0 ) {
- gtk_toggle_button_set_active(
- GTK_TOGGLE_BUTTON(addrgather_dlg.checkHeader[i]),
- TRUE );
- }
- }
+ gtk_notebook_set_current_page(GTK_NOTEBOOK(addrgather_dlg.notebook), PAGE_FIELDS);
+ addrgather_dlg.folderPath = folder_item_get_path(folderItem);
- gtk_widget_set_sensitive( addrgather_dlg.btnOk, TRUE );
- gtk_widget_grab_default( addrgather_dlg.btnOk );
- errFlag = FALSE;
- }
+ /* Setup some default values */
- /* Apply window title */
- if( sourceInd ) {
- gtk_window_set_title( GTK_WINDOW(addrgather_dlg.window),
- _("Harvest E-Mail Addresses - from Selected Messages") );
- gtk_widget_set_sensitive( addrgather_dlg.checkRecurse, FALSE );
- if( msgList == NULL ) {
- errFlag = TRUE;
- }
- }
- else {
- gtk_window_set_title( GTK_WINDOW(addrgather_dlg.window),
- _("Harvest E-Mail Addresses - from Folder") );
- gtk_widget_set_sensitive( addrgather_dlg.checkRecurse, TRUE );
+ gtk_label_set_text(GTK_LABEL(addrgather_dlg.labelFolder), folderItem->path);
+#ifndef USE_ALT_ADDRBOOK
+ gtk_entry_set_text(GTK_ENTRY(addrgather_dlg.entryBook), folderItem->path);
+#endif
+
+ for (i = 0; i < NUM_FIELDS; i++) {
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(addrgather_dlg.checkHeader[i]),
+ FALSE);
+ if (g_utf8_collate(_harv_headerNames_[i], HEADER_FROM) == 0)
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(addrgather_dlg.checkHeader[i]),
+ TRUE);
}
- gtk_toggle_button_set_active(
- GTK_TOGGLE_BUTTON( addrgather_dlg.checkRecurse ), FALSE );
- addrgather_dlg_status_show( "" );
- gtk_widget_show( addrgather_dlg.window );
+ gtk_widget_set_sensitive(addrgather_dlg.btnOk, TRUE);
+ gtk_widget_set_sensitive(addrgather_dlg.btnCancel, TRUE);
+ gtk_widget_grab_default(addrgather_dlg.btnOk);
- if( errFlag ) {
- gtk_notebook_set_current_page(
- GTK_NOTEBOOK(addrgather_dlg.notebook), PAGE_WARNING );
- gtk_widget_set_sensitive( addrgather_dlg.btnOk, FALSE );
- gtk_widget_grab_default( addrgather_dlg.btnCancel );
- }
- else {
- gtk_widget_grab_focus( addrgather_dlg.entryBook );
+ /* Apply window title */
+ if (sourceInd) {
+ gtk_window_set_title(GTK_WINDOW(addrgather_dlg.window),
+ _("Collect email addresses from selected messages"));
+ gtk_widget_set_sensitive(addrgather_dlg.checkRecurse, FALSE);
+ } else {
+ gtk_window_set_title(GTK_WINDOW(addrgather_dlg.window),
+ _("Collect email addresses from folder"));
+ gtk_widget_set_sensitive(addrgather_dlg.checkRecurse, TRUE);
}
- manage_window_set_transient( GTK_WINDOW(addrgather_dlg.window) );
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(addrgather_dlg.checkRecurse), FALSE);
+
+ addrgather_dlg_status_show("");
+ gtk_widget_show(addrgather_dlg.window);
+ gtk_window_set_modal(GTK_WINDOW(addrgather_dlg.window), TRUE);
+ gtk_widget_grab_focus(addrgather_dlg.entryBook);
+ manage_window_set_transient(GTK_WINDOW(addrgather_dlg.window));
gtk_main();
- if( ! errFlag ) {
- g_free( addrgather_dlg.folderPath );
- addrgather_dlg.folderPath = NULL;
- }
- gtk_widget_hide( addrgather_dlg.window );
+ g_free(addrgather_dlg.folderPath);
+ addrgather_dlg.folderPath = NULL;
+ gtk_widget_hide(addrgather_dlg.window);
+ gtk_window_set_modal(GTK_WINDOW(addrgather_dlg.window), FALSE);
+#ifndef USE_ALT_ADDRBOOK
_harv_addressIndex_ = NULL;
- if( addrgather_dlg.cancelled == TRUE ) return NULL;
+ if (addrgather_dlg.cancelled == TRUE)
+ return NULL;
return _harv_addressBook_;
+#endif
}
-
/*
* End of Source.
*/
projects / claws.git / blobdiff