From 3e761780fb989bfa74310afdaa1f2526ec14c005 Mon Sep 17 00:00:00 2001
From: Jorge Cob <jorgecs10@gmail.com>
Date: Sun, 28 Jun 2009 17:50:39 -0500
Subject: [PATCH] =?utf-8?q?Bug=20518134=20=E2=80=93=20No=20submenu=20should=20be=20shown=20when=20only=20"Create=20new=20empty=20file"=20is
=20available?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

---
 src/file-manager/fm-actions.h                   |    1 +
 src/file-manager/fm-directory-view.c            |   16 ++++++++++++++++
 src/file-manager/nautilus-directory-view-ui.xml |    2 ++
 3 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/src/file-manager/fm-actions.h b/src/file-manager/fm-actions.h
index 57bc10c..9abc4cd 100644
--- a/src/file-manager/fm-actions.h
+++ b/src/file-manager/fm-actions.h
@@ -80,6 +80,7 @@
 #define FM_ACTION_SCRIPTS "Scripts"
 #define FM_ACTION_NEW_DOCUMENTS "New Documents"
 #define FM_ACTION_NEW_EMPTY_FILE "New Empty File"
+#define FM_ACTION_NEW_EMPTY_DOCUMENT "New Empty Document"
 #define FM_ACTION_EMPTY_TRASH_CONDITIONAL "Empty Trash Conditional"
 #define FM_ACTION_MANUAL_LAYOUT "Manual Layout"
 #define FM_ACTION_TIGHTER_LAYOUT "Tighter Layout"
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 21171cc..3ef9a1a 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -5500,6 +5500,12 @@ update_templates_menu (FMDirectoryView *view)
 
 	action = gtk_action_group_get_action (view->details->dir_action_group, FM_ACTION_NO_TEMPLATES);
 	gtk_action_set_visible (action, !any_templates);
+	
+	action = gtk_action_group_get_action (view->details->dir_action_group, FM_ACTION_NEW_DOCUMENTS);
+	gtk_action_set_visible (action, any_templates);
+	
+	action = gtk_action_group_get_action (view->details->dir_action_group, FM_ACTION_NEW_EMPTY_DOCUMENT);
+	gtk_action_set_visible (action, !any_templates);
 
 	g_free (templates_directory_uri);
 }
@@ -6603,6 +6609,12 @@ static const GtkActionEntry directory_view_entries[] = {
   /* label, accelerator */       N_("Create _Folder"), "<control><shift>N",
   /* tooltip */                  N_("Create a new empty folder inside this folder"),
                                  G_CALLBACK (action_new_folder_callback) },
+                               {
+                                 FM_ACTION_NEW_EMPTY_DOCUMENT, "document-new",
+                                 N_("Create Empty Document"), NULL,
+                                 N_("Create a new empty file inside this folder"),
+                                 G_CALLBACK (action_new_empty_file_callback)
+                               },
   /* name, stock id, label */  { "No Templates", NULL, N_("No templates installed") },
   /* name, stock id */         { "New Empty File", NULL,
     /* translators: this is used to indicate that a file doesn't contain anything */
@@ -8045,6 +8057,10 @@ real_update_menus (FMDirectoryView *view)
 					      FM_ACTION_NEW_DOCUMENTS);
 	gtk_action_set_sensitive (action, can_create_files);
 	
+	action = gtk_action_group_get_action (view->details->dir_action_group,
+					      FM_ACTION_NEW_EMPTY_DOCUMENT);
+	gtk_action_set_sensitive (action, can_create_files);
+	
 	if (can_create_files && view->details->templates_invalid) {
 		update_templates_menu (view);
 	}
diff --git a/src/file-manager/nautilus-directory-view-ui.xml b/src/file-manager/nautilus-directory-view-ui.xml
index dce7d2d..888bb77 100644
--- a/src/file-manager/nautilus-directory-view-ui.xml
+++ b/src/file-manager/nautilus-directory-view-ui.xml
@@ -13,6 +13,7 @@
 				 <separator name="After New Documents"/>
 				 <menuitem name="New Empty File" action="New Empty File"/>
 			</menu>
+			<menuitem name="New Empty Document" action="New Empty Document"/>
 			<menuitem name="New Launcher" action="New Launcher"/>
 		</placeholder>
 		<placeholder name="Open Placeholder">
@@ -90,6 +91,7 @@
 			 	<separator name="After New Documents"/>
 			 	<menuitem name="New Empty File" action="New Empty File"/>
 			</menu>
+			<menuitem name="New Empty Document" action="New Empty Document"/>
                 	<menu action="Scripts">
 			 	<placeholder name="Scripts Placeholder"/>
 			 	<separator name="After Scripts"/>
-- 
1.6.0.4