[Gnucash-changes] Promote file history information to the 'File' menu per Gnome HIG 2.0.

[David Hampton]

Log Message:
-----------
Promote file history information to the 'File' menu per Gnome HIG 2.0.

Tags:
----
gnucash-gnome2-dev

Modified Files:
--------------
    gnucash/src/gnome:
        gnc-plugin-file-history.c
    gnucash/src/gnome/ui:
        gnc-plugin-file-history-ui.xml

Revision Data
-------------
Index: gnc-plugin-file-history.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/Attic/gnc-plugin-file-history.c,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -Lsrc/gnome/gnc-plugin-file-history.c -Lsrc/gnome/gnc-plugin-file-history.c -u -r1.1.2.11 -r1.1.2.12
--- src/gnome/gnc-plugin-file-history.c
+++ src/gnome/gnc-plugin-file-history.c
@@ -66,7 +66,6 @@
 #define PLUGIN_UI_FILENAME  "gnc-plugin-file-history-ui.xml"
 
 static GtkActionEntry gnc_plugin_actions [] = {
-	{ "FileOpenRecentAction", NULL, N_("Open _Recent"), NULL, NULL, NULL },
 	{ "RecentFile0Action", NULL, "", NULL, NULL, G_CALLBACK (gnc_plugin_file_history_cmd_open_file) },
 	{ "RecentFile1Action", NULL, "", NULL, NULL, G_CALLBACK (gnc_plugin_file_history_cmd_open_file) },
 	{ "RecentFile2Action", NULL, "", NULL, NULL, G_CALLBACK (gnc_plugin_file_history_cmd_open_file) },
@@ -110,8 +109,17 @@
 	/* raw byte length, not num characters */
 	result = g_malloc(strlen(filename) * 2);
 
-	dst = result + g_sprintf(result, "_%d ", index);
-	for (src = filename; *src; src = g_utf8_next_char(src)) {
+	dst = result;
+	if (index < 10)
+	  dst += g_sprintf(result, "_%d ", (index + 1) % 10);
+
+	/* Find the filename portion of the path */
+	src = g_utf8_strrchr(filename, -1, '/');
+	src = g_utf8_next_char(src);
+
+	/* Fix up any underline characters so they aren't mistaken as
+	 * command accelerator keys. */
+	for ( ; *src; src = g_utf8_next_char(src)) {
 	  unichar = g_utf8_get_char(src);
 	  dst += g_unichar_to_utf8 (unichar, dst);
 
@@ -420,8 +428,6 @@
 	gnc_window_set_progressbar_window (GNC_WINDOW(data->window));
 	gnc_file_open_file (filename); /* also opens new account page */
 	gnc_window_set_progressbar_window (NULL);
-	gnc_main_window_update_title (data->window);
-	/* FIXME GNOME 2 Port (update the title etc.) */
 }
 
 /** @} */
Index: gnc-plugin-file-history-ui.xml
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/ui/Attic/gnc-plugin-file-history-ui.xml,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -Lsrc/gnome/ui/gnc-plugin-file-history-ui.xml -Lsrc/gnome/ui/gnc-plugin-file-history-ui.xml -u -r1.1.2.2 -r1.1.2.3
--- src/gnome/ui/gnc-plugin-file-history-ui.xml
+++ src/gnome/ui/gnc-plugin-file-history-ui.xml
@@ -2,18 +2,16 @@
   <menubar>
     <menu name="File" action="FileAction">
       <placeholder name="FileOpenRecentPlaceholder">
-        <menu name="FileOpenRecent" action="FileOpenRecentAction">
-          <menuitem name="RecentFile0" action="RecentFile0Action"/>
-          <menuitem name="RecentFile1" action="RecentFile1Action"/>
-          <menuitem name="RecentFile2" action="RecentFile2Action"/>
-          <menuitem name="RecentFile3" action="RecentFile3Action"/>
-          <menuitem name="RecentFile4" action="RecentFile4Action"/>
-          <menuitem name="RecentFile5" action="RecentFile5Action"/>
-          <menuitem name="RecentFile6" action="RecentFile6Action"/>
-          <menuitem name="RecentFile7" action="RecentFile7Action"/>
-          <menuitem name="RecentFile8" action="RecentFile8Action"/>
-          <menuitem name="RecentFile9" action="RecentFile9Action"/>
-        </menu>
+        <menuitem name="RecentFile0" action="RecentFile0Action"/>
+        <menuitem name="RecentFile1" action="RecentFile1Action"/>
+        <menuitem name="RecentFile2" action="RecentFile2Action"/>
+        <menuitem name="RecentFile3" action="RecentFile3Action"/>
+        <menuitem name="RecentFile4" action="RecentFile4Action"/>
+        <menuitem name="RecentFile5" action="RecentFile5Action"/>
+        <menuitem name="RecentFile6" action="RecentFile6Action"/>
+        <menuitem name="RecentFile7" action="RecentFile7Action"/>
+        <menuitem name="RecentFile8" action="RecentFile8Action"/>
+        <menuitem name="RecentFile9" action="RecentFile9Action"/>
       </placeholder>
     </menu>
   </menubar>