Pair Tag Highlighter - Added a color preferences dialog (Issue #545)

MAINTAINERS

@@ -48,9 +48,9 @@ W:
 S: Maintained
 
 debugger
-P: Alexander Petukhov <[email protected]>
+P: Alexander Petukhov
 g:
-M: Alexander Petukhov <[email protected]>
+M: Alexander Petukhov
 W: http://plugins.geany.org/debugger.html
 S: Maintained
 
@@ -168,11 +168,11 @@ W: http://plugins.geany.org/geanysendmail.html
 S: Maintained
 
 geanyvc
-P: Yura Siamashka <yurand2@gmail.com>
-g:
-M: Yura Siamashka <yurand2@gmail.com>
+P: Artur Shepilko <nomadbyte@gmail.com>
+g: @nomadbyte
+M: Artur Shepilko <nomadbyte@gmail.com>
 W: http://plugins.geany.org/geanyvc.html
-S: Odd Fixes
+S: Maintained
 
 geniuspaste
 P: Enrico Trotta <[email protected]>

NEWS

@@ -1,8 +1,62 @@
-Geany Plugins 1.37 (not released yet)
+Geany Plugins 1.38 (not released yet)
 
     * nothing so far
 
 
+Geany Plugins 1.37 (2020-10-25)
+
+    General:
+    * Improve cppcheck environment for better testing (PR #947)
+
+    Addons:
+    * Improve sizes of color calltip (PR #987)
+
+    Autoclose:
+    * Remove all pairing quotes (PR #896)
+
+    GeanyVC:
+    * Add support for Fossil SCM (PR #1004, PR #969, PR #977)
+    * Support multiple instances of current File menu (PR #971)
+    * Allow to toggle single files with Space and Return keys
+      in commit dialog (PR #996)
+    * Improve libraries included to unittests (PR #977)
+
+    GeanyPrj:
+    * Fix cut-off sidebar tab under GTK3 (PR #917)
+
+    GitChangebar:
+    * Add compatibility with libgit2 0.99 (PR #956)
+
+    LaTeX:
+    * Indent line in new environment (Issue #950, PR #951)
+
+    Markdown:
+    * Fix colors in GTK3 (PR #965)
+
+    Overview:
+    * Initialize color variables
+
+    PairTagHighligher:
+    * Allow to select a matching tag (PR #926)
+
+    ProjectOrganizer:
+    * Make showing empty directories in the sidebar configurable (PR #929)
+    * Improve used icon -- don't use stock icons (PR #932)
+    * Add a keybinding for focusing the sidebar (PR #920)
+    * Re-read base path when updating project (PR #921)
+
+    Vimmode:
+    * Correctly ignore unwanted modifiers (PR #975)
+    * Don't use word navigation from Scintilla (PR #919)
+    * Make o/O respect auto indentation (PR #918)
+
+    Windows:
+    * Update dependencies for installer
+
+    Internationalization:
+    * Updated translations: de, es, nl, pt, tr
+
+
 Geany Plugins 1.36 (2019-09-28)
 
     General:

addons/README

@@ -108,6 +108,9 @@ color value over which the mouse is hovered. The preferences option "Show
 a calltip when hovering over a color value" is used to enable or disable
 the extension.
 
+Append `-DLARGE_COLOR_TIP` to `CFLAGS` for a large color calltip or
+`-DXLARGE_COLOR_TIP` for an extra-large color calltip.
+
 *Open Color Chooser on double clicking on a color value*
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 This extension will open the Color Chooser if the user double clicks on

addons/src/ao_colortip.c

@@ -32,11 +32,15 @@ typedef struct _AoColorTipPrivate			AoColorTipPrivate;
 #define AO_COLORTIP_GET_PRIVATE(obj)		(G_TYPE_INSTANCE_GET_PRIVATE((obj),\
 			AO_COLORTIP_TYPE, AoColorTipPrivate))
 
-// This is helpful for making the color-tip larger on 4K screens or for people with less acute vision 
-#if (!(defined(COLOR_TIP_TEMPLATE) || defined(LARGE_COLOR_TIP)))
-#   define COLOR_TIP_TEMPLATE   "    "
-#else
-#   define COLOR_TIP_TEMPLATE   "        \n        "
+// This is helpful for making the color-tip larger on 4K screens or for people with less acute vision
+#if (!defined(COLOR_TIP_TEMPLATE))
+#   if defined(LARGE_COLOR_TIP)
+#      define COLOR_TIP_TEMPLATE   "        \n        "
+#   elif defined(XLARGE_COLOR_TIP)
+#      define COLOR_TIP_TEMPLATE   "          \n          \n          \n          "
+#   else
+#      define COLOR_TIP_TEMPLATE   "    "
+#   endif
 #endif
 
 struct _AoColorTip

autoclose/README

@@ -42,8 +42,8 @@ Features
 Usage
 -----
 
-After installed successfully, load the plugin in Geany's plugin manager. You may
-change module preferences.
+Install the plugin (https://plugins.geany.org/install.html) then
+load it in Geany's plugin manager. You may change module preferences.
 
 Requirements
 ------------

automark/README

@@ -17,7 +17,8 @@ under cursor (see screenshot).
 Usage
 -----
 
-After installed successfully, load the plugin in Geany's plugin manager.
+Install the plugin (https://plugins.geany.org/install.html) then
+load it in Geany's plugin manager.
 As soon as the cursor is moved on a word, all occurences of that word will
 be highlighted. The highlight color is "marker_search".
 

build/compat.m4

@@ -0,0 +1,18 @@
+dnl taken from Autoconf's m4sh.m4, GPLv3+
+m4_ifndef([AS_VAR_COPY], [
+m4_define([AS_VAR_COPY],
+[AS_LITERAL_WORD_IF([$1[]$2], [$1=$$2], [eval $1=\$$2])])
+])
+
+dnl taken from pkg-config's pkg.m4, GPLv2+
+m4_ifndef([PKG_CHECK_VAR], [
+AC_DEFUN([PKG_CHECK_VAR],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
+
+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
+AS_VAR_COPY([$1], [pkg_cv_][$1])
+
+AS_VAR_IF([$1], [""], [$5], [$4])dnl
+])dnl PKG_CHECK_VAR
+])

build/cppcheck.m4

@@ -21,4 +21,8 @@ AC_DEFUN([GP_CHECK_CPPCHECK],
     AM_CONDITIONAL([HAVE_CPPCHECK], [test "x$gp_have_cppcheck" = xyes])
     GP_STATUS_BUILD_FEATURE_ADD([Static code checking],
                                 [$gp_have_cppcheck])
+
+    GP_GEANY_PKG_CONFIG_PATH_PUSH
+    PKG_CHECK_VAR([GEANY_INCLUDEDIR], [geany], [includedir], [], [])
+    GP_GEANY_PKG_CONFIG_PATH_POP
 ])

build/cppcheck.mk

@@ -4,6 +4,7 @@ if HAVE_CPPCHECK
 check-cppcheck: $(srcdir)
 	$(CPPCHECK) \
 		-q --template gcc --error-exitcode=2 \
+		-I$(GEANY_INCLUDEDIR)/geany \
 		$(AM_CPPCHECKFLAGS) $(CPPCHECKFLAGS) \
 		$(srcdir)
 

build/geany-plugins.nsi

@@ -33,14 +33,15 @@ Unicode true
 ; helper defines  ;
 ;;;;;;;;;;;;;;;;;;;
 !define PRODUCT_NAME "Geany-Plugins"
-!define PRODUCT_VERSION "1.37"
-!define PRODUCT_VERSION_ID "1.37.0.0"
+!define PRODUCT_VERSION "1.38"
+!define PRODUCT_VERSION_ID "1.38.0.0"
 !define PRODUCT_PUBLISHER "The Geany developer team"
 !define PRODUCT_WEB_SITE "https://www.geany.org/"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 !define PRODUCT_DIR_REGKEY "Software\Geany-Plugins"
 !define GEANY_DIR_REGKEY "Software\Geany"
-!define REQUIRED_GEANY_VERSION "1.37.0"
+; Geany version should be major.minor only (patch level is ignored for version checking)
+!define REQUIRED_GEANY_VERSION "1.38"
 !define RESOURCEDIR "geany-plugins-${PRODUCT_VERSION}"
 
 ;;;;;;;;;;;;;;;;;;;;;
@@ -258,7 +259,7 @@ Section Uninstall
 	Delete "$INSTDIR\bin\libgtkspell-0.dll"
 	Delete "$INSTDIR\bin\libgtkspell3-*.dll"
 	Delete "$INSTDIR\bin\libhistory8.dll"
-	Delete "$INSTDIR\bin\libhogweed-5.dll"
+	Delete "$INSTDIR\bin\libhogweed-6.dll"
 	Delete "$INSTDIR\bin\libhttp_parser-2.dll"
 	Delete "$INSTDIR\bin\libhunspell-1.7-0.dll"
 	Delete "$INSTDIR\bin\libicudt61.dll"
@@ -269,22 +270,22 @@ Section Uninstall
 	Delete "$INSTDIR\bin\libicule61.dll"
 	Delete "$INSTDIR\bin\libiculx61.dll"
 	Delete "$INSTDIR\bin\libicutest61.dll"
-	Delete "$INSTDIR\bin\libicutu64.dll"
-	Delete "$INSTDIR\bin\libicuuc64.dll"
-	Delete "$INSTDIR\bin\libicudt64.dll"
-	Delete "$INSTDIR\bin\libicuin64.dll"
-	Delete "$INSTDIR\bin\libicuio64.dll"
-	Delete "$INSTDIR\bin\libicule64.dll"
-	Delete "$INSTDIR\bin\libiculx64.dll"
-	Delete "$INSTDIR\bin\libicutest64.dll"
-	Delete "$INSTDIR\bin\libicutu64.dll"
-	Delete "$INSTDIR\bin\libicuuc64.dll"
+	Delete "$INSTDIR\bin\libicutu67.dll"
+	Delete "$INSTDIR\bin\libicuuc67.dll"
+	Delete "$INSTDIR\bin\libicudt67.dll"
+	Delete "$INSTDIR\bin\libicuin67.dll"
+	Delete "$INSTDIR\bin\libicuio67.dll"
+	Delete "$INSTDIR\bin\libicule67.dll"
+	Delete "$INSTDIR\bin\libiculx67.dll"
+	Delete "$INSTDIR\bin\libicutest67.dll"
+	Delete "$INSTDIR\bin\libicutu67.dll"
+	Delete "$INSTDIR\bin\libicuuc67.dll"
 	Delete "$INSTDIR\bin\libidn2-0.dll"
 	Delete "$INSTDIR\bin\libjavascriptcoregtk-1.0-0.dll"
 	Delete "$INSTDIR\bin\libjavascriptcoregtk-3.0-0.dll"
 	Delete "$INSTDIR\bin\libjpeg-8.dll"
 	Delete "$INSTDIR\bin\liblzma-5.dll"
-	Delete "$INSTDIR\bin\libnettle-7.dll"
+	Delete "$INSTDIR\bin\libnettle-8.dll"
 	Delete "$INSTDIR\bin\libnghttp2-14.dll"
 	Delete "$INSTDIR\bin\libogg-0.dll"
 	Delete "$INSTDIR\bin\liborc-0.4-0.dll"
@@ -333,15 +334,18 @@ Section Uninstall
 	RMDir /r "$INSTDIR\lib\gio"
 	RMDir /r "$INSTDIR\lib\gstreamer-1.0"
 	RMDir /r "$INSTDIR\lib\pkcs11"
-	RMDir /r "$INSTDIR\lib\sqlite3.29.0"
+	RMDir /r "$INSTDIR\lib\sqlite3.33.0"
 	RMDir /r "$INSTDIR\lib\geany-plugins"
+	RMDir /r "$INSTDIR\libexec\gstreamer-1.0"
 	RMDir /r "$INSTDIR\libexec\p11-kit"
 	RMDir /r "$INSTDIR\share\doc\geany-plugins"
 	RMDir /r "$INSTDIR\share\geany-plugins"
 	RMDir /r "$INSTDIR\share\enchant"
+	RMDir /r "$INSTDIR\share\gstreamer-1.0"
 	RMDir /r "$INSTDIR\share\libgpg-error"
 	RMDir /r "$INSTDIR\share\p11-kit"
 	RMDir /r "$INSTDIR\share\pki"
+	RMDir /r "$INSTDIR\share\sqlite"
 	RMDir /r "$INSTDIR\share\vala"
 	RMDir /r "$INSTDIR\share\webkitgtk-1.0"
 	RMDir /r "$INSTDIR\share\webkitgtk-3.0"
@@ -440,12 +444,10 @@ Function CheckForGeany
 	IntOp $R2 $R0 >> 16
 	IntOp $R2 $R2 & 0x0000FFFF ; $R2 now contains major version
 	IntOp $R3 $R0 & 0x0000FFFF ; $R3 now contains minor version
-	IntOp $R4 $R1 >> 16
-	IntOp $R4 $R4 & 0x0000FFFF ; $R4 now contains release
-	StrCpy $0 "$R2.$R3.$R4"
+	StrCpy $0 "$R2.$R3"
 	StrCmp $0 ${REQUIRED_GEANY_VERSION} version_check_done 0
 	MessageBox MB_YESNO|MB_ICONEXCLAMATION \
-		"You have Geany $0 installed but you need Geany ${REQUIRED_GEANY_VERSION}.$\nDo you really want to continue?" \
+		"You have Geany $0 installed but you need Geany ${REQUIRED_GEANY_VERSION}.x.$\nDo you really want to continue?" \
 		/SD IDNO IDNO stop IDYES ignore
 stop:
 	Abort

build/gtk-bundle-from-msys2.sh

@@ -221,7 +221,7 @@ cleanup_unnecessary_files() {
 	rm -rf lib/lua
 	rm -rf lib/p11-kit
 	rm -rf lib/python2.7
-	rm -rf lib/python3.7
+	rm -rf lib/python3.8
 	find lib -name '*.h' -delete
 	find lib -name '*.a' -delete
 	find lib -name '*.typelib' -delete
@@ -251,6 +251,7 @@ cleanup_unnecessary_files() {
 	rm -rf share/glib-2.0
 	rm -rf share/gnupg
 	rm -rf share/gst-plugins-base
+	rm -rf share/gstreamer-1.0
 	rm -rf share/gtk-doc
 	rm -rf share/icu
 	rm -rf share/info

build/keyrecord.m4

@@ -1,7 +1,7 @@
 AC_DEFUN([GP_CHECK_KEYRECORD],
  [
-     GP_ARG_DISABLE([keyrecord], [auto])
-     GP_COMMIT_PLUGIN_STATUS([keyrecord])
+     GP_ARG_DISABLE([Keyrecord], [auto])
+     GP_COMMIT_PLUGIN_STATUS([Keyrecord])
      AC_CONFIG_FILES([
          keyrecord/Makefile
          keyrecord/src/Makefile

build/pairtaghighlighter.m4

@@ -5,5 +5,6 @@ AC_DEFUN([GP_CHECK_PAIRTAGHIGHLIGHTER],
     AC_CONFIG_FILES([
         pairtaghighlighter/Makefile
         pairtaghighlighter/src/Makefile
+        pairtaghighlighter/data/Makefile
     ])
 ])

codenav/README

@@ -17,9 +17,10 @@ Features
 Usage
 -----
 
-After installed successfully, load the plugin in Geany's plugin manager
-and new menu items in the Edit menu will appear. You can
-change the keyboard shortcuts in Geany's preferences dialog.
+Install the plugin (https://plugins.geany.org/install.html) then
+load it in Geany's plugin manager. A new menu item in the Edit menu
+will appear. You can change the keyboard shortcuts in Geany's
+preferences dialog.
 
 
 *Switch header/implementation*

configure.ac

@@ -1,6 +1,6 @@
 AC_PREREQ([2.61])
 dnl Don't forget when updating version number to do GP_CHECK_GEANY also
-AC_INIT([geany-plugins], [1.37])
+AC_INIT([geany-plugins], [1.38])
 AM_INIT_AUTOMAKE([1.8 foreign dist-bzip2 tar-ustar subdir-objects])
 
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])

debugger/README

@@ -43,13 +43,14 @@ Debug control buttons also reside on the right end of a panel as well as plugin
 A user can also control debug process using hotkeys that are configurable through Geany hotkeys dialog.
 
 When exploring children of a watch or an auto variable user can double click any of them to create a distinct
-watch item containing the corresponding expression. 
+watch item containing the corresponding expression.
 
 Requirements
 ------------
 
 * Geany >= 0.21
-* GTK 2
+* libvte
+* GTK 3
 * POSIX API
 
 Contact developers

debugger/src/tpage.c

@@ -142,19 +142,16 @@ void tpage_pack_widgets(gboolean tabbed)
 	GList *children = gtk_container_get_children(GTK_CONTAINER(tab_target));
 	if (children)
 	{
-		int i;
-
 		oldroot = (GtkWidget*)children->data;
-		
+
 		/* unparent widgets */
-		i = 0;
-		while (widgets[i])
+		for (int i = 0; widgets[i]; i++)
 		{
-			g_object_ref(*widgets[i]);
-			gtk_container_remove(GTK_CONTAINER(gtk_widget_get_parent(*widgets[i])), *widgets[i]);
-			i++;
+			GtkWidget **widget_ref = widgets[i];
+			g_object_ref(*widget_ref);
+			gtk_container_remove(GTK_CONTAINER(gtk_widget_get_parent(*widget_ref)), *widget_ref);
 		}
-		
+
 		g_list_free(children);
 	}
 
@@ -265,11 +262,9 @@ void tpage_pack_widgets(gboolean tabbed)
 
 	if (oldroot)
 	{
-		int i = 0;
-		while (widgets[i])
+		for (int i = 0; widgets[i]; i++)
 		{
 			g_object_unref(*widgets[i]);
-			i++;
 		}
 		gtk_container_remove(GTK_CONTAINER(tab_target), oldroot);
 	}

defineformat/README

@@ -12,7 +12,8 @@ write multiline defines with aligned backslash.
 Usage
 -----
 
-After installed successfully, load the plugin in Geany's plugin manager.
+Install the plugin (https://plugins.geany.org/install.html) then
+load it in Geany's plugin manager.
 Try it: open C/C++ file and type:
 
 #define A() do { \