X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=gps-tracker.c;fp=gps-tracker.c;h=ca0e76e3c4c3663d21ff9449ea6450be94f0134b;hb=b426244efc74687456658fec99e34c65da63d3fe;hp=35515283f32578e8674cc043b03412c65a9836f1;hpb=07fa9e79db35c973e497bf136fb5bb04183024c7;p=gps-tracker diff --git a/gps-tracker.c b/gps-tracker.c index 3551528..ca0e76e 100644 --- a/gps-tracker.c +++ b/gps-tracker.c @@ -298,18 +298,6 @@ int main (int argc, char **argv) data->wp_marker_str = g_string_sized_new(64); data->main_vbox = (gpointer)gtk_vbox_new(FALSE, 0); - data->btn_hbox = (gpointer)gtk_hbox_new(TRUE, 0); - - data->start_stop_button = GTK_BUTTON (hildon_gtk_button_new (HILDON_SIZE_THUMB_HEIGHT | HILDON_SIZE_HALFSCREEN_WIDTH)); - gtk_button_set_label (data->start_stop_button, "Start"); - gtk_widget_set_sensitive(GTK_WIDGET(data->start_stop_button), FALSE); - data->save_button = GTK_BUTTON (hildon_gtk_button_new (HILDON_SIZE_THUMB_HEIGHT | HILDON_SIZE_HALFSCREEN_WIDTH)); - gtk_button_set_label (data->save_button, "Save"); - gtk_widget_set_sensitive(GTK_WIDGET(data->save_button), FALSE); - gtk_box_pack_start(GTK_BOX(data->btn_hbox), GTK_WIDGET(data->start_stop_button), FALSE, FALSE, 8); - gtk_box_pack_start(GTK_BOX(data->btn_hbox), GTK_WIDGET(data->save_button), FALSE, FALSE, 8); - gtk_box_pack_start(GTK_BOX(data->main_vbox), GTK_WIDGET(data->btn_hbox), FALSE, FALSE, 0); - data->loc_hbox = (gpointer)gtk_hbox_new(FALSE, 0); data->loc_gps_data_table = (gpointer)gtk_table_new(4, 2, FALSE); { @@ -348,7 +336,7 @@ int main (int argc, char **argv) gtk_box_pack_start(GTK_BOX(data->loc_hbox), alignment_gps, TRUE, FALSE, 0); } - //gtk_box_pack_start(GTK_BOX(data->loc_hbox), gtk_vseparator_new(), TRUE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(data->loc_hbox), gtk_vseparator_new(), TRUE, FALSE, 0); data->loc_track_data_table = (gpointer)gtk_table_new(4, 2, TRUE); { @@ -385,13 +373,25 @@ int main (int argc, char **argv) //data->wp_label = gtk_label_new("Marker:"); data->wp_name_entry = hildon_entry_new (HILDON_SIZE_HALFSCREEN_WIDTH); //hildon_entry_set_placeholder (HILDON_ENTRY (data->wp_name_entry), "First name"); - data->wp_set_btn = GTK_BUTTON (hildon_gtk_button_new (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_HALFSCREEN_WIDTH)); + data->wp_set_btn = GTK_BUTTON (hildon_gtk_button_new (HILDON_SIZE_HALFSCREEN_WIDTH)); gtk_button_set_label (data->wp_set_btn, "Set marker"); gtk_widget_set_sensitive(GTK_WIDGET(data->wp_set_btn), FALSE); //gtk_box_pack_start(GTK_BOX(data->wp_hbox), GTK_WIDGET(data->wp_label), TRUE, FALSE, 0); gtk_box_pack_start(GTK_BOX(data->wp_hbox), GTK_WIDGET(data->wp_name_entry), TRUE, FALSE, 0); gtk_box_pack_start(GTK_BOX(data->wp_hbox), GTK_WIDGET(data->wp_set_btn), TRUE, FALSE, 0); - gtk_box_pack_end(GTK_BOX(data->main_vbox), GTK_WIDGET(data->wp_hbox), FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(data->main_vbox), GTK_WIDGET(data->wp_hbox), FALSE, FALSE, 0); + + data->btn_hbox = (gpointer)gtk_hbox_new(TRUE, 0); + + data->start_stop_button = GTK_BUTTON (hildon_gtk_button_new (HILDON_SIZE_THUMB_HEIGHT | HILDON_SIZE_HALFSCREEN_WIDTH)); + gtk_button_set_label (data->start_stop_button, "Start"); + gtk_widget_set_sensitive(GTK_WIDGET(data->start_stop_button), FALSE); + data->save_button = GTK_BUTTON (hildon_gtk_button_new (HILDON_SIZE_THUMB_HEIGHT | HILDON_SIZE_HALFSCREEN_WIDTH)); + gtk_button_set_label (data->save_button, "Save"); + gtk_widget_set_sensitive(GTK_WIDGET(data->save_button), FALSE); + gtk_box_pack_start(GTK_BOX(data->btn_hbox), GTK_WIDGET(data->start_stop_button), FALSE, FALSE, 8); + gtk_box_pack_start(GTK_BOX(data->btn_hbox), GTK_WIDGET(data->save_button), FALSE, FALSE, 8); + gtk_box_pack_start(GTK_BOX(data->main_vbox), GTK_WIDGET(data->btn_hbox), FALSE, FALSE, 4); /* Add vbox to main window */ gtk_container_add (GTK_CONTAINER (data->window), GTK_WIDGET(data->main_vbox));