Plugins-Commits May 2015

plugins-commits@lists.geany.org

1 participants
35 discussions

[geany/geany-plugins] 7944b6: geanygendoc: Fix a few typos and issues in the documentation
by Colomban Wendling 05 May '15

05 May '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 04 May 2015 22:35:12 UTC Commit: 7944b697671246e29a1f0a83320c3d9b9f60057f https://github.com/geany/geany-plugins/commit/7944b697671246e29a1f0a83320c3… Log Message: ----------- geanygendoc: Fix a few typos and issues in the documentation Modified Paths: -------------- geanygendoc/docs/manual.rst Modified: geanygendoc/docs/manual.rst 28 lines changed, 14 insertions(+), 14 deletions(-) =================================================================== @@ -16,7 +16,7 @@ symbols. Its goal is to ease writing documentation for the good. If you are impatient, you will probably want to discover the `user interface in Geany`_ first; but if you have the time to discover the tool, take a look at the -`design`_ and learn how GeanyGenDoc works and how you can take the most of it. +`design`_ and learn how GeanyGenDoc works and how you can make the most of it. .. contents:: @@ -73,7 +73,7 @@ The `Documentation Generator` menu under `Tools` contains the following items: Preferences dialog ------------------ -The preferences dialog, than can either be opened through `Edit → +The preferences dialog, that can either be opened through `Edit → Plugin Preferences` or with the `Preferences` button in the plugin manager, allows to modify the following preferences: @@ -100,8 +100,8 @@ allows to modify the following preferences: be merged with the `file type`_-specific ones, possibly overriding some parts. It can be used to define some values for all the file types, such as whether to write the common `Since` tag, define the `Doxygen`_ prefix an so on. - Its most use case is not to need to change a file type's environment to change - the value of one of its elements. + Its most practical use case is not to need to change a file type's environment + to change the value of one of its elements. Design @@ -119,7 +119,7 @@ documentation type and rules. documentation types is to allow different set of rules to be defined for each file type. One might want to have separate rules to generate for example `Doxygen`_ - and `Gtk-Doc`_ documentation from C sources. She should then create two + and `Gtk-Doc`_ documentation from C sources, and should then create two documentation types in the C `file type configuration file`_, such as "doxygen" and "gtkdoc". @@ -220,11 +220,11 @@ boolean enumeration An enumeration. It consists of a named constant, generally in capital letters. - The possible values depend on the setting that use this type. + The possible values depend on the setting using this type. flags - A logical OR of named constants. This is like enumerations but can combine - different values. + A logical OR of named constants. This is similar to enumerations but can + combine different values. The syntax is common for such types and uses the pipe (``|``) as combination character. Considering the ``A``, ``B`` and ``C`` constants, a @@ -239,7 +239,7 @@ File types ========== The file type determines which configuration applies to which document. -*File type identifiers* are the lowercased name of the Geany's file type, for +*File type identifiers* are the lowercased name of Geany's file type, for example "c" or "python". Configuration for a particular file type goes in a file named @@ -259,8 +259,8 @@ This group contains the file-type-wide settings. A regular expression used to extract arguments from a function-style argument list (functions, methods, macros, etc.). This regular expression should match one argument at a time and capture only the argument's name. - This setting is a little odd but currently needed to extract argument list - from function definitions. + This setting is a little odd but currently required to extract argument list + from function declarations. ``global_environment`` (string) A description of a CTPL_ environment to add when parsing rule_'s templates. @@ -433,7 +433,7 @@ Rule settings ``PASS`` Completely ignore the symbol and handle the documentation request as if it hasn't existed at all. This can be useful to ignore e.g. variables if they - are extracted by the tag manager of the language and you don't want to + are extracted by the tag parser of the language and you don't want to document them, and don't want them to "eat" the documentation request. ``children`` (enumeration) @@ -474,8 +474,8 @@ following: ``$GEANY_SYS_CONFIG`` is generally ``/usr/share/geany/`` or ``/usr/local/share/geany`` on UNIX systems. -When searching for configuration, GeanyGenDoc will first look in the -user's configuration directory, and if it wasn't successful, in the system +When searching for a configuration, GeanyGenDoc will first look in the +user's configuration directory, and if it wasn't found there, in the system configuration directory. If both failed, it assumes that there is no configuration at all. -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 9a85dd: geanygendoc: Fix rule generating HTML documentation
by Colomban Wendling 05 May '15

05 May '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 04 May 2015 22:33:46 UTC Commit: 9a85dd8530c3f25469917d53477e816ea43c69d1 https://github.com/geany/geany-plugins/commit/9a85dd8530c3f25469917d53477e8… Log Message: ----------- geanygendoc: Fix rule generating HTML documentation Fix VPATH builds and improve portability around Make implementations Modified Paths: -------------- geanygendoc/docs/Makefile.am Modified: geanygendoc/docs/Makefile.am 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -14,5 +14,7 @@ dist_pluginhtmldoc_DATA = \ if BUILD_RST manual.html: manual.rst manual.css html4css1.css - $(AM_V_GEN) $(RST2HTML) -d --strict --stylesheet-path html4css1.css,manual.css $< $@ + $(AM_V_GEN) $(RST2HTML) -d --strict \ + --stylesheet-path $(srcdir)/html4css1.css,$(srcdir)/manual.css \ + $(srcdir)/manual.rst $@ endif BUILD_RST -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 667fa6: projectorganizer: optimize tree creation
by Jiří Techet 03 May '15

03 May '15

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 03 May 2015 21:02:30 UTC Commit: 667fa64af92957b8fc0ca641060add19dd27b19e https://github.com/geany/geany-plugins/commit/667fa64af92957b8fc0ca641060ad… Log Message: ----------- projectorganizer: optimize tree creation 1. Use gtk_tree_store_insert_with_values() which is faster than calling gtk_tree_store_append() and gtk_tree_store_set() 2. Avoid the use of gtk_tree_store_set() which walks all the siblings internally. 3. Prepend values to the tree store (because it behaves as a list). There are usually not thousands of files in a single directory to see the effect of this optimization but knowing the lists are walked all the time makes me nervous. Modified Paths: -------------- projectorganizer/src/prjorg-sidebar.c Modified: projectorganizer/src/prjorg-sidebar.c 139 lines changed, 68 insertions(+), 71 deletions(-) =================================================================== @@ -861,56 +861,6 @@ static void create_branch(gint level, GSList *leaf_list, GtkTreeIter *parent, file_list = g_slist_prepend(file_list, path_arr); } - if (dir_list) - { - GSList *tmp_list = NULL; - GtkTreeIter iter; - gchar **path_arr = dir_list->data; - gchar *last_dir_name; - GIcon *icon_dir = g_icon_new_for_string("folder", NULL); - - last_dir_name = path_arr[level]; - - foreach_slist (elem, dir_list) - { - gboolean dir_changed; - - path_arr = (gchar **) elem->data; - dir_changed = g_strcmp0(last_dir_name, path_arr[level]) != 0; - - if (dir_changed) - { - gtk_tree_store_append(s_file_store, &iter, parent); - gtk_tree_store_set(s_file_store, &iter, - FILEVIEW_COLUMN_ICON, icon_dir, - FILEVIEW_COLUMN_NAME, last_dir_name, -1); - if (!project) - gtk_tree_store_set(s_file_store, &iter, FILEVIEW_COLUMN_COLOR, &s_external_color, -1); - - create_branch(level+1, tmp_list, &iter, header_patterns, source_patterns, project); - - g_slist_free(tmp_list); - tmp_list = NULL; - last_dir_name = path_arr[level]; - } - - tmp_list = g_slist_prepend(tmp_list, path_arr); - } - - gtk_tree_store_append(s_file_store, &iter, parent); - gtk_tree_store_set(s_file_store, &iter, - FILEVIEW_COLUMN_ICON, icon_dir, - FILEVIEW_COLUMN_NAME, last_dir_name, -1); - if (!project) - gtk_tree_store_set(s_file_store, &iter, FILEVIEW_COLUMN_COLOR, &s_external_color, -1); - - create_branch(level+1, tmp_list, &iter, header_patterns, source_patterns, project); - - g_slist_free(tmp_list); - g_slist_free(dir_list); - g_object_unref(icon_dir); - } - foreach_slist (elem, file_list) { GtkTreeIter iter; @@ -937,45 +887,87 @@ static void create_branch(gint level, GSList *leaf_list, GtkTreeIter *parent, g_free(content_type); } - gtk_tree_store_append(s_file_store, &iter, parent); if (patterns_match(header_patterns, path_arr[level])) { if (! icon) icon = g_icon_new_for_string("prjorg-header", NULL); - gtk_tree_store_set(s_file_store, &iter, + gtk_tree_store_insert_with_values(s_file_store, &iter, parent, 0, FILEVIEW_COLUMN_ICON, icon, - FILEVIEW_COLUMN_NAME, path_arr[level], -1); - if (!project) - gtk_tree_store_set(s_file_store, &iter, FILEVIEW_COLUMN_COLOR, &s_external_color, -1); + FILEVIEW_COLUMN_NAME, path_arr[level], + FILEVIEW_COLUMN_COLOR, project ? NULL : &s_external_color, -1); } else if (patterns_match(source_patterns, path_arr[level])) { if (! icon) icon = g_icon_new_for_string("prjorg-source", NULL); - gtk_tree_store_set(s_file_store, &iter, + gtk_tree_store_insert_with_values(s_file_store, &iter, parent, 0, FILEVIEW_COLUMN_ICON, icon, - FILEVIEW_COLUMN_NAME, path_arr[level], -1); - if (!project) - gtk_tree_store_set(s_file_store, &iter, FILEVIEW_COLUMN_COLOR, &s_external_color, -1); + FILEVIEW_COLUMN_NAME, path_arr[level], + FILEVIEW_COLUMN_COLOR, project ? NULL : &s_external_color, -1); } else { if (! icon) icon = g_icon_new_for_string("prjorg-file", NULL); - gtk_tree_store_set(s_file_store, &iter, + gtk_tree_store_insert_with_values(s_file_store, &iter, parent, 0, FILEVIEW_COLUMN_ICON, icon, - FILEVIEW_COLUMN_NAME, path_arr[level], -1); - if (!project) - gtk_tree_store_set(s_file_store, &iter, FILEVIEW_COLUMN_COLOR, &s_external_color, -1); + FILEVIEW_COLUMN_NAME, path_arr[level], + FILEVIEW_COLUMN_COLOR, project ? NULL : &s_external_color, -1); } if (icon) g_object_unref(icon); } + if (dir_list) + { + GSList *tmp_list = NULL; + GtkTreeIter iter; + gchar **path_arr = dir_list->data; + gchar *last_dir_name; + GIcon *icon_dir = g_icon_new_for_string("folder", NULL); + + last_dir_name = path_arr[level]; + + foreach_slist (elem, dir_list) + { + gboolean dir_changed; + + path_arr = (gchar **) elem->data; + dir_changed = g_strcmp0(last_dir_name, path_arr[level]) != 0; + + if (dir_changed) + { + gtk_tree_store_insert_with_values(s_file_store, &iter, parent, 0, + FILEVIEW_COLUMN_ICON, icon_dir, + FILEVIEW_COLUMN_NAME, last_dir_name, + FILEVIEW_COLUMN_COLOR, project ? NULL : &s_external_color, -1); + + create_branch(level+1, tmp_list, &iter, header_patterns, source_patterns, project); + + g_slist_free(tmp_list); + tmp_list = NULL; + last_dir_name = path_arr[level]; + } + + tmp_list = g_slist_prepend(tmp_list, path_arr); + } + + gtk_tree_store_insert_with_values(s_file_store, &iter, parent, 0, + FILEVIEW_COLUMN_ICON, icon_dir, + FILEVIEW_COLUMN_NAME, last_dir_name, + FILEVIEW_COLUMN_COLOR, project ? NULL : &s_external_color, -1); + + create_branch(level+1, tmp_list, &iter, header_patterns, source_patterns, project); + + g_slist_free(tmp_list); + g_slist_free(dir_list); + g_object_unref(icon_dir); + } + g_slist_free(file_list); } @@ -984,8 +976,7 @@ static void set_intro_message(const gchar *msg) { GtkTreeIter iter; - gtk_tree_store_append(s_file_store, &iter, NULL); - gtk_tree_store_set(s_file_store, &iter, + gtk_tree_store_insert_with_values(s_file_store, &iter, NULL, -1, FILEVIEW_COLUMN_NAME, msg, -1); gtk_widget_set_sensitive(s_project_toolbar.expand, FALSE); @@ -995,6 +986,12 @@ static void set_intro_message(const gchar *msg) } +static int rev_strcmp(const char *str1, const char *str2) +{ + return strcmp(str2, str1); +} + + static void load_project_root(PrjOrgRoot *root, GtkTreeIter *parent, GSList *header_patterns, GSList *source_patterns, gboolean project) { GSList *lst = NULL; @@ -1009,7 +1006,9 @@ static void load_project_root(PrjOrgRoot *root, GtkTreeIter *parent, GSList *hea gchar *path = get_relative_path(root->base_dir, key); lst = g_slist_prepend(lst, path); } - lst = g_slist_sort(lst, (GCompareFunc) strcmp); + /* sort in reverse order so we can prepend nodes to the tree store - + * the store behaves as a linked list and prepending is faster */ + lst = g_slist_sort(lst, (GCompareFunc) rev_strcmp); foreach_slist (elem, lst) { @@ -1072,12 +1071,10 @@ static void load_project(void) else name = g_strdup(root->base_dir); - gtk_tree_store_append(s_file_store, &iter, NULL); - gtk_tree_store_set(s_file_store, &iter, + gtk_tree_store_insert_with_values(s_file_store, &iter, NULL, -1, FILEVIEW_COLUMN_ICON, icon_dir, - FILEVIEW_COLUMN_NAME, name, -1); - if (!first) - gtk_tree_store_set(s_file_store, &iter, FILEVIEW_COLUMN_COLOR, &s_external_color, -1); + FILEVIEW_COLUMN_NAME, name, + FILEVIEW_COLUMN_COLOR, first ? NULL : &s_external_color, -1); load_project_root(root, &iter, header_patterns, source_patterns, first); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 48356d: projectorganizer: Don't parse files bigger than 10MB
by Jiří Techet 02 May '15

02 May '15

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sat, 02 May 2015 09:49:51 UTC Commit: 48356d0c6f97027cfae0e234f6a55a75b47ea8a3 https://github.com/geany/geany-plugins/commit/48356d0c6f97027cfae0e234f6a55… Log Message: ----------- projectorganizer: Don't parse files bigger than 10MB This is where parsing starts getting too expensive. TODO: the use of utf8 filename is obviously wrong here but at the moment utf8/localeness is broken in the whole plugin anyway. Fix later ;-) Modified Paths: -------------- projectorganizer/src/prjorg-project.c Modified: projectorganizer/src/prjorg-project.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -221,9 +221,13 @@ static gboolean match_basename(gconstpointer pft, gconstpointer user_data) static GeanyFiletype *filetypes_detect(const gchar *utf8_filename) { guint i; + struct stat s; gchar *base_filename; GeanyFiletype *ft = NULL; + if (g_stat(utf8_filename, &s) != 0 || s.st_size > 10*1024*1024) + return filetypes[GEANY_FILETYPES_NONE]; + /* to match against the basename of the file (because of Makefile*) */ base_filename = g_path_get_basename(utf8_filename); #ifdef G_OS_WIN32 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 1a9107: projectorganizer: Reduce the number of project files that are automatically parsed
by Jiří Techet 02 May '15

02 May '15

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sat, 02 May 2015 09:43:05 UTC Commit: 1a9107aeb1368f77b32aab1d065b550a5238134e https://github.com/geany/geany-plugins/commit/1a9107aeb1368f77b32aab1d065b5… Log Message: ----------- projectorganizer: Reduce the number of project files that are automatically parsed Just to be sure the plugin doesn't slow-down things too much on non-SSD drives. Modified Paths: -------------- projectorganizer/src/prjorg-project.c Modified: projectorganizer/src/prjorg-project.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -293,7 +293,7 @@ void prjorg_project_rescan(void) foreach_slist(elem, prj_org->roots) filenum += prjorg_project_rescan_root(elem->data); - if (prj_org->generate_tag_prefs == PrjOrgTagYes || (prj_org->generate_tag_prefs == PrjOrgTagAuto && filenum < 500)) + if (prj_org->generate_tag_prefs == PrjOrgTagYes || (prj_org->generate_tag_prefs == PrjOrgTagAuto && filenum < 300)) g_slist_foreach(prj_org->roots, (GFunc)regenerate_tags, NULL); } @@ -595,7 +595,7 @@ gint prjorg_project_add_properties_tab(GtkWidget *notebook) label = gtk_label_new(_("Generate tags for all project files:")); gtk_misc_set_alignment(GTK_MISC(label), 0, 0); e->generate_tag_prefs = gtk_combo_box_text_new(); - gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(e->generate_tag_prefs), _("Auto (generate if less than 500 files)")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(e->generate_tag_prefs), _("Auto (generate if less than 300 files)")); gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(e->generate_tag_prefs), _("Yes")); gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(e->generate_tag_prefs), _("No")); gtk_combo_box_set_active(GTK_COMBO_BOX(e->generate_tag_prefs), prj_org->generate_tag_prefs); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits May 2015