Plugins-Commits May 2019

plugins-commits@lists.geany.org

1 participants
44 discussions

[geany/plugins.geany.org] 43eba2: Clean up landing page and add Installation heading
by Dan Dascalescu 31 May '19

31 May '19

Branch: refs/heads/master Author: Dan Dascalescu <ddascalescu+github(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Fri, 31 May 2019 03:27:38 UTC Commit: 43eba2426bc5b539c03c141cdd11b974dec95548 https://github.com/geany/plugins.geany.org/commit/43eba2426bc5b539c03c141cd… Log Message: ----------- Clean up landing page and add Installation heading Modified Paths: -------------- content/start.html Modified: content/start.html 50 lines changed, 21 insertions(+), 29 deletions(-) =================================================================== @@ -1,53 +1,45 @@ <h2>Welcome</h2> -<p> What you will find here is a lot of plugin stuff for <a href= -"http://www.geany.org">Geany</a>. There is a Geany Plugins project</a> -containing a lot of plugins, which is developed by various developers on <a -href="https://github.com/geany/geany-plugins">GitHub</a>. </p> +<p>This site is the home page for <a href= "http://www.geany.org">Geany</a> +plugins. It includes official Geany Plugins, as well as 3rd party ones.</p> -<p> Any plugin delivered with the Geany Plugins project is listed on the -left sidebar (Or rather any plugin providing a valid README file written in -reStructuredText. There are some plugins in an early development state, not -having such a README file yet.) </p> +<p>Some plugins may lack details. Feel free to bug us +<a href="https://www.geany.org/Support/IRC">on IRC</a> about them.</p> -<p> There also are some third party plugins for Geany. They are already -listed on the left navigation bar, but maybe content is missing, yet. Feel -free to kick our butts on IRC to complete also this pages and fill them with -information. </p> +<h3>Installation</h3> +See the <a href="install.html">Installation</a> page. -<p>If you are searching for <em>any</em> plugin for Geany or information about -a plugin, this website is (or will be) the right place to get those -information.</p> +<h3>Developer details</h3> +<p>The code for the plugins from the Geany Plugins project is hosted +<a href="https://github.com/geany/geany-plugins">on GitHub</a>.</p> -<p> The pages for any plugin delivered with the Geany Plugins project are -automatically generated by a shell script using <a href= -"http://docutils.sourceforge.net/">rst2html from doctools</a> and <a href= -"http://www.html-tidy.org/">HTML Tidy</a>. Basis for that are the README -files for each plugin, checked out and updated from <a href= -"https://github.com/geany/geany-plugins">GitHub</a>, so if you think there's -something wrong, you can feel free to report -issues against the according plugin (or even this website) at <a href="https://github.com/geany/geany-plugins/issues">GitHub</a>.<br /> +<p>The details page for any plugin in the Geany Plugins project is +automatically generated by a shell script from the README file of the plugin, +using <a href="http://docutils.sourceforge.net/">rst2html from doctools</a> +and <a href="http://www.html-tidy.org/">HTML Tidy</a>. If you think there's +something wrong, feel free to report issues against the corresponding plugin +at <a href="https://github.com/geany/geany-plugins/issues">GitHub</a>. -The <a href= "https://github.com/geany/plugins.geany.org" >source code of +<p>The <a href="https://github.com/geany/plugins.geany.org">source code of this script</a> (including the whole source for the plugins.geany.org -website itself) is available on <a href= -"https://github.com/geany/plugins.geany.org">GitHub</a> as well. </p> +website itself) is available <a href="https://github.com/geany/plugins.geany.org"> +on GitHub</a> as well.</p> <p> If you are a plugin developer and wonder why your plugin is not listed here, there may be several reasons for that: </p> <ul> <li>you didn't know of this site yet</li> - <li>the maintainers of this site didn't know of your plugin yet</li> + <li>the maintainers of this site don't know about your plugin yet</li> <li>your plugin is part of the Geany Plugins project, but</li> <li><ul> <li>you don't have a README file written in reStructuredText</li> <li>or your README file is empty</li> - <li>or a README file doesn't even exist</li> + <li>or a README file doesn't exist at all</li> </ul></li> </ul> <p> For any of these reasons, you will find more detailed hints on the -<a href="index.php?site=README">List or update a plugin page</a>. +<a href="README.html">List or update a plugin page</a>. </p> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 68cb7d: Merge pull request #870 from LarsGit223/wb-styling
by Frank Lanitz 23 May '19

23 May '19

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Thu, 23 May 2019 15:24:22 UTC Commit: 68cb7d2c0f75aef0e98b3877088473a8618c46a0 https://github.com/geany/geany-plugins/commit/68cb7d2c0f75aef0e98b387708847… Log Message: ----------- Merge pull request #870 from LarsGit223/wb-styling workbench: give sidebar a name to enable dedicated CSS styling Modified Paths: -------------- workbench/README workbench/src/sidebar.c Modified: workbench/README 41 lines changed, 41 insertions(+), 0 deletions(-) =================================================================== @@ -166,6 +166,47 @@ will output a message in the message window. The message has the following form: Could not setup file monitoring for directory: "exampledir". Error: <some error message> +Styling the sidebar +------------------- + +On linux based systems using GTK3 the workbench sidebar can be styled using CSS. +For general information on how to setup CSS with Geany please see the manual under +https://www.geany.org/manual/current/index.html#customizing-geany-s-appearance-using-gtk-3-css. + +To style the workbench sidebar use the CSS ID *"workbench"*. Here is a small +example:: + + /* Style the label over the treeview. */ + #workbench label { + color: black; + background-color: silver; + border-bottom: 2px solid red; + font-size: 20pt; + } + + /* Style the treeview: the border-color specifies the color of the + treeview lines (if enabled in the workbench settings). */ + #workbench treeview { + color: black; + background-color: linen; + border-color: darkviolet; + font-size: 12pt; + } + + /* The following changes the text and background color for the selected + row in the workbench treeview. */ + #workbench treeview:selected { + color: white; + background-color: red; + } + + /* The following changes the text and background color for a row in the + workbench treeview if the user hovers over it with the mouse pointer. */ + #workbench treeview:hover { + color: white; + background-color: orange; + } + Known issues ============ Modified: workbench/src/sidebar.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1374,6 +1374,7 @@ void sidebar_init(void) GList *focus_chain = NULL; sidebar.file_view_vbox = gtk_vbox_new(FALSE, 0); + gtk_widget_set_name(sidebar.file_view_vbox, "workbench"); /**** label ****/ sidebar.file_view_label = gtk_label_new (_("No workbench opened.")); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] bd2fd0: workbench: give sidebar a name to enable dedicated CSS styling
by LarsGit223 22 May '19

22 May '19

Branch: refs/heads/master Author: LarsGit223 <lars_paulsen(a)web.de> Committer: LarsGit223 <lars_paulsen(a)web.de> Date: Wed, 22 May 2019 18:40:35 UTC Commit: bd2fd080acf681acae85d43a0f7711cffb9f6a2f https://github.com/geany/geany-plugins/commit/bd2fd080acf681acae85d43a0f771… Log Message: ----------- workbench: give sidebar a name to enable dedicated CSS styling Give the sidebar a name/CSS ID to enable dedicated styling. Also added a section with an example to the README. Modified Paths: -------------- workbench/README workbench/src/sidebar.c Modified: workbench/README 41 lines changed, 41 insertions(+), 0 deletions(-) =================================================================== @@ -166,6 +166,47 @@ will output a message in the message window. The message has the following form: Could not setup file monitoring for directory: "exampledir". Error: <some error message> +Styling the sidebar +------------------- + +On linux based systems using GTK3 the workbench sidebar can be styled using CSS. +For general information on how to setup CSS with Geany please see the manual under +https://www.geany.org/manual/current/index.html#customizing-geany-s-appearance-using-gtk-3-css. + +To style the workbench sidebar use the CSS ID *"workbench"*. Here is a small +example:: + + /* Style the label over the treeview. */ + #workbench label { + color: black; + background-color: silver; + border-bottom: 2px solid red; + font-size: 20pt; + } + + /* Style the treeview: the border-color specifies the color of the + treeview lines (if enabled in the workbench settings). */ + #workbench treeview { + color: black; + background-color: linen; + border-color: darkviolet; + font-size: 12pt; + } + + /* The following changes the text and background color for the selected + row in the workbench treeview. */ + #workbench treeview:selected { + color: white; + background-color: red; + } + + /* The following changes the text and background color for a row in the + workbench treeview if the user hovers over it with the mouse pointer. */ + #workbench treeview:hover { + color: white; + background-color: orange; + } + Known issues ============ Modified: workbench/src/sidebar.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1374,6 +1374,7 @@ void sidebar_init(void) GList *focus_chain = NULL; sidebar.file_view_vbox = gtk_vbox_new(FALSE, 0); + gtk_widget_set_name(sidebar.file_view_vbox, "workbench"); /**** label ****/ sidebar.file_view_label = gtk_label_new (_("No workbench opened.")); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 954e6d: workbench: added option to enable or disable tree lines
by LarsGit223 21 May '19

21 May '19

Branch: refs/heads/master Author: LarsGit223 <lars_paulsen(a)web.de> Committer: LarsGit223 <lars_paulsen(a)web.de> Date: Tue, 21 May 2019 18:40:16 UTC Commit: 954e6d19d57cf020402063b0088bbfda64613154 https://github.com/geany/geany-plugins/commit/954e6d19d57cf020402063b0088bb… Log Message: ----------- workbench: added option to enable or disable tree lines Modified Paths: -------------- workbench/README workbench/src/dialogs.c workbench/src/plugin_main.c workbench/src/sidebar.c workbench/src/workbench.c workbench/src/workbench.h Modified: workbench/README 8 lines changed, 8 insertions(+), 0 deletions(-) =================================================================== @@ -155,6 +155,14 @@ The following settings exist for a workbench: which has been created with an older version of the workbench plugin then the option will be added with value "activated". +**Expand on hover** + If the option is activated, then a tree node in the sidebar + will be expanded or collapsed by hovering over it with the mouse cursor. + +**Enable tree lines** + If the option is activated, lines will be drawn between the nodes in + the sidebar tree. + Live update ----------- From version 1.03 on the workbench plugin supports an automatic live update Modified: workbench/src/dialogs.c 25 lines changed, 24 insertions(+), 1 deletions(-) =================================================================== @@ -465,7 +465,7 @@ gboolean dialogs_workbench_settings(WORKBENCH *workbench) { gint result; GtkWidget *w_rescan_projects_on_open, *w_enable_live_update, *w_expand_on_hover; - GtkWidget *dialog, *content_area; + GtkWidget *dialog, *content_area, *w_enable_tree_lines; GtkWidget *vbox, *hbox; #if GTK_CHECK_VERSION(3, 4, 0) GtkWidget *grid; @@ -476,6 +476,7 @@ gboolean dialogs_workbench_settings(WORKBENCH *workbench) gboolean changed, rescan_projects_on_open, rescan_projects_on_open_old; gboolean enable_live_update, enable_live_update_old; gboolean expand_on_hover, expand_on_hover_old; + gboolean enable_tree_lines, enable_tree_lines_old; /* Create the widgets */ flags = GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT; @@ -548,6 +549,22 @@ gboolean dialogs_workbench_settings(WORKBENCH *workbench) expand_on_hover_old = workbench_get_expand_on_hover(workbench); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w_expand_on_hover), expand_on_hover_old); + w_enable_tree_lines = gtk_check_button_new_with_mnemonic(_("_Enable tree lines")); +#if GTK_CHECK_VERSION(3, 4, 0) + gtk_grid_attach (GTK_GRID(grid), w_enable_tree_lines, 0, 3, 1, 1); + gtk_widget_set_halign (w_enable_tree_lines, GTK_ALIGN_CENTER); + gtk_widget_set_hexpand (w_enable_tree_lines, TRUE); + gtk_widget_set_valign (w_enable_tree_lines, GTK_ALIGN_CENTER); + gtk_widget_set_vexpand (w_enable_tree_lines, TRUE); +#else + ui_table_add_row(GTK_TABLE(table), 3, w_enable_tree_lines, NULL); +#endif + gtk_widget_set_tooltip_text(w_enable_tree_lines, + _("If the option is activated, lines will be drawn between " + "the nodes in the sidebar tree.")); + enable_tree_lines_old = workbench_get_enable_tree_lines(workbench); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w_enable_tree_lines), enable_tree_lines_old); + #if GTK_CHECK_VERSION(3, 4, 0) gtk_box_pack_start(GTK_BOX(vbox), grid, FALSE, FALSE, 6); #else @@ -583,6 +600,12 @@ gboolean dialogs_workbench_settings(WORKBENCH *workbench) changed = TRUE; workbench_set_expand_on_hover(workbench, expand_on_hover); } + enable_tree_lines = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w_enable_tree_lines)); + if (enable_tree_lines != enable_tree_lines_old) + { + changed = TRUE; + workbench_set_enable_tree_lines(workbench, enable_tree_lines); + } } gtk_widget_destroy(dialog); Modified: workbench/src/plugin_main.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -130,7 +130,7 @@ void geany_load_module(GeanyPlugin *plugin) /* Set metadata */ plugin->info->name = _("Workbench"); plugin->info->description = _("Manage and customize multiple projects."); - plugin->info->version = "1.06"; + plugin->info->version = "1.07"; plugin->info->author = "LarsGit223"; /* Set functions */ Modified: workbench/src/sidebar.c 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -867,6 +867,9 @@ static void sidebar_update_workbench(GtkTreeIter *iter, gint *position) gtk_tree_view_set_hover_expand(GTK_TREE_VIEW(sidebar.file_view), workbench_get_expand_on_hover(wb_globals.opened_wb)); + gtk_tree_view_set_enable_tree_lines(GTK_TREE_VIEW(sidebar.file_view), + workbench_get_enable_tree_lines(wb_globals.opened_wb)); + count = workbench_get_project_count(wb_globals.opened_wb); length = g_snprintf(text, sizeof(text), g_dngettext(GETTEXT_PACKAGE, "%s: %u Project", "%s: %u Projects", count), Modified: workbench/src/workbench.c 48 lines changed, 48 insertions(+), 0 deletions(-) =================================================================== @@ -49,6 +49,7 @@ struct S_WORKBENCH gboolean rescan_projects_on_open; gboolean enable_live_update; gboolean expand_on_hover; + gboolean enable_tree_lines; GPtrArray *projects; GPtrArray *bookmarks; WB_MONITOR *monitor; @@ -289,6 +290,42 @@ gboolean workbench_get_expand_on_hover(WORKBENCH *wb) } +/** Set the "Enable Tree Lines" option. + * + * @param wb The workbench + * @param value The value to set + * + **/ +void workbench_set_enable_tree_lines(WORKBENCH *wb, gboolean value) +{ + if (wb != NULL) + { + if (wb->enable_tree_lines != value) + { + wb->enable_tree_lines = value; + wb->modified = TRUE; + } + } +} + + +/** Get the "Enable Tree Lines" option. + * + * @param wb The workbench + * @return TRUE = show tree lines, + * FALSE = don't + * + **/ +gboolean workbench_get_enable_tree_lines(WORKBENCH *wb) +{ + if (wb != NULL) + { + return wb->enable_tree_lines; + } + return FALSE; +} + + /** Set the filename. * * @param wb The workbench @@ -691,6 +728,7 @@ gboolean workbench_save(WORKBENCH *wb, GError **error) g_key_file_set_boolean(kf, "General", "RescanProjectsOnOpen", wb->rescan_projects_on_open); g_key_file_set_boolean(kf, "General", "EnableLiveUpdate", wb->enable_live_update); g_key_file_set_boolean(kf, "General", "ExpandOnHover", wb->expand_on_hover); + g_key_file_set_boolean(kf, "General", "EnableTreeLines", wb->enable_tree_lines); /* Save Workbench bookmarks as string list */ boomarks_size = workbench_get_bookmarks_count(wb); @@ -834,6 +872,16 @@ gboolean workbench_load(WORKBENCH *wb, const gchar *filename, GError **error) Initialize with FALSE. */ wb->expand_on_hover = FALSE; } + if (g_key_file_has_key (kf, "General", "EnableTreeLines", error)) + { + wb->enable_tree_lines = g_key_file_get_boolean(kf, "General", "EnableTreeLines", error); + } + else + { + /* Not found. Might happen if the workbench was created with an older version of the plugin. + Initialize with FALSE. */ + wb->enable_tree_lines = FALSE; + } /* Load Workbench bookmarks from string list */ bookmarks_strings = g_key_file_get_string_list (kf, "General", "Bookmarks", NULL, error); Modified: workbench/src/workbench.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -45,6 +45,8 @@ void workbench_set_enable_live_update(WORKBENCH *wb, gboolean value); gboolean workbench_get_enable_live_update(WORKBENCH *wb); void workbench_set_expand_on_hover(WORKBENCH *wb, gboolean value); gboolean workbench_get_expand_on_hover(WORKBENCH *wb); +void workbench_set_enable_tree_lines(WORKBENCH *wb, gboolean value); +gboolean workbench_get_enable_tree_lines(WORKBENCH *wb); WB_PROJECT *workbench_get_project_at_index(WORKBENCH *wb, guint index); PROJECT_ENTRY_STATUS workbench_get_project_status_at_index(WORKBENCH *wb, guint index); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] ce1f67: Merge pull request #868 from LarsGit223/wb-settings-autosave
by Frank Lanitz 21 May '19

21 May '19

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Tue, 21 May 2019 06:21:31 UTC Commit: ce1f67766f058a2d6a4a8b988c7cf2adeb77e0b5 https://github.com/geany/geany-plugins/commit/ce1f67766f058a2d6a4a8b988c7cf… Log Message: ----------- Merge pull request #868 from LarsGit223/wb-settings-autosave workbench: save settings immediately Modified Paths: -------------- workbench/README workbench/src/menu.c workbench/src/plugin_main.c Modified: workbench/README 8 lines changed, 3 insertions(+), 5 deletions(-) =================================================================== @@ -35,12 +35,10 @@ menu: As explained above, creates a new Workbench. **Item "Open"** Open a Workbench. -**Item "Save"** - Save the opened Workbench. This "only" saves any changes - in the Workbench file. It does not save any changes of the projects - belonging to the Workbench. **Item "Settings"** - Open the Workbench settings dialog. + Open the Workbench settings dialog. After the settings have been + confirmed with "OK" they will be written back to the workbench file + (if any value was changed). **Item "Close"** Closes the opened Workbench. Modified: workbench/src/menu.c 35 lines changed, 9 insertions(+), 26 deletions(-) =================================================================== @@ -36,7 +36,6 @@ typedef struct GtkWidget *root_item; GtkWidget *item_new; GtkWidget *item_open; - GtkWidget *item_save; GtkWidget *item_settings; GtkWidget *item_close; }WB_MENU_DATA; @@ -58,14 +57,12 @@ void menu_set_context(MENU_CONTEXT context) case MENU_CONTEXT_WB_OPENED: gtk_widget_set_sensitive(menu_data.item_new, FALSE); gtk_widget_set_sensitive(menu_data.item_open, FALSE); - gtk_widget_set_sensitive(menu_data.item_save, TRUE); gtk_widget_set_sensitive(menu_data.item_settings, TRUE); gtk_widget_set_sensitive(menu_data.item_close, TRUE); break; case MENU_CONTEXT_WB_CLOSED: gtk_widget_set_sensitive(menu_data.item_new, TRUE); gtk_widget_set_sensitive(menu_data.item_open, TRUE); - gtk_widget_set_sensitive(menu_data.item_save, FALSE); gtk_widget_set_sensitive(menu_data.item_settings, FALSE); gtk_widget_set_sensitive(menu_data.item_close, FALSE); break; @@ -127,22 +124,6 @@ static void item_open_workbench_activate_cb(G_GNUC_UNUSED GtkMenuItem *menuitem, } -/* The function handles the menu item "Save workbench" */ -static void item_save_workbench_activate_cb(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_UNUSED gpointer user_data) -{ - GError *error = NULL; - - if (wb_globals.opened_wb != NULL) - { - if (!workbench_save(wb_globals.opened_wb, &error)) - { - dialogs_show_msgbox(GTK_MESSAGE_INFO, _("Could not save workbench file: %s"), error->message); - } - sidebar_update(SIDEBAR_CONTEXT_WB_SAVED, NULL); - } -} - - /* The function handles the menu item "Settings" */ static void item_workbench_settings_activate_cb(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_UNUSED gpointer user_data) { @@ -153,8 +134,17 @@ static void item_workbench_settings_activate_cb(G_GNUC_UNUSED GtkMenuItem *menui enable_live_update_old = workbench_get_enable_live_update(wb_globals.opened_wb); if (dialogs_workbench_settings(wb_globals.opened_wb)) { + GError *error = NULL; + sidebar_update(SIDEBAR_CONTEXT_WB_SETTINGS_CHANGED, NULL); + /* Save the new settings to the workbench file (.geanywb). */ + if (!workbench_save(wb_globals.opened_wb, &error)) + { + dialogs_show_msgbox(GTK_MESSAGE_INFO, _("Could not save workbench file: %s"), error->message); + } + sidebar_update(SIDEBAR_CONTEXT_WB_SAVED, NULL); + enable_live_update = workbench_get_enable_live_update(wb_globals.opened_wb); if (enable_live_update != enable_live_update_old) { @@ -209,13 +199,6 @@ gboolean menu_init(void) g_signal_connect(menu_data.item_open, "activate", G_CALLBACK(item_open_workbench_activate_cb), NULL); - /* Create new menu item "Save Workbench" */ - menu_data.item_save = gtk_menu_item_new_with_mnemonic(_("_Save")); - gtk_widget_show(menu_data.item_save); - gtk_menu_shell_append(GTK_MENU_SHELL (menu_data.menu), menu_data.item_save); - g_signal_connect(menu_data.item_save, "activate", - G_CALLBACK(item_save_workbench_activate_cb), NULL); - /* Create new menu item "Workbench Settings" */ menu_data.item_settings = gtk_menu_item_new_with_mnemonic(_("S_ettings")); gtk_widget_show(menu_data.item_settings); Modified: workbench/src/plugin_main.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -130,7 +130,7 @@ void geany_load_module(GeanyPlugin *plugin) /* Set metadata */ plugin->info->name = _("Workbench"); plugin->info->description = _("Manage and customize multiple projects."); - plugin->info->version = "1.05"; + plugin->info->version = "1.06"; plugin->info->author = "LarsGit223"; /* Set functions */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 9e480a: workbench: save settings immediately
by LarsGit223 20 May '19

20 May '19

Branch: refs/heads/master Author: LarsGit223 <lars_paulsen(a)web.de> Committer: LarsGit223 <lars_paulsen(a)web.de> Date: Mon, 20 May 2019 17:20:12 UTC Commit: 9e480a3b88f95a61fbef1e951efc426ccd4a9bb2 https://github.com/geany/geany-plugins/commit/9e480a3b88f95a61fbef1e951efc4… Log Message: ----------- workbench: save settings immediately After confirming changed settings with "OK" they will now immediately be written back to the workbench file. Therefore the menu item "Workbench / Save" became useless and has been removed. Closes #841. Modified Paths: -------------- workbench/README workbench/src/menu.c workbench/src/plugin_main.c Modified: workbench/README 8 lines changed, 3 insertions(+), 5 deletions(-) =================================================================== @@ -35,12 +35,10 @@ menu: As explained above, creates a new Workbench. **Item "Open"** Open a Workbench. -**Item "Save"** - Save the opened Workbench. This "only" saves any changes - in the Workbench file. It does not save any changes of the projects - belonging to the Workbench. **Item "Settings"** - Open the Workbench settings dialog. + Open the Workbench settings dialog. After the settings have been + confirmed with "OK" they will be written back to the workbench file + (if any value was changed). **Item "Close"** Closes the opened Workbench. Modified: workbench/src/menu.c 35 lines changed, 9 insertions(+), 26 deletions(-) =================================================================== @@ -36,7 +36,6 @@ typedef struct GtkWidget *root_item; GtkWidget *item_new; GtkWidget *item_open; - GtkWidget *item_save; GtkWidget *item_settings; GtkWidget *item_close; }WB_MENU_DATA; @@ -58,14 +57,12 @@ void menu_set_context(MENU_CONTEXT context) case MENU_CONTEXT_WB_OPENED: gtk_widget_set_sensitive(menu_data.item_new, FALSE); gtk_widget_set_sensitive(menu_data.item_open, FALSE); - gtk_widget_set_sensitive(menu_data.item_save, TRUE); gtk_widget_set_sensitive(menu_data.item_settings, TRUE); gtk_widget_set_sensitive(menu_data.item_close, TRUE); break; case MENU_CONTEXT_WB_CLOSED: gtk_widget_set_sensitive(menu_data.item_new, TRUE); gtk_widget_set_sensitive(menu_data.item_open, TRUE); - gtk_widget_set_sensitive(menu_data.item_save, FALSE); gtk_widget_set_sensitive(menu_data.item_settings, FALSE); gtk_widget_set_sensitive(menu_data.item_close, FALSE); break; @@ -127,22 +124,6 @@ static void item_open_workbench_activate_cb(G_GNUC_UNUSED GtkMenuItem *menuitem, } -/* The function handles the menu item "Save workbench" */ -static void item_save_workbench_activate_cb(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_UNUSED gpointer user_data) -{ - GError *error = NULL; - - if (wb_globals.opened_wb != NULL) - { - if (!workbench_save(wb_globals.opened_wb, &error)) - { - dialogs_show_msgbox(GTK_MESSAGE_INFO, _("Could not save workbench file: %s"), error->message); - } - sidebar_update(SIDEBAR_CONTEXT_WB_SAVED, NULL); - } -} - - /* The function handles the menu item "Settings" */ static void item_workbench_settings_activate_cb(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_UNUSED gpointer user_data) { @@ -153,8 +134,17 @@ static void item_workbench_settings_activate_cb(G_GNUC_UNUSED GtkMenuItem *menui enable_live_update_old = workbench_get_enable_live_update(wb_globals.opened_wb); if (dialogs_workbench_settings(wb_globals.opened_wb)) { + GError *error = NULL; + sidebar_update(SIDEBAR_CONTEXT_WB_SETTINGS_CHANGED, NULL); + /* Save the new settings to the workbench file (.geanywb). */ + if (!workbench_save(wb_globals.opened_wb, &error)) + { + dialogs_show_msgbox(GTK_MESSAGE_INFO, _("Could not save workbench file: %s"), error->message); + } + sidebar_update(SIDEBAR_CONTEXT_WB_SAVED, NULL); + enable_live_update = workbench_get_enable_live_update(wb_globals.opened_wb); if (enable_live_update != enable_live_update_old) { @@ -209,13 +199,6 @@ gboolean menu_init(void) g_signal_connect(menu_data.item_open, "activate", G_CALLBACK(item_open_workbench_activate_cb), NULL); - /* Create new menu item "Save Workbench" */ - menu_data.item_save = gtk_menu_item_new_with_mnemonic(_("_Save")); - gtk_widget_show(menu_data.item_save); - gtk_menu_shell_append(GTK_MENU_SHELL (menu_data.menu), menu_data.item_save); - g_signal_connect(menu_data.item_save, "activate", - G_CALLBACK(item_save_workbench_activate_cb), NULL); - /* Create new menu item "Workbench Settings" */ menu_data.item_settings = gtk_menu_item_new_with_mnemonic(_("S_ettings")); gtk_widget_show(menu_data.item_settings); Modified: workbench/src/plugin_main.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -130,7 +130,7 @@ void geany_load_module(GeanyPlugin *plugin) /* Set metadata */ plugin->info->name = _("Workbench"); plugin->info->description = _("Manage and customize multiple projects."); - plugin->info->version = "1.05"; + plugin->info->version = "1.06"; plugin->info->author = "LarsGit223"; /* Set functions */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] f32def: Merge pull request #862 from LarsGit223/gnb-gtk3
by Frank Lanitz 20 May '19

20 May '19

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Mon, 20 May 2019 08:36:04 UTC Commit: f32def6396f4be3cdb2c5d556afe065312599b6d https://github.com/geany/geany-plugins/commit/f32def6396f4be3cdb2c5d556afe0… Log Message: ----------- Merge pull request #862 from LarsGit223/gnb-gtk3 geanynumberedbookmarks: fixed deprecated gtk calls for gtk3 Modified Paths: -------------- build/geanynumberedbookmarks.m4 geanynumberedbookmarks/src/Makefile.am geanynumberedbookmarks/src/geanynumberedbookmarks.c utils/src/gp_gtkcompat.h Modified: build/geanynumberedbookmarks.m4 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -1,6 +1,8 @@ AC_DEFUN([GP_CHECK_GEANYNUMBEREDBOOKMARKS], [ GP_ARG_DISABLE([GeanyNumberedBookmarks], [auto]) + GP_CHECK_UTILSLIB([GeanyNumberedBookmarks]) + GP_COMMIT_PLUGIN_STATUS([GeanyNumberedBookmarks]) AC_CONFIG_FILES([ geanynumberedbookmarks/Makefile Modified: geanynumberedbookmarks/src/Makefile.am 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -5,4 +5,7 @@ geanyplugins_LTLIBRARIES = geanynumberedbookmarks.la geanynumberedbookmarks_la_SOURCES = geanynumberedbookmarks.c geanynumberedbookmarks_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"GeanyNumberedBookmarks\" -geanynumberedbookmarks_la_LIBADD = $(COMMONLIBS) +geanynumberedbookmarks_la_CFLAGS = $(AM_CFLAGS) \ + -I$(top_srcdir)/utils/src +geanynumberedbookmarks_la_LIBADD = $(COMMONLIBS) \ + $(top_builddir)/utils/src/libgeanypluginutils.la Modified: geanynumberedbookmarks/src/geanynumberedbookmarks.c 16 lines changed, 15 insertions(+), 1 deletions(-) =================================================================== @@ -20,6 +20,7 @@ #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> #include <glib/gstdio.h> +#include <gp_gtkcompat.h> static const gint base64_char_to_int[]= { @@ -1289,10 +1290,19 @@ will move the bookmark there if it was set on a different line, or create it if scroll=gtk_scrolled_window_new(NULL,NULL); gtk_scrolled_window_set_policy((GtkScrolledWindow*)scroll,GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); +#if GTK_CHECK_VERSION(3, 8, 0) + gtk_widget_set_size_request(label, 600, -1); + gtk_widget_set_halign(label, GTK_ALIGN_CENTER); + gtk_widget_set_valign(label, GTK_ALIGN_CENTER); + gtk_widget_set_vexpand(label, TRUE); + gtk_container_add(GTK_CONTAINER(scroll),label); + gtk_scrolled_window_set_shadow_type((GtkScrolledWindow*)scroll, GTK_SHADOW_IN); +#else gtk_scrolled_window_add_with_viewport((GtkScrolledWindow*)scroll,label); +#endif gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),scroll); - gtk_widget_show(scroll); + gtk_widget_show_all(dialog); /* set dialog size (leave width default) */ gtk_widget_set_size_request(dialog,-1,300); @@ -1475,7 +1485,11 @@ void plugin_init(GeanyData *data) { gint i,k,iResults=0; GdkKeymapKey *gdkkmkResults; +#if GTK_CHECK_VERSION(3, 22, 0) + GdkKeymap *gdkKeyMap=gdk_keymap_get_for_display(gdk_display_get_default()); +#else GdkKeymap *gdkKeyMap=gdk_keymap_get_default(); +#endif /* Load settings */ LoadSettings(); Modified: utils/src/gp_gtkcompat.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -48,8 +48,10 @@ G_BEGIN_DECLS #if GTK_CHECK_VERSION(3, 10, 0) #undef GTK_STOCK_OPEN #undef GTK_STOCK_CANCEL +#undef GTK_STOCK_OK #define GTK_STOCK_OPEN _("_Open") #define GTK_STOCK_CANCEL _("_Cancel") +#define GTK_STOCK_OK _("_OK") #endif /* Replace calls to gtk_icon_info_free() with call to -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] a4e68e: workbench: revised tag-manager control/usage
by LarsGit223 19 May '19

19 May '19

Branch: refs/heads/master Author: LarsGit223 <lars_paulsen(a)web.de> Committer: LarsGit223 <lars_paulsen(a)web.de> Date: Sun, 19 May 2019 16:45:04 UTC Commit: a4e68e67d14d4c7d710acd4ecc9d7c7a484968cf https://github.com/geany/geany-plugins/commit/a4e68e67d14d4c7d710acd4ecc9d7… Log Message: ----------- workbench: revised tag-manager control/usage This commit moves all access to TMSourceFiles/the tagmanager API into a dedicated file 'tm_control.c'. Calls from the workbench plugin to the tag-manager API may now only appear in this file. Also all calls are synced using a idle-queue managed in 'idle_queue.c' (using 'plugin_idle_add()'). This way the file lists in the workbench projects is completely de-coupled of any TMSourceFile related data/references. Fixes #866. (Calls to the tag-manager API were synced before also. But the implementation was not very clean and therefore contained errors/code where the tag-manager API was called directly - which could lead to crashes) Modified Paths: -------------- workbench/src/Makefile.am workbench/src/idle_queue.c workbench/src/idle_queue.h workbench/src/plugin_main.c workbench/src/tm_control.c workbench/src/tm_control.h workbench/src/wb_project.c workbench/src/wb_project.h Modified: workbench/src/Makefile.am 6 lines changed, 5 insertions(+), 1 deletions(-) =================================================================== @@ -22,7 +22,11 @@ workbench_la_SOURCES = \ sidebar.h \ sidebar.c \ utils.h \ - utils.c + utils.c \ + idle_queue.h \ + idle_queue.c \ + tm_control.h \ + tm_control.c workbench_la_CPPFLAGS = $(AM_CPPFLAGS) \ -DG_LOG_DOMAIN=\"Workbench\" Modified: workbench/src/idle_queue.c 134 lines changed, 134 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,134 @@ +/* + * Copyright 2019 LarsGit223 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +/* + * Code for the Workbench idle queue. + */ +#include <glib/gstdio.h> + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include <geanyplugin.h> +#include "wb_globals.h" +#include "idle_queue.h" +#include "tm_control.h" + +extern GeanyData *geany_data; + +typedef struct +{ + WB_IDLE_QUEUE_ACTION_ID id; + gpointer param_a; +}WB_IDLE_QUEUE_ACTION; + +static GSList *s_idle_actions = NULL; + + +/* Clear idle queue */ +static void wb_idle_queue_clear(void) +{ + if (s_idle_actions == NULL) + { + return; + } + + g_slist_free_full(s_idle_actions, g_free); + s_idle_actions = NULL; +} + + +/* On-idle callback function. */ +static gboolean wb_idle_queue_callback(gpointer foo) +{ + static gboolean first = TRUE; + GSList *elem = NULL; + WB_IDLE_QUEUE_ACTION *action; + static GMutex mutex; + + if (first == TRUE) + { + first = FALSE; + g_mutex_init (&mutex); + } + + g_mutex_lock(&mutex); + + foreach_slist (elem, s_idle_actions) + { + action = elem->data; + switch (action->id) + { + case WB_IDLE_ACTION_ID_TM_SOURCE_FILES_NEW: + wb_tm_control_source_files_new(action->param_a); + break; + + case WB_IDLE_ACTION_ID_TM_SOURCE_FILE_ADD: + wb_tm_control_source_file_add(action->param_a); + break; + + case WB_IDLE_ACTION_ID_TM_SOURCE_FILE_REMOVE: + wb_tm_control_source_file_remove(action->param_a); + break; + + case WB_IDLE_ACTION_ID_TM_SOURCE_FILE_FREE: + wb_tm_control_source_file_free(action->param_a); + break; + + case WB_IDLE_ACTION_ID_TM_SOURCE_FILES_REMOVE: + wb_tm_control_source_files_remove(action->param_a); + break; + } + } + + wb_idle_queue_clear(); + + g_mutex_unlock(&mutex); + + return FALSE; +} + + +/** Add a new idle action to the list. + * + * The function allocates a new WB_IDLE_QUEUE_ACTION structure and fills + * in the values passed. On-idle Geany will then call wb_idle_queue_callback + * and that function will call the function related to the action ID + * and pass the relevant parameters to it. + * + * @param id The action to execute on-idle + * @param param_a Parameter A + * @param param_a Parameter B + * + **/ +void wb_idle_queue_add_action(WB_IDLE_QUEUE_ACTION_ID id, gpointer param_a) +{ + WB_IDLE_QUEUE_ACTION *action; + + action = g_new0(WB_IDLE_QUEUE_ACTION, 1); + action->id = id; + action->param_a = param_a; + + if (s_idle_actions == NULL) + { + plugin_idle_add(wb_globals.geany_plugin, (GSourceFunc)wb_idle_queue_callback, NULL); + } + + s_idle_actions = g_slist_prepend(s_idle_actions, action); +} Modified: workbench/src/idle_queue.h 33 lines changed, 33 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,33 @@ +/* + * Copyright 2019 LarsGit223 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#ifndef __WB_IDLE_QUEUE_H__ +#define __WB_IDLE_QUEUE_H__ + +typedef enum +{ + WB_IDLE_ACTION_ID_TM_SOURCE_FILE_ADD, + WB_IDLE_ACTION_ID_TM_SOURCE_FILE_REMOVE, + WB_IDLE_ACTION_ID_TM_SOURCE_FILE_FREE, + WB_IDLE_ACTION_ID_TM_SOURCE_FILES_NEW, + WB_IDLE_ACTION_ID_TM_SOURCE_FILES_REMOVE, +}WB_IDLE_QUEUE_ACTION_ID; + +void wb_idle_queue_add_action(WB_IDLE_QUEUE_ACTION_ID id, gpointer param_a); + +#endif Modified: workbench/src/plugin_main.c 31 lines changed, 9 insertions(+), 22 deletions(-) =================================================================== @@ -31,6 +31,8 @@ #include "sidebar.h" #include "menu.h" #include "popup_menu.h" +#include "idle_queue.h" +#include "tm_control.h" GeanyPlugin *geany_plugin; GeanyData *geany_data; @@ -39,40 +41,23 @@ GeanyData *geany_data; static void plugin_workbench_on_doc_open(G_GNUC_UNUSED GObject * obj, G_GNUC_UNUSED GeanyDocument * doc, G_GNUC_UNUSED gpointer user_data) { - WB_PROJECT *project; - g_return_if_fail(doc != NULL && doc->file_name != NULL); - project = workbench_file_is_included(wb_globals.opened_wb, doc->file_name); - if (project != NULL) - { - wb_project_add_idle_action(WB_PROJECT_IDLE_ACTION_ID_REMOVE_SINGLE_TM_FILE, - project, g_strdup(doc->file_name)); - } + wb_idle_queue_add_action(WB_IDLE_ACTION_ID_TM_SOURCE_FILE_REMOVE, + g_strdup(doc->file_name)); } /* Callback function for document close */ static void plugin_workbench_on_doc_close(G_GNUC_UNUSED GObject * obj, GeanyDocument * doc, G_GNUC_UNUSED gpointer user_data) { - WB_PROJECT *project; - - g_return_if_fail(doc != NULL); - - if (doc->file_name == NULL) - { - return; - } + g_return_if_fail(doc != NULL && doc->file_name != NULL); /* tags of open files managed by geany - when the file gets closed, * we should take care of it */ - project = workbench_file_is_included(wb_globals.opened_wb, doc->file_name); - if (project != NULL) - { - wb_project_add_idle_action(WB_PROJECT_IDLE_ACTION_ID_ADD_SINGLE_TM_FILE, - project, g_strdup(doc->file_name)); - } + wb_idle_queue_add_action(WB_IDLE_ACTION_ID_TM_SOURCE_FILE_ADD, + g_strdup(doc->file_name)); } @@ -88,6 +73,7 @@ static gboolean plugin_workbench_init(GeanyPlugin *plugin, G_GNUC_UNUSED gpointe menu_init(); sidebar_init(); popup_menu_init(); + wb_tm_control_init(); /* At start there is no workbench open: deactive save and close menu item and sidebar */ @@ -103,6 +89,7 @@ static void plugin_workbench_cleanup(G_GNUC_UNUSED GeanyPlugin *plugin, G_GNUC_U { menu_cleanup(); sidebar_cleanup(); + wb_tm_control_cleanup(); } Modified: workbench/src/tm_control.c 243 lines changed, 243 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,243 @@ +/* + * Copyright 2017 LarsGit223 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +/* + * Code for the Workbench internal tag-manager-control. + */ +#include <glib/gstdio.h> + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include <geanyplugin.h> +#include "idle_queue.h" + +extern GeanyData *geany_data; +static GHashTable *wb_tm_file_table = NULL; + + +/* Callback function for freeing a file table entry. The entry must + be freed using the tag-manager in a syncronized way. So we do + not make the call here directly but use our idle-action-queue. */ +static void free_file_table_entry (gpointer data) +{ + wb_idle_queue_add_action(WB_IDLE_ACTION_ID_TM_SOURCE_FILE_FREE, data); +} + + +/** Initialize tm-control data. + **/ +void wb_tm_control_init (void) +{ + wb_tm_file_table = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, (GFreeFunc)free_file_table_entry); +} + + +/** Cleanup tm-control data. + **/ +void wb_tm_control_cleanup (void) +{ + wb_tm_file_table = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, (GFreeFunc)free_file_table_entry); +} + + +/** Add the file to the tm-workspace. + * + * @param filename Name of the file to add. + **/ +void wb_tm_control_source_file_add(gchar *filename) +{ + TMSourceFile *sf = g_hash_table_lookup(wb_tm_file_table, filename); + + if (sf != NULL && !document_find_by_filename(filename)) + { + tm_workspace_add_source_file(sf); + g_hash_table_insert (wb_tm_file_table, g_strdup(filename), sf); + } + g_free(filename); +} + + +/** Remove the file from the tm-workspace. + * + * @param filename Name of the file to add. + **/ +void wb_tm_control_source_file_remove(gchar *filename) +{ + TMSourceFile *sf = g_hash_table_lookup(wb_tm_file_table, filename); + if (sf != NULL) + { + tm_workspace_remove_source_file(sf); + g_hash_table_remove(wb_tm_file_table, filename); + } + g_free(filename); +} + + +/** Free a TMSourceFile + * + * @param source_file The file to be freed + **/ +void wb_tm_control_source_file_free(TMSourceFile *source_file) +{ + tm_source_file_free(source_file); +} + + +/** Remove the files from the tm-workspace. + * + * @param files GPtrArray of file names (gchar *) + **/ +void wb_tm_control_source_files_remove(GPtrArray *files) +{ + GPtrArray *source_files; + TMSourceFile *sf; + guint index; + + source_files = g_ptr_array_new(); + for (index = 0 ; index < files->len ; index++) + { + gchar *utf8_path = files->pdata[index]; + gchar *locale_path = utils_get_locale_from_utf8(utf8_path); + + sf = g_hash_table_lookup(wb_tm_file_table, locale_path); + if (sf != NULL) + { + g_ptr_array_add(source_files, sf); + g_hash_table_remove(wb_tm_file_table, locale_path); + } + + g_free(locale_path); + } + + tm_workspace_remove_source_files(files); + g_ptr_array_free(source_files, TRUE); + g_ptr_array_free(files, TRUE); +} + + +/* Check if filename matches filetpye patterns */ +static gboolean match_basename(gconstpointer pft, gconstpointer user_data) +{ + const GeanyFiletype *ft = pft; + const gchar *utf8_base_filename = user_data; + gint j; + gboolean ret = FALSE; + + if (G_UNLIKELY(ft->id == GEANY_FILETYPES_NONE)) + return FALSE; + + for (j = 0; ft->pattern[j] != NULL; j++) + { + GPatternSpec *pattern = g_pattern_spec_new(ft->pattern[j]); + + if (g_pattern_match_string(pattern, utf8_base_filename)) + { + ret = TRUE; + g_pattern_spec_free(pattern); + break; + } + g_pattern_spec_free(pattern); + } + return ret; +} + + +/* Stolen and modified version from Geany. The only difference is that Geany + * first looks at shebang inside the file and then, if it fails, checks the + * file extension. Opening every file is too expensive so instead check just + * extension and only if this fails, look at the shebang */ +static GeanyFiletype *filetypes_detect(const gchar *utf8_filename) +{ + struct stat s; + GeanyFiletype *ft = NULL; + gchar *locale_filename; + + locale_filename = utils_get_locale_from_utf8(utf8_filename); + if (g_stat(locale_filename, &s) != 0 || s.st_size > 10*1024*1024) + ft = filetypes[GEANY_FILETYPES_NONE]; + else + { + guint i; + gchar *utf8_base_filename; + + /* to match against the basename of the file (because of Makefile*) */ + utf8_base_filename = g_path_get_basename(utf8_filename); +#ifdef G_OS_WIN32 + /* use lower case basename */ + SETPTR(utf8_base_filename, g_utf8_strdown(utf8_base_filename, -1)); +#endif + + for (i = 0; i < geany_data->filetypes_array->len; i++) + { + GeanyFiletype *ftype = filetypes[i]; + + if (match_basename(ftype, utf8_base_filename)) + { + ft = ftype; + break; + } + } + + if (ft == NULL) + ft = filetypes_detect_from_file(utf8_filename); + + g_free(utf8_base_filename); + } + + g_free(locale_filename); + + return ft; +} + + +/** Add the files to the tm-workspace. + * + * @param files GPtrArray of file names (gchar *) + **/ +void wb_tm_control_source_files_new(GPtrArray *files) +{ + GPtrArray *source_files; + TMSourceFile *sf; + guint index; + + source_files = g_ptr_array_new(); + for (index = 0 ; index < files->len ; index++) + { + gchar *utf8_path = files->pdata[index]; + gchar *locale_path = utils_get_locale_from_utf8(utf8_path); + + sf = g_hash_table_lookup(wb_tm_file_table, locale_path); + if (sf == NULL) + { + sf = tm_source_file_new(locale_path, filetypes_detect(utf8_path)->name); + if (sf != NULL && !document_find_by_filename(utf8_path)) + { + g_ptr_array_add(source_files, sf); + g_hash_table_insert (wb_tm_file_table, g_strdup(locale_path), sf); + } + } + + g_free(locale_path); + } + + tm_workspace_add_source_files(source_files); + g_ptr_array_free(source_files, TRUE); + g_ptr_array_free(files, TRUE); +} Modified: workbench/src/tm_control.h 31 lines changed, 31 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,31 @@ +/* + * Copyright 2017 LarsGit223 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#ifndef __WB_TM_CONTROL_H__ +#define __WB_TM_CONTROL_H__ + +void wb_tm_control_init (void); +void wb_tm_control_cleanup (void); +void wb_tm_control_source_file_add(const gchar *filename); +void wb_tm_control_source_file_remove(const gchar *filename); +void wb_tm_control_source_files_remove(GPtrArray *files); +void wb_tm_control_source_files_new(GPtrArray *files); + +void wb_tm_control_source_file_free(TMSourceFile *source_file); + +#endif Modified: workbench/src/wb_project.c 346 lines changed, 47 insertions(+), 299 deletions(-) =================================================================== @@ -31,6 +31,7 @@ #include "wb_project.h" #include "sidebar.h" #include "utils.h" +#include "idle_queue.h" extern GeanyData *geany_data; @@ -41,13 +42,6 @@ typedef enum WB_PROJECT_TAG_PREFS_NO, }WB_PROJECT_TAG_PREFS; -typedef struct -{ - WB_PROJECT_IDLE_ACTION_ID id; - gpointer param_a; - gpointer param_b; -}WB_PROJECT_IDLE_ACTION; - typedef struct { GKeyFile *kf; @@ -63,7 +57,7 @@ struct S_WB_PROJECT_DIR gchar **ignored_file_patterns; guint file_count; guint subdir_count; - GHashTable *file_table; /* contains all file names within base_dir, maps file_name->TMSourceFile */ + GHashTable *file_table; /* contains all file names within base_dir */ gboolean is_prj_base_dir; }; @@ -72,8 +66,6 @@ struct S_WB_PROJECT gchar *filename; gchar *name; gboolean modified; - //GSList *s_idle_add_funcs; - //GSList *s_idle_remove_funcs; GSList *directories; /* list of WB_PROJECT_DIR; */ WB_PROJECT_TAG_PREFS generate_tag_prefs; GPtrArray *bookmarks; @@ -85,8 +77,6 @@ typedef struct const gchar *string; }WB_PROJECT_TEMP_DATA; -static GSList *s_idle_actions = NULL; -static void wb_project_dir_update_tags(WB_PROJECT_DIR *root); /** Set the projects modified marker. * @@ -200,46 +190,6 @@ GSList *wb_project_get_directories(WB_PROJECT *prj) } -/* Check if filename matches filetpye patterns */ -static gboolean match_basename(gconstpointer pft, gconstpointer user_data) -{ - const GeanyFiletype *ft = pft; - const gchar *utf8_base_filename = user_data; - gint j; - gboolean ret = FALSE; - - if (G_UNLIKELY(ft->id == GEANY_FILETYPES_NONE)) - return FALSE; - - for (j = 0; ft->pattern[j] != NULL; j++) - { - GPatternSpec *pattern = g_pattern_spec_new(ft->pattern[j]); - - if (g_pattern_match_string(pattern, utf8_base_filename)) - { - ret = TRUE; - g_pattern_spec_free(pattern); - break; - } - g_pattern_spec_free(pattern); - } - return ret; -} - - -/* Clear idle queue */ -static void wb_project_clear_idle_queue(void) -{ - if (s_idle_actions == NULL) - { - return; - } - - g_slist_free_full(s_idle_actions, g_free); - s_idle_actions = NULL; -} - - /* Create a new project dir with base path "utf8_base_dir" */ static WB_PROJECT_DIR *wb_project_dir_new(WB_PROJECT *prj, const gchar *utf8_base_dir) { @@ -251,7 +201,7 @@ static WB_PROJECT_DIR *wb_project_dir_new(WB_PROJECT *prj, const gchar *utf8_bas } WB_PROJECT_DIR *dir = g_new0(WB_PROJECT_DIR, 1); dir->base_dir = g_strdup(utf8_base_dir); - dir->file_table = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, (GFreeFunc)tm_source_file_free); + dir->file_table = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL); offset = strlen(dir->base_dir)-1; while (offset > 0 @@ -272,12 +222,10 @@ static WB_PROJECT_DIR *wb_project_dir_new(WB_PROJECT *prj, const gchar *utf8_bas /* Collect source files */ -static void wb_project_dir_collect_source_files(G_GNUC_UNUSED gchar *filename, TMSourceFile *sf, gpointer user_data) +static void wb_project_dir_collect_source_files(G_GNUC_UNUSED gchar *filename, gpointer *value, gpointer user_data) { GPtrArray *array = user_data; - - if (sf != NULL) - g_ptr_array_add(array, sf); + g_ptr_array_add(array, g_strdup(filename)); } @@ -470,12 +418,11 @@ gboolean wb_project_dir_set_ignored_file_patterns (WB_PROJECT_DIR *directory, gc /* Remove all files contained in the project dir from the tm-workspace */ static void wb_project_dir_remove_from_tm_workspace(WB_PROJECT_DIR *root) { - GPtrArray *source_files; + GPtrArray *files; - source_files = g_ptr_array_new(); - g_hash_table_foreach(root->file_table, (GHFunc)wb_project_dir_collect_source_files, source_files); - tm_workspace_remove_source_files(source_files); - g_ptr_array_free(source_files, TRUE); + files = g_ptr_array_new(); + g_hash_table_foreach(root->file_table, (GHFunc)wb_project_dir_collect_source_files, files); + wb_idle_queue_add_action(WB_IDLE_ACTION_ID_TM_SOURCE_FILES_REMOVE, files); } @@ -556,7 +503,7 @@ static guint wb_project_dir_rescan_int(WB_PROJECT *prj, WB_PROJECT_DIR *root) if (path) { - g_hash_table_insert(root->file_table, g_strdup(path), NULL); + g_hash_table_add(root->file_table, g_strdup(path)); filenum++; } } @@ -590,7 +537,7 @@ static void wb_project_dir_add_file_int(WB_PROJECT *prj, WB_PROJECT_DIR *root, c } /* Update file table and counters. */ - g_hash_table_insert(root->file_table, g_strdup(filepath), NULL); + g_hash_table_add(root->file_table, g_strdup(filepath)); if (g_file_test(filepath, G_FILE_TEST_IS_DIR)) { root->subdir_count++; @@ -635,6 +582,32 @@ static void wb_project_dir_add_file_int(WB_PROJECT *prj, WB_PROJECT_DIR *root, c } +/* Update tags for new files */ +static void wb_project_dir_update_tags(WB_PROJECT_DIR *root) +{ + GHashTableIter iter; + gpointer key, value; + GPtrArray *files; + + files = g_ptr_array_new_full(1, g_free); + g_hash_table_iter_init(&iter, root->file_table); + while (g_hash_table_iter_next(&iter, &key, &value)) + { + if (value == NULL) + { + gchar *utf8_path = key; + gchar *locale_path = utils_get_locale_from_utf8(utf8_path); + + g_ptr_array_add(files, g_strdup(key)); + g_hash_table_add(root->file_table, g_strdup(utf8_path)); + g_free(locale_path); + } + } + + wb_idle_queue_add_action(WB_IDLE_ACTION_ID_TM_SOURCE_FILES_NEW, files); +} + + /** Add a new file to the project directory and update the sidebar. * * The file is only added if it matches the pattern settings. @@ -647,17 +620,14 @@ static void wb_project_dir_add_file_int(WB_PROJECT *prj, WB_PROJECT_DIR *root, c void wb_project_dir_add_file(WB_PROJECT *prj, WB_PROJECT_DIR *root, const gchar *filepath) { wb_project_dir_add_file_int(prj, root, filepath); - wb_project_add_idle_action(WB_PROJECT_IDLE_ACTION_ID_UPDATE_TAGS, - root, NULL); - + wb_project_dir_update_tags(root); } /* Check if the filepath is equal for the length of the directory path in px_temp */ static gboolean wb_project_dir_remove_child (gpointer key, gpointer value, gpointer user_data) { WB_PROJECT_TEMP_DATA *px_temp; - TMSourceFile *sf; px_temp = user_data; if (strncmp(px_temp->string, key, px_temp->len) == 0) @@ -666,11 +636,7 @@ static gboolean wb_project_dir_remove_child (gpointer key, gpointer value, gpoin Remove it from the hash table. This will also free the tags. We do not need to update the sidebar as we already deleted the parent directory/node. */ - sf = value; - if (sf != NULL) - { - tm_workspace_remove_source_file(sf); - } + wb_idle_queue_add_action(WB_IDLE_ACTION_ID_TM_SOURCE_FILE_REMOVE, g_strdup(key)); return TRUE; } return FALSE; @@ -711,14 +677,10 @@ void wb_project_dir_remove_file(WB_PROJECT *prj, WB_PROJECT_DIR *root, const gch if (matches) { SIDEBAR_CONTEXT context; - TMSourceFile *sf; /* Update file table and counters. */ - sf = g_hash_table_lookup (root->file_table, filepath); - if (sf != NULL) - { - tm_workspace_remove_source_file(sf); - } + wb_idle_queue_add_action(WB_IDLE_ACTION_ID_TM_SOURCE_FILE_REMOVE, + g_strdup(filepath)); g_hash_table_remove(root->file_table, filepath); /* If the file already has been deleted, we cannot determine if it @@ -763,121 +725,31 @@ void wb_project_dir_remove_file(WB_PROJECT *prj, WB_PROJECT_DIR *root, const gch } -/* Stolen and modified version from Geany. The only difference is that Geany - * first looks at shebang inside the file and then, if it fails, checks the - * file extension. Opening every file is too expensive so instead check just - * extension and only if this fails, look at the shebang */ -static GeanyFiletype *filetypes_detect(const gchar *utf8_filename) -{ - struct stat s; - GeanyFiletype *ft = NULL; - gchar *locale_filename; - - locale_filename = utils_get_locale_from_utf8(utf8_filename); - if (g_stat(locale_filename, &s) != 0 || s.st_size > 10*1024*1024) - ft = filetypes[GEANY_FILETYPES_NONE]; - else - { - guint i; - gchar *utf8_base_filename; - - /* to match against the basename of the file (because of Makefile*) */ - utf8_base_filename = g_path_get_basename(utf8_filename); -#ifdef G_OS_WIN32 - /* use lower case basename */ - SETPTR(utf8_base_filename, g_utf8_strdown(utf8_base_filename, -1)); -#endif - - for (i = 0; i < geany_data->filetypes_array->len; i++) - { - GeanyFiletype *ftype = filetypes[i]; - - if (match_basename(ftype, utf8_base_filename)) - { - ft = ftype; - break; - } - } - - if (ft == NULL) - ft = filetypes_detect_from_file(utf8_filename); - - g_free(utf8_base_filename); - } - - g_free(locale_filename); - - return ft; -} - - /* Regenerate tags */ static void wb_project_dir_regenerate_tags(WB_PROJECT_DIR *root, G_GNUC_UNUSED gpointer user_data) { GHashTableIter iter; gpointer key, value; - GPtrArray *source_files; + GPtrArray *files; GHashTable *file_table; - source_files = g_ptr_array_new(); - file_table = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, (GFreeFunc)tm_source_file_free); + files = g_ptr_array_new_full (1, g_free); + file_table = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL); g_hash_table_iter_init(&iter, root->file_table); while (g_hash_table_iter_next(&iter, &key, &value)) { - TMSourceFile *sf; - - sf = NULL; if (g_file_test(key, G_FILE_TEST_IS_REGULAR)) { - gchar *utf8_path = key; - gchar *locale_path = utils_get_locale_from_utf8(utf8_path); - - sf = tm_source_file_new(locale_path, filetypes_detect(utf8_path)->name); - if (sf && !document_find_by_filename(utf8_path)) - g_ptr_array_add(source_files, sf); - - g_free(locale_path); + g_ptr_array_add(files, g_strdup(key)); } /* Add all files to the file-table (files and dirs)! */ - g_hash_table_insert(file_table, g_strdup(key), sf); + g_hash_table_add(file_table, g_strdup(key)); } g_hash_table_destroy(root->file_table); root->file_table = file_table; - tm_workspace_add_source_files(source_files); - g_ptr_array_free(source_files, TRUE); -} - - -/* Update tags for new files */ -static void wb_project_dir_update_tags(WB_PROJECT_DIR *root) -{ - GHashTableIter iter; - gpointer key, value; - GPtrArray *source_files; - - source_files = g_ptr_array_new(); - g_hash_table_iter_init(&iter, root->file_table); - while (g_hash_table_iter_next(&iter, &key, &value)) - { - if (value == NULL) - { - TMSourceFile *sf; - gchar *utf8_path = key; - gchar *locale_path = utils_get_locale_from_utf8(utf8_path); - - sf = tm_source_file_new(locale_path, filetypes_detect(utf8_path)->name); - if (sf && !document_find_by_filename(utf8_path)) - g_ptr_array_add(source_files, sf); - - g_hash_table_insert(root->file_table, g_strdup(utf8_path), sf); - g_free(locale_path); - } - } - - tm_workspace_add_source_files(source_files); - g_ptr_array_free(source_files, TRUE); + wb_idle_queue_add_action(WB_IDLE_ACTION_ID_TM_SOURCE_FILES_NEW, files); } @@ -918,8 +790,6 @@ void wb_project_rescan(WB_PROJECT *prj) return; } - wb_project_clear_idle_queue(); - foreach_slist(elem, prj->directories) { filenum += wb_project_dir_rescan_int(prj, elem->data); @@ -1013,128 +883,6 @@ gboolean wb_project_file_is_included(WB_PROJECT *prj, const gchar *filename) } -/* Add single tm file. Only to be called on-idle! */ -static void wb_project_add_single_tm_file(WB_PROJECT *prj, const gchar *filename) -{ - GSList *elem = NULL; - - foreach_slist (elem, prj->directories) - { - WB_PROJECT_DIR *dir = elem->data; - TMSourceFile *sf = g_hash_table_lookup(dir->file_table, filename); - - if (sf != NULL && !document_find_by_filename(filename)) - { - tm_workspace_add_source_file(sf); - break; /* single file representation in TM is enough */ - } - } -} - - -/* This function gets called when document is being opened by Geany and we need - * to remove the TMSourceFile from the tag manager because Geany inserts - * it for the newly open tab. Even though tag manager would handle two identical - * files, the file inserted by the plugin isn't updated automatically in TM - * so any changes wouldn't be reflected in the tags array (e.g. removed function - * from source file would still be found in TM) - * - * Additional problem: The document being opened may be caused - * by going to tag definition/declaration - tag processing is in progress - * when this function is called and if we remove the TmSourceFile now, line - * number for the searched tag won't be found. For this reason delay the tag - * TmSourceFile removal until idle */ -static void wb_project_remove_single_tm_file(WB_PROJECT *prj, const gchar *filename) -{ - GSList *elem = NULL; - - foreach_slist (elem, prj->directories) - { - WB_PROJECT_DIR *dir = elem->data; - TMSourceFile *sf = g_hash_table_lookup(dir->file_table, filename); - - if (sf != NULL) - { - tm_workspace_remove_source_file(sf); - } - } -} - - -/* On-idle callback function. */ -static gboolean wb_project_on_idle_callback(gpointer foo) -{ - GSList *elem = NULL; - WB_PROJECT_IDLE_ACTION *action; - - foreach_slist (elem, s_idle_actions) - { - action = elem->data; - switch (action->id) - { - case WB_PROJECT_IDLE_ACTION_ID_ADD_SINGLE_TM_FILE: - if (action->param_a != NULL && action->param_b != NULL) - { - wb_project_add_single_tm_file - (action->param_a, action->param_b); - g_free(action->param_b); - } - break; - - case WB_PROJECT_IDLE_ACTION_ID_REMOVE_SINGLE_TM_FILE: - if (action->param_a != NULL && action->param_b != NULL) - { - wb_project_remove_single_tm_file - (action->param_a, action->param_b); - g_free(action->param_b); - } - break; - - case WB_PROJECT_IDLE_ACTION_ID_UPDATE_TAGS: - if (action->param_a != NULL) - { - wb_project_dir_update_tags(action->param_a); - } - break; - } - } - - wb_project_clear_idle_queue(); - - return FALSE; -} - - -/** Add a new idle action to the list. - * - * The function allocates a new WB_PROJECT_IDLE_ACTION structure and fills - * in the values passed. On-idle genay will then call wb_project_on_idle_callback - * and that function will call the function related to the action ID - * and pass the relevant parameters to it. - * - * @param id The action to execute on-idle - * @param param_a Parameter A - * @param param_a Parameter B - * - **/ -void wb_project_add_idle_action(WB_PROJECT_IDLE_ACTION_ID id, gpointer param_a, gpointer param_b) -{ - WB_PROJECT_IDLE_ACTION *action; - - action = g_new0(WB_PROJECT_IDLE_ACTION, 1); - action->id = id; - action->param_a = param_a; - action->param_b = param_b; - - if (s_idle_actions == NULL) - { - plugin_idle_add(wb_globals.geany_plugin, (GSourceFunc)wb_project_on_idle_callback, NULL); - } - - s_idle_actions = g_slist_prepend(s_idle_actions, action); -} - - /* Add a directory to the project */ static WB_PROJECT_DIR *wb_project_add_directory_int(WB_PROJECT *prj, const gchar *dirname, gboolean rescan) { Modified: workbench/src/wb_project.h 9 lines changed, 0 insertions(+), 9 deletions(-) =================================================================== @@ -21,13 +21,6 @@ #include <glib.h> -typedef enum -{ - WB_PROJECT_IDLE_ACTION_ID_ADD_SINGLE_TM_FILE, - WB_PROJECT_IDLE_ACTION_ID_REMOVE_SINGLE_TM_FILE, - WB_PROJECT_IDLE_ACTION_ID_UPDATE_TAGS, -}WB_PROJECT_IDLE_ACTION_ID; - typedef struct S_WB_PROJECT WB_PROJECT; typedef struct S_WB_PROJECT_DIR WB_PROJECT_DIR; @@ -75,6 +68,4 @@ gboolean wb_project_load(WB_PROJECT *prj, const gchar *filename, GError **error) gchar *wb_project_get_info (WB_PROJECT *prj); -void wb_project_add_idle_action(WB_PROJECT_IDLE_ACTION_ID id, gpointer param_a, gpointer param_b); - #endif -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] d2e76e: Update MAINTAINERS
by Frank Lanitz 18 May '19

18 May '19

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sat, 18 May 2019 11:08:08 UTC Commit: d2e76ecdafc823e17492b4dd6b8a06fe4570c72b https://github.com/geany/geany-plugins/commit/d2e76ecdafc823e17492b4dd6b8a0… Log Message: ----------- Update MAINTAINERS Add another github user name Modified Paths: -------------- MAINTAINERS Modified: MAINTAINERS 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -287,7 +287,7 @@ S: Maintained treebrowser P: Adam Dingle <adam(a)medovina.org> -g: +g: @medovina M: Adam Dingle <adam(a)medovina.org> W: http://plugins.geany.org/treebrowser.html S: Maintained -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 2e52ba: Merge pull request #863 from LarsGit223/issue574
by Frank Lanitz 17 May '19

17 May '19

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Fri, 17 May 2019 12:54:41 UTC Commit: 2e52ba0daa8cfefce8eae93c96164ea11765c526 https://github.com/geany/geany-plugins/commit/2e52ba0daa8cfefce8eae93c96164… Log Message: ----------- Merge pull request #863 from LarsGit223/issue574 automark: move initialization behind DOC_VALID check. Fixes #574. Modified Paths: -------------- automark/src/automark.c Modified: automark/src/automark.c 7 lines changed, 5 insertions(+), 2 deletions(-) =================================================================== @@ -91,9 +91,9 @@ static gboolean automark(gpointer user_data) { GeanyDocument *doc = (GeanyDocument *)user_data; - GeanyEditor *editor = doc->editor; + GeanyEditor *editor; static GeanyEditor *editor_cache = NULL; - ScintillaObject *sci = editor->sci; + ScintillaObject *sci; gchar *text; static gchar text_cache[GEANY_MAX_WORD_LENGTH] = {0}; gint match_flag = SCFIND_MATCHCASE | SCFIND_WHOLEWORD; @@ -105,6 +105,9 @@ automark(gpointer user_data) if (!DOC_VALID(doc)) return FALSE; + editor = doc->editor; + sci = editor->sci; + /* Do not highlight while selecting text and allow other markers to work */ if (sci_has_selection(sci)) return FALSE; -------------- 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 2019