*/
/*
- * Edit VCard address book data.
+ * Edit vCard address book data.
*/
#ifdef HAVE_CONFIG_H
#include "defs.h"
#include <glib.h>
+#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtkwindow.h>
#include <gtk/gtksignal.h>
+#include <gtk/gtkvbox.h>
#include <gtk/gtklabel.h>
#include <gtk/gtkentry.h>
#include <gtk/gtktable.h>
#include <gtk/gtkbutton.h>
+#include <gtk/gtkstatusbar.h>
+#include <gtk/gtkfilesel.h>
+#include <gtk/gtkhseparator.h>
+#include <gtk/gtkstock.h>
-#include "intl.h"
#include "addressbook.h"
#include "prefs_common.h"
#include "addressitem.h"
#include "vcard.h"
#include "mgutils.h"
+#include "filesel.h"
+#include "gtkutils.h"
+#include "codeconv.h"
+#include "manage_window.h"
#define ADDRESSBOOK_GUESS_VCARD "MyGnomeCard"
gint status_cid;
} vcardedit;
-static struct _AddressFileSelection vcard_file_selector;
-
/*
* Edit functions.
*/
static void edit_vcard_file_check( void ) {
gint t;
gchar *sFile;
+ gchar *sFSFile;
gchar *sMsg;
sFile = gtk_editable_get_chars( GTK_EDITABLE(vcardedit.file_entry), 0, -1 );
- t = vcard_test_read_file( sFile );
+ sFSFile = conv_filename_from_utf8( sFile );
+ t = vcard_test_read_file( sFSFile );
+ g_free( sFSFile );
g_free( sFile );
if( t == MGU_SUCCESS ) {
sMsg = "";
}
else if( t == MGU_BAD_FORMAT ) {
- sMsg = _("File does not appear to be VCard format.");
+ sMsg = _("File does not appear to be vCard format.");
}
else {
sMsg = _("Could not read file.");
edit_vcard_status_show( sMsg );
}
-static void edit_vcard_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(vcardedit.file_entry), sFile );
- gtk_widget_hide( afs->fileSelector );
- gtk_grab_remove( afs->fileSelector );
- edit_vcard_file_check();
- gtk_widget_grab_focus( vcardedit.file_entry );
-}
-
-static void edit_vcard_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( vcardedit.file_entry );
-}
-
-static void edit_vcard_file_select_create( AddressFileSelection *afs ) {
- GtkWidget *fileSelector;
-
- fileSelector = gtk_file_selection_new( _("Select VCard 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 (edit_vcard_file_ok), ( gpointer ) afs );
- gtk_signal_connect( GTK_OBJECT (GTK_FILE_SELECTION(fileSelector)->cancel_button),
- "clicked", GTK_SIGNAL_FUNC (edit_vcard_file_cancel), ( gpointer ) afs );
- afs->fileSelector = fileSelector;
- afs->cancelled = TRUE;
-}
-
static void edit_vcard_file_select( void ) {
gchar *sFile;
+ gchar *sUTF8File;
- if (! vcard_file_selector.fileSelector )
- edit_vcard_file_select_create( & vcard_file_selector );
+ sFile = filesel_select_file_open( _("Select vCard File"), NULL);
- sFile = gtk_editable_get_chars( GTK_EDITABLE(vcardedit.file_entry), 0, -1 );
- gtk_file_selection_set_filename( GTK_FILE_SELECTION( vcard_file_selector.fileSelector ), sFile );
- g_free( sFile );
- gtk_widget_show( vcard_file_selector.fileSelector );
- gtk_grab_add( vcard_file_selector.fileSelector );
+ if( sFile ) {
+ sUTF8File = conv_filename_to_utf8( sFile );
+ gtk_entry_set_text( GTK_ENTRY(vcardedit.file_entry), sUTF8File );
+ g_free( sUTF8File );
+ g_free( sFile );
+ edit_vcard_file_check();
+ }
}
static gint edit_vcard_delete_event( GtkWidget *widget, GdkEventAny *event, gboolean *cancelled ) {
return TRUE;
}
-static void edit_vcard_key_pressed( GtkWidget *widget, GdkEventKey *event, gboolean *cancelled ) {
+static gboolean edit_vcard_key_pressed( GtkWidget *widget, GdkEventKey *event, gboolean *cancelled ) {
if (event && event->keyval == GDK_Escape) {
*cancelled = TRUE;
gtk_main_quit();
}
+ return FALSE;
}
static void addressbook_edit_vcard_create( gboolean *cancelled ) {
GtkWidget *hsbox;
gint top;
- window = gtk_window_new(GTK_WINDOW_DIALOG);
- gtk_widget_set_usize(window, 450, -1);
+ window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ gtk_widget_set_size_request(window, 450, -1);
gtk_container_set_border_width( GTK_CONTAINER(window), 0 );
- gtk_window_set_title(GTK_WINDOW(window), _("Edit VCard Entry"));
+ gtk_window_set_title(GTK_WINDOW(window), _("Edit vCard Entry"));
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(edit_vcard_delete_event),
- cancelled);
- gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
- GTK_SIGNAL_FUNC(edit_vcard_key_pressed),
- cancelled);
+ g_signal_connect(G_OBJECT(window), "delete_event",
+ G_CALLBACK(edit_vcard_delete_event),
+ cancelled);
+ g_signal_connect(G_OBJECT(window), "key_press_event",
+ G_CALLBACK(edit_vcard_key_pressed),
+ cancelled);
vbox = gtk_vbox_new(FALSE, 8);
gtk_container_add(GTK_CONTAINER(window), vbox);
gtk_table_set_row_spacings(GTK_TABLE(table), 8);
gtk_table_set_col_spacings(GTK_TABLE(table), 8 );
- // First row
+ /* First row */
top = 0;
label = gtk_label_new(_("Name"));
gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0);
check_btn = gtk_button_new_with_label( _(" Check File "));
gtk_table_attach(GTK_TABLE(table), check_btn, 2, 3, top, (top + 1), GTK_FILL, 0, 3, 0);
- // Second row
+ /* Second row */
top = 1;
label = gtk_label_new(_("File"));
gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0);
file_btn = gtk_button_new_with_label( _(" ... "));
gtk_table_attach(GTK_TABLE(table), file_btn, 2, 3, top, (top + 1), GTK_FILL, 0, 3, 0);
- // Status line
+ /* Status line */
hsbox = gtk_hbox_new(FALSE, 0);
gtk_box_pack_end(GTK_BOX(vbox), hsbox, FALSE, FALSE, BORDER_WIDTH);
statusbar = gtk_statusbar_new();
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);
+ /* Button panel */
+ gtkut_stock_button_set_create(&hbbox, &ok_btn, GTK_STOCK_OK,
+ &cancel_btn, 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 );
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(edit_vcard_ok), cancelled);
- gtk_signal_connect(GTK_OBJECT(cancel_btn), "clicked",
- GTK_SIGNAL_FUNC(edit_vcard_cancel), cancelled);
- gtk_signal_connect(GTK_OBJECT(file_btn), "clicked",
- GTK_SIGNAL_FUNC(edit_vcard_file_select), NULL);
- gtk_signal_connect(GTK_OBJECT(check_btn), "clicked",
- GTK_SIGNAL_FUNC(edit_vcard_file_check), NULL);
+ g_signal_connect(G_OBJECT(ok_btn), "clicked",
+ G_CALLBACK(edit_vcard_ok), cancelled);
+ g_signal_connect(G_OBJECT(cancel_btn), "clicked",
+ G_CALLBACK(edit_vcard_cancel), cancelled);
+ g_signal_connect(G_OBJECT(file_btn), "clicked",
+ G_CALLBACK(edit_vcard_file_select), NULL);
+ g_signal_connect(G_OBJECT(check_btn), "clicked",
+ G_CALLBACK(edit_vcard_file_check), NULL);
gtk_widget_show_all(vbox);
vcardedit.ok_btn = ok_btn;
vcardedit.cancel_btn = cancel_btn;
vcardedit.statusbar = statusbar;
- vcardedit.status_cid = gtk_statusbar_get_context_id( GTK_STATUSBAR(statusbar), "Edit VCard Dialog" );
+ vcardedit.status_cid = gtk_statusbar_get_context_id( GTK_STATUSBAR(statusbar), "Edit vCard Dialog" );
}
AdapterDSource *addressbook_edit_vcard( AddressIndex *addrIndex, AdapterDSource *ads ) {
static gboolean cancelled;
gchar *sName;
gchar *sFile;
+ gchar *sFSFile;
AddressDataSource *ds = NULL;
VCardFile *vcf = NULL;
gboolean fin;
if( ads ) {
ds = ads->dataSource;
vcf = ds->rawDataSource;
- if (vcf->name)
- gtk_entry_set_text(GTK_ENTRY(vcardedit.name_entry), vcf->name);
+ if ( vcard_get_name( vcf ) )
+ gtk_entry_set_text(GTK_ENTRY(vcardedit.name_entry), vcard_get_name( vcf ) );
if (vcf->path)
gtk_entry_set_text(GTK_ENTRY(vcardedit.file_entry), vcf->path);
- gtk_window_set_title( GTK_WINDOW(vcardedit.window), _("Edit VCard Entry"));
+ gtk_window_set_title( GTK_WINDOW(vcardedit.window), _("Edit vCard Entry"));
}
else {
gtk_entry_set_text(GTK_ENTRY(vcardedit.name_entry), ADDRESSBOOK_GUESS_VCARD );
gtk_entry_set_text(GTK_ENTRY(vcardedit.file_entry), vcard_find_gnomecard() );
- gtk_window_set_title( GTK_WINDOW(vcardedit.window), _("Add New VCard Entry"));
+ gtk_window_set_title( GTK_WINDOW(vcardedit.window), _("Add New vCard Entry"));
}
gtk_main();
fin = FALSE;
sName = gtk_editable_get_chars( GTK_EDITABLE(vcardedit.name_entry), 0, -1 );
sFile = gtk_editable_get_chars( GTK_EDITABLE(vcardedit.file_entry), 0, -1 );
+ sFSFile = conv_filename_from_utf8( sFile );
if( *sName == '\0' ) fin = TRUE;
if( *sFile == '\0' ) fin = TRUE;
+ if( ! sFSFile || *sFSFile == '\0' ) fin = TRUE;
if( ! fin ) {
if( ! ads ) {
}
addressbook_ads_set_name( ads, sName );
vcard_set_name( vcf, sName );
- vcard_set_file( vcf, sFile );
+ vcard_set_file( vcf, sFSFile );
}
- g_free( sName );
+ g_free( sFSFile );
g_free( sFile );
+ g_free( sName );
return ads;
}