Diff of /trunk/src/main.c

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

revision 189 by harbaum, Mon Jul 6 15:51:30 2009 UTC revision 195 by harbaum, Wed Jul 8 08:51:02 2009 UTC
# Line 27  Line 27 
27  #include <hildon/hildon-button.h>  #include <hildon/hildon-button.h>
28  #include <hildon/hildon-check-button.h>  #include <hildon/hildon-check-button.h>
29  #include <hildon/hildon-window-stack.h>  #include <hildon/hildon-window-stack.h>
30    #include <gdk/gdkx.h>
31    #include <X11/Xatom.h>
32  #endif  #endif
33    
34  #include "appdata.h"  #include "appdata.h"
# Line 60  static void main_ui_enable(appdata_t *ap Line 62  static void main_ui_enable(appdata_t *ap
62    
63    if(appdata->iconbar && appdata->iconbar->toolbar)    if(appdata->iconbar && appdata->iconbar->toolbar)
64      gtk_widget_set_sensitive(appdata->iconbar->toolbar, osm_valid);      gtk_widget_set_sensitive(appdata->iconbar->toolbar, osm_valid);
   
65    /* disable all menu entries related to map */    /* disable all menu entries related to map */
66    gtk_widget_set_sensitive(appdata->submenu_map, project_valid);    gtk_widget_set_sensitive(appdata->submenu_map, project_valid);
67    gtk_widget_set_sensitive(appdata->menu_item_map_upload, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_map_upload, osm_valid);
# Line 73  static void main_ui_enable(appdata_t *ap Line 74  static void main_ui_enable(appdata_t *ap
74    gtk_widget_set_sensitive(appdata->submenu_view, osm_valid);    gtk_widget_set_sensitive(appdata->submenu_view, osm_valid);
75    gtk_widget_set_sensitive(appdata->submenu_wms, osm_valid);    gtk_widget_set_sensitive(appdata->submenu_wms, osm_valid);
76    
77    #ifdef ZOOM_BUTTONS
78      gtk_widget_set_sensitive(appdata->btn_zoom_in, osm_valid);
79      gtk_widget_set_sensitive(appdata->btn_zoom_out, osm_valid);
80    #endif
81    
82    if(!project_valid)    if(!project_valid)
83      statusbar_set(appdata, _("Please load or create a project"), FALSE);      statusbar_set(appdata, _("Please load or create a project"), FALSE);
84  }  }
# Line 268  cb_menu_undo_changes(GtkMenuItem *item, Line 274  cb_menu_undo_changes(GtkMenuItem *item,
274  }  }
275    
276  static void  static void
277  cb_menu_osm_relations(GtkMenuItem *item, gpointer data) {  cb_menu_osm_relations(GtkMenuItem *item, appdata_t *appdata) {
278    relation_list((appdata_t*)data);    /* list relations of all objects */
279      relation_list(GTK_WIDGET(appdata->window), appdata, NULL);
280  }  }
281    
282  #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)  #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
# Line 878  static gboolean no_icon_get_toggle(appda Line 885  static gboolean no_icon_get_toggle(appda
885    return appdata->settings->no_icons;    return appdata->settings->no_icons;
886  }  }
887    
888    static gboolean enable_gps_get_toggle(appdata_t *appdata) {
889      if(!appdata)           return FALSE;
890      if(!appdata->settings) return FALSE;
891      return appdata->settings->enable_gps;
892    }
893    
894    static gboolean follow_gps_get_toggle(appdata_t *appdata) {
895      if(!appdata)           return FALSE;
896      if(!appdata->settings) return FALSE;
897      return appdata->settings->follow_gps;
898    }
899    
900  /* create a HildonAppMenu */  /* create a HildonAppMenu */
901  static GtkWidget *app_menu_create(appdata_t *appdata, const menu_entry_t *menu_entries) {  static GtkWidget *app_menu_create(appdata_t *appdata,
902                                      const menu_entry_t *menu_entries) {
903    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
904    
905    while(menu_entries->label) {    while(menu_entries->label) {
# Line 889  static GtkWidget *app_menu_create(appdat Line 909  static GtkWidget *app_menu_create(appdat
909        button = hildon_button_new_with_text(        button = hildon_button_new_with_text(
910              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
911              HILDON_BUTTON_ARRANGEMENT_VERTICAL,              HILDON_BUTTON_ARRANGEMENT_VERTICAL,
912              _(menu_entries->label), menu_entries->value);              _(menu_entries->label), _(menu_entries->value));
913        g_signal_connect_after(button, "clicked", menu_entries->activate_cb, appdata);        g_signal_connect_after(button, "clicked",
914                                 menu_entries->activate_cb, appdata);
915      } else {      } else {
916        button = hildon_check_button_new(HILDON_SIZE_AUTO);        button = hildon_check_button_new(HILDON_SIZE_AUTO);
917        gtk_button_set_label(GTK_BUTTON(button), _(menu_entries->label));        gtk_button_set_label(GTK_BUTTON(button), _(menu_entries->label));
918          printf("requesting check for %s: %p\n", menu_entries->label,
919                 menu_entries->toggle);
920        hildon_check_button_set_active(HILDON_CHECK_BUTTON(button),        hildon_check_button_set_active(HILDON_CHECK_BUTTON(button),
921                                       menu_entries->toggle(appdata));                                       menu_entries->toggle(appdata));
922        g_signal_connect_after(button, "toggled", menu_entries->activate_cb, appdata);        g_signal_connect_after(button, "toggled",
923                                 menu_entries->activate_cb, appdata);
924      }      }
925    
926      /* offset to GtkWidget pointer was given -> store pointer */      /* offset to GtkWidget pointer was given -> store pointer */
# Line 915  static GtkWidget *app_menu_create(appdat Line 939  static GtkWidget *app_menu_create(appdat
939    
940  /* the view submenu */  /* the view submenu */
941  void on_submenu_view_clicked(GtkButton *button, appdata_t *appdata) {  void on_submenu_view_clicked(GtkButton *button, appdata_t *appdata) {
942    /* draw a popup menu. */    hildon_app_menu_popup(HILDON_APP_MENU(appdata->app_menu_view),
943    hildon_app_menu_popup(HILDON_APP_MENU(appdata->submenu_view),                          GTK_WINDOW(appdata->window));
944    }
945    
946    void on_submenu_map_clicked(GtkButton *button, appdata_t *appdata) {
947      hildon_app_menu_popup(HILDON_APP_MENU(appdata->app_menu_map),
948                          GTK_WINDOW(appdata->window));                          GTK_WINDOW(appdata->window));
949  }  }
950    
951  void on_submenu_wms_clicked(GtkButton *button, appdata_t *appdata) {  void on_submenu_wms_clicked(GtkButton *button, appdata_t *appdata) {
952    /* draw a popup menu. */    hildon_app_menu_popup(HILDON_APP_MENU(appdata->app_menu_wms),
953    hildon_app_menu_popup(HILDON_APP_MENU(appdata->submenu_wms),                          GTK_WINDOW(appdata->window));
954    }
955    
956    void on_submenu_track_clicked(GtkButton *button, appdata_t *appdata) {
957      hildon_app_menu_popup(HILDON_APP_MENU(appdata->app_menu_track),
958                          GTK_WINDOW(appdata->window));                          GTK_WINDOW(appdata->window));
959  }  }
960    
 /* -- the view submenu -- */  
961  #define APP_OFFSET(a)  offsetof(appdata_t, a)  #define APP_OFFSET(a)  offsetof(appdata_t, a)
962  #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) }
963    #define ENABLED_ENTRY(a,b,c)  { a, NULL, TRUE,  NULL, APP_OFFSET(c), G_CALLBACK(b) }
964  #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) }
965    #define TOGGLE_ENTRY(a,b,c)   { a, NULL, TRUE, c, 0, G_CALLBACK(b) }
966    #define DISABLED_TOGGLE_ENTRY(a,b,c,d)  \
967                                  { a, NULL, FALSE, c, APP_OFFSET(d), G_CALLBACK(b) }
968    #define ENABLED_TOGGLE_ENTRY(a,b,c,d) \
969                                  { a, NULL, TRUE, c, APP_OFFSET(d), G_CALLBACK(b) }
970  #define LAST_ENTRY            { NULL, NULL, FALSE, NULL, 0, NULL }  #define LAST_ENTRY            { NULL, NULL, FALSE, NULL, 0, NULL }
971    
972    /* -- the view submenu -- */
973  static const menu_entry_t submenu_view[] = {  static const menu_entry_t submenu_view[] = {
974    SIMPLE_ENTRY("Zoom in",         cb_menu_zoomin),    SIMPLE_ENTRY("Zoom in",         cb_menu_zoomin),
975    SIMPLE_ENTRY("Zoom out",        cb_menu_zoomout),    SIMPLE_ENTRY("Zoom out",        cb_menu_zoomout),
# Line 945  static const menu_entry_t submenu_view[] Line 983  static const menu_entry_t submenu_view[]
983    DISABLED_ENTRY("Hide selected", cb_menu_map_hide_sel, menu_item_map_hide_sel),    DISABLED_ENTRY("Hide selected", cb_menu_map_hide_sel, menu_item_map_hide_sel),
984    DISABLED_ENTRY("Show all",      cb_menu_map_show_all, menu_item_map_show_all),    DISABLED_ENTRY("Show all",      cb_menu_map_show_all, menu_item_map_show_all),
985    /* --- */    /* --- */
986    { "No icons",       NULL, TRUE,  no_icon_get_toggle, 0, G_CALLBACK(cb_menu_map_no_icons) },    TOGGLE_ENTRY("No icons",        cb_menu_map_no_icons, no_icon_get_toggle),
987    
988      LAST_ENTRY
989    };
990    
991    /* -- the map submenu -- */
992    static const menu_entry_t submenu_map[] = {
993      ENABLED_ENTRY("Upload",                cb_menu_upload, menu_item_map_upload),
994      SIMPLE_ENTRY("Download",               cb_menu_download),
995      ENABLED_ENTRY("Save local changes",    cb_menu_save_changes,
996                                               menu_item_map_save_changes),
997      ENABLED_ENTRY("Discard local changes", cb_menu_undo_changes,
998                                               menu_item_map_undo_changes),
999      ENABLED_ENTRY("Relations",             cb_menu_osm_relations,
1000                                               menu_item_map_relations),
1001    
1002    LAST_ENTRY    LAST_ENTRY
1003  };  };
# Line 959  static const menu_entry_t submenu_wms[] Line 1011  static const menu_entry_t submenu_wms[]
1011    LAST_ENTRY    LAST_ENTRY
1012  };  };
1013    
1014  void menu_create(appdata_t *appdata) {  /* -- the track submenu -- */
1015    GtkWidget *button;  static const menu_entry_t submenu_track[] = {
1016    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());    ENABLED_ENTRY("Import",  cb_menu_track_import, track.menu_item_track_import),
1017      DISABLED_ENTRY("Export", cb_menu_track_export, track.menu_item_track_export),
1018      DISABLED_ENTRY("Clear",  cb_menu_track_clear, track.menu_item_track_clear),
1019      ENABLED_TOGGLE_ENTRY("GPS enable", cb_menu_track_enable_gps,
1020                    enable_gps_get_toggle, track.menu_item_track_enable_gps),
1021      DISABLED_TOGGLE_ENTRY("GPS follow", cb_menu_track_follow_gps,
1022                    follow_gps_get_toggle, track.menu_item_track_follow_gps),
1023    
1024    /* build submenus */    LAST_ENTRY
1025    appdata->submenu_wms = app_menu_create(appdata, submenu_wms);  };
   appdata->submenu_view = app_menu_create(appdata, submenu_view);  
   
   /* ------- */  
   button = gtk_button_new_with_label(_("About"));  
   g_signal_connect_after(button, "clicked",  
                          G_CALLBACK(cb_menu_about), appdata);  
   hildon_app_menu_append(menu, GTK_BUTTON(button));  
   
   button = gtk_button_new_with_label(_("View"));  
   g_signal_connect_after(button, "clicked",  
                          G_CALLBACK(on_submenu_view_clicked), appdata);  
   hildon_app_menu_append(menu, GTK_BUTTON(button));  
   
   button = gtk_button_new_with_label(_("WMS"));  
   g_signal_connect_after(button, "clicked",  
                          G_CALLBACK(on_submenu_wms_clicked), appdata);  
   hildon_app_menu_append(menu, GTK_BUTTON(button));  
1026    
1027    
1028    /* -- the applications main menu -- */
1029    static const menu_entry_t main_menu[] = {
1030      SIMPLE_ENTRY("About",   cb_menu_about),
1031      SIMPLE_ENTRY("Project", cb_menu_project_open),
1032      ENABLED_ENTRY("View",   on_submenu_view_clicked,  submenu_view),
1033      ENABLED_ENTRY("Map",    on_submenu_map_clicked,   submenu_map),
1034      ENABLED_ENTRY("WMS",    on_submenu_wms_clicked,   submenu_wms),
1035      ENABLED_ENTRY("Track",  on_submenu_track_clicked, track.submenu_track),
1036    
1037    gtk_widget_show_all(GTK_WIDGET(menu));    LAST_ENTRY
1038    hildon_window_set_app_menu(HILDON_WINDOW(appdata->window), menu);  };
1039    
1040    void menu_create(appdata_t *appdata) {
1041      HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
1042    
1043      /* build menu/submenus */
1044      menu = HILDON_APP_MENU(app_menu_create(appdata, main_menu));
1045      appdata->app_menu_wms   = app_menu_create(appdata, submenu_wms);
1046      appdata->app_menu_map   = app_menu_create(appdata, submenu_map);
1047      appdata->app_menu_view  = app_menu_create(appdata, submenu_view);
1048      appdata->app_menu_track = app_menu_create(appdata, submenu_track);
1049    
1050      /* enable/disable some entries according to settings */
1051      if(appdata && appdata->settings)
1052        gtk_widget_set_sensitive(appdata->track.menu_item_track_follow_gps,
1053                                 appdata->settings->enable_gps);
1054    
1055      hildon_window_set_app_menu(HILDON_WINDOW(appdata->window), menu);
1056  }  }
1057  #endif  #endif
1058    
# Line 1078  gboolean on_window_key_press(GtkWidget * Line 1144  gboolean on_window_key_press(GtkWidget *
1144    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
1145    int handled = FALSE;    int handled = FALSE;
1146    
1147      //  printf("key event with keyval %x\n", event->keyval);
1148    
1149    // the map handles some keys on its own ...    // the map handles some keys on its own ...
1150    switch(event->keyval) {    switch(event->keyval) {
1151    
# Line 1151  int main(int argc, char *argv[]) { Line 1219  int main(int argc, char *argv[]) {
1219    /* Create HildonWindow and set it to HildonProgram */    /* Create HildonWindow and set it to HildonProgram */
1220    appdata.window = HILDON_WINDOW(hildon_window_new());    appdata.window = HILDON_WINDOW(hildon_window_new());
1221    hildon_program_add_window(appdata.program, appdata.window);    hildon_program_add_window(appdata.program, appdata.window);
1222    
1223    #if MAEMO_VERSION_MAJOR == 5
1224      unsigned long val;
1225      XChangeProperty(GDK_DISPLAY(),
1226                      GDK_WINDOW_XID(GTK_WIDGET(appdata.window)->window),
1227                      XInternAtom(GDK_DISPLAY(),
1228                                  "_HILDON_ZOOM_KEY_ATOM",
1229                                  False), XA_INTEGER, 32,
1230                      PropModeReplace, (unsigned char *) &val, 1);
1231    #endif
1232    
1233  #else  #else
1234    /* Create a Window. */    /* Create a Window. */
1235    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
# Line 1206  int main(int argc, char *argv[]) { Line 1285  int main(int argc, char *argv[]) {
1285    gtk_box_pack_start(GTK_BOX(vbox), map, TRUE, TRUE, 0);    gtk_box_pack_start(GTK_BOX(vbox), map, TRUE, TRUE, 0);
1286  #endif  #endif
1287    
1288    #ifdef ZOOM_BUTTONS
1289      GtkWidget *zhbox = gtk_hbox_new(FALSE, 0);
1290    
1291      gtk_box_pack_start_defaults(GTK_BOX(zhbox), statusbar_new(&appdata));
1292    
1293      /* ---- add zoom in button right of statusbar ---- */
1294      appdata.btn_zoom_in = gtk_button_new();
1295      gtk_button_set_image(GTK_BUTTON(appdata.btn_zoom_in),
1296                           gtk_image_new_from_stock(GTK_STOCK_ZOOM_IN, GTK_ICON_SIZE_MENU));
1297      g_signal_connect(appdata.btn_zoom_in, "clicked", G_CALLBACK(cb_menu_zoomin), &appdata);
1298      gtk_box_pack_start(GTK_BOX(zhbox), appdata.btn_zoom_in, FALSE, FALSE, 0);
1299    
1300      /* ---- add zoom out button right of statusbar ---- */
1301      appdata.btn_zoom_out = gtk_button_new();
1302      gtk_button_set_image(GTK_BUTTON(appdata.btn_zoom_out),
1303                           gtk_image_new_from_stock(GTK_STOCK_ZOOM_OUT, GTK_ICON_SIZE_MENU));
1304      g_signal_connect(appdata.btn_zoom_out, "clicked", G_CALLBACK(cb_menu_zoomout), &appdata);
1305      gtk_box_pack_start(GTK_BOX(zhbox), appdata.btn_zoom_out, FALSE, FALSE, 0);
1306    
1307    
1308      gtk_box_pack_start(GTK_BOX(vbox), zhbox, FALSE, FALSE, 0);
1309    #else
1310    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);
1311    #endif
1312    
1313  #ifndef PORTRAIT  #ifndef PORTRAIT
1314    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);
Legend:
Removed from v.189  
changed lines
  Added in v.195