7 files changed, 136 insertions, 28 deletions

diff --git a/utils/themeeditor/editorwindow.cpp b/utils/themeeditor/editorwindow.cpp
index c19178a51a..92d400cf78 100644
--- a/utils/themeeditor/editorwindow.cpp
+++ b/utils/themeeditor/editorwindow.cpp
@@ -60,6 +60,7 @@ void EditorWindow::setupUI()
     /* Connecting the buttons */
     QObject::connect(ui->fromTree, SIGNAL(pressed()),
                      this, SLOT(updateCode()));
+
 }
 
 void EditorWindow::setupMenus()
@@ -71,15 +72,17 @@ void EditorWindow::setupMenus()
                      this, SLOT(showPanel()));
     QObject::connect(ui->actionPreview_Panel, SIGNAL(triggered()),
                      this, SLOT(showPanel()));
-}
 
-void EditorWindow::codeChanged()
-{
-    ui->parseTree->expandAll();
+    /* Connecting the document opening/closing actions */
+    QObject::connect(ui->actionNew_Document, SIGNAL(triggered()),
+                     this, SLOT(newTab()));
 }
 
-void EditorWindow::updateCode()
+
+void EditorWindow::newTab()
 {
+    SkinDocument* doc = new SkinDocument;
+    ui->editorTabs->addTab(doc, doc->getTitle());
 }
 
 void EditorWindow::showPanel()
diff --git a/utils/themeeditor/editorwindow.h b/utils/themeeditor/editorwindow.h
index 8cbfd99ede..2b64bde793 100644
--- a/utils/themeeditor/editorwindow.h
+++ b/utils/themeeditor/editorwindow.h
@@ -26,6 +26,7 @@
 
 #include "parsetreemodel.h"
 #include "skinhighlighter.h"
+#include "skindocument.h"
 
 namespace Ui {
     class EditorWindow;
@@ -41,9 +42,8 @@ protected:
     virtual void closeEvent(QCloseEvent* event);
 
 private slots:
-    void updateCode();
-    void codeChanged();
     void showPanel();
+    void newTab();
 
 private:
     /* Setup functions */
@@ -52,8 +52,6 @@ private:
     void setupMenus();
 
     Ui::EditorWindow *ui;
-    SkinHighlighter* highlighter;
-
 };
 
 #endif // EDITORWINDOW_H
diff --git a/utils/themeeditor/editorwindow.ui b/utils/themeeditor/editorwindow.ui
index c7e89a4a0e..0f6062d7f9 100644
--- a/utils/themeeditor/editorwindow.ui
+++ b/utils/themeeditor/editorwindow.ui
@@ -21,9 +21,6 @@
    <layout class="QVBoxLayout" name="verticalLayout">
     <item>
      <widget class="QTabWidget" name="editorTabs">
-      <property name="tabPosition">
-       <enum>QTabWidget::North</enum>
-      </property>
       <property name="currentIndex">
        <number>-1</number>
       </property>
diff --git a/utils/themeeditor/main.cpp b/utils/themeeditor/main.cpp
index 3f7379e0dd..152f780a43 100644
--- a/utils/themeeditor/main.cpp
+++ b/utils/themeeditor/main.cpp
@@ -41,19 +41,5 @@ int main(int argc, char* argv[])
 
     return app.exec();
 
-    /*
-    struct skin_element* test = skin_parse(doc);
-
-    ParseTreeModel tree(doc);
-    std::cout << "----" << std::endl;
-    if(std::string(doc) == tree.genCode().toStdString())
-        std::cout << "Code in/out matches" << std::endl;
-    else
-        std::cout << "Match error" << std::endl;
-
-
-    skin_free_tree(test);
-    */
-
 }
 
diff --git a/utils/themeeditor/skindocument.cpp b/utils/themeeditor/skindocument.cpp
new file mode 100644
index 0000000000..380f16fa7d
--- /dev/null
+++ b/utils/themeeditor/skindocument.cpp
@@ -0,0 +1,63 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2010 Robert Bieber
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+#include "skindocument.h"
+
+SkinDocument::SkinDocument(QWidget *parent) :
+    QWidget(parent)
+{
+    setupUI();
+
+    title = "Untitled";
+}
+
+SkinDocument::~SkinDocument()
+{
+    delete highlighter;
+    delete model;
+}
+
+void SkinDocument::setupUI()
+{
+    /* Setting up the text edit */
+    layout = new QHBoxLayout;
+    editor = new QPlainTextEdit(this);
+    layout->addWidget(editor);
+
+    setLayout(layout);
+
+    /* Attaching the syntax highlighter */
+    highlighter = new SkinHighlighter(QColor(0,180,0), QColor(255,0,0),
+                                      QColor(0,0,255), QColor(120,120,120),
+                                      editor->document());
+
+    /* Setting up the model */
+    model = new ParseTreeModel("");
+
+    /* Connecting the editor's signal */
+    QObject::connect(editor, SIGNAL(textChanged()),
+                     this, SLOT(codeChanged()));
+}
+
+void SkinDocument::codeChanged()
+{
+    model->changeTree(editor->document()->toPlainText().toAscii());
+}
diff --git a/utils/themeeditor/skindocument.h b/utils/themeeditor/skindocument.h
new file mode 100644
index 0000000000..5f25d8e292
--- /dev/null
+++ b/utils/themeeditor/skindocument.h
@@ -0,0 +1,59 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2010 Robert Bieber
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+#ifndef SKINDOCUMENT_H
+#define SKINDOCUMENT_H
+
+#include <QWidget>
+#include <QHBoxLayout>
+#include <QPlainTextEdit>
+
+#include "skinhighlighter.h"
+#include "parsetreemodel.h"
+
+class SkinDocument : public QWidget
+{
+Q_OBJECT
+public:
+    SkinDocument(QWidget *parent = 0);
+    virtual ~SkinDocument();
+
+    ParseTreeModel* getModel(){ return model; }
+    QString getTitle(){ return title; }
+
+signals:
+
+private slots:
+    void codeChanged();
+
+private:
+    void setupUI();
+
+    QString title;
+
+    QLayout* layout;
+    QPlainTextEdit* editor;
+
+    SkinHighlighter* highlighter;
+    ParseTreeModel* model;
+};
+
+#endif // SKINDOCUMENT_H
diff --git a/utils/themeeditor/themeeditor.pro b/utils/themeeditor/themeeditor.pro
index 15615004b1..19d9205d7b 100644
--- a/utils/themeeditor/themeeditor.pro
+++ b/utils/themeeditor/themeeditor.pro
@@ -12,7 +12,8 @@ HEADERS += tag_table.h \
     parsetreemodel.h \
     parsetreenode.h \
     editorwindow.h \
-    skinhighlighter.h
+    skinhighlighter.h \
+    skindocument.h
 SOURCES += tag_table.c \
     skin_parser.c \
     skin_scan.c \
@@ -21,7 +22,8 @@ SOURCES += tag_table.c \
     parsetreemodel.cpp \
     parsetreenode.cpp \
     editorwindow.cpp \
-    skinhighlighter.cpp
+    skinhighlighter.cpp \
+    skindocument.cpp
 OTHER_FILES += README \
     resources/windowicon.png \
     resources/appicon.xcf