/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001 Match Grun
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 2001-2015 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/gtkwindow.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkbutton.h>
-
-#include "intl.h"
+#include <gtk/gtk.h>
+
#include "addrbook.h"
#include "addressbook.h"
#include "addressitem.h"
#include "manage_window.h"
#include "mgutils.h"
#include "mutt.h"
+#include "filesel.h"
#define IMPORTMUTT_GUESS_NAME "MUTT Import"
/*
* Edit functions.
*/
-void imp_mutt_status_show( gchar *msg ) {
+static void imp_mutt_status_show( gchar *msg ) {
if( impmutt_dlg.statusbar != NULL ) {
gtk_statusbar_pop( GTK_STATUSBAR(impmutt_dlg.statusbar), impmutt_dlg.status_cid );
if( msg ) {
}
}
-static gchar *imp_mutt_guess_file( AddressBookFile *abf ) {
- gchar *newFile = NULL;
- GList *fileList = NULL;
- gint fileNum = 1;
- fileList = addrbook_get_bookfile_list( abf );
- if( fileList ) {
- fileNum = 1 + abf->maxValue;
- }
- newFile = addrbook_gen_new_file_name( fileNum );
- g_list_free( fileList );
- fileList = NULL;
- return newFile;
-}
-
static gboolean imp_mutt_import_file( gchar *sName, gchar *sFile ) {
gboolean retVal = FALSE;
gchar *newFile;
abf = addrbook_create_book();
addrbook_set_path( abf, _imp_addressIndex_->filePath );
addrbook_set_name( abf, sName );
- newFile = imp_mutt_guess_file( abf );
+ newFile = addrbook_guess_next_file( abf );
addrbook_set_file( abf, newFile );
g_free( newFile );
addrbook_free_book( abf );
}
+ mutt_free(mdf);
+
return retVal;
}
gboolean errFlag = FALSE;
sFile = gtk_editable_get_chars( GTK_EDITABLE(impmutt_dlg.file_entry), 0, -1 );
- g_strchug( sFile ); g_strchomp( sFile );
+ g_strstrip( sFile );
gtk_entry_set_text( GTK_ENTRY(impmutt_dlg.file_entry), sFile );
sName = gtk_editable_get_chars( GTK_EDITABLE(impmutt_dlg.name_entry), 0, -1 );
- g_strchug( sName ); g_strchomp( sName );
+ g_strstrip( sName );
gtk_entry_set_text( GTK_ENTRY(impmutt_dlg.name_entry), sName );
if( *sFile == '\0'|| strlen( sFile ) < 1 ) {
gtk_main_quit();
}
-static void imp_mutt_file_ok( GtkWidget *widget, gpointer data ) {
- gchar *sFile;
- AddressFileSelection *afs;
- GtkWidget *fileSel;
-
- afs = ( AddressFileSelection * ) data;
- fileSel = afs->fileSelector;
- sFile = gtk_file_selection_get_filename( GTK_FILE_SELECTION(fileSel) );
-
- afs->cancelled = FALSE;
- gtk_entry_set_text( GTK_ENTRY(impmutt_dlg.file_entry), sFile );
- gtk_widget_hide( afs->fileSelector );
- gtk_grab_remove( afs->fileSelector );
- gtk_widget_grab_focus( impmutt_dlg.file_entry );
- imp_mutt_status_show( _( "Please select a file to import." ) );
-}
-
-static void imp_mutt_file_cancel( GtkWidget *widget, gpointer data ) {
- AddressFileSelection *afs = ( AddressFileSelection * ) data;
- afs->cancelled = TRUE;
- gtk_widget_hide( afs->fileSelector );
- gtk_grab_remove( afs->fileSelector );
- gtk_widget_grab_focus( impmutt_dlg.file_entry );
-}
-
static void imp_mutt_file_select_create( AddressFileSelection *afs ) {
- GtkWidget *fileSelector;
-
- fileSelector = gtk_file_selection_new( _("Select MUTT File") );
- gtk_file_selection_hide_fileop_buttons( GTK_FILE_SELECTION(fileSelector) );
- gtk_signal_connect( GTK_OBJECT (GTK_FILE_SELECTION(fileSelector)->ok_button),
- "clicked", GTK_SIGNAL_FUNC (imp_mutt_file_ok), ( gpointer ) afs );
- gtk_signal_connect( GTK_OBJECT (GTK_FILE_SELECTION(fileSelector)->cancel_button),
- "clicked", GTK_SIGNAL_FUNC (imp_mutt_file_cancel), ( gpointer ) afs );
- afs->fileSelector = fileSelector;
- afs->cancelled = TRUE;
+ gchar *file = filesel_select_file_open(_("Select MUTT File"), NULL);
+
+ if (file == NULL)
+ afs->cancelled = TRUE;
+ else {
+ afs->cancelled = FALSE;
+ gtk_entry_set_text( GTK_ENTRY(impmutt_dlg.file_entry), file );
+ g_free(file);
+ }
}
static void imp_mutt_file_select( void ) {
- gchar *sFile;
- if (! _imp_mutt_file_selector_.fileSelector )
- imp_mutt_file_select_create( & _imp_mutt_file_selector_ );
-
- sFile = gtk_editable_get_chars( GTK_EDITABLE(impmutt_dlg.file_entry), 0, -1 );
- gtk_file_selection_set_filename( GTK_FILE_SELECTION( _imp_mutt_file_selector_.fileSelector ), sFile );
- g_free( sFile );
- gtk_widget_show( _imp_mutt_file_selector_.fileSelector );
- gtk_grab_add( _imp_mutt_file_selector_.fileSelector );
+ imp_mutt_file_select_create( & _imp_mutt_file_selector_ );
}
static gint imp_mutt_delete_event( GtkWidget *widget, GdkEventAny *event, gboolean *cancelled ) {
return TRUE;
}
-static void imp_mutt_key_pressed( GtkWidget *widget, GdkEventKey *event, gboolean *cancelled ) {
- if (event && event->keyval == GDK_Escape) {
+static gboolean imp_mutt_key_pressed( GtkWidget *widget, GdkEventKey *event, gboolean *cancelled ) {
+ if (event && event->keyval == GDK_KEY_Escape) {
*cancelled = TRUE;
gtk_main_quit();
}
+ return FALSE;
}
static void imp_mutt_create( gboolean *cancelled ) {
GtkWidget *file_entry;
GtkWidget *name_entry;
GtkWidget *hbbox;
- GtkWidget *hsep;
GtkWidget *ok_btn;
GtkWidget *cancel_btn;
GtkWidget *file_btn;
GtkWidget *hsbox;
gint top;
- window = gtk_window_new(GTK_WINDOW_DIALOG);
- gtk_widget_set_usize(window, 450, -1);
+ window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "importmutt");
+ gtk_widget_set_size_request(window, 450, -1);
gtk_container_set_border_width( GTK_CONTAINER(window), 0 );
gtk_window_set_title( GTK_WINDOW(window), _("Import MUTT file into Address Book") );
gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
- gtk_window_set_modal(GTK_WINDOW(window), TRUE);
- gtk_signal_connect(GTK_OBJECT(window), "delete_event",
- GTK_SIGNAL_FUNC(imp_mutt_delete_event),
- cancelled);
- gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
- GTK_SIGNAL_FUNC(imp_mutt_key_pressed),
- cancelled);
+ gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG);
+ g_signal_connect(G_OBJECT(window), "delete_event",
+ G_CALLBACK(imp_mutt_delete_event), cancelled);
+ g_signal_connect(G_OBJECT(window), "key_press_event",
+ G_CALLBACK(imp_mutt_key_pressed), cancelled);
vbox = gtk_vbox_new(FALSE, 8);
gtk_container_add(GTK_CONTAINER(window), vbox);
file_entry = gtk_entry_new();
gtk_table_attach(GTK_TABLE(table), file_entry, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
- file_btn = gtk_button_new_with_label( _(" ... "));
+ file_btn = gtkut_get_browse_file_btn(_("_Browse"));
gtk_table_attach(GTK_TABLE(table), file_btn, 2, 3, top, (top + 1), GTK_FILL, 0, 3, 0);
/* Status line */
gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
/* Button panel */
- gtkut_button_set_create(&hbbox, &ok_btn, _("OK"),
- &cancel_btn, _("Cancel"), NULL, NULL);
+ gtkut_stock_button_set_create(&hbbox, &cancel_btn, GTK_STOCK_CANCEL,
+ &ok_btn, GTK_STOCK_OK,
+ NULL, NULL);
gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
- gtk_container_set_border_width( GTK_CONTAINER(hbbox), 0 );
+ gtk_container_set_border_width( GTK_CONTAINER(hbbox), 5);
gtk_widget_grab_default(ok_btn);
- hsep = gtk_hseparator_new();
- gtk_box_pack_end(GTK_BOX(vbox), hsep, FALSE, FALSE, 0);
-
- gtk_signal_connect(GTK_OBJECT(ok_btn), "clicked",
- GTK_SIGNAL_FUNC(imp_mutt_ok), cancelled);
- gtk_signal_connect(GTK_OBJECT(cancel_btn), "clicked",
- GTK_SIGNAL_FUNC(imp_mutt_cancel), cancelled);
- gtk_signal_connect(GTK_OBJECT(file_btn), "clicked",
- GTK_SIGNAL_FUNC(imp_mutt_file_select), NULL);
+ g_signal_connect(G_OBJECT(ok_btn), "clicked",
+ G_CALLBACK(imp_mutt_ok), cancelled);
+ g_signal_connect(G_OBJECT(cancel_btn), "clicked",
+ G_CALLBACK(imp_mutt_cancel), cancelled);
+ g_signal_connect(G_OBJECT(file_btn), "clicked",
+ G_CALLBACK(imp_mutt_file_select), NULL);
gtk_widget_show_all(vbox);
gtk_widget_grab_focus(impmutt_dlg.file_entry);
gtk_widget_show(impmutt_dlg.window);
manage_window_set_transient(GTK_WINDOW(impmutt_dlg.window));
+ gtk_window_set_modal(GTK_WINDOW(impmutt_dlg.window), TRUE);
imp_mutt_status_show( _( "Please select a file to import." ) );
muttFile = mutt_find_file();
gtk_main();
gtk_widget_hide(impmutt_dlg.window);
+ gtk_window_set_modal(GTK_WINDOW(impmutt_dlg.window), FALSE);
_imp_addressIndex_ = NULL;
if (cancelled == TRUE) return NULL;
projects / claws.git / blobdiff