[anjuta] project-manager: UI cleanup

[Johannes Schmid <jhs src gnome org>]

commit 8ca4baa041a95d1ac3a2d997cb9f243094c1e067
Author: Johannes Schmid <jhs gnome org>
Date:   Tue Jan 4 12:58:51 2011 +0100

    project-manager: UI cleanup
    
    * Rearranged UI items in the menu for better structure
    * Renamed "Group" to "Subdirectory" in the UI

 plugins/project-manager/anjuta-project-manager.xml |   21 ++++++++++---------
 plugins/project-manager/dialogs.c                  |    2 +-
 plugins/project-manager/plugin.c                   |   15 ++++---------
 plugins/project-manager/pm_dialogs.ui              |    2 +-
 4 files changed, 18 insertions(+), 22 deletions(-)
---
diff --git a/plugins/project-manager/anjuta-project-manager.xml b/plugins/project-manager/anjuta-project-manager.xml
index b831b1f..ad8c04f 100644
--- a/plugins/project-manager/anjuta-project-manager.xml
+++ b/plugins/project-manager/anjuta-project-manager.xml
@@ -9,30 +9,31 @@
 	</menu>
 	<placeholder name="PlaceHolderProjectMenus">
 		<menu name="MenuProject" action="ActionMenuProject">
-				<menuitem name="AddPackage" action="ActionProjectAddPackage" />
-				<menuitem name="AddGroup" action="ActionProjectAddGroup" />
+				<menuitem name="AddSource" action="ActionProjectAddSource" />
 				<menuitem name="AddTarget" action="ActionProjectAddTarget" />
+				<menuitem name="AddSubdirectory" action="ActionProjectAddSubdirectory" />
+				<separator name="separator2"/>
+				<menuitem name="AddPackage" action="ActionProjectAddPackage" />
 				<menuitem name="AddModule" action="ActionProjectAddModule" />
-				<menuitem name="AddSource" action="ActionProjectAddSource" />
 				<separator name="separator1"/>
 				<menuitem name="Properties" action="ActionProjectProperties"/>
-				<menuitem name="Refresh" action="ActionProjectRefresh"/>
 		</menu>
 	</placeholder>
 	</menubar>
 	<popup name="PopupProjectManager">
 		<placeholder name="PlaceholderPopupProjectOpen"/>
 		<placeholder name="PlaceholderPopupProjectBuild"/>
-		<menuitem name="AddPackage" action="ActionPopupProjectAddPackage"/>
-		<menuitem name="AddGroup" action="ActionPopupProjectAddGroup"/>
-		<menuitem name="AddTarget" action="ActionPopupProjectAddTarget"/>
-		<menuitem name="AddModule" action="ActionPopupProjectAddModule"/>
+		<separator name="separator0"/>
 		<menuitem name="AddSource" action="ActionPopupProjectAddSource"/>
+		<menuitem name="AddTarget" action="ActionPopupProjectAddTarget"/>
+		<menuitem name="AddSubdirectory" action="ActionPopupProjectAddSubdirectory"/>
 		<separator name="separator1"/>
-		<menuitem name="Remove" action="ActionPopupProjectRemove"/>
+		<menuitem name="AddPackage" action="ActionPopupProjectAddPackage"/>
+		<menuitem name="AddModule" action="ActionPopupProjectAddModule"/>
 		<separator name="separator2"/>
+		<menuitem name="Remove" action="ActionPopupProjectRemove"/>
+		<separator name="separator3"/>
 		<menuitem name="Properties" action="ActionPopupProjectProperties"/>
-		<menuitem name="Refresh" action="ActionProjectRefresh"/>
 	</popup>
 	<popup name="PopupFileManager">
 		<placeholder name="PlaceholderPopupFileProject">
diff --git a/plugins/project-manager/dialogs.c b/plugins/project-manager/dialogs.c
index 8cb71ca..eae4da9 100644
--- a/plugins/project-manager/dialogs.c
+++ b/plugins/project-manager/dialogs.c
@@ -704,7 +704,7 @@ pm_project_create_properties_dialog (AnjutaPmProject *project, GtkWindow *parent
 		title = _("Project properties");
 		break;
 	case ANJUTA_PROJECT_GROUP:
-		title = _("Group properties");
+		title = _("Directory properties");
 		break;
 	case ANJUTA_PROJECT_TARGET:
 		title = _("Target properties");
diff --git a/plugins/project-manager/plugin.c b/plugins/project-manager/plugin.c
index 3b5f135..3196aae 100644
--- a/plugins/project-manager/plugin.c
+++ b/plugins/project-manager/plugin.c
@@ -885,8 +885,8 @@ static GtkActionEntry pm_actions[] =
 		N_("_Project"), NULL, NULL, NULL
 	},
 	{
-		"ActionProjectAddGroup", GTK_STOCK_ADD,
-		N_("Add _Groupâ?¦"), NULL, N_("Add a group to project"),
+		"ActionProjectAddSubdirectory", GTK_STOCK_ADD,
+		N_("Add _Subdirectoryâ?¦"), NULL, N_("Add a subdirectory to project"),
 		G_CALLBACK (on_add_group)
 	},
 	{
@@ -915,11 +915,6 @@ static GtkActionEntry pm_actions[] =
 		G_CALLBACK (on_properties)
 	},
 	{
-		"ActionProjectRefresh", GTK_STOCK_REFRESH,
-		N_("_Refresh"), NULL, N_("Refresh project manager tree"),
-		G_CALLBACK (on_refresh)
-	},
-	{
 		"ActionFileCloseProject", NULL,
 		N_("Close Pro_ject"), NULL, N_("Close project"),
 		G_CALLBACK (on_close_project)
@@ -929,8 +924,8 @@ static GtkActionEntry pm_actions[] =
 static GtkActionEntry popup_actions[] = 
 {
 	{
-		"ActionPopupProjectAddGroup", GTK_STOCK_ADD,
-		N_("Add _Group"), NULL, N_("Add a group to project"),
+		"ActionPopupProjectAddSubdirectory", GTK_STOCK_ADD,
+		N_("Add _Subdirectory"), NULL, N_("Add a subdirectory to project"),
 		G_CALLBACK (on_popup_add_group)
 	},
 	{
@@ -1072,7 +1067,7 @@ on_treeview_selection_changed (GtkTreeSelection *sel,
 
 	/* Popup menu */
 	action = anjuta_ui_get_action (ui, "ActionGroupProjectManagerPopup",
-								   "ActionPopupProjectAddGroup");
+								   "ActionPopupProjectAddSubdirectory");
 	g_object_set (G_OBJECT (action), "sensitive", INT_TO_GBOOLEAN (state & ANJUTA_PROJECT_CAN_ADD_GROUP), NULL);
 	action = anjuta_ui_get_action (ui, "ActionGroupProjectManagerPopup",
 								   "ActionPopupProjectAddTarget");
diff --git a/plugins/project-manager/pm_dialogs.ui b/plugins/project-manager/pm_dialogs.ui
index 72beb75..adeaf76 100644
--- a/plugins/project-manager/pm_dialogs.ui
+++ b/plugins/project-manager/pm_dialogs.ui
@@ -5,7 +5,7 @@
   <object class="GtkDialog" id="new_group_dialog">
     <property name="can_default">True</property>
     <property name="border_width">5</property>
-    <property name="title" translatable="yes">New Group</property>
+    <property name="title" translatable="yes">New Subdirectory</property>
     <property name="modal">True</property>
     <property name="default_width">400</property>
     <property name="default_height">450</property>