summaryrefslogtreecommitdiffstats
path: root/info.c
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2013-02-28 05:36:01 -0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2013-02-28 05:36:01 -0800
commita12320f145edf5a69ee3e3a07703a8f277b14907 (patch)
tree8d6839fe15b0eaf072fa49ee25e3b719c44cb393 /info.c
parent026c351b369257b7fcc0beabe3740f9e0933e2a9 (diff)
downloadsubsurface-a12320f145edf5a69ee3e3a07703a8f277b14907.tar.gz
Revert "Add Portuguese translation"
This reverts commit af9ba96da444f76794e3c46cf5189b027cb7e120. I had applied this to directory with work-in-progress code that was now mixed up with Eduardo's translation work. I'll re-apply just his translation instead. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'info.c')
-rw-r--r--info.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/info.c b/info.c
index 614bfdbf6..9a5c3a1a2 100644
--- a/info.c
+++ b/info.c
@@ -754,9 +754,9 @@ static void location_entry_change_cb(GtkComboBox *location, gpointer *userdata)
update_gps_entry(0, 0);
}
-static void dive_info_widget(GtkWidget *obox, struct dive *dive, struct dive_info *info, gboolean multi)
+static void dive_info_widget(GtkWidget *box, struct dive *dive, struct dive_info *info, gboolean multi)
{
- GtkWidget *hbox, *label, *frame, *equipment, *ibox, *box;
+ GtkWidget *hbox, *label, *frame, *equipment;
#if HAVE_OSM_GPS_MAP
GtkWidget *image;
#endif
@@ -766,16 +766,11 @@ static void dive_info_widget(GtkWidget *obox, struct dive *dive, struct dive_inf
double value;
snprintf(buffer, sizeof(buffer), "%s", _("Edit multiple dives"));
+
if (!multi)
divename(buffer, sizeof(buffer), dive);
label = gtk_label_new(buffer);
- gtk_box_pack_start(GTK_BOX(obox), label, FALSE, TRUE, 0);
-
- /* two column layout (inner hbox ibox) within the outer vbox (obox) we are given */
- ibox = gtk_hbox_new(FALSE, 0);
- gtk_box_pack_start(GTK_BOX(obox), ibox, FALSE, FALSE, 0);
- box = gtk_vbox_new(FALSE, 0);
- gtk_box_pack_start(GTK_BOX(ibox), box, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(box), label, FALSE, TRUE, 0);
info->location = text_entry(box, _("Location"), location_list, dive->location);
g_signal_connect(G_OBJECT(info->location), "changed", G_CALLBACK(location_entry_change_cb), NULL);
@@ -835,7 +830,7 @@ static void dive_info_widget(GtkWidget *obox, struct dive *dive, struct dive_inf
gtk_text_buffer_set_text(gtk_text_view_get_buffer(info->notes), dive->notes, -1);
}
hbox = gtk_hbox_new(FALSE, 3);
- gtk_box_pack_start(GTK_BOX(ibox), hbox, FALSE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, TRUE, 0);
/* create a secondary Equipment widget */
frame = gtk_frame_new(_("Equipment"));