Plugins-Commits February 2018

plugins-commits@lists.geany.org

1 participants
37 discussions

[geany/geany-plugins] 378473: Fixup for ca2f9b8e787
by Frank Lanitz 25 Feb '18

25 Feb '18

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Sun, 25 Feb 2018 12:33:45 UTC Commit: 3784733be10ef51c69bc3bd108fc6de5e386abc9 https://github.com/geany/geany-plugins/commit/3784733be10ef51c69bc3bd108fc6… Log Message: ----------- Fixup for ca2f9b8e787 Modified Paths: -------------- addons/src/Makefile.am Modified: addons/src/Makefile.am 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -10,7 +10,7 @@ addons_la_SOURCES = \ ao_blanklines.h \ ao_bookmarklist.c \ ao_bookmarklist.h \ - ao_colortip.c + ao_colortip.c \ ao_colortip.h \ ao_copyfilepath.c \ ao_copyfilepath.h \ @@ -27,7 +27,7 @@ addons_la_SOURCES = \ ao_wrapwords.c \ ao_wrapwords.h \ ao_xmltagging.c \ - ao_xmltagging.h \ + ao_xmltagging.h addons_la_CPPFLAGS = $(AM_CPPFLAGS) \ -DG_LOG_DOMAIN=\"Addons\" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] ca2f9b: Addons: Fix distribution for ao_colortip.h and resort list
by Frank Lanitz 25 Feb '18

25 Feb '18

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Sun, 25 Feb 2018 12:25:24 UTC Commit: ca2f9b8e78797a679784784d106c4d4f86ca7fe6 https://github.com/geany/geany-plugins/commit/ca2f9b8e78797a679784784d106c4… Log Message: ----------- Addons: Fix distribution for ao_colortip.h and resort list Modified Paths: -------------- addons/src/Makefile.am Modified: addons/src/Makefile.am 29 lines changed, 15 insertions(+), 14 deletions(-) =================================================================== @@ -4,29 +4,30 @@ plugin = addons geanyplugins_LTLIBRARIES = addons.la addons_la_SOURCES = \ + addons.c \ addons.h \ + ao_blanklines.c \ ao_blanklines.h \ - ao_doclist.h \ - ao_openuri.h \ - ao_systray.h \ + ao_bookmarklist.c \ ao_bookmarklist.h \ - ao_markword.h \ - ao_tasks.h \ - ao_xmltagging.h \ - ao_wrapwords.h \ + ao_colortip.c + ao_colortip.h \ + ao_copyfilepath.c \ ao_copyfilepath.h \ - addons.c \ - ao_blanklines.c \ ao_doclist.c \ + ao_doclist.h \ + ao_markword.c \ + ao_markword.h \ ao_openuri.c \ + ao_openuri.h \ ao_systray.c \ - ao_bookmarklist.c \ - ao_markword.c \ + ao_systray.h \ ao_tasks.c \ - ao_xmltagging.c \ + ao_tasks.h \ ao_wrapwords.c \ - ao_copyfilepath.c \ - ao_colortip.c + ao_wrapwords.h \ + ao_xmltagging.c \ + ao_xmltagging.h \ addons_la_CPPFLAGS = $(AM_CPPFLAGS) \ -DG_LOG_DOMAIN=\"Addons\" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 9fc3bf: Windows Installer: Update removal list of unnecessary/uninstall files
by Enrico Tröger 25 Feb '18

25 Feb '18

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 25 Feb 2018 12:16:51 UTC Commit: 9fc3bf62e4e96ec0696c45a482788d7f3a145640 https://github.com/geany/geany-plugins/commit/9fc3bf62e4e96ec0696c45a482788… Log Message: ----------- Windows Installer: Update removal list of unnecessary/uninstall files Modified Paths: -------------- build/geany-plugins.nsi build/gtk-bundle-from-msys2.sh Modified: build/geany-plugins.nsi 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -224,6 +224,8 @@ Section Uninstall Delete "$INSTDIR\bin\libgnutlsxx-28.dll" Delete "$INSTDIR\bin\libgpg-error-0.dll" Delete "$INSTDIR\bin\libgpgme-11.dll" + Delete "$INSTDIR\bin\libqgpgme-7.dll" + Delete "$INSTDIR\bin\libgpgmepp-6.dll" Delete "$INSTDIR\bin\libgstallocators-1.0-0.dll" Delete "$INSTDIR\bin\libgstapp-1.0-0.dll" Delete "$INSTDIR\bin\libgstaudio-1.0-0.dll" Modified: build/gtk-bundle-from-msys2.sh 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -217,6 +217,7 @@ cleanup_unnecessary_files() { rm -rf lib/lua rm -rf lib/p11-kit rm -rf lib/python2.7 + rm -rf lib/python3.6 find lib -name '*.h' -delete find lib -name '*.a' -delete find lib -name '*.typelib' -delete -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 5dd3e7: Add missing mnemonic accelerators in the French translation
by Colomban Wendling 20 Feb '18

20 Feb '18

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 19 Feb 2018 23:12:25 UTC Commit: 5dd3e7d1cd675a9588a989f50d19e56e487d21de https://github.com/geany/geany-plugins/commit/5dd3e7d1cd675a9588a989f50d19e… Log Message: ----------- Add missing mnemonic accelerators in the French translation Also update copyright years. Modified Paths: -------------- po/fr.po Modified: po/fr.po 12 lines changed, 6 insertions(+), 6 deletions(-) =================================================================== @@ -1,16 +1,16 @@ # French translation for geany-plugins -# Copyright (C) 2009 THE PACKAGE'S COPYRIGHT HOLDER +# Copyright (C) 2009 - 2018 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the geany-plugins package. # Burlot Pascal <prublot(at)users(dot)sourceforge(dot)net>, 2009. # Lionel Fuentes <funto66(at)gmail(dot)com>, 2009 -# Colomban Wendling <ban(a)herbesfolles.org>, 2011, 2013. +# Colomban Wendling <ban(a)herbesfolles.org>, 2011 - 2018. # msgid "" msgstr "" "Project-Id-Version: Geany-Plugins 1.30\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-02-14 23:05-0600\n" -"PO-Revision-Date: 2018-02-15 23:00-0600\n" +"PO-Revision-Date: 2018-02-19 17:07-0600\n" "Last-Translator: Colomban Wendling <ban(a)herbesfolles.org>\n" "Language-Team: French <geany-i18n(a)uvena.de>\n" "Language: fr\n" @@ -6367,7 +6367,7 @@ msgstr "_UTF-8" #: ../scope/data/scope.glade.h:48 msgid "_Show .names" -msgstr "Afficher les .noms" +msgstr "_Afficher les .noms" #: ../scope/data/scope.glade.h:49 msgid "R_ead" @@ -6557,7 +6557,7 @@ msgstr "Environne_ment :" #: ../scope/data/scope.glade.h:103 msgid "_Working dir:" -msgstr "Dossier de travail :" +msgstr "Dossier de _travail :" #: ../scope/data/scope.glade.h:104 msgid "_Load script:" @@ -6573,7 +6573,7 @@ msgstr "" #: ../scope/data/scope.glade.h:107 msgid "_Temporary breakpoint on load at:" -msgstr "Point d'arrêt _temporaire au chargement à :" +msgstr "_Point d'arrêt temporaire au chargement à :" #: ../scope/data/scope.glade.h:108 #, fuzzy -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 991892: Fix plural forms for the French translation
by Colomban Wendling 20 Feb '18

20 Feb '18

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 19 Feb 2018 23:12:15 UTC Commit: 99189222ec157ea980d04d86b5cd1654cf737d56 https://github.com/geany/geany-plugins/commit/99189222ec157ea980d04d86b5cd1… Log Message: ----------- Fix plural forms for the French translation Modified Paths: -------------- po/fr.po Modified: po/fr.po 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -17,7 +17,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: s;\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" #: ../addons/src/ao_bookmarklist.c:190 msgid "(Empty Line)" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 9059b5: pohelper: Fix regular expression replacement when no matches are found
by Colomban Wendling 19 Feb '18

19 Feb '18

1 0

[geany/geany-plugins] cdaa96: pohelper: Make sure to only replace header fields in the actual header
by Colomban Wendling 19 Feb '18

19 Feb '18

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 19 Feb 2018 06:22:50 UTC Commit: cdaa961ce6b441162d4f6bcb329d0307d8945e01 https://github.com/geany/geany-plugins/commit/cdaa961ce6b441162d4f6bcb329d0… Log Message: ----------- pohelper: Make sure to only replace header fields in the actual header The header should be first and both entries we replace should be present, but be protective and make sure we find the header and only actually replace existing header entries. Modified Paths: -------------- pohelper/src/gph-plugin.c Modified: pohelper/src/gph-plugin.c 101 lines changed, 70 insertions(+), 31 deletions(-) =================================================================== @@ -453,16 +453,24 @@ goto_next_untranslated_or_fuzzy (GeanyDocument *doc) } } -/* basic regex search/replace without captures or back references */ +/* basic regex search/replace without captures or back references + * + * @sci A ScintillaObject + * @start Position where to start the search + * @end Position where to end the search, or -1 for the buffer's end + * @scire The Scintilla regular expression + * @repl The replacement text */ static gboolean regex_replace (ScintillaObject *sci, + gint start, + gint end, const gchar *scire, const gchar *repl) { struct Sci_TextToFind ttf; - ttf.chrg.cpMin = 0; - ttf.chrg.cpMax = sci_get_length (sci); + ttf.chrg.cpMin = start; + ttf.chrg.cpMax = end >= 0 ? end : sci_get_length (sci); ttf.lpstrText = (gchar *) scire; if (sci_find_text (sci, SCFIND_REGEXP, &ttf) != -1) { @@ -505,34 +513,6 @@ escape_string (const gchar *str) return new; } -static void -on_document_save (GObject *obj, - GeanyDocument *doc, - gpointer user_data) -{ - if (doc_is_po (doc) && plugin.update_headers) { - gchar *name = escape_string (geany_data->template_prefs->developer); - gchar *mail = escape_string (geany_data->template_prefs->mail); - gchar *date; - gchar *translator; - - date = utils_get_date_time ("\"PO-Revision-Date: %Y-%m-%d %H:%M%z\\n\"", - NULL); - translator = g_strdup_printf ("\"Last-Translator: %s <%s>\\n\"", - name, mail); - - sci_start_undo_action (doc->editor->sci); - regex_replace (doc->editor->sci, "^\"PO-Revision-Date: .*\"$", date); - regex_replace (doc->editor->sci, "^\"Last-Translator: .*\"$", translator); - sci_end_undo_action (doc->editor->sci); - - g_free (date); - g_free (translator); - g_free (name); - g_free (mail); - } -} - static void update_menu_items_sensitivity (GeanyDocument *doc) { @@ -1212,6 +1192,65 @@ on_kb_toggle_fuzziness (guint key_id) } } +static gint +find_header_start (GeanyDocument *doc) +{ + if (doc_is_po (doc)) { + for (gint line = 0; line < sci_get_line_count (doc->editor->sci); line++) { + if (find_first_non_default_style_on_line (doc->editor->sci, line) == SCE_PO_MSGID) { + gint pos = sci_get_position_from_line (doc->editor->sci, line); + GString *str = get_msgid_text_at (doc, pos); + + if (str) { + gboolean is_header = (*str->str == 0); + + g_string_free (str, TRUE); + if (is_header) { + return pos; + } + } + } + } + } + + return -1; +} + +static void +on_document_save (GObject *obj, + GeanyDocument *doc, + gpointer user_data) +{ + gint header_start; + + if (doc_is_po (doc) && plugin.update_headers && + (header_start = find_header_start (doc)) >= 0) { + gchar *name = escape_string (geany_data->template_prefs->developer); + gchar *mail = escape_string (geany_data->template_prefs->mail); + gchar *date; + gchar *translator; + + date = utils_get_date_time ("\"PO-Revision-Date: %Y-%m-%d %H:%M%z\\n\"", + NULL); + translator = g_strdup_printf ("\"Last-Translator: %s <%s>\\n\"", + name, mail); + + sci_start_undo_action (doc->editor->sci); + regex_replace (doc->editor->sci, + header_start, find_msgstr_end_at (doc, header_start) + 1, + "^\"PO-Revision-Date: .*\"$", date); + regex_replace (doc->editor->sci, + header_start, find_msgstr_end_at (doc, header_start) + 1, + "^\"Last-Translator: .*\"$", translator); + sci_end_undo_action (doc->editor->sci); + + g_free (date); + g_free (translator); + g_free (name); + g_free (mail); + } +} + typedef struct { gdouble translated; gdouble fuzzy; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 3485da: pohelper: Use GP version for the plugin
by Colomban Wendling 19 Feb '18

19 Feb '18

1 0

[geany/geany-plugins] cff154: pohelper: Update X-Generator header if present
by Colomban Wendling 19 Feb '18

19 Feb '18

1 0

[geany/geany-plugins] f76f80: pohelper: Properly break all multiline strings on multiple lines
by Colomban Wendling 19 Feb '18

19 Feb '18

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 19 Feb 2018 06:22:41 UTC Commit: f76f801ce19bb24b70b4fd424498a408dec20d67 https://github.com/geany/geany-plugins/commit/f76f801ce19bb24b70b4fd424498a… Log Message: ----------- pohelper: Properly break all multiline strings on multiple lines If a string contains an explicit newline, properly break it onto multiple lines even if it would fit on a single line. Modified Paths: -------------- pohelper/src/gph-plugin.c Modified: pohelper/src/gph-plugin.c 5 lines changed, 3 insertions(+), 2 deletions(-) =================================================================== @@ -951,8 +951,9 @@ on_kb_reflow (guint key_id) (uptr_t) start, end + 1 - start); msgstr_kw_len = start - sci_get_position_from_line (sci, sci_get_line_from_position (sci, start)); - if (msgstr_kw_len + len + 2 <= line_len) { - /* if all can go in the msgstr line, put it here */ + if (msgstr_kw_len + len + 2 <= line_len && + find_line_break (msgstr->str) == NULL) { + /* if all can go in the msgstr line and there's no newline, put it here */ gchar *text = g_strconcat ("\"", msgstr->str, "\"", NULL); sci_insert_text (sci, start, text); g_free (text); -------------- 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 February 2018