Diff of /trunk/src/main.c

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

revision 200 by harbaum, Thu Jul 9 11:44:27 2009 UTC revision 241 by harbaum, Thu Jul 23 19:23:22 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)
56        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)    if(project_valid)
64      str = g_strdup_printf("OSM2Go - %s", appdata->project->name);      str = g_strdup_printf("OSM2Go - %s", 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    
# Line 596  void menu_create(appdata_t *appdata) { Line 606  void menu_create(appdata_t *appdata) {
606    /* -------------------- Project submenu -------------------- */    /* -------------------- Project submenu -------------------- */
607    
608    GtkAccelGroup *accel_grp = gtk_accel_group_new();    GtkAccelGroup *accel_grp = gtk_accel_group_new();
609    
610    #ifndef USE_HILDON
611    item = gtk_menu_item_new_with_mnemonic( _("_Project") );    item = gtk_menu_item_new_with_mnemonic( _("_Project") );
612    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
613    submenu = gtk_menu_new();    submenu = gtk_menu_new();
# Line 616  void menu_create(appdata_t *appdata) { Line 628  void menu_create(appdata_t *appdata) {
628      GTK_STOCK_NEW, "<OSM2Go-Main>/Project/Wizard",      GTK_STOCK_NEW, "<OSM2Go-Main>/Project/Wizard",
629      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
630    );    );
631    #else
632      menu_append_new_item(
633        appdata, menu, GTK_SIGNAL_FUNC(cb_menu_project_open), _("_Project"),
634        GTK_STOCK_OPEN, "<OSM2Go-Main>/Project",
635        0, 0, TRUE, FALSE, FALSE
636      );
637    #endif
638    
639    /* --------------- view menu ------------------- */    /* --------------- view menu ------------------- */
640    
# Line 637  void menu_create(appdata_t *appdata) { Line 656  void menu_create(appdata_t *appdata) {
656    );    );
657  #endif  #endif
658    
659    #if !defined(ZOOM_BUTTONS) || !defined(USE_HILDON)
660    menu_append_new_item(    menu_append_new_item(
661      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_zoomin), _("Zoom _in"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_zoomin), _("Zoom _in"),
662      GTK_STOCK_ZOOM_IN, "<OSM2Go-Main>/View/ZoomIn",      GTK_STOCK_ZOOM_IN, "<OSM2Go-Main>/View/ZoomIn",
# Line 648  void menu_create(appdata_t *appdata) { Line 668  void menu_create(appdata_t *appdata) {
668      GTK_STOCK_ZOOM_OUT, "<OSM2Go-Main>/View/ZoomOut",      GTK_STOCK_ZOOM_OUT, "<OSM2Go-Main>/View/ZoomOut",
669      GDK_period, GDK_CONTROL_MASK, TRUE, FALSE, FALSE      GDK_period, GDK_CONTROL_MASK, TRUE, FALSE, FALSE
670    );    );
671    #endif
672    
673    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());
674    
# Line 939  static GtkWidget *app_menu_create(appdat Line 960  static GtkWidget *app_menu_create(appdat
960    return GTK_WIDGET(menu);    return GTK_WIDGET(menu);
961  }  }
962    
963    static void submenu_popup(GtkWidget *menu) {
964      GtkWidget *top = hildon_window_stack_peek(hildon_window_stack_get_default());
965    
966    #if 1
967      int start, end;
968      GTimeVal tv;
969      g_get_current_time(&tv);
970      start = tv.tv_sec * 1000 + tv.tv_usec / 1000;
971      do {
972        if(gtk_events_pending())
973          while(gtk_events_pending()) {
974            putchar('.'); fflush(stdout);
975            gtk_main_iteration();
976          }
977        else
978          usleep(100);
979    
980        g_get_current_time(&tv);
981        end = tv.tv_sec * 1000 + tv.tv_usec / 1000;
982      } while(end-start < 500);
983    #endif
984    
985    
986    
987      hildon_app_menu_popup(HILDON_APP_MENU(menu), GTK_WINDOW(top));
988    }
989    
990  /* the view submenu */  /* the view submenu */
991  void on_submenu_view_clicked(GtkButton *button, appdata_t *appdata) {  void on_submenu_view_clicked(GtkButton *button, appdata_t *appdata) {
992    hildon_app_menu_popup(HILDON_APP_MENU(appdata->app_menu_view),    submenu_popup(appdata->app_menu_view);
                         GTK_WINDOW(appdata->window));  
993  }  }
994    
995  void on_submenu_map_clicked(GtkButton *button, appdata_t *appdata) {  void on_submenu_map_clicked(GtkButton *button, appdata_t *appdata) {
996    hildon_app_menu_popup(HILDON_APP_MENU(appdata->app_menu_map),    submenu_popup(appdata->app_menu_map);
                         GTK_WINDOW(appdata->window));  
997  }  }
998    
999  void on_submenu_wms_clicked(GtkButton *button, appdata_t *appdata) {  void on_submenu_wms_clicked(GtkButton *button, appdata_t *appdata) {
1000    hildon_app_menu_popup(HILDON_APP_MENU(appdata->app_menu_wms),    submenu_popup(appdata->app_menu_wms);
                         GTK_WINDOW(appdata->window));  
1001  }  }
1002    
1003  void on_submenu_track_clicked(GtkButton *button, appdata_t *appdata) {  void on_submenu_track_clicked(GtkButton *button, appdata_t *appdata) {
1004    hildon_app_menu_popup(HILDON_APP_MENU(appdata->app_menu_track),    submenu_popup(appdata->app_menu_track);
                         GTK_WINDOW(appdata->window));  
1005  }  }
1006    
1007  #define APP_OFFSET(a)  offsetof(appdata_t, a)  #define APP_OFFSET(a)  offsetof(appdata_t, a)
# Line 973  void on_submenu_track_clicked(GtkButton Line 1017  void on_submenu_track_clicked(GtkButton
1017    
1018  /* -- the view submenu -- */  /* -- the view submenu -- */
1019  static const menu_entry_t submenu_view[] = {  static const menu_entry_t submenu_view[] = {
1020    #ifndef ZOOM_BUTTONS
1021    SIMPLE_ENTRY("Zoom in",         cb_menu_zoomin),    SIMPLE_ENTRY("Zoom in",         cb_menu_zoomin),
1022    SIMPLE_ENTRY("Zoom out",        cb_menu_zoomout),    SIMPLE_ENTRY("Zoom out",        cb_menu_zoomout),
1023    #endif
1024    /* --- */    /* --- */
1025    SIMPLE_ENTRY("Style",           cb_menu_style),    SIMPLE_ENTRY("Style",           cb_menu_style),
1026    /* --- */    /* --- */
# Line 1045  void menu_create(appdata_t *appdata) { Line 1091  void menu_create(appdata_t *appdata) {
1091    /* build menu/submenus */    /* build menu/submenus */
1092    menu = HILDON_APP_MENU(app_menu_create(appdata, main_menu));    menu = HILDON_APP_MENU(app_menu_create(appdata, main_menu));
1093    appdata->app_menu_wms   = app_menu_create(appdata, submenu_wms);    appdata->app_menu_wms   = app_menu_create(appdata, submenu_wms);
1094      g_object_ref(appdata->app_menu_wms);
1095    appdata->app_menu_map   = app_menu_create(appdata, submenu_map);    appdata->app_menu_map   = app_menu_create(appdata, submenu_map);
1096      g_object_ref(appdata->app_menu_map);
1097    appdata->app_menu_view  = app_menu_create(appdata, submenu_view);    appdata->app_menu_view  = app_menu_create(appdata, submenu_view);
1098      g_object_ref(appdata->app_menu_view);
1099    appdata->app_menu_track = app_menu_create(appdata, submenu_track);    appdata->app_menu_track = app_menu_create(appdata, submenu_track);
1100      g_object_ref(appdata->app_menu_track);
1101    
1102    /* enable/disable some entries according to settings */    /* enable/disable some entries according to settings */
1103    if(appdata && appdata->settings)    if(appdata && appdata->settings)
# Line 1129  void cleanup(appdata_t *appdata) { Line 1179  void cleanup(appdata_t *appdata) {
1179    project_free(appdata->project);    project_free(appdata->project);
1180    
1181    if(appdata->menu_item_map_undo)    if(appdata->menu_item_map_undo)
1182      undo_free(appdata->undo.state);      undo_free(appdata->osm, appdata->undo.state);
1183    
1184    puts("everything is gone");    puts("everything is gone");
1185  }  }
# Line 1219  int main(int argc, char *argv[]) { Line 1269  int main(int argc, char *argv[]) {
1269    g_set_application_name("OSM2Go");    g_set_application_name("OSM2Go");
1270    
1271    /* Create HildonWindow and set it to HildonProgram */    /* Create HildonWindow and set it to HildonProgram */
1272    #if MAEMO_VERSION_MAJOR < 5
1273    appdata.window = HILDON_WINDOW(hildon_window_new());    appdata.window = HILDON_WINDOW(hildon_window_new());
1274    #else
1275      appdata.window = HILDON_WINDOW(hildon_stackable_window_new());
1276    #endif
1277    hildon_program_add_window(appdata.program, appdata.window);    hildon_program_add_window(appdata.program, appdata.window);
1278    
1279  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
1280    unsigned long val;    unsigned long val = False;
1281    XChangeProperty(GDK_DISPLAY(),    XChangeProperty(GDK_DISPLAY(),
1282                    GDK_WINDOW_XID(GTK_WIDGET(appdata.window)->window),                    GDK_WINDOW_XID(GTK_WIDGET(appdata.window)->window),
1283                    XInternAtom(GDK_DISPLAY(),                    XInternAtom(GDK_DISPLAY(),
# Line 1274  int main(int argc, char *argv[]) { Line 1328  int main(int argc, char *argv[]) {
1328      return -1;      return -1;
1329    }    }
1330    
 #if 0  // another test overlay  
   {  
     GtkWidget *fixed = gtk_fixed_new();  
   
     gtk_fixed_put(GTK_FIXED(fixed), gtk_label_new("Nase"), 0,0);  
     gtk_fixed_put(GTK_FIXED(fixed), map, 0,0);  
   
     gtk_box_pack_start(GTK_BOX(vbox), fixed, TRUE, TRUE, 0);  
   }  
 #else  
1331    gtk_box_pack_start(GTK_BOX(vbox), map, TRUE, TRUE, 0);    gtk_box_pack_start(GTK_BOX(vbox), map, TRUE, TRUE, 0);
 #endif  
1332    
1333  #ifdef ZOOM_BUTTONS  #ifdef ZOOM_BUTTONS
1334    GtkWidget *zhbox = gtk_hbox_new(FALSE, 0);    GtkWidget *zhbox = gtk_hbox_new(FALSE, 0);
1335    
1336    gtk_box_pack_start_defaults(GTK_BOX(zhbox), statusbar_new(&appdata));    gtk_box_pack_start_defaults(GTK_BOX(zhbox), statusbar_new(&appdata));
1337    
   /* ---- add zoom in button right of statusbar ---- */  
   appdata.btn_zoom_in = gtk_button_new();  
   gtk_button_set_image(GTK_BUTTON(appdata.btn_zoom_in),  
                        gtk_image_new_from_stock(GTK_STOCK_ZOOM_IN, GTK_ICON_SIZE_MENU));  
   g_signal_connect(appdata.btn_zoom_in, "clicked", G_CALLBACK(cb_menu_zoomin), &appdata);  
   gtk_box_pack_start(GTK_BOX(zhbox), appdata.btn_zoom_in, FALSE, FALSE, 0);  
   
1338    /* ---- add zoom out button right of statusbar ---- */    /* ---- add zoom out button right of statusbar ---- */
1339    appdata.btn_zoom_out = gtk_button_new();    appdata.btn_zoom_out = gtk_button_new();
1340    gtk_button_set_image(GTK_BUTTON(appdata.btn_zoom_out),    gtk_button_set_image(GTK_BUTTON(appdata.btn_zoom_out),
1341                         gtk_image_new_from_stock(GTK_STOCK_ZOOM_OUT, GTK_ICON_SIZE_MENU));          gtk_image_new_from_stock(GTK_STOCK_ZOOM_OUT, GTK_ICON_SIZE_MENU));
1342    g_signal_connect(appdata.btn_zoom_out, "clicked", G_CALLBACK(cb_menu_zoomout), &appdata);    g_signal_connect(appdata.btn_zoom_out, "clicked",
1343                       G_CALLBACK(cb_menu_zoomout), &appdata);
1344    gtk_box_pack_start(GTK_BOX(zhbox), appdata.btn_zoom_out, FALSE, FALSE, 0);    gtk_box_pack_start(GTK_BOX(zhbox), appdata.btn_zoom_out, FALSE, FALSE, 0);
1345    
1346      /* ---- add zoom in button right of statusbar ---- */
1347      appdata.btn_zoom_in = gtk_button_new();
1348      gtk_button_set_image(GTK_BUTTON(appdata.btn_zoom_in),
1349            gtk_image_new_from_stock(GTK_STOCK_ZOOM_IN, GTK_ICON_SIZE_MENU));
1350      g_signal_connect(appdata.btn_zoom_in, "clicked",
1351                       G_CALLBACK(cb_menu_zoomin), &appdata);
1352      gtk_box_pack_start(GTK_BOX(zhbox), appdata.btn_zoom_in, FALSE, FALSE, 0);
1353    
1354    
1355    gtk_box_pack_start(GTK_BOX(vbox), zhbox, FALSE, FALSE, 0);    gtk_box_pack_start(GTK_BOX(vbox), zhbox, FALSE, FALSE, 0);
1356  #else  #else
# Line 1352  int main(int argc, char *argv[]) { Line 1397  int main(int argc, char *argv[]) {
1397      gtk_window_set_keep_above(GTK_WINDOW(overlay), TRUE);      gtk_window_set_keep_above(GTK_WINDOW(overlay), TRUE);
1398      gtk_window_set_destroy_with_parent(GTK_WINDOW(overlay), TRUE);      gtk_window_set_destroy_with_parent(GTK_WINDOW(overlay), TRUE);
1399      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);
1400    
1401        gtk_window_set_gravity(GTK_WINDOW(overlay), GDK_GRAVITY_NORTH_EAST);
1402    
1403        printf("x = %d\n", gdk_screen_width() - overlay->allocation.width);
1404        gtk_window_move(GTK_WINDOW(overlay),
1405                        gdk_screen_width() - overlay->allocation.width, 60);
1406    
1407      gtk_window_set_decorated(GTK_WINDOW(overlay), TRUE);      gtk_window_set_decorated(GTK_WINDOW(overlay), TRUE);
1408    
1409      /* add some zoom buttons for testing */      /* add some zoom buttons for testing */
Legend:
Removed from v.200  
changed lines
  Added in v.241