2008-07-06 [paul] 3.5.0cvs14

	* src/addrgather.c
		improve the layout of the dialogue
		improve the English
		add tooltips
		fix some of the nasty coding style
	* src/mainwindow.c
		improve the English
		add some missing mnemonics

diff --git a/ChangeLog b/ChangeLog
index 3aabc747684e94bd1c8f3920d9417bd3ed02a651..0fc38320ccd5f9e39e430573538376e2bd9df696 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-07-06 [paul]      3.5.0cvs14
+
+       * src/addrgather.c
+               improve the layout of the dialogue
+               improve the English
+               add tooltips
+               fix some of the nasty coding style
+       * src/mainwindow.c
+               improve the English
+               add some missing mnemonics
+

 2008-07-05 [paul]      3.5.0cvs13
 
        * src/mainwindow.c
 2008-07-05 [paul]      3.5.0cvs13
 
        * src/mainwindow.c

diff --git a/PATCHSETS b/PATCHSETS
index a1b1e056032e327d2a82005ee64316944a5ea7d7..8cb388d1afa5cca70d915a8558a9030a8b2cfdb4 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3425,3 +3425,4 @@
 ( cvs diff -u -r 1.101.2.51 -r 1.101.2.52 src/news.c;  cvs diff -u -r 1.2.2.25 -r 1.2.2.26 src/news_gtk.c;  ) > 3.5.0cvs11.patchset
 ( cvs diff -u -r 1.274.2.246 -r 1.274.2.247 src/mainwindow.c;  ) > 3.5.0cvs12.patchset
 ( cvs diff -u -r 1.274.2.247 -r 1.274.2.248 src/mainwindow.c;  cvs diff -u -r 1.39.2.47 -r 1.39.2.48 src/mainwindow.h;  cvs diff -u -r 1.1.2.29 -r 1.1.2.30 src/plugins/pgpcore/prefs_gpg.c;  ) > 3.5.0cvs13.patchset
 ( cvs diff -u -r 1.101.2.51 -r 1.101.2.52 src/news.c;  cvs diff -u -r 1.2.2.25 -r 1.2.2.26 src/news_gtk.c;  ) > 3.5.0cvs11.patchset
 ( cvs diff -u -r 1.274.2.246 -r 1.274.2.247 src/mainwindow.c;  ) > 3.5.0cvs12.patchset
 ( cvs diff -u -r 1.274.2.247 -r 1.274.2.248 src/mainwindow.c;  cvs diff -u -r 1.39.2.47 -r 1.39.2.48 src/mainwindow.h;  cvs diff -u -r 1.1.2.29 -r 1.1.2.30 src/plugins/pgpcore/prefs_gpg.c;  ) > 3.5.0cvs13.patchset

+( cvs diff -u -r 1.5.10.20 -r 1.5.10.21 src/addrgather.c;  cvs diff -u -r 1.274.2.248 -r 1.274.2.249 src/mainwindow.c;  ) > 3.5.0cvs14.patchset

diff --git a/configure.ac b/configure.ac
index 9caefd945034d82c0640d3600c2e937a6d80bc82..8e91e0ea18012cae295e31060679b937124c6c94 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=13
+EXTRA_VERSION=14

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/addrgather.c b/src/addrgather.c
index a941ad8698faa18e7b9b25a2c4962d5498632652..095c3d28ad94e69b68668e197aef1d345e2dd8e1 100644 (file)
--- a/src/addrgather.c
+++ b/src/addrgather.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client

- * Copyright (C) 2002-2007 Match Grun and the Claws Mail team
+ * Copyright (C) 2002-2008 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
  *
  * 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


@@ -182,7 +182,7 @@ static gboolean addrgather_dlg_harvest() {
        }
 
        /* Go fer it */
        }
 
        /* Go fer it */

-       addrgather_dlg_status_show( _( "Harvesting addresses..." ) );
+       addrgather_dlg_status_show( _( "Collecting addresses..." ) );

        GTK_EVENTS_FLUSH();
        sz = gtk_spin_button_get_value_as_int(
                GTK_SPIN_BUTTON( addrgather_dlg.spinbtnFolder ) );
        GTK_EVENTS_FLUSH();
        sz = gtk_spin_button_get_value_as_int(
                GTK_SPIN_BUTTON( addrgather_dlg.spinbtnFolder ) );


@@ -221,7 +221,7 @@ static gboolean addrgather_dlg_harvest() {
 
        addrharvest_free( harvester );
 
 
        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(
 
        /* Display summary page */
        gtk_notebook_set_current_page(


@@ -313,7 +313,8 @@ static void addrgather_page_warning( gint pageNum, gchar *pageLbl ) {
  * Enter: pageNum Page number.
  *        pageLbl Page label.
  */
  * 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 *vbox;
        GtkWidget *vboxf;
        GtkWidget *hboxs;


@@ -322,47 +323,48 @@ static void addrgather_page_fields( gint pageNum, gchar *pageLbl ) {
        GtkWidget *labelFolder;
        GtkWidget *entryBook;
        GtkWidget *frameHeader;
        GtkWidget *labelFolder;
        GtkWidget *entryBook;
        GtkWidget *frameHeader;

-       GtkWidget *checkHeader[ NUM_FIELDS ];
+       GtkWidget *checkHeader[NUM_FIELDS];

        GtkWidget *spinbtnFolder;
        GtkObject *adjFolder;
        GtkWidget *checkRecurse;
        gint top;
        gint i;
        GtkWidget *spinbtnFolder;
        GtkObject *adjFolder;
        GtkWidget *checkRecurse;
        gint top;
        gint i;

+       GtkTooltips *tooltips;
+
+       tooltips = gtk_tooltips_new();

 
        /* Container */
 
        /* 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 */
 
        /* 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 */
 
        /* 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;
 
        /* 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 );
 
        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;
        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 );
 
        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 );
 


@@ -372,34 +374,37 @@ static void addrgather_page_fields( gint pageNum, gchar *pageLbl ) {
 
        /* Third row */
        top = 2;
 
        /* 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 );
        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_size_request( 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 );
+       gtk_tooltips_set_tip(GTK_TOOLTIPS(tooltips), label,
+                       _("Maximum amount of entries per folder within the newly created address book"), NULL);
+
+       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_size_request(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);
+       gtk_tooltips_set_tip(GTK_TOOLTIPS(tooltips), spinbtnFolder,
+                       _("Maximum amount of entries per folder within the newly created address book"), NULL);

 
        /* Fourth row */
        top = 3;
 
        /* 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 */
 
        /* 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);
+       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] );
+       for (i = 0; i < NUM_FIELDS; i++) {
+               PACK_CHECK_BUTTON(vboxf, checkHeader[i], _harv_headerNames_[i]);

                addrgather_dlg.checkHeader[i] = checkHeader[i];
        }
 
                addrgather_dlg.checkHeader[i] = checkHeader[i];
        }
 


@@ -468,55 +473,50 @@ static void addrgather_page_finish( gint pageNum, gchar *pageLbl ) {
  * Enter: pageNum Page number.
  *        pageLbl Page label.
  */
  * 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 *window;
        GtkWidget *notebook;
        GtkWidget *btnOk;
        GtkWidget *btnCancel;
        GtkWidget *statusbar;
        GtkWidget *vbox;

-       GtkWidget *vnbox;

        GtkWidget *hbbox;
        GtkWidget *hsbox;
 
        GtkWidget *hbbox;
        GtkWidget *hsbox;
 

-       window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "addrgather" );
-       gtk_widget_set_size_request( 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 );       
+       window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "addrgather");
+       gtk_widget_set_size_request(window, 380, -1);
+       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_modal(GTK_WINDOW(window), TRUE);
+       

        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), "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);
 

-       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();
 
        /* 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_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 */
        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();
        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 */
 
        /* 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), 10 );
+       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",
 
        /* Signal handlers */
        g_signal_connect(G_OBJECT(btnOk), "clicked",


@@ -524,20 +524,21 @@ static void addrgather_dlg_create( void ) {
        g_signal_connect(G_OBJECT(btnCancel), "clicked",
                         G_CALLBACK(addrgather_dlg_cancel), NULL);
 
        g_signal_connect(G_OBJECT(btnCancel), "clicked",
                         G_CALLBACK(addrgather_dlg_cancel), NULL);
 

-       gtk_widget_show_all( vbox );
+       gtk_widget_show_all(vbox);
+

        addrgather_dlg.window     = window;
        addrgather_dlg.notebook   = notebook;
        addrgather_dlg.btnOk      = btnOk;
        addrgather_dlg.btnCancel  = btnCancel;
        addrgather_dlg.statusbar  = statusbar;
        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 Email Address Dialog" );
+       addrgather_dlg.status_cid = gtk_statusbar_get_context_id(GTK_STATUSBAR(statusbar),
+                                                                "Collect Email Address Dialog");

 
        /* Create notebook pages */
 
        /* 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_warning(PAGE_WARNING, _("Warning"));
+       addrgather_page_fields(PAGE_FIELDS, _("Header Fields"));
+       addrgather_page_finish(PAGE_FINISH, _("Finish"));
+       gtk_widget_show_all(addrgather_dlg.window);

 }
 
 /*
 }
 
 /*


@@ -548,9 +549,8 @@ static void addrgather_dlg_create( void ) {
  *        msgList    List of message numbers, or NULL to process folder.
  * Return: Populated address book file, or NULL if none created.
  */
  *        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 )
+AddressBookFile *addrgather_dlg_execute(FolderItem *folderItem, AddressIndex *addrIndex,
+                                       gboolean sourceInd, GList *msgList)

 {
        gboolean errFlag;
        gint i;
 {
        gboolean errFlag;
        gint i;


@@ -560,80 +560,70 @@ AddressBookFile *addrgather_dlg_execute(
        _harv_messageList_ = msgList;
 
        /* Create dialog */
        _harv_messageList_ = msgList;
 
        /* Create dialog */

-       if( ! addrgather_dlg.window ) {
+       if (!addrgather_dlg.window)

                addrgather_dlg_create();
                addrgather_dlg_create();

-       }

        
        addrgather_dlg.done = FALSE;
 
        errFlag = TRUE;
        
        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 );
+       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 */
 
                /* 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_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_widget_set_sensitive( addrgather_dlg.btnOk, TRUE );
-               gtk_widget_grab_default( addrgather_dlg.btnOk );
+               gtk_widget_set_sensitive(addrgather_dlg.btnOk, TRUE);
+               gtk_widget_grab_default(addrgather_dlg.btnOk);

                errFlag = FALSE;
        }
 
        /* Apply window title */
                errFlag = FALSE;
        }
 
        /* Apply window title */

-       if( sourceInd ) {
-               gtk_window_set_title( GTK_WINDOW(addrgather_dlg.window),
-                       _("Harvest Email Addresses - from Selected Messages") );
-               gtk_widget_set_sensitive( addrgather_dlg.checkRecurse, FALSE );
-               if( msgList == NULL ) {
+       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);
+               if (msgList == NULL) {

                        errFlag = TRUE;
                }
                        errFlag = TRUE;
                }

+       } else {
+               gtk_window_set_title(GTK_WINDOW(addrgather_dlg.window),
+                                    _("Collect email addresses from folder"));
+               gtk_widget_set_sensitive(addrgather_dlg.checkRecurse, TRUE);

        }
        }

-       else {
-               gtk_window_set_title( GTK_WINDOW(addrgather_dlg.window),
-                       _("Harvest Email Addresses - from Folder") );
-               gtk_widget_set_sensitive( addrgather_dlg.checkRecurse, TRUE );
-       }
-       gtk_toggle_button_set_active(
-               GTK_TOGGLE_BUTTON( addrgather_dlg.checkRecurse ), FALSE );
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(addrgather_dlg.checkRecurse), FALSE);

 
 

-       addrgather_dlg_status_show( "" );
-       gtk_widget_show( addrgather_dlg.window );
+       addrgather_dlg_status_show("");
+       gtk_widget_show(addrgather_dlg.window);

 
 

-       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 );
+       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);

        }
        }

-       manage_window_set_transient( GTK_WINDOW(addrgather_dlg.window) );
+       manage_window_set_transient(GTK_WINDOW(addrgather_dlg.window));

        gtk_main();
 
        gtk_main();
 

-       if( ! errFlag ) {
-               g_free( addrgather_dlg.folderPath );
+       if (!errFlag) {
+               g_free(addrgather_dlg.folderPath);

                addrgather_dlg.folderPath = NULL;
        }
                addrgather_dlg.folderPath = NULL;
        }

-       gtk_widget_hide( addrgather_dlg.window );
+       gtk_widget_hide(addrgather_dlg.window);

        _harv_addressIndex_ = NULL;
 
        _harv_addressIndex_ = NULL;
 

-       if( addrgather_dlg.cancelled == TRUE ) return NULL;
+       if (addrgather_dlg.cancelled == TRUE)
+               return NULL;

 
        return _harv_addressBook_;
 }
 
        return _harv_addressBook_;
 }

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 7aacb2df2d0ec928b2b1ddcf54555afc0048219f..971e112e1f5d9d8141b11ee0fba977dd4c994a14 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -549,7 +549,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
 #endif
        {N_("/_File/_Print..."),                "<control>P", print_cb, 0, NULL},
        {N_("/_File/---"),                      NULL, NULL, 0, "<Separator>"},
 #endif
        {N_("/_File/_Print..."),                "<control>P", print_cb, 0, NULL},
        {N_("/_File/---"),                      NULL, NULL, 0, "<Separator>"},

-       {N_("/_File/_Work offline"),            "<control>W", toggle_work_offline_cb, 0, "<ToggleItem>"},
+       {N_("/_File/Offline _mode"),            "<control>W", toggle_work_offline_cb, 0, "<ToggleItem>"},

        {N_("/_File/Synchronise folders"),      "<control><shift>S", sync_cb, 0, NULL},
        {N_("/_File/---"),                      NULL, NULL, 0, "<Separator>"},
        /* {N_("/_File/_Close"),                "<alt>W", app_exit_cb, 0, NULL}, */
        {N_("/_File/Synchronise folders"),      "<control><shift>S", sync_cb, 0, NULL},
        {N_("/_File/---"),                      NULL, NULL, 0, "<Separator>"},
        /* {N_("/_File/_Close"),                "<alt>W", app_exit_cb, 0, NULL}, */


@@ -854,17 +854,17 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Tools/_Address book..."),        "<shift><control>A", addressbook_open_cb, 0, NULL},
        {N_("/_Tools/Add sender to address boo_k"),
                                                NULL, add_address_cb, 0, NULL},
        {N_("/_Tools/_Address book..."),        "<shift><control>A", addressbook_open_cb, 0, NULL},
        {N_("/_Tools/Add sender to address boo_k"),
                                                NULL, add_address_cb, 0, NULL},

-       {N_("/_Tools/_Harvest addresses"),      NULL, NULL, 0, "<Branch>"},
-       {N_("/_Tools/_Harvest addresses/from _Folder..."),
+       {N_("/_Tools/C_ollect addresses from"), NULL, NULL, 0, "<Branch>"},
+       {N_("/_Tools/C_ollect addresses from/Current _folder..."),

                                                NULL, addr_harvest_cb, 0, NULL},
                                                NULL, addr_harvest_cb, 0, NULL},

-       {N_("/_Tools/_Harvest addresses/from _Messages..."),
+       {N_("/_Tools/C_ollect addresses from/Selected _messages..."),

                                                NULL, addr_harvest_msg_cb, 0, NULL},
        {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
        {N_("/_Tools/_Filter all messages in folder"),
                                                NULL, filter_cb, 0, NULL},
        {N_("/_Tools/Filter _selected messages"),
                                                NULL, filter_cb, 1, NULL},
                                                NULL, addr_harvest_msg_cb, 0, NULL},
        {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
        {N_("/_Tools/_Filter all messages in folder"),
                                                NULL, filter_cb, 0, NULL},
        {N_("/_Tools/Filter _selected messages"),
                                                NULL, filter_cb, 1, NULL},

-       {N_("/_Tools/Run folder processing rules"),
+       {N_("/_Tools/Run folder pr_ocessing rules"),

                                                NULL, process_cb, 0, NULL},
        {N_("/_Tools/_Create filter rule"),     NULL, NULL, 0, "<Branch>"},
        {N_("/_Tools/_Create filter rule/_Automatically"),
                                                NULL, process_cb, 0, NULL},
        {N_("/_Tools/_Create filter rule"),     NULL, NULL, 0, "<Branch>"},
        {N_("/_Tools/_Create filter rule/_Automatically"),


@@ -905,7 +905,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
                                                NULL, ssl_manager_open_cb, 0, NULL},
 #endif
        {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
                                                NULL, ssl_manager_open_cb, 0, NULL},
 #endif
        {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},

-       {N_("/_Tools/Filtering Log"),           NULL, filtering_debug_window_show_cb, 0, NULL},
+       {N_("/_Tools/Filtering Lo_g"),          NULL, filtering_debug_window_show_cb, 0, NULL},

        {N_("/_Tools/Network _Log"),            "<shift><control>L", log_window_show_cb, 0, NULL},
 
        {N_("/_Configuration"),                 NULL, NULL, 0, "<Branch>"},
        {N_("/_Tools/Network _Log"),            "<shift><control>L", log_window_show_cb, 0, NULL},
 
        {N_("/_Configuration"),                 NULL, NULL, 0, "<Branch>"},


@@ -2890,8 +2890,8 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                {"/Message/Re-edit"               , M_HAVE_ACCOUNT|M_ALLOW_REEDIT},
 
                {"/Tools/Add sender to address book"   , M_SINGLE_TARGET_EXIST},
                {"/Message/Re-edit"               , M_HAVE_ACCOUNT|M_ALLOW_REEDIT},
 
                {"/Tools/Add sender to address book"   , M_SINGLE_TARGET_EXIST},

-               {"/Tools/Harvest addresses"            , M_MSG_EXIST|M_SUMMARY_ISLIST},
-               {"/Tools/Harvest addresses/from Messages..."
+               {"/Tools/Collect addresses from"       , M_MSG_EXIST|M_SUMMARY_ISLIST},
+               {"/Tools/Collect addresses from/Selected messages..."

                                                       , M_TARGET_EXIST},
                {"/Tools/Filter all messages in folder", M_MSG_EXIST|M_EXEC},
                {"/Tools/Filter selected messages"     , M_TARGET_EXIST|M_EXEC},
                                                       , M_TARGET_EXIST},
                {"/Tools/Filter all messages in folder", M_MSG_EXIST|M_EXEC},
                {"/Tools/Filter selected messages"     , M_TARGET_EXIST|M_EXEC},