2007-06-18 [wwp] 2.9.2cvs70
authorTristan Chabredier <wwp@claws-mail.org>
Mon, 18 Jun 2007 09:14:18 +0000 (09:14 +0000)
committerTristan Chabredier <wwp@claws-mail.org>
Mon, 18 Jun 2007 09:14:18 +0000 (09:14 +0000)
* src/importldif.c
LDIF import: use a "Proceed" button to complete
the process.

ChangeLog
PATCHSETS
configure.ac
src/importldif.c

index 83dfb8085df802ef892238c45c817475325a3840..3b62a5e6707fa88084f0d037276a931f4542fb67 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-18 [wwp]       2.9.2cvs70
+
+       * src/importldif.c
+               LDIF import: use a "Proceed" button to complete
+               the process.
+
 2007-06-18 [paul]      2.9.2cvs69
 
        * configure.ac
index a627c5b4d5374eaa41970e17d5b68cc653950862..cd110cd7978434eaf9e71878b3fde7858d1344df 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.1.2.43 -r 1.1.2.44 src/prefs_summaries.c;  cvs diff -u -r 1.150.2.97 -r 1.150.2.98 src/procmsg.c;  ) > 2.9.2cvs67.patchset
 ( cvs diff -u -r 1.12.2.12 -r 1.12.2.13 src/ldif.c;  cvs diff -u -r 1.14.2.13 -r 1.14.2.14 src/importldif.c;  ) > 2.9.2cvs68.patchset
 ( cvs diff -u -r 1.654.2.2699 -r 1.654.2.2700 configure.ac;  ) > 2.9.2cvs69.patchset
+( cvs diff -u -r 1.14.2.14 -r 1.14.2.15 src/importldif.c;  ) > 2.9.2cvs70.patchset
index bbf3397dee1dcac9b508fb9b9028c53d254fa308..472b964b0301b74ba4422f6a2fa3f7f237bb0fce 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=69
+EXTRA_VERSION=70
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index ae6b2889b2781dad009f8f4063ac6f1c4c0a6c11..0cd217ec01b6cbf2192c9cc310d9be8fecc828a4 100644 (file)
@@ -89,6 +89,7 @@ static struct _ImpLdif_Dlg {
        GtkWidget *labelRecords;
        GtkWidget *btnPrev;
        GtkWidget *btnNext;
+       GtkWidget *btnProceed;
        GtkWidget *btnCancel;
        GtkWidget *statusbar;
        gint      status_cid;
@@ -490,7 +491,9 @@ static void imp_ldif_finish_show() {
        gtk_label_set_text( GTK_LABEL(impldif_dlg.labelFile), _ldifFile_->path );
        gtk_label_set_text( GTK_LABEL(impldif_dlg.labelRecords), itos( _ldifFile_->importCount ) );
        gtk_widget_set_sensitive( impldif_dlg.btnPrev, FALSE );
-       gtk_widget_set_sensitive( impldif_dlg.btnNext, FALSE );
+       gtk_widget_hide( impldif_dlg.btnNext );
+       gtk_widget_show( impldif_dlg.btnProceed );
+       gtk_widget_set_sensitive( impldif_dlg.btnProceed, FALSE );
        if( _ldifFile_->retVal == MGU_SUCCESS ) {
                sMsg = _( "LDIF file imported successfully." );
        }
@@ -514,6 +517,8 @@ static void imp_ldif_prev( GtkWidget *widget ) {
                gtk_notebook_set_current_page(
                        GTK_NOTEBOOK(impldif_dlg.notebook), PAGE_FILE_INFO );
                gtk_widget_set_sensitive( impldif_dlg.btnPrev, FALSE );
+               gtk_widget_hide( impldif_dlg.btnProceed );
+               gtk_widget_show( impldif_dlg.btnNext );
        }
        imp_ldif_message();
 }
@@ -533,6 +538,9 @@ static void imp_ldif_next( GtkWidget *widget ) {
                                GTK_NOTEBOOK(impldif_dlg.notebook), PAGE_ATTRIBUTES );
                        imp_ldif_message();
                        gtk_widget_set_sensitive( impldif_dlg.btnPrev, TRUE );
+                       gtk_widget_hide( impldif_dlg.btnNext );
+                       gtk_widget_show( impldif_dlg.btnProceed );
+                       gtk_widget_set_sensitive( impldif_dlg.btnProceed, TRUE );
                }
                else {
                        gtk_widget_set_sensitive( impldif_dlg.btnPrev, FALSE );
@@ -945,6 +953,7 @@ static void imp_ldif_dialog_create() {
        GtkWidget *hbbox;
        GtkWidget *btnPrev;
        GtkWidget *btnNext;
+       GtkWidget *btnProceed;
        GtkWidget *btnCancel;
        GtkWidget *hsbox;
        GtkWidget *statusbar;
@@ -989,6 +998,14 @@ static void imp_ldif_dialog_create() {
                                      &btnCancel, GTK_STOCK_CANCEL, 
                                      &btnPrev, GTK_STOCK_GO_BACK,
                                      &btnNext, GTK_STOCK_GO_FORWARD);
+
+       btnProceed = gtk_button_new_with_mnemonic(_("Proceed"));
+       gtk_button_set_image(GTK_BUTTON(btnProceed),
+                       gtk_image_new_from_stock(GTK_STOCK_OK, GTK_ICON_SIZE_BUTTON));
+       GTK_WIDGET_SET_FLAGS(btnProceed, GTK_CAN_DEFAULT);
+       gtk_box_pack_start(GTK_BOX(hbbox), btnProceed, TRUE, TRUE, 0);
+       gtk_widget_hide(btnProceed);
+
        gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
        gtk_container_set_border_width(GTK_CONTAINER(hbbox), 2);
        gtk_widget_grab_default(btnNext);
@@ -998,6 +1015,8 @@ static void imp_ldif_dialog_create() {
                         G_CALLBACK(imp_ldif_prev), NULL);
        g_signal_connect(G_OBJECT(btnNext), "clicked",
                         G_CALLBACK(imp_ldif_next), NULL);
+       g_signal_connect(G_OBJECT(btnProceed), "clicked",
+                        G_CALLBACK(imp_ldif_next), NULL);
        g_signal_connect(G_OBJECT(btnCancel), "clicked",
                         G_CALLBACK(imp_ldif_cancel), NULL);
 
@@ -1007,6 +1026,7 @@ static void imp_ldif_dialog_create() {
        impldif_dlg.notebook   = notebook;
        impldif_dlg.btnPrev    = btnPrev;
        impldif_dlg.btnNext    = btnNext;
+       impldif_dlg.btnProceed = btnProceed;
        impldif_dlg.btnCancel  = btnCancel;
        impldif_dlg.statusbar  = statusbar;
        impldif_dlg.status_cid = gtk_statusbar_get_context_id(
@@ -1037,9 +1057,11 @@ AddressBookFile *addressbook_imp_ldif( AddressIndex *addrIndex ) {
 
        if( ! impldif_dlg.window )
                imp_ldif_create();
-               
+
        gtk_button_set_label(GTK_BUTTON(impldif_dlg.btnCancel),
                             GTK_STOCK_CANCEL);
+       gtk_widget_hide(impldif_dlg.btnProceed);
+       gtk_widget_show(impldif_dlg.btnNext);
 
        impldif_dlg.cancelled = FALSE;
        gtk_widget_show(impldif_dlg.window);