[gnumeric] Fix properties page of Document Properties dialog. [#673129]



commit d14827fec24c0b59418910ff92a3a56d44c5ed8e
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Sat Mar 31 13:53:55 2012 -0600

    Fix properties page of Document Properties dialog. [#673129]
    
    2012-03-31  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* dialog-doc-metadata.c (cb_dialog_doc_metadata_tree_prop_selected):
    	refer to the keywords page only for dc:keywords

 NEWS                              |    1 +
 src/dialogs/ChangeLog             |    5 +++++
 src/dialogs/dialog-doc-metadata.c |   12 +++++++++---
 3 files changed, 15 insertions(+), 3 deletions(-)
---
diff --git a/NEWS b/NEWS
index df95f0f..05aabb7 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,7 @@ Andreas:
 	* Import/Export marker size from/to ODF. Part of [#671461]
 	* Export/Import axes data formats to ODF. Part of [#671461]
 	* Fix object anchors on ODF import. [#667489]
+	* Fix properties page of Document Properties dialog. [#673129]
 
 Jean:
 	* Fixed crash with sheet object. [#671617]
diff --git a/src/dialogs/ChangeLog b/src/dialogs/ChangeLog
index 10210d1..7f41e9d 100644
--- a/src/dialogs/ChangeLog
+++ b/src/dialogs/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-31  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* dialog-doc-metadata.c (cb_dialog_doc_metadata_tree_prop_selected):
+	refer to the keywords page only for dc:keywords
+
 2012-03-18  Morten Welinder  <terra gnome org>
 
 	* dialog-cell-format.c (fmt_dialog_init_font_page): Convert from
diff --git a/src/dialogs/dialog-doc-metadata.c b/src/dialogs/dialog-doc-metadata.c
index cbe7411..1b2f6aa 100644
--- a/src/dialogs/dialog-doc-metadata.c
+++ b/src/dialogs/dialog-doc-metadata.c
@@ -1558,8 +1558,10 @@ cb_dialog_doc_metadata_tree_prop_selected (GtkTreeSelection  *selection,
 
 	if (selected) {
 		GType val_type = G_TYPE_INVALID;
+		gchar *prop_name = NULL;
 		gtk_tree_model_get (GTK_TREE_MODEL (state->properties_store),
 				    &iter,
+				    0, &prop_name,
 				    4, &val_type,
 				    -1);
 		switch (val_type) {
@@ -1573,12 +1575,16 @@ cb_dialog_doc_metadata_tree_prop_selected (GtkTreeSelection  *selection,
 			text = _("Edit TRUE/FALSE value directly in above listing.");
 			break;
 		default:
-			if (val_type == GSF_DOCPROP_VECTOR_TYPE)
-				text = _("To edit, use the keywords tab.");
-			else if (val_type == GSF_TIMESTAMP_TYPE)
+			if (val_type == GSF_DOCPROP_VECTOR_TYPE) {
+				if (0 == strcmp (prop_name, "dc:keywords")) 
+					text = _("To edit, use the keywords tab.");
+				else
+					text = _("This property value cannot be edited.");
+			} else if (val_type == GSF_TIMESTAMP_TYPE)
 				text= _("Edit timestamp directly in above listing.");
 			break;
 		}
+		g_free (prop_name);
 	}
 
 	gtk_label_set_text (state->instruction, text);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]