SF.net SVN: geany:[5704] trunk

[eht16 at users.sourceforge.net]

Revision: 5704
          http://geany.svn.sourceforge.net/geany/?rev=5704&view=rev
Author:   eht16
Date:     2011-04-10 14:52:57 +0000 (Sun, 10 Apr 2011)

Log Message:
-----------
Fix mapping of SQL tags for Geany's symbol list (closes #3216474).

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-04-10 13:53:05 UTC (rev 5703)
+++ trunk/ChangeLog	2011-04-10 14:52:57 UTC (rev 5704)
@@ -5,6 +5,8 @@
  * src/geanyobject.c, src/plugindata.h, src/geanyobject.h,
    src/document.c, doc/pluginsignals.c:
    Add and use signal "document-reload" to the plugin API.
+ * src/symbols.c, tagmanager/sql.c:
+   Fix mapping of SQL tags for Geany's symbol list (closes #3216474).
 
 
 2011-04-08  Colomban Wendling  <colomban(at)geany(dot)org>

Modified: trunk/src/symbols.c
===================================================================
--- trunk/src/symbols.c	2011-04-10 13:53:05 UTC (rev 5703)
+++ trunk/src/symbols.c	2011-04-10 14:52:57 UTC (rev 5704)
@@ -946,6 +946,19 @@
 				&tv_iters.tag_macro, _("Macros"), "classviewer-macro",
 				NULL);
 			break;
+		case GEANY_FILETYPES_SQL:
+		{
+			tag_list_add_groups(tag_store,
+				&(tv_iters.tag_function), _("Functions"), "classviewer-method",
+				&(tv_iters.tag_namespace), _("Procedures"), "classviewer-namespace",
+				&(tv_iters.tag_struct), _("Indexes"), "classviewer-struct",
+				&(tv_iters.tag_class), _("Tables"), "classviewer-class",
+				&(tv_iters.tag_macro), _("Triggers"), "classviewer-macro",
+				&(tv_iters.tag_member), _("Views"), "classviewer-var",
+				&(tv_iters.tag_other), _("Other"), "classviewer-other",
+				NULL);
+			break;
+		}
 		case GEANY_FILETYPES_D:
 		default:
 		{

Modified: trunk/tagmanager/sql.c
===================================================================
--- trunk/tagmanager/sql.c	2011-04-10 13:53:05 UTC (rev 5703)
+++ trunk/tagmanager/sql.c	2011-04-10 14:52:57 UTC (rev 5704)
@@ -182,18 +182,18 @@
     { FALSE, 'l', "local",        "local variables"        },
     { TRUE,  'L', "label",        "block label"            },
     { TRUE,  'P', "package",      "packages"	           },
-    { TRUE,  'p', "procedure",    "procedures"  	   },
+    { TRUE,  'n', "namespace",    "procedures"  	   },
     { FALSE, 'r', "record",       "records"     	   },
     { TRUE,  's', "subtype",      "subtypes"    	   },
-    { TRUE,  't', "table",        "tables"		   },
-    { TRUE,  'T', "trigger",      "triggers"	           },
+    { TRUE,  't', "class",        "tables"		   },
+    { TRUE,  'T', "macro",        "triggers"	           },
     { TRUE,  'v', "variable",     "variables"   	   },
-    { TRUE,  'i', "index",        "indexes"     	   },
+    { TRUE,  'i', "struct",       "indexes"     	   },
     { TRUE,  'e', "event",        "events"	           },
     { TRUE,  'U', "publication",  "publications"           },
     { TRUE,  'R', "service",      "services"               },
     { TRUE,  'D', "domain",       "domains"                },
-    { TRUE,  'V', "view",         "views"                  },
+    { TRUE,  'm', "member",       "views"                  },
     { TRUE,  'n', "synonym",      "synonyms"               },
     { TRUE,  'x', "mltable",      "MobiLink Table Scripts" },
     { TRUE,  'y', "mlconn",       "MobiLink Conn Scripts"  }


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