Diff of /trunk/src/notes.c

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

revision 199 by harbaum, Thu Nov 19 13:33:35 2009 UTC revision 299 by harbaum, Fri Aug 27 12:04:34 2010 UTC
# Line 19  Line 19 
19    
20  #include <stdio.h>  #include <stdio.h>
21  #include <string.h>  #include <string.h>
22    #include <errno.h>
23    
24  #include <glib/gunicode.h>  #include <glib/gunicode.h>
25    
# Line 48  void gtk_text_buffer_set_rich_text_forma Line 49  void gtk_text_buffer_set_rich_text_forma
49    
50  #define TAG_STATE  GTK_STATE_PRELIGHT  #define TAG_STATE  GTK_STATE_PRELIGHT
51    
 static GtkWidget *check_button_new_with_label(char *label) {  
 #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)  
   return gtk_check_button_new_with_label(label);  
 #else  
   GtkWidget *cbut =  
     hildon_check_button_new(HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH);  
   gtk_button_set_label(GTK_BUTTON(cbut), label);  
   return cbut;  
 #endif  
 }  
   
 static void check_button_set_active(GtkWidget *button, gboolean active) {  
 #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)  
   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), active);  
 #else  
   hildon_check_button_set_active(HILDON_CHECK_BUTTON(button), active);  
 #endif  
 }  
   
 static gboolean check_button_get_active(GtkWidget *button) {  
 #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)  
   return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button));  
 #else  
   return hildon_check_button_get_active(HILDON_CHECK_BUTTON(button));  
 #endif  
 }  
   
52  static notes_t *notes_load(appdata_t *appdata, cache_t *cache) {  static notes_t *notes_load(appdata_t *appdata, cache_t *cache) {
53    notes_t *notes = NULL;    notes_t *notes = NULL;
54    xmlDoc *doc = NULL;    xmlDoc *doc = NULL;
# Line 198  static int notes_write_file(cache_contex Line 172  static int notes_write_file(cache_contex
172                        char *text, pos_t pos,                        char *text, pos_t pos,
173                        gboolean override, gboolean found,                        gboolean override, gboolean found,
174                        time_t ftime, gboolean logged) {                        time_t ftime, gboolean logged) {
175    
176      g_assert(context);
177      g_assert(context->cache);
178    
179    /* build local path */    /* build local path */
180    int path_len = strlen(context->appdata->image_path) +    int path_len = strlen(context->appdata->image_path) +
181      2 * strlen(context->cache->id) + 6;      2 * strlen(context->cache->id) + 6;
182    
183    char *path = malloc(path_len);    char *path = malloc(path_len);
184    snprintf(path, path_len, "%s%s/%s.gpx",    snprintf(path, path_len, "%s%s/%s.gpx",
185             context->appdata->image_path,             context->appdata->image_path,
# Line 273  static void notes_save(cache_context_t * Line 252  static void notes_save(cache_context_t *
252    /* or has been changed */    /* or has been changed */
253    
254    if(context->notes.modified) {    if(context->notes.modified) {
255    #ifdef USE_STACKABLE_WINDOW
256        context->notes_have_been_changed = TRUE;
257    #endif
258    
259      printf("something has been modified, saving notes\n");      printf("something has been modified, saving notes\n");
260    
261      GtkTextIter start;      GtkTextIter start;
# Line 283  static void notes_save(cache_context_t * Line 266  static void notes_save(cache_context_t *
266                                            &start, &end, FALSE);                                            &start, &end, FALSE);
267    
268      pos_t pos;      pos_t pos;
269      pos.lat = lat_get(context->notes.latw);      pos.lat = lat_entry_get(context->notes.latw);
270      pos.lon = lon_get(context->notes.lonw);      pos.lon = lon_entry_get(context->notes.lonw);
271    
272      gboolean override =      gboolean override =
273        check_button_get_active(context->notes.overridew);        check_button_get_active(context->notes.overridew);
# Line 293  static void notes_save(cache_context_t * Line 276  static void notes_save(cache_context_t *
276      gboolean logged =      gboolean logged =
277        check_button_get_active(context->notes.loggedw);        check_button_get_active(context->notes.loggedw);
278    
279      /* required accuracy is 1/60000 degree */      if(pos_differ(&pos, &context->cache->pos))
280      if(((int)(pos.lat * 60000 + .5) !=        printf("position is modified\n");
         (int)(context->cache->pos.lat * 60000 + .5)) ||  
        ((int)(pos.lon * 60000 + .5) !=  
         (int)(context->cache->pos.lon * 60000 + .5)))  
       printf("position is modified %f != %f / %f != %f\n",  
              pos.lat * 60000 + .5, context->cache->pos.lat * 60000 + .5,  
              pos.lon * 60000 + .5, context->cache->pos.lon * 60000 + .5);  
281      if(override || found)      if(override || found)
282        printf("flags are set\n");        printf("flags are set\n");
283      if(strlen(text))      if(strlen(text))
284        printf("text is present\n");        printf("text is present\n");
285    
286      /* check if the notes are empty */      /* check if the notes are empty */
287      if(((int)(pos.lat * 60000 + .5) ==      if(!pos_differ(&pos, &context->cache->pos) &&
         (int)(context->cache->pos.lat * 60000 + .5)) &&  
        ((int)(pos.lon * 60000 + .5) ==  
         (int)(context->cache->pos.lon * 60000 + .5)) &&  
288         !override && !found && !logged && (strlen(text) == 0)) {         !override && !found && !logged && (strlen(text) == 0)) {
289        printf("notes are in default state, removing them if present\n");        printf("notes are in default state, removing them if present\n");
290    
# Line 363  static void notes_save(cache_context_t * Line 337  static void notes_save(cache_context_t *
337        /* we have to do two things here: */        /* we have to do two things here: */
338        /* - update the notes.xml file on disk */        /* - update the notes.xml file on disk */
339        /* - update the notes entry in the loaded gpx tree */        /* - update the notes entry in the loaded gpx tree */
340    
341        /* update file on disk */        /* update file on disk */
342        notes_write_file(context, text, pos, override, found,        notes_write_file(context, text, pos, override, found,
343                         context->notes.ftime, logged);                         context->notes.ftime, logged);
344    
345        /* search for matching caches and replace note there */        /* search for matching caches and replace note there */
346        notes_t *note = NULL;        notes_t *note = NULL;
347        gpx_t *gpx = context->appdata->gpx;        gpx_t *gpx = context->appdata->gpx;
# Line 618  GtkWidget *cache_notes(cache_context_t * Line 592  GtkWidget *cache_notes(cache_context_t *
592    GtkWidget *table = gtk_table_new(2, 4, FALSE);    GtkWidget *table = gtk_table_new(2, 4, FALSE);
593  #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)  #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
594    gtk_table_set_col_spacing(GTK_TABLE(table), 0, 16);    gtk_table_set_col_spacing(GTK_TABLE(table), 0, 16);
   gtk_table_set_col_spacing(GTK_TABLE(table), 2, 16);  
595  #endif  #endif
596    
597      gtk_table_set_col_spacing(GTK_TABLE(table), 2, 16);
598    
599    gtk_table_attach_defaults(GTK_TABLE(table),    gtk_table_attach_defaults(GTK_TABLE(table),
600                      gtk_label_new(_("New coordinate:")), 0, 1, 0, 1);                      gtk_label_new(_("New coordinate:")), 0, 1, 0, 1);
601    context->notes.overridew = check_button_new_with_label(_("Override"));    context->notes.overridew = check_button_new_with_label(_("Override"));
602    check_button_set_active(context->notes.overridew,    check_button_set_active(context->notes.overridew,
603                            cache->notes && cache->notes->override);                            cache->notes && cache->notes->override);
604    gtk_table_attach_defaults(GTK_TABLE(table),    gtk_table_attach_defaults(GTK_TABLE(table),
605                              context->notes.overridew, 0, 1, 1, 2);                              context->notes.overridew, 2, 3, 0, 1);
606    
607    GtkWidget *hbox = gtk_hbox_new(FALSE, 2);    GtkWidget *hbox = gtk_hbox_new(FALSE, 2);
608    
# Line 658  GtkWidget *cache_notes(cache_context_t * Line 633  GtkWidget *cache_notes(cache_context_t *
633    pos_t pos = gpx_cache_pos(cache);    pos_t pos = gpx_cache_pos(cache);
634    if(cache->notes) pos = cache->notes->pos;    if(cache->notes) pos = cache->notes->pos;
635    
636    gtk_table_attach_defaults(GTK_TABLE(table),    context->notes.latw = lat_entry_new(pos.lat);
637              context->notes.latw = lat_entry_new(pos.lat), 2, 3, 0, 1);    context->notes.lonw = lon_entry_new(pos.lon);
638      GtkWidget *picker =
639        preset_coordinate_picker(context->appdata,
640                                 context->notes.latw, context->notes.lonw);
641    
642    g_signal_connect(G_OBJECT(context->notes.latw), "focus-out-event",    g_signal_connect(G_OBJECT(context->notes.latw), "focus-out-event",
643                     G_CALLBACK(focus_out), context);                     G_CALLBACK(focus_out), context);
   
   gtk_table_attach_defaults(GTK_TABLE(table),  
             context->notes.lonw = lon_entry_new(pos.lon), 2, 3, 1, 2);  
644    g_signal_connect(G_OBJECT(context->notes.lonw), "focus-out-event",    g_signal_connect(G_OBJECT(context->notes.lonw), "focus-out-event",
645                     G_CALLBACK(focus_out), context);                     G_CALLBACK(focus_out), context);
646    
647    
648      GtkWidget *ihbox = gtk_hbox_new(FALSE, 0);
649    
650      gtk_box_pack_start_defaults(GTK_BOX(ihbox), context->notes.latw);
651      gtk_box_pack_start_defaults(GTK_BOX(ihbox), context->notes.lonw);
652      gtk_box_pack_start_defaults(GTK_BOX(ihbox), picker);
653    
654      gtk_table_attach_defaults(GTK_TABLE(table),
655                                ihbox, 0, 3, 1, 2);
656    
657  #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)  #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
658    hbox = gtk_hbox_new(FALSE, 0);    hbox = gtk_hbox_new(FALSE, 0);
659    gtk_box_pack_start(GTK_BOX(hbox), table, FALSE, FALSE, 0);    gtk_box_pack_start(GTK_BOX(hbox), table, FALSE, FALSE, 0);
# Line 696  GtkWidget *cache_notes(cache_context_t * Line 682  GtkWidget *cache_notes(cache_context_t *
682    hildon_text_view_set_buffer(HILDON_TEXT_VIEW(view), context->notes.buffer);    hildon_text_view_set_buffer(HILDON_TEXT_VIEW(view), context->notes.buffer);
683  #endif  #endif
684    
685      /* if the cache has been marked found in the logs already, there's */
686      /* no need/use to be able to change all this */
687      if(cache->found) {
688        check_button_set_active(context->notes.loggedw, TRUE);
689        check_button_set_active(context->notes.foundw, TRUE);
690        gtk_widget_set_sensitive(table, FALSE);
691    
692        gtk_text_view_set_editable(GTK_TEXT_VIEW(view), FALSE);
693        gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(view), FALSE);
694      } else
695        gtk_text_view_set_editable(GTK_TEXT_VIEW(view), TRUE);
696    
697    gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(view), GTK_WRAP_WORD);    gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(view), GTK_WRAP_WORD);
   gtk_text_view_set_editable(GTK_TEXT_VIEW(view), TRUE);  
698    gtk_text_view_set_left_margin(GTK_TEXT_VIEW(view), 2 );    gtk_text_view_set_left_margin(GTK_TEXT_VIEW(view), 2 );
699    gtk_text_view_set_right_margin(GTK_TEXT_VIEW(view), 2 );    gtk_text_view_set_right_margin(GTK_TEXT_VIEW(view), 2 );
700    
# Line 755  void notes_free(notes_t *notes) { Line 752  void notes_free(notes_t *notes) {
752  pos_t notes_get_pos(cache_context_t *context) {  pos_t notes_get_pos(cache_context_t *context) {
753    pos_t pos = context->cache->pos;    pos_t pos = context->cache->pos;
754    if(check_button_get_active(context->notes.overridew)) {    if(check_button_get_active(context->notes.overridew)) {
755      pos.lat = lat_get(context->notes.latw);      pos.lat = lat_entry_get(context->notes.latw);
756      pos.lon = lon_get(context->notes.lonw);      pos.lon = lon_entry_get(context->notes.lonw);
757    }    }
758    return pos;    return pos;
759  }  }
# Line 770  typedef struct { Line 767  typedef struct {
767    GtkWidget *info_label;    GtkWidget *info_label;
768    GtkWidget *dialog;    GtkWidget *dialog;
769    appdata_t *appdata;    appdata_t *appdata;
   GtkWidget *path_label;  
770  } export_context_t;  } export_context_t;
771    
 static void on_browse(GtkWidget *widget, gpointer data) {  
   GtkWidget *dialog;  
   
   export_context_t *context = (export_context_t*)data;  
   
 #ifdef USE_MAEMO  
   dialog = hildon_file_chooser_dialog_new(GTK_WINDOW(context->dialog),  
                                           GTK_FILE_CHOOSER_ACTION_SAVE);  
 #else  
   dialog = gtk_file_chooser_dialog_new(_("Save POI database"),  
                                        GTK_WINDOW(context->dialog),  
                                        GTK_FILE_CHOOSER_ACTION_SAVE,  
                                        GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,  
                                        GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,  
                                        NULL);  
 #endif  
   
   printf("set filename <%s>\n", context->appdata->fieldnotes_path);  
   
   if(!g_file_test(context->appdata->fieldnotes_path, G_FILE_TEST_EXISTS)) {  
     char *last_sep = strrchr(context->appdata->fieldnotes_path, '/');  
     if(last_sep) {  
       *last_sep = 0;  // seperate path from file  
   
       /* the user just created a new document */  
       gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog),  
                                           context->appdata->fieldnotes_path);  
       gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog), last_sep+1);  
   
       /* restore full filename */  
       *last_sep = '/';  
     }  
   } else  
     gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog),  
                                   context->appdata->fieldnotes_path);  
   
   if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {  
     gchar *name = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));  
     if(name) {  
       free(context->appdata->fieldnotes_path);  
       context->appdata->fieldnotes_path = strdup(name);  
       gtk_label_set_text(GTK_LABEL(context->path_label),  
                          context->appdata->fieldnotes_path);  
     }  
   }  
   
   gtk_widget_destroy (dialog);  
 }  
   
772  typedef struct log_chain_s {  typedef struct log_chain_s {
773    cache_t *cache;    cache_t *cache;
774    struct log_chain_s *next;    struct log_chain_s *next;
# Line 911  void notes_log_export(appdata_t *appdata Line 858  void notes_log_export(appdata_t *appdata
858    /* ------------------ path/file ------------------ */    /* ------------------ path/file ------------------ */
859    gtk_box_pack_start_defaults(GTK_BOX(vbox), gtk_hseparator_new());    gtk_box_pack_start_defaults(GTK_BOX(vbox), gtk_hseparator_new());
860    
861    GtkWidget *hbox = gtk_hbox_new(FALSE, 0);    gtk_box_pack_start_defaults(GTK_BOX(vbox),
862    GtkWidget *label = gtk_label_new(_("Export to:"));       export_file(_("Save POI database"), &appdata->fieldnotes_path));
   gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE,0);  
   gtk_misc_set_alignment(GTK_MISC(label), 0.f, 0.5f);  
   GtkWidget *button = gtk_button_new_with_label(_("Browse"));  
 #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)  
   hildon_gtk_widget_set_theme_size(button,  
            (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));  
 #endif  
   gtk_signal_connect(GTK_OBJECT(button), "clicked",  
                      GTK_SIGNAL_FUNC(on_browse), (gpointer)&context);  
   gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE,0);  
   gtk_box_pack_start_defaults(GTK_BOX(vbox), hbox);  
   
   context.path_label = gtk_label_new(appdata->fieldnotes_path);  
   gtk_misc_set_alignment(GTK_MISC(context.path_label), 0.f, 0.5f);  
   gtk_label_set_ellipsize(GTK_LABEL(context.path_label),  
                           PANGO_ELLIPSIZE_MIDDLE);  
   gtk_box_pack_start_defaults(GTK_BOX(vbox), context.path_label);  
863    
864    label = gtk_label_new(_("(a %s in the filename will be replaced by the "    GtkWidget *label =
865                            "current date and time)"));      gtk_label_new(_("(a %s in the filename will be replaced by the "
866                        "current date and time)"));
867    gtk_label_set_line_wrap_mode(GTK_LABEL(label), PANGO_WRAP_WORD);    gtk_label_set_line_wrap_mode(GTK_LABEL(label), PANGO_WRAP_WORD);
868    gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);    gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
869    gtk_misc_set_alignment(GTK_MISC(label), 0.f, 0.5f);    gtk_misc_set_alignment(GTK_MISC(label), 0.f, 0.5f);
# Line 951  void notes_log_export(appdata_t *appdata Line 882  void notes_log_export(appdata_t *appdata
882      time_t now = time(NULL);      time_t now = time(NULL);
883      struct tm *tm_now = localtime(&now);      struct tm *tm_now = localtime(&now);
884      char now_str[32];      char now_str[32];
885      strftime(now_str, sizeof(now_str)-1, "%F_%H:%M", tm_now);      strftime(now_str, sizeof(now_str)-1, "%F_%H-%M", tm_now);
886      char *fname = g_strdup_printf(appdata->fieldnotes_path, now_str);      char *fname = g_strdup_printf(appdata->fieldnotes_path, now_str);
887    
888      printf("--- about to export logs to %s ---\n", fname);      printf("--- about to export logs to %s ---\n", fname);
889      FILE *file = fopen(fname, "w");      FILE *file = fopen(fname, "w");
890      g_free(fname);      g_free(fname);
891    
892      if(file) {      if(file) {
   
893        llog = log;        llog = log;
894        while(llog) {        while(llog) {
895          printf("Exporting %s\n", llog->cache->id);          printf("Exporting %s\n", llog->cache->id);
# Line 1048  void notes_log_export(appdata_t *appdata Line 979  void notes_log_export(appdata_t *appdata
979        }        }
980    
981        fclose(file);        fclose(file);
982      }      } else
983          errorf(_("Can't open file:\n\n%s"), strerror(errno));
984    
985    } else {    } else {
986      /* restore old path, in case it has been altered but not been used */      /* restore old path, in case it has been altered but not been used */
987      free(appdata->fieldnotes_path);      free(appdata->fieldnotes_path);
Legend:
Removed from v.199  
changed lines
  Added in v.299