SF.net SVN: geany: [1792] trunk

[ntrel at users.sourceforge.net]

Revision: 1792
          http://geany.svn.sourceforge.net/geany/?rev=1792&view=rev
Author:   ntrel
Date:     2007-08-14 08:11:54 -0700 (Tue, 14 Aug 2007)

Log Message:
-----------
Sort filetype groups alphabetically.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/filetypes.c
    trunk/src/filetypes.h

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-08-14 11:50:03 UTC (rev 1791)
+++ trunk/ChangeLog	2007-08-14 15:11:54 UTC (rev 1792)
@@ -4,6 +4,8 @@
    tagmanager/parsers.h, tagmanager/makefile.win32, tagmanager/rest.c,
    tagmanager/Makefile.am:
    Add reStructuredText filetype and parser.
+ * src/filetypes.c, src/filetypes.h:
+   Sort filetype groups alphabetically.
 
 
 2007-08-13  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>

Modified: trunk/src/filetypes.c
===================================================================
--- trunk/src/filetypes.c	2007-08-14 11:50:03 UTC (rev 1791)
+++ trunk/src/filetypes.c	2007-08-14 15:11:54 UTC (rev 1792)
@@ -595,22 +595,22 @@
 		// insert separators for different filetype groups
 		switch (ft_id)
 		{
-			case GEANY_FILETYPES_C:		// programming
+			case GEANY_FILETYPES_GROUP_COMPILED:	// programming
 			{
 				sub_menu = sub_menu_programming;
 				break;
 			}
-			case GEANY_FILETYPES_PERL:	// scripts
+			case GEANY_FILETYPES_GROUP_SCRIPT:	// scripts
 			{
 				sub_menu = sub_menu_scripts;
 				break;
 			}
-			case GEANY_FILETYPES_XML:	// markup
+			case GEANY_FILETYPES_GROUP_MARKUP:	// markup
 			{	// (include also CSS, not really markup but fit quite well to HTML)
 				sub_menu = sub_menu_markup;
 				break;
 			}
-			case GEANY_FILETYPES_SQL:	// misc
+			case GEANY_FILETYPES_GROUP_MISC:	// misc
 			{
 				sub_menu = sub_menu_misc;
 				break;

Modified: trunk/src/filetypes.h
===================================================================
--- trunk/src/filetypes.h	2007-08-14 11:50:03 UTC (rev 1791)
+++ trunk/src/filetypes.h	2007-08-14 15:11:54 UTC (rev 1792)
@@ -33,48 +33,53 @@
 #include "ScintillaWidget.h"
 
 
+// each group should be alpha-sorted, based on filetype::name (not enum name)
 typedef enum
 {
 	// normally compiled languages
-	GEANY_FILETYPES_C = 0,
+	GEANY_FILETYPES_GROUP_COMPILED = 0,
+	GEANY_FILETYPES_ASM = GEANY_FILETYPES_GROUP_COMPILED,
+	GEANY_FILETYPES_C,
 	GEANY_FILETYPES_CPP,
 	GEANY_FILETYPES_CS,
+	GEANY_FILETYPES_CAML,
 	GEANY_FILETYPES_D,
+	GEANY_FILETYPES_FORTRAN,
+	GEANY_FILETYPES_BASIC,	// FreeBasic
+	GEANY_FILETYPES_HASKELL,
+	GEANY_FILETYPES_HAXE,
 	GEANY_FILETYPES_JAVA,
 	GEANY_FILETYPES_PASCAL,
-	GEANY_FILETYPES_BASIC,
-	GEANY_FILETYPES_ASM,
-	GEANY_FILETYPES_FORTRAN,
-	GEANY_FILETYPES_CAML,
-	GEANY_FILETYPES_HASKELL,
 	GEANY_FILETYPES_VHDL,
-	GEANY_FILETYPES_HAXE,
 
 	// script languages
+	GEANY_FILETYPES_GROUP_SCRIPT,
+	GEANY_FILETYPES_FERITE = GEANY_FILETYPES_GROUP_SCRIPT,
+	GEANY_FILETYPES_JS,
+	GEANY_FILETYPES_LUA,
+	GEANY_FILETYPES_MAKE,
+	GEANY_FILETYPES_OMS,
 	GEANY_FILETYPES_PERL,
 	GEANY_FILETYPES_PHP,
-	GEANY_FILETYPES_JS,
 	GEANY_FILETYPES_PYTHON,
 	GEANY_FILETYPES_RUBY,
+	GEANY_FILETYPES_SH,
 	GEANY_FILETYPES_TCL,
-	GEANY_FILETYPES_LUA,
-	GEANY_FILETYPES_FERITE,
-	GEANY_FILETYPES_SH,
-	GEANY_FILETYPES_MAKE,
-	GEANY_FILETYPES_OMS,
 
  	// markup langauges
- 	GEANY_FILETYPES_XML,
+	GEANY_FILETYPES_GROUP_MARKUP,
+	GEANY_FILETYPES_CSS = GEANY_FILETYPES_GROUP_MARKUP,
 	GEANY_FILETYPES_DOCBOOK,
 	GEANY_FILETYPES_HTML,
-	GEANY_FILETYPES_CSS,
+ 	GEANY_FILETYPES_XML,
 
 	// miscellaneous languages
-	GEANY_FILETYPES_SQL,
+	GEANY_FILETYPES_GROUP_MISC,
+	GEANY_FILETYPES_CONF = GEANY_FILETYPES_GROUP_MISC,
+	GEANY_FILETYPES_DIFF,
 	GEANY_FILETYPES_LATEX,
-	GEANY_FILETYPES_DIFF,
-	GEANY_FILETYPES_CONF,
 	GEANY_FILETYPES_REST,
+	GEANY_FILETYPES_SQL,
 
 	GEANY_FILETYPES_ALL,	// must be last filetype, used for 'None' item.
 	GEANY_MAX_FILE_TYPES


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