Diff of /trunk/src/main.c

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

revision 224 by harbaum, Tue Jul 14 11:15:40 2009 UTC revision 225 by harbaum, Tue Jul 14 13:32:27 2009 UTC
# Line 52  void main_ui_enable(appdata_t *appdata) Line 52  void main_ui_enable(appdata_t *appdata)
52  #else  #else
53    char *str = NULL;    char *str = NULL;
54    if(project_valid)    if(project_valid)
55      str = g_strdup_printf("OSM2Go - %s", appdata->project->name);      str = g_markup_printf_escaped("OSM2Go - <b>%s</b>",
56                                      appdata->project->name);
57    else    else
58      str = g_strdup_printf("OSM2Go");      str = g_markup_printf_escaped("OSM2Go");
59    
60    gtk_window_set_title(GTK_WINDOW(appdata->window), str);    hildon_window_set_markup(HILDON_WINDOW(appdata->window), str);
61    g_free(str);    g_free(str);
62  #endif  #endif
63    
# Line 1221  int main(int argc, char *argv[]) { Line 1222  int main(int argc, char *argv[]) {
1222    g_set_application_name("OSM2Go");    g_set_application_name("OSM2Go");
1223    
1224    /* Create HildonWindow and set it to HildonProgram */    /* Create HildonWindow and set it to HildonProgram */
1225    #if MAEMO_VERSION_MAJOR < 5
1226    appdata.window = HILDON_WINDOW(hildon_window_new());    appdata.window = HILDON_WINDOW(hildon_window_new());
1227    #else
1228      appdata.window = HILDON_WINDOW(hildon_stackable_window_new());
1229    #endif
1230    hildon_program_add_window(appdata.program, appdata.window);    hildon_program_add_window(appdata.program, appdata.window);
1231    
1232  #if MAEMO_VERSION_MAJOR == 6  #if MAEMO_VERSION_MAJOR == 6
# Line 1276  int main(int argc, char *argv[]) { Line 1281  int main(int argc, char *argv[]) {
1281      return -1;      return -1;
1282    }    }
1283    
 #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  
1284    gtk_box_pack_start(GTK_BOX(vbox), map, TRUE, TRUE, 0);    gtk_box_pack_start(GTK_BOX(vbox), map, TRUE, TRUE, 0);
 #endif  
1285    
1286  #ifdef ZOOM_BUTTONS  #ifdef ZOOM_BUTTONS
1287    GtkWidget *zhbox = gtk_hbox_new(FALSE, 0);    GtkWidget *zhbox = gtk_hbox_new(FALSE, 0);
# Line 1356  int main(int argc, char *argv[]) { Line 1350  int main(int argc, char *argv[]) {
1350      gtk_window_set_keep_above(GTK_WINDOW(overlay), TRUE);      gtk_window_set_keep_above(GTK_WINDOW(overlay), TRUE);
1351      gtk_window_set_destroy_with_parent(GTK_WINDOW(overlay), TRUE);      gtk_window_set_destroy_with_parent(GTK_WINDOW(overlay), TRUE);
1352      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);
1353    
1354        gtk_window_set_gravity(GTK_WINDOW(overlay), GDK_GRAVITY_NORTH_EAST);
1355    
1356        printf("x = %d\n", gdk_screen_width() - overlay->allocation.width);
1357        gtk_window_move(GTK_WINDOW(overlay),
1358                        gdk_screen_width() - overlay->allocation.width, 60);
1359    
1360      gtk_window_set_decorated(GTK_WINDOW(overlay), TRUE);      gtk_window_set_decorated(GTK_WINDOW(overlay), TRUE);
1361    
1362      /* add some zoom buttons for testing */      /* add some zoom buttons for testing */
Legend:
Removed from v.224  
changed lines
  Added in v.225