HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Warn user if current filetype might not support color schemes

Browse Source 
If the 'default' style isn't set to a named style, then probably the
filetype styles have been overridden with manual colors and may not
work properly with color schemes.

Note: HTML-based filetypes won't show a warning because they don't
have a 'default' style (they use 'html_default' instead).

This is a simple heuristic, but is worth having to avoid some
spurious bug reports when using the color schemes dialog.
This commit is contained in:
Nick Treleaven 2012-05-29 17:59:37 +01:00
parent 12a1295dd1
commit 563249f7c6
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/filetypesprivate.h
View File

@ -35,6 +35,7 @@ typedef struct GeanyFiletypePrivate
gint symbol_list_sort_mode; gint symbol_list_sort_mode;
gboolean xml_indent_tags; /* XML tag autoindentation, for HTML and XML filetypes */ gboolean xml_indent_tags; /* XML tag autoindentation, for HTML and XML filetypes */
GSList *tag_files; GSList *tag_files;
gboolean warn_color_scheme;
} }
GeanyFiletypePrivate; GeanyFiletypePrivate;

17
src/highlighting.c
View File

@ -41,6 +41,9 @@
#include "main.h" #include "main.h"
#include "support.h" #include "support.h"
#include "sciwrappers.h" #include "sciwrappers.h"
#include "document.h"
#include "dialogs.h"
#include "filetypesprivate.h"
#include "highlightingmappings.h" #include "highlightingmappings.h"
@ -979,6 +982,7 @@ void highlighting_init_styles(guint filetype_idx, GKeyFile *config, GKeyFile *co
{ {
GeanyFiletype *ft = filetypes[filetype_idx]; GeanyFiletype *ft = filetypes[filetype_idx];
guint lexer_id = get_lexer_filetype(ft); guint lexer_id = get_lexer_filetype(ft);
gchar *default_str;
if (!style_sets) if (!style_sets)
style_sets = g_new0(StyleSet, filetypes_array->len); style_sets = g_new0(StyleSet, filetypes_array->len);
@ -987,6 +991,12 @@ void highlighting_init_styles(guint filetype_idx, GKeyFile *config, GKeyFile *co
free_styleset(filetype_idx); free_styleset(filetype_idx);
read_properties(ft, config, configh); read_properties(ft, config, configh);
/* If a default style exists, check it uses a named style
* Note: almost all filetypes have a "default" style, except HTML ones */
default_str = utils_get_setting(string, configh, config,
"styling", "default", "default");
ft->priv->warn_color_scheme = !g_ascii_isalpha(*default_str);
g_free(default_str);
/* None filetype handled specially */ /* None filetype handled specially */
if (filetype_idx == GEANY_FILETYPES_NONE) if (filetype_idx == GEANY_FILETYPES_NONE)
@ -1318,6 +1328,13 @@ void highlighting_show_color_scheme_dialog(void)
GtkTreeViewColumn *column; GtkTreeViewColumn *column;
GtkTreeSelection *treesel; GtkTreeSelection *treesel;
GtkWidget *vbox, *swin, *tree; GtkWidget *vbox, *swin, *tree;
GeanyDocument *doc;
doc = document_get_current();
if (doc && doc->file_type->priv->warn_color_scheme)
dialogs_show_msgbox_with_secondary(GTK_MESSAGE_WARNING,
_("The current filetype overrides the default style."),
_("This may cause color schemes to display incorrectly."));
scheme_tree = tree = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store)); scheme_tree = tree = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
g_object_unref(store); g_object_unref(store);