From 8184de7c136c1d54434aaea4d4b09a0149cb9e29 Mon Sep 17 00:00:00 2001 From: kintel Date: Sat, 3 Apr 2010 03:05:28 +0000 Subject: Syntax highlighting now works. git-svn-id: http://svn.clifford.at/openscad/trunk@505 b57f626f-c46c-0410-a088-ec61d464b74c diff --git a/qxs/openscad.qnfa b/qxs/openscad.qnfa new file mode 100644 index 0000000..fc13975 --- /dev/null +++ b/qxs/openscad.qnfa @@ -0,0 +1,86 @@ + + + + + /\* + \*/ + + + + // + \n + + + \\\n + \n + \\ + + + + + " + " + \n + \\[nrtvf\\"'\n] + + + ( + ) + { + } + \[ + \] + + + public + protected + private + + + + module + func + + + + for + if + else + + + + using + + + + asm + false + true + template + typename + return + sizeof + typeid + typedef + + + + \?\? + \( + \) + < + > + = + / + ' + ! + - + + + q$w+_cast + + -?[0-9]*.[0-9]+f? + 0[xX][0-9a-fA-F]+[ulUL]* + 0[0-7]+ + -?[0-9]+[ulUL]* + diff --git a/qxs/openscad.qxf b/qxs/openscad.qxf new file mode 100644 index 0000000..f0df3d5 --- /dev/null +++ b/qxs/openscad.qxf @@ -0,0 +1,142 @@ + + + + false + false + false + false + false + false + + + false + false + false + false + false + false + #008000 + + + true + false + false + false + false + false + #ff00ff + + + false + true + false + false + false + false + #a0a0a4 + + + false + true + false + false + false + false + #000080 + + + true + false + false + false + false + false + #000000 + + + true + false + false + false + false + false + #0095ff + + + true + false + false + false + false + false + #ff0000 + #ffff00 + + + true + false + false + false + false + false + #ff0000 + #ffff00 + + + true + false + false + false + false + false + #ffff00 + #ff0000 + + + true + true + false + false + false + false + #ff0000 + #ffff00 + + + true + false + false + false + false + true + #d060d0 + #ff0000 + + + false + false + false + false + false + false + #800080 + + + false + false + false + false + false + false + #ff0000 + + + false + false + false + false + false + false + #ff1493 + + diff --git a/src/mainwin.cc b/src/mainwin.cc index a16707b..816f897 100644 --- a/src/mainwin.cc +++ b/src/mainwin.cc @@ -66,7 +66,11 @@ #include #include #include - +#ifdef _QCODE_EDIT_ +#include "qdocument.h" +#include "qformatscheme.h" +#include "qlanguagefactory.h" +#endif //for chdir #include @@ -156,7 +160,13 @@ MainWindow::MainWindow(const QString &filename) fsteps = 1; highlighter = NULL; - +#ifdef _QCODE_EDIT_ + QFormatScheme *formats = new QFormatScheme("qxs/openscad.qxf"); + QDocument::setDefaultFormatScheme(formats); + QLanguageFactory *languages = new QLanguageFactory(formats,this); + languages->addDefinitionPath("qxs"); + languages->setLanguage(editor, "openscad"); +#endif editor->setLineWrapping(true); // Not designable setFont("", 0); // Init default font -- cgit v0.10.1