GNOME.org
 

[anjuta] project-manager: Rename a few menu items

commit 7706e3c0d0744105a360ea70e414eb60a79b33dd
Author: Sébastien Granjoux <seb sfo free fr>
Date:   Fri Jan 7 19:47:46 2011 +0100

    project-manager: Rename a few menu items

 plugins/project-manager/anjuta-project-manager.xml |   16 ++--
 plugins/project-manager/plugin.c                   |   70 ++++++++++----------
 plugins/project-manager/pm_dialogs.ui              |   60 ++++++++--------
 3 files changed, 73 insertions(+), 73 deletions(-)
---
diff --git a/plugins/project-manager/anjuta-project-manager.xml b/plugins/project-manager/anjuta-project-manager.xml
index ad8c04f..4c9688b 100644
--- a/plugins/project-manager/anjuta-project-manager.xml
+++ b/plugins/project-manager/anjuta-project-manager.xml
@@ -10,11 +10,11 @@
 	<placeholder name="PlaceHolderProjectMenus">
 		<menu name="MenuProject" action="ActionMenuProject">
 				<menuitem name="AddSource" action="ActionProjectAddSource" />
-				<menuitem name="AddTarget" action="ActionProjectAddTarget" />
-				<menuitem name="AddSubdirectory" action="ActionProjectAddSubdirectory" />
+				<menuitem name="AddLibrary" action="ActionProjectAddLibrary" />
 				<separator name="separator2"/>
-				<menuitem name="AddPackage" action="ActionProjectAddPackage" />
-				<menuitem name="AddModule" action="ActionProjectAddModule" />
+				<menuitem name="NewTarget" action="ActionProjectNewTarget" />
+				<menuitem name="NewDirectory" action="ActionProjectNewDirectory" />
+				<menuitem name="NewLibrary" action="ActionProjectNewLibrary" />
 				<separator name="separator1"/>
 				<menuitem name="Properties" action="ActionProjectProperties"/>
 		</menu>
@@ -25,11 +25,11 @@
 		<placeholder name="PlaceholderPopupProjectBuild"/>
 		<separator name="separator0"/>
 		<menuitem name="AddSource" action="ActionPopupProjectAddSource"/>
-		<menuitem name="AddTarget" action="ActionPopupProjectAddTarget"/>
-		<menuitem name="AddSubdirectory" action="ActionPopupProjectAddSubdirectory"/>
+		<menuitem name="AddLibrary" action="ActionPopupProjectAddLibrary"/>
 		<separator name="separator1"/>
-		<menuitem name="AddPackage" action="ActionPopupProjectAddPackage"/>
-		<menuitem name="AddModule" action="ActionPopupProjectAddModule"/>
+		<menuitem name="NewTarget" action="ActionPopupProjectNewTarget"/>
+		<menuitem name="NewDirectory" action="ActionPopupProjectNewDirectory"/>
+		<menuitem name="NewLibrary" action="ActionPopupProjectNewLibrary"/>
 		<separator name="separator2"/>
 		<menuitem name="Remove" action="ActionPopupProjectRemove"/>
 		<separator name="separator3"/>
diff --git a/plugins/project-manager/plugin.c b/plugins/project-manager/plugin.c
index 3196aae..20a94b5 100644
--- a/plugins/project-manager/plugin.c
+++ b/plugins/project-manager/plugin.c
@@ -428,7 +428,7 @@ on_properties (GtkAction *action, ProjectManagerPlugin *plugin)
 }
 
 static void
-on_add_group (GtkAction *action, ProjectManagerPlugin *plugin)
+on_new_group (GtkAction *action, ProjectManagerPlugin *plugin)
 {
 	GFile *group;
 	GFile *default_group = NULL;
@@ -449,7 +449,7 @@ on_add_group (GtkAction *action, ProjectManagerPlugin *plugin)
 }
 
 static void
-on_add_package (GtkAction *action, ProjectManagerPlugin *plugin)
+on_new_package (GtkAction *action, ProjectManagerPlugin *plugin)
 {
 	GtkTreeIter selected_module;
 	GList *new_module;
@@ -483,7 +483,7 @@ on_add_module (GtkAction *action, ProjectManagerPlugin *plugin)
 }
 
 static void
-on_add_target (GtkAction *action, ProjectManagerPlugin *plugin)
+on_new_target (GtkAction *action, ProjectManagerPlugin *plugin)
 {
 	GFile *target;
 	GFile *default_group = NULL;
@@ -547,7 +547,7 @@ on_popup_properties (GtkAction *action, ProjectManagerPlugin *plugin)
 }
 
 static void
-on_popup_add_package (GtkAction *action, ProjectManagerPlugin *plugin)
+on_popup_new_package (GtkAction *action, ProjectManagerPlugin *plugin)
 {
 	GtkTreeIter selected_module;
 	GList *packages;
@@ -578,7 +578,7 @@ on_popup_add_module (GtkAction *action, ProjectManagerPlugin *plugin)
 }
 
 static void
-on_popup_add_group (GtkAction *action, ProjectManagerPlugin *plugin)
+on_popup_new_group (GtkAction *action, ProjectManagerPlugin *plugin)
 {
 	GtkTreeIter selected_group;
 	AnjutaProjectNode *new_group;
@@ -593,7 +593,7 @@ on_popup_add_group (GtkAction *action, ProjectManagerPlugin *plugin)
 }
 
 static void
-on_popup_add_target (GtkAction *action, ProjectManagerPlugin *plugin)
+on_popup_new_target (GtkAction *action, ProjectManagerPlugin *plugin)
 {
 	GtkTreeIter selected_group;
 	AnjutaProjectNode *new_target;
@@ -885,29 +885,29 @@ static GtkActionEntry pm_actions[] =
 		N_("_Project"), NULL, NULL, NULL
 	},
 	{
-		"ActionProjectAddSubdirectory", GTK_STOCK_ADD,
-		N_("Add _Subdirectoryâ?¦"), NULL, N_("Add a subdirectory to project"),
-		G_CALLBACK (on_add_group)
+		"ActionProjectNewDirectory", GTK_STOCK_ADD,
+		N_("New _Directoryâ?¦"), NULL, N_("Add a new directory to the project"),
+		G_CALLBACK (on_new_group)
 	},
 	{
-		"ActionProjectAddTarget", GTK_STOCK_ADD,
-		N_("Add _Targetâ?¦"), NULL, N_("Add a target to project"),
-		G_CALLBACK (on_add_target)
+		"ActionProjectNewTarget", GTK_STOCK_ADD,
+		N_("New _Targetâ?¦"), NULL, N_("Add a new target to the project"),
+		G_CALLBACK (on_new_target)
 	},
 	{
 		"ActionProjectAddSource", GTK_STOCK_ADD,
-		N_("Add _Source Fileâ?¦"), NULL, N_("Add a source file to project"),
+		N_("Add _Source Fileâ?¦"), NULL, N_("Add a source file to a target"),
 		G_CALLBACK (on_add_source)
 	},
 	{
-		"ActionProjectAddModule", GTK_STOCK_ADD,
-		N_("Add _Moduleâ?¦"), NULL, N_("Add a module to a target"),
+		"ActionProjectAddLibrary", GTK_STOCK_ADD,
+		N_("Add _Libraryâ?¦"), NULL, N_("Add a module to a target"),
 		G_CALLBACK (on_add_module)
 	},
 	{
-		"ActionProjectAddPackage", GTK_STOCK_ADD,
-		N_("Add _Packageâ?¦"), NULL, N_("Add a package to project"),
-		G_CALLBACK (on_add_package)
+		"ActionProjectNewLibrary", GTK_STOCK_ADD,
+		N_("New _Libraryâ?¦"), NULL, N_("Add a new package to the project"),
+		G_CALLBACK (on_new_package)
 	},
 	{
 		"ActionProjectProperties", GTK_STOCK_PROPERTIES,
@@ -924,33 +924,33 @@ static GtkActionEntry pm_actions[] =
 static GtkActionEntry popup_actions[] = 
 {
 	{
-		"ActionPopupProjectAddSubdirectory", GTK_STOCK_ADD,
-		N_("Add _Subdirectory"), NULL, N_("Add a subdirectory to project"),
-		G_CALLBACK (on_popup_add_group)
+		"ActionPopupProjectNewDirectory", GTK_STOCK_ADD,
+		N_("New _Directory"), NULL, N_("Add a new directory to the project"),
+		G_CALLBACK (on_popup_new_group)
 	},
 	{
-		"ActionPopupProjectAddTarget", GTK_STOCK_ADD,
-		N_("Add _Target"), NULL, N_("Add a target to project"),
-		G_CALLBACK (on_popup_add_target)
+		"ActionPopupProjectNewTarget", GTK_STOCK_ADD,
+		N_("New _Target"), NULL, N_("Add a new target to the project"),
+		G_CALLBACK (on_popup_new_target)
 	},
 	{
 		"ActionPopupProjectAddSource", GTK_STOCK_ADD,
-		N_("Add _Source File"), NULL, N_("Add a source file to project"),
+		N_("Add _Source File"), NULL, N_("Add a source file to a target"),
 		G_CALLBACK (on_popup_add_source)
 	},
 	{
-		"ActionPopupProjectAddModule", GTK_STOCK_ADD,
-		N_("Add _Module"), NULL, N_("Add a module to target"),
+		"ActionPopupProjectAddLibrary", GTK_STOCK_ADD,
+		N_("Add _Library"), NULL, N_("Add a library to a target"),
 		G_CALLBACK (on_popup_add_module)
 	},
 	{
-		"ActionPopupProjectAddPackage", GTK_STOCK_ADD,
-		N_("Add _Package"), NULL, N_("Add a package to project"),
-		G_CALLBACK (on_popup_add_package)
+		"ActionPopupProjectNewLibrary", GTK_STOCK_ADD,
+		N_("New _Library"), NULL, N_("Add a new library to the project"),
+		G_CALLBACK (on_popup_new_package)
 	},
 	{
 		"ActionPopupProjectAddToProject", GTK_STOCK_ADD,
-		N_("_Add to Project"), NULL, N_("Add a source file to project"),
+		N_("_Add to Project"), NULL, N_("Add a source file to a target"),
 		G_CALLBACK (on_popup_add_to_project)
 	},
 	{
@@ -1067,19 +1067,19 @@ on_treeview_selection_changed (GtkTreeSelection *sel,
 
 	/* Popup menu */
 	action = anjuta_ui_get_action (ui, "ActionGroupProjectManagerPopup",
-								   "ActionPopupProjectAddSubdirectory");
+								   "ActionPopupProjectNewDirectory");
 	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");
+								   "ActionPopupProjectNewTarget");
 	g_object_set (G_OBJECT (action), "sensitive", INT_TO_GBOOLEAN (state & ANJUTA_PROJECT_CAN_ADD_TARGET), NULL);
 	action = anjuta_ui_get_action (ui, "ActionGroupProjectManagerPopup",
 								   "ActionPopupProjectAddSource");
 	g_object_set (G_OBJECT (action), "sensitive", INT_TO_GBOOLEAN (state & ANJUTA_PROJECT_CAN_ADD_SOURCE), NULL);
 	action = anjuta_ui_get_action (ui, "ActionGroupProjectManagerPopup",
-								   "ActionPopupProjectAddModule");
+								   "ActionPopupProjectAddLibrary");
 	g_object_set (G_OBJECT (action), "sensitive", INT_TO_GBOOLEAN (state & ANJUTA_PROJECT_CAN_ADD_MODULE), NULL);
 	action = anjuta_ui_get_action (ui, "ActionGroupProjectManagerPopup",
-								   "ActionPopupProjectAddPackage");
+								   "ActionPopupProjectNewLibrary");
 	g_object_set (G_OBJECT (action), "sensitive", INT_TO_GBOOLEAN (state & ANJUTA_PROJECT_CAN_ADD_PACKAGE), NULL);
 	action = anjuta_ui_get_action (ui, "ActionGroupProjectManagerPopup",
 								   "ActionPopupProjectRemove");
diff --git a/plugins/project-manager/pm_dialogs.ui b/plugins/project-manager/pm_dialogs.ui
index adeaf76..8cc9d0f 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 Subdirectory</property>
+    <property name="title" translatable="yes">New Directory</property>
     <property name="modal">True</property>
     <property name="default_width">400</property>
     <property name="default_height">450</property>
@@ -27,7 +27,7 @@
                 <child>
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">_Group name:</property>
+                    <property name="label" translatable="yes">_Directory name:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">group_name_entry</property>
                   </object>
@@ -62,7 +62,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Specify _where to create the group:</property>
+                    <property name="label" translatable="yes">Specify _where to create the directory:</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -513,7 +513,7 @@
   <object class="GtkDialog" id="add_module_dialog">
     <property name="can_default">True</property>
     <property name="border_width">5</property>
-    <property name="title" translatable="yes">Add Module</property>
+    <property name="title" translatable="yes">Add Library</property>
     <property name="modal">True</property>
     <property name="default_width">400</property>
     <property name="default_height">550</property>
@@ -540,7 +540,7 @@
                   <object class="GtkLabel" id="label6">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Select the _target for the module:</property>
+                    <property name="label" translatable="yes">Select the _target for the library:</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -600,7 +600,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="new_package_button">
-                    <property name="label" translatable="yes">_Add package&#x2026;</property>
+                    <property name="label" translatable="yes">_New library&#x2026;</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -692,7 +692,7 @@
   <object class="GtkDialog" id="add_package_dialog">
     <property name="can_default">True</property>
     <property name="border_width">5</property>
-    <property name="title" translatable="yes">Add Package</property>
+    <property name="title" translatable="yes">New Library</property>
     <property name="modal">True</property>
     <property name="default_width">400</property>
     <property name="default_height">550</property>
@@ -711,15 +711,16 @@
             <property name="orientation">vertical</property>
             <property name="spacing">12</property>
             <child>
-              <object class="GtkHBox" id="hbox2">
+              <object class="GtkVBox" id="vbox12">
                 <property name="visible">True</property>
+                <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
-                  <object class="GtkLabel" id="label11">
+                  <object class="GtkLabel" id="label10">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">_Module name:</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Package list:</property>
                     <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">group_name_entry</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -728,9 +729,18 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkComboBoxText" id="module_entry">
+                  <object class="GtkScrolledWindow" id="scrolledwindow2">
                     <property name="visible">True</property>
-                    <property name="has-entry">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="hscrollbar_policy">automatic</property>
+                    <property name="vscrollbar_policy">automatic</property>
+                    <property name="shadow_type">in</property>
+                    <child>
+                      <object class="AnjutaPkgConfigChooser" id="packages_view">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                      </object>
+                    </child>
                   </object>
                   <packing>
                     <property name="position">1</property>
@@ -738,21 +748,19 @@
                 </child>
               </object>
               <packing>
-                <property name="expand">False</property>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkVBox" id="vbox12">
+              <object class="GtkHBox" id="hbox2">
                 <property name="visible">True</property>
-                <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
-                  <object class="GtkLabel" id="label10">
+                  <object class="GtkLabel" id="label11">
                     <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Package list:</property>
+                    <property name="label" translatable="yes">_Module name:</property>
                     <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">group_name_entry</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -761,18 +769,9 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkScrolledWindow" id="scrolledwindow2">
+                  <object class="GtkComboBoxText" id="module_entry">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="hscrollbar_policy">automatic</property>
-                    <property name="vscrollbar_policy">automatic</property>
-                    <property name="shadow_type">in</property>
-                    <child>
-                      <object class="AnjutaPkgConfigChooser" id="packages_view">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                      </object>
-                    </child>
+                    <property name="has-entry">True</property>
                   </object>
                   <packing>
                     <property name="position">1</property>
@@ -780,6 +779,7 @@
                 </child>
               </object>
               <packing>
+                <property name="expand">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]