Index: src/maps.c =================================================================== --- src/maps.c (revision 11) +++ src/maps.c (revision 12) @@ -3217,18 +3217,17 @@ gboolean mapman_dialog() { - static GtkWidget *dialog = NULL; - static GtkWidget *vbox = NULL; - static GtkWidget *hbox = NULL; - static GtkWidget *table = NULL; - static GtkWidget *label = NULL; - static GtkWidget *button = NULL; - static GtkWidget *lbl_gps_lat = NULL; - static GtkWidget *lbl_gps_lon = NULL; - static GtkWidget *lbl_center_lat = NULL; - static GtkWidget *lbl_center_lon = NULL; - static MapmanInfo mapman_info; - static gint last_deg_format = 0; + GtkWidget *dialog; + GtkWidget *vbox; + GtkWidget *hbox; + GtkWidget *table; + GtkWidget *label; + GtkWidget *button; + GtkWidget *lbl_gps_lat; + GtkWidget *lbl_gps_lon; + GtkWidget *lbl_center_lat; + GtkWidget *lbl_center_lon; + MapmanInfo mapman_info; gchar buffer[80]; gdouble lat, lon; @@ -3286,296 +3285,285 @@ } - if(_degformat != last_deg_format) - { - last_deg_format = _degformat; - - if(dialog != NULL) gtk_widget_destroy(dialog); - dialog = NULL; - } + mapman_info.dialog = dialog = gtk_dialog_new_with_buttons( + _("Manage Maps"), + GTK_WINDOW(_window), GTK_DIALOG_MODAL, + GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, + NULL); - if(dialog == NULL) - { - mapman_info.dialog = dialog = gtk_dialog_new_with_buttons( - _("Manage Maps"), - GTK_WINDOW(_window), GTK_DIALOG_MODAL, - GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, - NULL); - - /* Enable the help button. */ + /* Enable the help button. */ #ifndef LEGACY - hildon_help_dialog_help_enable( + hildon_help_dialog_help_enable( #else - ossohelp_dialog_help_enable( + ossohelp_dialog_help_enable( #endif - GTK_DIALOG(mapman_info.dialog), HELP_ID_MAPMAN, _osso); + GTK_DIALOG(mapman_info.dialog), HELP_ID_MAPMAN, _osso); - /* Clear button. */ - gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area), - button = gtk_button_new_with_label(_("Clear"))); - g_signal_connect(G_OBJECT(button), "clicked", - G_CALLBACK(mapman_clear), &mapman_info); + /* Clear button. */ + gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area), + button = gtk_button_new_with_label(_("Clear"))); + g_signal_connect(G_OBJECT(button), "clicked", + G_CALLBACK(mapman_clear), &mapman_info); - /* Cancel button. */ - gtk_dialog_add_button(GTK_DIALOG(dialog), - GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT); + /* Cancel button. */ + gtk_dialog_add_button(GTK_DIALOG(dialog), + GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT); - gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), - mapman_info.notebook = gtk_notebook_new(), TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), + mapman_info.notebook = gtk_notebook_new(), TRUE, TRUE, 0); - /* Setup page. */ - gtk_notebook_append_page(GTK_NOTEBOOK(mapman_info.notebook), - vbox = gtk_vbox_new(FALSE, 2), - label = gtk_label_new(_("Setup"))); - gtk_notebook_set_tab_label_packing( - GTK_NOTEBOOK(mapman_info.notebook), vbox, - FALSE, FALSE, GTK_PACK_START); + /* Setup page. */ + gtk_notebook_append_page(GTK_NOTEBOOK(mapman_info.notebook), + vbox = gtk_vbox_new(FALSE, 2), + label = gtk_label_new(_("Setup"))); + gtk_notebook_set_tab_label_packing( + GTK_NOTEBOOK(mapman_info.notebook), vbox, + FALSE, FALSE, GTK_PACK_START); - gtk_box_pack_start(GTK_BOX(vbox), - hbox = gtk_hbox_new(FALSE, 4), - FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX(hbox), - mapman_info.rad_download = gtk_radio_button_new_with_label( - NULL,_("Download Maps")), - FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX(hbox), - label = gtk_alignment_new(0.f, 0.5f, 0.f, 0.f), - FALSE, FALSE, 0); - gtk_container_add(GTK_CONTAINER(label), - mapman_info.chk_overwrite - = gtk_check_button_new_with_label(_("Overwrite"))), + gtk_box_pack_start(GTK_BOX(vbox), + hbox = gtk_hbox_new(FALSE, 4), + FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), + mapman_info.rad_download = gtk_radio_button_new_with_label( + NULL,_("Download Maps")), + FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), + label = gtk_alignment_new(0.f, 0.5f, 0.f, 0.f), + FALSE, FALSE, 0); + gtk_container_add(GTK_CONTAINER(label), + mapman_info.chk_overwrite + = gtk_check_button_new_with_label(_("Overwrite"))), - gtk_box_pack_start(GTK_BOX(vbox), - mapman_info.rad_delete - = gtk_radio_button_new_with_label_from_widget( - GTK_RADIO_BUTTON(mapman_info.rad_download), - _("Delete Maps")), - FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(vbox), + mapman_info.rad_delete + = gtk_radio_button_new_with_label_from_widget( + GTK_RADIO_BUTTON(mapman_info.rad_download), + _("Delete Maps")), + FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX(vbox), - gtk_hseparator_new(), - FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(vbox), + gtk_hseparator_new(), + FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX(vbox), - mapman_info.rad_by_area - = gtk_radio_button_new_with_label(NULL, - _("By Area (see tab)")), - FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX(vbox), - hbox = gtk_hbox_new(FALSE, 4), - FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX(hbox), - mapman_info.rad_by_route - = gtk_radio_button_new_with_label_from_widget( - GTK_RADIO_BUTTON(mapman_info.rad_by_area), - _("Along Route - Radius (tiles):")), - FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX(hbox), - mapman_info.num_route_radius = hildon_number_editor_new(0,100), - FALSE, FALSE, 0); - hildon_number_editor_set_value( - HILDON_NUMBER_EDITOR(mapman_info.num_route_radius), - _route_dl_radius); + gtk_box_pack_start(GTK_BOX(vbox), + mapman_info.rad_by_area + = gtk_radio_button_new_with_label(NULL, + _("By Area (see tab)")), + FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(vbox), + hbox = gtk_hbox_new(FALSE, 4), + FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), + mapman_info.rad_by_route + = gtk_radio_button_new_with_label_from_widget( + GTK_RADIO_BUTTON(mapman_info.rad_by_area), + _("Along Route - Radius (tiles):")), + FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), + mapman_info.num_route_radius = hildon_number_editor_new(0,100), + FALSE, FALSE, 0); + hildon_number_editor_set_value( + HILDON_NUMBER_EDITOR(mapman_info.num_route_radius), + _route_dl_radius); - /* Zoom page. */ - gtk_notebook_append_page(GTK_NOTEBOOK(mapman_info.notebook), - table = gtk_table_new(5, 5, FALSE), - label = gtk_label_new(_("Zoom"))); - gtk_notebook_set_tab_label_packing( - GTK_NOTEBOOK(mapman_info.notebook), table, - FALSE, FALSE, GTK_PACK_START); + /* Zoom page. */ + gtk_notebook_append_page(GTK_NOTEBOOK(mapman_info.notebook), + table = gtk_table_new(5, 5, FALSE), + label = gtk_label_new(_("Zoom"))); + gtk_notebook_set_tab_label_packing( + GTK_NOTEBOOK(mapman_info.notebook), table, + FALSE, FALSE, GTK_PACK_START); + gtk_table_attach(GTK_TABLE(table), + label = gtk_label_new( + _("Zoom Levels to Download: (0 = most detail)")), + 0, 4, 0, 1, GTK_FILL, 0, 4, 0); + gtk_misc_set_alignment(GTK_MISC(label), 0.f, 0.5f); + snprintf(buffer, sizeof(buffer), "%d", 0); + gtk_table_attach(GTK_TABLE(table), + mapman_info.chk_zoom_levels[0] + = gtk_check_button_new_with_label(buffer), + 4, 5 , 0, 1, GTK_FILL, 0, 0, 0); + for(z = 0; z < MAX_ZOOM; ++z) + { + snprintf(buffer, sizeof(buffer), "%d", z + 1); gtk_table_attach(GTK_TABLE(table), - label = gtk_label_new( - _("Zoom Levels to Download: (0 = most detail)")), - 0, 4, 0, 1, GTK_FILL, 0, 4, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0.f, 0.5f); - snprintf(buffer, sizeof(buffer), "%d", 0); - gtk_table_attach(GTK_TABLE(table), - mapman_info.chk_zoom_levels[0] + mapman_info.chk_zoom_levels[z + 1] = gtk_check_button_new_with_label(buffer), - 4, 5 , 0, 1, GTK_FILL, 0, 0, 0); - for(z = 0; z < MAX_ZOOM; ++z) - { - snprintf(buffer, sizeof(buffer), "%d", z + 1); - gtk_table_attach(GTK_TABLE(table), - mapman_info.chk_zoom_levels[z + 1] - = gtk_check_button_new_with_label(buffer), - z / 4, z / 4 + 1, z % 4 + 1, z % 4 + 2, - GTK_FILL, 0, 0, 0); - } + z / 4, z / 4 + 1, z % 4 + 1, z % 4 + 2, + GTK_FILL, 0, 0, 0); + } - /* Area page. */ - gtk_notebook_append_page(GTK_NOTEBOOK(mapman_info.notebook), - mapman_info.tbl_area = gtk_table_new(5, 3, FALSE), - label = gtk_label_new(_("Area"))); + /* Area page. */ + gtk_notebook_append_page(GTK_NOTEBOOK(mapman_info.notebook), + mapman_info.tbl_area = gtk_table_new(5, 3, FALSE), + label = gtk_label_new(_("Area"))); - /* Label Columns. */ + /* Label Columns. */ + gtk_table_attach(GTK_TABLE(mapman_info.tbl_area), + label = gtk_label_new(DEG_FORMAT_ENUM_TEXT[_degformat].long_field_1), + 1, 2, 0, 1, GTK_FILL, 0, 4, 0); + gtk_misc_set_alignment(GTK_MISC(label), 0.5f, 0.5f); + + if(DEG_FORMAT_ENUM_TEXT[_degformat].field_2_in_use) + { gtk_table_attach(GTK_TABLE(mapman_info.tbl_area), - label = gtk_label_new(DEG_FORMAT_ENUM_TEXT[_degformat].long_field_1), - 1, 2, 0, 1, GTK_FILL, 0, 4, 0); + label = gtk_label_new(DEG_FORMAT_ENUM_TEXT[_degformat].long_field_2), + 2, 3, 0, 1, GTK_FILL, 0, 4, 0); gtk_misc_set_alignment(GTK_MISC(label), 0.5f, 0.5f); - - if(DEG_FORMAT_ENUM_TEXT[_degformat].field_2_in_use) - { - gtk_table_attach(GTK_TABLE(mapman_info.tbl_area), - label = gtk_label_new(DEG_FORMAT_ENUM_TEXT[_degformat].long_field_2), - 2, 3, 0, 1, GTK_FILL, 0, 4, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0.5f, 0.5f); - } - - /* GPS. */ + } + + /* GPS. */ + gtk_table_attach(GTK_TABLE(mapman_info.tbl_area), + label = gtk_label_new(_("GPS Location")), + 0, 1, 1, 2, GTK_FILL, 0, 4, 0); + gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f); + gtk_table_attach(GTK_TABLE(mapman_info.tbl_area), + lbl_gps_lat = gtk_label_new(""), + 1, 2, 1, 2, GTK_FILL, 0, 4, 0); + gtk_label_set_selectable(GTK_LABEL(lbl_gps_lat), TRUE); + gtk_misc_set_alignment(GTK_MISC(lbl_gps_lat), 1.f, 0.5f); + + if(DEG_FORMAT_ENUM_TEXT[_degformat].field_2_in_use) + { gtk_table_attach(GTK_TABLE(mapman_info.tbl_area), - label = gtk_label_new(_("GPS Location")), - 0, 1, 1, 2, GTK_FILL, 0, 4, 0); - gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f); - gtk_table_attach(GTK_TABLE(mapman_info.tbl_area), - lbl_gps_lat = gtk_label_new(""), - 1, 2, 1, 2, GTK_FILL, 0, 4, 0); - gtk_label_set_selectable(GTK_LABEL(lbl_gps_lat), TRUE); - gtk_misc_set_alignment(GTK_MISC(lbl_gps_lat), 1.f, 0.5f); - - if(DEG_FORMAT_ENUM_TEXT[_degformat].field_2_in_use) - { - gtk_table_attach(GTK_TABLE(mapman_info.tbl_area), - lbl_gps_lon = gtk_label_new(""), - 2, 3, 1, 2, GTK_FILL, 0, 4, 0); - gtk_label_set_selectable(GTK_LABEL(lbl_gps_lon), TRUE); - gtk_misc_set_alignment(GTK_MISC(lbl_gps_lon), 1.f, 0.5f); - } - - /* Center. */ - gtk_table_attach(GTK_TABLE(mapman_info.tbl_area), - label = gtk_label_new(_("View Center")), - 0, 1, 2, 3, GTK_FILL, 0, 4, 0); - gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f); - gtk_table_attach(GTK_TABLE(mapman_info.tbl_area), - lbl_center_lat = gtk_label_new(""), - 1, 2, 2, 3, GTK_FILL, 0, 4, 0); - gtk_label_set_selectable(GTK_LABEL(lbl_center_lat), TRUE); - gtk_misc_set_alignment(GTK_MISC(lbl_center_lat), 1.f, 0.5f); - + lbl_gps_lon = gtk_label_new(""), + 2, 3, 1, 2, GTK_FILL, 0, 4, 0); + gtk_label_set_selectable(GTK_LABEL(lbl_gps_lon), TRUE); + gtk_misc_set_alignment(GTK_MISC(lbl_gps_lon), 1.f, 0.5f); + } - if(DEG_FORMAT_ENUM_TEXT[_degformat].field_2_in_use) - { - gtk_table_attach(GTK_TABLE(mapman_info.tbl_area), - lbl_center_lon = gtk_label_new(""), - 2, 3, 2, 3, GTK_FILL, 0, 4, 0); - gtk_label_set_selectable(GTK_LABEL(lbl_center_lon), TRUE); - gtk_misc_set_alignment(GTK_MISC(lbl_center_lon), 1.f, 0.5f); - } + /* Center. */ + gtk_table_attach(GTK_TABLE(mapman_info.tbl_area), + label = gtk_label_new(_("View Center")), + 0, 1, 2, 3, GTK_FILL, 0, 4, 0); + gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f); + gtk_table_attach(GTK_TABLE(mapman_info.tbl_area), + lbl_center_lat = gtk_label_new(""), + 1, 2, 2, 3, GTK_FILL, 0, 4, 0); + gtk_label_set_selectable(GTK_LABEL(lbl_center_lat), TRUE); + gtk_misc_set_alignment(GTK_MISC(lbl_center_lat), 1.f, 0.5f); + - /* default values for Top Left and Bottom Right are defined by the - * rectangle of the current and the previous Center */ + if(DEG_FORMAT_ENUM_TEXT[_degformat].field_2_in_use) + { + gtk_table_attach(GTK_TABLE(mapman_info.tbl_area), + lbl_center_lon = gtk_label_new(""), + 2, 3, 2, 3, GTK_FILL, 0, 4, 0); + gtk_label_set_selectable(GTK_LABEL(lbl_center_lon), TRUE); + gtk_misc_set_alignment(GTK_MISC(lbl_center_lon), 1.f, 0.5f); + } - /* Top Left. */ + /* default values for Top Left and Bottom Right are defined by the + * rectangle of the current and the previous Center */ + + /* Top Left. */ + gtk_table_attach(GTK_TABLE(mapman_info.tbl_area), + label = gtk_label_new(_("Top-Left")), + 0, 1, 3, 4, GTK_FILL, 0, 4, 0); + gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f); + gtk_table_attach(GTK_TABLE(mapman_info.tbl_area), + mapman_info.txt_topleft_lat = gtk_entry_new(), + 1, 2, 3, 4, GTK_FILL, 0, 4, 0); + gtk_entry_set_width_chars(GTK_ENTRY(mapman_info.txt_topleft_lat), 12); + gtk_entry_set_alignment(GTK_ENTRY(mapman_info.txt_topleft_lat), 1.f); +#ifdef MAEMO_CHANGES + g_object_set(G_OBJECT(mapman_info.txt_topleft_lat), +#ifndef LEGACY + "hildon-input-mode", + HILDON_GTK_INPUT_MODE_FULL, NULL); +#else + HILDON_INPUT_MODE_HINT, + HILDON_INPUT_MODE_HINT_ALPHANUMERICSPECIAL, NULL); + g_object_set(G_OBJECT(mapman_info.txt_topleft_lat), + HILDON_AUTOCAP, + FALSE, NULL); +#endif +#endif + + if(DEG_FORMAT_ENUM_TEXT[_degformat].field_2_in_use) + { gtk_table_attach(GTK_TABLE(mapman_info.tbl_area), - label = gtk_label_new(_("Top-Left")), - 0, 1, 3, 4, GTK_FILL, 0, 4, 0); - gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f); - gtk_table_attach(GTK_TABLE(mapman_info.tbl_area), - mapman_info.txt_topleft_lat = gtk_entry_new(), - 1, 2, 3, 4, GTK_FILL, 0, 4, 0); - gtk_entry_set_width_chars(GTK_ENTRY(mapman_info.txt_topleft_lat), 12); - gtk_entry_set_alignment(GTK_ENTRY(mapman_info.txt_topleft_lat), 1.f); + mapman_info.txt_topleft_lon = gtk_entry_new(), + 2, 3, 3, 4, GTK_FILL, 0, 4, 0); + gtk_entry_set_width_chars(GTK_ENTRY(mapman_info.txt_topleft_lon), 12); + gtk_entry_set_alignment(GTK_ENTRY(mapman_info.txt_topleft_lon), 1.f); #ifdef MAEMO_CHANGES - g_object_set(G_OBJECT(mapman_info.txt_topleft_lat), + g_object_set(G_OBJECT(mapman_info.txt_topleft_lon), #ifndef LEGACY "hildon-input-mode", HILDON_GTK_INPUT_MODE_FULL, NULL); #else HILDON_INPUT_MODE_HINT, HILDON_INPUT_MODE_HINT_ALPHANUMERICSPECIAL, NULL); - g_object_set(G_OBJECT(mapman_info.txt_topleft_lat), + g_object_set(G_OBJECT(mapman_info.txt_topleft_lon), HILDON_AUTOCAP, FALSE, NULL); #endif #endif - - if(DEG_FORMAT_ENUM_TEXT[_degformat].field_2_in_use) - { - gtk_table_attach(GTK_TABLE(mapman_info.tbl_area), - mapman_info.txt_topleft_lon = gtk_entry_new(), - 2, 3, 3, 4, GTK_FILL, 0, 4, 0); - gtk_entry_set_width_chars(GTK_ENTRY(mapman_info.txt_topleft_lon), 12); - gtk_entry_set_alignment(GTK_ENTRY(mapman_info.txt_topleft_lon), 1.f); + + } + + /* Bottom Right. */ + gtk_table_attach(GTK_TABLE(mapman_info.tbl_area), + label = gtk_label_new(_("Bottom-Right")), + 0, 1, 4, 5, GTK_FILL, 0, 4, 0); + gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f); + gtk_table_attach(GTK_TABLE(mapman_info.tbl_area), + mapman_info.txt_botright_lat = gtk_entry_new(), + 1, 2, 4, 5, GTK_FILL, 0, 4, 0); + gtk_entry_set_width_chars(GTK_ENTRY(mapman_info.txt_botright_lat), 12); + gtk_entry_set_alignment(GTK_ENTRY(mapman_info.txt_botright_lat), 1.f); #ifdef MAEMO_CHANGES - g_object_set(G_OBJECT(mapman_info.txt_topleft_lon), + g_object_set(G_OBJECT(mapman_info.txt_botright_lat), #ifndef LEGACY - "hildon-input-mode", - HILDON_GTK_INPUT_MODE_FULL, NULL); + "hildon-input-mode", + HILDON_GTK_INPUT_MODE_FULL, NULL); #else - HILDON_INPUT_MODE_HINT, - HILDON_INPUT_MODE_HINT_ALPHANUMERICSPECIAL, NULL); - g_object_set(G_OBJECT(mapman_info.txt_topleft_lon), - HILDON_AUTOCAP, - FALSE, NULL); + HILDON_INPUT_MODE_HINT, + HILDON_INPUT_MODE_HINT_ALPHANUMERICSPECIAL, NULL); + g_object_set(G_OBJECT(mapman_info.txt_botright_lat), + HILDON_AUTOCAP, + FALSE, NULL); #endif #endif - - } - - /* Bottom Right. */ + + if(DEG_FORMAT_ENUM_TEXT[_degformat].field_2_in_use) + { gtk_table_attach(GTK_TABLE(mapman_info.tbl_area), - label = gtk_label_new(_("Bottom-Right")), - 0, 1, 4, 5, GTK_FILL, 0, 4, 0); - gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f); - gtk_table_attach(GTK_TABLE(mapman_info.tbl_area), - mapman_info.txt_botright_lat = gtk_entry_new(), - 1, 2, 4, 5, GTK_FILL, 0, 4, 0); - gtk_entry_set_width_chars(GTK_ENTRY(mapman_info.txt_botright_lat), 12); - gtk_entry_set_alignment(GTK_ENTRY(mapman_info.txt_botright_lat), 1.f); + mapman_info.txt_botright_lon = gtk_entry_new(), + 2, 3, 4, 5, GTK_FILL, 0, 4, 0); + gtk_entry_set_width_chars(GTK_ENTRY(mapman_info.txt_botright_lon), 12); + gtk_entry_set_alignment(GTK_ENTRY(mapman_info.txt_botright_lon), 1.f); #ifdef MAEMO_CHANGES - g_object_set(G_OBJECT(mapman_info.txt_botright_lat), + g_object_set(G_OBJECT(mapman_info.txt_botright_lon), #ifndef LEGACY "hildon-input-mode", HILDON_GTK_INPUT_MODE_FULL, NULL); #else HILDON_INPUT_MODE_HINT, HILDON_INPUT_MODE_HINT_ALPHANUMERICSPECIAL, NULL); - g_object_set(G_OBJECT(mapman_info.txt_botright_lat), + g_object_set(G_OBJECT(mapman_info.txt_botright_lon), HILDON_AUTOCAP, FALSE, NULL); #endif #endif - - if(DEG_FORMAT_ENUM_TEXT[_degformat].field_2_in_use) - { - gtk_table_attach(GTK_TABLE(mapman_info.tbl_area), - mapman_info.txt_botright_lon = gtk_entry_new(), - 2, 3, 4, 5, GTK_FILL, 0, 4, 0); - gtk_entry_set_width_chars(GTK_ENTRY(mapman_info.txt_botright_lon), 12); - gtk_entry_set_alignment(GTK_ENTRY(mapman_info.txt_botright_lon), 1.f); -#ifdef MAEMO_CHANGES - g_object_set(G_OBJECT(mapman_info.txt_botright_lon), -#ifndef LEGACY - "hildon-input-mode", - HILDON_GTK_INPUT_MODE_FULL, NULL); -#else - HILDON_INPUT_MODE_HINT, - HILDON_INPUT_MODE_HINT_ALPHANUMERICSPECIAL, NULL); - g_object_set(G_OBJECT(mapman_info.txt_botright_lon), - HILDON_AUTOCAP, - FALSE, NULL); -#endif -#endif - } - - /* Default action is to download by area. */ - gtk_toggle_button_set_active( - GTK_TOGGLE_BUTTON(mapman_info.rad_by_area), TRUE); - - g_signal_connect(G_OBJECT(mapman_info.rad_download), "clicked", - G_CALLBACK(mapman_update_state), &mapman_info); - g_signal_connect(G_OBJECT(mapman_info.rad_delete), "clicked", - G_CALLBACK(mapman_update_state), &mapman_info); - g_signal_connect(G_OBJECT(mapman_info.rad_by_area), "clicked", - G_CALLBACK(mapman_update_state), &mapman_info); - g_signal_connect(G_OBJECT(mapman_info.rad_by_route), "clicked", - G_CALLBACK(mapman_update_state), &mapman_info); } + + /* Default action is to download by area. */ + gtk_toggle_button_set_active( + GTK_TOGGLE_BUTTON(mapman_info.rad_by_area), TRUE); + g_signal_connect(G_OBJECT(mapman_info.rad_download), "clicked", + G_CALLBACK(mapman_update_state), &mapman_info); + g_signal_connect(G_OBJECT(mapman_info.rad_delete), "clicked", + G_CALLBACK(mapman_update_state), &mapman_info); + g_signal_connect(G_OBJECT(mapman_info.rad_by_area), "clicked", + G_CALLBACK(mapman_update_state), &mapman_info); + g_signal_connect(G_OBJECT(mapman_info.rad_by_route), "clicked", + G_CALLBACK(mapman_update_state), &mapman_info); + /* Initialize fields. Do no use g_ascii_formatd; these strings will be * output (and parsed) as locale-dependent. */ @@ -3697,7 +3685,7 @@ } } - gtk_widget_hide(dialog); + gtk_widget_destroy(dialog); _degformat = prev_degformat;