Skip to content
Extraits de code Groupes Projets
Vérifiée Valider cfe2df52 rédigé par Kubat's avatar Kubat
Parcourir les fichiers

UI: Add basic syntax highlighting to scripts

parent f0757f13
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion!11Change a bit the UI + Add simple scripts support
...@@ -20,7 +20,7 @@ TimingView::TimingView(QImage img, quint64 soundLength, QWidget *parent) noexcep ...@@ -20,7 +20,7 @@ TimingView::TimingView(QImage img, quint64 soundLength, QWidget *parent) noexcep
{ {
scene = new TimingScene(img, soundLength, this); scene = new TimingScene(img, soundLength, this);
setFixedHeight(img.height()); setFixedHeight(img.height());
setMaximumHeight(img.height() + horizontalScrollBar()->height()); setMaximumHeight(img.height());
setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Minimum); setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Minimum);
......
#include "ScriptDocumentView.hh" #include "ScriptDocumentView.hh"
#include "ScriptViews/ScriptEditor.hh" #include "ScriptViews/ScriptEditor.hh"
#include "ScriptViews/ScriptHighlighter.hh"
#include "../VivyApplication.hh" #include "../VivyApplication.hh"
#include <QVBoxLayout> #include <QVBoxLayout>
...@@ -9,6 +10,7 @@ using namespace Vivy; ...@@ -9,6 +10,7 @@ using namespace Vivy;
ScriptDocumentView::ScriptDocumentView(const QString &path, QWidget *parent) ScriptDocumentView::ScriptDocumentView(const QString &path, QWidget *parent)
: AbstractDocumentView(AbstractDocumentView::Type::Script, parent) : AbstractDocumentView(AbstractDocumentView::Type::Script, parent)
, editor(new ScriptEditor(this)) , editor(new ScriptEditor(this))
, syntax(new ScriptHighlighter(editor->document()))
{ {
QFile textFile(path); QFile textFile(path);
if (!textFile.open(QIODevice::ReadOnly | QIODevice::Text)) { if (!textFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
namespace Vivy namespace Vivy
{ {
class ScriptEditor; class ScriptEditor;
class ScriptHighlighter;
class ScriptDocumentView final : public AbstractDocumentView { class ScriptDocumentView final : public AbstractDocumentView {
Q_OBJECT Q_OBJECT
...@@ -36,6 +37,7 @@ public: ...@@ -36,6 +37,7 @@ public:
private: private:
ScriptEditor *editor{ nullptr }; ScriptEditor *editor{ nullptr };
ScriptHighlighter *syntax{ nullptr };
}; };
} }
......
...@@ -54,9 +54,9 @@ private: ...@@ -54,9 +54,9 @@ private:
void resetHighlightingRule() noexcept; void resetHighlightingRule() noexcept;
const HighlightingTheme darkHighlightingTheme = { const HighlightingTheme darkHighlightingTheme = {
.functionForeground = Qt::blue, .functionForeground = Qt::darkCyan,
.keywordForeground = Qt::darkBlue, .keywordForeground = Qt::darkYellow,
.valueForeground = Qt::red, .valueForeground = QColor(Qt::cyan).darker(120),
.quotationForeground = Qt::darkGreen, .quotationForeground = Qt::darkGreen,
.commentForeground = QColor(Qt::darkGray).darker(120), .commentForeground = QColor(Qt::darkGray).darker(120),
}; };
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter