@@ -127,22 +127,30 @@ _gtk_grid_append_prop_line (GtkGrid *grid, GtkWidget *sibling,
127127 GtkWidget * * data_label , const gchar * text )
128128{
129129 GtkWidget * label ;
130+ gchar * markup ;
131+ GtkWidget * box ;
130132
131- label = gtk_label_new (text );
132- gtk_misc_set_alignment (GTK_MISC (label ), 0.0 , 0.5 );
133+ box = gtk_box_new (GTK_ORIENTATION_VERTICAL , 0 );
134+ label = gtk_label_new (NULL );
135+ markup = g_markup_printf_escaped ("<b>%s</b>" , text );
136+ gtk_label_set_markup (GTK_LABEL (label ), markup );
137+ g_free (markup );
133138
134- gtk_grid_attach_next_to (grid , label , sibling , GTK_POS_BOTTOM , 1 , 1 );
139+ gtk_misc_set_alignment (GTK_MISC (label ), 0.0 , 1.0 );
140+ gtk_box_pack_start (GTK_BOX (box ), label , FALSE, FALSE, 0 );
135141
136142 if (G_LIKELY (data_label != NULL )) {
137143 * data_label = gtk_label_new (NULL );
138144 gtk_label_set_selectable (GTK_LABEL (* data_label ), TRUE);
139- gtk_label_set_ellipsize (GTK_LABEL (* data_label ), PANGO_ELLIPSIZE_END );
140- gtk_misc_set_alignment (GTK_MISC (* data_label ), 0.0 , 0.5 );
141- gtk_grid_attach_next_to (grid , * data_label , label ,
142- GTK_POS_RIGHT , 1 , 1 );
145+ gtk_label_set_line_wrap (GTK_LABEL (* data_label ), TRUE);
146+ gtk_misc_set_alignment (GTK_MISC (* data_label ), 0.0 , 0.0 );
147+ // Add a small margin to make it a sublabel to the first label
148+ gtk_widget_set_margin_left (* data_label , 12 );
149+ gtk_box_pack_end (GTK_BOX (box ), * data_label , FALSE, FALSE, 0 );
143150 }
151+ gtk_grid_attach_next_to (grid , box , sibling , GTK_POS_BOTTOM , 2 , 1 );
144152
145- return label ;
153+ return box ;
146154}
147155
148156#if HAVE_EXEMPI
@@ -499,11 +507,15 @@ eom_metadata_sidebar_init (EomMetadataSidebar *sidebar)
499507 label = _gtk_grid_append_prop_line (GTK_GRID (priv -> grid ), label ,
500508 NULL , _ ("Folder:" ));
501509
510+ {
502511 priv -> folder_button = gtk_button_new_with_label ("" );
503512 g_signal_connect (priv -> folder_button , "clicked" ,
504513 G_CALLBACK (_folder_button_clicked_cb ), sidebar );
505- gtk_grid_attach_next_to (GTK_GRID (priv -> grid ), priv -> folder_button ,
506- label , GTK_POS_RIGHT , 1 , 1 );
514+ gtk_widget_set_margin_left (priv -> folder_button , 12 );
515+ gtk_widget_set_margin_right (priv -> folder_button , 12 );
516+ gtk_widget_set_margin_top (priv -> folder_button , 3 );
517+ gtk_box_pack_end (GTK_BOX (label ), priv -> folder_button , FALSE, FALSE, 0 );
518+ }
507519
508520#if HAVE_METADATA
509521 label = _gtk_grid_append_title_line (GTK_GRID (priv -> grid ),
0 commit comments