[glade] * gladeui/glade-project.[ch], src/glade-window.c: Edit->Preferences becomes File->Properties along

[Tristan Van Berkom <tvb src gnome org>]

commit 026182df5805adef96d01eb1d295b460acff10c0
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Sat Jan 22 18:15:37 2011 +0900

    	* gladeui/glade-project.[ch], src/glade-window.c: Edit->Preferences becomes File->Properties
    	along with some internal renames (closes bug 609485).

 ChangeLog               |    3 +++
 gladeui/glade-project.c |   25 +++++++++++--------------
 gladeui/glade-project.h |    2 +-
 src/glade-window.c      |   12 ++++++------
 4 files changed, 21 insertions(+), 21 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index afc6c79..f14cfed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,9 @@
 	glade_property_class_make_gvalue_from_string() and from glade_utils_value_from_string() since
 	you never need a common ancestor to search a widget by name anymore.
 
+	* gladeui/glade-project.[ch], src/glade-window.c: Edit->Preferences becomes File->Properties
+	along with some internal renames (closes bug 609485).
+
 2011-01-21  Tristan Van Berkom <tristanvb openismus com>
 
 	* gladeui/glade-palette.c: Dont strdup the adaptor names in the local hash table (those
diff --git a/gladeui/glade-project.c b/gladeui/glade-project.c
index d037bce..69ebcc4 100644
--- a/gladeui/glade-project.c
+++ b/gladeui/glade-project.c
@@ -126,7 +126,7 @@ struct _GladeProjectPrivate
                                  * (full or relative path, null means project directory).
                                  */
 
-  /* Control on the preferences dialog to update buttons etc when properties change */
+  /* Control on the properties dialog to update buttons etc when properties change */
   GtkWidget *prefs_dialog;
   GtkWidget *project_wide_radio;
   GtkWidget *toplevel_contextual_radio;
@@ -1095,8 +1095,7 @@ glade_project_read_requires_from_comment (GladeXmlNode * comment,
   if (value &&
       !strncmp (" interface-requires", value, strlen (" interface-requires")))
     {
-      if (sscanf (value, " interface-requires %s %d.%d", buffer, &maj, &min) ==
-          3)
+      if (sscanf (value, " interface-requires %s %d.%d", buffer, &maj, &min) == 3)
         {
           if (major)
             *major = maj;
@@ -1579,7 +1578,7 @@ glade_project_load_from_file (GladeProject * project, const gchar * path)
 
       /* Update prefs dialogs here... */
       name = glade_project_get_name (project);
-      title = g_strdup_printf (_("%s preferences"), name);
+      title = g_strdup_printf (_("%s document properties"), name);
       gtk_window_set_title (GTK_WINDOW (project->priv->prefs_dialog), title);
       g_free (title);
       g_free (name);
@@ -1616,7 +1615,7 @@ glade_project_load (const gchar * path)
 
       /* Update prefs dialogs here... */
       name = glade_project_get_name (project);
-      title = g_strdup_printf (_("%s preferences"), name);
+      title = g_strdup_printf (_("%s document properties"), name);
       gtk_window_set_title (GTK_WINDOW (project->priv->prefs_dialog), title);
       g_free (title);
       g_free (name);
@@ -1852,7 +1851,7 @@ glade_project_save (GladeProject * project, const gchar * path, GError ** error)
 
       /* Update prefs dialogs here... */
       name = glade_project_get_name (project);
-      title = g_strdup_printf (_("%s preferences"), name);
+      title = g_strdup_printf (_("%s document properties"), name);
       gtk_window_set_title (GTK_WINDOW (project->priv->prefs_dialog), title);
       g_free (title);
       g_free (name);
@@ -3750,8 +3749,7 @@ glade_project_build_prefs_box (GladeProject * project)
       gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON
                                                    (project->priv->
                                                     resource_default_radio),
-                                                   _
-                                                   ("From a project relative directory"));
+                                                   _("From a project relative directory"));
 
   gtk_box_pack_start (GTK_BOX (hbox), project->priv->resource_relative_radio,
                       TRUE, TRUE, 0);
@@ -3766,8 +3764,7 @@ glade_project_build_prefs_box (GladeProject * project)
   hbox = gtk_hbox_new (FALSE, 0);
   project->priv->resource_fullpath_radio =
       gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON
-                                                   (project->priv->
-                                                    resource_default_radio),
+                                                   (project->priv->resource_default_radio),
                                                    _("From this directory"));
   gtk_box_pack_start (GTK_BOX (hbox), project->priv->resource_fullpath_radio,
                       TRUE, TRUE, 0);
@@ -3913,7 +3910,7 @@ glade_project_build_prefs_dialog (GladeProject * project)
   gchar *title, *name;
 
   name = glade_project_get_name (project);
-  title = g_strdup_printf (_("%s preferences"), name);
+  title = g_strdup_printf (_("%s document properties"), name);
 
   dialog = gtk_dialog_new_with_buttons (title,
                                         GTK_WINDOW (glade_app_get_window ()),
@@ -3953,13 +3950,13 @@ glade_project_build_prefs_dialog (GladeProject * project)
 }
 
 /**
- * glade_project_preferences:
+ * glade_project_properties:
  * @project: A #GladeProject
  *
- * Runs a preferences dialog for @project.
+ * Runs a document properties dialog for @project.
  */
 void
-glade_project_preferences (GladeProject * project)
+glade_project_properties (GladeProject * project)
 {
   g_return_if_fail (GLADE_IS_PROJECT (project));
 
diff --git a/gladeui/glade-project.h b/gladeui/glade-project.h
index 38e5ac8..22896ba 100644
--- a/gladeui/glade-project.h
+++ b/gladeui/glade-project.h
@@ -127,7 +127,7 @@ void                glade_project_cancel_load          (GladeProject       *proj
 
 void                glade_project_preview              (GladeProject       *project, 
 							GladeWidget        *gwidget);
-void                glade_project_preferences          (GladeProject       *project);
+void                glade_project_properties           (GladeProject       *project);
 gchar              *glade_project_resource_fullpath    (GladeProject       *project,
 							const gchar        *resource);
 
diff --git a/src/glade-window.c b/src/glade-window.c
index a498579..da1d13c 100644
--- a/src/glade-window.c
+++ b/src/glade-window.c
@@ -1593,7 +1593,7 @@ delete_cb (GtkAction * action, GladeWindow * window)
 }
 
 static void
-preferences_cb (GtkAction * action, GladeWindow * window)
+properties_cb (GtkAction * action, GladeWindow * window)
 {
   GladeProject *project;
 
@@ -1602,7 +1602,7 @@ preferences_cb (GtkAction * action, GladeWindow * window)
 
   project = glade_design_view_get_project (window->priv->active_view);
 
-  glade_project_preferences (project);
+  glade_project_properties (project);
 }
 
 static void
@@ -2147,6 +2147,8 @@ static const gchar ui_info[] =
     "      <separator/>"
     "      <menuitem action='Close'/>"
     "      <menuitem action='Quit'/>"
+    "      <separator/>"
+    "      <menuitem action='Properties'/>"
     "    </menu>"
     "    <menu action='EditMenu'>"
     "      <menuitem action='Undo'/>"
@@ -2156,8 +2158,6 @@ static const gchar ui_info[] =
     "      <menuitem action='Copy'/>"
     "      <menuitem action='Paste'/>"
     "      <menuitem action='Delete'/>"
-    "      <separator/>"
-    "      <menuitem action='Preferences'/>"
     "    </menu>"
     "    <menu action='ViewMenu'>"
     "      <menuitem action='ToolbarVisible'/>"
@@ -2267,8 +2267,8 @@ static GtkActionEntry project_entries[] = {
   {"Delete", GTK_STOCK_DELETE, NULL, "Delete",
    N_("Delete the selection"), G_CALLBACK (delete_cb)},
 
-  {"Preferences", GTK_STOCK_PREFERENCES, NULL, "<control>P",
-   N_("Modify project preferences"), G_CALLBACK (preferences_cb)},
+  {"Properties", GTK_STOCK_PROPERTIES, NULL, "<control>P",
+   N_("Edit project properties"), G_CALLBACK (properties_cb)},
 
   /* ProjectsMenu */
   {"PreviousProject", NULL, N_("_Previous Project"), "<control>Page_Up",