Diff of /trunk/src/main.c

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

revision 157 by harbaum, Tue Nov 3 20:20:39 2009 UTC revision 165 by harbaum, Sun Nov 8 20:32:55 2009 UTC
# Line 31  Line 31 
31    
32  #ifdef USE_MAEMO  #ifdef USE_MAEMO
33  #include <hildon/hildon-banner.h>  #include <hildon/hildon-banner.h>
34    #if MAEMO_VERSION_MAJOR >= 5
35    #include <hildon/hildon-note.h>
36    #endif
37  #endif  #endif
38    
39  #include <locale.h>  #include <locale.h>
# Line 94  void errorf(const char *fmt, ...) { Line 97  void errorf(const char *fmt, ...) {
97      }      }
98    }    }
99    
100    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
101    GtkWidget *dialog = gtk_message_dialog_new(    GtkWidget *dialog = gtk_message_dialog_new(
102                             GTK_WINDOW(NULL),                             GTK_WINDOW(NULL),
103                             GTK_DIALOG_DESTROY_WITH_PARENT,                             GTK_DIALOG_DESTROY_WITH_PARENT,
 #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)  
104                             GTK_MESSAGE_ERROR,                             GTK_MESSAGE_ERROR,
 #else  
                            GTK_MESSAGE_OTHER,  
 #endif  
105                             GTK_BUTTONS_CLOSE, buf);                             GTK_BUTTONS_CLOSE, buf);
106    
107    gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));    gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));
108    #else
109      GtkWidget *dialog =
110        hildon_note_new_information(GTK_WINDOW(NULL), buf);
111    #endif
112    
113    gtk_dialog_run(GTK_DIALOG(dialog));    gtk_dialog_run(GTK_DIALOG(dialog));
114    gtk_widget_destroy(dialog);    gtk_widget_destroy(dialog);
# Line 776  static void gpxlist_view_onRowActivated( Line 780  static void gpxlist_view_onRowActivated(
780      if(col_name && !strcmp(col_name, "Del")) {      if(col_name && !strcmp(col_name, "Del")) {
781        printf("clicked delete\n");        printf("clicked delete\n");
782    
783    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
784        /* ask user what he wants */        /* ask user what he wants */
785        GtkWidget *dialog = gtk_message_dialog_new(        GtkWidget *dialog = gtk_message_dialog_new(
786                   GTK_WINDOW(appdata->window),                   GTK_WINDOW(appdata->window),
787                   GTK_DIALOG_DESTROY_WITH_PARENT,                   GTK_DIALOG_DESTROY_WITH_PARENT,
                  /* this doesn't fix the text selection issues ... */  
 #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR >=5)  
                  GTK_MESSAGE_OTHER,  
 #else  
788                   GTK_MESSAGE_QUESTION,                   GTK_MESSAGE_QUESTION,
 #endif  
789                   GTK_BUTTONS_CANCEL,                   GTK_BUTTONS_CANCEL,
790                   _("Do you want to close this entry only or do "                   _("Do you want to close this entry only or do "
791                     "you want to remove it completely from the list?"));                     "you want to remove it completely from the list?"));
# Line 795  static void gpxlist_view_onRowActivated( Line 795  static void gpxlist_view_onRowActivated(
795                               _("Close"), 2,                               _("Close"), 2,
796                               NULL);                               NULL);
797    
798          gtk_window_set_title(GTK_WINDOW(dialog), _("Close or remove entry?"));
799    #else
800    
801          GtkWidget *dialog =
802            gtk_dialog_new_with_buttons(_("Close or remove entry?"),
803                                GTK_WINDOW(appdata->window),
804                                GTK_DIALOG_DESTROY_WITH_PARENT,
805                                GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
806                                _("Remove"), 1,
807                                _("Close"), 2,
808                                NULL);
809    
810          GtkWidget *content_area =
811            gtk_dialog_get_content_area (GTK_DIALOG (dialog));
812    
813          GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
814    
815          gtk_box_pack_start(GTK_BOX(hbox),
816             gtk_image_new_from_stock( GTK_STOCK_DIALOG_QUESTION,
817                                       GTK_ICON_SIZE_DIALOG),
818                             FALSE, FALSE, 0);
819    
820          GtkWidget *label = gtk_label_new(
821                      _("Do you want to close this entry only or do "
822                        "you want to remove it completely from the list?"));
823    
824          gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
825          gtk_label_set_line_wrap_mode(GTK_LABEL(label), PANGO_WRAP_WORD);
826    
827          gtk_box_pack_start_defaults(GTK_BOX(hbox), label);
828          gtk_container_add (GTK_CONTAINER (content_area), hbox);
829    
830          gtk_widget_show_all (dialog);
831    #endif
832    
833        if(gpx->closed)        if(gpx->closed)
834          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);
835    
       gtk_window_set_title(GTK_WINDOW(dialog), _("Close or remove entry?"));  
   
836        /* set the active flag again if the user answered "no" */        /* set the active flag again if the user answered "no" */
837        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {
838    
Legend:
Removed from v.157  
changed lines
  Added in v.165