Commit 04d53c3c authored by Felix Riemann's avatar Felix Riemann

EogPropertiesDialog: Separate Exif/XMP-specific widgets from generic ones

This is just renaming a few widgets.

https://bugzilla.gnome.org/show_bug.cgi?id=509406
parent 5a497db1
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.15.2 on Thu Aug 8 20:39:12 2013 -->
<!-- Generated with glade 3.16.0 on Wed Oct 30 19:22:06 2013 -->
<interface>
<!-- interface-requires gtk+ 3.6 -->
<!-- interface-requires gtk+ 3.8 -->
<object class="GtkDialog" id="eog_image_properties_dialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>
......@@ -411,7 +411,7 @@
</packing>
</child>
<child>
<object class="GtkBox" id="exif_box">
<object class="GtkBox" id="metadata_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
......@@ -913,7 +913,7 @@
</packing>
</child>
<child>
<object class="GtkExpander" id="exif_details_expander">
<object class="GtkExpander" id="metadata_details_expander">
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
......
......@@ -97,9 +97,9 @@ struct _EogPropertiesDialogPrivate {
GtkWidget *xmp_rights_label;
#endif
#if HAVE_METADATA
GtkWidget *exif_box;
GtkWidget *exif_details_expander;
GtkWidget *exif_details;
GtkWidget *metadata_box;
GtkWidget *metadata_details_expander;
GtkWidget *metadata_details;
GtkWidget *metadata_details_box;
GtkWidget *metadata_details_sw;
#endif
......@@ -269,8 +269,8 @@ pd_update_metadata_tab (EogPropertiesDialog *prop_dlg,
gtk_notebook_set_current_page (notebook, EOG_PROPERTIES_DIALOG_PAGE_GENERAL);
}
if (gtk_widget_get_visible (priv->exif_box)) {
gtk_widget_hide (priv->exif_box);
if (gtk_widget_get_visible (priv->metadata_box)) {
gtk_widget_hide (priv->metadata_box);
}
if (gtk_widget_get_visible (priv->metadata_details_box)) {
gtk_widget_hide (priv->metadata_details_box);
......@@ -278,12 +278,12 @@ pd_update_metadata_tab (EogPropertiesDialog *prop_dlg,
return;
} else {
if (!gtk_widget_get_visible (priv->exif_box))
gtk_widget_show_all (priv->exif_box);
if (!gtk_widget_get_visible (priv->metadata_box))
gtk_widget_show_all (priv->metadata_box);
if (priv->netbook_mode &&
!gtk_widget_get_visible (priv->metadata_details_box)) {
gtk_widget_show_all (priv->metadata_details_box);
gtk_widget_hide (priv->exif_details_expander);
gtk_widget_hide (priv->metadata_details_expander);
}
}
......@@ -314,7 +314,7 @@ pd_update_metadata_tab (EogPropertiesDialog *prop_dlg,
eog_exif_util_set_label_text (GTK_LABEL (priv->exif_date_label),
exif_data, EXIF_TAG_DATE_TIME_ORIGINAL);
eog_metadata_details_update (EOG_METADATA_DETAILS (priv->exif_details),
eog_metadata_details_update (EOG_METADATA_DETAILS (priv->metadata_details),
exif_data);
/* exif_data_unref can handle NULL-values */
......@@ -350,7 +350,7 @@ pd_update_metadata_tab (EogPropertiesDialog *prop_dlg,
"rights",
priv->xmp_rights_label);
eog_metadata_details_xmp_update (EOG_METADATA_DETAILS (priv->exif_details), xmp_data);
eog_metadata_details_xmp_update (EOG_METADATA_DETAILS (priv->metadata_details), xmp_data);
xmp_free (xmp_data);
} else {
......@@ -467,14 +467,14 @@ eog_properties_dialog_set_netbook_mode (EogPropertiesDialog *dlg,
gtk_widget_reparent (priv->metadata_details_sw,
priv->metadata_details_box);
// Only show details box if metadata is being displayed
if (gtk_widget_get_visible (priv->exif_box))
if (gtk_widget_get_visible (priv->metadata_box))
gtk_widget_show_all (priv->metadata_details_box);
gtk_widget_hide (priv->exif_details_expander);
gtk_widget_hide (priv->metadata_details_expander);
} else {
gtk_widget_reparent (priv->metadata_details_sw,
priv->exif_details_expander);
gtk_widget_show_all (priv->exif_details_expander);
priv->metadata_details_expander);
gtk_widget_show_all (priv->metadata_details_expander);
if (gtk_notebook_get_current_page (GTK_NOTEBOOK (priv->notebook)) == EOG_PROPERTIES_DIALOG_PAGE_DETAILS)
gtk_notebook_prev_page (GTK_NOTEBOOK (priv->notebook));
......@@ -640,8 +640,8 @@ eog_properties_dialog_init (EogPropertiesDialog *prop_dlg)
"xmp_box_label", &xmp_box_label,
#endif
#ifdef HAVE_METADATA
"exif_box", &priv->exif_box,
"exif_details_expander", &priv->exif_details_expander,
"metadata_box", &priv->metadata_box,
"metadata_details_expander", &priv->metadata_details_expander,
"metadata_details_box", &priv->metadata_details_box,
#endif
NULL);
......@@ -682,25 +682,25 @@ eog_properties_dialog_init (EogPropertiesDialog *prop_dlg)
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
priv->exif_details = eog_metadata_details_new ();
gtk_widget_set_size_request (priv->exif_details, -1, 170);
priv->metadata_details = eog_metadata_details_new ();
gtk_widget_set_size_request (priv->metadata_details, -1, 170);
gtk_container_set_border_width (GTK_CONTAINER (sw), 6);
gtk_container_add (GTK_CONTAINER (sw), priv->exif_details);
gtk_container_add (GTK_CONTAINER (sw), priv->metadata_details);
gtk_widget_show_all (sw);
priv->metadata_details_sw = sw;
if (priv->netbook_mode) {
gtk_widget_hide (priv->exif_details_expander);
gtk_widget_hide (priv->metadata_details_expander);
gtk_box_pack_start (GTK_BOX (priv->metadata_details_box),
sw, TRUE, TRUE, 6);
} else {
gtk_container_add (GTK_CONTAINER (priv->exif_details_expander),
gtk_container_add (GTK_CONTAINER (priv->metadata_details_expander),
sw);
}
g_signal_connect_after (G_OBJECT (priv->exif_details_expander),
g_signal_connect_after (G_OBJECT (priv->metadata_details_expander),
"notify::expanded",
G_CALLBACK (pd_exif_details_activated_cb),
dlg);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment