Skip to content

Commit f965eb2

Browse files
fxriraveit65
fxri
authored and
raveit65
committed
EomPropertiesDialog: Separate Exif/XMP-specific widgets from generic ones
This is just renaming a few widgets. https://bugzilla.gnome.org/show_bug.cgi?id=509406 origin commit: https://gitlab.gnome.org/GNOME/eog/commit/04d53c3
1 parent 4e20a6d commit f965eb2

File tree

2 files changed

+25
-25
lines changed

2 files changed

+25
-25
lines changed

‎data/eom-image-properties-dialog.ui‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@
424424
</packing>
425425
</child>
426426
<child>
427-
<object class="GtkBox" id="exif_box">
427+
<object class="GtkBox" id="metadata_box">
428428
<property name="visible">True</property>
429429
<property name="can_focus">False</property>
430430
<property name="orientation">vertical</property>
@@ -926,7 +926,7 @@
926926
</packing>
927927
</child>
928928
<child>
929-
<object class="GtkExpander" id="exif_details_expander">
929+
<object class="GtkExpander" id="metadata_details_expander">
930930
<property name="visible">True</property>
931931
<property name="can_focus">True</property>
932932
<child>

‎src/eom-properties-dialog.c‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ struct _EomPropertiesDialogPrivate {
9797
GtkWidget *xmp_rights_label;
9898
#endif
9999
#if HAVE_METADATA
100-
GtkWidget *exif_box;
101-
GtkWidget *exif_details_expander;
102-
GtkWidget *exif_details;
100+
GtkWidget *metadata_box;
101+
GtkWidget *metadata_details_expander;
102+
GtkWidget *metadata_details;
103103
GtkWidget *metadata_details_box;
104104
GtkWidget *metadata_details_sw;
105105
#endif
@@ -275,21 +275,21 @@ pd_update_metadata_tab (EomPropertiesDialog *prop_dlg,
275275
gtk_notebook_set_current_page (notebook, EOM_PROPERTIES_DIALOG_PAGE_GENERAL);
276276
}
277277

278-
if (gtk_widget_get_visible (priv->exif_box)) {
279-
gtk_widget_hide (priv->exif_box);
278+
if (gtk_widget_get_visible (priv->metadata_box)) {
279+
gtk_widget_hide (priv->metadata_box);
280280
}
281281
if (gtk_widget_get_visible (priv->metadata_details_box)) {
282282
gtk_widget_hide (priv->metadata_details_box);
283283
}
284284

285285
return;
286286
} else {
287-
if (!gtk_widget_get_visible (priv->exif_box))
288-
gtk_widget_show_all (priv->exif_box);
287+
if (!gtk_widget_get_visible (priv->metadata_box))
288+
gtk_widget_show_all (priv->metadata_box);
289289
if (priv->netbook_mode &&
290290
!gtk_widget_get_visible (priv->metadata_details_box)) {
291291
gtk_widget_show_all (priv->metadata_details_box);
292-
gtk_widget_hide (priv->exif_details_expander);
292+
gtk_widget_hide (priv->metadata_details_expander);
293293
}
294294
}
295295

@@ -320,7 +320,7 @@ pd_update_metadata_tab (EomPropertiesDialog *prop_dlg,
320320
eom_exif_util_set_label_text (GTK_LABEL (priv->exif_date_label),
321321
exif_data, EXIF_TAG_DATE_TIME_ORIGINAL);
322322

323-
eom_metadata_details_update (EOM_METADATA_DETAILS (priv->exif_details),
323+
eom_metadata_details_update (EOM_METADATA_DETAILS (priv->metadata_details),
324324
exif_data);
325325

326326
/* exif_data_unref can handle NULL-values */
@@ -356,7 +356,7 @@ pd_update_metadata_tab (EomPropertiesDialog *prop_dlg,
356356
"rights",
357357
priv->xmp_rights_label);
358358

359-
eom_metadata_details_xmp_update (EOM_METADATA_DETAILS (priv->exif_details), xmp_data);
359+
eom_metadata_details_xmp_update (EOM_METADATA_DETAILS (priv->metadata_details), xmp_data);
360360

361361
xmp_free (xmp_data);
362362
} else {
@@ -476,17 +476,17 @@ eom_properties_dialog_set_netbook_mode (EomPropertiesDialog *dlg,
476476
gtk_container_add (GTK_CONTAINER (priv->metadata_details_box), priv->metadata_details_sw);
477477
g_object_unref (priv->metadata_details_sw);
478478
// Only show details box if metadata is being displayed
479-
if (gtk_widget_get_visible (priv->exif_box))
479+
if (gtk_widget_get_visible (priv->metadata_box))
480480
gtk_widget_show_all (priv->metadata_details_box);
481481

482-
gtk_widget_hide (priv->exif_details_expander);
482+
gtk_widget_hide (priv->metadata_details_expander);
483483
} else {
484484
g_object_ref (priv->metadata_details_sw);
485485
gtk_container_remove (GTK_CONTAINER (gtk_widget_get_parent (priv->metadata_details_sw)),
486486
priv->metadata_details_sw);
487-
gtk_container_add (GTK_CONTAINER (priv->exif_details_expander), priv->metadata_details_sw);
487+
gtk_container_add (GTK_CONTAINER (priv->metadata_details_expander), priv->metadata_details_sw);
488488
g_object_unref (priv->metadata_details_sw);
489-
gtk_widget_show_all (priv->exif_details_expander);
489+
gtk_widget_show_all (priv->metadata_details_expander);
490490

491491
if (gtk_notebook_get_current_page (GTK_NOTEBOOK (priv->notebook)) == EOM_PROPERTIES_DIALOG_PAGE_DETAILS)
492492
gtk_notebook_prev_page (GTK_NOTEBOOK (priv->notebook));
@@ -652,8 +652,8 @@ eom_properties_dialog_init (EomPropertiesDialog *prop_dlg)
652652
"xmp_box_label", &xmp_box_label,
653653
#endif
654654
#ifdef HAVE_METADATA
655-
"exif_box", &priv->exif_box,
656-
"exif_details_expander", &priv->exif_details_expander,
655+
"metadata_box", &priv->metadata_box,
656+
"metadata_details_expander", &priv->metadata_details_expander,
657657
"metadata_details_box", &priv->metadata_details_box,
658658
#endif
659659
NULL);
@@ -690,26 +690,26 @@ eom_properties_dialog_init (EomPropertiesDialog *prop_dlg)
690690
GTK_POLICY_AUTOMATIC,
691691
GTK_POLICY_AUTOMATIC);
692692

693-
priv->exif_details = eom_metadata_details_new ();
694-
gtk_widget_set_size_request (priv->exif_details, -1, 170);
693+
priv->metadata_details = eom_metadata_details_new ();
694+
gtk_widget_set_size_request (priv->metadata_details, -1, 170);
695695
gtk_container_set_border_width (GTK_CONTAINER (sw), 6);
696-
gtk_widget_set_vexpand (priv->exif_details, TRUE);
696+
gtk_widget_set_vexpand (priv->metadata_details, TRUE);
697697

698-
gtk_container_add (GTK_CONTAINER (sw), priv->exif_details);
698+
gtk_container_add (GTK_CONTAINER (sw), priv->metadata_details);
699699
gtk_widget_show_all (sw);
700700

701701
priv->metadata_details_sw = sw;
702702

703703
if (priv->netbook_mode) {
704-
gtk_widget_hide (priv->exif_details_expander);
704+
gtk_widget_hide (priv->metadata_details_expander);
705705
gtk_box_pack_start (GTK_BOX (priv->metadata_details_box),
706706
sw, TRUE, TRUE, 6);
707707
} else {
708-
gtk_container_add (GTK_CONTAINER (priv->exif_details_expander),
708+
gtk_container_add (GTK_CONTAINER (priv->metadata_details_expander),
709709
sw);
710710
}
711711

712-
g_signal_connect_after (G_OBJECT (priv->exif_details_expander),
712+
g_signal_connect_after (G_OBJECT (priv->metadata_details_expander),
713713
"notify::expanded",
714714
G_CALLBACK (pd_exif_details_activated_cb),
715715
dlg);

0 commit comments

Comments
 (0)