Sort custom template file menu items by filetype, with None

filetypes first.


git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@2577 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Nick Treleaven 2008-05-14 11:31:07 +00:00
parent b39f7b1276
commit f3dcad20b3
2 changed files with 28 additions and 0 deletions

View File

@ -1,3 +1,10 @@
2008-05-14 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* src/templates.c:
Sort custom template file menu items by filetype, with None
filetypes first.
2008-05-13 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> 2008-05-13 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* src/templates.c, src/utils.c, src/ui_utils.h, src/ui_utils.c, * src/templates.c, src/utils.c, src/ui_utils.h, src/ui_utils.c,

View File

@ -430,6 +430,26 @@ static void add_file_item(gpointer data, gpointer user_data)
} }
static gint compare_filenames_by_filetype(gconstpointer a, gconstpointer b)
{
filetype *ft_a = filetypes_detect_from_extension(a);
filetype *ft_b = filetypes_detect_from_extension(b);
/* sort by filetype name first */
if (ft_a != ft_b)
{
/* None filetypes should come first */
if (ft_a->id == GEANY_FILETYPES_NONE)
return -1;
if (ft_b->id == GEANY_FILETYPES_NONE)
return 1;
return g_strcasecmp(ft_a->name, ft_b->name);
}
return g_strcasecmp(a, b);
}
static gboolean add_custom_template_items(void) static gboolean add_custom_template_items(void)
{ {
gchar *path = g_build_path(G_DIR_SEPARATOR_S, app->configdir, GEANY_TEMPLATES_SUBDIR, gchar *path = g_build_path(G_DIR_SEPARATOR_S, app->configdir, GEANY_TEMPLATES_SUBDIR,
@ -441,6 +461,7 @@ static gboolean add_custom_template_items(void)
utils_mkdir(path, FALSE); utils_mkdir(path, FALSE);
return FALSE; return FALSE;
} }
list = g_slist_sort(list, compare_filenames_by_filetype);
g_slist_foreach(list, add_file_item, NULL); g_slist_foreach(list, add_file_item, NULL);
g_slist_foreach(list, (GFunc) g_free, NULL); g_slist_foreach(list, (GFunc) g_free, NULL);
g_slist_free(list); g_slist_free(list);