Commits May 2011

commits@lists.geany.org

5 participants
73 discussions

SF.net SVN: geany:[5757] trunk
by ntrel＠users.sourceforge.net 03 May '11

03 May '11

Revision: 5757 http://geany.svn.sourceforge.net/geany/?rev=5757&view=rev Author: ntrel Date: 2011-05-03 15:18:52 +0000 (Tue, 03 May 2011) Log Message: ----------- Allow translations for color scheme [theme_info] keys. Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.html trunk/doc/geany.txt trunk/src/highlighting.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-05-02 16:46:34 UTC (rev 5756) +++ trunk/ChangeLog 2011-05-03 15:18:52 UTC (rev 5757) @@ -1,3 +1,9 @@ +2011-05-03 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/highlighting.c, doc/geany.txt, doc/geany.html: + Allow translations for color scheme [theme_info] keys. + + 2011-05-02 Colomban Wendling <colomban(at)geany(dot)org> * src/plugindata.h: Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2011-05-02 16:46:34 UTC (rev 5756) +++ trunk/doc/geany.html 2011-05-03 15:18:52 UTC (rev 5757) @@ -1901,7 +1901,13 @@ </div> <p>The <tt class="docutils literal"><span class="pre">[theme_info]</span></tt> section can contain information about the theme. The <tt class="docutils literal"><span class="pre">name</span></tt> and <tt class="docutils literal"><span class="pre">description</span></tt> keys are read to set the -menu item text and tooltip, respectively.</p> +menu item text and tooltip, respectively. These keys can have +translations, e.g.:</p> +<pre class="literal-block"> +key=Hello +key[de]=Hallo +key[fr_FR]=Bonjour +</pre> </div> </div> <div class="section"> @@ -6560,7 +6566,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference" href="geany.txt">View document source</a>. -Generated on: 2011-04-30 16:23 UTC. +Generated on: 2011-05-03 15:15 UTC. Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source. </div> Modified: trunk/doc/geany.txt =================================================================== --- trunk/doc/geany.txt 2011-05-02 16:46:34 UTC (rev 5756) +++ trunk/doc/geany.txt 2011-05-03 15:18:52 UTC (rev 5757) @@ -1489,8 +1489,13 @@ The ``[theme_info]`` section can contain information about the theme. The ``name`` and ``description`` keys are read to set the -menu item text and tooltip, respectively. +menu item text and tooltip, respectively. These keys can have +translations, e.g.:: + key=Hello + key[de]=Hallo + key[fr_FR]=Bonjour + Tags ---- Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2011-05-02 16:46:34 UTC (rev 5756) +++ trunk/src/highlighting.c 2011-05-03 15:18:52 UTC (rev 5757) @@ -3627,6 +3627,15 @@ } +static gchar *utils_get_setting_locale_string(GKeyFile *keyfile, + const gchar *group, const gchar *key, const gchar *default_value) +{ + gchar *result = g_key_file_get_locale_string(keyfile, group, key, NULL, NULL); + + return NVL(result, g_strdup(default_value)); +} + + static void add_color_scheme_item(GtkWidget *menu, const gchar *fname) { static GSList *group = NULL; @@ -3647,11 +3656,11 @@ setptr(path, utils_build_path(app->datadir, GEANY_COLORSCHEMES_SUBDIR, fname, NULL)); skeyfile = utils_key_file_new(path); - theme_name = utils_get_setting(string, hkeyfile, skeyfile, "theme_info", "name", theme_fn); + theme_name = utils_get_setting(locale_string, hkeyfile, skeyfile, "theme_info", "name", theme_fn); item = gtk_radio_menu_item_new_with_label(group, theme_name); g_object_set_data_full(G_OBJECT(item), "colorscheme_file", theme_fn, g_free); - tooltip = utils_get_setting(string, hkeyfile, skeyfile, "theme_info", "description", NULL); + tooltip = utils_get_setting(locale_string, hkeyfile, skeyfile, "theme_info", "description", NULL); if (tooltip != NULL) { ui_widget_set_tooltip_text(item, tooltip); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5756] trunk
by colombanw＠users.sourceforge.net 02 May '11

02 May '11

Revision: 5756 http://geany.svn.sourceforge.net/geany/?rev=5756&view=rev Author: colombanw Date: 2011-05-02 16:46:34 +0000 (Mon, 02 May 2011) Log Message: ----------- Bump plugin API version Nothing in the API actually changed, but the project->file_patterns fields used not to be set or used at all; so bump the API to let a plugin depend on this field to be actually useful. Modified Paths: -------------- trunk/ChangeLog trunk/src/plugindata.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-05-01 14:38:57 UTC (rev 5755) +++ trunk/ChangeLog 2011-05-02 16:46:34 UTC (rev 5756) @@ -1,3 +1,10 @@ +2011-05-02 Colomban Wendling <colomban(at)geany(dot)org> + + * src/plugindata.h: + Bump plugin API version so a plugin can know the project file + patterns are visible by the user. + + 2011-05-01 Colomban Wendling <colomban(at)geany(dot)org> * src/search.c: Modified: trunk/src/plugindata.h =================================================================== --- trunk/src/plugindata.h 2011-05-01 14:38:57 UTC (rev 5755) +++ trunk/src/plugindata.h 2011-05-02 16:46:34 UTC (rev 5756) @@ -54,7 +54,7 @@ * @warning You should not test for values below 200 as previously * @c GEANY_API_VERSION was defined as an enum value, not a macro. */ -#define GEANY_API_VERSION 210 +#define GEANY_API_VERSION 211 /** The Application Binary Interface (ABI) version, incremented whenever * existing fields in the plugin data types have to be changed or reordered. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5755] trunk
by colombanw＠users.sourceforge.net 01 May '11

01 May '11

Revision: 5755 http://geany.svn.sourceforge.net/geany/?rev=5755&view=rev Author: colombanw Date: 2011-05-01 14:38:57 +0000 (Sun, 01 May 2011) Log Message: ----------- Fix pattern filtering when not searching in subdirectories grep's --include option doesn't filter files passed explicitly to grep, so when we build the file list to search in, take the filters into account. Also drop the --include options in this case since they aren't useful. Modified Paths: -------------- trunk/ChangeLog trunk/src/search.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-04-30 21:50:50 UTC (rev 5754) +++ trunk/ChangeLog 2011-05-01 14:38:57 UTC (rev 5755) @@ -1,3 +1,9 @@ +2011-05-01 Colomban Wendling <colomban(at)geany(dot)org> + + * src/search.c: + Fix pattern filtering when not searching in subdirectories. + + 2011-04-30 Colomban Wendling <colomban(at)geany(dot)org> * src/project.c: Modified: trunk/src/search.c =================================================================== --- trunk/src/search.c 2011-04-30 21:50:50 UTC (rev 5754) +++ trunk/src/search.c 2011-05-01 14:38:57 UTC (rev 5755) @@ -1642,14 +1642,27 @@ } +static gboolean pattern_list_match(GSList *patterns, const gchar *str) +{ + GSList *item; + + foreach_slist(item, patterns) + { + if (g_pattern_match_string(item->data, str)) + return TRUE; + } + return FALSE; +} + + /* Creates an argument vector of strings, copying argv_prefix[] values for * the first arguments, then followed by filenames found in dir. * Returns NULL if no files were found, otherwise returned vector should be fully freed. */ static gchar **search_get_argv(const gchar **argv_prefix, const gchar *dir) { - guint prefix_len, list_len, i; + guint prefix_len, list_len, i, j; gchar **argv; - GSList *list, *item; + GSList *list, *item, *patterns = NULL; GError *error = NULL; g_return_val_if_fail(dir != NULL, NULL); @@ -1667,13 +1680,40 @@ argv = g_new(gchar*, prefix_len + list_len + 1); - for (i = 0; i < prefix_len; i++) - argv[i] = g_strdup(argv_prefix[i]); + for (i = 0, j = 0; i < prefix_len; i++) + { + if (g_str_has_prefix(argv_prefix[i], "--include=")) + { + const gchar *pat = &(argv_prefix[i][10]); /* the pattern part of the argument */ - foreach_slist(item, list) - argv[i++] = item->data; + patterns = g_slist_prepend(patterns, g_pattern_spec_new(pat)); + } + else + argv[j++] = g_strdup(argv_prefix[i]); + } - argv[i] = NULL; + if (patterns) + { + GSList *pat; + + foreach_slist(item, list) + { + if (pattern_list_match(patterns, item->data)) + argv[j++] = item->data; + else + g_free(item->data); + } + foreach_slist(pat, patterns) + g_pattern_spec_free(pat->data); + g_slist_free(patterns); + } + else + { + foreach_slist(item, list) + argv[j++] = item->data; + } + + argv[j] = NULL; g_slist_free(list); return argv; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits May 2011