Diff of /trunk/src/main.c

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

revision 190 by harbaum, Mon Jul 6 19:17:24 2009 UTC revision 231 by harbaum, Thu Jul 16 19:56:39 2009 UTC
# Line 35  Line 35 
35  #include "banner.h"  #include "banner.h"
36    
37  /* disable/enable main screen control dependant on presence of open project */  /* disable/enable main screen control dependant on presence of open project */
38  static void main_ui_enable(appdata_t *appdata) {  void main_ui_enable(appdata_t *appdata) {
39    gboolean project_valid = (appdata->project != NULL);    gboolean project_valid = (appdata->project != NULL);
40    gboolean osm_valid = (appdata->osm != NULL);    gboolean osm_valid = (appdata->osm != NULL);
41    
# Line 51  static void main_ui_enable(appdata_t *ap Line 51  static void main_ui_enable(appdata_t *ap
51      gtk_window_set_title(GTK_WINDOW(appdata->window), "");      gtk_window_set_title(GTK_WINDOW(appdata->window), "");
52  #else  #else
53    char *str = NULL;    char *str = NULL;
54    #ifdef USE_HILDON
55    if(project_valid)    if(project_valid)
56      str = g_strdup_printf("OSM2Go - %s", appdata->project->name);      str = g_markup_printf_escaped("OSM2Go - <b>%s</b>",
57                                      appdata->project->name);
58      else
59        str = g_markup_printf_escaped("OSM2Go");
60    
61      hildon_window_set_markup(HILDON_WINDOW(appdata->window), str);
62    #else
63      if(project_valid)
64        str = g_strdup_printf("OSM2Go - <b>%s</b>", appdata->project->name);
65    else    else
66      str = g_strdup_printf("OSM2Go");      str = g_strdup_printf("OSM2Go");
67    
68    gtk_window_set_title(GTK_WINDOW(appdata->window), str);    gtk_window_set_title(GTK_WINDOW(appdata->window), str);
69    #endif
70    g_free(str);    g_free(str);
71  #endif  #endif
72    
73    if(appdata->iconbar && appdata->iconbar->toolbar)    if(appdata->iconbar && appdata->iconbar->toolbar)
74      gtk_widget_set_sensitive(appdata->iconbar->toolbar, osm_valid);      gtk_widget_set_sensitive(appdata->iconbar->toolbar, osm_valid);
   
75    /* disable all menu entries related to map */    /* disable all menu entries related to map */
76    gtk_widget_set_sensitive(appdata->submenu_map, project_valid);    gtk_widget_set_sensitive(appdata->submenu_map, project_valid);
77    gtk_widget_set_sensitive(appdata->menu_item_map_upload, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_map_upload, osm_valid);
# Line 75  static void main_ui_enable(appdata_t *ap Line 84  static void main_ui_enable(appdata_t *ap
84    gtk_widget_set_sensitive(appdata->submenu_view, osm_valid);    gtk_widget_set_sensitive(appdata->submenu_view, osm_valid);
85    gtk_widget_set_sensitive(appdata->submenu_wms, osm_valid);    gtk_widget_set_sensitive(appdata->submenu_wms, osm_valid);
86    
87    #ifdef ZOOM_BUTTONS
88      gtk_widget_set_sensitive(appdata->btn_zoom_in, osm_valid);
89      gtk_widget_set_sensitive(appdata->btn_zoom_out, osm_valid);
90    #endif
91    
92    if(!project_valid)    if(!project_valid)
93      statusbar_set(appdata, _("Please load or create a project"), FALSE);      statusbar_set(appdata, _("Please load or create a project"), FALSE);
94  }  }
# Line 101  cb_menu_about(GtkMenuItem *item, gpointe Line 115  cb_menu_about(GtkMenuItem *item, gpointe
115    const gchar *authors[] = {    const gchar *authors[] = {
116      "Till Harbaum <till@harbaum.org>",      "Till Harbaum <till@harbaum.org>",
117      "Andrew Chadwick <andrewc-osm2go@piffle.org>",      "Andrew Chadwick <andrewc-osm2go@piffle.org>",
118        "Marcus Bauer <marcus.bauer@gmail.com>",
119        "John Stowers <john.stowers@gmail.com>",
120      NULL };      NULL };
121    
122    const gchar *artists[] = {    const gchar *artists[] = {
# Line 270  cb_menu_undo_changes(GtkMenuItem *item, Line 286  cb_menu_undo_changes(GtkMenuItem *item,
286  }  }
287    
288  static void  static void
289  cb_menu_osm_relations(GtkMenuItem *item, gpointer data) {  cb_menu_osm_relations(GtkMenuItem *item, appdata_t *appdata) {
290    relation_list((appdata_t*)data);    /* list relations of all objects */
291      relation_list(GTK_WIDGET(appdata->window), appdata, NULL);
292  }  }
293    
294  #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)  #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
# Line 604  void menu_create(appdata_t *appdata) { Line 621  void menu_create(appdata_t *appdata) {
621      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
622    );    );
623    
624    #ifndef USE_HILDON
625    menu_append_new_item(    menu_append_new_item(
626      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_wizard), _("_Wizard"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_wizard), _("_Wizard"),
627      GTK_STOCK_NEW, "<OSM2Go-Main>/Project/Wizard",      GTK_STOCK_NEW, "<OSM2Go-Main>/Project/Wizard",
628      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
629    );    );
630    #endif
631    
632    /* --------------- view menu ------------------- */    /* --------------- view menu ------------------- */
633    
# Line 630  void menu_create(appdata_t *appdata) { Line 649  void menu_create(appdata_t *appdata) {
649    );    );
650  #endif  #endif
651    
652    #if !defined(ZOOM_BUTTONS) || !defined(USE_HILDON)
653    menu_append_new_item(    menu_append_new_item(
654      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_zoomin), _("Zoom _in"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_zoomin), _("Zoom _in"),
655      GTK_STOCK_ZOOM_IN, "<OSM2Go-Main>/View/ZoomIn",      GTK_STOCK_ZOOM_IN, "<OSM2Go-Main>/View/ZoomIn",
# Line 641  void menu_create(appdata_t *appdata) { Line 661  void menu_create(appdata_t *appdata) {
661      GTK_STOCK_ZOOM_OUT, "<OSM2Go-Main>/View/ZoomOut",      GTK_STOCK_ZOOM_OUT, "<OSM2Go-Main>/View/ZoomOut",
662      GDK_period, GDK_CONTROL_MASK, TRUE, FALSE, FALSE      GDK_period, GDK_CONTROL_MASK, TRUE, FALSE, FALSE
663    );    );
664    #endif
665    
666    gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());    gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
667    
# Line 882  static gboolean no_icon_get_toggle(appda Line 903  static gboolean no_icon_get_toggle(appda
903    
904  static gboolean enable_gps_get_toggle(appdata_t *appdata) {  static gboolean enable_gps_get_toggle(appdata_t *appdata) {
905    if(!appdata)           return FALSE;    if(!appdata)           return FALSE;
906    return appdata->gps_enabled;    if(!appdata->settings) return FALSE;
907      return appdata->settings->enable_gps;
908  }  }
909    
910  static gboolean follow_gps_get_toggle(appdata_t *appdata) {  static gboolean follow_gps_get_toggle(appdata_t *appdata) {
# Line 909  static GtkWidget *app_menu_create(appdat Line 931  static GtkWidget *app_menu_create(appdat
931      } else {      } else {
932        button = hildon_check_button_new(HILDON_SIZE_AUTO);        button = hildon_check_button_new(HILDON_SIZE_AUTO);
933        gtk_button_set_label(GTK_BUTTON(button), _(menu_entries->label));        gtk_button_set_label(GTK_BUTTON(button), _(menu_entries->label));
934          printf("requesting check for %s: %p\n", menu_entries->label,
935                 menu_entries->toggle);
936        hildon_check_button_set_active(HILDON_CHECK_BUTTON(button),        hildon_check_button_set_active(HILDON_CHECK_BUTTON(button),
937                                       menu_entries->toggle(appdata));                                       menu_entries->toggle(appdata));
938        g_signal_connect_after(button, "toggled",        g_signal_connect_after(button, "toggled",
# Line 929  static GtkWidget *app_menu_create(appdat Line 953  static GtkWidget *app_menu_create(appdat
953    return GTK_WIDGET(menu);    return GTK_WIDGET(menu);
954  }  }
955    
956    static void submenu_popup(GtkWidget *menu) {
957      GtkWidget *top = hildon_window_stack_peek(hildon_window_stack_get_default());
958    
959    #if 1
960      int start, end;
961      GTimeVal tv;
962      g_get_current_time(&tv);
963      start = tv.tv_sec * 1000 + tv.tv_usec / 1000;
964      do {
965        if(gtk_events_pending())
966          while(gtk_events_pending()) {
967            putchar('.'); fflush(stdout);
968            gtk_main_iteration();
969          }
970        else
971          usleep(100);
972    
973        g_get_current_time(&tv);
974        end = tv.tv_sec * 1000 + tv.tv_usec / 1000;
975      } while(end-start < 500);
976    #endif
977    
978    
979    
980      hildon_app_menu_popup(HILDON_APP_MENU(menu), GTK_WINDOW(top));
981    }
982    
983  /* the view submenu */  /* the view submenu */
984  void on_submenu_view_clicked(GtkButton *button, appdata_t *appdata) {  void on_submenu_view_clicked(GtkButton *button, appdata_t *appdata) {
985    hildon_app_menu_popup(HILDON_APP_MENU(appdata->app_menu_view),    submenu_popup(appdata->app_menu_view);
986                          GTK_WINDOW(appdata->window));  }
987    
988    void on_submenu_map_clicked(GtkButton *button, appdata_t *appdata) {
989      submenu_popup(appdata->app_menu_map);
990  }  }
991    
992  void on_submenu_wms_clicked(GtkButton *button, appdata_t *appdata) {  void on_submenu_wms_clicked(GtkButton *button, appdata_t *appdata) {
993    hildon_app_menu_popup(HILDON_APP_MENU(appdata->app_menu_wms),    submenu_popup(appdata->app_menu_wms);
                         GTK_WINDOW(appdata->window));  
994  }  }
995    
996  void on_submenu_track_clicked(GtkButton *button, appdata_t *appdata) {  void on_submenu_track_clicked(GtkButton *button, appdata_t *appdata) {
997    hildon_app_menu_popup(HILDON_APP_MENU(appdata->app_menu_track),    submenu_popup(appdata->app_menu_track);
                         GTK_WINDOW(appdata->window));  
998  }  }
999    
 /* -- the view submenu -- */  
1000  #define APP_OFFSET(a)  offsetof(appdata_t, a)  #define APP_OFFSET(a)  offsetof(appdata_t, a)
1001  #define SIMPLE_ENTRY(a,b)     { a, NULL, TRUE,   NULL, 0, G_CALLBACK(b) }  #define SIMPLE_ENTRY(a,b)     { a, NULL, TRUE,   NULL, 0, G_CALLBACK(b) }
1002  #define ENABLED_ENTRY(a,b,c) { a, NULL, TRUE,  NULL, APP_OFFSET(c), G_CALLBACK(b) }  #define ENABLED_ENTRY(a,b,c)  { a, NULL, TRUE,  NULL, APP_OFFSET(c), G_CALLBACK(b) }
1003  #define DISABLED_ENTRY(a,b,c) { a, NULL, FALSE,  NULL, APP_OFFSET(c), G_CALLBACK(b) }  #define DISABLED_ENTRY(a,b,c) { a, NULL, FALSE,  NULL, APP_OFFSET(c), G_CALLBACK(b) }
1004  #define TOGGLE_ENTRY(a,b,c)  { a, NULL, TRUE, c, 0, G_CALLBACK(b) }  #define TOGGLE_ENTRY(a,b,c)   { a, NULL, TRUE, c, 0, G_CALLBACK(b) }
1005  #define DISABLED_TOGGLE_ENTRY(a,b,c,d)  { a, NULL, FALSE, c, APP_OFFSET(d), G_CALLBACK(b) }  #define DISABLED_TOGGLE_ENTRY(a,b,c,d)  \
1006  #define ENABLED_TOGGLE_ENTRY(a,b,c,d)  { a, NULL, TRUE, c, APP_OFFSET(d), G_CALLBACK(b) }                                { a, NULL, FALSE, c, APP_OFFSET(d), G_CALLBACK(b) }
1007    #define ENABLED_TOGGLE_ENTRY(a,b,c,d) \
1008                                  { a, NULL, TRUE, c, APP_OFFSET(d), G_CALLBACK(b) }
1009  #define LAST_ENTRY            { NULL, NULL, FALSE, NULL, 0, NULL }  #define LAST_ENTRY            { NULL, NULL, FALSE, NULL, 0, NULL }
1010    
1011    /* -- the view submenu -- */
1012  static const menu_entry_t submenu_view[] = {  static const menu_entry_t submenu_view[] = {
1013    #ifndef ZOOM_BUTTONS
1014    SIMPLE_ENTRY("Zoom in",         cb_menu_zoomin),    SIMPLE_ENTRY("Zoom in",         cb_menu_zoomin),
1015    SIMPLE_ENTRY("Zoom out",        cb_menu_zoomout),    SIMPLE_ENTRY("Zoom out",        cb_menu_zoomout),
1016    #endif
1017    /* --- */    /* --- */
1018    SIMPLE_ENTRY("Style",           cb_menu_style),    SIMPLE_ENTRY("Style",           cb_menu_style),
1019    /* --- */    /* --- */
# Line 973  static const menu_entry_t submenu_view[] Line 1029  static const menu_entry_t submenu_view[]
1029    LAST_ENTRY    LAST_ENTRY
1030  };  };
1031    
1032    /* -- the map submenu -- */
1033    static const menu_entry_t submenu_map[] = {
1034      ENABLED_ENTRY("Upload",                cb_menu_upload, menu_item_map_upload),
1035      SIMPLE_ENTRY("Download",               cb_menu_download),
1036      ENABLED_ENTRY("Save local changes",    cb_menu_save_changes,
1037                                               menu_item_map_save_changes),
1038      ENABLED_ENTRY("Discard local changes", cb_menu_undo_changes,
1039                                               menu_item_map_undo_changes),
1040      ENABLED_ENTRY("Relations",             cb_menu_osm_relations,
1041                                               menu_item_map_relations),
1042    
1043      LAST_ENTRY
1044    };
1045    
1046  /* -- the wms submenu -- */  /* -- the wms submenu -- */
1047  static const menu_entry_t submenu_wms[] = {  static const menu_entry_t submenu_wms[] = {
1048    SIMPLE_ENTRY("Import",   cb_menu_wms_import),    SIMPLE_ENTRY("Import",   cb_menu_wms_import),
# Line 998  static const menu_entry_t submenu_track[ Line 1068  static const menu_entry_t submenu_track[
1068    
1069  /* -- the applications main menu -- */  /* -- the applications main menu -- */
1070  static const menu_entry_t main_menu[] = {  static const menu_entry_t main_menu[] = {
1071    SIMPLE_ENTRY("About",  cb_menu_about),    SIMPLE_ENTRY("About",   cb_menu_about),
1072    ENABLED_ENTRY("View",  on_submenu_view_clicked,  submenu_view),    SIMPLE_ENTRY("Project", cb_menu_project_open),
1073    ENABLED_ENTRY("WMS",   on_submenu_wms_clicked,   submenu_wms),    ENABLED_ENTRY("View",   on_submenu_view_clicked,  submenu_view),
1074    ENABLED_ENTRY("Track", on_submenu_track_clicked, track.submenu_track),    ENABLED_ENTRY("Map",    on_submenu_map_clicked,   submenu_map),
1075      ENABLED_ENTRY("WMS",    on_submenu_wms_clicked,   submenu_wms),
1076      ENABLED_ENTRY("Track",  on_submenu_track_clicked, track.submenu_track),
1077    
1078    LAST_ENTRY    LAST_ENTRY
1079  };  };
1080    
1081  void menu_create(appdata_t *appdata) {  void menu_create(appdata_t *appdata) {
1082    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
1083    
1084    /* build menu/submenus */    /* build menu/submenus */
1085    menu = HILDON_APP_MENU(app_menu_create(appdata, main_menu));    menu = HILDON_APP_MENU(app_menu_create(appdata, main_menu));
1086    appdata->app_menu_wms = app_menu_create(appdata, submenu_wms);    appdata->app_menu_wms   = app_menu_create(appdata, submenu_wms);
1087    appdata->app_menu_view = app_menu_create(appdata, submenu_view);    g_object_ref(appdata->app_menu_wms);
1088      appdata->app_menu_map   = app_menu_create(appdata, submenu_map);
1089      g_object_ref(appdata->app_menu_map);
1090      appdata->app_menu_view  = app_menu_create(appdata, submenu_view);
1091      g_object_ref(appdata->app_menu_view);
1092    appdata->app_menu_track = app_menu_create(appdata, submenu_track);    appdata->app_menu_track = app_menu_create(appdata, submenu_track);
1093      g_object_ref(appdata->app_menu_track);
1094    
1095      /* enable/disable some entries according to settings */
1096      if(appdata && appdata->settings)
1097        gtk_widget_set_sensitive(appdata->track.menu_item_track_follow_gps,
1098                                 appdata->settings->enable_gps);
1099    
1100    hildon_window_set_app_menu(HILDON_WINDOW(appdata->window), menu);    hildon_window_set_app_menu(HILDON_WINDOW(appdata->window), menu);
1101  }  }
# Line 1180  int main(int argc, char *argv[]) { Line 1262  int main(int argc, char *argv[]) {
1262    g_set_application_name("OSM2Go");    g_set_application_name("OSM2Go");
1263    
1264    /* Create HildonWindow and set it to HildonProgram */    /* Create HildonWindow and set it to HildonProgram */
1265    #if MAEMO_VERSION_MAJOR < 5
1266    appdata.window = HILDON_WINDOW(hildon_window_new());    appdata.window = HILDON_WINDOW(hildon_window_new());
1267    #else
1268      appdata.window = HILDON_WINDOW(hildon_stackable_window_new());
1269    #endif
1270    hildon_program_add_window(appdata.program, appdata.window);    hildon_program_add_window(appdata.program, appdata.window);
1271    
1272  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
# Line 1235  int main(int argc, char *argv[]) { Line 1321  int main(int argc, char *argv[]) {
1321      return -1;      return -1;
1322    }    }
1323    
1324  #if 0  // another test overlay    gtk_box_pack_start(GTK_BOX(vbox), map, TRUE, TRUE, 0);
   {  
     GtkWidget *fixed = gtk_fixed_new();  
1325    
1326      gtk_fixed_put(GTK_FIXED(fixed), gtk_label_new("Nase"), 0,0);  #ifdef ZOOM_BUTTONS
1327      gtk_fixed_put(GTK_FIXED(fixed), map, 0,0);    GtkWidget *zhbox = gtk_hbox_new(FALSE, 0);
1328    
1329      gtk_box_pack_start(GTK_BOX(vbox), fixed, TRUE, TRUE, 0);    gtk_box_pack_start_defaults(GTK_BOX(zhbox), statusbar_new(&appdata));
1330    }  
1331  #else    /* ---- add zoom out button right of statusbar ---- */
1332    gtk_box_pack_start(GTK_BOX(vbox), map, TRUE, TRUE, 0);    appdata.btn_zoom_out = gtk_button_new();
1333  #endif    gtk_button_set_image(GTK_BUTTON(appdata.btn_zoom_out),
1334            gtk_image_new_from_stock(GTK_STOCK_ZOOM_OUT, GTK_ICON_SIZE_MENU));
1335      g_signal_connect(appdata.btn_zoom_out, "clicked",
1336                       G_CALLBACK(cb_menu_zoomout), &appdata);
1337      gtk_box_pack_start(GTK_BOX(zhbox), appdata.btn_zoom_out, FALSE, FALSE, 0);
1338    
1339      /* ---- add zoom in button right of statusbar ---- */
1340      appdata.btn_zoom_in = gtk_button_new();
1341      gtk_button_set_image(GTK_BUTTON(appdata.btn_zoom_in),
1342            gtk_image_new_from_stock(GTK_STOCK_ZOOM_IN, GTK_ICON_SIZE_MENU));
1343      g_signal_connect(appdata.btn_zoom_in, "clicked",
1344                       G_CALLBACK(cb_menu_zoomin), &appdata);
1345      gtk_box_pack_start(GTK_BOX(zhbox), appdata.btn_zoom_in, FALSE, FALSE, 0);
1346    
1347    
1348      gtk_box_pack_start(GTK_BOX(vbox), zhbox, FALSE, FALSE, 0);
1349    #else
1350    gtk_box_pack_start(GTK_BOX(vbox), statusbar_new(&appdata), FALSE, FALSE, 0);    gtk_box_pack_start(GTK_BOX(vbox), statusbar_new(&appdata), FALSE, FALSE, 0);
1351    #endif
1352    
1353  #ifndef PORTRAIT  #ifndef PORTRAIT
1354    gtk_box_pack_start(GTK_BOX(hbox), iconbar_new(&appdata), FALSE, FALSE, 0);    gtk_box_pack_start(GTK_BOX(hbox), iconbar_new(&appdata), FALSE, FALSE, 0);
# Line 1290  int main(int argc, char *argv[]) { Line 1390  int main(int argc, char *argv[]) {
1390      gtk_window_set_keep_above(GTK_WINDOW(overlay), TRUE);      gtk_window_set_keep_above(GTK_WINDOW(overlay), TRUE);
1391      gtk_window_set_destroy_with_parent(GTK_WINDOW(overlay), TRUE);      gtk_window_set_destroy_with_parent(GTK_WINDOW(overlay), TRUE);
1392      gtk_window_set_position(GTK_WINDOW(overlay), GTK_WIN_POS_CENTER_ON_PARENT);      gtk_window_set_position(GTK_WINDOW(overlay), GTK_WIN_POS_CENTER_ON_PARENT);
1393    
1394        gtk_window_set_gravity(GTK_WINDOW(overlay), GDK_GRAVITY_NORTH_EAST);
1395    
1396        printf("x = %d\n", gdk_screen_width() - overlay->allocation.width);
1397        gtk_window_move(GTK_WINDOW(overlay),
1398                        gdk_screen_width() - overlay->allocation.width, 60);
1399    
1400      gtk_window_set_decorated(GTK_WINDOW(overlay), TRUE);      gtk_window_set_decorated(GTK_WINDOW(overlay), TRUE);
1401    
1402      /* add some zoom buttons for testing */      /* add some zoom buttons for testing */
Legend:
Removed from v.190  
changed lines
  Added in v.231