Branch: refs/heads/master Author: Enrico Tröger enrico.troeger@uvena.de Committer: GitHub noreply@github.com Date: Sun, 25 Nov 2018 22:25:07 UTC Commit: 715ed5fd0f6675adf2a99266c3b50ed249977293 https://github.com/geany/geany-plugins/commit/715ed5fd0f6675adf2a99266c3b50e...
Log Message: ----------- Merge branch 'master' into issue761_windows_ship_letsencrypt_certificate
Modified Paths: -------------- README build/geany-plugins.nsi build/gtk-bundle-from-msys2.sh build/scope.m4 devhelp/README geanylua/glspi_keycmd.h geanylua/glspi_sci.h geanylua/glspi_ver.h geanyvc/src/geanyvc.c latex/README po/POTFILES.in po/be.po po/ca.po po/da.po po/de.po po/el.po po/es.po po/fr.po po/gl.po po/it.po po/ja.po po/kk.po po/nl.po po/pt.po po/pt_BR.po po/ru.po po/tr.po po/zh_CN.po scope/data/Makefile.am scope/data/scope_gtk3.glade scope/src/Makefile.am scope/src/conterm.c scope/src/plugme.c scope/src/prefs.c scope/src/prefs.h scope/src/scope.c scope/src/utils.c treebrowser/src/treebrowser.c utils/src/Makefile.am utils/src/gp_gtkcompat.h utils/src/gp_vtecompat.c utils/src/gp_vtecompat.h workbench/src/dialogs.c
Modified: README 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -57,15 +57,16 @@ Available plugins are: * ``automark`` -- the Automark plugin * ``codenav`` -- the CodeNav plugin * ``commander`` -- the Commander plugin +* ``cppcheck`` -- static code analysis using cppcheck (see also HACKING) * ``debugger`` -- the Debugger plugin * ``defineformat`` -- the Defineformat plugin * ``devhelp`` -- the devhelp plugin +* ``extra-c-warnings`` -- extra C Compiler warnings (see also HACKING) * ``geanyctags`` -- the GeanyCtags plugin * ``geanydoc`` -- the GeanyDoc plugin * ``geanyextrasel`` -- the GeanyExtraSel plugin * ``geanygendoc`` -- the GeanyGenDoc plugin * ``geanyinsertnum`` -- the GeanyInsertNum plugin -* ``latex`` -- the LaTeX plugin * ``geanylua`` -- the GeanyLua plugin * ``geanymacro`` -- the GeanyMacro plugin * ``geanyminiscript`` -- the GeanyMiniScript plugin @@ -77,6 +78,7 @@ Available plugins are: * ``geniuspaste`` -- the paste to a pastebin plugin * ``gitchangebar`` -- the GitChangeBar plugin * ``gtkspell`` -- GeanyVC's spell-check support +* ``latex`` -- the LaTeX plugin * ``lineoperations`` -- simple line functions that can be applied to an open file * ``lipsum`` -- the Lipsum plugin * ``markdown`` -- the Markdown plugin @@ -91,13 +93,11 @@ Available plugins are: * ``sendmail`` -- the GeanySendmail plugin * ``shiftcolumn`` -- the ShiftColumn plugin * ``spellcheck`` -- the spellcheck plugin -* ``treebrowser`` -- the Treebrowser plugin * ``tableconvert`` -- the Tableconvert plugin +* ``treebrowser`` -- the Treebrowser plugin * ``updatechecker`` -- the Updatechecker plugin * ``webhelper`` -- the WebHelper plugin * ``xmlsnippets`` -- the XMLSnippets plugin -* ``extra-c-warnings`` -- extra C Compiler warnings (see also HACKING) -* ``cppcheck`` -- static code analysis using cppcheck (see also HACKING)
Example::
Modified: build/geany-plugins.nsi 28 lines changed, 19 insertions(+), 9 deletions(-) =================================================================== @@ -208,7 +208,11 @@ Section Uninstall Delete "$INSTDIR\bin\gpgme-tool.exe" Delete "$INSTDIR\bin\gpgme-w32spawn.exe" Delete "$INSTDIR\bin\libassuan-0.dll" + Delete "$INSTDIR\bin\libbrotlicommon.dll" + Delete "$INSTDIR\bin\libbrotlidec.dll" + Delete "$INSTDIR\bin\libbrotlienc.dll" Delete "$INSTDIR\bin\libctpl-2.dll" + Delete "$INSTDIR\bin\libcrypto-1_1.dll" Delete "$INSTDIR\bin\libcurl-4.dll" Delete "$INSTDIR\bin\libdbus-1-3.dll" Delete "$INSTDIR\bin\libdbus-glib-1-2.dll" @@ -249,15 +253,15 @@ Section Uninstall Delete "$INSTDIR\bin\libhistory7.dll" Delete "$INSTDIR\bin\libhogweed-4.dll" Delete "$INSTDIR\bin\libhttp_parser-2.dll" - Delete "$INSTDIR\bin\libhunspell-1.6-0.dll" - Delete "$INSTDIR\bin\libicudt61.dll" - Delete "$INSTDIR\bin\libicuin61.dll" - Delete "$INSTDIR\bin\libicuio61.dll" - Delete "$INSTDIR\bin\libicule61.dll" - Delete "$INSTDIR\bin\libiculx61.dll" - Delete "$INSTDIR\bin\libicutest61.dll" - Delete "$INSTDIR\bin\libicutu61.dll" - Delete "$INSTDIR\bin\libicuuc61.dll" + Delete "$INSTDIR\bin\libhunspell-1.7-0.dll" + Delete "$INSTDIR\bin\libicudt62.dll" + Delete "$INSTDIR\bin\libicuin62.dll" + Delete "$INSTDIR\bin\libicuio62.dll" + Delete "$INSTDIR\bin\libicule62.dll" + Delete "$INSTDIR\bin\libiculx62.dll" + Delete "$INSTDIR\bin\libicutest62.dll" + Delete "$INSTDIR\bin\libicutu62.dll" + Delete "$INSTDIR\bin\libicuuc62.dll" Delete "$INSTDIR\bin\libidn2-0.dll" Delete "$INSTDIR\bin\libjavascriptcoregtk-1.0-0.dll" Delete "$INSTDIR\bin\libjavascriptcoregtk-3.0-0.dll" @@ -269,12 +273,14 @@ Section Uninstall Delete "$INSTDIR\bin\liborc-0.4-0.dll" Delete "$INSTDIR\bin\liborc-test-0.4-0.dll" Delete "$INSTDIR\bin\libp11-kit-0.dll" + Delete "$INSTDIR\bin\libpsl-5.dll" Delete "$INSTDIR\bin\libreadline7.dll" Delete "$INSTDIR\bin\librtmp-1.dll" Delete "$INSTDIR\bin\libsoup-2.4-1.dll" Delete "$INSTDIR\bin\libsoup-gnome-2.4-1.dll" Delete "$INSTDIR\bin\libsqlite3-0.dll" Delete "$INSTDIR\bin\libssh2-1.dll" + Delete "$INSTDIR\bin\libssl-1_1.dll" Delete "$INSTDIR\bin\libsystre-0.dll" Delete "$INSTDIR\bin\libtasn1-6.dll" Delete "$INSTDIR\bin\libtermcap-0.dll" @@ -302,8 +308,10 @@ Section Uninstall Delete "$INSTDIR\bin\lua51.dll" Delete "$INSTDIR\bin\ssleay32.dll"
+ RMDir /r "$INSTDIR\etc\pki" RMDir /r "$INSTDIR\lib\enchant-2" RMDir /r "$INSTDIR\lib\engines" + RMDir /r "$INSTDIR\lib\engines-1_1" RMDir /r "$INSTDIR\lib\gio" RMDir /r "$INSTDIR\lib\gstreamer-1.0" RMDir /r "$INSTDIR\lib\pkcs11" @@ -314,6 +322,7 @@ Section Uninstall RMDir /r "$INSTDIR\share\enchant" RMDir /r "$INSTDIR\share\libgpg-error" RMDir /r "$INSTDIR\share\p11-kit" + RMDir /r "$INSTDIR\share\pki" RMDir /r "$INSTDIR\share\vala" RMDir /r "$INSTDIR\share\webkitgtk-1.0" RMDir /r "$INSTDIR\share\webkitgtk-3.0" @@ -333,6 +342,7 @@ Section Uninstall
; only if empty RMDir "$INSTDIR\bin" + RMDir "$INSTDIR\etc" RMDir "$INSTDIR\lib\geany" RMDir "$INSTDIR\lib" RMDir "$INSTDIR\libexec"
Modified: build/gtk-bundle-from-msys2.sh 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -24,6 +24,7 @@ gtkv="3" # the rest is dependency-dependency packages=" p11-kit +brotli ca-certificates ctags ctpl-git @@ -49,6 +50,7 @@ libgpg-error libgit2 libidn2 libjpeg-turbo +libpsl libogg libsoup libssh2
Modified: build/scope.m4 8 lines changed, 5 insertions(+), 3 deletions(-) =================================================================== @@ -1,16 +1,18 @@ AC_DEFUN([GP_CHECK_SCOPE], [ GP_ARG_DISABLE([Scope], [auto]) - GP_CHECK_PLUGIN_GTK2_ONLY([Scope])
case "$host_os" in cygwin* | mingw* | win32*) PTY_LIBS="" ;;
*) - GP_CHECK_PLUGIN_DEPS([scope], [VTE], - [vte >= 0.17]) + + GP_CHECK_GTK3([vte_package=vte-2.91], [vte_package="vte >= 0.17"]) + GP_CHECK_PLUGIN_DEPS([scope], [VTE], [$vte_package]) + AM_CONDITIONAL([GP_VTE291_USED], [test "$enable_scope" != no && test "$vte_package" = vte-2.91]) + AC_CHECK_HEADERS([util.h pty.h libutil.h]) PTY_LIBS="-lutil" ;;
Modified: devhelp/README 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -111,4 +111,4 @@ Requirements Contact developers ------------------
-You can email me at codebrainz@users.sourceforge.net, or find me on the #geany IRC channel on FreeNode, with the nickname 'codebrainz'. +You can email me at matt@geany.org, or find me on the #geany IRC channel on FreeNode, with the nickname 'codebrainz'.
Modified: geanylua/glspi_keycmd.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -43,6 +43,7 @@ static KeyCmdHashEntry key_cmd_hash_entries[] = { {"DOCUMENT_REMOVE_MARKERS_INDICATORS", GEANY_KEY_GROUP_DOCUMENT, GEANY_KEYS_DOCUMENT_REMOVE_MARKERS_INDICATORS}, {"DOCUMENT_REPLACESPACES", GEANY_KEY_GROUP_DOCUMENT, GEANY_KEYS_DOCUMENT_REPLACESPACES}, {"DOCUMENT_REPLACETABS", GEANY_KEY_GROUP_DOCUMENT, GEANY_KEYS_DOCUMENT_REPLACETABS}, + {"DOCUMENT_STRIPTRAILINGSPACES", GEANY_KEY_GROUP_DOCUMENT, GEANY_KEYS_DOCUMENT_STRIPTRAILINGSPACES}, {"DOCUMENT_TOGGLEFOLD", GEANY_KEY_GROUP_DOCUMENT, GEANY_KEYS_DOCUMENT_TOGGLEFOLD}, {"DOCUMENT_UNFOLDALL", GEANY_KEY_GROUP_DOCUMENT, GEANY_KEYS_DOCUMENT_UNFOLDALL}, {"EDITOR_AUTOCOMPLETE", GEANY_KEY_GROUP_EDITOR, GEANY_KEYS_EDITOR_AUTOCOMPLETE},
Modified: geanylua/glspi_sci.h 13 lines changed, 8 insertions(+), 5 deletions(-) =================================================================== @@ -173,8 +173,6 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"SETWHITESPACEBACK", SLT_VOID, SCI_SETWHITESPACEBACK, SLT_BOOL, SLT_INT}, {"SETWHITESPACESIZE", SLT_VOID, SCI_SETWHITESPACESIZE, SLT_INT, SLT_VOID}, {"GETWHITESPACESIZE", SLT_INT, SCI_GETWHITESPACESIZE, SLT_VOID, SLT_VOID}, - {"SETSTYLEBITS", SLT_VOID, SCI_SETSTYLEBITS, SLT_INT, SLT_VOID}, - {"GETSTYLEBITS", SLT_INT, SCI_GETSTYLEBITS, SLT_VOID, SLT_VOID}, {"SETLINESTATE", SLT_VOID, SCI_SETLINESTATE, SLT_INT, SLT_INT}, {"GETLINESTATE", SLT_INT, SCI_GETLINESTATE, SLT_INT, SLT_VOID}, {"GETMAXLINESTATE", SLT_INT, SCI_GETMAXLINESTATE, SLT_VOID, SLT_VOID}, @@ -470,9 +468,10 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"SELECTIONISRECTANGLE", SLT_BOOL, SCI_SELECTIONISRECTANGLE, SLT_VOID, SLT_VOID}, {"SETZOOM", SLT_VOID, SCI_SETZOOM, SLT_INT, SLT_VOID}, {"GETZOOM", SLT_INT, SCI_GETZOOM, SLT_VOID, SLT_VOID}, - {"CREATEDOCUMENT", SLT_INT, SCI_CREATEDOCUMENT, SLT_VOID, SLT_VOID}, + {"CREATEDOCUMENT", SLT_INT, SCI_CREATEDOCUMENT, SLT_INT, SLT_INT}, {"ADDREFDOCUMENT", SLT_VOID, SCI_ADDREFDOCUMENT, SLT_VOID, SLT_INT}, {"RELEASEDOCUMENT", SLT_VOID, SCI_RELEASEDOCUMENT, SLT_VOID, SLT_INT}, + {"GETDOCUMENTOPTIONS", SLT_INT, SCI_GETDOCUMENTOPTIONS, SLT_VOID, SLT_VOID}, {"GETMODEVENTMASK", SLT_INT, SCI_GETMODEVENTMASK, SLT_VOID, SLT_VOID}, {"SETFOCUS", SLT_VOID, SCI_SETFOCUS, SLT_BOOL, SLT_VOID}, {"GETFOCUS", SLT_BOOL, SCI_GETFOCUS, SLT_VOID, SLT_VOID}, @@ -520,6 +519,7 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"COPYTEXT", SLT_VOID, SCI_COPYTEXT, SLT_INT, SLT_STRING}, {"SETSELECTIONMODE", SLT_VOID, SCI_SETSELECTIONMODE, SLT_INT, SLT_VOID}, {"GETSELECTIONMODE", SLT_INT, SCI_GETSELECTIONMODE, SLT_VOID, SLT_VOID}, + {"GETMOVEEXTENDSSELECTION", SLT_BOOL, SCI_GETMOVEEXTENDSSELECTION, SLT_VOID, SLT_VOID}, {"GETLINESELSTARTPOSITION", SLT_INT, SCI_GETLINESELSTARTPOSITION, SLT_INT, SLT_VOID}, {"GETLINESELENDPOSITION", SLT_INT, SCI_GETLINESELENDPOSITION, SLT_INT, SLT_VOID}, {"LINEDOWNRECTEXTEND", SLT_VOID, SCI_LINEDOWNRECTEXTEND, SLT_VOID, SLT_VOID}, @@ -688,7 +688,7 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"SCROLLTOEND", SLT_VOID, SCI_SCROLLTOEND, SLT_VOID, SLT_VOID}, {"SETTECHNOLOGY", SLT_VOID, SCI_SETTECHNOLOGY, SLT_INT, SLT_VOID}, {"GETTECHNOLOGY", SLT_INT, SCI_GETTECHNOLOGY, SLT_VOID, SLT_VOID}, - {"CREATELOADER", SLT_INT, SCI_CREATELOADER, SLT_INT, SLT_VOID}, + {"CREATELOADER", SLT_INT, SCI_CREATELOADER, SLT_INT, SLT_INT}, {"FINDINDICATORSHOW", SLT_VOID, SCI_FINDINDICATORSHOW, SLT_INT, SLT_INT}, {"FINDINDICATORFLASH", SLT_VOID, SCI_FINDINDICATORFLASH, SLT_INT, SLT_INT}, {"FINDINDICATORHIDE", SLT_VOID, SCI_FINDINDICATORHIDE, SLT_VOID, SLT_VOID}, @@ -714,7 +714,6 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"GETPROPERTY", SLT_INT, SCI_GETPROPERTY, SLT_STRING, SLT_STRINGRESULT}, {"GETPROPERTYEXPANDED", SLT_INT, SCI_GETPROPERTYEXPANDED, SLT_STRING, SLT_STRINGRESULT}, {"GETPROPERTYINT", SLT_INT, SCI_GETPROPERTYINT, SLT_STRING, SLT_INT}, - {"GETSTYLEBITSNEEDED", SLT_INT, SCI_GETSTYLEBITSNEEDED, SLT_VOID, SLT_VOID}, {"GETLEXERLANGUAGE", SLT_INT, SCI_GETLEXERLANGUAGE, SLT_VOID, SLT_STRINGRESULT}, {"PRIVATELEXERCALL", SLT_INT, SCI_PRIVATELEXERCALL, SLT_INT, SLT_INT}, {"PROPERTYNAMES", SLT_INT, SCI_PROPERTYNAMES, SLT_VOID, SLT_STRINGRESULT}, @@ -731,5 +730,9 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"SETIDENTIFIERS", SLT_VOID, SCI_SETIDENTIFIERS, SLT_INT, SLT_STRING}, {"DISTANCETOSECONDARYSTYLES", SLT_INT, SCI_DISTANCETOSECONDARYSTYLES, SLT_VOID, SLT_VOID}, {"GETSUBSTYLEBASES", SLT_INT, SCI_GETSUBSTYLEBASES, SLT_VOID, SLT_STRINGRESULT}, + {"GETNAMEDSTYLES", SLT_INT, SCI_GETNAMEDSTYLES, SLT_VOID, SLT_VOID}, + {"NAMEOFSTYLE", SLT_INT, SCI_NAMEOFSTYLE, SLT_INT, SLT_STRINGRESULT}, + {"TAGSOFSTYLE", SLT_INT, SCI_TAGSOFSTYLE, SLT_INT, SLT_STRINGRESULT}, + {"DESCRIPTIONOFSTYLE", SLT_INT, SCI_DESCRIPTIONOFSTYLE, SLT_INT, SLT_STRINGRESULT}, {NULL, SLT_LAST, 0, SLT_LAST, SLT_LAST} };
Modified: geanylua/glspi_ver.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -12,7 +12,7 @@
#define PLUGIN_AUTHOR "Jeff Pohlmeyer"
-#define MY_GEANY_API_VER 235 +#define MY_GEANY_API_VER 239
#define LUA_MODULE_NAME "geany"
Modified: geanyvc/src/geanyvc.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1948,7 +1948,7 @@ plugin_configure(GtkDialog * dialog) widgets.cb_attach_to_menubar = gtk_check_button_new_with_label(_("Attach menu to menubar")); gtk_widget_set_tooltip_text(widgets.cb_editor_menu_entries, _("Whether menu for this plugin are getting placed either " - "inside tools menu or directly inside Geany's menubar." + "inside tools menu or directly inside Geany's menubar. " "Will take in account after next start of GeanyVC")); gtk_button_set_focus_on_click(GTK_BUTTON(widgets.cb_attach_to_menubar), FALSE); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets.cb_attach_to_menubar),
Modified: latex/README 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,4 @@ Documentation has been moved into doc subfolder. There you you should find a PDF or HTML file shipped with sources of this plugin. If there is no documentation available there, please check -http://frank.uvena.de/en/Geany/geanylatex instead. +https://plugins.geany.org/latex.html instead.
Modified: po/POTFILES.in 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -267,6 +267,7 @@ projectorganizer/src/prjorg-sidebar.c
# Scope scope/data/scope.glade +scope/data/scope_gtk3.glade scope/src/break.c scope/src/conterm.c scope/src/debug.c
Modified: po/be.po 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -4570,7 +4570,7 @@ msgstr "" #: ../geanyvc/src/geanyvc.c:1950 msgid "" "Whether menu for this plugin are getting placed either inside tools menu or " -"directly inside Geany's menubar.Will take in account after next start of " +"directly inside Geany's menubar. Will take in account after next start of " "GeanyVC" msgstr ""
Modified: po/ca.po 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -4498,7 +4498,7 @@ msgstr "Annexar el menú a la barra d'eines" #: ../geanyvc/src/geanyvc.c:1950 msgid "" "Whether menu for this plugin are getting placed either inside tools menu or " -"directly inside Geany's menubar.Will take in account after next start of " +"directly inside Geany's menubar. Will take in account after next start of " "GeanyVC" msgstr ""
Modified: po/da.po 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -4509,7 +4509,7 @@ msgstr "" #: ../geanyvc/src/geanyvc.c:1950 msgid "" "Whether menu for this plugin are getting placed either inside tools menu or " -"directly inside Geany's menubar.Will take in account after next start of " +"directly inside Geany's menubar. Will take in account after next start of " "GeanyVC" msgstr ""
Modified: po/de.po 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -4811,7 +4811,7 @@ msgstr "Menü an Menüleiste anhängen" #: ../geanyvc/src/geanyvc.c:1950 msgid "" "Whether menu for this plugin are getting placed either inside tools menu or " -"directly inside Geany's menubar.Will take in account after next start of " +"directly inside Geany's menubar. Will take in account after next start of " "GeanyVC" msgstr "" "Das Menü für dieses Plugin kann entweder im Werkzeugmenü oder direkt in der "
Modified: po/el.po 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -4471,7 +4471,7 @@ msgstr "" #: ../geanyvc/src/geanyvc.c:1950 msgid "" "Whether menu for this plugin are getting placed either inside tools menu or " -"directly inside Geany's menubar.Will take in account after next start of " +"directly inside Geany's menubar. Will take in account after next start of " "GeanyVC" msgstr ""
Modified: po/es.po 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -4786,7 +4786,7 @@ msgstr "Añadir menú a la barra de menús" #: ../geanyvc/src/geanyvc.c:1950 msgid "" "Whether menu for this plugin are getting placed either inside tools menu or " -"directly inside Geany's menubar.Will take in account after next start of " +"directly inside Geany's menubar. Will take in account after next start of " "GeanyVC" msgstr "" "Indica si el menú de este plugin se colocará dentro del menú de herramientas "
Modified: po/fr.po 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -4798,7 +4798,7 @@ msgstr "Attacher le menu à la barre de menu" #: ../geanyvc/src/geanyvc.c:1950 msgid "" "Whether menu for this plugin are getting placed either inside tools menu or " -"directly inside Geany's menubar.Will take in account after next start of " +"directly inside Geany's menubar. Will take in account after next start of " "GeanyVC" msgstr "" "Choisit si le menu du plugin est placé dans le menu « Outils » ou "
Modified: po/gl.po 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -4737,7 +4737,7 @@ msgstr "" #: ../geanyvc/src/geanyvc.c:1950 msgid "" "Whether menu for this plugin are getting placed either inside tools menu or " -"directly inside Geany's menubar.Will take in account after next start of " +"directly inside Geany's menubar. Will take in account after next start of " "GeanyVC" msgstr ""
Modified: po/it.po 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -4741,7 +4741,7 @@ msgstr "Poni menu nella menubar" #: ../geanyvc/src/geanyvc.c:1950 msgid "" "Whether menu for this plugin are getting placed either inside tools menu or " -"directly inside Geany's menubar.Will take in account after next start of " +"directly inside Geany's menubar. Will take in account after next start of " "GeanyVC" msgstr "" "Imposta se il menu per questo plugin deve essere posizionato all'interno del "
Modified: po/ja.po 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -4663,7 +4663,7 @@ msgstr "メニューをメニューバーに追加" #: ../geanyvc/src/geanyvc.c:1950 msgid "" "Whether menu for this plugin are getting placed either inside tools menu or " -"directly inside Geany's menubar.Will take in account after next start of " +"directly inside Geany's menubar. Will take in account after next start of " "GeanyVC" msgstr "" "このプラグインのメニューがツールメニューの中に表示されるかGeanyのメニューバー"
Modified: po/kk.po 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -4472,7 +4472,7 @@ msgstr "" #: ../geanyvc/src/geanyvc.c:1950 msgid "" "Whether menu for this plugin are getting placed either inside tools menu or " -"directly inside Geany's menubar.Will take in account after next start of " +"directly inside Geany's menubar. Will take in account after next start of " "GeanyVC" msgstr ""
Modified: po/nl.po 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -4537,7 +4537,7 @@ msgstr "" #: ../geanyvc/src/geanyvc.c:1950 msgid "" "Whether menu for this plugin are getting placed either inside tools menu or " -"directly inside Geany's menubar.Will take in account after next start of " +"directly inside Geany's menubar. Will take in account after next start of " "GeanyVC" msgstr ""
Modified: po/pt.po 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -4775,7 +4775,7 @@ msgstr "Anexar menu à barra de menus" #: ../geanyvc/src/geanyvc.c:1950 msgid "" "Whether menu for this plugin are getting placed either inside tools menu or " -"directly inside Geany's menubar.Will take in account after next start of " +"directly inside Geany's menubar. Will take in account after next start of " "GeanyVC" msgstr "" "Se o menu da extensão é colocado dentro do menu Ferramentas ou directamente "
Modified: po/pt_BR.po 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -4748,7 +4748,7 @@ msgstr "" #: ../geanyvc/src/geanyvc.c:1950 msgid "" "Whether menu for this plugin are getting placed either inside tools menu or " -"directly inside Geany's menubar.Will take in account after next start of " +"directly inside Geany's menubar. Will take in account after next start of " "GeanyVC" msgstr ""
Modified: po/ru.po 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -4731,7 +4731,7 @@ msgstr "Разместить меню на главной панели" #: ../geanyvc/src/geanyvc.c:1950 msgid "" "Whether menu for this plugin are getting placed either inside tools menu or " -"directly inside Geany's menubar.Will take in account after next start of " +"directly inside Geany's menubar. Will take in account after next start of " "GeanyVC" msgstr "" "Располагать меню данного модуля либо внутри меню Инструменты либо "
Modified: po/tr.po 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -4576,7 +4576,7 @@ msgstr "" #: ../geanyvc/src/geanyvc.c:1950 msgid "" "Whether menu for this plugin are getting placed either inside tools menu or " -"directly inside Geany's menubar.Will take in account after next start of " +"directly inside Geany's menubar. Will take in account after next start of " "GeanyVC" msgstr ""
Modified: po/zh_CN.po 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -4735,7 +4735,7 @@ msgstr "" #: ../geanyvc/src/geanyvc.c:1950 msgid "" "Whether menu for this plugin are getting placed either inside tools menu or " -"directly inside Geany's menubar.Will take in account after next start of " +"directly inside Geany's menubar. Will take in account after next start of " "GeanyVC" msgstr ""
Modified: scope/data/Makefile.am 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -29,4 +29,5 @@ dist_plugindata_DATA = \ StepOver.png \ StepOver22.png \ StepOver24.png \ - scope.glade + scope.glade \ + scope_gtk3.glade
Modified: scope/data/scope_gtk3.glade 3982 lines changed, 3982 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: scope/src/Makefile.am 6 lines changed, 4 insertions(+), 2 deletions(-) =================================================================== @@ -51,11 +51,13 @@ scope_la_SOURCES = \ store/scptreestore.h \ store/scptreestore.c
-scope_la_LIBADD = $(COMMONLIBS) $(VTE_LIBS) $(PTY_LIBS) +scope_la_LIBADD = $(COMMONLIBS) $(VTE_LIBS) $(PTY_LIBS) \ + $(top_builddir)/utils/src/libgeanypluginutils.la
scope_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN="Scope" scope_la_CFLAGS = $(AM_CFLAGS) $(VTE_CFLAGS) \ -DPLUGINHTMLDOCDIR="$(plugindocdir)/html" \ - -Wno-shadow + -Wno-shadow \ + -I$(top_srcdir)/utils/src
include $(top_srcdir)/build/cppcheck.mk
Modified: scope/src/conterm.c 45 lines changed, 44 insertions(+), 1 deletions(-) =================================================================== @@ -33,6 +33,7 @@
#ifdef G_OS_UNIX #include <vte/vte.h> +#include <gp_vtecompat.h> /* instead of detecting N kinds of *nix */ #if defined(HAVE_UTIL_H) #include <util.h> @@ -394,19 +395,53 @@ void conterm_load_config(void) pref_vte_font = utils_get_setting_string(config, "VTE", "font", "Monospace 10"); pref_vte_scrollback = utils_get_setting_integer(config, "VTE", "scrollback_lines", 500); tmp_string = utils_get_setting_string(config, "VTE", "colour_fore", "#ffffff"); +#if !GTK_CHECK_VERSION(3, 14, 0) gdk_color_parse(tmp_string, &pref_vte_colour_fore); +#else + gdk_rgba_parse(&pref_vte_colour_fore, tmp_string); +#endif g_free(tmp_string); tmp_string = utils_get_setting_string(config, "VTE", "colour_back", "#000000"); +#if !GTK_CHECK_VERSION(3, 14, 0) gdk_color_parse(tmp_string, &pref_vte_colour_back); +#else + gdk_rgba_parse(&pref_vte_colour_back, tmp_string); +#endif g_free(tmp_string); g_key_file_free(config); g_free(configfile); }
static void context_apply_config(GtkWidget *console) { +#if !GTK_CHECK_VERSION(3, 0, 0) gtk_widget_modify_base(console, GTK_STATE_NORMAL, &pref_vte_colour_back); gtk_widget_modify_cursor(console, &pref_vte_colour_fore, &pref_vte_colour_back); +#else + GString *css_string; + GtkStyleContext *context; + GtkCssProvider *provider; + gchar *css_code, *color, *background_color; + + color = gdk_rgba_to_string (&pref_vte_colour_fore); + background_color = gdk_rgba_to_string (&pref_vte_colour_back); + + gtk_widget_set_name(console, "scope-console"); + context = gtk_widget_get_style_context(console); + provider = gtk_css_provider_new(); + gtk_style_context_add_provider(context, GTK_STYLE_PROVIDER(provider), + GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); + + css_string = g_string_new(NULL); + g_string_printf(css_string, "#scope-console { color: %s; background-color: %s; }", + color, background_color); + css_code = g_string_free(css_string, FALSE); + + gtk_css_provider_load_from_data(GTK_CSS_PROVIDER(provider), css_code, -1, NULL); + + g_free(css_code); + g_object_unref(provider); +#endif ui_widget_modify_font_from_string(console, pref_vte_font); }
@@ -457,7 +492,15 @@ void conterm_init(void) { gint vte_border_x, vte_border_y;
-#if VTE_CHECK_VERSION(0, 24, 0) +#if GTK_CHECK_VERSION(3, 4, 0) + GtkStyleContext *context; + GtkBorder border; + + context = gtk_widget_get_style_context (console); + gtk_style_context_get_padding (context, GTK_STATE_FLAG_NORMAL, &border); + vte_border_x = border.left + border.right; + vte_border_y = border.top + border.bottom; +#elif VTE_CHECK_VERSION(0, 24, 0) GtkBorder *border = NULL;
gtk_widget_style_get(console, "inner-border", &border, NULL);
Modified: scope/src/plugme.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -23,6 +23,10 @@
#include <string.h>
+#include "common.h" + +#include <gp_gtkcompat.h> + #include "geanyplugin.h"
extern GeanyData *geany_data;
Modified: scope/src/prefs.c 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -76,8 +76,14 @@ gboolean pref_vte_blinken; gchar *pref_vte_emulation; gchar *pref_vte_font; gint pref_vte_scrollback; + +#if !GTK_CHECK_VERSION(3, 14, 0) GdkColor pref_vte_colour_fore; GdkColor pref_vte_colour_back; +#else +GdkRGBA pref_vte_colour_fore; +GdkRGBA pref_vte_colour_back; +#endif
typedef struct _MarkerStyle {
Modified: scope/src/prefs.h 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -64,8 +64,14 @@ extern gboolean pref_vte_blinken; extern gchar *pref_vte_emulation; extern gchar *pref_vte_font; extern gint pref_vte_scrollback; + +#if !GTK_CHECK_VERSION(3, 14, 0) extern GdkColor pref_vte_colour_fore; extern GdkColor pref_vte_colour_back; +#else +extern GdkRGBA pref_vte_colour_fore; +extern GdkRGBA pref_vte_colour_back; +#endif
void prefs_apply(GeanyDocument *doc); char *prefs_file_name(void);
Modified: scope/src/scope.c 15 lines changed, 8 insertions(+), 7 deletions(-) =================================================================== @@ -25,6 +25,10 @@
#include "common.h"
+#include <vte/vte.h> + +#include <gp_gtkcompat.h> + GeanyPlugin *geany_plugin; GeanyData *geany_data;
@@ -351,12 +355,6 @@ static void on_settings_save(G_GNUC_UNUSED GObject *obj, G_GNUC_UNUSED GKeyFile schedule_settings_saved(TRUE); }
-static void on_project_before_save(G_GNUC_UNUSED GObject *obj, G_GNUC_UNUSED GKeyFile *keyfile, - G_GNUC_UNUSED gpointer gdata) -{ - schedule_settings_saved(FALSE); -} - static gboolean on_editor_notify(G_GNUC_UNUSED GObject *obj, GeanyEditor *editor, SCNotification *nt, G_GNUC_UNUSED gpointer gdata) { @@ -438,7 +436,6 @@ static const ScopeCallback scope_callbacks[] = { "document-filetype-set", G_CALLBACK(on_document_filetype_set) }, { "document-activate", G_CALLBACK(on_document_activate) }, { "document-save", G_CALLBACK(on_document_activate) }, - { "project-before-save", G_CALLBACK(on_project_before_save) }, { "project-open", G_CALLBACK(on_project_open) }, { "project-close", G_CALLBACK(on_project_close) }, { "geany-startup-complete", G_CALLBACK(on_geany_startup_complete) }, @@ -545,7 +542,11 @@ static gchar *get_data_dir_path(const gchar *filename) void plugin_init(G_GNUC_UNUSED GeanyData *gdata) { GeanyKeyGroup *scope_key_group; +#if GTK_CHECK_VERSION(3, 0, 0) + char *gladefile = get_data_dir_path("scope_gtk3.glade"); +#else char *gladefile = get_data_dir_path("scope.glade"); +#endif GError *gerror = NULL; GtkWidget *menubar1 = ui_lookup_widget(geany->main_widgets->window, "menubar1"); guint item;
Modified: scope/src/utils.c 11 lines changed, 11 insertions(+), 0 deletions(-) =================================================================== @@ -437,10 +437,21 @@ void utils_remark(GeanyDocument *doc)
guint utils_parse_sci_color(const gchar *string) { +#if !GTK_CHECK_VERSION(3, 14, 0) GdkColor color;
gdk_color_parse(string, &color); return ((color.blue >> 8) << 16) + (color.green & 0xFF00) + (color.red >> 8); +#else + GdkRGBA color; + guint blue, green, red; + + gdk_rgba_parse(&color, string); + blue = color.blue * 0xFF; + green = color.green * 0xFF; + red = color.red * 0xFF; + return (blue << 16) + (green << 8) + red; +#endif }
gboolean utils_key_file_write_to_file(GKeyFile *config, const char *configfile)
Modified: treebrowser/src/treebrowser.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1039,7 +1039,7 @@ on_menu_create_new_object(GtkMenuItem *menuitem, const gchar *type) if (uri_new) { if (!(g_file_test(uri_new, G_FILE_TEST_EXISTS) && - !dialogs_show_question(_("Target file '%s' exists\n, do you really want to replace it with empty file?"), uri_new))) + !dialogs_show_question(_("Target file '%s' exists.\nDo you really want to replace it with an empty file?"), uri_new))) { gboolean creation_success = FALSE;
Modified: utils/src/Makefile.am 11 lines changed, 9 insertions(+), 2 deletions(-) =================================================================== @@ -6,9 +6,16 @@ libgeanypluginutils_la_SOURCES = \ filelist.h \ filelist.c
+if GP_VTE291_USED +libgeanypluginutils_la_SOURCES += \ + gp_vtecompat.h \ + gp_vtecompat.c +endif + libgeanypluginutils_la_CPPFLAGS = $(AM_CPPFLAGS) \ -DG_LOG_DOMAIN="Utils" -libgeanypluginutils_la_CFLAGS = $(AM_CFLAGS) -libgeanypluginutils_la_LIBADD = $(COMMONLIBS) +libgeanypluginutils_la_CFLAGS = $(AM_CFLAGS) $(VTE_CFLAGS) +libgeanypluginutils_la_LIBADD = $(COMMONLIBS) $(VTE_LIBS) libgeanypluginutils_la_LDFLAGS = -no-undefined $(GP_LDFLAGS) include $(top_srcdir)/build/cppcheck.mk +
Modified: utils/src/gp_gtkcompat.h 57 lines changed, 57 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,57 @@ +/* + * 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. + */ + +/* Compatibility macros to support different GTK versions */ + +#ifndef GP_GTKCOMPAT_H +#define GP_GTKCOMPAT_H + +G_BEGIN_DECLS + +/* Remove gtk_window_set_has_resize_grip() starting from version 3.14 */ +#if GTK_CHECK_VERSION(3, 14, 0) +#define gtk_window_set_has_resize_grip(window, value) +#endif + +/* Replace calls to gtk_widget_set_state() with call to + gtk_widget_set_state_flags() and translate States to State-Flags. + Starting from version 3.0.*/ +#if GTK_CHECK_VERSION(3, 0, 0) +#define GTK_STATE_NORMAL GTK_STATE_FLAG_NORMAL +#define GTK_STATE_ACTIVE GTK_STATE_FLAG_ACTIVE +#define GTK_STATE_PRELIGHT GTK_STATE_FLAG_PRELIGHT +#define GTK_STATE_SELECTED GTK_STATE_FLAG_SELECTED +#define GTK_STATE_INSENSITIVE GTK_STATE_FLAG_INSENSITIVE +#define GTK_STATE_INCONSISTENT GTK_STATE_FLAG_INCONSISTENT +#define GTK_STATE_FOCUSED GTK_STATE_FLAG_FOCUSED +#define gtk_widget_set_state(widget, state) \ + gtk_widget_set_state_flags(widget, state, FALSE) +#endif + +/* Replace some GTK_STOCK constants with labels. + Add new ones on-demand. Starting from version 3.10 */ +#if GTK_CHECK_VERSION(3, 10, 0) +#undef GTK_STOCK_OPEN +#undef GTK_STOCK_CANCEL +#define GTK_STOCK_OPEN _("_Open") +#define GTK_STOCK_CANCEL _("_Cancel") +#endif +G_END_DECLS + +#endif /* GP_GTKCOMPAT_H */ +
Modified: utils/src/gp_vtecompat.c 47 lines changed, 47 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,47 @@ +/* + * 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. + */ + +#include <glib.h> +#include <glib/gstdio.h> + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#ifdef G_OS_UNIX +#include <vte/vte.h> +#include <../../utils/src/gp_vtecompat.h> +#endif + +/** Set font from string. + * + * Compatibility function to replace deprecated vte_terminal_set_font_from_string(). + * + * @param vte Pointer to VteTerminal + * @param font Font specification as string + * + **/ +void gp_vtecompat_set_font_from_string(VteTerminal *vte, char *font) +{ + PangoFontDescription *font_desc; + + font_desc = pango_font_description_from_string(font); + vte_terminal_set_font(vte, font_desc); + pango_font_description_free (font_desc); +} +
Modified: utils/src/gp_vtecompat.h 60 lines changed, 60 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,60 @@ +/* + * 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. + */ + +/* Compatibility macros to support different VTE versions */ + +#ifndef GP_VTECOMPAT_H +#define GP_VTECOMPAT_H + +G_BEGIN_DECLS + +/* Replace call to vte_terminal_copy_clipboard() with a call to + vte_terminal_copy_clipboard_format starting from version 0.50 */ +#if VTE_CHECK_VERSION(0, 50, 0) +#define vte_terminal_copy_clipboard(terminal) \ + vte_terminal_copy_clipboard_format(terminal, VTE_FORMAT_TEXT) +#endif + +/* Version info for VTE is incomplete so we use all the macros below + simply if GTK3 is used. */ +#if GTK_CHECK_VERSION(3, 0, 0) +/* Remove vte_terminal_set_emulation() starting from 0.26.2 version */ +#define vte_terminal_set_emulation(vte, emulation) + +/* Replace call to vte_terminal_set_font_from_string() with a call to + gp_vtecompat_set_font_from_string() starting from version 0.26.2 */ +#define vte_terminal_set_font_from_string(vte, font) \ + gp_vtecompat_set_font_from_string(vte, font) + +/* Replace call to vte_pty_new_foreign() with a call to + vte_pty_new_foreign_sync() starting from version 0.26.2 */ +#define vte_pty_new_foreign(pty, error) \ + vte_pty_new_foreign_sync(pty, NULL, error) + +/* Replace call to vte_terminal_set_pty_object() with a call to + vte_terminal_set_pty() starting from version 0.26.2 */ +#define vte_terminal_set_pty_object(terminal, pty) \ + vte_terminal_set_pty(terminal, pty) + +void gp_vtecompat_set_font_from_string(VteTerminal *vte, char *font); +#endif + +G_END_DECLS + +#endif /* GP_VTECOMPAT_H */ +
Modified: workbench/src/dialogs.c 12 lines changed, 6 insertions(+), 6 deletions(-) =================================================================== @@ -434,25 +434,25 @@ gboolean dialogs_workbench_settings(WORKBENCH *workbench) w_rescan_projects_on_open = gtk_check_button_new_with_mnemonic(_("_Rescan all projects on open")); ui_table_add_row(GTK_TABLE(table), 0, w_rescan_projects_on_open, NULL); gtk_widget_set_tooltip_text(w_rescan_projects_on_open, - _("If the option is activated (default), then all projects will be re-scanned" - " on opening of the workbench.")); + _("If the option is activated (default), then all projects will be re-scanned " + "on opening of the workbench.")); rescan_projects_on_open_old = workbench_get_rescan_projects_on_open(workbench); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w_rescan_projects_on_open), rescan_projects_on_open_old);
w_enable_live_update = gtk_check_button_new_with_mnemonic(_("_Enable live update")); ui_table_add_row(GTK_TABLE(table), 1, w_enable_live_update, NULL); gtk_widget_set_tooltip_text(w_enable_live_update, - _("If the option is activated (default), then the list of files and the sidebar" - " will be updated automatically if a file or directory is created, removed or renamed." + _("If the option is activated (default), then the list of files and the sidebar " + "will be updated automatically if a file or directory is created, removed or renamed. " "A manual re-scan is not required if the option is enabled.")); enable_live_update_old = workbench_get_enable_live_update(workbench); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w_enable_live_update), enable_live_update_old);
w_expand_on_hover = gtk_check_button_new_with_mnemonic(_("_Expand on hover")); ui_table_add_row(GTK_TABLE(table), 2, w_expand_on_hover, NULL); gtk_widget_set_tooltip_text(w_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.")); + _("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.")); 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);
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).