[geany/geany] f86b39: Merge pull request #491 from techee/ft_config
Colomban Wendling
git-noreply at xxxxx
Mon Jun 15 19:39:22 UTC 2015
Branch: refs/heads/master
Author: Colomban Wendling <ban at herbesfolles.org>
Committer: Colomban Wendling <ban at herbesfolles.org>
Date: Mon, 15 Jun 2015 19:39:22 UTC
Commit: f86b39c7cb5242cd0753ef31e3d30f1026a07de0
https://github.com/geany/geany/commit/f86b39c7cb5242cd0753ef31e3d30f1026a07de0
Log Message:
-----------
Merge pull request #491 from techee/ft_config
Add filetype configuration menu entries
Modified Paths:
--------------
src/filetypes.c
src/ui_utils.c
src/ui_utils.h
Modified: src/filetypes.c
82 lines changed, 57 insertions(+), 25 deletions(-)
===================================================================
@@ -66,13 +66,13 @@ static GHashTable *filetypes_hash = NULL; /* Hash of filetype pointers based on
* @see filetypes_get_sorted_by_name(). */
GSList *filetypes_by_title = NULL;
-static GtkWidget *group_menus[GEANY_FILETYPE_GROUP_COUNT] = {NULL};
-
static void create_radio_menu_item(GtkWidget *menu, GeanyFiletype *ftype);
static gchar *filetypes_get_conf_extension(const GeanyFiletype *ft);
static void read_filetype_config(void);
+static void create_set_filetype_menu(gboolean config);
+static gchar *filetypes_get_filename(GeanyFiletype *ft, gboolean user);
enum TitleType
@@ -354,28 +354,43 @@ void filetypes_init_types(void)
static void on_document_save(G_GNUC_UNUSED GObject *object, GeanyDocument *doc)
{
- gchar *f;
+ gchar *f, *basename;
g_return_if_fail(!EMPTY(doc->real_path));
f = g_build_filename(app->configdir, "filetype_extensions.conf", NULL);
if (utils_str_equal(doc->real_path, f))
filetypes_reload_extensions();
-
g_free(f);
- f = g_build_filename(app->configdir, GEANY_FILEDEFS_SUBDIR, "filetypes.common", NULL);
- if (utils_str_equal(doc->real_path, f))
+
+ basename = g_path_get_basename(doc->real_path);
+ if (g_str_has_prefix(basename, "filetypes."))
{
guint i;
- /* Note: we don't reload other filetypes, even though the named styles may have changed.
- * The user can do this manually with 'Tools->Reload Configuration' */
- filetypes_load_config(GEANY_FILETYPES_NONE, TRUE);
+ for (i = 0; i < filetypes_array->len; i++)
+ {
+ GeanyFiletype *ft = filetypes[i];
+
+ f = filetypes_get_filename(ft, TRUE);
+ if (utils_str_equal(doc->real_path, f))
+ {
+ guint j;
- foreach_document(i)
- document_reload_config(documents[i]);
+ /* Note: we don't reload other filetypes, even though the named styles may have changed.
+ * The user can do this manually with 'Tools->Reload Configuration' */
+ filetypes_load_config(i, TRUE);
+
+ foreach_document(j)
+ document_reload_config(documents[j]);
+
+ g_free(f);
+ break;
+ }
+ g_free(f);
+ }
}
- g_free(f);
+ g_free(basename);
}
@@ -389,11 +404,13 @@ static void setup_config_file_menus(void)
ui_add_config_file_menu_item(f, NULL, NULL);
g_free(f);
+ create_set_filetype_menu(TRUE);
+
g_signal_connect(geany_object, "document-save", G_CALLBACK(on_document_save), NULL);
}
-static void create_sub_menu(GtkWidget *parent, GeanyFiletypeGroupID group_id, const gchar *title)
+static GtkWidget *create_sub_menu(GtkWidget *parent, const gchar *title)
{
GtkWidget *menu, *item;
@@ -402,29 +419,44 @@ static void create_sub_menu(GtkWidget *parent, GeanyFiletypeGroupID group_id, co
gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), menu);
gtk_container_add(GTK_CONTAINER(parent), item);
gtk_widget_show(item);
- group_menus[group_id] = menu;
+
+ return menu;
}
-static void create_set_filetype_menu(void)
+static void create_set_filetype_menu(gboolean config)
{
+ GtkWidget *group_menus[GEANY_FILETYPE_GROUP_COUNT] = {NULL};
GSList *node;
- GtkWidget *filetype_menu = ui_lookup_widget(main_widgets.window, "set_filetype1_menu");
+ GtkWidget *menu;
+
+ menu = config ? ui_widgets.config_files_filetype_menu :
+ ui_lookup_widget(main_widgets.window, "set_filetype1_menu");
- create_sub_menu(filetype_menu, GEANY_FILETYPE_GROUP_COMPILED, _("_Programming Languages"));
- create_sub_menu(filetype_menu, GEANY_FILETYPE_GROUP_SCRIPT, _("_Scripting Languages"));
- create_sub_menu(filetype_menu, GEANY_FILETYPE_GROUP_MARKUP, _("_Markup Languages"));
- create_sub_menu(filetype_menu, GEANY_FILETYPE_GROUP_MISC, _("M_iscellaneous"));
+ group_menus[GEANY_FILETYPE_GROUP_COMPILED] = create_sub_menu(menu, _("_Programming Languages"));
+ group_menus[GEANY_FILETYPE_GROUP_SCRIPT] = create_sub_menu(menu, _("_Scripting Languages"));
+ group_menus[GEANY_FILETYPE_GROUP_MARKUP] = create_sub_menu(menu, _("_Markup Languages"));
+ group_menus[GEANY_FILETYPE_GROUP_MISC] = create_sub_menu(menu, _("M_iscellaneous"));
- /* Append all filetypes to the filetype menu */
+ /* Append all filetypes to the menu */
foreach_slist(node, filetypes_by_title)
{
GeanyFiletype *ft = node->data;
+ GtkWidget *parent = (ft->group != GEANY_FILETYPE_GROUP_NONE) ? group_menus[ft->group] : menu;
- if (ft->group != GEANY_FILETYPE_GROUP_NONE)
- create_radio_menu_item(group_menus[ft->group], ft);
+ /* we already have filetypes.common config entry */
+ if (config && ft->id == GEANY_FILETYPES_NONE)
+ continue;
+
+ if (config)
+ {
+ gchar *filename = filetypes_get_filename(ft, TRUE);
+
+ ui_add_config_file_menu_item(filename, NULL, GTK_CONTAINER(parent));
+ g_free(filename);
+ }
else
- create_radio_menu_item(filetype_menu, ft);
+ create_radio_menu_item(parent, ft);
}
}
@@ -432,7 +464,7 @@ static void create_set_filetype_menu(void)
void filetypes_init(void)
{
filetypes_init_types();
- create_set_filetype_menu();
+ create_set_filetype_menu(FALSE);
setup_config_file_menus();
}
Modified: src/ui_utils.c
15 lines changed, 14 insertions(+), 1 deletions(-)
===================================================================
@@ -120,6 +120,7 @@ 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 */
@@ -2148,6 +2149,12 @@ static void create_config_files_menu(void)
item = ui_lookup_widget(main_widgets.window, "configuration_files1");
gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), menu);
+ item = gtk_menu_item_new_with_mnemonic(_("_Filetype Configuration"));
+ gtk_container_add(GTK_CONTAINER(menu), item);
+ ui_widgets.config_files_filetype_menu = gtk_menu_new();
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), ui_widgets.config_files_filetype_menu);
+ gtk_widget_show(item);
+
/* sort menu after all items added */
g_idle_add(sort_menu, widgets.config_files_menu);
}
@@ -2768,6 +2775,12 @@ 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 */
+ 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);
result = utils_str_casecmp(sa, sb);
@@ -2778,7 +2791,7 @@ static gint compare_menu_item_labels(gconstpointer a, gconstpointer b)
/* Currently @a menu should contain only GtkMenuItems with labels. */
-void ui_menu_sort_by_label(GtkMenu *menu)
+static void ui_menu_sort_by_label(GtkMenu *menu)
{
GList *list = gtk_container_get_children(GTK_CONTAINER(menu));
GList *node;
Modified: src/ui_utils.h
3 lines changed, 1 insertions(+), 2 deletions(-)
===================================================================
@@ -184,6 +184,7 @@ typedef struct UIWidgets
GtkWidget *print_page_setup;
GtkWidget *recent_projects_menuitem;
GtkWidget *recent_projects_menu_menubar;
+ GtkWidget *config_files_filetype_menu;
/* dialogs */
GtkWidget *open_colorsel;
@@ -223,8 +224,6 @@ GeanyUIEditorFeatures;
void ui_widget_show_hide(GtkWidget *widget, gboolean show);
-void ui_menu_sort_by_label(GtkMenu *menu);
-
gchar *ui_menu_item_get_text(GtkMenuItem *menu_item);
void ui_dialog_set_primary_button_order(GtkDialog *dialog, gint response, ...);
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
More information about the Commits
mailing list