/[gnokii]/gnokii/xgnokii/xgnokii_contacts.c
ViewVC logotype

Diff of /gnokii/xgnokii/xgnokii_contacts.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.63 by pkot, Sun Apr 24 20:57:37 2005 UTC revision 1.64 by ja, Wed Aug 10 07:33:43 2005 UTC
# Line 23  Line 23 
23    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
24    
25    Copyright (C) 1999      Pavel Janík ml., Hugh Blemings    Copyright (C) 1999      Pavel Janík ml., Hugh Blemings
26    Copyright (C) 1999-2002 Ján Derfiňák <ja@mail.upjs.sk>.    Copyright (C) 1999-2005 Jan Derfinak
27    Copyright (C) 2002      Markus Plail, Pavel Machek    Copyright (C) 2002      Markus Plail, Pavel Machek
28    Copyright (C) 2002-2004 Pawel Kot, BORBELY Zoltan    Copyright (C) 2002-2004 Pawel Kot, BORBELY Zoltan
29    Copyright (C) 2002-2003 Uli Hopp    Copyright (C) 2002-2003 Uli Hopp
# Line 32  Line 32 
32  */  */
33    
34    
35    #include <gtk/gtk.h>
36  #include "misc.h"  #include "misc.h"
37    
38  #include <stdio.h>  #include <stdio.h>
# Line 45  Line 46 
46    
47  #include <stdlib.h>  #include <stdlib.h>
48  #include <string.h>  #include <string.h>
 #include <gtk/gtk.h>  
49    
50  #include "gnokii.h"  #include "gnokii.h"
51  #include "xgnokii_contacts.h"  #include "xgnokii_contacts.h"
# Line 1173  static void EditSubEntries(GtkWidget * c Line 1173  static void EditSubEntries(GtkWidget * c
1173          gint type;          gint type;
1174    
1175          if (editSubEntriesData.dialog == NULL)          if (editSubEntriesData.dialog == NULL)
1176                  CreateSubEntriesDialog(&editSubEntriesData, _("Edit entry"), OkEditSubEntriesDialog, row);                  CreateSubEntriesDialog(&editSubEntriesData, _("Edit entry"), (GtkSignalFunc) OkEditSubEntriesDialog, row);
1177    
1178          gtk_clist_get_text(GTK_CLIST(clist), row, 1, &buf);          gtk_clist_get_text(GTK_CLIST(clist), row, 1, &buf);
1179          editNumbersData.row = row;          editNumbersData.row = row;
# Line 1567  static void EditPbEntry(PhonebookEntry * Line 1567  static void EditPbEntry(PhonebookEntry *
1567          editSubEntriesData.pbEntry = pbEntry;          editSubEntriesData.pbEntry = pbEntry;
1568    
1569          if (editEditEntryData.dialog == NULL)          if (editEditEntryData.dialog == NULL)
1570                  CreateEditDialog(&editEditEntryData, _("Edit entry"), OkEditEntryDialog);                  CreateEditDialog(&editEditEntryData, _("Edit entry"), (GtkSignalFunc) OkEditEntryDialog);
1571    
1572    
1573          gtk_entry_set_text(GTK_ENTRY(editEditEntryData.name), pbEntry->entry.name);          gtk_entry_set_text(GTK_ENTRY(editEditEntryData.name), pbEntry->entry.name);
# Line 1660  void NewPbEntry(PhonebookEntry * pbEntry Line 1660  void NewPbEntry(PhonebookEntry * pbEntry
1660          editSubEntriesData.pbEntry = pbEntry;          editSubEntriesData.pbEntry = pbEntry;
1661    
1662          if (newEditEntryData.dialog == NULL)          if (newEditEntryData.dialog == NULL)
1663                  CreateEditDialog(&newEditEntryData, _("New entry"), OkNewEntryDialog);                  CreateEditDialog(&newEditEntryData, _("New entry"), (GtkSignalFunc) OkNewEntryDialog);
1664    
1665          gtk_entry_set_text(GTK_ENTRY(newEditEntryData.name), pbEntry->entry.name);          gtk_entry_set_text(GTK_ENTRY(newEditEntryData.name), pbEntry->entry.name);
1666    
# Line 1704  void DuplicatePbEntry(PhonebookEntry * p Line 1704  void DuplicatePbEntry(PhonebookEntry * p
1704          editSubEntriesData.pbEntry = pbEntry;          editSubEntriesData.pbEntry = pbEntry;
1705    
1706          if (duplicateEditEntryData.dialog == NULL)          if (duplicateEditEntryData.dialog == NULL)
1707                  CreateEditDialog(&duplicateEditEntryData, _("Duplicate entry"), OkNewEntryDialog);                  CreateEditDialog(&duplicateEditEntryData, _("Duplicate entry"), (GtkSignalFunc) OkNewEntryDialog);
1708    
1709          gtk_entry_set_text(GTK_ENTRY(duplicateEditEntryData.name), pbEntry->entry.name);          gtk_entry_set_text(GTK_ENTRY(duplicateEditEntryData.name), pbEntry->entry.name);
1710    
# Line 2109  static void CreateProgressDialog(gint ma Line 2109  static void CreateProgressDialog(gint ma
2109          GtkWidget *vbox, *label;          GtkWidget *vbox, *label;
2110          GtkAdjustment *adj;          GtkAdjustment *adj;
2111    
2112          progressDialog.dialog = gtk_window_new(GTK_WINDOW_DIALOG);          progressDialog.dialog = gtk_dialog_new();
2113          gtk_window_position(GTK_WINDOW(progressDialog.dialog), GTK_WIN_POS_MOUSE);          gtk_window_position(GTK_WINDOW(progressDialog.dialog), GTK_WIN_POS_MOUSE);
2114          gtk_window_set_modal(GTK_WINDOW(progressDialog.dialog), TRUE);          gtk_window_set_modal(GTK_WINDOW(progressDialog.dialog), TRUE);
2115          gtk_signal_connect(GTK_OBJECT(progressDialog.dialog), "delete_event",          gtk_signal_connect(GTK_OBJECT(progressDialog.dialog), "delete_event",
# Line 2583  static void ReadSaveContacts(void) Line 2583  static void ReadSaveContacts(void)
2583          static GtkWidget *dialog = NULL;          static GtkWidget *dialog = NULL;
2584    
2585          if (dialog == NULL)          if (dialog == NULL)
2586                  dialog = CreateSaveQuestionDialog(ReadSaveCallback, ReadDontSaveCallback);                  dialog = CreateSaveQuestionDialog((GtkSignalFunc) ReadSaveCallback, (GtkSignalFunc) ReadDontSaveCallback);
2587    
2588          gtk_widget_show(dialog);          gtk_widget_show(dialog);
2589  }  }
# Line 2751  static void OkExportDialog(GtkWidget * w Line 2751  static void OkExportDialog(GtkWidget * w
2751          FILE *f;          FILE *f;
2752          gchar err[255];          gchar err[255];
2753    
2754          exportDialogData.fileName = gtk_file_selection_get_filename(GTK_FILE_SELECTION(fs));          exportDialogData.fileName = (gchar *)gtk_file_selection_get_filename(GTK_FILE_SELECTION(fs));
2755          gtk_widget_hide(GTK_WIDGET(fs));          gtk_widget_hide(GTK_WIDGET(fs));
2756    
2757          if ((f = fopen(exportDialogData.fileName, "r")) != NULL) {          if ((f = fopen(exportDialogData.fileName, "r")) != NULL) {
2758                  fclose(f);                  fclose(f);
2759                  if (dialog.dialog == NULL) {                  if (dialog.dialog == NULL) {
2760                          CreateYesNoDialog(&dialog, YesExportDialog, CancelDialog,                          CreateYesNoDialog(&dialog, (GtkSignalFunc) YesExportDialog, (GtkSignalFunc) CancelDialog,
2761                                            GUI_ContactsWindow);                                            GUI_ContactsWindow);
2762                          gtk_window_set_title(GTK_WINDOW(dialog.dialog), _("Overwrite file?"));                          gtk_window_set_title(GTK_WINDOW(dialog.dialog), _("Overwrite file?"));
2763                          g_snprintf(err, 255, _("File %s already exist.\nOverwrite?"),                          g_snprintf(err, 255, _("File %s already exist.\nOverwrite?"),
# Line 2803  static void OkImportDialog(GtkWidget * w Line 2803  static void OkImportDialog(GtkWidget * w
2803          gchar *fileName;          gchar *fileName;
2804          gint i;          gint i;
2805    
2806          fileName = gtk_file_selection_get_filename(GTK_FILE_SELECTION(fs));          fileName = (gchar *) gtk_file_selection_get_filename(GTK_FILE_SELECTION(fs));
2807          gtk_widget_hide(GTK_WIDGET(fs));          gtk_widget_hide(GTK_WIDGET(fs));
2808    
2809          if ((f = fopen(fileName, "r")) == NULL) {          if ((f = fopen(fileName, "r")) == NULL) {
# Line 2992  void static ImportSaveContacts(void) Line 2992  void static ImportSaveContacts(void)
2992          static GtkWidget *dialog = NULL;          static GtkWidget *dialog = NULL;
2993    
2994          if (dialog == NULL)          if (dialog == NULL)
2995                  dialog = CreateSaveQuestionDialog(ImportSaveCallback, ImportDontSaveCallback);                  dialog = CreateSaveQuestionDialog((GtkSignalFunc) ImportSaveCallback, (GtkSignalFunc) ImportDontSaveCallback);
2996    
2997          gtk_widget_show(dialog);          gtk_widget_show(dialog);
2998  }  }
# Line 3041  void GUI_QuitSaveContacts(void) Line 3041  void GUI_QuitSaveContacts(void)
3041          static GtkWidget *dialog = NULL;          static GtkWidget *dialog = NULL;
3042    
3043          if (dialog == NULL)          if (dialog == NULL)
3044                  dialog = CreateSaveQuestionDialog(QuitSaveCallback, QuitDontSaveCallback);                  dialog = CreateSaveQuestionDialog((GtkSignalFunc) QuitSaveCallback, (GtkSignalFunc) QuitDontSaveCallback);
3045    
3046          gtk_widget_show(dialog);          gtk_widget_show(dialog);
3047  }  }
# Line 3345  void GUI_CreateContactsWindow(void) Line 3345  void GUI_CreateContactsWindow(void)
3345    
3346          gtk_item_factory_create_items(item_factory, nmenu_items, menu_items, NULL);          gtk_item_factory_create_items(item_factory, nmenu_items, menu_items, NULL);
3347    
3348          gtk_accel_group_attach(accel_group, GTK_OBJECT(GUI_ContactsWindow));          gtk_window_add_accel_group(GTK_WINDOW(GUI_ContactsWindow), accel_group);
3349    
3350          /* Finally, return the actual menu bar created by the item factory. */          /* Finally, return the actual menu bar created by the item factory. */
3351          menubar = gtk_item_factory_get_widget(item_factory, "<main>");          menubar = gtk_item_factory_get_widget(item_factory, "<main>");
# Line 3360  void GUI_CreateContactsWindow(void) Line 3360  void GUI_CreateContactsWindow(void)
3360    
3361          /* Create the toolbar */          /* Create the toolbar */
3362    
3363          toolbar = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_ICONS);          toolbar = gtk_toolbar_new();
3364          gtk_toolbar_set_button_relief(GTK_TOOLBAR(toolbar), GTK_RELIEF_NORMAL);          gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS);
3365            gtk_toolbar_set_orientation(GTK_TOOLBAR(toolbar), GTK_ORIENTATION_HORIZONTAL);
3366    
3367          gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), NULL, _("Read from phone"), NULL,          gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), NULL, _("Read from phone"), NULL,
3368                                  NewPixmap(Read_xpm, GUI_ContactsWindow->window,                                  NewPixmap(Read_xpm, GUI_ContactsWindow->window,

Legend:
Removed from v.1.63  
changed lines
  Added in v.1.64

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26