Merge pull request #3083 from hansu/gtk-sourceview-4-migration

Migrate to GtkSourceview 4

Author: andypugh

debian/control.main-pkg.in

@@ -22,7 +22,7 @@ Depends:
     python3-opengl,
     python3-configobj,
     python3-xlib,
-    libgtksourceview-3.0-dev,
+    libgtksourceview-4-dev,
     tcl@TCLTK_VERSION@,
     tk@TCLTK_VERSION@,
     bwidget (>= 1.7),

debian/linuxcnc.install.in

@@ -119,7 +119,7 @@ usr/share/axis
 usr/share/glade
 usr/share/gmoccapy
 usr/share/gscreen
-usr/share/gtksourceview-2.0
+usr/share/gtksourceview-4
 
 usr/share/applications/linuxcnc.desktop
 usr/share/applications/linuxcnc-latency.desktop

docs/src/gui/gladevcp.adoc

@@ -1919,7 +1919,7 @@ image::images/offsetpage.png[align="center"]
 === HAL_sourceview widget
 
 This is for displaying and simple editing of G-code.
-It looks for `.ngc` highlighting specs in `~/share/gtksourceview-2.0/language-specs/`.
+It looks for `.ngc` highlighting specs in `~/share/gtksourceview-4/language-specs/`.
 The current running line will be highlighted.
 
 With external Python glue code it can:

lib/python/gladevcp/gtksourceview.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<glade-catalog name="gtksourceview" library="gtksourceview-2.0" depends="gtk+">
+<glade-catalog name="gtksourceview" library="gtksourceview-4" depends="gtk+">
   <glade-widget-classes>
     <glade-widget-class name="GtkSourceView" title="GtkSourceView" generic-name="gtksourceview">
       <properties>

lib/python/gladevcp/hal_sourceview.py

@@ -25,7 +25,7 @@
 import gi
 gi.require_version("Gtk","3.0")
 gi.require_version("Gdk","3.0")
-gi.require_version("GtkSource","3.0")
+gi.require_version("GtkSource","4")
 from gi.repository import Gtk
 from gi.repository import Gdk
 from gi.repository import GObject
@@ -62,10 +62,10 @@ def __init__(self, *a, **kw):
         self.lm = GtkSource.LanguageManager()
         self.sm = GtkSource.StyleSchemeManager()
         if 'EMC2_HOME' in os.environ:
-            path = os.path.join(os.environ['EMC2_HOME'], 'share/gtksourceview-2.0/language-specs/')
+            path = os.path.join(os.environ['EMC2_HOME'], 'share/gtksourceview-4/language-specs/')
             self.lm.set_search_path(self.lm.get_search_path() + [path])
 
-        self.buf.set_language(self.lm.get_language('.ngc'))
+        self.buf.set_language(self.lm.get_language('gcode'))
         self.set_show_line_numbers(True)
         self.set_show_line_marks(True)
         self.set_highlight_current_line(True)
@@ -116,7 +116,7 @@ def set_language(self, lang, path = None):
         # lang = the lang file to set
         if path == None:
             if 'EMC2_HOME' in os.environ:
-                path = os.path.join(os.environ['EMC2_HOME'], 'share/gtksourceview-2.0/language-specs/')
+                path = os.path.join(os.environ['EMC2_HOME'], 'share/gtksourceview-4/language-specs/')
         if path:
             self.lm.set_search_path(path)
         self.buf.set_language(self.lm.get_language(lang))

share/gtksourceview-2.0/language-specs/ngc.lang

@@ -688,7 +688,7 @@ install-dirs:
 		$(DESTDIR)$(datadir)/gmoccapy/icons \
 		$(DESTDIR)$(datadir)/glade/catalogs \
 		$(DESTDIR)$(datadir)/glade/pixmaps/hicolor/22x22/actions \
-		$(DESTDIR)$(datadir)/gtksourceview-2.0/language-specs \
+		$(DESTDIR)$(datadir)/gtksourceview-4/language-specs \
 		$(DESTDIR)$(datadir)/linuxcnc/stepconf \
 		$(DESTDIR)$(datadir)/linuxcnc/pncconf \
 		$(DESTDIR)$(datadir)/linuxcnc/pncconf/pncconf-help \
@@ -764,7 +764,7 @@ install-kernel-indep: install-dirs
 	$(FILE) ../lib/python/gladevcp/hal_python.xml $(DESTDIR)$(datadir)/glade/catalogs/
 	$(FILE) ../share/glade/pixmaps/hicolor/22x22/actions/widget*.png  $(DESTDIR)$(datadir)/glade/pixmaps/hicolor/22x22/actions/
 
-	$(FILE) ../share/gtksourceview-2.0/language-specs/*.lang  $(DESTDIR)$(datadir)/gtksourceview-2.0/language-specs/
+	$(FILE) ../share/gtksourceview-4/language-specs/*.lang  $(DESTDIR)$(datadir)/gtksourceview-4/language-specs/
 
 	$(FILE) ../src/hal/drivers/mesa-hostmot2/modbus/*.tmpl  $(DESTDIR)$(prefix)/share/linuxcnc/
 

…sourceview-2.0/language-specs/gcode.lang …tksourceview-4/language-specs/gcode.langshare/gtksourceview-2.0/language-specs/gcode.lang renamed to share/gtksourceview-4/language-specs/gcode.lang share/gtksourceview-2.0/language-specs/gcode.lang renamed to share/gtksourceview-4/language-specs/gcode.lang

@@ -426,7 +426,7 @@ def __init__(self, argv):
         # check the highlighting type
         # the following would load the python language
         # self.widgets.gcode_view.set_language("python")
-        LANGDIR = os.path.join(BASE, "share", "Gtksourceview-2.0", "language-specs")
+        LANGDIR = os.path.join(BASE, "share", "Gtksourceview-4", "language-specs")
         file_path = os.path.join(LANGDIR, "gcode.lang")
         if os.path.isfile(file_path):
             LOG.info("Gcode.lang found")