diff --git a/eagle/openmv2/openmv2.brd b/eagle/openmv2/openmv2.brd index 62df72c6c..4eac5a70c 100644 --- a/eagle/openmv2/openmv2.brd +++ b/eagle/openmv2/openmv2.brd @@ -30,8 +30,8 @@ - - + + @@ -1812,7 +1812,7 @@ design rules under a new name. - + diff --git a/eagle/openmv2/openmv2.pdf b/eagle/openmv2/openmv2.pdf index 912e491d9..e43853a65 100644 Binary files a/eagle/openmv2/openmv2.pdf and b/eagle/openmv2/openmv2.pdf differ diff --git a/eagle/openmv2/openmv2.sch b/eagle/openmv2/openmv2.sch index ed0681335..1c6662270 100644 --- a/eagle/openmv2/openmv2.sch +++ b/eagle/openmv2/openmv2.sch @@ -6655,7 +6655,7 @@ DIN A3, landscape with extra doc field - + diff --git a/usr/openmv-ide.glade b/usr/openmv-ide.glade index 0dbe3b854..4cbdec4ec 100644 --- a/usr/openmv-ide.glade +++ b/usr/openmv-ide.glade @@ -1,7 +1,6 @@ - @@ -787,21 +786,11 @@ True True - + True True - - True - True - 2 - 2 - True - 4 - True - True - True - + @@ -1165,7 +1154,7 @@ - + True True diff --git a/usr/openmv-ide.py b/usr/openmv-ide.py index 6c284a0b7..0baac4d64 100755 --- a/usr/openmv-ide.py +++ b/usr/openmv-ide.py @@ -1,16 +1,18 @@ #!/usr/bin/env python import pydfu import openmv -import sys, os, os.path -from time import sleep -import gtk, gtksourceview2 as gtksourceview -import gio -import gobject +import gtk import vte +import gobject import serial import usb.core import usb.util +import sys, os, os.path +from time import sleep from os.path import expanduser +import gtkcodebuffer +from gtkcodebuffer import CodeBuffer, SyntaxLoader + try: # 3.x name import configparser @@ -71,18 +73,13 @@ class OMVGtk: self.connected = False map(lambda x:x.set_sensitive(False), self.controls) - #configure gtksourceview - sourceview = self.builder.get_object('gtksourceview') - self.buffer = gtksourceview.Buffer() - mgr = gtksourceview.style_scheme_manager_get_default() - style_scheme = mgr.get_scheme('classic') - if style_scheme: - self.buffer.set_style_scheme(style_scheme) - lang_manager = gtksourceview.language_manager_get_default() - self.buffer.set_highlight_syntax(True) - self.buffer.set_language(lang_manager.get_language("python")) + # workaround bug in gtkcodebuffer + gtkcodebuffer.SYNTAX_PATH.append(os.path.join(sys.prefix,"local", "share","pygtkcodebuffer","syntax")) + + # Configure source viewer + self.buffer = CodeBuffer(lang=SyntaxLoader("python")) self.buffer.connect("changed", self.text_changed) - sourceview.set_buffer(self.buffer) + self.builder.get_object("src_scrolledwindow").add(gtk.TextView(self.buffer)) #configure the terminal self.fd = -1