Diff of /trunk/src/main.c

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

revision 132 by harbaum, Wed Sep 30 12:11:22 2009 UTC revision 133 by harbaum, Mon Oct 12 20:27:55 2009 UTC
# Line 754  static void gpxlist_view_onRowActivated( Line 754  static void gpxlist_view_onRowActivated(
754        GtkWidget *dialog = gtk_message_dialog_new(        GtkWidget *dialog = gtk_message_dialog_new(
755                   GTK_WINDOW(appdata->window),                   GTK_WINDOW(appdata->window),
756                   GTK_DIALOG_DESTROY_WITH_PARENT,                   GTK_DIALOG_DESTROY_WITH_PARENT,
757                   GTK_MESSAGE_QUESTION, GTK_BUTTONS_CANCEL,                   /* this doesn't fix the text selection issues ... */
758    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR >=5)
759                     GTK_MESSAGE_OTHER,
760    #else
761                     GTK_MESSAGE_QUESTION,
762    #endif
763                     GTK_BUTTONS_CANCEL,
764                   _("Do you want to close this entry only or do "                   _("Do you want to close this entry only or do "
765                     "you want to remove it completely from the list?"));                     "you want to remove it completely from the list?"));
766    
# Line 766  static void gpxlist_view_onRowActivated( Line 772  static void gpxlist_view_onRowActivated(
772        if(gpx->closed)        if(gpx->closed)
773          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);
774    
775        gtk_window_set_title(GTK_WINDOW(dialog), _("Remove entry?"));        gtk_window_set_title(GTK_WINDOW(dialog), _("Close or remove entry?"));
776    
777        /* set the active flag again if the user answered "no" */        /* set the active flag again if the user answered "no" */
778        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {
# Line 1850  void menu_create(appdata_t *appdata) { Line 1856  void menu_create(appdata_t *appdata) {
1856    
1857    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1858    
 #ifndef NO_COPY_N_PASTE  
1859    /* ----------- copy'n paste submenu ----------------- */    /* ----------- copy'n paste submenu ----------------- */
1860    appdata->clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);  #ifndef NO_COPY_N_PASTE
   gtk_clipboard_set_can_store(appdata->clipboard, NULL, 0);  
   
1861    item = gtk_menu_item_new_with_label(_("Edit"));    item = gtk_menu_item_new_with_label(_("Edit"));
1862    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1863    submenu = gtk_menu_new();    submenu = gtk_menu_new();
# Line 2327  int main(int argc, char *argv[]) { Line 2330  int main(int argc, char *argv[]) {
2330    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",
2331                     G_CALLBACK(on_window_key_press), &appdata);                     G_CALLBACK(on_window_key_press), &appdata);
2332    
2333      /* prepare clipboard */
2334      appdata.clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
2335      gtk_clipboard_set_can_store(appdata.clipboard, NULL, 0);
2336    
2337    appdata.vbox = gtk_vbox_new(FALSE, 2);    appdata.vbox = gtk_vbox_new(FALSE, 2);
2338    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);
2339  #ifndef USE_STACKABLE_WINDOW  #ifndef USE_STACKABLE_WINDOW
Legend:
Removed from v.132  
changed lines
  Added in v.133