Plugins-Commits June 2019

plugins-commits@lists.geany.org

1 participants
10 discussions

[geany/geany-plugins] b98e52: UpdateChecker: Use new service URL
by Enrico Tröger 30 Jun '19

30 Jun '19

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 30 Jun 2019 21:44:33 UTC Commit: b98e52684e96605a850b0b3321501ff321675575 https://github.com/geany/geany-plugins/commit/b98e52684e96605a850b0b3321501… Log Message: ----------- UpdateChecker: Use new service URL The old URL is kept running only to support old versions. Modified Paths: -------------- updatechecker/src/updatechecker.c Modified: updatechecker/src/updatechecker.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -47,7 +47,7 @@ enum { UPDATECHECK_STARTUP }; -#define UPDATE_CHECK_URL "https://geany.org/service/version.php" +#define UPDATE_CHECK_URL "https://geany.org/service/version/" static GtkWidget *main_menu_item = NULL; static void update_check_result_cb(SoupSession *session, -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 4ddf2e: Merge pull request #877 from LarsGit223/wb-auto-save-project
by Frank Lanitz 24 Jun '19

24 Jun '19

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Mon, 24 Jun 2019 07:10:18 UTC Commit: 4ddf2e7707d3e0305a3e463d4574e0f715102a0e https://github.com/geany/geany-plugins/commit/4ddf2e7707d3e0305a3e463d4574e… Log Message: ----------- Merge pull request #877 from LarsGit223/wb-auto-save-project workbench: auto-save project on change Modified Paths: -------------- workbench/README workbench/src/plugin_main.c workbench/src/popup_menu.c Modified: workbench/README 6 lines changed, 0 insertions(+), 6 deletions(-) =================================================================== @@ -62,12 +62,6 @@ These are the available items: adding a project you need to save the workbench settings by selecting "Workbench / Save" in the menubar. -**Save project** - Selecting this item will save the Workbench related project settings in - the Geany project file. It is only available if you right clicked inside - of a project. It will only save the settings of the project that you - clicked on. - **Remove project** Remove the project from the Workbench. It is only available if you right clicked inside of a project. After removing a project you need Modified: workbench/src/plugin_main.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -117,7 +117,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.07"; + plugin->info->version = "1.08"; plugin->info->author = "LarsGit223"; /* Set functions */ Modified: workbench/src/popup_menu.c 81 lines changed, 53 insertions(+), 28 deletions(-) =================================================================== @@ -41,7 +41,6 @@ static struct GtkWidget *widget; GtkWidget *add_project; - GtkWidget *save_project; GtkWidget *remove_project; GtkWidget *fold_unfold_project; GtkWidget *project_open_all; @@ -243,6 +242,32 @@ void popup_menu_show(POPUP_CONTEXT context, GdkEventButton *event) } +/* Helper function for saving the project and updating of the sidebar. */ +static void save_project(SIDEBAR_CONTEXT *context) +{ + GError *error = NULL; + + if (context->project != NULL && wb_project_save(context->project, &error)) + { + sidebar_update(SIDEBAR_CONTEXT_PROJECT_SAVED, context); + } +} + + +/* Helper function for saving the workbench and updating of the sidebar. */ +static void save_workbench(WORKBENCH *wb) +{ + GError *error = NULL; + + /* Save the new settings to the workbench file (.geanywb). */ + if (!workbench_save(wb, &error)) + { + dialogs_show_msgbox(GTK_MESSAGE_INFO, _("Could not save workbench file: %s"), error->message); + } + sidebar_update(SIDEBAR_CONTEXT_WB_SAVED, NULL); +} + + /* Handle popup menu item "Add project" */ static void popup_menu_on_add_project(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_UNUSED gpointer user_data) { @@ -257,6 +282,9 @@ static void popup_menu_on_add_project(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNU if (workbench_add_project(wb_globals.opened_wb, filename)) { sidebar_update(SIDEBAR_CONTEXT_PROJECT_ADDED, NULL); + + /* Save the changes to the workbench file (.geanywb). */ + save_workbench(wb_globals.opened_wb); } else { @@ -266,27 +294,6 @@ static void popup_menu_on_add_project(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNU } -/* Handle popup menu item "Save project" */ -static void popup_menu_on_save_project(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_UNUSED gpointer user_data) -{ - GError *error = NULL; - WB_PROJECT *project; - - project = sidebar_file_view_get_selected_project(NULL); - if (project != NULL && wb_globals.opened_wb != NULL) - { - if (wb_project_save(project, &error)) - { - SIDEBAR_CONTEXT context; - - memset(&context, 0, sizeof(context)); - context.project = project; - sidebar_update(SIDEBAR_CONTEXT_PROJECT_SAVED, &context); - } - } -} - - /* Handle popup menu item "Remove project" */ static void popup_menu_on_remove_project(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_UNUSED gpointer user_data) { @@ -302,6 +309,9 @@ static void popup_menu_on_remove_project(G_GNUC_UNUSED GtkMenuItem *menuitem, G_ memset(&context, 0, sizeof(context)); context.project = project; sidebar_update(SIDEBAR_CONTEXT_PROJECT_REMOVED, &context); + + /* Save the changes to the workbench file (.geanywb). */ + save_workbench(wb_globals.opened_wb); } } } @@ -375,6 +385,9 @@ static void popup_menu_on_add_directory(G_GNUC_UNUSED GtkMenuItem * menuitem, G_ wb_project_add_directory(project, dirname); sidebar_update(SIDEBAR_CONTEXT_DIRECTORY_ADDED, &context); g_free(dirname); + + /* Save the now changed project. */ + save_project(&context); } } } @@ -390,6 +403,9 @@ static void popup_menu_on_remove_directory(G_GNUC_UNUSED GtkMenuItem * menuitem, { wb_project_remove_directory(context.project, context.directory); sidebar_update(SIDEBAR_CONTEXT_DIRECTORY_REMOVED, &context); + + /* Save the now changed project. */ + save_project(&context); } } @@ -421,6 +437,9 @@ static void popup_menu_on_directory_settings(G_GNUC_UNUSED GtkMenuItem * menuite wb_project_set_modified(context.project, TRUE); wb_project_dir_rescan(context.project, context.directory); sidebar_update(SIDEBAR_CONTEXT_DIRECTORY_SETTINGS_CHANGED, &context); + + /* Save the now changed project. */ + save_project(&context); } } } @@ -471,6 +490,9 @@ static void popup_menu_on_add_to_workbench_bookmarks(G_GNUC_UNUSED GtkMenuItem * { workbench_add_bookmark(wb_globals.opened_wb, context.file); sidebar_update(SIDEBAR_CONTEXT_WB_BOOKMARK_ADDED, &context); + + /* Save the changes to the workbench file (.geanywb). */ + save_workbench(wb_globals.opened_wb); } } @@ -485,6 +507,9 @@ static void popup_menu_on_add_to_project_bookmarks(G_GNUC_UNUSED GtkMenuItem *me { wb_project_add_bookmark(context.project, context.file); sidebar_update(SIDEBAR_CONTEXT_PRJ_BOOKMARK_ADDED, &context); + + /* Save the now changed project. */ + save_project(&context); } } @@ -499,12 +524,18 @@ static void popup_menu_on_remove_from_bookmarks(G_GNUC_UNUSED GtkMenuItem *menui { workbench_remove_bookmark(wb_globals.opened_wb, context.wb_bookmark); sidebar_update(SIDEBAR_CONTEXT_WB_BOOKMARK_REMOVED, &context); + + /* Save the changes to the workbench file (.geanywb). */ + save_workbench(wb_globals.opened_wb); } if (sidebar_file_view_get_selected_context(&context) && context.project != NULL && context.prj_bookmark != NULL) { wb_project_remove_bookmark(context.project, context.prj_bookmark); sidebar_update(SIDEBAR_CONTEXT_PRJ_BOOKMARK_REMOVED, &context); + + /* Save the now changed project. */ + save_project(&context); } } @@ -782,12 +813,6 @@ void popup_menu_init(void) g_signal_connect(item, "activate", G_CALLBACK(popup_menu_on_add_project), NULL); s_popup_menu.add_project = item; - item = gtk_menu_item_new_with_mnemonic(_("_Save project")); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(s_popup_menu.widget), item); - g_signal_connect(item, "activate", G_CALLBACK(popup_menu_on_save_project), NULL); - s_popup_menu.save_project = item; - item = gtk_menu_item_new_with_mnemonic(_("_Remove project")); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(s_popup_menu.widget), item); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] f1ae57: workbench: auto-save project on change
by LarsGit223 23 Jun '19

23 Jun '19

Branch: refs/heads/master Author: LarsGit223 <lars_paulsen(a)web.de> Committer: LarsGit223 <lars_paulsen(a)web.de> Date: Sun, 23 Jun 2019 10:00:22 UTC Commit: f1ae5770803c6685d0ffe117a8c4d7b8eb1ac358 https://github.com/geany/geany-plugins/commit/f1ae5770803c6685d0ffe117a8c4d… Log Message: ----------- workbench: auto-save project on change This removes the item "Save project" from the popup menu and automatically saves a project if something is changed (e.g. directory added/removed). This also fixes some situations in which saving of the workbench file was missing (e.g. a change in the workbench bookmarks). See #841. Modified Paths: -------------- workbench/README workbench/src/plugin_main.c workbench/src/popup_menu.c Modified: workbench/README 6 lines changed, 0 insertions(+), 6 deletions(-) =================================================================== @@ -62,12 +62,6 @@ These are the available items: adding a project you need to save the workbench settings by selecting "Workbench / Save" in the menubar. -**Save project** - Selecting this item will save the Workbench related project settings in - the Geany project file. It is only available if you right clicked inside - of a project. It will only save the settings of the project that you - clicked on. - **Remove project** Remove the project from the Workbench. It is only available if you right clicked inside of a project. After removing a project you need Modified: workbench/src/plugin_main.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -117,7 +117,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.07"; + plugin->info->version = "1.08"; plugin->info->author = "LarsGit223"; /* Set functions */ Modified: workbench/src/popup_menu.c 81 lines changed, 53 insertions(+), 28 deletions(-) =================================================================== @@ -41,7 +41,6 @@ static struct GtkWidget *widget; GtkWidget *add_project; - GtkWidget *save_project; GtkWidget *remove_project; GtkWidget *fold_unfold_project; GtkWidget *project_open_all; @@ -243,6 +242,32 @@ void popup_menu_show(POPUP_CONTEXT context, GdkEventButton *event) } +/* Helper function for saving the project and updating of the sidebar. */ +static void save_project(SIDEBAR_CONTEXT *context) +{ + GError *error = NULL; + + if (context->project != NULL && wb_project_save(context->project, &error)) + { + sidebar_update(SIDEBAR_CONTEXT_PROJECT_SAVED, context); + } +} + + +/* Helper function for saving the workbench and updating of the sidebar. */ +static void save_workbench(WORKBENCH *wb) +{ + GError *error = NULL; + + /* Save the new settings to the workbench file (.geanywb). */ + if (!workbench_save(wb, &error)) + { + dialogs_show_msgbox(GTK_MESSAGE_INFO, _("Could not save workbench file: %s"), error->message); + } + sidebar_update(SIDEBAR_CONTEXT_WB_SAVED, NULL); +} + + /* Handle popup menu item "Add project" */ static void popup_menu_on_add_project(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_UNUSED gpointer user_data) { @@ -257,6 +282,9 @@ static void popup_menu_on_add_project(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNU if (workbench_add_project(wb_globals.opened_wb, filename)) { sidebar_update(SIDEBAR_CONTEXT_PROJECT_ADDED, NULL); + + /* Save the changes to the workbench file (.geanywb). */ + save_workbench(wb_globals.opened_wb); } else { @@ -266,27 +294,6 @@ static void popup_menu_on_add_project(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNU } -/* Handle popup menu item "Save project" */ -static void popup_menu_on_save_project(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_UNUSED gpointer user_data) -{ - GError *error = NULL; - WB_PROJECT *project; - - project = sidebar_file_view_get_selected_project(NULL); - if (project != NULL && wb_globals.opened_wb != NULL) - { - if (wb_project_save(project, &error)) - { - SIDEBAR_CONTEXT context; - - memset(&context, 0, sizeof(context)); - context.project = project; - sidebar_update(SIDEBAR_CONTEXT_PROJECT_SAVED, &context); - } - } -} - - /* Handle popup menu item "Remove project" */ static void popup_menu_on_remove_project(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_UNUSED gpointer user_data) { @@ -302,6 +309,9 @@ static void popup_menu_on_remove_project(G_GNUC_UNUSED GtkMenuItem *menuitem, G_ memset(&context, 0, sizeof(context)); context.project = project; sidebar_update(SIDEBAR_CONTEXT_PROJECT_REMOVED, &context); + + /* Save the changes to the workbench file (.geanywb). */ + save_workbench(wb_globals.opened_wb); } } } @@ -375,6 +385,9 @@ static void popup_menu_on_add_directory(G_GNUC_UNUSED GtkMenuItem * menuitem, G_ wb_project_add_directory(project, dirname); sidebar_update(SIDEBAR_CONTEXT_DIRECTORY_ADDED, &context); g_free(dirname); + + /* Save the now changed project. */ + save_project(&context); } } } @@ -390,6 +403,9 @@ static void popup_menu_on_remove_directory(G_GNUC_UNUSED GtkMenuItem * menuitem, { wb_project_remove_directory(context.project, context.directory); sidebar_update(SIDEBAR_CONTEXT_DIRECTORY_REMOVED, &context); + + /* Save the now changed project. */ + save_project(&context); } } @@ -421,6 +437,9 @@ static void popup_menu_on_directory_settings(G_GNUC_UNUSED GtkMenuItem * menuite wb_project_set_modified(context.project, TRUE); wb_project_dir_rescan(context.project, context.directory); sidebar_update(SIDEBAR_CONTEXT_DIRECTORY_SETTINGS_CHANGED, &context); + + /* Save the now changed project. */ + save_project(&context); } } } @@ -471,6 +490,9 @@ static void popup_menu_on_add_to_workbench_bookmarks(G_GNUC_UNUSED GtkMenuItem * { workbench_add_bookmark(wb_globals.opened_wb, context.file); sidebar_update(SIDEBAR_CONTEXT_WB_BOOKMARK_ADDED, &context); + + /* Save the changes to the workbench file (.geanywb). */ + save_workbench(wb_globals.opened_wb); } } @@ -485,6 +507,9 @@ static void popup_menu_on_add_to_project_bookmarks(G_GNUC_UNUSED GtkMenuItem *me { wb_project_add_bookmark(context.project, context.file); sidebar_update(SIDEBAR_CONTEXT_PRJ_BOOKMARK_ADDED, &context); + + /* Save the now changed project. */ + save_project(&context); } } @@ -499,12 +524,18 @@ static void popup_menu_on_remove_from_bookmarks(G_GNUC_UNUSED GtkMenuItem *menui { workbench_remove_bookmark(wb_globals.opened_wb, context.wb_bookmark); sidebar_update(SIDEBAR_CONTEXT_WB_BOOKMARK_REMOVED, &context); + + /* Save the changes to the workbench file (.geanywb). */ + save_workbench(wb_globals.opened_wb); } if (sidebar_file_view_get_selected_context(&context) && context.project != NULL && context.prj_bookmark != NULL) { wb_project_remove_bookmark(context.project, context.prj_bookmark); sidebar_update(SIDEBAR_CONTEXT_PRJ_BOOKMARK_REMOVED, &context); + + /* Save the now changed project. */ + save_project(&context); } } @@ -782,12 +813,6 @@ void popup_menu_init(void) g_signal_connect(item, "activate", G_CALLBACK(popup_menu_on_add_project), NULL); s_popup_menu.add_project = item; - item = gtk_menu_item_new_with_mnemonic(_("_Save project")); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(s_popup_menu.widget), item); - g_signal_connect(item, "activate", G_CALLBACK(popup_menu_on_save_project), NULL); - s_popup_menu.save_project = item; - item = gtk_menu_item_new_with_mnemonic(_("_Remove project")); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(s_popup_menu.widget), item); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/plugins.geany.org] f76f06: Merge pull request #19 from dandv/patch-1
by Michael Spahn 10 Jun '19

10 Jun '19

Branch: refs/heads/master Author: Michael Spahn <michael(a)spahn.me> Committer: GitHub <noreply(a)github.com> Date: Mon, 10 Jun 2019 11:08:02 UTC Commit: f76f067801b439f9ded05c6aef94a0ebbb34943c https://github.com/geany/plugins.geany.org/commit/f76f067801b439f9ded05c6ae… Log Message: ----------- Merge pull request #19 from dandv/patch-1 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> - 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>. +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. - 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.) +Some plugins may lack details. Feel free to add them yourself or ask +<a href="https://www.geany.org/Support/IRC">on IRC</a> about them. - 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. +<h3>Installation</h3> +See the <a href="install.html">Installation</a> page. -If you are searching for any plugin for Geany or information about -a plugin, this website is (or will be) the right place to get those -information. +<h3>Developer details</h3> +The code for the plugins from the Geany Plugins project is hosted +<a href="https://github.com/geany/geany-plugins">on GitHub</a>. - 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>. +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 +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. +website itself) is available <a href="https://github.com/geany/plugins.geany.org"> +on GitHub</a> as well. If you are a plugin developer and wonder why your plugin is not listed here, there may be several reasons for that: <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> 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>. -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/plugins.geany.org] 0a3786: State that people are welcome to add information themselves
by Michael Spahn 10 Jun '19

10 Jun '19

Branch: refs/heads/master Author: Michael Spahn <michael(a)spahn.me> Committer: GitHub <noreply(a)github.com> Date: Mon, 10 Jun 2019 11:06:31 UTC Commit: 0a37867ffd597e3a4aa2d4f7cc102b76eda18ab4 https://github.com/geany/plugins.geany.org/commit/0a37867ffd597e3a4aa2d4f7c… Log Message: ----------- State that people are welcome to add information themselves Modified Paths: -------------- content/start.html Modified: content/start.html 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -3,7 +3,7 @@ <h2>Welcome</h2> 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. -Some plugins may lack details. Feel free to bug us +Some plugins may lack details. Feel free to add them yourself or ask <a href="https://www.geany.org/Support/IRC">on IRC</a> about them. <h3>Installation</h3> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/plugins.geany.org] 9a75b7: Remove newline-plugin as it's abandoned
by Dominic Hopf 09 Jun '19

09 Jun '19

Branch: refs/heads/master Author: Dominic Hopf <dmaphy(a)googlemail.com> Committer: Dominic Hopf <dmaphy(a)googlemail.com> Date: Sun, 09 Jun 2019 07:36:00 UTC Commit: 9a75b7649761057cd70054971755be72ab0b5907 https://github.com/geany/plugins.geany.org/commit/9a75b7649761057cd70054971… Log Message: ----------- Remove newline-plugin as it's abandoned Thanks beeelcee for reporting this! Modified Paths: -------------- content/newline-plugin.html index.php Modified: content/newline-plugin.html 142 lines changed, 0 insertions(+), 142 deletions(-) =================================================================== @@ -1,142 +0,0 @@ - <div id="content"> -<div class="section" id="screen"> -<img src="https://a.fsdn.com/con/app/proj/newline-plugin/screenshots/Untitled2_small.…" alt="missing"/> -<img src="https://a.fsdn.com/con/app/proj/newline-plugin/screenshots/Untitled_small.p…" alt="missing"/> -</div> -<div class="section" id="overview"><h3>Overview</h3> -Displays CR character and displays LF character on beginning of lines, makes them selectable but not on triple click, auto insert or delete of line delimiters. Hides the line wrap marker, disables cursor blinking,((close geany to fully unload)) and other minor modifications that cannot be made through normal preferences -this is the full readme file for newline plugin, a x platform -cleans up the ending of files what a releaf.have you ever wanted to clean up the ending of files and make other things the way you want them to be. -note that this plugin helps implement some of the "line operations" -The main inspiration behind this plugin is because i like it better. -this is an experimental plugin.since the implementation was not straightforward it mostly serves as a functional model and there is probably lots of little bugs;report for example any newline characters appearing out of place;probably different undo behavior -mater of fact i can't really stand programming without this plugin despite its bugs -cant be held liable for any loss of data according to the use of this plugin or variants -please spread it across the interwebs starting from here - -</div><div class="section" id="features"><h3>Features</h3> -automatically insert a new line if there is no selection and a character is inserted at left of LF or at right of CR -automatically remove line delimiters if there is a selection and the rest of the line is deleted -triple click doesn't include any line delimeters in selection -selection fixed -reload remembers selection -so a line operation can be deleted or moved keeping the selection on a single line -handle mixed line delimeters in the same file -delete both CR LF pair if no selection and one is deleted -notepad copy broke, cut fixed, drag ok- copy cut context only work in geany only, drag to left and far right -the Newline hide function can be used to use regular expression search normally,and other menu items -the features go along with the fact that the line characters really already represent beginning and ending of lines it is just showing it. the selection and auto features go along with how at the beginning of a file there is always an assumed LF character and an assumed CR character at the end, not only a file but any piece of text. - -</div><div class="section" id="download"><h3>Download Files List</h3> -project discussion page on <a target="_blank" href="https://sourceforge.net/p/newline-plugin/discussion/">sourceforge</a> -<h5>Sources</h5> -<a target="_blank" href="https://sourceforge.net/projects/newline-plugin/files/latest/download">newline-2015-03.zip</a> - these other 5 files expect to be placed with the external sources -newline_bat.cpp, newline.c, newline_sh.c - source files -newline.bat, newline_sh - build scripts for each platform -<h5>External Tools</h5> -<a href="http://download.geany.org/geany-0.19.1.tar.gz">geany-0.19.1.tar.gz</a> - you will also need gcc compiler -<a href="http://download.tuxfamily.org/nppplugins/NppPluginTemplate/NppPluginTemplat…">NppPluginTemplate.zip</a> - you will need Visual Studio on windows -<h5>Compiled Files</h5> -includes two compiled versions placed alongside the other plugin files -newline.dll - for Notepad 6.5 or later and Scintilla 3.3.4 on windows -newline.so - for Geany Vellam (0.19.1) and Scintilla 2.12 on linux - -</div><div class="section" id="dev"><h3>Development Notes</h3> -notepad is assumed to be unicode while geany and scintilla are ansi -even though this implementation is only possible through the use of substitute characters,these characters are meant to replace their corresponding characters exactly -reimplements cut,copy;copy and cut in the context menu can be used(in geany), not shortcuts--ignore this -Scintilla can you find nested undo level to prevent syntax errors? -clipboard editing is used for cut on windows only, and in the paste and fix copied menu items -i guess an example of where you would be selecting eol chars and not: LF mode select full line and drag to end of another. else triple click then drag to beginning - -</div><div class="section" id="next"><h3>To Do</h3> -display last 3 digits of line numbers over newline characters, maybe use ^ for LF and $ for CR -maybe fix overwrite mode to never insert/delete -add option to break lines BEFORE spaces -remove background styling past ends of lines -fix undo grouping-it keeps undoing by single character;also notepad on startup undo..is allin one,same with geany sometimes -im really confused by the scintilla BEGIN/END-UNDOACTION commands, why not just like a separator. and i cant figure out how to use them -try to look up keybindings for copy/cut and steal them -make dragging text to a different location undo in one action--done -try searching for closure -maybe allow right click to change cursor position if there is no selection--notepad always changes it -notepad only?dont change tab on right click -make double click not pay attention to if a word is highlighted--notepad does this -allow copy dragging adjacent--works in notepad new scintilla -maybe make goto line widget automatic geany -maybe make it so the document appears saved based on its content not just undo -make clicking a function in the symbol sidebar bring you to the bottom of the function -make autocomplete use rest of the word to help find a match;notepad have word autocompletion not suggest the word currently being typed itself -geany autoclose parenthesis check for nesting on line -make nested shell highlighting to highlight only innermost -perform highlighting of comments backwards, both platforms. specifically, if there is a stray asterisk-slash ending c-comment no highlighting is done. so have it do that for the starting instead. this is of course because i tend to put in the starting one first, which highlights and stylizes the rest of the document temporarily. i believe this is more natural because i read the code left to right like a sentence. the program tries to stylize in that order as well which might make sense in other cases. im not sure and what it would take to make an exception -it would be nice if scintilla set commands return the passed value, more like c language assign operator does -undo for changing of line endings but not reload-done -for auto insert insert LF first then CR--done -allow type between characters(turn off auto insert)--done -log instead of status for notepad debugging--whatever -check selection after autocomplete inserted -column select mode allow replacing LF chars since they are already aligned -notepad save all remember tab -probably the most bugs in dual mode -change drag detect more specific in geany;other commands can "trigger" detection of paste and drag for example which will cause errors--partially removed check for relevacy -leaving fake characters behind: replace(use .\r and \n. in search); rectangle mode by inserting after virtual space, then manually delete the characters -allow regular character to be used as indicator(use \n. in search and the selection is not respected) -move rectangular selection with arrows -drag disallow selection to go between CRLF pair;adjust selection at end to make variables visible if not updated -delete LF choose x--ok -adjust drag to undo automatic conversion of line endings of paste;in notepad any paste is causing all line endings to be converted-try SCI_GETPASTECONVERTENDINGS, all settings will still convert in some way -notepad doesnt use a separate scintilla object for each tab?,which i dont like as much but it probably saves memory(also it is suggested in the documentation)(it is slower cause it has to load the content and styles);notepad possibly wait to display until tab is selected--does, separate settings; -i noticed that notepad is already kind of "flashy" on startup but without this it is noticibly more, so now it is only with save all function;also notepad activates two files for some reason and insists on displaying the second scintilla handle window quickly i mean seriously.at least its free. -i saw no results when trying the character representation commands (introduced in scintilla 3.3.5)..also SCI_SETCARETLINEVISIBLEALWAYS is defined as two different numbers in different versions of the header file and neither seem to have an effect; -...i dont know why, i thought it would be nested; -try fixing clipboard with new scintilla object;bug copy line over line not triggered--done;what -fix "smart" home key and end keytabulate -..maybe even keep selection after paste,more similar to drag;also after undo uuuuu -you could do something similar to this with spaces between words. no -fix selection on enable/disable -have drag adjacent not clear the selection;make dragging a selection to within itself keep the selection (on geany it is reset to 0;on notepad it keeps the pos but not the selection) -maybe use SCI_GETIDENTIFIER to allow the source of each notification to be found -finish documenting menu items like SCI_COPYALLOWLINE -maybe make it so auto inserting newline doesn't if it already begins with -ensure single character, be more line oriented so if there is three empty lines you can paste three lines and it will use the empty 1s or something -geany SCI_PASTE causes crash;there is an issue on linux where if you copy something from outside then the plugin tries to use a SCI_PASTE command on a non visible scintilla object it crashes.;as a result, regular cut does not work in geany, but remeber cut copy in the context menu do work. also fix copied menu item can be used -maybe on paste highlight half if it is duplicate for easy del.;probly notcause like in other apps -auto remove line default to start not end, if leading LF?;when dragging line delimiters selections off;and dbl clck -geany linux only, change drag to not use clipboard -on windows the issue was an extra space getting copied SCI_COPYTEXT on to the end so there is a fix for it -tryfuckindoin theshitwhere delay btwnb cut n pasye - -</div><div class="section" id="known-issues"><h3>Bugs</h3> -scintilla column select mode doesnt fully work with line wrapping -note that under regular operation on both platforms, changing the line ending mode and then undoing doesn't update the mode so line endings can get mixed(changing line ending/undo also allows mixed),or through the replace dialog -breaks auto indentation and undoing of words(both platforms) -visible line ending settings are not updated in the ui -column selection mode/replace dialog multiple lines puts in extra newlines--catches error -word count and sel in status bar of geany, and summary menu in notepad, is about doubled. in notepad sel in status bar is not shown because like rectangle mode is not counted. -column select mode: make a thin select and delete doesn't insert extra spaces, initially selecting half doesn't, enter does -reload doesn't remember selection on notepad,reload remembers selection but not first visible line on geany-there is a fix but it is too slow -dragging to after a CR or before LF the selection is cleared(fix especially for line)--fixed -replacin all is changin the selection(regular i guess) -if you hold the mouse down near a styled character it may blink because the selection is redrawn -CR mode select from whole line with leading not removed--fixed -no auto ins when failed drag? -dragging to beginning of line/auto ins and del both -drag whole line to end of same line broke because it does it before sc_notify so change it;in LF mode dragging the rest of a line to before the LF at the start of it messes up because auto_del should actually be done after auto_ins but its probably easier. same for CR. -auto remove got caught between CRLF -CRLF mode, copy dragging a whole line removes an LF from original line -<h5>Geany specific</h5> -for example if changes are made, then disabled, then undo, all the locations will be wrong--so the plugin should be in the same state before using undo------or Newline hide -can't drag to the right of selection within another length of the selection,because of scintilla version;related (LF mode)drag a line,keeping the selection on one line, to the end of itself but before the next line,it acts like it was typed before itself -for example replacing a full selection treated like drag? -dragging far right will use the clipboard in geany on linux -make it so the mouse area for dragging selected text is the same as the visible selection--currently it is off by half a character--(fixed in a newer version of geany) -geany word count- doesnt count lines when in CR mode(current) -<h5>Notepad specific</h5> -notepad if you convert eol then reload scintilla line mode is not reset except if you for example switch tabs and switch back -in CRLF mode insert blank line above current menu item is broken and it doesnt update the column -the plugin doesn't work until a file is read from disk, not if only new unsaved files are open on startup -notepad word select was hidden accidentally - -</div> - </div> Modified: index.php 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -70,7 +70,6 @@ <h1>Third-Party plugins</h1> <ul> <li><a href="djynn.html">Djynn</a></li> - <li><a href="newline-plugin.html">Newline Plugin</a></li> <li><a href="https://sourceforge.net/projects/geanyeasyunicodeinput/">GeanyEasyUnicodeInput</a></li> <li><a href="https://sourceforge.net/projects/geanyunicodetocodepoint/">GeanyUnicodeToCodepoint</a></li> <li><a href="https://sourceforge.net/projects/geanyhighlightselectedword/">GeanyHighlightSelectedWord</a></li> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 612cb7: Merge pull request #873 from codebrainz/ignore-built-files
by Frank Lanitz 03 Jun '19

03 Jun '19

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Mon, 03 Jun 2019 08:16:03 UTC Commit: 612cb701520c1e3245a0f7a0e43bb76b69aa93b8 https://github.com/geany/geany-plugins/commit/612cb701520c1e3245a0f7a0e43bb… Log Message: ----------- Merge pull request #873 from codebrainz/ignore-built-files Add .gitignore files for specific plugins Modified Paths: -------------- geanydoc/.gitignore vimode/.gitignore Modified: geanydoc/.gitignore 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1 @@ +tests/unittests Modified: vimode/.gitignore 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1 @@ +src/viw -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 904c3f: Add .gitignore files for specific plugins
by Matthew Brush 02 Jun '19

02 Jun '19

Branch: refs/heads/master Author: Matthew Brush <matt(a)geany.org> Committer: Matthew Brush <matt(a)geany.org> Date: Sun, 02 Jun 2019 23:31:29 UTC Commit: 904c3fa8e8936a6be7f67f7a557de92474a94bba https://github.com/geany/geany-plugins/commit/904c3fa8e8936a6be7f67f7a557de… Log Message: ----------- Add .gitignore files for specific plugins Modified Paths: -------------- geanydoc/.gitignore vimode/.gitignore Modified: geanydoc/.gitignore 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1 @@ +tests/unittests Modified: vimode/.gitignore 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1 @@ +src/viw -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] cf9658: Merge pull request #867 from LarsGit223/wb-tm-control
by Frank Lanitz 02 Jun '19

02 Jun '19

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sun, 02 Jun 2019 12:04:00 UTC Commit: cf965815ee15619f07e3f1b35eece9861415a3f9 https://github.com/geany/geany-plugins/commit/cf965815ee15619f07e3f1b35eece… Log Message: ----------- Merge pull request #867 from LarsGit223/wb-tm-control workbench: revised tag-manager control/usage 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] 51d829: Merge pull request #869 from LarsGit223/wb-tree-lines
by Frank Lanitz 02 Jun '19

02 Jun '19

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sun, 02 Jun 2019 12:03:08 UTC Commit: 51d8292f52e3e26de106d7b16373f0f7e7e8565d https://github.com/geany/geany-plugins/commit/51d8292f52e3e26de106d7b16373f… Log Message: ----------- Merge pull request #869 from LarsGit223/wb-tree-lines 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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits June 2019