SF.net SVN: geany:[3405] trunk

[ntrel at users.sourceforge.net]

Revision: 3405
          http://geany.svn.sourceforge.net/geany/?rev=3405&view=rev
Author:   ntrel
Date:     2008-12-19 16:28:14 +0000 (Fri, 19 Dec 2008)

Log Message:
-----------
Use plurals for HTML symbol list parent items.
Fix Fortran Types showing as Interfaces in the symbol list.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/symbols.c
    trunk/tagmanager/fortran.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-12-19 16:10:54 UTC (rev 3404)
+++ trunk/ChangeLog	2008-12-19 16:28:14 UTC (rev 3405)
@@ -1,3 +1,10 @@
+2008-12-19  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/symbols.c, tagmanager/fortran.c:
+   Use plurals for HTML symbol list parent items.
+   Fix Fortran Types showing as Interfaces in the symbol list.
+
+
 2008-12-18  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
 
  * src/editor.c:

Modified: trunk/src/symbols.c
===================================================================
--- trunk/src/symbols.c	2008-12-19 16:10:54 UTC (rev 3404)
+++ trunk/src/symbols.c	2008-12-19 16:28:14 UTC (rev 3405)
@@ -637,10 +637,10 @@
 		{
 			tag_list_add_groups(tag_store,
 				&(tv_iters.tag_function), _("Functions"), NULL,
-				&(tv_iters.tag_member), _("Anchor"), NULL,
-				&(tv_iters.tag_namespace), _("Heading (H1)"), NULL,
-				&(tv_iters.tag_class), _("Heading (H2)"), NULL,
-				&(tv_iters.tag_variable), _("Heading (H3)"), NULL,
+				&(tv_iters.tag_member), _("Anchors"), NULL,
+				&(tv_iters.tag_namespace), _("H1 Headings"), NULL,
+				&(tv_iters.tag_class), _("H2 Headings"), NULL,
+				&(tv_iters.tag_variable), _("H3 Headings"), NULL,
 				NULL);
 			break;
 		}
@@ -955,10 +955,15 @@
 		case tm_tag_enum_t:
 		{
 			/* TODO separate C-like types here also */
-			if (ft_id == GEANY_FILETYPES_HAXE)
+			switch (ft_id)
 			{
-				iter = &tv_iters.tag_type;
-				break;
+				case GEANY_FILETYPES_HAXE:
+				case GEANY_FILETYPES_FORTRAN:
+				case GEANY_FILETYPES_F77:
+					iter = &tv_iters.tag_type;
+					goto skip;
+				default:
+					break;
 			}
 			/* fall through */
 		}
@@ -985,6 +990,7 @@
 			iter = &tv_iters.tag_other;
 		}
 	}
+skip:
 	if (iter->stamp != -1)
 		return iter;
 	else

Modified: trunk/tagmanager/fortran.c
===================================================================
--- trunk/tagmanager/fortran.c	2008-12-19 16:10:54 UTC (rev 3404)
+++ trunk/tagmanager/fortran.c	2008-12-19 16:28:14 UTC (rev 3405)
@@ -184,7 +184,7 @@
     { TRUE,  'n', "namelist",   "namelists"},
     { TRUE,  'p', "package",    "programs"},
     { TRUE,  's', "member",     "subroutines"},
-    { TRUE,  't', "type",       "derived types"},
+    { TRUE,  't', "typedef",    "derived types"},
     { TRUE,  'v', "variable",   "module variables"}
 };
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.