From b426244efc74687456658fec99e34c65da63d3fe Mon Sep 17 00:00:00 2001 From: "Dr. Johann Pfefferl" Date: Sat, 29 May 2010 14:17:50 +0200 Subject: [PATCH] Moved Start/Stop/Save button to bottom of screen --- debian/changelog | 6 ++++++ gps-tracker.c | 30 +++++++++++++++--------------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/debian/changelog b/debian/changelog index cc0c9d4..f0bfec7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +gps-tracker (1.0-8) unstable; urgency=low + + * Moved Start/Stop/Save button to bottom of screen + + -- Dr. Johann Pfefferl Sat, 29 May 2010 14:17:04 +0200 + gps-tracker (1.0-7) unstable; urgency=low * Incremented the debian package number 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)); -- 1.7.9.5