added scintilla editor classes

openscad.pro

@@ -285,7 +285,8 @@ HEADERS += src/typedefs.h \
            src/CsgInfo.h \
            \
            src/AutoUpdater.h \
-           src/legacyeditor.h
+    	   src/legacyeditor.h \
+    	   src/scintillaeditor.h
 
 SOURCES += src/version_check.cc \
            src/ProgressWidget.cc \
@@ -369,7 +370,8 @@ SOURCES += src/version_check.cc \
            src/openscad.cc \
            src/mainwin.cc \
 	   src/FontListDialog.cc \
-           src/legacyeditor.cc
+    	   src/legacyeditor.cc \
+    	   src/scintillaeditor.cpp
 
 # ClipperLib
 SOURCES += src/polyclipping/clipper.cpp

openscad.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 2.8.1, 2014-06-01T01:42:15. -->
+<!-- Written by QtCreator 2.8.1, 2014-06-03T20:19:45. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>

src/MainWindow.h

@@ -8,6 +8,7 @@
 #include "Tree.h"
 #include "memory.h"
 #include "legacyeditor.h"
+#include "scintillaeditor.h"
 #include "editor.h"
 #include <vector>
 #include <QMutex>
@@ -106,6 +107,7 @@ private:
 	void setDockWidgetTitle(QDockWidget *dockWidget, QString prefix, bool topLevel);
 
 	LegacyEditor *legacy;
+	ScintillaEditor *scintilla;
 	Editor *editor;
 
   class QMessageBox *openglbox;

src/mainwin.cc

@@ -166,10 +166,14 @@ bool MainWindow::undockMode = false;
 MainWindow::MainWindow(const QString &filename)
 	: root_inst("group"), font_list_dialog(NULL), tempFile(NULL), progresswidget(NULL)
 {
+	setupUi(this);
 	legacy = new LegacyEditor(editorDockContents);
         editor = legacy;
 
-	setupUi(this);
+	scintilla = new ScintillaEditor(editorDockContents);
+	//editor = scintilla;
+	editor->setMinimumSize(editorDockContents->sizeHint());
+
 	setCorner(Qt::TopLeftCorner, Qt::LeftDockWidgetArea);
 	setCorner(Qt::TopRightCorner, Qt::RightDockWidgetArea);
 	setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea);

src/scintillaeditor.cpp

@@ -0,0 +1,7 @@
+#include "scintillaeditor.h"
+
+ScintillaEditor::ScintillaEditor(QWidget *parent) : Editor(parent)
+{
+	qsci = new QsciScintilla;
+	qsci->setMarginLineNumbers(10,true);
+}

src/scintillaeditor.h

@@ -0,0 +1,17 @@
+#ifndef SCINTILLAEDITOR_H
+#define SCINTILLAEDITOR_H
+
+#include <QObject>
+#include <QWidget>
+#include <Qsci/qsciscintilla.h>
+
+#include "editor.h"
+
+class ScintillaEditor : public Editor
+{
+public:
+    ScintillaEditor(QWidget *parent);
+    QsciScintilla *qsci;
+};
+
+#endif // SCINTILLAEDITOR_H