[geany/geany] 8a9e9b: Add filetype submenus for new file with template menus (#3397) - Commits

9 Mar 2023


      Branch:      refs/heads/master
Author:      Nick Treleaven ntrel002@gmail.com
Committer:   GitHub noreply@github.com
Date:        Thu, 09 Mar 2023 16:24:37 UTC
Commit:      8a9e9be88545f83c91d378d6662790efa38959d4
             https://github.com/geany/geany/commit/8a9e9be88545f83c91d378d6662790efa38959...
Log Message:
-----------
Add filetype submenus for new file with template menus  (#3397)
* Put items with submenus at the top of the menu
* Add filetype submenus for new file template menus
Add submenus when there's more than one template per filetype.
* Remove redundant checks for null ft
* Update docs
Modified Paths:
--------------
    doc/geany.txt
    src/filetypes.c
    src/templates.c
    src/ui_utils.c
    src/ui_utils.h
Modified: doc/geany.txt
3 lines changed, 2 insertions(+), 1 deletions(-)
===================================================================
@@ -4944,7 +4944,8 @@ File templates
File templates are templates used as the basis of a new file. To
 use them, choose the *New (with Template)* menu item from the *File*
-menu.
+menu. If there is more than one template for a filetype then they
+will be grouped in a submenu.
By default, file templates are installed for some filetypes. Custom
 file templates can be added by creating the appropriate template file. You can
Modified: src/filetypes.c
3 lines changed, 2 insertions(+), 1 deletions(-)
===================================================================
@@ -513,7 +513,8 @@ static GeanyFiletype *detect_filetype_conf_file(const gchar *utf8_filename)
/* Detect filetype only based on the filename extension.
- * utf8_filename can include the full path. */
+ * utf8_filename can include the full path.
+ * Returns: non-NULL */
 GeanyFiletype *filetypes_detect_from_extension(const gchar *utf8_filename)
 {
    gchar *base_filename;
Modified: src/templates.c
37 lines changed, 36 insertions(+), 1 deletions(-)
===================================================================
@@ -255,19 +255,54 @@ static void add_file_item(const gchar *fname, GtkWidget *menu)
 }
+typedef struct
+{
+	gint count;
+	GtkWidget *menu;
+}
+FTMenu;
+
 static void populate_file_template_menu(GtkWidget *menu)
 {
    GSList *list = utils_get_config_files(GEANY_TEMPLATES_SUBDIR G_DIR_SEPARATOR_S "files");
    GSList *node;
+	FTMenu *ft_groups;
+	gint nbytes = sizeof(FTMenu) * filetypes_array->len;
+
+	ft_groups = g_alloca(nbytes);
+	memset(ft_groups, 0, nbytes);
+
+	foreach_slist(node, list)
+	{
+		gchar *fname = node->data;
+		GeanyFiletype *ft = filetypes_detect_from_extension(fname);
+		ft_groups[ft->id].count++;
+	}
    foreach_slist(node, list)
    {
    	gchar *fname = node->data;
+		GeanyFiletype *ft = filetypes_detect_from_extension(fname);
+		FTMenu *group = &ft_groups[ft->id];
-		add_file_item(fname, menu);
+		if (group->count == 1)
+			add_file_item(fname, menu);
+		else
+		{
+			if (!group->menu)
+			{
+				GtkWidget *item = gtk_menu_item_new_with_label(ft->name);
+				gtk_widget_show(item);
+				gtk_container_add(GTK_CONTAINER(menu), item);
+				group->menu = gtk_menu_new();
+				gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), group->menu);
+			}
+			add_file_item(fname, group->menu);
+		}
    	g_free(fname);
    }
    g_slist_free(list);
+	ui_menu_sort_by_label(GTK_MENU(menu));
 }
Modified: src/ui_utils.c
9 lines changed, 4 insertions(+), 5 deletions(-)
===================================================================
@@ -118,7 +118,6 @@ static void recent_file_loaded(const gchar *utf8_filename, GeanyRecentFiles *grf
 static void recent_file_activate_cb(GtkMenuItem *menuitem, gpointer user_data);
 static void recent_project_activate_cb(GtkMenuItem *menuitem, gpointer user_data);
 static GtkWidget *progress_bar_create(void);
-static void ui_menu_sort_by_label(GtkMenu *menu);
/* simple wrapper for gtk_widget_set_sensitive() to allow widget being NULL */
@@ -2877,11 +2876,11 @@ static gint compare_menu_item_labels(gconstpointer a, gconstpointer b)
    gchar *sa, *sb;
    gint result;
-	/* put entries with submenus at the end of the menu */
+	/* put entries with submenus at the start of the menu */
    if (gtk_menu_item_get_submenu(item_a) && !gtk_menu_item_get_submenu(item_b))
-		return 1;
-	else if (!gtk_menu_item_get_submenu(item_a) && gtk_menu_item_get_submenu(item_b))
    	return -1;
+	else if (!gtk_menu_item_get_submenu(item_a) && gtk_menu_item_get_submenu(item_b))
+		return 1;
sa = ui_menu_item_get_text(item_a);
    sb = ui_menu_item_get_text(item_b);
@@ -2893,7 +2892,7 @@ static gint compare_menu_item_labels(gconstpointer a, gconstpointer b)
/* Currently @a menu should contain only GtkMenuItems with labels. */
-static void ui_menu_sort_by_label(GtkMenu *menu)
+void ui_menu_sort_by_label(GtkMenu *menu)
 {
    GList *list = gtk_container_get_children(GTK_CONTAINER(menu));
    GList *node;
Modified: src/ui_utils.h
2 lines changed, 2 insertions(+), 0 deletions(-)
===================================================================
@@ -371,6 +371,8 @@ gboolean ui_encodings_combo_box_set_active_encoding(GtkComboBox *combo, gint enc
gchar *ui_get_project_directory(const gchar *path);
+void ui_menu_sort_by_label(GtkMenu *menu);
+
 void ui_menu_popup(GtkMenu* menu, GtkMenuPositionFunc func, gpointer data, guint button, guint32 activate_time);
#endif /* GEANY_PRIVATE */
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

    