Diff of /trunk/src/main.c

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

revision 11 by harbaum, Fri Jun 26 12:24:24 2009 UTC revision 123 by harbaum, Wed Sep 23 11:23:45 2009 UTC
# Line 95  void errorf(const char *fmt, ...) { Line 95  void errorf(const char *fmt, ...) {
95    GtkWidget *dialog = gtk_message_dialog_new(    GtkWidget *dialog = gtk_message_dialog_new(
96                             GTK_WINDOW(NULL),                             GTK_WINDOW(NULL),
97                             GTK_DIALOG_DESTROY_WITH_PARENT,                             GTK_DIALOG_DESTROY_WITH_PARENT,
98                             GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,  #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
99                             buf);                             GTK_MESSAGE_ERROR,
100    #else
101                               GTK_MESSAGE_OTHER,
102    #endif
103                               GTK_BUTTONS_CLOSE, buf);
104    
105    gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));    gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));
106    
# Line 138  gpx_t *choose_file(appdata_t *appdata, g Line 142  gpx_t *choose_file(appdata_t *appdata, g
142    gtk_widget_show_all (GTK_WIDGET(dialog));    gtk_widget_show_all (GTK_WIDGET(dialog));
143    if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {    if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {
144      char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));      char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
145    
146        if(filename) {
147          gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));
148    
149      gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));        if(!whole_dir)
150            gpx = gpx_parse(dialog, filename);
151      if(!whole_dir)        else {
152        gpx = gpx_parse(dialog, filename);          /* cur trailing '/' if present */
153      else {          if(strlastchr(filename) == '/')
154        /* cur trailing '/' if present */            filename[strlen(filename)] = 0;
155        if(strlastchr(filename) == '/')  
156          filename[strlen(filename)] = 0;          gpx = gpx_parse_dir(dialog, filename);
   
       gpx = gpx_parse_dir(dialog, filename);  
     }  
   
     gpx_busy_dialog_destroy(dialog);  
   
     /* save path if gpx was successfully loaded */  
     if(gpx) {  
       char *r = strrchr(filename, '/');  
   
       /* there is a delimiter, use everything left of it as path */  
       if(r && !whole_dir) {  
         *r = 0;  
         if(appdata->path) free(appdata->path);  
         appdata->path = strdup(filename);  
         /* restore path ... just in case ... */  
         *r = '/';  
157        }        }
158    
159          gpx_busy_dialog_destroy(dialog);
160    
161          /* save path if gpx was successfully loaded */
162          if(gpx) {
163            char *r = strrchr(filename, '/');
164    
165            /* there is a delimiter, use everything left of it as path */
166            if(r && !whole_dir) {
167              *r = 0;
168              if(appdata->path) free(appdata->path);
169              appdata->path = strdup(filename);
170              /* restore path ... just in case ... */
171              *r = '/';
172            }
173    
174            if(whole_dir)
175              appdata->path = strdup(filename);
176          } else
177            errorf(_("Load error"));
178    
179        if(whole_dir)        g_free (filename);
180          appdata->path = strdup(filename);      } else {
181    #ifndef USE_MAEMO
182          errorf(_("Error accessing the file."));
183    #else
184          errorf(_("Error accessing the file. This may happen if the file "
185                   "resides on a remote file system. Please copy the file onto "
186                   "the device (e.g. onto the memory card) and try again."));
187    #endif
188      }      }
   
     g_free (filename);  
189    }    }
190    
191    gtk_widget_destroy (dialog);    gtk_widget_destroy (dialog);
# Line 202  void cachelist_view_onRowActivated(GtkTr Line 217  void cachelist_view_onRowActivated(GtkTr
217    GtkTreeIter   iter;    GtkTreeIter   iter;
218    GtkTreeModel *model = gtk_tree_view_get_model(treeview);    GtkTreeModel *model = gtk_tree_view_get_model(treeview);
219    
220    #ifdef USE_MAEMO
221      /* check if a cache is already selected and ignore click if yes */
222      /* (was probably a double click) */
223      if(appdata->cur_cache) return;
224    #endif
225    
226    if(gtk_tree_model_get_iter(model, &iter, path)) {    if(gtk_tree_model_get_iter(model, &iter, path)) {
227      cache_t *cache;      cache_t *cache;
228      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);
# Line 329  static gboolean cachelist_update(gpointe Line 350  static gboolean cachelist_update(gpointe
350    
351    if(appdata->cachelist_update)    if(appdata->cachelist_update)
352      cachelist_redraw(appdata);      cachelist_redraw(appdata);
353    
354  #endif  #endif
355    
356    return TRUE;    return TRUE;
# Line 587  void cachelist_dialog(appdata_t *appdata Line 609  void cachelist_dialog(appdata_t *appdata
609    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);
610    
611    appdata->cur_gpx = gpx;    appdata->cur_gpx = gpx;
612    char *title = g_strdup_printf("GPXView - %s", gpx->name);    char *title = g_strdup_printf("%s - GPXView", gpx->name);
613    gtk_window_set_title(GTK_WINDOW(window), title);    gtk_window_set_title(GTK_WINDOW(window), title);
614    g_free(title);    g_free(title);
615    
# Line 713  static void gpxlist_view_onRowActivated( Line 735  static void gpxlist_view_onRowActivated(
735    GtkTreeIter   iter;    GtkTreeIter   iter;
736    GtkTreeModel *model = gtk_tree_view_get_model(treeview);    GtkTreeModel *model = gtk_tree_view_get_model(treeview);
737    
738    #ifdef USE_MAEMO
739      /* check if a cache is already selected and ignore click if yes */
740      /* (was probably a double click) */
741      if(appdata->cur_gpx) return;
742    #endif
743    
744    if (gtk_tree_model_get_iter(model, &iter, path)) {    if (gtk_tree_model_get_iter(model, &iter, path)) {
745      gpx_t *gpx;      gpx_t *gpx;
746      gtk_tree_model_get(model, &iter, GPXLIST_COL_DATA, &gpx, -1);      gtk_tree_model_get(model, &iter, GPXLIST_COL_DATA, &gpx, -1);
# Line 811  static void gpxlist_view_onRowActivated( Line 839  static void gpxlist_view_onRowActivated(
839          gpx_busy_dialog_destroy(dialog);          gpx_busy_dialog_destroy(dialog);
840        }        }
841  #ifndef USE_BREAD_CRUMB_TRAIL  #ifndef USE_BREAD_CRUMB_TRAIL
842    #ifdef USE_STACKABLE_WINDOW
843        if(!appdata->cur_gpx)        if(!appdata->cur_gpx)
844    #endif
845          cachelist_dialog(appdata, gpx);          cachelist_dialog(appdata, gpx);
846    #ifdef USE_STACKABLE_WINDOW
847        else        else
848          printf("selected gpx, but cachelist window already present\n");          printf("selected gpx, but cachelist window already present\n");
849    #endif
850  #else  #else
851        gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);        gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
852        appdata->cur_view = cachelist_create(appdata, gpx, NULL);        appdata->cur_view = cachelist_create(appdata, gpx, NULL);
# Line 953  static GtkWidget *gpxlist_create_view_an Line 985  static GtkWidget *gpxlist_create_view_an
985      GtkTreeIter         iter;      GtkTreeIter         iter;
986      gtk_list_store_append(appdata->gpxstore, &iter);      gtk_list_store_append(appdata->gpxstore, &iter);
987      gpxlist_set(appdata->gpxstore, &iter, gpx);      gpxlist_set(appdata->gpxstore, &iter, gpx);
988    
989      if(gpx == sel_gpx) {      if(gpx == sel_gpx) {
990        sel_iter = iter;        sel_iter = iter;
991        sel_iter_valid = TRUE;        sel_iter_valid = TRUE;
# Line 1013  static void gpxlist_add(appdata_t *appda Line 1045  static void gpxlist_add(appdata_t *appda
1045    
1046  /******************** begin of menu *********************/  /******************** begin of menu *********************/
1047    
1048    typedef struct {
1049      appdata_t *appdata;
1050      GtkWidget *dialog;
1051    } about_context_t;
1052    
1053    #ifdef ENABLE_BROWSER_INTERFACE
1054    void on_paypal_button_clicked(GtkButton *button, about_context_t *context) {
1055      gtk_dialog_response(GTK_DIALOG(context->dialog), GTK_RESPONSE_ACCEPT);
1056      browser_url(context->appdata,
1057                  "https://www.paypal.com/cgi-bin/webscr"
1058                  "?cmd=_s-xclick&hosted_button_id=7400558");
1059    }
1060    #endif
1061    
1062  static void  static void
1063  cb_menu_about(GtkWidget *window, gpointer data) {  cb_menu_about(GtkWidget *window, gpointer data) {
1064    GtkAboutDialog *about = GTK_ABOUT_DIALOG(gtk_about_dialog_new());    about_context_t context;
1065    
1066      context.appdata = (appdata_t *)data;
1067    
1068    #ifdef ENABLE_LIBLOCATION
1069      char *uses = "uses liblocation";
1070    #elif defined(ENABLE_GPSBT)
1071      char *uses = "uses gpsbt and gpsd";
1072    #else
1073      char *uses = "uses gpsd";
1074    #endif
1075    
1076      const gchar *authors[] = {
1077        "Till Harbaum <till@harbaum.org>",
1078        "John Stowers <john.stowers@gmail.com>",
1079        NULL };
1080    
1081      context.dialog = g_object_new(GTK_TYPE_ABOUT_DIALOG,
1082                            "name", "GPXView",
1083                            "version", VERSION,
1084                            "copyright", _("Copyright 2008-2009"),
1085                            "authors", authors,
1086                            "website", _("http://www.harbaum.org/till/maemo"),
1087                            "comments", _(uses),
1088                            NULL);
1089    
1090    gtk_about_dialog_set_name(about, "GPXView");  #ifdef ENABLE_BROWSER_INTERFACE
1091    gtk_about_dialog_set_version(about, VERSION);    /* add a way to donate to the project */
1092    gtk_about_dialog_set_copyright(about,    GtkWidget *alignment = gtk_alignment_new(0.5, 0, 0, 0);
1093           _("GPXView (c) 2008 by\n"  
1094           "Till Harbaum <till@harbaum.org>\n"    GtkWidget *hbox = gtk_hbox_new(FALSE, 8);
1095           "Geocaching.com: Tantil"));    gtk_box_pack_start(GTK_BOX(hbox),
1096                         gtk_label_new(_("Do you like GPXView?")),
1097    gtk_about_dialog_set_website(about,                       FALSE, FALSE, 0);
1098         _("http://www.harbaum.org/till/maemo"));  
1099      GtkWidget *button = gtk_button_new();
1100    gtk_about_dialog_set_comments(about,    gtk_button_set_image(GTK_BUTTON(button),
1101         _("Geocaching.com GPX file viewer"));                         icon_get_widget(ICON_MISC, 8));
1102      gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
1103    gtk_widget_show_all(GTK_WIDGET(about));    g_signal_connect(button, "clicked",
1104    gtk_dialog_run(GTK_DIALOG(about));                     G_CALLBACK(on_paypal_button_clicked), &context);
1105    gtk_widget_destroy(GTK_WIDGET(about));    gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
1106    
1107      gtk_container_add(GTK_CONTAINER(alignment), hbox);
1108      gtk_box_pack_start_defaults(GTK_BOX((GTK_DIALOG(context.dialog))->vbox),
1109                                  alignment);
1110    
1111      gtk_widget_show_all(alignment);
1112    #endif
1113    
1114      gtk_dialog_run(GTK_DIALOG(context.dialog));
1115      gtk_widget_destroy(context.dialog);
1116  }  }
1117    
1118  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
# Line 1382  cb_menu_search(GtkWidget *window, gpoint Line 1462  cb_menu_search(GtkWidget *window, gpoint
1462        printf("Search for %s (flags = %x)...\n", p, appdata->search);        printf("Search for %s (flags = %x)...\n", p, appdata->search);
1463    
1464  #ifndef USE_BREAD_CRUMB_TRAIL  #ifndef USE_BREAD_CRUMB_TRAIL
1465        appdata->search_results =        gpx_t *found =
1466          search_do(appdata, appdata->gpx, p, appdata->search, FALSE);          search_do(appdata, appdata->gpx, p, appdata->search, FALSE);
1467    
1468        /* do search result dialog here ... */        /* do search result dialog here ... */
1469        cachelist_dialog(appdata, appdata->search_results);        cachelist_dialog(appdata, found);
1470  #ifndef USE_STACKABLE_WINDOW  #ifndef USE_STACKABLE_WINDOW
1471        search_result_free(appdata->search_results);        search_result_free(found);
1472        appdata->search_results = NULL;  #else
1473          appdata->search_results = found;
1474  #endif  #endif
1475  #else  #else
1476        gpx_t *found = NULL;        gpx_t *found = NULL;
# Line 1414  cb_menu_search(GtkWidget *window, gpoint Line 1495  cb_menu_search(GtkWidget *window, gpoint
1495      gtk_widget_destroy(dialog);      gtk_widget_destroy(dialog);
1496  }  }
1497    
1498  void on_window_destroy (GtkWidget *widget, gpointer data);  static void on_window_destroy (GtkWidget *widget, gpointer data);
1499    
1500  #ifndef USE_MAEMO  #ifndef USE_MAEMO
1501  static void  static void
# Line 1476  cb_menu_export_log(GtkWidget *widget, gp Line 1557  cb_menu_export_log(GtkWidget *widget, gp
1557    notes_log_export(appdata);    notes_log_export(appdata);
1558  }  }
1559    
1560  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1561  static void  static void
1562  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {
1563    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
# Line 1490  cb_menu_export_garmin(GtkWidget *widget, Line 1571  cb_menu_export_garmin(GtkWidget *widget,
1571    garmin_export(appdata);    garmin_export(appdata);
1572  }  }
1573    
1574    #ifdef ENABLE_OSM_GPS_MAP
1575    static void
1576    cb_menu_map(GtkWidget *window, gpointer data) {
1577      map((appdata_t *)data);
1578    }
1579    #endif
1580    
1581  static void  static void
1582  cb_menu_geomath(GtkWidget *window, gpointer data) {  cb_menu_geomath(GtkWidget *window, gpointer data) {
1583    geomath_dialog((appdata_t *)data);    geomath_dialog((appdata_t *)data);
# Line 1506  cb_menu_precpos(GtkWidget *window, gpoin Line 1594  cb_menu_precpos(GtkWidget *window, gpoin
1594  }  }
1595    
1596  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
1597  static void on_export_destroy(GtkWidget *widget, appdata_t *appdata) {  typedef struct {
1598    appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");    char *label, *desc;
1599  }    GtkSignalFunc activate_cb;
1600    } menu_entry_t;
1601    
1602  void on_export_clicked(GtkButton *button, appdata_t *appdata) {  typedef struct {
1603    HildonStackableWindow *view_window;    const char *title;
1604    GtkWidget *but;    const menu_entry_t *menu;
1605      int len;
1606    } submenu_t;
1607    
1608    view_window = HILDON_STACKABLE_WINDOW (hildon_stackable_window_new ());  #define COLUMNS  1
   gtk_window_set_title (GTK_WINDOW (view_window), "GPXView - Export");  
1609    
1610     /* store last "cur_view" in window */  void on_submenu_entry_clicked(GtkButton *button, GtkWidget *menu) {
   g_object_set_data(G_OBJECT(view_window), "cur_view", appdata->cur_view);  
   appdata->cur_view = NULL;  
1611    
1612    g_signal_connect(G_OBJECT(view_window), "destroy",    /* force closing of submenu dialog */
1613                     G_CALLBACK(on_export_destroy), appdata);    gtk_dialog_response(GTK_DIALOG(menu), GTK_RESPONSE_NONE);
1614      gtk_widget_hide(menu);
1615    
1616      /* let gtk clean up */
1617      while(gtk_events_pending())
1618        gtk_main_iteration();
1619    }
1620    
1621    GtkVBox *contents = GTK_VBOX(gtk_vbox_new (12, FALSE));  static GtkWidget *app_submenu_create(appdata_t *appdata,
1622                                         const submenu_t *submenu) {
1623    
1624    but = hildon_button_new_with_text(    /* create a oridinary dialog box */
1625              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,    GtkWidget *dialog = gtk_dialog_new();
1626              HILDON_BUTTON_ARRANGEMENT_VERTICAL,    gtk_window_set_title(GTK_WINDOW(dialog), _(submenu->title));
1627              _("Export to Maemo Mapper"),    gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
1628              _("Save a Maemo Mapper POI file"));    gtk_window_set_transient_for(GTK_WINDOW(dialog),
1629    g_signal_connect(but, "clicked",                                 GTK_WINDOW(appdata->window));
1630                     G_CALLBACK(cb_menu_export_mmpoi), appdata);    gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
   gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);  
1631    
1632      GtkWidget *table = gtk_table_new(submenu->len/COLUMNS, COLUMNS, TRUE);
1633      int x = 0, y = 0;
1634    
1635    but = hildon_button_new_with_text(    const menu_entry_t *menu_entries = submenu->menu;
1636              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,    while(menu_entries->label) {
1637              HILDON_BUTTON_ARRANGEMENT_VERTICAL,      GtkWidget *button = NULL;
             _("Export Field Notes"),  
             _("Save a Garmin Field Notes file"));  
   g_signal_connect(but, "clicked",  
                    G_CALLBACK(cb_menu_export_log), appdata);  
   gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);  
   
1638    
1639    but = hildon_button_new_with_text(      button = hildon_button_new_with_text(
1640              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1641              HILDON_BUTTON_ARRANGEMENT_VERTICAL,              HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1642              _("Export Garmin GPX"),              _(menu_entries->label), _(menu_entries->desc));
             _("Save a GPX file containing modified waypoints"));  
   g_signal_connect(but, "clicked",  
                    G_CALLBACK(cb_menu_export_garmin), appdata);  
   gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);  
1643    
1644    gtk_container_add (GTK_CONTAINER (view_window), GTK_WIDGET (contents));      /* try to center both texts */
1645    gtk_widget_show_all (GTK_WIDGET (view_window));      hildon_button_set_title_alignment(HILDON_BUTTON(button), 0.5, 0.5);
1646  }      hildon_button_set_value_alignment(HILDON_BUTTON(button), 0.5, 0.5);
1647    
1648  static void on_tools_destroy(GtkWidget *widget, appdata_t *appdata) {      g_signal_connect(button, "clicked",
1649    appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");                       G_CALLBACK(on_submenu_entry_clicked), dialog);
1650  }  
1651        g_signal_connect(button, "clicked",
1652                         menu_entries->activate_cb, appdata);
1653    
1654        gtk_table_attach_defaults(GTK_TABLE(table),  button, x, x+1, y, y+1);
1655    
1656        x++;
1657        if(x == COLUMNS) { x = 0; y++; }
1658    
1659  void on_tools_clicked(GtkButton *button, appdata_t *appdata) {      menu_entries++;
1660    HildonStackableWindow *view_window;    }
   GtkWidget *but;  
1661    
1662    view_window = HILDON_STACKABLE_WINDOW (hildon_stackable_window_new ());    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), table);
   gtk_window_set_title (GTK_WINDOW (view_window), "GPXView - Tools");  
1663    
1664     /* store last "cur_view" in window */    return dialog;
1665    g_object_set_data(G_OBJECT(view_window), "cur_view", appdata->cur_view);  }
   appdata->cur_view = NULL;  
1666    
1667    g_signal_connect(G_OBJECT(view_window), "destroy",  /* popup the dialog shaped submenu */
1668                     G_CALLBACK(on_tools_destroy), appdata);  static void submenu_popup(GtkWidget *menu) {
1669      gtk_widget_show_all(menu);
1670      gtk_dialog_run(GTK_DIALOG(menu));
1671      gtk_widget_hide(menu);
1672    }
1673    
1674    GtkVBox *contents = GTK_VBOX(gtk_vbox_new (12, FALSE));  static void submenu_cleanup(GtkWidget *menu) {
1675      gtk_widget_destroy(menu);
1676    }
1677    
1678    but = hildon_button_new_with_text(  static const menu_entry_t submenu_export_entries[] = {
1679              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,  #ifdef ENABLE_MAEMO_MAPPER
1680              HILDON_BUTTON_ARRANGEMENT_VERTICAL,    { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",
1681              _("Geomath"),      G_CALLBACK(cb_menu_export_mmpoi)  },
1682              _("Geocoordinate calculation"));  #endif
1683    g_signal_connect(but, "clicked",    { "Export Field Notes",      "Save a Garmin Field Notes file",
1684                     G_CALLBACK(cb_menu_geomath), appdata);      G_CALLBACK(cb_menu_export_log)    },
1685    gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);    { "Export Garmin GPX",       "Save modified waypoints in GPX file",
1686        G_CALLBACK(cb_menu_export_garmin) },
1687      { NULL, NULL, NULL }
1688    };
1689    
1690    static const submenu_t submenu_export = {
1691      "Export", submenu_export_entries,
1692      sizeof(submenu_export_entries)/sizeof(menu_entry_t)-1
1693    };
1694    
1695    but = hildon_button_new_with_text(  /* the export submenu */
1696              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,  void on_export_clicked(GtkButton *button, appdata_t *appdata) {
1697              HILDON_BUTTON_ARRANGEMENT_VERTICAL,    if(!appdata->export_menu)
1698              _("Geotext"),      appdata->export_menu = app_submenu_create(appdata, &submenu_export);
             _("Text analysis, letter counting etc"));  
   g_signal_connect(but, "clicked",  
                    G_CALLBACK(cb_menu_geotext), appdata);  
   gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);  
   
1699    
1700    but = hildon_button_new_with_text(    submenu_popup(appdata->export_menu);
1701              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,  }
             HILDON_BUTTON_ARRANGEMENT_VERTICAL,  
             _("Precise Position"),  
             _("Calculate a very precise GPS position"));  
   g_signal_connect(but, "clicked",  
                    G_CALLBACK(cb_menu_precpos), appdata);  
   gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);  
1702    
1703    gtk_container_add (GTK_CONTAINER (view_window), GTK_WIDGET (contents));  static const menu_entry_t submenu_tools_entries[] = {
1704    gtk_widget_show_all (GTK_WIDGET (view_window));    { "Geomath",          "Geocoordinate calculation",
1705        G_CALLBACK(cb_menu_geomath) },
1706      { "Geotext",          "Text analysis",
1707        G_CALLBACK(cb_menu_geotext) },
1708      { "Precise Position", "Calculate a precise GPS position",
1709        G_CALLBACK(cb_menu_precpos) },
1710      { NULL, NULL, NULL }
1711    };
1712    
1713    static const submenu_t submenu_tools = {
1714      "Tools", submenu_tools_entries,
1715      sizeof(submenu_tools_entries)/sizeof(menu_entry_t)-1
1716    };
1717    
1718    /* the tools submenu */
1719    void on_tools_clicked(GtkButton *button, appdata_t *appdata) {
1720      if(!appdata->tools_menu)
1721        appdata->tools_menu = app_submenu_create(appdata, &submenu_tools);
1722    
1723      submenu_popup(appdata->tools_menu);
1724  }  }
1725    
1726  HildonAppMenu *menu_create(appdata_t *appdata, int mode) {  HildonAppMenu *menu_create(appdata_t *appdata, int mode) {
# Line 1637  HildonAppMenu *menu_create(appdata_t *ap Line 1748  HildonAppMenu *menu_create(appdata_t *ap
1748      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1749                             G_CALLBACK(cb_menu_adddir), appdata);                             G_CALLBACK(cb_menu_adddir), appdata);
1750      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
   }  
1751    
   if(mode == MENU_GPXLIST) {  
1752      button = gtk_button_new_with_label(_("Export"));      button = gtk_button_new_with_label(_("Export"));
1753      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1754                             G_CALLBACK(on_export_clicked), appdata);                             G_CALLBACK(on_export_clicked), appdata);
# Line 1656  HildonAppMenu *menu_create(appdata_t *ap Line 1765  HildonAppMenu *menu_create(appdata_t *ap
1765                           G_CALLBACK(on_tools_clicked), appdata);                           G_CALLBACK(on_tools_clicked), appdata);
1766    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1767    
1768    gtk_widget_show(GTK_WIDGET(menu));  #ifdef ENABLE_OSM_GPS_MAP
1769        button = gtk_button_new_with_label(_("Map"));
1770        g_signal_connect_after(button, "clicked",
1771                               G_CALLBACK(cb_menu_map), appdata);
1772        hildon_app_menu_append(menu, GTK_BUTTON(button));
1773    #endif
1774    
1775    #ifdef HILDON_HELP
1776      button = gtk_button_new_with_label(_("Help"));
1777      g_signal_connect_after(button, "clicked",
1778                             G_CALLBACK(cb_menu_help), appdata);
1779      hildon_app_menu_append(menu, GTK_BUTTON(button));
1780    #endif
1781    
1782      gtk_widget_show_all(GTK_WIDGET(menu));
1783    
1784    return menu;    return menu;
1785  }  }
# Line 1704  void menu_create(appdata_t *appdata) { Line 1827  void menu_create(appdata_t *appdata) {
1827    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1828    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1829    
1830  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1831    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );
1832    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1833    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
# Line 1761  void menu_create(appdata_t *appdata) { Line 1884  void menu_create(appdata_t *appdata) {
1884    
1885    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1886    
1887    #ifdef ENABLE_OSM_GPS_MAP
1888      item = gtk_menu_item_new_with_label( _("Map") );
1889      gtk_menu_append(GTK_MENU_SHELL(menu), item);
1890      g_signal_connect(item, "activate",
1891                       GTK_SIGNAL_FUNC(cb_menu_map), appdata);
1892    #endif
1893    
1894    item = gtk_menu_item_new_with_label(_("Tools"));    item = gtk_menu_item_new_with_label(_("Tools"));
1895    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1896    submenu = gtk_menu_new();    submenu = gtk_menu_new();
# Line 1825  void cleanup(appdata_t *appdata) { Line 1955  void cleanup(appdata_t *appdata) {
1955    if(appdata->image_path) free(appdata->image_path);    if(appdata->image_path) free(appdata->image_path);
1956    if(appdata->search_str) free(appdata->search_str);    if(appdata->search_str) free(appdata->search_str);
1957    
1958    #ifdef USE_STACKABLE_WINDOW
1959      if(appdata->export_menu) submenu_cleanup(appdata->export_menu);
1960      if(appdata->tools_menu)  submenu_cleanup(appdata->tools_menu);
1961    #endif
1962    
1963    gnome_vfs_shutdown();    gnome_vfs_shutdown();
1964    icons_free();    icons_free();
1965    gps_release(appdata);    gps_release(appdata);
# Line 1853  void cleanup(appdata_t *appdata) { Line 1988  void cleanup(appdata_t *appdata) {
1988    puts("everything is gone");    puts("everything is gone");
1989  }  }
1990    
1991  void on_window_destroy (GtkWidget *widget, gpointer data) {  static void on_window_destroy (GtkWidget *widget, gpointer data) {
1992    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
1993    
1994    gconf_save_state(appdata);    gconf_save_state(appdata);
# Line 2156  int main(int argc, char *argv[]) { Line 2291  int main(int argc, char *argv[]) {
2291      fprintf(stderr, "error initiating osso context\n");      fprintf(stderr, "error initiating osso context\n");
2292    }    }
2293    
2294    #ifdef ENABLE_MAEMO_MAPPER
2295    dbus_register(&appdata);    dbus_register(&appdata);
2296  #endif  #endif
2297    #endif
2298    
2299    icons_init();    icons_init();
2300    
# Line 2184  int main(int argc, char *argv[]) { Line 2321  int main(int argc, char *argv[]) {
2321    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);
2322  #endif  #endif
2323    
2324    #if MAEMO_VERSION_MAJOR == 5
2325    gtk_window_set_title(GTK_WINDOW(appdata.window), "GPXView");    gtk_window_set_title(GTK_WINDOW(appdata.window), "GPXView");
2326    #endif
2327    
2328    g_signal_connect(G_OBJECT(appdata.window), "destroy",    g_signal_connect(G_OBJECT(appdata.window), "destroy",
2329                     G_CALLBACK(on_window_destroy), &appdata);                     G_CALLBACK(on_window_destroy), &appdata);
2330    
# Line 2193  int main(int argc, char *argv[]) { Line 2333  int main(int argc, char *argv[]) {
2333    
2334    appdata.vbox = gtk_vbox_new(FALSE, 2);    appdata.vbox = gtk_vbox_new(FALSE, 2);
2335    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);
   
2336  #ifndef USE_STACKABLE_WINDOW  #ifndef USE_STACKABLE_WINDOW
2337    menu_create(&appdata);    menu_create(&appdata);
2338  #else  #else
Legend:
Removed from v.11  
changed lines
  Added in v.123