gthumb r2362 - in trunk: . src

[mjc svn gnome org]

Author: mjc
Date: Wed Jul 30 19:52:01 2008
New Revision: 2362
URL: http://svn.gnome.org/viewvc/gthumb?rev=2362&view=rev

Log:
2008-07-30  Michael J. Chudobiak  <mjc svn gnome org>

        * src/gth-browser-ui.h:
        * src/gth-browser.c: (window_update_sensitivity):
        * src/gth-viewer-ui.h:
        * src/gth-window-actions-callbacks.c:
        * src/gth-window-actions-callbacks.h:
        * src/gth-window-actions-entries.h:
        Removed the "Delete Comment" function, because the comments are
        now linked to the embedded image metadata. Deleting the comments
        would mean deleting quite a few metadata fields, which is
        probably too invasive. Use the "Edit Comment" function instead.
        Might need to revisit this issue.



Modified:
   trunk/ChangeLog
   trunk/src/gth-browser-ui.h
   trunk/src/gth-browser.c
   trunk/src/gth-viewer-ui.h
   trunk/src/gth-window-actions-callbacks.c
   trunk/src/gth-window-actions-callbacks.h
   trunk/src/gth-window-actions-entries.h

Modified: trunk/src/gth-browser-ui.h
==============================================================================
--- trunk/src/gth-browser-ui.h	(original)
+++ trunk/src/gth-browser-ui.h	Wed Jul 30 19:52:01 2008
@@ -69,7 +69,6 @@
 "      <separator/>"
 "      <menuitem action='Edit_EditComment'/>"
 "      <menuitem action='Edit_EditCategories'/>"
-"      <menuitem action='Edit_DeleteComment'/>"
 "      <separator/>"
 "      <menuitem action='Edit_AddToCatalog'/>"
 "      <menuitem action='Edit_RemoveFromCatalog'/>"
@@ -229,7 +228,6 @@
 "    <separator/>"
 "    <menuitem action='Edit_EditComment'/>"
 "    <menuitem action='Edit_EditCategories'/>"
-"    <menuitem action='Edit_DeleteComment'/>"
 "    <separator/>"
 "    <menuitem action='Edit_AddToCatalog'/>"
 "    <menuitem action='Edit_RemoveFromCatalog'/>"
@@ -267,7 +265,6 @@
 "    <separator/>"
 "    <menuitem action='Edit_EditComment'/>"
 "    <menuitem action='Edit_EditCategories'/>"
-"    <menuitem action='Edit_DeleteComment'/>"
 "  </popup>"
 "  <popup name='CatalogPopup'>"
 "    <menuitem action='EditCatalog_View'/>"

Modified: trunk/src/gth-browser.c
==============================================================================
--- trunk/src/gth-browser.c	(original)
+++ trunk/src/gth-browser.c	Wed Jul 30 19:52:01 2008
@@ -887,7 +887,6 @@
 
 	set_action_sensitive (browser, "Edit_EditComment", sel_not_null);
 	set_action_sensitive (browser, "ToolBar_EditComment", sel_not_null);
-	set_action_sensitive (browser, "Edit_DeleteComment", sel_not_null);
 	set_action_sensitive (browser, "Edit_EditCategories", sel_not_null);
 	set_action_sensitive (browser, "ToolBar_EditCategories", sel_not_null);
 

Modified: trunk/src/gth-viewer-ui.h
==============================================================================
--- trunk/src/gth-viewer-ui.h	(original)
+++ trunk/src/gth-viewer-ui.h	Wed Jul 30 19:52:01 2008
@@ -53,7 +53,6 @@
 "      <separator name='sep01'/>"
 "      <menuitem action='Edit_EditComment'/>"
 "      <menuitem action='Edit_EditCategories'/>"
-"      <menuitem action='Edit_DeleteComment'/>"
 "      <separator/>"
 "      <menuitem action='Edit_AddToCatalog'/>"
 "    </menu>"

Modified: trunk/src/gth-window-actions-callbacks.c
==============================================================================
--- trunk/src/gth-window-actions-callbacks.c	(original)
+++ trunk/src/gth-window-actions-callbacks.c	Wed Jul 30 19:52:01 2008
@@ -273,30 +273,6 @@
 
 
 void
-gth_window_activate_action_edit_delete_comment (GtkAction *action,
-						GthWindow *window)
-{
-	GList *list, *scan;
-
-	list = gth_window_get_file_list_selection (window);
-	for (scan = list; scan; scan = scan->next) {
-		char        *filename = scan->data;
-		CommentData *cdata;
-
-		cdata = comments_load_comment (filename, TRUE);
-		comment_data_free_comment (cdata);
-		comments_save_comment (filename, cdata);
-		comment_data_free (cdata);
-
-		all_windows_notify_update_metadata (filename);
-	}
-	path_list_free (list);
-
-	gth_window_update_current_image_metadata (window);
-}
-
-
-void
 gth_window_activate_action_edit_edit_categories (GtkAction *action,
 						 GthWindow *window)
 {

Modified: trunk/src/gth-window-actions-callbacks.h
==============================================================================
--- trunk/src/gth-window-actions-callbacks.h	(original)
+++ trunk/src/gth-window-actions-callbacks.h	Wed Jul 30 19:52:01 2008
@@ -36,7 +36,6 @@
 DEFINE_ACTION(gth_window_activate_action_file_revert)
 DEFINE_ACTION(gth_window_activate_action_file_print)
 DEFINE_ACTION(gth_window_activate_action_edit_edit_comment)
-DEFINE_ACTION(gth_window_activate_action_edit_delete_comment)
 DEFINE_ACTION(gth_window_activate_action_edit_edit_categories)
 DEFINE_ACTION(gth_window_activate_action_edit_undo)
 DEFINE_ACTION(gth_window_activate_action_edit_redo)

Modified: trunk/src/gth-window-actions-entries.h
==============================================================================
--- trunk/src/gth-window-actions-entries.h	(original)
+++ trunk/src/gth-window-actions-entries.h	Wed Jul 30 19:52:01 2008
@@ -86,11 +86,6 @@
 	  N_("Add a comment to selected images"),
 	  G_CALLBACK (gth_window_activate_action_edit_edit_comment) },
 
-	{ "Edit_DeleteComment", NULL,
-	  N_("Rem_ove Comment"), NULL,
-	  N_("Remove comments of selected images"),
-	  G_CALLBACK (gth_window_activate_action_edit_delete_comment) },
-
 	{ "Edit_EditCategories", GTK_STOCK_INDEX,
 	  N_("Ca_tegories..."), "",
 	  N_("Assign categories to selected images"),