From 396146d916e53989df140616a36092769f437703 Mon Sep 17 00:00:00 2001
From: Christian Loose <christian.loose@hamburg.de>
Date: Thu, 13 Nov 2014 21:54:30 +0100
Subject: [PATCH 01/34] Introduce Styles class that handles the builtin styles

---
 app-static/app-static.pro |   6 +-
 app-static/styles.cpp     | 121 ++++++++++++++++++++++++++++++++++++++
 app-static/styles.h       |  59 +++++++++++++++++++
 app/mainwindow.cpp        |  58 ++++++++++--------
 app/mainwindow.h          |   2 +
 5 files changed, 221 insertions(+), 25 deletions(-)
 create mode 100644 app-static/styles.cpp
 create mode 100644 app-static/styles.h

diff --git a/app-static/app-static.pro b/app-static/app-static.pro
index dbb17ebc..fb4ac104 100644
--- a/app-static/app-static.pro
+++ b/app-static/app-static.pro
@@ -24,7 +24,8 @@ SOURCES += \
     slidelinemapping.cpp \
     viewsynchronizer.cpp \
     revealviewsynchronizer.cpp \
-    htmlviewsynchronizer.cpp
+    htmlviewsynchronizer.cpp \
+    styles.cpp
 
 HEADERS += \
     snippets/snippet.h \
@@ -44,7 +45,8 @@ HEADERS += \
     slidelinemapping.h \
     viewsynchronizer.h \
     revealviewsynchronizer.h \
-    htmlviewsynchronizer.h
+    htmlviewsynchronizer.h \
+    styles.h
 
 #unix:!symbian {
 #    maemo5 {
diff --git a/app-static/styles.cpp b/app-static/styles.cpp
new file mode 100644
index 00000000..96ec8d76
--- /dev/null
+++ b/app-static/styles.cpp
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2014 Christian Loose <christian.loose@hamburg.de>
+ *
+ * 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 program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "styles.h"
+
+
+Styles::Styles() 
+{
+    setupBuiltinMarkdownHighlightings();
+    setupBuiltinCodeHighlightings();
+    setupBuiltinPreviewStylesheets();
+    setupBuiltinStyles();
+}
+
+Style Styles::style(const QString &name) const
+{
+    return m_styles[name];
+}
+
+QStringList Styles::markdownHighlightings() const 
+{
+    return QStringList(m_markdownHighlightings.keys());
+}
+
+QString Styles::pathForMarkdownHighlighting(const Style &style) const
+{
+    return m_markdownHighlightings[style.markdownHighlighting];
+}
+
+QStringList Styles::codeHighlightings() const 
+{
+    return QStringList(m_codeHighlightings.keys());
+}
+
+QString Styles::pathForCodeHighlighting(const Style &style) const
+{
+    return m_codeHighlightings[style.codeHighlighting];
+}
+
+QStringList Styles::previewStylesheets() const 
+{
+    return QStringList(m_previewStylesheets.keys());
+}
+
+QString Styles::pathForPreviewStylesheet(const Style &style) const
+{
+    return m_previewStylesheets[style.previewStylesheet];
+}
+
+void Styles::setupBuiltinMarkdownHighlightings() 
+{
+    m_markdownHighlightings.insert("Default", ":/theme/default.txt");
+    m_markdownHighlightings.insert("Solarized Light", ":/theme/solarized-light+.txt");
+    m_markdownHighlightings.insert("Solarized Dark", ":/theme/solarized-dark+.txt");
+    m_markdownHighlightings.insert("Clearness Dark", ":/theme/clearness-dark+.txt");
+    m_markdownHighlightings.insert("Byword Dark", ":/theme/byword-dark.txt");
+}
+
+void Styles::setupBuiltinCodeHighlightings() 
+{
+    m_codeHighlightings.insert("Default", "default");
+    m_codeHighlightings.insert("Github", "github");
+    m_codeHighlightings.insert("Solarized Light", "solarized_light");
+    m_codeHighlightings.insert("Solarized Dark", "solarized_dark");
+}
+
+void Styles::setupBuiltinPreviewStylesheets()
+{
+    m_previewStylesheets.insert("Default", "qrc:/css/markdown.css");
+    m_previewStylesheets.insert("Github", "qrc:/css/github.css");
+    m_previewStylesheets.insert("Solarized Light", "qrc:/css/solarized-light.css");
+    m_previewStylesheets.insert("Solarized Dark", "qrc:/css/solarized-dark.css");
+    m_previewStylesheets.insert("Clearness", "qrc:/css/clearness.css");
+    m_previewStylesheets.insert("Clearness Dark", "qrc:/css/clearness-dark.css");
+    m_previewStylesheets.insert("Byword Dark", "qrc:/css/byword-dark.css");
+}
+
+#include <QDebug>
+void Styles::setupBuiltinStyles()
+{
+    Style defaultStyle = { "Default", "Default", "Default" };
+    m_styles.insert("Default", defaultStyle);
+
+    Style githubStyle = { "Default", "Github", "Github" };
+    m_styles.insert("Github", githubStyle);
+
+    Style solarizedLightStyle = { "Solarized Light", "Solarized Light", "Solarized Light" };
+    m_styles.insert("Solarized Light", solarizedLightStyle);
+
+    Style solarizedDarkStyle = { "Solarized Dark", "Solarized Dark", "Solarized Dark" };
+    m_styles.insert("Solarized Dark", solarizedDarkStyle);
+
+    Style clearnessStyle = { "Default", "Default", "Clearness" };
+    m_styles.insert("Clearness", clearnessStyle);
+
+    Style clearnessDarkStyle = { "Clearness Dark", "Default", "Clearness Dark" };
+    m_styles.insert("Clearness Dark", clearnessDarkStyle);
+
+    Style bywordDarkStyle = { "Byword Dark", "Default", "Byword Dark" };
+    m_styles.insert("Byword Dark", bywordDarkStyle);
+    qDebug() << m_styles;
+}
+
+QDebug operator<<(QDebug dbg, const Style &s)
+{
+    dbg << s.markdownHighlighting << s.codeHighlighting << s.previewStylesheet;
+    return dbg.space();
+}
diff --git a/app-static/styles.h b/app-static/styles.h
new file mode 100644
index 00000000..387c3367
--- /dev/null
+++ b/app-static/styles.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2014 Christian Loose <christian.loose@hamburg.de>
+ *
+ * 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 program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef STYLES_H
+#define STYLES_H
+
+#include <QMap>
+#include <QString>
+#include <QStringList>
+
+struct Style
+{
+    QString markdownHighlighting;
+    QString codeHighlighting;
+    QString previewStylesheet;
+};
+
+class Styles
+{
+public:
+    Styles();
+
+    Style style(const QString &name) const;
+
+    QStringList markdownHighlightings() const;
+    QString pathForMarkdownHighlighting(const Style &style) const;
+
+    QStringList codeHighlightings() const;
+    QString pathForCodeHighlighting(const Style &style) const;
+
+    QStringList previewStylesheets() const;
+    QString pathForPreviewStylesheet(const Style &style) const;
+
+private:
+    void setupBuiltinMarkdownHighlightings();
+    void setupBuiltinCodeHighlightings();
+    void setupBuiltinPreviewStylesheets();
+    void setupBuiltinStyles();
+
+    QMap<QString, QString> m_markdownHighlightings;
+    QMap<QString, QString> m_codeHighlightings;
+    QMap<QString, QString> m_previewStylesheets;
+    QMap<QString, Style> m_styles;
+};
+
+#endif // STYLES_H
diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp
index df528bc0..2fe60f70 100644
--- a/app/mainwindow.cpp
+++ b/app/mainwindow.cpp
@@ -64,6 +64,7 @@
 #include "optionsdialog.h"
 #include "revealviewsynchronizer.h"
 #include "snippetcompleter.h"
+#include "styles.h"
 #include "tabletooldialog.h"
 
 MainWindow::MainWindow(const QString &fileName, QWidget *parent) :
@@ -80,6 +81,7 @@ MainWindow::MainWindow(const QString &fileName, QWidget *parent) :
     generator(new HtmlPreviewGenerator(options, this)),
     snippetCollection(new SnippetCollection(this)),
     viewSynchronizer(0),
+    styles(new Styles()),
     splitFactor(0.5),
     rightViewCollapsed(false)
 {
@@ -148,6 +150,9 @@ void MainWindow::initializeApp()
 
     // set default style
     styleDefault();
+    qDebug() << styles->markdownHighlightings();
+    qDebug() << styles->codeHighlightings();
+    qDebug() << styles->previewStylesheets();
 
     ui->plainTextEdit->tabWidthChanged(options->tabWidth());
 
@@ -490,70 +495,77 @@ void MainWindow::viewChangeSplit()
 
 void MainWindow::styleDefault()
 {
-    generator->setCodeHighlightingStyle("default");
+    Style defaultStyle = styles->style("Default");
+    generator->setCodeHighlightingStyle(styles->pathForCodeHighlighting(defaultStyle));
 
-    ui->plainTextEdit->loadStyleFromStylesheet(":/theme/default.txt");
-    ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl("qrc:/css/markdown.css"));
+    ui->plainTextEdit->loadStyleFromStylesheet(styles->pathForMarkdownHighlighting(defaultStyle));
+    ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl(styles->pathForPreviewStylesheet(defaultStyle)));
 
     styleLabel->setText(ui->actionDefault->text());
 }
 
 void MainWindow::styleGithub()
 {
-    generator->setCodeHighlightingStyle("github");
+    Style githubStyle = styles->style("Github");
+    generator->setCodeHighlightingStyle(styles->pathForCodeHighlighting(githubStyle));
 
-    ui->plainTextEdit->loadStyleFromStylesheet(":/theme/default.txt");
-    ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl("qrc:/css/github.css"));
+    ui->plainTextEdit->loadStyleFromStylesheet(styles->pathForMarkdownHighlighting(githubStyle));
+    ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl(styles->pathForPreviewStylesheet(githubStyle)));
 
     styleLabel->setText(ui->actionGithub->text());
 }
 
 void MainWindow::styleSolarizedLight()
 {
-    generator->setCodeHighlightingStyle("solarized_light");
+    Style solarizedLightStyle = styles->style("Solarized Light");
+    generator->setCodeHighlightingStyle(styles->pathForCodeHighlighting(solarizedLightStyle));
 
-    ui->plainTextEdit->loadStyleFromStylesheet(":/theme/solarized-light+.txt");
-    ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl("qrc:/css/solarized-light.css"));
+    ui->plainTextEdit->loadStyleFromStylesheet(styles->pathForMarkdownHighlighting(solarizedLightStyle));
+    ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl(styles->pathForPreviewStylesheet(solarizedLightStyle)));
 
     styleLabel->setText(ui->actionSolarizedLight->text());
 }
 
 void MainWindow::styleSolarizedDark()
 {
-    generator->setCodeHighlightingStyle("solarized_dark");
+    Style solarizedDarkStyle = styles->style("Solarized Dark");
+    generator->setCodeHighlightingStyle(styles->pathForCodeHighlighting(solarizedDarkStyle));
 
-    ui->plainTextEdit->loadStyleFromStylesheet(":/theme/solarized-dark+.txt");
-    ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl("qrc:/css/solarized-dark.css"));
+    ui->plainTextEdit->loadStyleFromStylesheet(styles->pathForMarkdownHighlighting(solarizedDarkStyle));
+    ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl(styles->pathForPreviewStylesheet(solarizedDarkStyle)));
 
     styleLabel->setText(ui->actionSolarizedDark->text());
 }
 
 void MainWindow::styleClearness()
 {
-    generator->setCodeHighlightingStyle("default");
+    Style clearnessStyle = styles->style("Clearness");
+    generator->setCodeHighlightingStyle(styles->pathForCodeHighlighting(clearnessStyle));
 
-    ui->plainTextEdit->loadStyleFromStylesheet(":/theme/default.txt");
-    ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl("qrc:/css/clearness.css"));
+    ui->plainTextEdit->loadStyleFromStylesheet(styles->pathForMarkdownHighlighting(clearnessStyle));
+    ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl(styles->pathForPreviewStylesheet(clearnessStyle)));
 
     styleLabel->setText(ui->actionClearness->text());
 }
 
 void MainWindow::styleClearnessDark()
 {
-    generator->setCodeHighlightingStyle("default");
+    Style clearnessDarkStyle = styles->style("Clearness Dark");
+    generator->setCodeHighlightingStyle(styles->pathForCodeHighlighting(clearnessDarkStyle));
 
-    ui->plainTextEdit->loadStyleFromStylesheet(":/theme/clearness-dark+.txt");
-    ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl("qrc:/css/clearness-dark.css"));
+    ui->plainTextEdit->loadStyleFromStylesheet(styles->pathForMarkdownHighlighting(clearnessDarkStyle));
+    ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl(styles->pathForPreviewStylesheet(clearnessDarkStyle)));
 
     styleLabel->setText(ui->actionClearnessDark->text());
 }
 
 void MainWindow::styleBywordDark()
 {
-    generator->setCodeHighlightingStyle("default");
+    Style bywordDarkStyle = styles->style("Byword Dark");
+    generator->setCodeHighlightingStyle(styles->pathForCodeHighlighting(bywordDarkStyle));
 
-    ui->plainTextEdit->loadStyleFromStylesheet(":/theme/byword-dark.txt");
-    ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl("qrc:/css/byword-dark.css"));
+    ui->plainTextEdit->loadStyleFromStylesheet(styles->pathForMarkdownHighlighting(bywordDarkStyle));
+    ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl(styles->pathForPreviewStylesheet(bywordDarkStyle)));
 
     styleLabel->setText(ui->actionBywordDark->text());
 }
@@ -562,9 +574,9 @@ void MainWindow::styleCustomStyle()
 {
     QAction *action = qobject_cast<QAction*>(sender());
 
-    generator->setCodeHighlightingStyle("default");
+    //generator->setCodeHighlightingStyle(styles->pathForCodeHighlighting("Default"));
 
-    ui->plainTextEdit->loadStyleFromStylesheet(":/theme/default.txt");
+    //ui->plainTextEdit->loadStyleFromStylesheet(styles->pathForMarkdownHighlighting("Default"));
     ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl::fromLocalFile(action->data().toString()));
 
     styleLabel->setText(action->text());
diff --git a/app/mainwindow.h b/app/mainwindow.h
index adf04a14..cd2e15db 100644
--- a/app/mainwindow.h
+++ b/app/mainwindow.h
@@ -37,6 +37,7 @@ class RecentFilesMenu;
 class Options;
 class SlideLineMapping;
 class SnippetCollection;
+class Styles;
 class ViewSynchronizer;
 
 
@@ -167,6 +168,7 @@ private slots:
     HtmlHighlighter *htmlHighlighter;
     SnippetCollection *snippetCollection;
     ViewSynchronizer *viewSynchronizer;
+    Styles *styles;
     QString fileName;
     float splitFactor;
     bool rightViewCollapsed;

From d8092778b4b228a2a12c89009f5e46d7bcc6a6b5 Mon Sep 17 00:00:00 2001
From: Christian Loose <christian.loose@hamburg.de>
Date: Fri, 14 Nov 2014 21:55:36 +0100
Subject: [PATCH 02/34] Use new Styles class to setup actions for builtin
 styles

---
 app-static/styles.cpp |  48 +++++++----------
 app-static/styles.h   |   4 +-
 app/mainwindow.cpp    | 123 ++++++++++++------------------------------
 app/mainwindow.h      |   9 +---
 app/mainwindow.ui     |   7 ---
 5 files changed, 58 insertions(+), 133 deletions(-)

diff --git a/app-static/styles.cpp b/app-static/styles.cpp
index 96ec8d76..7044e5ac 100644
--- a/app-static/styles.cpp
+++ b/app-static/styles.cpp
@@ -16,6 +16,13 @@
  */
 #include "styles.h"
 
+static const Style BUILTIN_DEFAULT_STYLE = { "Default", "Default", "Default" };
+static const Style BUILTIN_GITHUB_STYLE = { "Default", "Github", "Github" };
+static const Style BUILTIN_SOLARIZED_LIGHT_STYLE = { "Solarized Light", "Solarized Light", "Solarized Light" };
+static const Style BUILTIN_SOLARIZED_DARK_STYLE = { "Solarized Dark", "Solarized Dark", "Solarized Dark" };
+static const Style BUILTIN_CLEARNESS_STYLE = { "Default", "Default", "Clearness" };
+static const Style BUILTIN_CLEARNESS_DARK_STYLE = { "Clearness Dark", "Default", "Clearness Dark" };
+static const Style BUILTIN_BYWORD_DARK_STYLE = { "Byword Dark", "Default", "Byword Dark" };
 
 Styles::Styles() 
 {
@@ -25,9 +32,14 @@ Styles::Styles()
     setupBuiltinStyles();
 }
 
+QStringList Styles::styleNames() const 
+{
+    return QStringList(m_stylesIndex);
+}
+
 Style Styles::style(const QString &name) const
 {
-    return m_styles[name];
+    return m_styles[m_stylesIndex.indexOf(name)];
 }
 
 QStringList Styles::markdownHighlightings() const 
@@ -88,34 +100,14 @@ void Styles::setupBuiltinPreviewStylesheets()
     m_previewStylesheets.insert("Byword Dark", "qrc:/css/byword-dark.css");
 }
 
-#include <QDebug>
 void Styles::setupBuiltinStyles()
 {
-    Style defaultStyle = { "Default", "Default", "Default" };
-    m_styles.insert("Default", defaultStyle);
-
-    Style githubStyle = { "Default", "Github", "Github" };
-    m_styles.insert("Github", githubStyle);
-
-    Style solarizedLightStyle = { "Solarized Light", "Solarized Light", "Solarized Light" };
-    m_styles.insert("Solarized Light", solarizedLightStyle);
-
-    Style solarizedDarkStyle = { "Solarized Dark", "Solarized Dark", "Solarized Dark" };
-    m_styles.insert("Solarized Dark", solarizedDarkStyle);
-
-    Style clearnessStyle = { "Default", "Default", "Clearness" };
-    m_styles.insert("Clearness", clearnessStyle);
-
-    Style clearnessDarkStyle = { "Clearness Dark", "Default", "Clearness Dark" };
-    m_styles.insert("Clearness Dark", clearnessDarkStyle);
-
-    Style bywordDarkStyle = { "Byword Dark", "Default", "Byword Dark" };
-    m_styles.insert("Byword Dark", bywordDarkStyle);
-    qDebug() << m_styles;
+    m_stylesIndex << "Default" << "Github" << "Solarized Light" 
+                  << "Solarized Dark" << "Clearness" << "Clearness Dark" 
+                  << "Byword Dark";
+    m_styles << BUILTIN_DEFAULT_STYLE << BUILTIN_GITHUB_STYLE 
+             << BUILTIN_SOLARIZED_LIGHT_STYLE << BUILTIN_SOLARIZED_DARK_STYLE
+             << BUILTIN_CLEARNESS_STYLE << BUILTIN_CLEARNESS_DARK_STYLE
+             << BUILTIN_BYWORD_DARK_STYLE;
 }
 
-QDebug operator<<(QDebug dbg, const Style &s)
-{
-    dbg << s.markdownHighlighting << s.codeHighlighting << s.previewStylesheet;
-    return dbg.space();
-}
diff --git a/app-static/styles.h b/app-static/styles.h
index 387c3367..3492597d 100644
--- a/app-static/styles.h
+++ b/app-static/styles.h
@@ -33,6 +33,7 @@ class Styles
 public:
     Styles();
 
+    QStringList styleNames() const;
     Style style(const QString &name) const;
 
     QStringList markdownHighlightings() const;
@@ -53,7 +54,8 @@ class Styles
     QMap<QString, QString> m_markdownHighlightings;
     QMap<QString, QString> m_codeHighlightings;
     QMap<QString, QString> m_previewStylesheets;
-    QMap<QString, Style> m_styles;
+    QList<QString> m_stylesIndex;
+    QList<Style> m_styles;
 };
 
 #endif // STYLES_H
diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp
index 2fe60f70..78c85b91 100644
--- a/app/mainwindow.cpp
+++ b/app/mainwindow.cpp
@@ -148,12 +148,14 @@ void MainWindow::initializeApp()
     connect(ui->webView, SIGNAL(customContextMenuRequested(QPoint)),
             this, SLOT(webViewContextMenu(QPoint)));
 
-    // set default style
-    styleDefault();
-    qDebug() << styles->markdownHighlightings();
-    qDebug() << styles->codeHighlightings();
-    qDebug() << styles->previewStylesheets();
+    loadBuiltinStyles();
 
+    // set default style
+    Style defaultStyle = styles->style("Default");
+    generator->setCodeHighlightingStyle(styles->pathForCodeHighlighting(defaultStyle));
+    ui->plainTextEdit->loadStyleFromStylesheet(styles->pathForMarkdownHighlighting(defaultStyle));
+    ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl(styles->pathForPreviewStylesheet(defaultStyle)));
+    
     ui->plainTextEdit->tabWidthChanged(options->tabWidth());
 
     // init extension flags
@@ -493,90 +495,24 @@ void MainWindow::viewChangeSplit()
     }
 }
 
-void MainWindow::styleDefault()
-{
-    Style defaultStyle = styles->style("Default");
-    generator->setCodeHighlightingStyle(styles->pathForCodeHighlighting(defaultStyle));
-
-    ui->plainTextEdit->loadStyleFromStylesheet(styles->pathForMarkdownHighlighting(defaultStyle));
-    ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl(styles->pathForPreviewStylesheet(defaultStyle)));
-
-    styleLabel->setText(ui->actionDefault->text());
-}
-
-void MainWindow::styleGithub()
-{
-    Style githubStyle = styles->style("Github");
-    generator->setCodeHighlightingStyle(styles->pathForCodeHighlighting(githubStyle));
-
-    ui->plainTextEdit->loadStyleFromStylesheet(styles->pathForMarkdownHighlighting(githubStyle));
-    ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl(styles->pathForPreviewStylesheet(githubStyle)));
-
-    styleLabel->setText(ui->actionGithub->text());
-}
-
-void MainWindow::styleSolarizedLight()
-{
-    Style solarizedLightStyle = styles->style("Solarized Light");
-    generator->setCodeHighlightingStyle(styles->pathForCodeHighlighting(solarizedLightStyle));
-
-    ui->plainTextEdit->loadStyleFromStylesheet(styles->pathForMarkdownHighlighting(solarizedLightStyle));
-    ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl(styles->pathForPreviewStylesheet(solarizedLightStyle)));
-
-    styleLabel->setText(ui->actionSolarizedLight->text());
-}
-
-void MainWindow::styleSolarizedDark()
-{
-    Style solarizedDarkStyle = styles->style("Solarized Dark");
-    generator->setCodeHighlightingStyle(styles->pathForCodeHighlighting(solarizedDarkStyle));
-
-    ui->plainTextEdit->loadStyleFromStylesheet(styles->pathForMarkdownHighlighting(solarizedDarkStyle));
-    ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl(styles->pathForPreviewStylesheet(solarizedDarkStyle)));
-
-    styleLabel->setText(ui->actionSolarizedDark->text());
-}
-
-void MainWindow::styleClearness()
-{
-    Style clearnessStyle = styles->style("Clearness");
-    generator->setCodeHighlightingStyle(styles->pathForCodeHighlighting(clearnessStyle));
-
-    ui->plainTextEdit->loadStyleFromStylesheet(styles->pathForMarkdownHighlighting(clearnessStyle));
-    ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl(styles->pathForPreviewStylesheet(clearnessStyle)));
-
-    styleLabel->setText(ui->actionClearness->text());
-}
-
-void MainWindow::styleClearnessDark()
+void MainWindow::styleBuiltinStyle()
 {
-    Style clearnessDarkStyle = styles->style("Clearness Dark");
-    generator->setCodeHighlightingStyle(styles->pathForCodeHighlighting(clearnessDarkStyle));
-
-    ui->plainTextEdit->loadStyleFromStylesheet(styles->pathForMarkdownHighlighting(clearnessDarkStyle));
-    ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl(styles->pathForPreviewStylesheet(clearnessDarkStyle)));
-
-    styleLabel->setText(ui->actionClearnessDark->text());
-}
-
-void MainWindow::styleBywordDark()
-{
-    Style bywordDarkStyle = styles->style("Byword Dark");
-    generator->setCodeHighlightingStyle(styles->pathForCodeHighlighting(bywordDarkStyle));
-
-    ui->plainTextEdit->loadStyleFromStylesheet(styles->pathForMarkdownHighlighting(bywordDarkStyle));
-    ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl(styles->pathForPreviewStylesheet(bywordDarkStyle)));
+    QAction *action = qobject_cast<QAction*>(sender());
+    Style style = styles->style(action->data().toString());
+    generator->setCodeHighlightingStyle(styles->pathForCodeHighlighting(style));
 
-    styleLabel->setText(ui->actionBywordDark->text());
+    ui->plainTextEdit->loadStyleFromStylesheet(styles->pathForMarkdownHighlighting(style));
+    ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl(styles->pathForPreviewStylesheet(style)));
 }
 
 void MainWindow::styleCustomStyle()
 {
     QAction *action = qobject_cast<QAction*>(sender());
 
-    //generator->setCodeHighlightingStyle(styles->pathForCodeHighlighting("Default"));
+    Style defaultStyle = { "Default", "Default", "Default" };
+    generator->setCodeHighlightingStyle(styles->pathForCodeHighlighting(defaultStyle));
 
-    //ui->plainTextEdit->loadStyleFromStylesheet(styles->pathForMarkdownHighlighting("Default"));
+    ui->plainTextEdit->loadStyleFromStylesheet(styles->pathForMarkdownHighlighting(defaultStyle));
     ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl::fromLocalFile(action->data().toString()));
 
     styleLabel->setText(action->text());
@@ -1062,16 +998,6 @@ void MainWindow::setupActions()
     connect(ui->menuLanguages, SIGNAL(languageTriggered(Dictionary)),
             this, SLOT(languageChanged(Dictionary)));
 
-    // put style actions in a group
-    stylesGroup = new QActionGroup(this);
-    ui->actionDefault->setActionGroup(stylesGroup);
-    ui->actionGithub->setActionGroup(stylesGroup);
-    ui->actionSolarizedLight->setActionGroup(stylesGroup);
-    ui->actionSolarizedDark->setActionGroup(stylesGroup);
-    ui->actionClearness->setActionGroup(stylesGroup);
-    ui->actionClearnessDark->setActionGroup(stylesGroup);
-    ui->actionBywordDark->setActionGroup(stylesGroup);
-
     // help menu
     ui->actionMarkdownSyntax->setShortcut(QKeySequence::HelpContents);
 
@@ -1269,6 +1195,23 @@ void MainWindow::updateSplitter()
     ui->splitter->setSizes(childSizes);
 }
 
+void MainWindow::loadBuiltinStyles()
+{
+    // put style actions in a group
+    stylesGroup = new QActionGroup(this);
+
+    int key = 1;
+    foreach(const QString &styleName, styles->styleNames()) {
+        QAction *action = ui->menuStyles->addAction(styleName);
+        action->setShortcut(QKeySequence(tr("Ctrl+%1").arg(key++)));
+        action->setCheckable(true);
+        action->setActionGroup(stylesGroup);
+        action->setData(styleName);
+        connect(action, SIGNAL(triggered()),
+                this, SLOT(styleBuiltinStyle()));
+    }
+}
+
 void MainWindow::loadCustomStyles()
 {
     QStringList paths = DataLocation::standardLocations();
diff --git a/app/mainwindow.h b/app/mainwindow.h
index cd2e15db..a434c988 100644
--- a/app/mainwindow.h
+++ b/app/mainwindow.h
@@ -87,13 +87,7 @@ private slots:
     void editInsertImage();
 
     void viewChangeSplit();
-    void styleDefault();
-    void styleGithub();
-    void styleSolarizedLight();
-    void styleSolarizedDark();
-    void styleClearness();
-    void styleClearnessDark();
-    void styleBywordDark();
+    void styleBuiltinStyle();
     void styleCustomStyle();
     void viewFullScreenMode();
     void viewHorizontalLayout(bool checked);
@@ -148,6 +142,7 @@ private slots:
     bool maybeSave();
     void setFileName(const QString &fileName);
     void updateSplitter();
+    void loadBuiltinStyles();
     void loadCustomStyles();
     void readSettings();
     void writeSettings();
diff --git a/app/mainwindow.ui b/app/mainwindow.ui
index 4b29c3fd..7ec482f1 100644
--- a/app/mainwindow.ui
+++ b/app/mainwindow.ui
@@ -258,13 +258,6 @@
      <property name="title">
       <string>Styles</string>
      </property>
-     <addaction name="actionDefault"/>
-     <addaction name="actionGithub"/>
-     <addaction name="actionSolarizedLight"/>
-     <addaction name="actionSolarizedDark"/>
-     <addaction name="actionClearness"/>
-     <addaction name="actionClearnessDark"/>
-     <addaction name="actionBywordDark"/>
     </widget>
     <widget class="QMenu" name="menuMarkdown_Extensions">
      <property name="title">

From 56d532922f30dba840a02f3177d7ad77e7342fed Mon Sep 17 00:00:00 2001
From: Christian Loose <christian.loose@hamburg.de>
Date: Thu, 20 Nov 2014 21:35:55 +0100
Subject: [PATCH 03/34] Add possibility to choose from reveal.js built-in
 presentation styles

---
 app-static/styles.cpp                        | 51 ++++++++++++++++++--
 app-static/styles.h                          |  9 ++--
 app-static/template/presentationtemplate.cpp | 11 ++++-
 app-static/template/presentationtemplate.h   |  1 +
 app-static/template/template.h               | 10 ++--
 app/htmlpreviewgenerator.cpp                 |  5 ++
 app/htmlpreviewgenerator.h                   |  4 +-
 app/mainwindow.cpp                           | 38 +++++++++++++--
 app/mainwindow.h                             |  4 +-
 app/template_presentation.html               |  3 +-
 10 files changed, 115 insertions(+), 21 deletions(-)

diff --git a/app-static/styles.cpp b/app-static/styles.cpp
index 7044e5ac..9d5288dd 100644
--- a/app-static/styles.cpp
+++ b/app-static/styles.cpp
@@ -24,6 +24,15 @@ static const Style BUILTIN_CLEARNESS_STYLE = { "Default", "Default", "Clearness"
 static const Style BUILTIN_CLEARNESS_DARK_STYLE = { "Clearness Dark", "Default", "Clearness Dark" };
 static const Style BUILTIN_BYWORD_DARK_STYLE = { "Byword Dark", "Default", "Byword Dark" };
 
+static const Style DEFAULT_PRESENTATION_STYLE = { "Default", "Default", "Default Presentation" };
+static const Style BEIGE_PRESENTATION_STYLE = { "Default", "Default", "Beige" };
+static const Style SKY_PRESENTATION_STYLE = { "Default", "Default", "Sky" };
+static const Style NIGHT_PRESENTATION_STYLE = { "Default", "Default", "Night" };
+static const Style SERIF_PRESENTATION_STYLE = { "Default", "Default", "Serif" };
+static const Style SIMPLE_PRESENTATION_STYLE = { "Default", "Default", "Simple" };
+static const Style SOLARIZED_PRESENTATION_STYLE = { "Solarized Light", "Default", "Solarized" };
+
+
 Styles::Styles() 
 {
     setupBuiltinMarkdownHighlightings();
@@ -32,14 +41,22 @@ Styles::Styles()
     setupBuiltinStyles();
 }
 
-QStringList Styles::styleNames() const 
+QStringList Styles::htmlPreviewStyleNames() const 
+{
+    return m_htmlPreviewStylesIndex;
+}
+
+QStringList Styles::presentationStyleNames() const
 {
-    return QStringList(m_stylesIndex);
+    return m_presentationStylesIndex;
 }
 
 Style Styles::style(const QString &name) const
 {
-    return m_styles[m_stylesIndex.indexOf(name)];
+    if (m_htmlPreviewStylesIndex.contains(name))
+        return m_htmlPreviewStyles[m_htmlPreviewStylesIndex.indexOf(name)];
+    else
+        return m_presentationStyles[m_presentationStylesIndex.indexOf(name)];
 }
 
 QStringList Styles::markdownHighlightings() const 
@@ -98,16 +115,40 @@ void Styles::setupBuiltinPreviewStylesheets()
     m_previewStylesheets.insert("Clearness", "qrc:/css/clearness.css");
     m_previewStylesheets.insert("Clearness Dark", "qrc:/css/clearness-dark.css");
     m_previewStylesheets.insert("Byword Dark", "qrc:/css/byword-dark.css");
+
+    m_previewStylesheets.insert("Default Presentation", "https://cdn.jsdelivr.net/reveal.js/2.6.2/css/theme/default.css");
+    m_previewStylesheets.insert("Beige", "https://cdn.jsdelivr.net/reveal.js/2.6.2/css/theme/beige.css");
+    m_previewStylesheets.insert("Sky", "https://cdn.jsdelivr.net/reveal.js/2.6.2/css/theme/sky.css");
+    m_previewStylesheets.insert("Night", "https://cdn.jsdelivr.net/reveal.js/2.6.2/css/theme/night.css");
+    m_previewStylesheets.insert("Serif", "https://cdn.jsdelivr.net/reveal.js/2.6.2/css/theme/serif.css");
+    m_previewStylesheets.insert("Simple", "https://cdn.jsdelivr.net/reveal.js/2.6.2/css/theme/simple.css");
+    m_previewStylesheets.insert("Solarized", "https://cdn.jsdelivr.net/reveal.js/2.6.2/css/theme/solarized.css");
 }
 
 void Styles::setupBuiltinStyles()
 {
-    m_stylesIndex << "Default" << "Github" << "Solarized Light" 
+    m_htmlPreviewStylesIndex << "Default" << "Github" << "Solarized Light" 
                   << "Solarized Dark" << "Clearness" << "Clearness Dark" 
                   << "Byword Dark";
-    m_styles << BUILTIN_DEFAULT_STYLE << BUILTIN_GITHUB_STYLE 
+    m_htmlPreviewStyles << BUILTIN_DEFAULT_STYLE << BUILTIN_GITHUB_STYLE 
              << BUILTIN_SOLARIZED_LIGHT_STYLE << BUILTIN_SOLARIZED_DARK_STYLE
              << BUILTIN_CLEARNESS_STYLE << BUILTIN_CLEARNESS_DARK_STYLE
              << BUILTIN_BYWORD_DARK_STYLE;
+
+    m_presentationStylesIndex << DEFAULT_PRESENTATION_STYLE.previewStylesheet
+                              << BEIGE_PRESENTATION_STYLE.previewStylesheet
+                              << SKY_PRESENTATION_STYLE.previewStylesheet
+                              << NIGHT_PRESENTATION_STYLE.previewStylesheet
+                              << SERIF_PRESENTATION_STYLE.previewStylesheet
+                              << SIMPLE_PRESENTATION_STYLE.previewStylesheet
+                              << SOLARIZED_PRESENTATION_STYLE.previewStylesheet;
+
+    m_presentationStyles << DEFAULT_PRESENTATION_STYLE
+                         << BEIGE_PRESENTATION_STYLE
+                         << SKY_PRESENTATION_STYLE
+                         << NIGHT_PRESENTATION_STYLE
+                         << SERIF_PRESENTATION_STYLE
+                         << SIMPLE_PRESENTATION_STYLE
+                         << SOLARIZED_PRESENTATION_STYLE;
 }
 
diff --git a/app-static/styles.h b/app-static/styles.h
index 3492597d..dc9f1bae 100644
--- a/app-static/styles.h
+++ b/app-static/styles.h
@@ -33,7 +33,8 @@ class Styles
 public:
     Styles();
 
-    QStringList styleNames() const;
+    QStringList htmlPreviewStyleNames() const;
+    QStringList presentationStyleNames() const;
     Style style(const QString &name) const;
 
     QStringList markdownHighlightings() const;
@@ -54,8 +55,10 @@ class Styles
     QMap<QString, QString> m_markdownHighlightings;
     QMap<QString, QString> m_codeHighlightings;
     QMap<QString, QString> m_previewStylesheets;
-    QList<QString> m_stylesIndex;
-    QList<Style> m_styles;
+    QStringList m_htmlPreviewStylesIndex;
+    QList<Style> m_htmlPreviewStyles;
+    QStringList m_presentationStylesIndex;
+    QList<Style> m_presentationStyles;
 };
 
 #endif // STYLES_H
diff --git a/app-static/template/presentationtemplate.cpp b/app-static/template/presentationtemplate.cpp
index 106afd47..fc10c1b8 100644
--- a/app-static/template/presentationtemplate.cpp
+++ b/app-static/template/presentationtemplate.cpp
@@ -33,7 +33,7 @@ QString PresentationTemplate::render(const QString &body, RenderOptions options)
     }
 
     return QString(presentationTemplate)
-            .replace(QLatin1String("<!--__HTML_HEADER__-->"), QString())
+            .replace(QLatin1String("<!--__HTML_HEADER__-->"), buildHtmlHeader())
             .replace(QLatin1String("<!--__HTML_CONTENT__-->"), body)
             .replace(QLatin1String("<!--__REVEAL_PLUGINS__-->"), buildRevealPlugins(options));
 }
@@ -43,6 +43,15 @@ QString PresentationTemplate::exportAsHtml(const QString &, const QString &body,
     return render(body, options);
 }
 
+QString PresentationTemplate::buildHtmlHeader() const
+{
+    QString header;
+
+    header += QString("<link rel=\"stylesheet\" href=\"%1\" id=\"theme\">").arg(previewStyleSheet());
+
+    return header;
+}
+
 QString PresentationTemplate::buildRevealPlugins(RenderOptions options) const
 {
     QString plugins;
diff --git a/app-static/template/presentationtemplate.h b/app-static/template/presentationtemplate.h
index 49a14a6e..089dba7c 100644
--- a/app-static/template/presentationtemplate.h
+++ b/app-static/template/presentationtemplate.h
@@ -28,6 +28,7 @@ class PresentationTemplate : public Template
     virtual QString exportAsHtml(const QString &header, const QString &body, RenderOptions options) const;
 
 private:
+    QString buildHtmlHeader() const;
     QString buildRevealPlugins(RenderOptions options) const;
 
     QString presentationTemplate;
diff --git a/app-static/template/template.h b/app-static/template/template.h
index c767b70c..64a40a45 100644
--- a/app-static/template/template.h
+++ b/app-static/template/template.h
@@ -31,14 +31,18 @@ class Template
 
     virtual ~Template() {}
 
-    QString codeHighlightingStyle() const { return highlightingStyle; }
-    void setCodeHighlightingStyle(const QString &style) { highlightingStyle = style; }
+    QString codeHighlightingStyle() const { return m_highlightingStyle; }
+    void setCodeHighlightingStyle(const QString &style) { m_highlightingStyle = style; }
+
+    QString previewStyleSheet() const { return m_previewStyleSheet; }
+    void setPreviewStyleSheet(const QString &stylesheet) { m_previewStyleSheet = stylesheet; }
 
     virtual QString render(const QString &body, RenderOptions options) const = 0;
     virtual QString exportAsHtml(const QString &header, const QString &body, RenderOptions options) const = 0;
 
 private:
-    QString highlightingStyle;
+    QString m_highlightingStyle;
+    QString m_previewStyleSheet;
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(Template::RenderOptions)
diff --git a/app/htmlpreviewgenerator.cpp b/app/htmlpreviewgenerator.cpp
index ef56423f..294004cc 100644
--- a/app/htmlpreviewgenerator.cpp
+++ b/app/htmlpreviewgenerator.cpp
@@ -103,6 +103,11 @@ void HtmlPreviewGenerator::setCodeHighlightingStyle(const QString &style)
     generateHtmlFromMarkdown();
 }
 
+void HtmlPreviewGenerator::setPreviewStyleSheet(const QString &stylesheet)
+{
+    converter->templateRenderer()->setPreviewStyleSheet(stylesheet);
+}
+
 void HtmlPreviewGenerator::markdownConverterChanged()
 {
     QString style;
diff --git a/app/htmlpreviewgenerator.h b/app/htmlpreviewgenerator.h
index a28edc6e..82e6365f 100644
--- a/app/htmlpreviewgenerator.h
+++ b/app/htmlpreviewgenerator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Christian Loose <christian.loose@hamburg.de>
+ * Copyright 2013-2014 Christian Loose <christian.loose@hamburg.de>
  *
  * 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
@@ -45,6 +45,8 @@ public slots:
     void setCodeHighlightingEnabled(bool enabled);
     void setCodeHighlightingStyle(const QString &style);
 
+    void setPreviewStyleSheet(const QString &stylesheet);
+
     void markdownConverterChanged();
 
 signals:
diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp
index 78c85b91..d9d2d108 100644
--- a/app/mainwindow.cpp
+++ b/app/mainwindow.cpp
@@ -72,6 +72,8 @@ MainWindow::MainWindow(const QString &fileName, QWidget *parent) :
     ui(new Ui::MainWindow),
     options(new Options(this)),
     diskCache(new QNetworkDiskCache(this)),
+    htmlPreviewStylesGroup(0),
+    presentationStylesGroup(0),
     zoomInAction(0),
     zoomOutAction(0),
     zoomResetAction(0),
@@ -500,6 +502,7 @@ void MainWindow::styleBuiltinStyle()
     QAction *action = qobject_cast<QAction*>(sender());
     Style style = styles->style(action->data().toString());
     generator->setCodeHighlightingStyle(styles->pathForCodeHighlighting(style));
+    generator->setPreviewStyleSheet(styles->pathForPreviewStylesheet(style));
 
     ui->plainTextEdit->loadStyleFromStylesheet(styles->pathForMarkdownHighlighting(style));
     ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl(styles->pathForPreviewStylesheet(style)));
@@ -671,7 +674,7 @@ void MainWindow::helpAbout()
 void MainWindow::styleContextMenu(const QPoint &pos)
 {
     QMenu *menu = new QMenu();
-    menu->addActions(stylesGroup->actions());
+    menu->addActions(htmlPreviewStylesGroup->actions());
 
     menu->exec(styleLabel->mapToGlobal(pos));
 }
@@ -877,9 +880,11 @@ void MainWindow::markdownConverterChanged()
         viewSynchronizer = new HtmlViewSynchronizer(ui->webView, ui->plainTextEdit);
         connect(generator, SIGNAL(htmlResultReady(QString)),
                 viewSynchronizer, SLOT(rememberScrollBarPos()));
+        loadBuiltinStyles();
         break;
     case Options::RevealMarkdownConverter:
         viewSynchronizer = new RevealViewSynchronizer(ui->webView, ui->plainTextEdit);
+        setupPresentationStyles();
         break;
     default:
         viewSynchronizer = 0;
@@ -1195,17 +1200,40 @@ void MainWindow::updateSplitter()
     ui->splitter->setSizes(childSizes);
 }
 
+void MainWindow::setupPresentationStyles()
+{
+    ui->menuStyles->clear();
+
+    // put style actions in a group
+    delete presentationStylesGroup;
+    presentationStylesGroup = new QActionGroup(this);
+
+    int key = 1;
+    foreach(const QString &styleName, styles->presentationStyleNames()) {
+        QAction *action = ui->menuStyles->addAction(styleName);
+        action->setShortcut(QKeySequence(tr("Ctrl+%1").arg(key++)));
+        action->setCheckable(true);
+        action->setActionGroup(presentationStylesGroup);
+        action->setData(styleName);
+        connect(action, SIGNAL(triggered()),
+                this, SLOT(styleBuiltinStyle()));
+    }
+}
+
 void MainWindow::loadBuiltinStyles()
 {
+    ui->menuStyles->clear();
+
     // put style actions in a group
-    stylesGroup = new QActionGroup(this);
+    delete htmlPreviewStylesGroup;
+    htmlPreviewStylesGroup = new QActionGroup(this);
 
     int key = 1;
-    foreach(const QString &styleName, styles->styleNames()) {
+    foreach(const QString &styleName, styles->htmlPreviewStyleNames()) {
         QAction *action = ui->menuStyles->addAction(styleName);
         action->setShortcut(QKeySequence(tr("Ctrl+%1").arg(key++)));
         action->setCheckable(true);
-        action->setActionGroup(stylesGroup);
+        action->setActionGroup(htmlPreviewStylesGroup);
         action->setData(styleName);
         connect(action, SIGNAL(triggered()),
                 this, SLOT(styleBuiltinStyle()));
@@ -1229,7 +1257,7 @@ void MainWindow::loadCustomStyles()
             QString fileName = it.fileName();
             QAction *action = ui->menuStyles->addAction(QFileInfo(fileName).baseName());
             action->setCheckable(true);
-            action->setActionGroup(stylesGroup);
+            action->setActionGroup(htmlPreviewStylesGroup);
             action->setData(it.filePath());
 
             connect(action, SIGNAL(triggered()),
diff --git a/app/mainwindow.h b/app/mainwindow.h
index a434c988..475fe3c7 100644
--- a/app/mainwindow.h
+++ b/app/mainwindow.h
@@ -142,6 +142,7 @@ private slots:
     bool maybeSave();
     void setFileName(const QString &fileName);
     void updateSplitter();
+    void setupPresentationStyles();
     void loadBuiltinStyles();
     void loadCustomStyles();
     void readSettings();
@@ -152,7 +153,8 @@ private slots:
     RecentFilesMenu *recentFilesMenu;
     Options *options;
     QNetworkDiskCache *diskCache;
-    QActionGroup *stylesGroup;
+    QActionGroup *htmlPreviewStylesGroup;
+    QActionGroup *presentationStylesGroup;
     QAction *zoomInAction;
     QAction *zoomOutAction;
     QAction *zoomResetAction;
diff --git a/app/template_presentation.html b/app/template_presentation.html
index f8d3b31f..0706c4e8 100644
--- a/app/template_presentation.html
+++ b/app/template_presentation.html
@@ -3,10 +3,9 @@
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/reveal.js/2.6.2/css/reveal.min.css">
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/reveal.js/2.6.2/css/theme/default.css" id="theme">
+<!--__HTML_HEADER__-->
 <!-- For syntax highlighting -->
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/reveal.js/2.6.2/lib/css/zenburn.css">
-<!--__HTML_HEADER__-->
 </head>
 <body>
 

From f5c680b681b45afee2c8e0d45b6b69dcf9caa848 Mon Sep 17 00:00:00 2001
From: Christian Loose <christian.loose@hamburg.de>
Date: Thu, 13 Nov 2014 21:54:30 +0100
Subject: [PATCH 04/34] Introduce Styles class that handles the builtin styles

---
 app-static/app-static.pro |   6 +-
 app-static/styles.cpp     | 121 ++++++++++++++++++++++++++++++++++++++
 app-static/styles.h       |  59 +++++++++++++++++++
 app/mainwindow.cpp        |  58 ++++++++++--------
 app/mainwindow.h          |   2 +
 5 files changed, 221 insertions(+), 25 deletions(-)
 create mode 100644 app-static/styles.cpp
 create mode 100644 app-static/styles.h

diff --git a/app-static/app-static.pro b/app-static/app-static.pro
index dbb17ebc..fb4ac104 100644
--- a/app-static/app-static.pro
+++ b/app-static/app-static.pro
@@ -24,7 +24,8 @@ SOURCES += \
     slidelinemapping.cpp \
     viewsynchronizer.cpp \
     revealviewsynchronizer.cpp \
-    htmlviewsynchronizer.cpp
+    htmlviewsynchronizer.cpp \
+    styles.cpp
 
 HEADERS += \
     snippets/snippet.h \
@@ -44,7 +45,8 @@ HEADERS += \
     slidelinemapping.h \
     viewsynchronizer.h \
     revealviewsynchronizer.h \
-    htmlviewsynchronizer.h
+    htmlviewsynchronizer.h \
+    styles.h
 
 #unix:!symbian {
 #    maemo5 {
diff --git a/app-static/styles.cpp b/app-static/styles.cpp
new file mode 100644
index 00000000..96ec8d76
--- /dev/null
+++ b/app-static/styles.cpp
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2014 Christian Loose <christian.loose@hamburg.de>
+ *
+ * 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 program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "styles.h"
+
+
+Styles::Styles() 
+{
+    setupBuiltinMarkdownHighlightings();
+    setupBuiltinCodeHighlightings();
+    setupBuiltinPreviewStylesheets();
+    setupBuiltinStyles();
+}
+
+Style Styles::style(const QString &name) const
+{
+    return m_styles[name];
+}
+
+QStringList Styles::markdownHighlightings() const 
+{
+    return QStringList(m_markdownHighlightings.keys());
+}
+
+QString Styles::pathForMarkdownHighlighting(const Style &style) const
+{
+    return m_markdownHighlightings[style.markdownHighlighting];
+}
+
+QStringList Styles::codeHighlightings() const 
+{
+    return QStringList(m_codeHighlightings.keys());
+}
+
+QString Styles::pathForCodeHighlighting(const Style &style) const
+{
+    return m_codeHighlightings[style.codeHighlighting];
+}
+
+QStringList Styles::previewStylesheets() const 
+{
+    return QStringList(m_previewStylesheets.keys());
+}
+
+QString Styles::pathForPreviewStylesheet(const Style &style) const
+{
+    return m_previewStylesheets[style.previewStylesheet];
+}
+
+void Styles::setupBuiltinMarkdownHighlightings() 
+{
+    m_markdownHighlightings.insert("Default", ":/theme/default.txt");
+    m_markdownHighlightings.insert("Solarized Light", ":/theme/solarized-light+.txt");
+    m_markdownHighlightings.insert("Solarized Dark", ":/theme/solarized-dark+.txt");
+    m_markdownHighlightings.insert("Clearness Dark", ":/theme/clearness-dark+.txt");
+    m_markdownHighlightings.insert("Byword Dark", ":/theme/byword-dark.txt");
+}
+
+void Styles::setupBuiltinCodeHighlightings() 
+{
+    m_codeHighlightings.insert("Default", "default");
+    m_codeHighlightings.insert("Github", "github");
+    m_codeHighlightings.insert("Solarized Light", "solarized_light");
+    m_codeHighlightings.insert("Solarized Dark", "solarized_dark");
+}
+
+void Styles::setupBuiltinPreviewStylesheets()
+{
+    m_previewStylesheets.insert("Default", "qrc:/css/markdown.css");
+    m_previewStylesheets.insert("Github", "qrc:/css/github.css");
+    m_previewStylesheets.insert("Solarized Light", "qrc:/css/solarized-light.css");
+    m_previewStylesheets.insert("Solarized Dark", "qrc:/css/solarized-dark.css");
+    m_previewStylesheets.insert("Clearness", "qrc:/css/clearness.css");
+    m_previewStylesheets.insert("Clearness Dark", "qrc:/css/clearness-dark.css");
+    m_previewStylesheets.insert("Byword Dark", "qrc:/css/byword-dark.css");
+}
+
+#include <QDebug>
+void Styles::setupBuiltinStyles()
+{
+    Style defaultStyle = { "Default", "Default", "Default" };
+    m_styles.insert("Default", defaultStyle);
+
+    Style githubStyle = { "Default", "Github", "Github" };
+    m_styles.insert("Github", githubStyle);
+
+    Style solarizedLightStyle = { "Solarized Light", "Solarized Light", "Solarized Light" };
+    m_styles.insert("Solarized Light", solarizedLightStyle);
+
+    Style solarizedDarkStyle = { "Solarized Dark", "Solarized Dark", "Solarized Dark" };
+    m_styles.insert("Solarized Dark", solarizedDarkStyle);
+
+    Style clearnessStyle = { "Default", "Default", "Clearness" };
+    m_styles.insert("Clearness", clearnessStyle);
+
+    Style clearnessDarkStyle = { "Clearness Dark", "Default", "Clearness Dark" };
+    m_styles.insert("Clearness Dark", clearnessDarkStyle);
+
+    Style bywordDarkStyle = { "Byword Dark", "Default", "Byword Dark" };
+    m_styles.insert("Byword Dark", bywordDarkStyle);
+    qDebug() << m_styles;
+}
+
+QDebug operator<<(QDebug dbg, const Style &s)
+{
+    dbg << s.markdownHighlighting << s.codeHighlighting << s.previewStylesheet;
+    return dbg.space();
+}
diff --git a/app-static/styles.h b/app-static/styles.h
new file mode 100644
index 00000000..387c3367
--- /dev/null
+++ b/app-static/styles.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2014 Christian Loose <christian.loose@hamburg.de>
+ *
+ * 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 program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef STYLES_H
+#define STYLES_H
+
+#include <QMap>
+#include <QString>
+#include <QStringList>
+
+struct Style
+{
+    QString markdownHighlighting;
+    QString codeHighlighting;
+    QString previewStylesheet;
+};
+
+class Styles
+{
+public:
+    Styles();
+
+    Style style(const QString &name) const;
+
+    QStringList markdownHighlightings() const;
+    QString pathForMarkdownHighlighting(const Style &style) const;
+
+    QStringList codeHighlightings() const;
+    QString pathForCodeHighlighting(const Style &style) const;
+
+    QStringList previewStylesheets() const;
+    QString pathForPreviewStylesheet(const Style &style) const;
+
+private:
+    void setupBuiltinMarkdownHighlightings();
+    void setupBuiltinCodeHighlightings();
+    void setupBuiltinPreviewStylesheets();
+    void setupBuiltinStyles();
+
+    QMap<QString, QString> m_markdownHighlightings;
+    QMap<QString, QString> m_codeHighlightings;
+    QMap<QString, QString> m_previewStylesheets;
+    QMap<QString, Style> m_styles;
+};
+
+#endif // STYLES_H
diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp
index a11131fb..2658e946 100644
--- a/app/mainwindow.cpp
+++ b/app/mainwindow.cpp
@@ -64,6 +64,7 @@
 #include "optionsdialog.h"
 #include "revealviewsynchronizer.h"
 #include "snippetcompleter.h"
+#include "styles.h"
 #include "tabletooldialog.h"
 
 MainWindow::MainWindow(const QString &fileName, QWidget *parent) :
@@ -80,6 +81,7 @@ MainWindow::MainWindow(const QString &fileName, QWidget *parent) :
     generator(new HtmlPreviewGenerator(options, this)),
     snippetCollection(new SnippetCollection(this)),
     viewSynchronizer(0),
+    styles(new Styles()),
     splitFactor(0.5),
     rightViewCollapsed(false)
 {
@@ -148,6 +150,9 @@ void MainWindow::initializeApp()
 
     // set default style
     styleDefault();
+    qDebug() << styles->markdownHighlightings();
+    qDebug() << styles->codeHighlightings();
+    qDebug() << styles->previewStylesheets();
 
     ui->plainTextEdit->tabWidthChanged(options->tabWidth());
 
@@ -490,70 +495,77 @@ void MainWindow::viewChangeSplit()
 
 void MainWindow::styleDefault()
 {
-    generator->setCodeHighlightingStyle("default");
+    Style defaultStyle = styles->style("Default");
+    generator->setCodeHighlightingStyle(styles->pathForCodeHighlighting(defaultStyle));
 
-    ui->plainTextEdit->loadStyleFromStylesheet(":/theme/default.txt");
-    ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl("qrc:/css/markdown.css"));
+    ui->plainTextEdit->loadStyleFromStylesheet(styles->pathForMarkdownHighlighting(defaultStyle));
+    ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl(styles->pathForPreviewStylesheet(defaultStyle)));
 
     styleLabel->setText(ui->actionDefault->text());
 }
 
 void MainWindow::styleGithub()
 {
-    generator->setCodeHighlightingStyle("github");
+    Style githubStyle = styles->style("Github");
+    generator->setCodeHighlightingStyle(styles->pathForCodeHighlighting(githubStyle));
 
-    ui->plainTextEdit->loadStyleFromStylesheet(":/theme/default.txt");
-    ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl("qrc:/css/github.css"));
+    ui->plainTextEdit->loadStyleFromStylesheet(styles->pathForMarkdownHighlighting(githubStyle));
+    ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl(styles->pathForPreviewStylesheet(githubStyle)));
 
     styleLabel->setText(ui->actionGithub->text());
 }
 
 void MainWindow::styleSolarizedLight()
 {
-    generator->setCodeHighlightingStyle("solarized_light");
+    Style solarizedLightStyle = styles->style("Solarized Light");
+    generator->setCodeHighlightingStyle(styles->pathForCodeHighlighting(solarizedLightStyle));
 
-    ui->plainTextEdit->loadStyleFromStylesheet(":/theme/solarized-light+.txt");
-    ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl("qrc:/css/solarized-light.css"));
+    ui->plainTextEdit->loadStyleFromStylesheet(styles->pathForMarkdownHighlighting(solarizedLightStyle));
+    ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl(styles->pathForPreviewStylesheet(solarizedLightStyle)));
 
     styleLabel->setText(ui->actionSolarizedLight->text());
 }
 
 void MainWindow::styleSolarizedDark()
 {
-    generator->setCodeHighlightingStyle("solarized_dark");
+    Style solarizedDarkStyle = styles->style("Solarized Dark");
+    generator->setCodeHighlightingStyle(styles->pathForCodeHighlighting(solarizedDarkStyle));
 
-    ui->plainTextEdit->loadStyleFromStylesheet(":/theme/solarized-dark+.txt");
-    ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl("qrc:/css/solarized-dark.css"));
+    ui->plainTextEdit->loadStyleFromStylesheet(styles->pathForMarkdownHighlighting(solarizedDarkStyle));
+    ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl(styles->pathForPreviewStylesheet(solarizedDarkStyle)));
 
     styleLabel->setText(ui->actionSolarizedDark->text());
 }
 
 void MainWindow::styleClearness()
 {
-    generator->setCodeHighlightingStyle("default");
+    Style clearnessStyle = styles->style("Clearness");
+    generator->setCodeHighlightingStyle(styles->pathForCodeHighlighting(clearnessStyle));
 
-    ui->plainTextEdit->loadStyleFromStylesheet(":/theme/default.txt");
-    ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl("qrc:/css/clearness.css"));
+    ui->plainTextEdit->loadStyleFromStylesheet(styles->pathForMarkdownHighlighting(clearnessStyle));
+    ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl(styles->pathForPreviewStylesheet(clearnessStyle)));
 
     styleLabel->setText(ui->actionClearness->text());
 }
 
 void MainWindow::styleClearnessDark()
 {
-    generator->setCodeHighlightingStyle("default");
+    Style clearnessDarkStyle = styles->style("Clearness Dark");
+    generator->setCodeHighlightingStyle(styles->pathForCodeHighlighting(clearnessDarkStyle));
 
-    ui->plainTextEdit->loadStyleFromStylesheet(":/theme/clearness-dark+.txt");
-    ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl("qrc:/css/clearness-dark.css"));
+    ui->plainTextEdit->loadStyleFromStylesheet(styles->pathForMarkdownHighlighting(clearnessDarkStyle));
+    ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl(styles->pathForPreviewStylesheet(clearnessDarkStyle)));
 
     styleLabel->setText(ui->actionClearnessDark->text());
 }
 
 void MainWindow::styleBywordDark()
 {
-    generator->setCodeHighlightingStyle("default");
+    Style bywordDarkStyle = styles->style("Byword Dark");
+    generator->setCodeHighlightingStyle(styles->pathForCodeHighlighting(bywordDarkStyle));
 
-    ui->plainTextEdit->loadStyleFromStylesheet(":/theme/byword-dark.txt");
-    ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl("qrc:/css/byword-dark.css"));
+    ui->plainTextEdit->loadStyleFromStylesheet(styles->pathForMarkdownHighlighting(bywordDarkStyle));
+    ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl(styles->pathForPreviewStylesheet(bywordDarkStyle)));
 
     styleLabel->setText(ui->actionBywordDark->text());
 }
@@ -562,9 +574,9 @@ void MainWindow::styleCustomStyle()
 {
     QAction *action = qobject_cast<QAction*>(sender());
 
-    generator->setCodeHighlightingStyle("default");
+    //generator->setCodeHighlightingStyle(styles->pathForCodeHighlighting("Default"));
 
-    ui->plainTextEdit->loadStyleFromStylesheet(":/theme/default.txt");
+    //ui->plainTextEdit->loadStyleFromStylesheet(styles->pathForMarkdownHighlighting("Default"));
     ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl::fromLocalFile(action->data().toString()));
 
     styleLabel->setText(action->text());
diff --git a/app/mainwindow.h b/app/mainwindow.h
index adf04a14..cd2e15db 100644
--- a/app/mainwindow.h
+++ b/app/mainwindow.h
@@ -37,6 +37,7 @@ class RecentFilesMenu;
 class Options;
 class SlideLineMapping;
 class SnippetCollection;
+class Styles;
 class ViewSynchronizer;
 
 
@@ -167,6 +168,7 @@ private slots:
     HtmlHighlighter *htmlHighlighter;
     SnippetCollection *snippetCollection;
     ViewSynchronizer *viewSynchronizer;
+    Styles *styles;
     QString fileName;
     float splitFactor;
     bool rightViewCollapsed;

From 0cfced82ec9b73bc159a4432d5678347ac180aa2 Mon Sep 17 00:00:00 2001
From: Christian Loose <christian.loose@hamburg.de>
Date: Fri, 14 Nov 2014 21:55:36 +0100
Subject: [PATCH 05/34] Use new Styles class to setup actions for builtin
 styles

---
 app-static/styles.cpp |  48 +++++++----------
 app-static/styles.h   |   4 +-
 app/mainwindow.cpp    | 123 ++++++++++++------------------------------
 app/mainwindow.h      |   9 +---
 app/mainwindow.ui     |   7 ---
 5 files changed, 58 insertions(+), 133 deletions(-)

diff --git a/app-static/styles.cpp b/app-static/styles.cpp
index 96ec8d76..7044e5ac 100644
--- a/app-static/styles.cpp
+++ b/app-static/styles.cpp
@@ -16,6 +16,13 @@
  */
 #include "styles.h"
 
+static const Style BUILTIN_DEFAULT_STYLE = { "Default", "Default", "Default" };
+static const Style BUILTIN_GITHUB_STYLE = { "Default", "Github", "Github" };
+static const Style BUILTIN_SOLARIZED_LIGHT_STYLE = { "Solarized Light", "Solarized Light", "Solarized Light" };
+static const Style BUILTIN_SOLARIZED_DARK_STYLE = { "Solarized Dark", "Solarized Dark", "Solarized Dark" };
+static const Style BUILTIN_CLEARNESS_STYLE = { "Default", "Default", "Clearness" };
+static const Style BUILTIN_CLEARNESS_DARK_STYLE = { "Clearness Dark", "Default", "Clearness Dark" };
+static const Style BUILTIN_BYWORD_DARK_STYLE = { "Byword Dark", "Default", "Byword Dark" };
 
 Styles::Styles() 
 {
@@ -25,9 +32,14 @@ Styles::Styles()
     setupBuiltinStyles();
 }
 
+QStringList Styles::styleNames() const 
+{
+    return QStringList(m_stylesIndex);
+}
+
 Style Styles::style(const QString &name) const
 {
-    return m_styles[name];
+    return m_styles[m_stylesIndex.indexOf(name)];
 }
 
 QStringList Styles::markdownHighlightings() const 
@@ -88,34 +100,14 @@ void Styles::setupBuiltinPreviewStylesheets()
     m_previewStylesheets.insert("Byword Dark", "qrc:/css/byword-dark.css");
 }
 
-#include <QDebug>
 void Styles::setupBuiltinStyles()
 {
-    Style defaultStyle = { "Default", "Default", "Default" };
-    m_styles.insert("Default", defaultStyle);
-
-    Style githubStyle = { "Default", "Github", "Github" };
-    m_styles.insert("Github", githubStyle);
-
-    Style solarizedLightStyle = { "Solarized Light", "Solarized Light", "Solarized Light" };
-    m_styles.insert("Solarized Light", solarizedLightStyle);
-
-    Style solarizedDarkStyle = { "Solarized Dark", "Solarized Dark", "Solarized Dark" };
-    m_styles.insert("Solarized Dark", solarizedDarkStyle);
-
-    Style clearnessStyle = { "Default", "Default", "Clearness" };
-    m_styles.insert("Clearness", clearnessStyle);
-
-    Style clearnessDarkStyle = { "Clearness Dark", "Default", "Clearness Dark" };
-    m_styles.insert("Clearness Dark", clearnessDarkStyle);
-
-    Style bywordDarkStyle = { "Byword Dark", "Default", "Byword Dark" };
-    m_styles.insert("Byword Dark", bywordDarkStyle);
-    qDebug() << m_styles;
+    m_stylesIndex << "Default" << "Github" << "Solarized Light" 
+                  << "Solarized Dark" << "Clearness" << "Clearness Dark" 
+                  << "Byword Dark";
+    m_styles << BUILTIN_DEFAULT_STYLE << BUILTIN_GITHUB_STYLE 
+             << BUILTIN_SOLARIZED_LIGHT_STYLE << BUILTIN_SOLARIZED_DARK_STYLE
+             << BUILTIN_CLEARNESS_STYLE << BUILTIN_CLEARNESS_DARK_STYLE
+             << BUILTIN_BYWORD_DARK_STYLE;
 }
 
-QDebug operator<<(QDebug dbg, const Style &s)
-{
-    dbg << s.markdownHighlighting << s.codeHighlighting << s.previewStylesheet;
-    return dbg.space();
-}
diff --git a/app-static/styles.h b/app-static/styles.h
index 387c3367..3492597d 100644
--- a/app-static/styles.h
+++ b/app-static/styles.h
@@ -33,6 +33,7 @@ class Styles
 public:
     Styles();
 
+    QStringList styleNames() const;
     Style style(const QString &name) const;
 
     QStringList markdownHighlightings() const;
@@ -53,7 +54,8 @@ class Styles
     QMap<QString, QString> m_markdownHighlightings;
     QMap<QString, QString> m_codeHighlightings;
     QMap<QString, QString> m_previewStylesheets;
-    QMap<QString, Style> m_styles;
+    QList<QString> m_stylesIndex;
+    QList<Style> m_styles;
 };
 
 #endif // STYLES_H
diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp
index 2658e946..15dc01b8 100644
--- a/app/mainwindow.cpp
+++ b/app/mainwindow.cpp
@@ -148,12 +148,14 @@ void MainWindow::initializeApp()
     connect(ui->webView, SIGNAL(customContextMenuRequested(QPoint)),
             this, SLOT(webViewContextMenu(QPoint)));
 
-    // set default style
-    styleDefault();
-    qDebug() << styles->markdownHighlightings();
-    qDebug() << styles->codeHighlightings();
-    qDebug() << styles->previewStylesheets();
+    loadBuiltinStyles();
 
+    // set default style
+    Style defaultStyle = styles->style("Default");
+    generator->setCodeHighlightingStyle(styles->pathForCodeHighlighting(defaultStyle));
+    ui->plainTextEdit->loadStyleFromStylesheet(styles->pathForMarkdownHighlighting(defaultStyle));
+    ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl(styles->pathForPreviewStylesheet(defaultStyle)));
+    
     ui->plainTextEdit->tabWidthChanged(options->tabWidth());
 
     // init extension flags
@@ -493,90 +495,24 @@ void MainWindow::viewChangeSplit()
     }
 }
 
-void MainWindow::styleDefault()
-{
-    Style defaultStyle = styles->style("Default");
-    generator->setCodeHighlightingStyle(styles->pathForCodeHighlighting(defaultStyle));
-
-    ui->plainTextEdit->loadStyleFromStylesheet(styles->pathForMarkdownHighlighting(defaultStyle));
-    ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl(styles->pathForPreviewStylesheet(defaultStyle)));
-
-    styleLabel->setText(ui->actionDefault->text());
-}
-
-void MainWindow::styleGithub()
-{
-    Style githubStyle = styles->style("Github");
-    generator->setCodeHighlightingStyle(styles->pathForCodeHighlighting(githubStyle));
-
-    ui->plainTextEdit->loadStyleFromStylesheet(styles->pathForMarkdownHighlighting(githubStyle));
-    ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl(styles->pathForPreviewStylesheet(githubStyle)));
-
-    styleLabel->setText(ui->actionGithub->text());
-}
-
-void MainWindow::styleSolarizedLight()
-{
-    Style solarizedLightStyle = styles->style("Solarized Light");
-    generator->setCodeHighlightingStyle(styles->pathForCodeHighlighting(solarizedLightStyle));
-
-    ui->plainTextEdit->loadStyleFromStylesheet(styles->pathForMarkdownHighlighting(solarizedLightStyle));
-    ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl(styles->pathForPreviewStylesheet(solarizedLightStyle)));
-
-    styleLabel->setText(ui->actionSolarizedLight->text());
-}
-
-void MainWindow::styleSolarizedDark()
-{
-    Style solarizedDarkStyle = styles->style("Solarized Dark");
-    generator->setCodeHighlightingStyle(styles->pathForCodeHighlighting(solarizedDarkStyle));
-
-    ui->plainTextEdit->loadStyleFromStylesheet(styles->pathForMarkdownHighlighting(solarizedDarkStyle));
-    ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl(styles->pathForPreviewStylesheet(solarizedDarkStyle)));
-
-    styleLabel->setText(ui->actionSolarizedDark->text());
-}
-
-void MainWindow::styleClearness()
-{
-    Style clearnessStyle = styles->style("Clearness");
-    generator->setCodeHighlightingStyle(styles->pathForCodeHighlighting(clearnessStyle));
-
-    ui->plainTextEdit->loadStyleFromStylesheet(styles->pathForMarkdownHighlighting(clearnessStyle));
-    ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl(styles->pathForPreviewStylesheet(clearnessStyle)));
-
-    styleLabel->setText(ui->actionClearness->text());
-}
-
-void MainWindow::styleClearnessDark()
+void MainWindow::styleBuiltinStyle()
 {
-    Style clearnessDarkStyle = styles->style("Clearness Dark");
-    generator->setCodeHighlightingStyle(styles->pathForCodeHighlighting(clearnessDarkStyle));
-
-    ui->plainTextEdit->loadStyleFromStylesheet(styles->pathForMarkdownHighlighting(clearnessDarkStyle));
-    ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl(styles->pathForPreviewStylesheet(clearnessDarkStyle)));
-
-    styleLabel->setText(ui->actionClearnessDark->text());
-}
-
-void MainWindow::styleBywordDark()
-{
-    Style bywordDarkStyle = styles->style("Byword Dark");
-    generator->setCodeHighlightingStyle(styles->pathForCodeHighlighting(bywordDarkStyle));
-
-    ui->plainTextEdit->loadStyleFromStylesheet(styles->pathForMarkdownHighlighting(bywordDarkStyle));
-    ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl(styles->pathForPreviewStylesheet(bywordDarkStyle)));
+    QAction *action = qobject_cast<QAction*>(sender());
+    Style style = styles->style(action->data().toString());
+    generator->setCodeHighlightingStyle(styles->pathForCodeHighlighting(style));
 
-    styleLabel->setText(ui->actionBywordDark->text());
+    ui->plainTextEdit->loadStyleFromStylesheet(styles->pathForMarkdownHighlighting(style));
+    ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl(styles->pathForPreviewStylesheet(style)));
 }
 
 void MainWindow::styleCustomStyle()
 {
     QAction *action = qobject_cast<QAction*>(sender());
 
-    //generator->setCodeHighlightingStyle(styles->pathForCodeHighlighting("Default"));
+    Style defaultStyle = { "Default", "Default", "Default" };
+    generator->setCodeHighlightingStyle(styles->pathForCodeHighlighting(defaultStyle));
 
-    //ui->plainTextEdit->loadStyleFromStylesheet(styles->pathForMarkdownHighlighting("Default"));
+    ui->plainTextEdit->loadStyleFromStylesheet(styles->pathForMarkdownHighlighting(defaultStyle));
     ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl::fromLocalFile(action->data().toString()));
 
     styleLabel->setText(action->text());
@@ -1065,16 +1001,6 @@ void MainWindow::setupActions()
     connect(ui->menuLanguages, SIGNAL(languageTriggered(Dictionary)),
             this, SLOT(languageChanged(Dictionary)));
 
-    // put style actions in a group
-    stylesGroup = new QActionGroup(this);
-    ui->actionDefault->setActionGroup(stylesGroup);
-    ui->actionGithub->setActionGroup(stylesGroup);
-    ui->actionSolarizedLight->setActionGroup(stylesGroup);
-    ui->actionSolarizedDark->setActionGroup(stylesGroup);
-    ui->actionClearness->setActionGroup(stylesGroup);
-    ui->actionClearnessDark->setActionGroup(stylesGroup);
-    ui->actionBywordDark->setActionGroup(stylesGroup);
-
     // help menu
     ui->actionMarkdownSyntax->setShortcut(QKeySequence::HelpContents);
 
@@ -1272,6 +1198,23 @@ void MainWindow::updateSplitter()
     ui->splitter->setSizes(childSizes);
 }
 
+void MainWindow::loadBuiltinStyles()
+{
+    // put style actions in a group
+    stylesGroup = new QActionGroup(this);
+
+    int key = 1;
+    foreach(const QString &styleName, styles->styleNames()) {
+        QAction *action = ui->menuStyles->addAction(styleName);
+        action->setShortcut(QKeySequence(tr("Ctrl+%1").arg(key++)));
+        action->setCheckable(true);
+        action->setActionGroup(stylesGroup);
+        action->setData(styleName);
+        connect(action, SIGNAL(triggered()),
+                this, SLOT(styleBuiltinStyle()));
+    }
+}
+
 void MainWindow::loadCustomStyles()
 {
     QStringList paths = DataLocation::standardLocations();
diff --git a/app/mainwindow.h b/app/mainwindow.h
index cd2e15db..a434c988 100644
--- a/app/mainwindow.h
+++ b/app/mainwindow.h
@@ -87,13 +87,7 @@ private slots:
     void editInsertImage();
 
     void viewChangeSplit();
-    void styleDefault();
-    void styleGithub();
-    void styleSolarizedLight();
-    void styleSolarizedDark();
-    void styleClearness();
-    void styleClearnessDark();
-    void styleBywordDark();
+    void styleBuiltinStyle();
     void styleCustomStyle();
     void viewFullScreenMode();
     void viewHorizontalLayout(bool checked);
@@ -148,6 +142,7 @@ private slots:
     bool maybeSave();
     void setFileName(const QString &fileName);
     void updateSplitter();
+    void loadBuiltinStyles();
     void loadCustomStyles();
     void readSettings();
     void writeSettings();
diff --git a/app/mainwindow.ui b/app/mainwindow.ui
index 4b29c3fd..7ec482f1 100644
--- a/app/mainwindow.ui
+++ b/app/mainwindow.ui
@@ -258,13 +258,6 @@
      <property name="title">
       <string>Styles</string>
      </property>
-     <addaction name="actionDefault"/>
-     <addaction name="actionGithub"/>
-     <addaction name="actionSolarizedLight"/>
-     <addaction name="actionSolarizedDark"/>
-     <addaction name="actionClearness"/>
-     <addaction name="actionClearnessDark"/>
-     <addaction name="actionBywordDark"/>
     </widget>
     <widget class="QMenu" name="menuMarkdown_Extensions">
      <property name="title">

From 5c998bd4d50814e802feaa5b4475a049dc3747a8 Mon Sep 17 00:00:00 2001
From: Christian Loose <christian.loose@hamburg.de>
Date: Thu, 20 Nov 2014 21:35:55 +0100
Subject: [PATCH 06/34] Add possibility to choose from reveal.js built-in
 presentation styles

---
 app-static/styles.cpp                        | 51 ++++++++++++++++++--
 app-static/styles.h                          |  9 ++--
 app-static/template/presentationtemplate.cpp | 11 ++++-
 app-static/template/presentationtemplate.h   |  1 +
 app-static/template/template.h               | 10 ++--
 app/htmlpreviewgenerator.cpp                 |  5 ++
 app/htmlpreviewgenerator.h                   |  4 +-
 app/mainwindow.cpp                           | 38 +++++++++++++--
 app/mainwindow.h                             |  4 +-
 app/template_presentation.html               |  3 +-
 10 files changed, 115 insertions(+), 21 deletions(-)

diff --git a/app-static/styles.cpp b/app-static/styles.cpp
index 7044e5ac..9d5288dd 100644
--- a/app-static/styles.cpp
+++ b/app-static/styles.cpp
@@ -24,6 +24,15 @@ static const Style BUILTIN_CLEARNESS_STYLE = { "Default", "Default", "Clearness"
 static const Style BUILTIN_CLEARNESS_DARK_STYLE = { "Clearness Dark", "Default", "Clearness Dark" };
 static const Style BUILTIN_BYWORD_DARK_STYLE = { "Byword Dark", "Default", "Byword Dark" };
 
+static const Style DEFAULT_PRESENTATION_STYLE = { "Default", "Default", "Default Presentation" };
+static const Style BEIGE_PRESENTATION_STYLE = { "Default", "Default", "Beige" };
+static const Style SKY_PRESENTATION_STYLE = { "Default", "Default", "Sky" };
+static const Style NIGHT_PRESENTATION_STYLE = { "Default", "Default", "Night" };
+static const Style SERIF_PRESENTATION_STYLE = { "Default", "Default", "Serif" };
+static const Style SIMPLE_PRESENTATION_STYLE = { "Default", "Default", "Simple" };
+static const Style SOLARIZED_PRESENTATION_STYLE = { "Solarized Light", "Default", "Solarized" };
+
+
 Styles::Styles() 
 {
     setupBuiltinMarkdownHighlightings();
@@ -32,14 +41,22 @@ Styles::Styles()
     setupBuiltinStyles();
 }
 
-QStringList Styles::styleNames() const 
+QStringList Styles::htmlPreviewStyleNames() const 
+{
+    return m_htmlPreviewStylesIndex;
+}
+
+QStringList Styles::presentationStyleNames() const
 {
-    return QStringList(m_stylesIndex);
+    return m_presentationStylesIndex;
 }
 
 Style Styles::style(const QString &name) const
 {
-    return m_styles[m_stylesIndex.indexOf(name)];
+    if (m_htmlPreviewStylesIndex.contains(name))
+        return m_htmlPreviewStyles[m_htmlPreviewStylesIndex.indexOf(name)];
+    else
+        return m_presentationStyles[m_presentationStylesIndex.indexOf(name)];
 }
 
 QStringList Styles::markdownHighlightings() const 
@@ -98,16 +115,40 @@ void Styles::setupBuiltinPreviewStylesheets()
     m_previewStylesheets.insert("Clearness", "qrc:/css/clearness.css");
     m_previewStylesheets.insert("Clearness Dark", "qrc:/css/clearness-dark.css");
     m_previewStylesheets.insert("Byword Dark", "qrc:/css/byword-dark.css");
+
+    m_previewStylesheets.insert("Default Presentation", "https://cdn.jsdelivr.net/reveal.js/2.6.2/css/theme/default.css");
+    m_previewStylesheets.insert("Beige", "https://cdn.jsdelivr.net/reveal.js/2.6.2/css/theme/beige.css");
+    m_previewStylesheets.insert("Sky", "https://cdn.jsdelivr.net/reveal.js/2.6.2/css/theme/sky.css");
+    m_previewStylesheets.insert("Night", "https://cdn.jsdelivr.net/reveal.js/2.6.2/css/theme/night.css");
+    m_previewStylesheets.insert("Serif", "https://cdn.jsdelivr.net/reveal.js/2.6.2/css/theme/serif.css");
+    m_previewStylesheets.insert("Simple", "https://cdn.jsdelivr.net/reveal.js/2.6.2/css/theme/simple.css");
+    m_previewStylesheets.insert("Solarized", "https://cdn.jsdelivr.net/reveal.js/2.6.2/css/theme/solarized.css");
 }
 
 void Styles::setupBuiltinStyles()
 {
-    m_stylesIndex << "Default" << "Github" << "Solarized Light" 
+    m_htmlPreviewStylesIndex << "Default" << "Github" << "Solarized Light" 
                   << "Solarized Dark" << "Clearness" << "Clearness Dark" 
                   << "Byword Dark";
-    m_styles << BUILTIN_DEFAULT_STYLE << BUILTIN_GITHUB_STYLE 
+    m_htmlPreviewStyles << BUILTIN_DEFAULT_STYLE << BUILTIN_GITHUB_STYLE 
              << BUILTIN_SOLARIZED_LIGHT_STYLE << BUILTIN_SOLARIZED_DARK_STYLE
              << BUILTIN_CLEARNESS_STYLE << BUILTIN_CLEARNESS_DARK_STYLE
              << BUILTIN_BYWORD_DARK_STYLE;
+
+    m_presentationStylesIndex << DEFAULT_PRESENTATION_STYLE.previewStylesheet
+                              << BEIGE_PRESENTATION_STYLE.previewStylesheet
+                              << SKY_PRESENTATION_STYLE.previewStylesheet
+                              << NIGHT_PRESENTATION_STYLE.previewStylesheet
+                              << SERIF_PRESENTATION_STYLE.previewStylesheet
+                              << SIMPLE_PRESENTATION_STYLE.previewStylesheet
+                              << SOLARIZED_PRESENTATION_STYLE.previewStylesheet;
+
+    m_presentationStyles << DEFAULT_PRESENTATION_STYLE
+                         << BEIGE_PRESENTATION_STYLE
+                         << SKY_PRESENTATION_STYLE
+                         << NIGHT_PRESENTATION_STYLE
+                         << SERIF_PRESENTATION_STYLE
+                         << SIMPLE_PRESENTATION_STYLE
+                         << SOLARIZED_PRESENTATION_STYLE;
 }
 
diff --git a/app-static/styles.h b/app-static/styles.h
index 3492597d..dc9f1bae 100644
--- a/app-static/styles.h
+++ b/app-static/styles.h
@@ -33,7 +33,8 @@ class Styles
 public:
     Styles();
 
-    QStringList styleNames() const;
+    QStringList htmlPreviewStyleNames() const;
+    QStringList presentationStyleNames() const;
     Style style(const QString &name) const;
 
     QStringList markdownHighlightings() const;
@@ -54,8 +55,10 @@ class Styles
     QMap<QString, QString> m_markdownHighlightings;
     QMap<QString, QString> m_codeHighlightings;
     QMap<QString, QString> m_previewStylesheets;
-    QList<QString> m_stylesIndex;
-    QList<Style> m_styles;
+    QStringList m_htmlPreviewStylesIndex;
+    QList<Style> m_htmlPreviewStyles;
+    QStringList m_presentationStylesIndex;
+    QList<Style> m_presentationStyles;
 };
 
 #endif // STYLES_H
diff --git a/app-static/template/presentationtemplate.cpp b/app-static/template/presentationtemplate.cpp
index 106afd47..fc10c1b8 100644
--- a/app-static/template/presentationtemplate.cpp
+++ b/app-static/template/presentationtemplate.cpp
@@ -33,7 +33,7 @@ QString PresentationTemplate::render(const QString &body, RenderOptions options)
     }
 
     return QString(presentationTemplate)
-            .replace(QLatin1String("<!--__HTML_HEADER__-->"), QString())
+            .replace(QLatin1String("<!--__HTML_HEADER__-->"), buildHtmlHeader())
             .replace(QLatin1String("<!--__HTML_CONTENT__-->"), body)
             .replace(QLatin1String("<!--__REVEAL_PLUGINS__-->"), buildRevealPlugins(options));
 }
@@ -43,6 +43,15 @@ QString PresentationTemplate::exportAsHtml(const QString &, const QString &body,
     return render(body, options);
 }
 
+QString PresentationTemplate::buildHtmlHeader() const
+{
+    QString header;
+
+    header += QString("<link rel=\"stylesheet\" href=\"%1\" id=\"theme\">").arg(previewStyleSheet());
+
+    return header;
+}
+
 QString PresentationTemplate::buildRevealPlugins(RenderOptions options) const
 {
     QString plugins;
diff --git a/app-static/template/presentationtemplate.h b/app-static/template/presentationtemplate.h
index 49a14a6e..089dba7c 100644
--- a/app-static/template/presentationtemplate.h
+++ b/app-static/template/presentationtemplate.h
@@ -28,6 +28,7 @@ class PresentationTemplate : public Template
     virtual QString exportAsHtml(const QString &header, const QString &body, RenderOptions options) const;
 
 private:
+    QString buildHtmlHeader() const;
     QString buildRevealPlugins(RenderOptions options) const;
 
     QString presentationTemplate;
diff --git a/app-static/template/template.h b/app-static/template/template.h
index c767b70c..64a40a45 100644
--- a/app-static/template/template.h
+++ b/app-static/template/template.h
@@ -31,14 +31,18 @@ class Template
 
     virtual ~Template() {}
 
-    QString codeHighlightingStyle() const { return highlightingStyle; }
-    void setCodeHighlightingStyle(const QString &style) { highlightingStyle = style; }
+    QString codeHighlightingStyle() const { return m_highlightingStyle; }
+    void setCodeHighlightingStyle(const QString &style) { m_highlightingStyle = style; }
+
+    QString previewStyleSheet() const { return m_previewStyleSheet; }
+    void setPreviewStyleSheet(const QString &stylesheet) { m_previewStyleSheet = stylesheet; }
 
     virtual QString render(const QString &body, RenderOptions options) const = 0;
     virtual QString exportAsHtml(const QString &header, const QString &body, RenderOptions options) const = 0;
 
 private:
-    QString highlightingStyle;
+    QString m_highlightingStyle;
+    QString m_previewStyleSheet;
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(Template::RenderOptions)
diff --git a/app/htmlpreviewgenerator.cpp b/app/htmlpreviewgenerator.cpp
index ef56423f..294004cc 100644
--- a/app/htmlpreviewgenerator.cpp
+++ b/app/htmlpreviewgenerator.cpp
@@ -103,6 +103,11 @@ void HtmlPreviewGenerator::setCodeHighlightingStyle(const QString &style)
     generateHtmlFromMarkdown();
 }
 
+void HtmlPreviewGenerator::setPreviewStyleSheet(const QString &stylesheet)
+{
+    converter->templateRenderer()->setPreviewStyleSheet(stylesheet);
+}
+
 void HtmlPreviewGenerator::markdownConverterChanged()
 {
     QString style;
diff --git a/app/htmlpreviewgenerator.h b/app/htmlpreviewgenerator.h
index a28edc6e..82e6365f 100644
--- a/app/htmlpreviewgenerator.h
+++ b/app/htmlpreviewgenerator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Christian Loose <christian.loose@hamburg.de>
+ * Copyright 2013-2014 Christian Loose <christian.loose@hamburg.de>
  *
  * 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
@@ -45,6 +45,8 @@ public slots:
     void setCodeHighlightingEnabled(bool enabled);
     void setCodeHighlightingStyle(const QString &style);
 
+    void setPreviewStyleSheet(const QString &stylesheet);
+
     void markdownConverterChanged();
 
 signals:
diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp
index 15dc01b8..6e332b91 100644
--- a/app/mainwindow.cpp
+++ b/app/mainwindow.cpp
@@ -72,6 +72,8 @@ MainWindow::MainWindow(const QString &fileName, QWidget *parent) :
     ui(new Ui::MainWindow),
     options(new Options(this)),
     diskCache(new QNetworkDiskCache(this)),
+    htmlPreviewStylesGroup(0),
+    presentationStylesGroup(0),
     zoomInAction(0),
     zoomOutAction(0),
     zoomResetAction(0),
@@ -500,6 +502,7 @@ void MainWindow::styleBuiltinStyle()
     QAction *action = qobject_cast<QAction*>(sender());
     Style style = styles->style(action->data().toString());
     generator->setCodeHighlightingStyle(styles->pathForCodeHighlighting(style));
+    generator->setPreviewStyleSheet(styles->pathForPreviewStylesheet(style));
 
     ui->plainTextEdit->loadStyleFromStylesheet(styles->pathForMarkdownHighlighting(style));
     ui->webView->page()->settings()->setUserStyleSheetUrl(QUrl(styles->pathForPreviewStylesheet(style)));
@@ -671,7 +674,7 @@ void MainWindow::helpAbout()
 void MainWindow::styleContextMenu(const QPoint &pos)
 {
     QMenu *menu = new QMenu();
-    menu->addActions(stylesGroup->actions());
+    menu->addActions(htmlPreviewStylesGroup->actions());
 
     menu->exec(styleLabel->mapToGlobal(pos));
 }
@@ -880,9 +883,11 @@ void MainWindow::markdownConverterChanged()
         viewSynchronizer = new HtmlViewSynchronizer(ui->webView, ui->plainTextEdit);
         connect(generator, SIGNAL(htmlResultReady(QString)),
                 viewSynchronizer, SLOT(rememberScrollBarPos()));
+        loadBuiltinStyles();
         break;
     case Options::RevealMarkdownConverter:
         viewSynchronizer = new RevealViewSynchronizer(ui->webView, ui->plainTextEdit);
+        setupPresentationStyles();
         break;
     default:
         viewSynchronizer = 0;
@@ -1198,17 +1203,40 @@ void MainWindow::updateSplitter()
     ui->splitter->setSizes(childSizes);
 }
 
+void MainWindow::setupPresentationStyles()
+{
+    ui->menuStyles->clear();
+
+    // put style actions in a group
+    delete presentationStylesGroup;
+    presentationStylesGroup = new QActionGroup(this);
+
+    int key = 1;
+    foreach(const QString &styleName, styles->presentationStyleNames()) {
+        QAction *action = ui->menuStyles->addAction(styleName);
+        action->setShortcut(QKeySequence(tr("Ctrl+%1").arg(key++)));
+        action->setCheckable(true);
+        action->setActionGroup(presentationStylesGroup);
+        action->setData(styleName);
+        connect(action, SIGNAL(triggered()),
+                this, SLOT(styleBuiltinStyle()));
+    }
+}
+
 void MainWindow::loadBuiltinStyles()
 {
+    ui->menuStyles->clear();
+
     // put style actions in a group
-    stylesGroup = new QActionGroup(this);
+    delete htmlPreviewStylesGroup;
+    htmlPreviewStylesGroup = new QActionGroup(this);
 
     int key = 1;
-    foreach(const QString &styleName, styles->styleNames()) {
+    foreach(const QString &styleName, styles->htmlPreviewStyleNames()) {
         QAction *action = ui->menuStyles->addAction(styleName);
         action->setShortcut(QKeySequence(tr("Ctrl+%1").arg(key++)));
         action->setCheckable(true);
-        action->setActionGroup(stylesGroup);
+        action->setActionGroup(htmlPreviewStylesGroup);
         action->setData(styleName);
         connect(action, SIGNAL(triggered()),
                 this, SLOT(styleBuiltinStyle()));
@@ -1232,7 +1260,7 @@ void MainWindow::loadCustomStyles()
             QString fileName = it.fileName();
             QAction *action = ui->menuStyles->addAction(QFileInfo(fileName).baseName());
             action->setCheckable(true);
-            action->setActionGroup(stylesGroup);
+            action->setActionGroup(htmlPreviewStylesGroup);
             action->setData(it.filePath());
 
             connect(action, SIGNAL(triggered()),
diff --git a/app/mainwindow.h b/app/mainwindow.h
index a434c988..475fe3c7 100644
--- a/app/mainwindow.h
+++ b/app/mainwindow.h
@@ -142,6 +142,7 @@ private slots:
     bool maybeSave();
     void setFileName(const QString &fileName);
     void updateSplitter();
+    void setupPresentationStyles();
     void loadBuiltinStyles();
     void loadCustomStyles();
     void readSettings();
@@ -152,7 +153,8 @@ private slots:
     RecentFilesMenu *recentFilesMenu;
     Options *options;
     QNetworkDiskCache *diskCache;
-    QActionGroup *stylesGroup;
+    QActionGroup *htmlPreviewStylesGroup;
+    QActionGroup *presentationStylesGroup;
     QAction *zoomInAction;
     QAction *zoomOutAction;
     QAction *zoomResetAction;
diff --git a/app/template_presentation.html b/app/template_presentation.html
index f8d3b31f..0706c4e8 100644
--- a/app/template_presentation.html
+++ b/app/template_presentation.html
@@ -3,10 +3,9 @@
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/reveal.js/2.6.2/css/reveal.min.css">
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/reveal.js/2.6.2/css/theme/default.css" id="theme">
+<!--__HTML_HEADER__-->
 <!-- For syntax highlighting -->
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/reveal.js/2.6.2/lib/css/zenburn.css">
-<!--__HTML_HEADER__-->
 </head>
 <body>
 

From b30d4cdf3cb27261b885bf20f3cf9cb4e4a9aae0 Mon Sep 17 00:00:00 2001
From: Christian Loose <christian.loose@hamburg.de>
Date: Tue, 25 Nov 2014 16:54:40 +0100
Subject: [PATCH 07/34] First rough version of UI for changing styles via
 options dialog (no logic yet)

---
 app/optionsdialog.cpp | 35 ++++++++++++++++
 app/optionsdialog.h   |  2 +
 app/optionsdialog.ui  | 94 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 131 insertions(+)

diff --git a/app/optionsdialog.cpp b/app/optionsdialog.cpp
index 581d8d27..fca1609c 100644
--- a/app/optionsdialog.cpp
+++ b/app/optionsdialog.cpp
@@ -30,6 +30,7 @@
 
 #include <snippets/snippetcollection.h>
 #include "options.h"
+#include "styles.h"
 
 class SnippetsTableModel : public QAbstractTableModel
 {
@@ -296,6 +297,23 @@ OptionsDialog::OptionsDialog(Options *opt, SnippetCollection *collection, const
 
     setupShortcutsTable();
 
+    Styles *styles = new Styles();
+    ui->htmlPreviewStylesComboBox->addItems(styles->htmlPreviewStyleNames());
+    ui->markdownHighlightingComboBox->addItems(styles->markdownHighlightings());
+    ui->codeHighlightingComboBox->addItems(styles->codeHighlightings());
+    ui->previewStylesheetComboBox->addItems(styles->previewStylesheets());
+    ui->presentationStylesComboBox->addItems(styles->presentationStyleNames());
+    ui->presentationMarkdownHighlightingComboBox->addItems(styles->markdownHighlightings());
+    ui->presentationStylesheetComboBox->addItems(styles->previewStylesheets());
+
+    connect(ui->htmlPreviewStylesComboBox, SIGNAL(currentTextChanged(QString)),
+            this, SLOT(currentHtmlPreviewStyleChanged(QString)));
+    currentHtmlPreviewStyleChanged(ui->htmlPreviewStylesComboBox->currentText());
+
+    connect(ui->presentationStylesComboBox, SIGNAL(currentTextChanged(QString)),
+            this, SLOT(currentPresentationStyleChanged(QString)));
+    currentPresentationStyleChanged(ui->presentationStylesComboBox->currentText());
+
     // read configuration state
     readState();
 }
@@ -418,6 +436,23 @@ void OptionsDialog::validateShortcut(int row, int column)
     }
 }
 
+void OptionsDialog::currentHtmlPreviewStyleChanged(const QString &styleName)
+{
+    Styles *styles = new Styles();
+    Style htmlPreviewStyle = styles->style(styleName);
+    ui->markdownHighlightingComboBox->setCurrentText(htmlPreviewStyle.markdownHighlighting);
+    ui->codeHighlightingComboBox->setCurrentText(htmlPreviewStyle.codeHighlighting);
+    ui->previewStylesheetComboBox->setCurrentText(htmlPreviewStyle.previewStylesheet);
+}
+
+void OptionsDialog::currentPresentationStyleChanged(const QString &styleName)
+{
+    Styles *styles = new Styles();
+    Style presentationStyle = styles->style(styleName);
+    ui->presentationMarkdownHighlightingComboBox->setCurrentText(presentationStyle.markdownHighlighting);
+    ui->presentationStylesheetComboBox->setCurrentText(presentationStyle.previewStylesheet);
+}
+
 void OptionsDialog::setupShortcutsTable()
 {
     QStyledItemDelegate *delegate = new QStyledItemDelegate(ui->shortcutsTable);
diff --git a/app/optionsdialog.h b/app/optionsdialog.h
index 4878b404..9a6ea49e 100644
--- a/app/optionsdialog.h
+++ b/app/optionsdialog.h
@@ -44,6 +44,8 @@ private slots:
     void addSnippetButtonClicked();
     void removeSnippetButtonClicked();
     void validateShortcut(int row, int column);
+    void currentHtmlPreviewStyleChanged(const QString &styleName);
+    void currentPresentationStyleChanged(const QString &styleName);
 
 private:
     void setupShortcutsTable();
diff --git a/app/optionsdialog.ui b/app/optionsdialog.ui
index e460debc..724eab4f 100644
--- a/app/optionsdialog.ui
+++ b/app/optionsdialog.ui
@@ -486,6 +486,100 @@
        </item>
       </layout>
      </widget>
+     <widget class="QWidget" name="stylesTab">
+      <attribute name="title">
+       <string>Styles</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_9">
+       <item>
+        <widget class="QGroupBox" name="htmlPreviewGroupBox">
+         <property name="title">
+          <string>HTML Preview Styles</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_3">
+          <item row="2" column="0">
+           <widget class="QLabel" name="label_4">
+            <property name="text">
+             <string>Code Highlighting:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="QComboBox" name="codeHighlightingComboBox"/>
+          </item>
+          <item row="1" column="1">
+           <widget class="QComboBox" name="markdownHighlightingComboBox"/>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="label_3">
+            <property name="text">
+             <string>Markdown Highlighting:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0">
+           <widget class="QLabel" name="label_5">
+            <property name="text">
+             <string>Preview Stylesheet:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="QComboBox" name="previewStylesheetComboBox"/>
+          </item>
+          <item row="0" column="0">
+           <widget class="QComboBox" name="htmlPreviewStylesComboBox"/>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="presentationGroupBox">
+         <property name="title">
+          <string>Presentation Styles</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_4">
+          <item row="1" column="1">
+           <widget class="QComboBox" name="presentationMarkdownHighlightingComboBox"/>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="label">
+            <property name="text">
+             <string>Markdown Highlighting:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="0">
+           <widget class="QComboBox" name="presentationStylesComboBox"/>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="label_2">
+            <property name="text">
+             <string>Presentation Stylesheet:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="QComboBox" name="presentationStylesheetComboBox"/>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer_6">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
     </widget>
    </item>
    <item>

From 2cbf273ced11f37a52c004febe0eb76d8d91fe07 Mon Sep 17 00:00:00 2001
From: Christian Loose <christian.loose@hamburg.de>
Date: Wed, 26 Nov 2014 16:57:53 +0100
Subject: [PATCH 08/34] Moved Style struct to own header

---
 app-static/app-static.pro |  1 +
 app-static/styles.cpp     | 30 +++++++++++-----------
 app-static/styles.h       |  8 ++----
 app-static/styles/style.h | 52 +++++++++++++++++++++++++++++++++++++++
 test/unit/main.cpp        |  4 +++
 test/unit/styletest.cpp   | 51 ++++++++++++++++++++++++++++++++++++++
 test/unit/styletest.h     | 32 ++++++++++++++++++++++++
 test/unit/unit.pro        |  6 +++--
 8 files changed, 161 insertions(+), 23 deletions(-)
 create mode 100644 app-static/styles/style.h
 create mode 100644 test/unit/styletest.cpp
 create mode 100644 test/unit/styletest.h

diff --git a/app-static/app-static.pro b/app-static/app-static.pro
index fb4ac104..536ef73d 100644
--- a/app-static/app-static.pro
+++ b/app-static/app-static.pro
@@ -41,6 +41,7 @@ HEADERS += \
     template/template.h \
     template/htmltemplate.h \
     template/presentationtemplate.h \
+    styles/style.h \
     datalocation.h \
     slidelinemapping.h \
     viewsynchronizer.h \
diff --git a/app-static/styles.cpp b/app-static/styles.cpp
index 9d5288dd..a55e70d3 100644
--- a/app-static/styles.cpp
+++ b/app-static/styles.cpp
@@ -16,21 +16,21 @@
  */
 #include "styles.h"
 
-static const Style BUILTIN_DEFAULT_STYLE = { "Default", "Default", "Default" };
-static const Style BUILTIN_GITHUB_STYLE = { "Default", "Github", "Github" };
-static const Style BUILTIN_SOLARIZED_LIGHT_STYLE = { "Solarized Light", "Solarized Light", "Solarized Light" };
-static const Style BUILTIN_SOLARIZED_DARK_STYLE = { "Solarized Dark", "Solarized Dark", "Solarized Dark" };
-static const Style BUILTIN_CLEARNESS_STYLE = { "Default", "Default", "Clearness" };
-static const Style BUILTIN_CLEARNESS_DARK_STYLE = { "Clearness Dark", "Default", "Clearness Dark" };
-static const Style BUILTIN_BYWORD_DARK_STYLE = { "Byword Dark", "Default", "Byword Dark" };
-
-static const Style DEFAULT_PRESENTATION_STYLE = { "Default", "Default", "Default Presentation" };
-static const Style BEIGE_PRESENTATION_STYLE = { "Default", "Default", "Beige" };
-static const Style SKY_PRESENTATION_STYLE = { "Default", "Default", "Sky" };
-static const Style NIGHT_PRESENTATION_STYLE = { "Default", "Default", "Night" };
-static const Style SERIF_PRESENTATION_STYLE = { "Default", "Default", "Serif" };
-static const Style SIMPLE_PRESENTATION_STYLE = { "Default", "Default", "Simple" };
-static const Style SOLARIZED_PRESENTATION_STYLE = { "Solarized Light", "Default", "Solarized" };
+static const Style BUILTIN_DEFAULT_STYLE = Style("Default", "Default", "Default", "Default", true );
+static const Style BUILTIN_GITHUB_STYLE = Style("Github", "Default", "Github", "Github", true );
+static const Style BUILTIN_SOLARIZED_LIGHT_STYLE = Style("Solarized Light", "Solarized Light", "Solarized Light", "Solarized Light", true );
+static const Style BUILTIN_SOLARIZED_DARK_STYLE = Style("Solarized Dark", "Solarized Dark", "Solarized Dark", "Solarized Dark", true );
+static const Style BUILTIN_CLEARNESS_STYLE = Style("Clearness", "Default", "Default", "Clearness", true );
+static const Style BUILTIN_CLEARNESS_DARK_STYLE = Style("Clearness Dark", "Clearness Dark", "Default", "Clearness Dark", true );
+static const Style BUILTIN_BYWORD_DARK_STYLE = Style("Byword Dark", "Byword Dark", "Default", "Byword Dark", true );
+
+static const Style DEFAULT_PRESENTATION_STYLE = Style("Default Presentation", "Default", "Default", "Default Presentation", true );
+static const Style BEIGE_PRESENTATION_STYLE = Style("Beige", "Default", "Default", "Beige", true );
+static const Style SKY_PRESENTATION_STYLE = Style("Sky", "Default", "Default", "Sky", true );
+static const Style NIGHT_PRESENTATION_STYLE = Style("Night", "Default", "Default", "Night", true );
+static const Style SERIF_PRESENTATION_STYLE = Style("Serif", "Default", "Default", "Serif", true );
+static const Style SIMPLE_PRESENTATION_STYLE = Style("Simple", "Default", "Default", "Simple", true );
+static const Style SOLARIZED_PRESENTATION_STYLE = Style("Solarized", "Solarized Light", "Default", "Solarized", true);
 
 
 Styles::Styles() 
diff --git a/app-static/styles.h b/app-static/styles.h
index dc9f1bae..88566d95 100644
--- a/app-static/styles.h
+++ b/app-static/styles.h
@@ -21,12 +21,8 @@
 #include <QString>
 #include <QStringList>
 
-struct Style
-{
-    QString markdownHighlighting;
-    QString codeHighlighting;
-    QString previewStylesheet;
-};
+#include "styles/style.h"
+
 
 class Styles
 {
diff --git a/app-static/styles/style.h b/app-static/styles/style.h
new file mode 100644
index 00000000..e9c6c8db
--- /dev/null
+++ b/app-static/styles/style.h
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2014 Christian Loose <christian.loose@hamburg.de>
+ *
+ * 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 program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef STYLE_H
+#define STYLE_H
+
+#include <QString>
+
+
+struct Style
+{
+    QString name;
+    QString markdownHighlighting;
+    QString codeHighlighting;
+    QString previewStylesheet;
+    bool builtIn;
+
+    Style() : builtIn(false) {}
+    Style(const QString &styleName,
+          const QString &markdown,
+          const QString &code,
+          const QString &preview,
+          bool b) : 
+        name(styleName), 
+        markdownHighlighting(markdown),
+        codeHighlighting(code),
+        previewStylesheet(preview),
+        builtIn(b) 
+    {
+    }
+
+    bool operator==(const Style &rhs) const
+    {
+        return name == rhs.name;
+    }
+};
+
+#endif // STYLE_H
+
diff --git a/test/unit/main.cpp b/test/unit/main.cpp
index e422b11c..77f150b5 100644
--- a/test/unit/main.cpp
+++ b/test/unit/main.cpp
@@ -22,6 +22,7 @@
 #include "snippetcollectiontest.h"
 #include "snippetlistmodeltest.h"
 #include "snippettest.h"
+#include "styletest.h"
 
 int main(int argc, char *argv[])
 {
@@ -45,5 +46,8 @@ int main(int argc, char *argv[])
     SlideLineMappingTest test6;
     ret += QTest::qExec(&test6, argc, argv);
 
+    StyleTest test7;
+    ret += QTest::qExec(&test7, argc, argv);
+
     return ret;
 }
diff --git a/test/unit/styletest.cpp b/test/unit/styletest.cpp
new file mode 100644
index 00000000..aaa39240
--- /dev/null
+++ b/test/unit/styletest.cpp
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2014 Christian Loose <christian.loose@hamburg.de>
+ *
+ * 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 program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "styletest.h"
+
+#include <QTest>
+
+#include <styles/style.h>
+
+void StyleTest::isEqualComparable()
+{
+    Style style1;
+    style1.name = "abc";
+    style1.markdownHighlighting = "markdownHighlighting 1";
+
+    Style style2;
+    style2.name = "abc";
+    style2.markdownHighlighting = "markdownHighlighting 2";
+
+    Style style3;
+    style3.name = "xyz";
+    style3.markdownHighlighting = "markdownHighlighting 1";
+
+    QCOMPARE(style1 == style1, true);
+    QCOMPARE(style1 == style2, true);
+    QCOMPARE(style1 == style3, false);
+}
+
+void StyleTest::isInitializedAfterCreation()
+{
+    Style style;
+    QVERIFY(style.name.isNull());
+    QVERIFY(style.markdownHighlighting.isNull());
+    QVERIFY(style.codeHighlighting.isNull());
+    QVERIFY(style.previewStylesheet.isNull());
+    QCOMPARE(style.builtIn, false);
+}
+
diff --git a/test/unit/styletest.h b/test/unit/styletest.h
new file mode 100644
index 00000000..5ef11ffd
--- /dev/null
+++ b/test/unit/styletest.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2014 Christian Loose <christian.loose@hamburg.de>
+ *
+ * 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 program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef STYLETEST_H
+#define STYLETTEST_H
+
+#include <QObject>
+
+class StyleTest : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void isEqualComparable();
+    void isInitializedAfterCreation();
+};
+
+#endif // STYLETEST_H
+
diff --git a/test/unit/unit.pro b/test/unit/unit.pro
index 2edfcceb..54c3a00b 100644
--- a/test/unit/unit.pro
+++ b/test/unit/unit.pro
@@ -16,7 +16,8 @@ SOURCES += \
     slidelinemappingtest.cpp \
     snippetcollectiontest.cpp \
     snippetlistmodeltest.cpp \
-    dictionarytest.cpp
+    dictionarytest.cpp \
+    styletest.cpp
 
 HEADERS += \
     snippettest.h \
@@ -24,7 +25,8 @@ HEADERS += \
     slidelinemappingtest.h \
     snippetcollectiontest.h \
     snippetlistmodeltest.h \
-    dictionarytest.h
+    dictionarytest.h \
+    styletest.h
 
 target.CONFIG += no_default_install
 

From 4c66dbec601a62a1c0474e08464fcd197fed1862 Mon Sep 17 00:00:00 2001
From: Christian Loose <christian.loose@hamburg.de>
Date: Wed, 26 Nov 2014 20:40:36 +0100
Subject: [PATCH 09/34] Fix compile with changed Style struct

---
 app/mainwindow.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp
index 6e332b91..6a7b0983 100644
--- a/app/mainwindow.cpp
+++ b/app/mainwindow.cpp
@@ -512,7 +512,7 @@ void MainWindow::styleCustomStyle()
 {
     QAction *action = qobject_cast<QAction*>(sender());
 
-    Style defaultStyle = { "Default", "Default", "Default" };
+    Style defaultStyle = Style("Custom", "Default", "Default", "Default", false);
     generator->setCodeHighlightingStyle(styles->pathForCodeHighlighting(defaultStyle));
 
     ui->plainTextEdit->loadStyleFromStylesheet(styles->pathForMarkdownHighlighting(defaultStyle));

From 0b3ab3b69338e5b9ed510a539deaa342c76bd3c6 Mon Sep 17 00:00:00 2001
From: Christian Loose <christian.loose@hamburg.de>
Date: Fri, 28 Nov 2014 17:45:23 +0100
Subject: [PATCH 10/34] Add new StyleCollection class

---
 app-static/app-static.pro             |  2 ++
 app-static/styles.cpp                 | 48 +++++++++++----------------
 app-static/styles.h                   |  7 ++--
 app-static/styles/stylecollection.cpp | 39 ++++++++++++++++++++++
 app-static/styles/stylecollection.h   | 41 +++++++++++++++++++++++
 5 files changed, 105 insertions(+), 32 deletions(-)
 create mode 100644 app-static/styles/stylecollection.cpp
 create mode 100644 app-static/styles/stylecollection.h

diff --git a/app-static/app-static.pro b/app-static/app-static.pro
index 536ef73d..6fd6498c 100644
--- a/app-static/app-static.pro
+++ b/app-static/app-static.pro
@@ -20,6 +20,7 @@ SOURCES += \
     converter/revealmarkdownconverter.cpp \
     template/htmltemplate.cpp \
     template/presentationtemplate.cpp \
+    styles/stylecollection.cpp \
     datalocation.cpp \
     slidelinemapping.cpp \
     viewsynchronizer.cpp \
@@ -42,6 +43,7 @@ HEADERS += \
     template/htmltemplate.h \
     template/presentationtemplate.h \
     styles/style.h \
+    styles/stylecollection.h \
     datalocation.h \
     slidelinemapping.h \
     viewsynchronizer.h \
diff --git a/app-static/styles.cpp b/app-static/styles.cpp
index a55e70d3..278c4b1b 100644
--- a/app-static/styles.cpp
+++ b/app-static/styles.cpp
@@ -43,20 +43,20 @@ Styles::Styles()
 
 QStringList Styles::htmlPreviewStyleNames() const 
 {
-    return m_htmlPreviewStylesIndex;
+    return m_htmlPreviewStyles.styleNames();
 }
 
 QStringList Styles::presentationStyleNames() const
 {
-    return m_presentationStylesIndex;
+    return m_presentationStyles.styleNames();
 }
 
 Style Styles::style(const QString &name) const
 {
-    if (m_htmlPreviewStylesIndex.contains(name))
-        return m_htmlPreviewStyles[m_htmlPreviewStylesIndex.indexOf(name)];
+    if (m_htmlPreviewStyles.styleNames().contains(name))
+        return m_htmlPreviewStyles.style(name);
     else
-        return m_presentationStyles[m_presentationStylesIndex.indexOf(name)];
+        return m_presentationStyles.style(name);
 }
 
 QStringList Styles::markdownHighlightings() const 
@@ -127,28 +127,20 @@ void Styles::setupBuiltinPreviewStylesheets()
 
 void Styles::setupBuiltinStyles()
 {
-    m_htmlPreviewStylesIndex << "Default" << "Github" << "Solarized Light" 
-                  << "Solarized Dark" << "Clearness" << "Clearness Dark" 
-                  << "Byword Dark";
-    m_htmlPreviewStyles << BUILTIN_DEFAULT_STYLE << BUILTIN_GITHUB_STYLE 
-             << BUILTIN_SOLARIZED_LIGHT_STYLE << BUILTIN_SOLARIZED_DARK_STYLE
-             << BUILTIN_CLEARNESS_STYLE << BUILTIN_CLEARNESS_DARK_STYLE
-             << BUILTIN_BYWORD_DARK_STYLE;
-
-    m_presentationStylesIndex << DEFAULT_PRESENTATION_STYLE.previewStylesheet
-                              << BEIGE_PRESENTATION_STYLE.previewStylesheet
-                              << SKY_PRESENTATION_STYLE.previewStylesheet
-                              << NIGHT_PRESENTATION_STYLE.previewStylesheet
-                              << SERIF_PRESENTATION_STYLE.previewStylesheet
-                              << SIMPLE_PRESENTATION_STYLE.previewStylesheet
-                              << SOLARIZED_PRESENTATION_STYLE.previewStylesheet;
-
-    m_presentationStyles << DEFAULT_PRESENTATION_STYLE
-                         << BEIGE_PRESENTATION_STYLE
-                         << SKY_PRESENTATION_STYLE
-                         << NIGHT_PRESENTATION_STYLE
-                         << SERIF_PRESENTATION_STYLE
-                         << SIMPLE_PRESENTATION_STYLE
-                         << SOLARIZED_PRESENTATION_STYLE;
+    m_htmlPreviewStyles.insert(BUILTIN_DEFAULT_STYLE);
+    m_htmlPreviewStyles.insert(BUILTIN_GITHUB_STYLE);
+    m_htmlPreviewStyles.insert(BUILTIN_SOLARIZED_LIGHT_STYLE);
+    m_htmlPreviewStyles.insert(BUILTIN_SOLARIZED_DARK_STYLE);
+    m_htmlPreviewStyles.insert(BUILTIN_CLEARNESS_STYLE);
+    m_htmlPreviewStyles.insert(BUILTIN_CLEARNESS_DARK_STYLE);
+    m_htmlPreviewStyles.insert(BUILTIN_BYWORD_DARK_STYLE);
+
+    m_presentationStyles.insert(DEFAULT_PRESENTATION_STYLE);
+    m_presentationStyles.insert(BEIGE_PRESENTATION_STYLE);
+    m_presentationStyles.insert(SKY_PRESENTATION_STYLE);
+    m_presentationStyles.insert(NIGHT_PRESENTATION_STYLE);
+    m_presentationStyles.insert(SERIF_PRESENTATION_STYLE);
+    m_presentationStyles.insert(SIMPLE_PRESENTATION_STYLE);
+    m_presentationStyles.insert(SOLARIZED_PRESENTATION_STYLE);
 }
 
diff --git a/app-static/styles.h b/app-static/styles.h
index 88566d95..719701dd 100644
--- a/app-static/styles.h
+++ b/app-static/styles.h
@@ -22,6 +22,7 @@
 #include <QStringList>
 
 #include "styles/style.h"
+#include "styles/stylecollection.h"
 
 
 class Styles
@@ -51,10 +52,8 @@ class Styles
     QMap<QString, QString> m_markdownHighlightings;
     QMap<QString, QString> m_codeHighlightings;
     QMap<QString, QString> m_previewStylesheets;
-    QStringList m_htmlPreviewStylesIndex;
-    QList<Style> m_htmlPreviewStyles;
-    QStringList m_presentationStylesIndex;
-    QList<Style> m_presentationStyles;
+    StyleCollection m_htmlPreviewStyles;
+    StyleCollection m_presentationStyles;
 };
 
 #endif // STYLES_H
diff --git a/app-static/styles/stylecollection.cpp b/app-static/styles/stylecollection.cpp
new file mode 100644
index 00000000..f77a5f46
--- /dev/null
+++ b/app-static/styles/stylecollection.cpp
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2014 Christian Loose <christian.loose@hamburg.de>
+ *
+ * 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 program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "stylecollection.h"
+
+
+StyleCollection::StyleCollection() 
+{
+}
+
+void StyleCollection::insert(const Style &style)
+{
+    stylesIndex << style.name;
+    styles << style;
+}
+
+QStringList StyleCollection::styleNames() const
+{
+    return stylesIndex;
+}
+
+const Style StyleCollection::style(const QString &name) const
+{
+    return styles.at(stylesIndex.indexOf(name));
+}
+
diff --git a/app-static/styles/stylecollection.h b/app-static/styles/stylecollection.h
new file mode 100644
index 00000000..0be1f30c
--- /dev/null
+++ b/app-static/styles/stylecollection.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2014 Christian Loose <christian.loose@hamburg.de>
+ *
+ * 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 program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef STYLECOLLECTION_H
+#define STYLECOLLECTION_H
+
+#include <QString>
+#include <QStringList>
+#include "style.h"
+
+
+class StyleCollection
+{
+public:
+    StyleCollection();
+
+    void insert(const Style &style);
+
+    QStringList styleNames() const;
+    const Style style(const QString &name) const;
+
+private:
+    QStringList stylesIndex;
+    QList<Style> styles;
+};
+
+#endif // STYLECOLLECTION_H
+

From eb67ede4df50218cfedc263079d8098135380950 Mon Sep 17 00:00:00 2001
From: Christian Loose <christian.loose@hamburg.de>
Date: Mon, 1 Dec 2014 14:17:56 +0100
Subject: [PATCH 11/34] Add unit test for StyleCollection class

---
 test/unit/main.cpp                |  4 +++
 test/unit/stylecollectiontest.cpp | 53 +++++++++++++++++++++++++++++++
 test/unit/stylecollectiontest.h   | 36 +++++++++++++++++++++
 test/unit/unit.pro                |  6 ++--
 4 files changed, 97 insertions(+), 2 deletions(-)
 create mode 100644 test/unit/stylecollectiontest.cpp
 create mode 100644 test/unit/stylecollectiontest.h

diff --git a/test/unit/main.cpp b/test/unit/main.cpp
index 77f150b5..4a9817d0 100644
--- a/test/unit/main.cpp
+++ b/test/unit/main.cpp
@@ -23,6 +23,7 @@
 #include "snippetlistmodeltest.h"
 #include "snippettest.h"
 #include "styletest.h"
+#include "stylecollectiontest.h"
 
 int main(int argc, char *argv[])
 {
@@ -49,5 +50,8 @@ int main(int argc, char *argv[])
     StyleTest test7;
     ret += QTest::qExec(&test7, argc, argv);
 
+    StyleCollectionTest test8;
+    ret += QTest::qExec(&test8, argc, argv);
+
     return ret;
 }
diff --git a/test/unit/stylecollectiontest.cpp b/test/unit/stylecollectiontest.cpp
new file mode 100644
index 00000000..c009f769
--- /dev/null
+++ b/test/unit/stylecollectiontest.cpp
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2014 Christian Loose <christian.loose@hamburg.de>
+ *
+ * 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 program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "stylecollectiontest.h"
+
+#include <QtTest>
+
+#include <styles/stylecollection.h>
+
+
+void StyleCollectionTest::initTestCase()
+{
+}
+
+void StyleCollectionTest::holdsStylesInInserationOrder()
+{
+    Style style1; style1.name = "a";
+    Style style2; style2.name = "b";
+    Style style3; style3.name = "c";
+
+    StyleCollection collection;
+
+    collection.insert(style2);    // b
+    collection.insert(style3);    // c
+    collection.insert(style1);    // a
+
+    QCOMPARE(collection.styleNames().at(0), style2.name);    // b
+    QCOMPARE(collection.styleNames().at(1), style3.name);    // c
+    QCOMPARE(collection.styleNames().at(2), style1.name);    // a
+}
+
+void StyleCollectionTest::canRetrieveStyleByName()
+{
+    Style style; style.name = "ArbitraryName";
+    StyleCollection collection;
+
+    collection.insert(style);
+
+    QCOMPARE(collection.style("ArbitraryName").name, style.name);
+}
diff --git a/test/unit/stylecollectiontest.h b/test/unit/stylecollectiontest.h
new file mode 100644
index 00000000..b5989d15
--- /dev/null
+++ b/test/unit/stylecollectiontest.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2014 Christian Loose <christian.loose@hamburg.de>
+ *
+ * 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 program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef STYLECOLLECTIONTEST_H
+#define STYLECOLLECTIONTEST_H
+
+#include <QObject>
+#include <styles/stylecollection.h>
+
+
+class StyleCollectionTest : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void initTestCase();
+
+    void holdsStylesInInserationOrder();
+    void canRetrieveStyleByName();
+};
+
+#endif // SNIPPETCOLLECTIONTEST_H
+
diff --git a/test/unit/unit.pro b/test/unit/unit.pro
index 54c3a00b..ceb57904 100644
--- a/test/unit/unit.pro
+++ b/test/unit/unit.pro
@@ -17,7 +17,8 @@ SOURCES += \
     snippetcollectiontest.cpp \
     snippetlistmodeltest.cpp \
     dictionarytest.cpp \
-    styletest.cpp
+    styletest.cpp \
+    stylecollectiontest.cpp
 
 HEADERS += \
     snippettest.h \
@@ -26,7 +27,8 @@ HEADERS += \
     snippetcollectiontest.h \
     snippetlistmodeltest.h \
     dictionarytest.h \
-    styletest.h
+    styletest.h \
+    stylecollectiontest.h
 
 target.CONFIG += no_default_install
 

From f0d6232f72ad6f1f82de7a2bbd8f4892b0465608 Mon Sep 17 00:00:00 2001
From: Christian Loose <christian.loose@hamburg.de>
Date: Mon, 1 Dec 2014 17:03:41 +0100
Subject: [PATCH 12/34] Add contains() method to StyleCollection (inkl. unit
 test)

---
 app-static/styles.cpp                 |  2 +-
 app-static/styles/stylecollection.cpp |  5 +++++
 app-static/styles/stylecollection.h   |  1 +
 test/unit/stylecollectiontest.cpp     | 11 +++++++++++
 test/unit/stylecollectiontest.h       |  1 +
 5 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/app-static/styles.cpp b/app-static/styles.cpp
index 278c4b1b..ae5fcd92 100644
--- a/app-static/styles.cpp
+++ b/app-static/styles.cpp
@@ -53,7 +53,7 @@ QStringList Styles::presentationStyleNames() const
 
 Style Styles::style(const QString &name) const
 {
-    if (m_htmlPreviewStyles.styleNames().contains(name))
+    if (m_htmlPreviewStyles.contains(name))
         return m_htmlPreviewStyles.style(name);
     else
         return m_presentationStyles.style(name);
diff --git a/app-static/styles/stylecollection.cpp b/app-static/styles/stylecollection.cpp
index f77a5f46..24a514f1 100644
--- a/app-static/styles/stylecollection.cpp
+++ b/app-static/styles/stylecollection.cpp
@@ -32,6 +32,11 @@ QStringList StyleCollection::styleNames() const
     return stylesIndex;
 }
 
+bool StyleCollection::contains(const QString &name) const
+{
+    return stylesIndex.contains(name);
+}
+
 const Style StyleCollection::style(const QString &name) const
 {
     return styles.at(stylesIndex.indexOf(name));
diff --git a/app-static/styles/stylecollection.h b/app-static/styles/stylecollection.h
index 0be1f30c..d3545362 100644
--- a/app-static/styles/stylecollection.h
+++ b/app-static/styles/stylecollection.h
@@ -30,6 +30,7 @@ class StyleCollection
     void insert(const Style &style);
 
     QStringList styleNames() const;
+    bool contains(const QString &name) const;
     const Style style(const QString &name) const;
 
 private:
diff --git a/test/unit/stylecollectiontest.cpp b/test/unit/stylecollectiontest.cpp
index c009f769..526a5d06 100644
--- a/test/unit/stylecollectiontest.cpp
+++ b/test/unit/stylecollectiontest.cpp
@@ -51,3 +51,14 @@ void StyleCollectionTest::canRetrieveStyleByName()
 
     QCOMPARE(collection.style("ArbitraryName").name, style.name);
 }
+
+void StyleCollectionTest::canCheckIfContainsStyleByName()
+{
+    Style style; style.name = "ArbitraryName";
+    StyleCollection collection;
+
+    collection.insert(style);
+
+    QCOMPARE(collection.contains("ArbitraryName"), true);
+    QCOMPARE(collection.contains("NonExistingName"), false);
+}
diff --git a/test/unit/stylecollectiontest.h b/test/unit/stylecollectiontest.h
index b5989d15..9e42ba1b 100644
--- a/test/unit/stylecollectiontest.h
+++ b/test/unit/stylecollectiontest.h
@@ -30,6 +30,7 @@ private slots:
 
     void holdsStylesInInserationOrder();
     void canRetrieveStyleByName();
+    void canCheckIfContainsStyleByName();
 };
 
 #endif // SNIPPETCOLLECTIONTEST_H

From bc170434bd655cd63e044f87dae322d808de3af7 Mon Sep 17 00:00:00 2001
From: Christian Loose <christian.loose@hamburg.de>
Date: Wed, 3 Dec 2014 22:24:03 +0100
Subject: [PATCH 13/34] Add base classes for collections and JSON translators

Add new template base class Collection (StyleCollection,
SnippetCollection) and JsonTranslator (JsonSnippetTranslator).
---
 app-static/collection.h                       | 32 ++++++++++++++++++
 app-static/jsontranslator.h                   | 33 +++++++++++++++++++
 app-static/snippets/jsonsnippettranslator.cpp |  6 ++--
 app-static/snippets/jsonsnippettranslator.h   |  7 ++--
 app-static/snippets/snippetcollection.cpp     |  2 +-
 app-static/snippets/snippetcollection.h       |  5 +--
 app-static/styles/stylecollection.cpp         | 13 +++++++-
 app-static/styles/stylecollection.h           |  8 +++--
 app/optionsdialog.cpp                         | 14 ++++----
 test/unit/jsonsnippettranslatortest.cpp       | 20 +++++------
 test/unit/snippetcollectiontest.cpp           |  6 ++--
 11 files changed, 114 insertions(+), 32 deletions(-)
 create mode 100644 app-static/collection.h
 create mode 100644 app-static/jsontranslator.h

diff --git a/app-static/collection.h b/app-static/collection.h
new file mode 100644
index 00000000..54736e54
--- /dev/null
+++ b/app-static/collection.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2014 Christian Loose <christian.loose@hamburg.de>
+ *
+ * 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 program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef COLLECTION_H
+#define COLLECTION_H
+
+template <class T>
+class Collection
+{
+public:
+    virtual ~Collection() {}
+
+    virtual int insert(const T &item) = 0;
+    virtual int count() const = 0;
+    virtual const T &at(int offset) const = 0;
+};
+
+#endif // COLLECTION_H
+
diff --git a/app-static/jsontranslator.h b/app-static/jsontranslator.h
new file mode 100644
index 00000000..53e8ca42
--- /dev/null
+++ b/app-static/jsontranslator.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2014 Christian Loose <christian.loose@hamburg.de>
+ *
+ * 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 program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef JSONTRANSLATOR_H
+#define JSONTRANSLATOR_H
+
+#include <QJsonObject>
+#include "collection.h"
+class QJsonDocument;
+
+template <class T>
+class JsonTranslator
+{
+public:
+    virtual bool processDocument(const QJsonDocument &jsonDocument, Collection<T> *collection) = 0;
+    virtual QJsonDocument createDocument(Collection<T> *collection) = 0;
+};
+
+#endif // JSONTRANSLATOR_H
+
diff --git a/app-static/snippets/jsonsnippettranslator.cpp b/app-static/snippets/jsonsnippettranslator.cpp
index 0aae63c2..23776db9 100644
--- a/app-static/snippets/jsonsnippettranslator.cpp
+++ b/app-static/snippets/jsonsnippettranslator.cpp
@@ -32,7 +32,7 @@ static const QLatin1String BUILTIN("builtIn");
 
 }
 
-bool JsonSnippetTranslator::processDocument(const QJsonDocument &jsonDocument, SnippetCollection *collection)
+bool JsonSnippetTranslator::processDocument(const QJsonDocument &jsonDocument, Collection<Snippet> *collection)
 {
     if (!isValid(jsonDocument))
         return false;
@@ -46,11 +46,11 @@ bool JsonSnippetTranslator::processDocument(const QJsonDocument &jsonDocument, S
     return true;
 }
 
-QJsonDocument JsonSnippetTranslator::createDocument(SnippetCollection *collection)
+QJsonDocument JsonSnippetTranslator::createDocument(Collection<Snippet> *collection)
 {
     QJsonArray snippetArray;
     for (int i = 0; i < collection->count(); ++i) {
-        Snippet snippet = collection->snippetAt(i);
+        Snippet snippet = collection->at(i);
 
         QJsonObject entry = toJsonObject(snippet);
         snippetArray.append(entry);
diff --git a/app-static/snippets/jsonsnippettranslator.h b/app-static/snippets/jsonsnippettranslator.h
index b352ebcf..f21990ba 100644
--- a/app-static/snippets/jsonsnippettranslator.h
+++ b/app-static/snippets/jsonsnippettranslator.h
@@ -17,17 +17,18 @@
 #ifndef JSONSNIPPETTRANSLATOR_H
 #define JSONSNIPPETTRANSLATOR_H
 
+#include "jsontranslator.h"
 #include <QJsonObject>
 class QJsonDocument;
 class SnippetCollection;
 struct Snippet;
 
 
-class JsonSnippetTranslator
+class JsonSnippetTranslator : public JsonTranslator<Snippet>
 {
 public:
-    bool processDocument(const QJsonDocument &jsonDocument, SnippetCollection *collection);
-    QJsonDocument createDocument(SnippetCollection *collection);
+    bool processDocument(const QJsonDocument &jsonDocument, Collection<Snippet> *collection) Q_DECL_OVERRIDE;
+    QJsonDocument createDocument(Collection<Snippet> *collection) Q_DECL_OVERRIDE;
 
 private:
     Snippet fromJsonObject(const QJsonObject &object);
diff --git a/app-static/snippets/snippetcollection.cpp b/app-static/snippets/snippetcollection.cpp
index d774628c..2b4e06f8 100644
--- a/app-static/snippets/snippetcollection.cpp
+++ b/app-static/snippets/snippetcollection.cpp
@@ -58,7 +58,7 @@ const Snippet SnippetCollection::snippet(const QString &trigger) const
     return snippets.value(trigger);
 }
 
-const Snippet &SnippetCollection::snippetAt(int offset) const
+const Snippet &SnippetCollection::at(int offset) const
 {
     return (snippets.begin() + offset).value();
 }
diff --git a/app-static/snippets/snippetcollection.h b/app-static/snippets/snippetcollection.h
index adb1bf3e..b020f23c 100644
--- a/app-static/snippets/snippetcollection.h
+++ b/app-static/snippets/snippetcollection.h
@@ -19,10 +19,11 @@
 
 #include <QObject>
 #include <QMap>
+#include "collection.h"
 #include "snippet.h"
 
 
-class SnippetCollection : public QObject
+class SnippetCollection : public QObject, public Collection<Snippet>
 {
     Q_OBJECT
     Q_ENUMS(CollectionChangedType)
@@ -45,7 +46,7 @@ class SnippetCollection : public QObject
 
     bool contains(const QString &trigger) const;
     const Snippet snippet(const QString &trigger) const;
-    const Snippet &snippetAt(int offset) const;
+    const Snippet &at(int offset) const;
 
     QSharedPointer<SnippetCollection> userDefinedSnippets() const;
 
diff --git a/app-static/styles/stylecollection.cpp b/app-static/styles/stylecollection.cpp
index 24a514f1..18a47f21 100644
--- a/app-static/styles/stylecollection.cpp
+++ b/app-static/styles/stylecollection.cpp
@@ -21,10 +21,21 @@ StyleCollection::StyleCollection()
 {
 }
 
-void StyleCollection::insert(const Style &style)
+int StyleCollection::insert(const Style &style)
 {
     stylesIndex << style.name;
     styles << style;
+    return count(); 
+}
+
+int StyleCollection::count() const
+{
+    return styles.count();
+}
+
+const Style &StyleCollection::at(int offset) const
+{
+    return styles.at(offset);
 }
 
 QStringList StyleCollection::styleNames() const
diff --git a/app-static/styles/stylecollection.h b/app-static/styles/stylecollection.h
index d3545362..234c427b 100644
--- a/app-static/styles/stylecollection.h
+++ b/app-static/styles/stylecollection.h
@@ -19,15 +19,19 @@
 
 #include <QString>
 #include <QStringList>
+#include "collection.h"
 #include "style.h"
 
 
-class StyleCollection
+class StyleCollection : public Collection<Style>
 {
 public:
     StyleCollection();
 
-    void insert(const Style &style);
+    int insert(const Style &style);
+
+    int count() const;
+    const Style &at(int offset) const;
 
     QStringList styleNames() const;
     bool contains(const QString &name) const;
diff --git a/app/optionsdialog.cpp b/app/optionsdialog.cpp
index fca1609c..7c3b212e 100644
--- a/app/optionsdialog.cpp
+++ b/app/optionsdialog.cpp
@@ -78,7 +78,7 @@ Qt::ItemFlags SnippetsTableModel::flags(const QModelIndex &index) const
 {
     Qt::ItemFlags itemFlags = QAbstractTableModel::flags(index);
     if (index.isValid()) {
-        const Snippet snippet = snippetCollection->snippetAt(index.row());
+        const Snippet snippet = snippetCollection->at(index.row());
         if (!snippet.builtIn) {
             itemFlags |= Qt::ItemIsEditable;
         }
@@ -92,7 +92,7 @@ QVariant SnippetsTableModel::data(const QModelIndex &index, int role) const
         return QVariant();
     }
 
-    const Snippet snippet = snippetCollection->snippetAt(index.row());
+    const Snippet snippet = snippetCollection->at(index.row());
 
     if (role == Qt::DisplayRole) {
         if (index.column() == 0) {
@@ -118,7 +118,7 @@ bool SnippetsTableModel::setData(const QModelIndex &index, const QVariant &value
     if (!index.isValid() || role != Qt::EditRole)
         return false;
 
-    Snippet snippet = snippetCollection->snippetAt(index.row());
+    Snippet snippet = snippetCollection->at(index.row());
 
     if (index.column() == 0) {
         const QString &s = value.toString();
@@ -161,7 +161,7 @@ QModelIndex SnippetsTableModel::createSnippet()
 void SnippetsTableModel::removeSnippet(const QModelIndex &index)
 {
     beginRemoveRows(QModelIndex(), index.row(), index.row());
-    Snippet snippet = snippetCollection->snippetAt(index.row());
+    Snippet snippet = snippetCollection->at(index.row());
     snippetCollection->remove(snippet);
     endRemoveRows();
 }
@@ -170,7 +170,7 @@ void SnippetsTableModel::replaceSnippet(const Snippet &snippet, const QModelInde
 {
     const int row = index.row();
 
-    Snippet previousSnippet = snippetCollection->snippetAt(index.row());
+    Snippet previousSnippet = snippetCollection->at(index.row());
     snippetCollection->remove(previousSnippet);
 
     int insertedRow = snippetCollection->insert(snippet);
@@ -343,7 +343,7 @@ void OptionsDialog::manualProxyRadioButtonToggled(bool checked)
 
 void OptionsDialog::currentSnippetChanged(const QModelIndex &current, const QModelIndex &)
 {
-    const Snippet snippet = snippetCollection->snippetAt(current.row());
+    const Snippet snippet = snippetCollection->at(current.row());
 
     // update text edit for snippet content
     QString formattedSnippet(snippet.snippet);
@@ -359,7 +359,7 @@ void OptionsDialog::snippetTextChanged()
 {
     const QModelIndex &modelIndex = ui->snippetTableView->selectionModel()->currentIndex();
     if (modelIndex.isValid()) {
-        Snippet snippet = snippetCollection->snippetAt(modelIndex.row());
+        Snippet snippet = snippetCollection->at(modelIndex.row());
         if (!snippet.builtIn) {
             snippet.snippet = ui->snippetTextEdit->toPlainText();
 
diff --git a/test/unit/jsonsnippettranslatortest.cpp b/test/unit/jsonsnippettranslatortest.cpp
index 97d4244a..2a26a7ff 100644
--- a/test/unit/jsonsnippettranslatortest.cpp
+++ b/test/unit/jsonsnippettranslatortest.cpp
@@ -66,11 +66,11 @@ void JsonSnippetTranslatorTest::translatesJsonDocumentToSnippets()
 
     QVERIFY(success);
     QCOMPARE(collection.count(), 1);
-    QCOMPARE(collection.snippetAt(0).trigger, expected.trigger);
-    QCOMPARE(collection.snippetAt(0).description, expected.description);
-    QCOMPARE(collection.snippetAt(0).snippet, expected.snippet);
-    QCOMPARE(collection.snippetAt(0).cursorPosition, expected.cursorPosition);
-    QCOMPARE(collection.snippetAt(0).builtIn, expected.builtIn);
+    QCOMPARE(collection.at(0).trigger, expected.trigger);
+    QCOMPARE(collection.at(0).description, expected.description);
+    QCOMPARE(collection.at(0).snippet, expected.snippet);
+    QCOMPARE(collection.at(0).cursorPosition, expected.cursorPosition);
+    QCOMPARE(collection.at(0).builtIn, expected.builtIn);
 }
 
 void JsonSnippetTranslatorTest::translatesEmptyJsonDocumentToEmptySnippets()
@@ -90,11 +90,11 @@ void JsonSnippetTranslatorTest::translatesEmptyJsonDocumentToEmptySnippets()
 
     QVERIFY(success);
     QCOMPARE(collection.count(), 1);
-    QCOMPARE(collection.snippetAt(0).trigger, expected.trigger);
-    QCOMPARE(collection.snippetAt(0).description, expected.description);
-    QCOMPARE(collection.snippetAt(0).snippet, expected.snippet);
-    QCOMPARE(collection.snippetAt(0).cursorPosition, expected.cursorPosition);
-    QCOMPARE(collection.snippetAt(0).builtIn, expected.builtIn);
+    QCOMPARE(collection.at(0).trigger, expected.trigger);
+    QCOMPARE(collection.at(0).description, expected.description);
+    QCOMPARE(collection.at(0).snippet, expected.snippet);
+    QCOMPARE(collection.at(0).cursorPosition, expected.cursorPosition);
+    QCOMPARE(collection.at(0).builtIn, expected.builtIn);
 }
 
 void JsonSnippetTranslatorTest::defectIfJsonDocumentIsInvalid()
diff --git a/test/unit/snippetcollectiontest.cpp b/test/unit/snippetcollectiontest.cpp
index e2be09c0..e324e6ea 100644
--- a/test/unit/snippetcollectiontest.cpp
+++ b/test/unit/snippetcollectiontest.cpp
@@ -84,9 +84,9 @@ void SnippetCollectionTest::holdsSnippetsInTriggerOrder()
     collection.insert(snippet3);    // c
     collection.insert(snippet1);    // a
 
-    QCOMPARE(collection.snippetAt(0).trigger, snippet1.trigger);    // a
-    QCOMPARE(collection.snippetAt(1).trigger, snippet2.trigger);    // b
-    QCOMPARE(collection.snippetAt(2).trigger, snippet3.trigger);    // c
+    QCOMPARE(collection.at(0).trigger, snippet1.trigger);    // a
+    QCOMPARE(collection.at(1).trigger, snippet2.trigger);    // b
+    QCOMPARE(collection.at(2).trigger, snippet3.trigger);    // c
 }
 
 void SnippetCollectionTest::returnsNewCollectionOfUserDefinedSnippets()

From 9e2490744cd23c9d29269adfbb97b78d5ecad191 Mon Sep 17 00:00:00 2001
From: Christian Loose <christian.loose@hamburg.de>
Date: Thu, 4 Dec 2014 15:36:34 +0100
Subject: [PATCH 14/34] Generalize reading and saving JSON files

Generalize the JsonSnippetFile into a JsonFile class that reads or saves
a JSON file and uses JsonTranslatorFactory to retrieve a JsonTranslator
class that can handle the specified item type stored in the file.
---
 app-static/app-static.pro                     | 10 +++--
 .../jsonsnippetfile.cpp => jsonfile.h}        | 40 ++++++++++++++-----
 ...nsnippetfile.h => jsontranslatorfactory.h} | 34 +++++++++++-----
 app/mainwindow.cpp                            |  8 ++--
 test/integration/jsonsnippetfiletest.cpp      | 16 ++++----
 5 files changed, 70 insertions(+), 38 deletions(-)
 rename app-static/{snippets/jsonsnippetfile.cpp => jsonfile.h} (55%)
 rename app-static/{snippets/jsonsnippetfile.h => jsontranslatorfactory.h} (55%)

diff --git a/app-static/app-static.pro b/app-static/app-static.pro
index 6fd6498c..e5bc5a0f 100644
--- a/app-static/app-static.pro
+++ b/app-static/app-static.pro
@@ -13,7 +13,6 @@ CONFIG += staticlib
 SOURCES += \
     snippets/jsonsnippettranslator.cpp \
     snippets/snippetcollection.cpp \
-    snippets/jsonsnippetfile.cpp \
     snippets/snippetlistmodel.cpp \
     converter/discountmarkdownconverter.cpp \
     spellchecker/dictionary.cpp \
@@ -26,13 +25,12 @@ SOURCES += \
     viewsynchronizer.cpp \
     revealviewsynchronizer.cpp \
     htmlviewsynchronizer.cpp \
-    styles.cpp
+    styles.cpp 
 
 HEADERS += \
     snippets/snippet.h \
     snippets/jsonsnippettranslator.h \
     snippets/snippetcollection.h \
-    snippets/jsonsnippetfile.h \
     snippets/snippetlistmodel.h \
     converter/markdownconverter.h \
     converter/markdowndocument.h \
@@ -49,7 +47,11 @@ HEADERS += \
     viewsynchronizer.h \
     revealviewsynchronizer.h \
     htmlviewsynchronizer.h \
-    styles.h
+    styles.h \
+    collection.h \
+    jsonfile.h \
+    jsontranslator.h \
+    jsontranslatorfactory.h
 
 #unix:!symbian {
 #    maemo5 {
diff --git a/app-static/snippets/jsonsnippetfile.cpp b/app-static/jsonfile.h
similarity index 55%
rename from app-static/snippets/jsonsnippetfile.cpp
rename to app-static/jsonfile.h
index cbce033a..163435cd 100644
--- a/app-static/snippets/jsonsnippetfile.cpp
+++ b/app-static/jsonfile.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Christian Loose <christian.loose@hamburg.de>
+ * Copyright 2014 Christian Loose <christian.loose@hamburg.de>
  *
  * 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
@@ -14,17 +14,31 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "jsonsnippetfile.h"
+#ifndef JSONFILE_H
+#define JSONFILE_H
 
 #include <QFile>
 #include <QJsonDocument>
-#include <QTextStream>
+#include "collection.h"
+#include "jsontranslator.h"
+#include "jsontranslatorfactory.h"
 
-#include "jsonsnippettranslator.h"
-#include "snippetcollection.h"
+class QString;
 
 
-bool JsonSnippetFile::load(const QString &fileName, SnippetCollection *collection)
+template <class T>
+class JsonFile
+{
+public:
+    static bool load(const QString &fileName, Collection<T> *collection);
+    static bool save(const QString &fileName, Collection<T> *collection);
+
+private:
+    JsonFile();
+};
+
+template <class T>
+bool JsonFile<T>::load(const QString &fileName, Collection<T> *collection)
 {
     QFile jsonFile(fileName);
     if (!jsonFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
@@ -33,22 +47,26 @@ bool JsonSnippetFile::load(const QString &fileName, SnippetCollection *collectio
 
     QJsonDocument doc = QJsonDocument::fromJson(jsonFile.readAll());
 
-    JsonSnippetTranslator translator;
-    return translator.processDocument(doc, collection);
+    JsonTranslator<T> *translator = JsonTranslatorFactory<T>::create();
+    return translator->processDocument(doc,collection);
 }
 
-bool JsonSnippetFile::save(const QString &fileName, SnippetCollection *collection)
+template <class T>
+bool JsonFile<T>::save(const QString &fileName, Collection<T> *collection)
 {
     QFile jsonFile(fileName);
     if (!jsonFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
         return false;
     }
 
-    JsonSnippetTranslator translator;
-    QJsonDocument doc = translator.createDocument(collection);
+    JsonTranslator<T> *translator = JsonTranslatorFactory<T>::create();
+    QJsonDocument doc = translator->createDocument(collection);
 
     QTextStream out(&jsonFile);
     out << doc.toJson();
 
     return true;
 }
+
+#endif // JSONFILE_H
+
diff --git a/app-static/snippets/jsonsnippetfile.h b/app-static/jsontranslatorfactory.h
similarity index 55%
rename from app-static/snippets/jsonsnippetfile.h
rename to app-static/jsontranslatorfactory.h
index 5f3800c6..7824d502 100644
--- a/app-static/snippets/jsonsnippetfile.h
+++ b/app-static/jsontranslatorfactory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Christian Loose <christian.loose@hamburg.de>
+ * Copyright 2014 Christian Loose <christian.loose@hamburg.de>
  *
  * 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
@@ -14,21 +14,33 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef JSONSNIPPETFILE_H
-#define JSONSNIPPETFILE_H
+#ifndef JSONTRANSLATORFACTORY_H
+#define JSONTRANSLATORFACTORY_H
 
-class QString;
-class SnippetCollection;
+#include "jsontranslator.h"
 
+#include "snippets/snippet.h"
+#include "snippets/jsonsnippettranslator.h"
 
-class JsonSnippetFile
+#include "styles/style.h"
+
+
+template <class T>
+class JsonTranslatorFactory
 {
 public:
-    static bool load(const QString &fileName, SnippetCollection *collection);
-    static bool save(const QString &fileName, SnippetCollection *collection);
+    static JsonTranslator<T> *create() { return 0; }
+};
 
-private:
-    JsonSnippetFile();
+template <> class JsonTranslatorFactory<Snippet>
+{
+public:
+    static JsonTranslator<Snippet> *create()
+    {
+        return new JsonSnippetTranslator();
+    }
 };
 
-#endif // JSONSNIPPETFILE_H
+#endif // JSONTRANSLATOR_H
+
+
diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp
index 6a7b0983..cc892313 100644
--- a/app/mainwindow.cpp
+++ b/app/mainwindow.cpp
@@ -44,10 +44,10 @@
 #include <QWinJumpListCategory>
 #endif
 
-#include <snippets/jsonsnippetfile.h>
 #include <snippets/snippetcollection.h>
 #include <spellchecker/dictionary.h>
 #include <datalocation.h>
+#include <jsonfile.h>
 #include "controls/activelabel.h"
 #include "controls/findreplacewidget.h"
 #include "controls/languagemenu.h"
@@ -195,9 +195,9 @@ void MainWindow::initializeApp()
     ui->menuLanguages->loadDictionaries(options->dictionaryLanguage());
 
     //: path to built-in snippets resource.
-    JsonSnippetFile::load(tr(":/markdown-snippets.json"), snippetCollection);
+    JsonFile<Snippet>::load(tr(":/markdown-snippets.json"), snippetCollection);
     QString path = DataLocation::writableLocation();
-    JsonSnippetFile::load(path + "/user-snippets.json", snippetCollection);
+    JsonFile<Snippet>::load(path + "/user-snippets.json", snippetCollection);
 
     // setup file explorer
     connect(ui->fileExplorerDockContents, SIGNAL(fileSelected(QString)),
@@ -653,7 +653,7 @@ void MainWindow::extrasOptions()
 
         QString path = DataLocation::writableLocation();
         QSharedPointer<SnippetCollection> userDefinedSnippets = snippetCollection->userDefinedSnippets();
-        JsonSnippetFile::save(path + "/user-snippets.json", userDefinedSnippets.data());
+        JsonFile<Snippet>::save(path + "/user-snippets.json", userDefinedSnippets.data());
 
         // update shortcuts
         setupCustomShortcuts();
diff --git a/test/integration/jsonsnippetfiletest.cpp b/test/integration/jsonsnippetfiletest.cpp
index ba1da3bd..b279e1fa 100644
--- a/test/integration/jsonsnippetfiletest.cpp
+++ b/test/integration/jsonsnippetfiletest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Christian Loose <christian.loose@hamburg.de>
+ * Copyright 2013-2014 Christian Loose <christian.loose@hamburg.de>
  *
  * 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
@@ -20,7 +20,7 @@
 #include <QTemporaryFile>
 #include <QTextStream>
 
-#include <snippets/jsonsnippetfile.h>
+#include <jsonfile.h>
 #include <snippets/snippetcollection.h>
 
 void JsonSnippetFileTest::loadsEmptySnippetsCollectionFromFile()
@@ -34,7 +34,7 @@ void JsonSnippetFileTest::loadsEmptySnippetsCollectionFromFile()
     snippetFile.close();
 
     SnippetCollection collection;
-    bool success = JsonSnippetFile::load(snippetFile.fileName(), &collection);
+    bool success = JsonFile<Snippet>::load(snippetFile.fileName(), &collection);
 
     QVERIFY(success);
     QCOMPARE(collection.count(), 0);
@@ -62,7 +62,7 @@ void JsonSnippetFileTest::loadsSnippetsCollectionFromFile()
     snippetFile.close();
 
     SnippetCollection collection;
-    bool success = JsonSnippetFile::load(snippetFile.fileName(), &collection);
+    bool success = JsonFile<Snippet>::load(snippetFile.fileName(), &collection);
 
     QVERIFY(success);
     QCOMPARE(collection.count(), 2);
@@ -77,7 +77,7 @@ void JsonSnippetFileTest::savesEmptySnippetsCollectionToFile()
         QFAIL("Failed to create temporary snippet file");
 
     SnippetCollection collection;
-    bool success = JsonSnippetFile::save(snippetFile.fileName(), &collection);
+    bool success = JsonFile<Snippet>::save(snippetFile.fileName(), &collection);
 
     QVERIFY(success);
 
@@ -105,7 +105,7 @@ void JsonSnippetFileTest::savesSnippetsCollectionToFile()
     collection.insert(snippet1);
     collection.insert(snippet2);
 
-    bool success = JsonSnippetFile::save(snippetFile.fileName(), &collection);
+    bool success = JsonFile<Snippet>::save(snippetFile.fileName(), &collection);
 
     QVERIFY(success);
 
@@ -143,11 +143,11 @@ void JsonSnippetFileTest::roundtripTest()
     collection1.insert(snippet1);
     collection1.insert(snippet2);
 
-    bool saveSuccess = JsonSnippetFile::save(snippetFile.fileName(), &collection1);
+    bool saveSuccess = JsonFile<Snippet>::save(snippetFile.fileName(), &collection1);
     QVERIFY(saveSuccess);
 
     SnippetCollection collection2;
-    bool loadSuccess = JsonSnippetFile::load(snippetFile.fileName(), &collection2);
+    bool loadSuccess = JsonFile<Snippet>::load(snippetFile.fileName(), &collection2);
     QVERIFY(loadSuccess);
 
     QCOMPARE(collection2.count(), 2);

From 4264fee75382b50fe7af709fbba5a9f8545f7b43 Mon Sep 17 00:00:00 2001
From: Christian Loose <christian.loose@hamburg.de>
Date: Thu, 4 Dec 2014 17:06:44 +0100
Subject: [PATCH 15/34] Add JSON translator for style structure

---
 app-static/app-static.pro                 |   2 +
 app-static/styles/jsonstyletranslator.cpp |  90 +++++++++++++
 app-static/styles/jsonstyletranslator.h   |  40 ++++++
 test/unit/jsonstyletranslatortest.cpp     | 148 ++++++++++++++++++++++
 test/unit/jsonstyletranslatortest.h       |  44 +++++++
 test/unit/main.cpp                        |   8 +-
 test/unit/unit.pro                        |   2 +
 7 files changed, 332 insertions(+), 2 deletions(-)
 create mode 100644 app-static/styles/jsonstyletranslator.cpp
 create mode 100644 app-static/styles/jsonstyletranslator.h
 create mode 100644 test/unit/jsonstyletranslatortest.cpp
 create mode 100644 test/unit/jsonstyletranslatortest.h

diff --git a/app-static/app-static.pro b/app-static/app-static.pro
index e5bc5a0f..6158c17b 100644
--- a/app-static/app-static.pro
+++ b/app-static/app-static.pro
@@ -19,6 +19,7 @@ SOURCES += \
     converter/revealmarkdownconverter.cpp \
     template/htmltemplate.cpp \
     template/presentationtemplate.cpp \
+    styles/jsonstyletranslator.cpp \
     styles/stylecollection.cpp \
     datalocation.cpp \
     slidelinemapping.cpp \
@@ -40,6 +41,7 @@ HEADERS += \
     template/template.h \
     template/htmltemplate.h \
     template/presentationtemplate.h \
+    styles/jsonstyletranslator.h \
     styles/style.h \
     styles/stylecollection.h \
     datalocation.h \
diff --git a/app-static/styles/jsonstyletranslator.cpp b/app-static/styles/jsonstyletranslator.cpp
new file mode 100644
index 00000000..3581d1c4
--- /dev/null
+++ b/app-static/styles/jsonstyletranslator.cpp
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2014 Christian Loose <christian.loose@hamburg.de>
+ *
+ * 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 program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "jsonstyletranslator.h"
+
+#include <QJsonArray>
+#include <QJsonDocument>
+
+#include "style.h"
+#include "collection.h"
+
+namespace {
+
+static const QLatin1String NAME("name");
+static const QLatin1String BUILTIN("builtIn");
+
+}
+
+bool JsonStyleTranslator::processDocument(const QJsonDocument &jsonDocument, Collection<Style> *collection)
+{
+    if (!isValid(jsonDocument))
+        return false;
+
+    QJsonArray styleArray = jsonDocument.object().value("styles").toArray();
+    foreach (QJsonValue entry, styleArray) {
+        Style style = fromJsonObject(entry.toObject());
+        collection->insert(style);
+    }
+
+    return true;
+}
+
+QJsonDocument JsonStyleTranslator::createDocument(Collection<Style> *collection)
+{
+    QJsonArray styleArray;
+    for (int i = 0; i < collection->count(); ++i) {
+        Style style = collection->at(i);
+
+        QJsonObject entry = toJsonObject(style);
+        styleArray.append(entry);
+    }
+
+    QJsonObject object;
+    object.insert("styles", styleArray);
+
+    QJsonDocument doc(object);
+    return doc;
+}
+
+Style JsonStyleTranslator::fromJsonObject(const QJsonObject &object)
+{
+    Style style;
+
+    style.name = object.value(NAME).toString();
+    style.builtIn = object.value(BUILTIN).toBool();
+
+    return style;
+}
+
+QJsonObject JsonStyleTranslator::toJsonObject(const Style &style)
+{
+    QJsonObject object;
+
+    object.insert(NAME, style.name);
+    object.insert(BUILTIN, style.builtIn);
+
+    return object;
+}
+
+bool JsonStyleTranslator::isValid(const QJsonDocument &jsonDocument) const
+{
+    return !jsonDocument.isEmpty() &&
+           jsonDocument.isObject() &&
+           jsonDocument.object().contains("styles") &&
+           jsonDocument.object().value("styles").isArray();
+}
+
diff --git a/app-static/styles/jsonstyletranslator.h b/app-static/styles/jsonstyletranslator.h
new file mode 100644
index 00000000..45a043f1
--- /dev/null
+++ b/app-static/styles/jsonstyletranslator.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2014 Christian Loose <christian.loose@hamburg.de>
+ *
+ * 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 program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef JSONSTYLETRANSLATOR_H
+#define JSONSTYLETRANSLATOR_H
+
+#include "jsontranslator.h"
+#include <QJsonObject>
+class QJsonDocument;
+struct Style;
+
+
+class JsonStyleTranslator : public JsonTranslator<Style>
+{
+public:
+    bool processDocument(const QJsonDocument &jsonDocument, Collection<Style> *collection) Q_DECL_OVERRIDE;
+    QJsonDocument createDocument(Collection<Style> *collection) Q_DECL_OVERRIDE;
+
+private:
+    Style fromJsonObject(const QJsonObject &object);
+    QJsonObject toJsonObject(const Style &style);
+
+    bool isValid(const QJsonDocument &jsonDocument) const;
+};
+
+#endif // JSONSTYLETRANSLATOR_H
+
diff --git a/test/unit/jsonstyletranslatortest.cpp b/test/unit/jsonstyletranslatortest.cpp
new file mode 100644
index 00000000..16c1a9a7
--- /dev/null
+++ b/test/unit/jsonstyletranslatortest.cpp
@@ -0,0 +1,148 @@
+/*
+ * Copyright 2014 Christian Loose <christian.loose@hamburg.de>
+ *
+ * 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 program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "jsonstyletranslatortest.h"
+
+#include <QtTest>
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QJsonObject>
+
+#include <styles/jsonstyletranslator.h>
+#include <styles/style.h>
+#include <styles/stylecollection.h>
+
+
+QJsonDocument NewStyleDocumentWithObject(const QJsonObject &jsonObject)
+{
+    QJsonArray styleArray;
+    styleArray.append(jsonObject);
+
+    QJsonObject object;
+    object.insert("styles", styleArray);
+
+    QJsonDocument doc(object);
+    return doc;
+}
+
+void JsonStyleTranslatorTest::initTestCase()
+{
+    translator = new JsonStyleTranslator();
+}
+
+void JsonStyleTranslatorTest::translatesJsonDocumentToStyles()
+{
+    Style expected;
+    expected.name = "name";
+    //expected.description = "description";
+    //expected.style = "style";
+    //expected.cursorPosition = 1;
+    expected.builtIn = true;
+
+    QJsonObject jsonObject;
+    jsonObject.insert("name", expected.name);
+    //jsonObject.insert("description", expected.description);
+    //jsonObject.insert("style", expected.style);
+    //jsonObject.insert("cursor", expected.cursorPosition);
+    jsonObject.insert("builtIn", expected.builtIn);
+
+    QJsonDocument doc = NewStyleDocumentWithObject(jsonObject);
+
+    StyleCollection collection;
+    bool success = translator->processDocument(doc, &collection);
+
+    QVERIFY(success);
+    QCOMPARE(collection.count(), 1);
+    QCOMPARE(collection.at(0).name, expected.name);
+    //QCOMPARE(collection.at(0).description, expected.description);
+    //QCOMPARE(collection.at(0).style, expected.style);
+    //QCOMPARE(collection.at(0).cursorPosition, expected.cursorPosition);
+    QCOMPARE(collection.at(0).builtIn, expected.builtIn);
+}
+
+void JsonStyleTranslatorTest::translatesEmptyJsonDocumentToEmptyStyles()
+{
+    Style expected;
+    expected.name = QString();
+    //expected.description = QString();
+    //expected.style = QString();
+    //expected.cursorPosition = 0;
+    expected.builtIn = false;
+
+    QJsonObject emptyJsonObject;
+    QJsonDocument doc = NewStyleDocumentWithObject(emptyJsonObject);
+
+    StyleCollection collection;
+    bool success = translator->processDocument(doc, &collection);
+
+    QVERIFY(success);
+    QCOMPARE(collection.count(), 1);
+    QCOMPARE(collection.at(0).name, expected.name);
+    //QCOMPARE(collection.at(0).description, expected.description);
+    //QCOMPARE(collection.at(0).style, expected.style);
+    //QCOMPARE(collection.at(0).cursorPosition, expected.cursorPosition);
+    QCOMPARE(collection.at(0).builtIn, expected.builtIn);
+}
+
+void JsonStyleTranslatorTest::defectIfJsonDocumentIsInvalid()
+{
+    QJsonDocument doc;
+
+    StyleCollection collection;
+    bool success = translator->processDocument(doc, &collection);
+
+    QVERIFY(!success);
+    QCOMPARE(collection.count(), 0);
+}
+
+void JsonStyleTranslatorTest::translatesStyleCollectionToJsonDocument()
+{
+    Style style;
+    style.name = "name";
+    //style.description = "description";
+    //style.style = "style";
+    //style.cursorPosition = 1;
+    style.builtIn = true;
+
+    StyleCollection collection;
+    collection.insert(style);
+
+    QJsonObject expected;
+    expected.insert("name", style.name);
+    //expected.insert("description", style.description);
+    //expected.insert("style", style.style);
+    //expected.insert("cursor", style.cursorPosition);
+    expected.insert("builtIn", style.builtIn);
+
+    QJsonDocument actual = translator->createDocument(&collection);
+
+    QVERIFY(actual.isObject());
+    QVERIFY(actual.object().contains("styles"));
+    QVERIFY(actual.object().value("styles").isArray());
+
+    QJsonObject actualObject = actual.object().value("styles").toArray().first().toObject();
+    QCOMPARE(actualObject["name"], expected["name"]);
+    //QCOMPARE(actualObject["description"], expected["description"]);
+    //QCOMPARE(actualObject["style"], expected["style"]);
+    //QCOMPARE(actualObject["cursorPosition"], expected["cursorPosition"]);
+    QCOMPARE(actualObject["builtIn"], expected["builtIn"]);
+}
+
+void JsonStyleTranslatorTest::cleanupTestCase()
+{
+    delete translator;
+}
+
diff --git a/test/unit/jsonstyletranslatortest.h b/test/unit/jsonstyletranslatortest.h
new file mode 100644
index 00000000..78aeb0f5
--- /dev/null
+++ b/test/unit/jsonstyletranslatortest.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2014 Christian Loose <christian.loose@hamburg.de>
+ *
+ * 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 program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef JSONSTYLETRANSLATORTEST_H
+#define JSONSTYLETRANSLATORTEST_H
+
+#include <QObject>
+class JsonStyleTranslator;
+
+
+class JsonStyleTranslatorTest : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void initTestCase();
+
+    void translatesJsonDocumentToStyles();
+    void translatesEmptyJsonDocumentToEmptyStyles();
+    void defectIfJsonDocumentIsInvalid();
+
+    void translatesStyleCollectionToJsonDocument();
+
+    void cleanupTestCase();
+
+private:
+    JsonStyleTranslator *translator;
+};
+
+#endif // JSONSTYLETRANSLATORTEST_H
+
diff --git a/test/unit/main.cpp b/test/unit/main.cpp
index 4a9817d0..475a8bd5 100644
--- a/test/unit/main.cpp
+++ b/test/unit/main.cpp
@@ -22,6 +22,7 @@
 #include "snippetcollectiontest.h"
 #include "snippetlistmodeltest.h"
 #include "snippettest.h"
+#include "jsonstyletranslatortest.h"
 #include "styletest.h"
 #include "stylecollectiontest.h"
 
@@ -47,11 +48,14 @@ int main(int argc, char *argv[])
     SlideLineMappingTest test6;
     ret += QTest::qExec(&test6, argc, argv);
 
-    StyleTest test7;
+    JsonStyleTranslatorTest test7;
     ret += QTest::qExec(&test7, argc, argv);
 
-    StyleCollectionTest test8;
+    StyleTest test8;
     ret += QTest::qExec(&test8, argc, argv);
 
+    StyleCollectionTest test9;
+    ret += QTest::qExec(&test9, argc, argv);
+
     return ret;
 }
diff --git a/test/unit/unit.pro b/test/unit/unit.pro
index ceb57904..43c32a9b 100644
--- a/test/unit/unit.pro
+++ b/test/unit/unit.pro
@@ -17,6 +17,7 @@ SOURCES += \
     snippetcollectiontest.cpp \
     snippetlistmodeltest.cpp \
     dictionarytest.cpp \
+    jsonstyletranslatortest.cpp \
     styletest.cpp \
     stylecollectiontest.cpp
 
@@ -27,6 +28,7 @@ HEADERS += \
     snippetcollectiontest.h \
     snippetlistmodeltest.h \
     dictionarytest.h \
+    jsonstyletranslatortest.h \
     styletest.h \
     stylecollectiontest.h
 

From d8337929fe1f3c88a23d02a7837e6d623c8cb1c7 Mon Sep 17 00:00:00 2001
From: Christian Loose <christian.loose@hamburg.de>
Date: Fri, 5 Dec 2014 14:52:28 +0100
Subject: [PATCH 16/34] Add missing virtual destructor to JsonTranslator

---
 app-static/jsontranslator.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app-static/jsontranslator.h b/app-static/jsontranslator.h
index 53e8ca42..cdaa74a6 100644
--- a/app-static/jsontranslator.h
+++ b/app-static/jsontranslator.h
@@ -25,6 +25,8 @@ template <class T>
 class JsonTranslator
 {
 public:
+    virtual ~JsonTranslator() {}
+
     virtual bool processDocument(const QJsonDocument &jsonDocument, Collection<T> *collection) = 0;
     virtual QJsonDocument createDocument(Collection<T> *collection) = 0;
 };

From 0771f398df9206bff8dacd3442a608e9b996468b Mon Sep 17 00:00:00 2001
From: Christian Loose <christian.loose@hamburg.de>
Date: Fri, 5 Dec 2014 14:52:51 +0100
Subject: [PATCH 17/34] Fix memory leak in JsonFile

---
 app-static/jsonfile.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-static/jsonfile.h b/app-static/jsonfile.h
index 163435cd..ebc141b4 100644
--- a/app-static/jsonfile.h
+++ b/app-static/jsonfile.h
@@ -47,7 +47,7 @@ bool JsonFile<T>::load(const QString &fileName, Collection<T> *collection)
 
     QJsonDocument doc = QJsonDocument::fromJson(jsonFile.readAll());
 
-    JsonTranslator<T> *translator = JsonTranslatorFactory<T>::create();
+    QScopedPointer<JsonTranslator<T> > translator(JsonTranslatorFactory<T>::create());
     return translator->processDocument(doc,collection);
 }
 
@@ -59,7 +59,7 @@ bool JsonFile<T>::save(const QString &fileName, Collection<T> *collection)
         return false;
     }
 
-    JsonTranslator<T> *translator = JsonTranslatorFactory<T>::create();
+    QScopedPointer<JsonTranslator<T> > translator(JsonTranslatorFactory<T>::create());
     QJsonDocument doc = translator->createDocument(collection);
 
     QTextStream out(&jsonFile);

From 4e28b9d19a9d0e8b462c560dee77538ab78ed3f9 Mon Sep 17 00:00:00 2001
From: Christian Loose <christian.loose@hamburg.de>
Date: Fri, 5 Dec 2014 14:54:22 +0100
Subject: [PATCH 18/34] Add factory for JsonStyleTranslator and unit test for
 JsonTranslatorFactory

---
 app-static/jsontranslatorfactory.h      | 10 ++++++
 test/unit/jsontranslatorfactorytest.cpp | 47 +++++++++++++++++++++++++
 test/unit/jsontranslatorfactorytest.h   | 33 +++++++++++++++++
 test/unit/main.cpp                      |  4 +++
 test/unit/unit.pro                      |  6 ++--
 5 files changed, 98 insertions(+), 2 deletions(-)
 create mode 100644 test/unit/jsontranslatorfactorytest.cpp
 create mode 100644 test/unit/jsontranslatorfactorytest.h

diff --git a/app-static/jsontranslatorfactory.h b/app-static/jsontranslatorfactory.h
index 7824d502..8b0d9f09 100644
--- a/app-static/jsontranslatorfactory.h
+++ b/app-static/jsontranslatorfactory.h
@@ -23,6 +23,7 @@
 #include "snippets/jsonsnippettranslator.h"
 
 #include "styles/style.h"
+#include "styles/jsonstyletranslator.h"
 
 
 template <class T>
@@ -41,6 +42,15 @@ template <> class JsonTranslatorFactory<Snippet>
     }
 };
 
+template <> class JsonTranslatorFactory<Style>
+{
+public:
+    static JsonTranslator<Style> *create()
+    {
+        return new JsonStyleTranslator();
+    }
+};
+
 #endif // JSONTRANSLATOR_H
 
 
diff --git a/test/unit/jsontranslatorfactorytest.cpp b/test/unit/jsontranslatorfactorytest.cpp
new file mode 100644
index 00000000..f8e1d2c4
--- /dev/null
+++ b/test/unit/jsontranslatorfactorytest.cpp
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2014 Christian Loose <christian.loose@hamburg.de>
+ *
+ * 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 program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "jsontranslatorfactorytest.h"
+
+#include <QTest>
+
+#include <jsontranslator.h>
+#include <jsontranslatorfactory.h>
+#include <snippets/snippet.h>
+#include <styles/style.h>
+
+
+void JsonTranslatorFactoryTest::returnsNullIfNoJsonTranslatorExists()
+{
+    JsonTranslator<int> *translator = JsonTranslatorFactory<int>::create();
+
+    QVERIFY(translator == 0);
+}
+
+void JsonTranslatorFactoryTest::returnsValidJsonTranslatorForSnippets()
+{
+    JsonTranslator<Snippet> *translator = JsonTranslatorFactory<Snippet>::create();
+
+    QVERIFY(translator != 0);
+}
+
+void JsonTranslatorFactoryTest::returnsValidJsonTranslatorForStyles()
+{
+    JsonTranslator<Style> *translator = JsonTranslatorFactory<Style>::create();
+
+    QVERIFY(translator != 0);
+}
+
diff --git a/test/unit/jsontranslatorfactorytest.h b/test/unit/jsontranslatorfactorytest.h
new file mode 100644
index 00000000..c3074a27
--- /dev/null
+++ b/test/unit/jsontranslatorfactorytest.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2014 Christian Loose <christian.loose@hamburg.de>
+ *
+ * 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 program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef JSONTRANSLATORFACTORYTEST_H
+#define JSONTRANSLATORFACTORYTEST_H
+
+#include <QObject>
+
+class JsonTranslatorFactoryTest : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void returnsNullIfNoJsonTranslatorExists();
+    void returnsValidJsonTranslatorForSnippets();
+    void returnsValidJsonTranslatorForStyles();
+};
+
+#endif // JSONTRANSLATORFACTORYTEST_H
+
diff --git a/test/unit/main.cpp b/test/unit/main.cpp
index 475a8bd5..7b59bfa8 100644
--- a/test/unit/main.cpp
+++ b/test/unit/main.cpp
@@ -25,6 +25,7 @@
 #include "jsonstyletranslatortest.h"
 #include "styletest.h"
 #include "stylecollectiontest.h"
+#include "jsontranslatorfactorytest.h"
 
 int main(int argc, char *argv[])
 {
@@ -57,5 +58,8 @@ int main(int argc, char *argv[])
     StyleCollectionTest test9;
     ret += QTest::qExec(&test9, argc, argv);
 
+    JsonTranslatorFactoryTest test10;
+    ret += QTest::qExec(&test10, argc, argv);
+
     return ret;
 }
diff --git a/test/unit/unit.pro b/test/unit/unit.pro
index 43c32a9b..886581d5 100644
--- a/test/unit/unit.pro
+++ b/test/unit/unit.pro
@@ -19,7 +19,8 @@ SOURCES += \
     dictionarytest.cpp \
     jsonstyletranslatortest.cpp \
     styletest.cpp \
-    stylecollectiontest.cpp
+    stylecollectiontest.cpp \
+    jsontranslatorfactorytest.cpp
 
 HEADERS += \
     snippettest.h \
@@ -30,7 +31,8 @@ HEADERS += \
     dictionarytest.h \
     jsonstyletranslatortest.h \
     styletest.h \
-    stylecollectiontest.h
+    stylecollectiontest.h \
+    jsontranslatorfactorytest.h
 
 target.CONFIG += no_default_install
 

From a41cfcfa8cce690321da25b49cde91895cecd94a Mon Sep 17 00:00:00 2001
From: Christian Loose <christian.loose@hamburg.de>
Date: Fri, 5 Dec 2014 14:56:30 +0100
Subject: [PATCH 19/34] Add JsonStyleFileTest and complete JsonStyleTranslator
 implementation

---
 app-static/styles/jsonstyletranslator.cpp |   9 ++
 test/integration/integration.pro          |   2 +
 test/integration/jsonstylefiletest.cpp    | 165 ++++++++++++++++++++++
 test/integration/jsonstylefiletest.h      |  38 +++++
 test/integration/main.cpp                 |   6 +-
 test/unit/jsonstyletranslatortest.cpp     |  48 +++----
 6 files changed, 243 insertions(+), 25 deletions(-)
 create mode 100644 test/integration/jsonstylefiletest.cpp
 create mode 100644 test/integration/jsonstylefiletest.h

diff --git a/app-static/styles/jsonstyletranslator.cpp b/app-static/styles/jsonstyletranslator.cpp
index 3581d1c4..83e3e83b 100644
--- a/app-static/styles/jsonstyletranslator.cpp
+++ b/app-static/styles/jsonstyletranslator.cpp
@@ -25,6 +25,9 @@
 namespace {
 
 static const QLatin1String NAME("name");
+static const QLatin1String MARKDOWN_HIGHLIGHTING("markdownHighlighting");
+static const QLatin1String CODE_HIGHLIGHTING("codeHighlighting");
+static const QLatin1String PREVIEW_STYLESHEET("previewStylesheet");
 static const QLatin1String BUILTIN("builtIn");
 
 }
@@ -65,6 +68,9 @@ Style JsonStyleTranslator::fromJsonObject(const QJsonObject &object)
     Style style;
 
     style.name = object.value(NAME).toString();
+    style.markdownHighlighting = object.value(MARKDOWN_HIGHLIGHTING).toString();
+    style.codeHighlighting = object.value(CODE_HIGHLIGHTING).toString();
+    style.previewStylesheet = object.value(PREVIEW_STYLESHEET).toString();
     style.builtIn = object.value(BUILTIN).toBool();
 
     return style;
@@ -75,6 +81,9 @@ QJsonObject JsonStyleTranslator::toJsonObject(const Style &style)
     QJsonObject object;
 
     object.insert(NAME, style.name);
+    object.insert(MARKDOWN_HIGHLIGHTING, style.markdownHighlighting);
+    object.insert(CODE_HIGHLIGHTING, style.codeHighlighting);
+    object.insert(PREVIEW_STYLESHEET, style.previewStylesheet);
     object.insert(BUILTIN, style.builtIn);
 
     return object;
diff --git a/test/integration/integration.pro b/test/integration/integration.pro
index 684c43f0..ffdf2b4e 100644
--- a/test/integration/integration.pro
+++ b/test/integration/integration.pro
@@ -13,12 +13,14 @@ CONFIG += console testcase
 SOURCES += \
     discountmarkdownconvertertest.cpp \
     jsonsnippetfiletest.cpp \
+    jsonstylefiletest.cpp \
     main.cpp \
     revealmarkdownconvertertest.cpp
 
 HEADERS += \
     discountmarkdownconvertertest.h \
     jsonsnippetfiletest.h \
+    jsonstylefiletest.h \
     revealmarkdownconvertertest.h
 
 target.CONFIG += no_default_install
diff --git a/test/integration/jsonstylefiletest.cpp b/test/integration/jsonstylefiletest.cpp
new file mode 100644
index 00000000..155bf025
--- /dev/null
+++ b/test/integration/jsonstylefiletest.cpp
@@ -0,0 +1,165 @@
+/*
+ * Copyright 2014 Christian Loose <christian.loose@hamburg.de>
+ *
+ * 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 program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "jsonstylefiletest.h"
+
+#include <QtTest>
+#include <QTemporaryFile>
+#include <QTextStream>
+
+#include <jsonfile.h>
+#include <styles/stylecollection.h>
+
+void JsonStyleFileTest::loadsEmptyStylesCollectionFromFile()
+{
+    QTemporaryFile styleFile(this);
+    if (!styleFile.open())
+        QFAIL("Failed to create temporary style file");
+
+    QTextStream out(&styleFile); out << "{ \"styles\": [] }";
+
+    styleFile.close();
+
+    StyleCollection collection;
+    bool success = JsonFile<Style>::load(styleFile.fileName(), &collection);
+
+    QVERIFY(success);
+    QCOMPARE(collection.count(), 0);
+}
+
+void JsonStyleFileTest::loadsStylesCollectionFromFile()
+{
+    QTemporaryFile styleFile(this);
+    if (!styleFile.open())
+        QFAIL("Failed to create temporary style file");
+
+    QTextStream out(&styleFile);
+    out << "{ \"styles\": ["
+        << "   {  \"name\": \"abc\","
+        << "      \"markdownHighlighting\": \"markdownHighlighting abc\","
+        << "      \"codeHighlighting\": \"codeHighlighting abc\","
+        << "      \"previewStylesheet\": \"previewStylesheet abc\","
+        << "      \"builtIn\": true },"
+        << "   {  \"name\": \"xyz\","
+        << "      \"markdownHighlighting\": \"markdownHighlighting xyz\","
+        << "      \"codeHighlighting\": \"codeHighlighting xyz\","
+        << "      \"previewStylesheet\": \"previewStylesheet xyz\","
+        << "      \"builtIn\": false } ] }";
+
+    styleFile.close();
+
+    StyleCollection collection;
+    bool success = JsonFile<Style>::load(styleFile.fileName(), &collection);
+
+    QVERIFY(success);
+    QCOMPARE(collection.count(), 2);
+    QVERIFY(collection.contains("abc"));
+    QVERIFY(collection.contains("xyz"));
+}
+
+void JsonStyleFileTest::savesEmptyStylesCollectionToFile()
+{
+    QTemporaryFile styleFile(this);
+    if (!styleFile.open())
+        QFAIL("Failed to create temporary style file");
+
+    StyleCollection collection;
+    bool success = JsonFile<Style>::save(styleFile.fileName(), &collection);
+
+    QVERIFY(success);
+
+    QTextStream in(&styleFile);
+    QString fileContent = in.readAll().trimmed();
+
+    QVERIFY(fileContent.startsWith("{"));
+    QVERIFY(fileContent.contains("\"styles\": ["));
+    QVERIFY(fileContent.endsWith("}"));
+}
+
+void JsonStyleFileTest::savesStylesCollectionToFile()
+{
+    QTemporaryFile styleFile(this);
+    if (!styleFile.open())
+        QFAIL("Failed to create temporary style file");
+
+    Style style1;
+    style1.name = "abc";
+
+    Style style2;
+    style2.name = "xyz";
+
+    StyleCollection collection;
+    collection.insert(style1);
+    collection.insert(style2);
+
+    bool success = JsonFile<Style>::save(styleFile.fileName(), &collection);
+
+    QVERIFY(success);
+
+    QTextStream in(&styleFile);
+    QString fileContent = in.readAll().trimmed();
+
+    QVERIFY(fileContent.startsWith("{"));
+    QVERIFY(fileContent.contains("\"styles\": ["));
+    QVERIFY(fileContent.contains("\"name\": \"abc\""));
+    QVERIFY(fileContent.contains("\"name\": \"xyz\""));
+    QVERIFY(fileContent.endsWith("}"));
+}
+
+void JsonStyleFileTest::roundtripTest()
+{
+    QTemporaryFile styleFile(this);
+    if (!styleFile.open())
+        QFAIL("Failed to create temporary style file");
+
+    Style style1;
+    style1.name = "abc";
+    style1.markdownHighlighting = "markdownHighlighting abc";
+    style1.codeHighlighting = "codeHighlighting abc";
+    style1.previewStylesheet = "previewStylesheet abc";
+    style1.builtIn = true;
+
+    Style style2;
+    style2.name = "xyz";
+    style2.markdownHighlighting = "markdownHighlighting xyz";
+    style2.codeHighlighting = "codeHighlighting xyz";
+    style2.previewStylesheet = "previewStylesheet xyz";
+    style2.builtIn = false;
+
+    StyleCollection collection1;
+    collection1.insert(style1);
+    collection1.insert(style2);
+
+    bool saveSuccess = JsonFile<Style>::save(styleFile.fileName(), &collection1);
+    QVERIFY(saveSuccess);
+
+    StyleCollection collection2;
+    bool loadSuccess = JsonFile<Style>::load(styleFile.fileName(), &collection2);
+    QVERIFY(loadSuccess);
+
+    QCOMPARE(collection2.count(), 2);
+
+    QCOMPARE(collection2.style("abc").markdownHighlighting, style1.markdownHighlighting);
+    QCOMPARE(collection2.style("abc").codeHighlighting, style1.codeHighlighting);
+    QCOMPARE(collection2.style("abc").previewStylesheet, style1.previewStylesheet);
+    QCOMPARE(collection2.style("abc").builtIn, style1.builtIn);
+
+    QCOMPARE(collection2.style("xyz").markdownHighlighting, style2.markdownHighlighting);
+    QCOMPARE(collection2.style("xyz").codeHighlighting, style2.codeHighlighting);
+    QCOMPARE(collection2.style("xyz").previewStylesheet, style2.previewStylesheet);
+    QCOMPARE(collection2.style("xyz").builtIn, style2.builtIn);
+}
+
diff --git a/test/integration/jsonstylefiletest.h b/test/integration/jsonstylefiletest.h
new file mode 100644
index 00000000..866def65
--- /dev/null
+++ b/test/integration/jsonstylefiletest.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2014 Christian Loose <christian.loose@hamburg.de>
+ *
+ * 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 program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef JSONSTYLEFILETEST_H
+#define JSONSTYLEFILETEST_H
+
+#include <QObject>
+
+
+class JsonStyleFileTest : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void loadsEmptyStylesCollectionFromFile();
+    void loadsStylesCollectionFromFile();
+
+    void savesEmptyStylesCollectionToFile();
+    void savesStylesCollectionToFile();
+
+    void roundtripTest();
+};
+
+#endif // JSONSTYLEFILETEST_H
+
diff --git a/test/integration/main.cpp b/test/integration/main.cpp
index 3f2697cc..85506f2f 100644
--- a/test/integration/main.cpp
+++ b/test/integration/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Christian Loose <christian.loose@hamburg.de>
+ * Copyright 2013-2014 Christian Loose <christian.loose@hamburg.de>
  *
  * 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
@@ -18,6 +18,7 @@
 
 #include "discountmarkdownconvertertest.h"
 #include "jsonsnippetfiletest.h"
+#include "jsonstylefiletest.h"
 #include "revealmarkdownconvertertest.h"
 
 #ifdef ENABLE_HOEDOWN
@@ -42,6 +43,9 @@ int main(int argc, char *argv[])
     JsonSnippetFileTest test4;
     ret += QTest::qExec(&test4, argc, argv);
 
+    JsonStyleFileTest test5;
+    ret += QTest::qExec(&test5, argc, argv);
+
     return ret;
 }
 
diff --git a/test/unit/jsonstyletranslatortest.cpp b/test/unit/jsonstyletranslatortest.cpp
index 16c1a9a7..b7aab73a 100644
--- a/test/unit/jsonstyletranslatortest.cpp
+++ b/test/unit/jsonstyletranslatortest.cpp
@@ -47,16 +47,16 @@ void JsonStyleTranslatorTest::translatesJsonDocumentToStyles()
 {
     Style expected;
     expected.name = "name";
-    //expected.description = "description";
-    //expected.style = "style";
-    //expected.cursorPosition = 1;
+    expected.markdownHighlighting = "markdownHighlighting";
+    expected.codeHighlighting = "codeHighlighting";
+    expected.previewStylesheet = "previewStylesheet";
     expected.builtIn = true;
 
     QJsonObject jsonObject;
     jsonObject.insert("name", expected.name);
-    //jsonObject.insert("description", expected.description);
-    //jsonObject.insert("style", expected.style);
-    //jsonObject.insert("cursor", expected.cursorPosition);
+    jsonObject.insert("markdownHighlighting", expected.markdownHighlighting);
+    jsonObject.insert("codeHighlighting", expected.codeHighlighting);
+    jsonObject.insert("previewStylesheet", expected.previewStylesheet);
     jsonObject.insert("builtIn", expected.builtIn);
 
     QJsonDocument doc = NewStyleDocumentWithObject(jsonObject);
@@ -67,9 +67,9 @@ void JsonStyleTranslatorTest::translatesJsonDocumentToStyles()
     QVERIFY(success);
     QCOMPARE(collection.count(), 1);
     QCOMPARE(collection.at(0).name, expected.name);
-    //QCOMPARE(collection.at(0).description, expected.description);
-    //QCOMPARE(collection.at(0).style, expected.style);
-    //QCOMPARE(collection.at(0).cursorPosition, expected.cursorPosition);
+    QCOMPARE(collection.at(0).markdownHighlighting, expected.markdownHighlighting);
+    QCOMPARE(collection.at(0).codeHighlighting, expected.codeHighlighting);
+    QCOMPARE(collection.at(0).previewStylesheet, expected.previewStylesheet);
     QCOMPARE(collection.at(0).builtIn, expected.builtIn);
 }
 
@@ -77,9 +77,9 @@ void JsonStyleTranslatorTest::translatesEmptyJsonDocumentToEmptyStyles()
 {
     Style expected;
     expected.name = QString();
-    //expected.description = QString();
-    //expected.style = QString();
-    //expected.cursorPosition = 0;
+    expected.markdownHighlighting = QString();
+    expected.codeHighlighting = QString();
+    expected.previewStylesheet = QString();
     expected.builtIn = false;
 
     QJsonObject emptyJsonObject;
@@ -91,9 +91,9 @@ void JsonStyleTranslatorTest::translatesEmptyJsonDocumentToEmptyStyles()
     QVERIFY(success);
     QCOMPARE(collection.count(), 1);
     QCOMPARE(collection.at(0).name, expected.name);
-    //QCOMPARE(collection.at(0).description, expected.description);
-    //QCOMPARE(collection.at(0).style, expected.style);
-    //QCOMPARE(collection.at(0).cursorPosition, expected.cursorPosition);
+    QCOMPARE(collection.at(0).markdownHighlighting, expected.markdownHighlighting);
+    QCOMPARE(collection.at(0).codeHighlighting, expected.codeHighlighting);
+    QCOMPARE(collection.at(0).previewStylesheet, expected.previewStylesheet);
     QCOMPARE(collection.at(0).builtIn, expected.builtIn);
 }
 
@@ -112,9 +112,9 @@ void JsonStyleTranslatorTest::translatesStyleCollectionToJsonDocument()
 {
     Style style;
     style.name = "name";
-    //style.description = "description";
-    //style.style = "style";
-    //style.cursorPosition = 1;
+    style.markdownHighlighting = "markdownHighlighting";
+    style.codeHighlighting = "codeHighlighting";
+    style.previewStylesheet = "previewStylesheet";
     style.builtIn = true;
 
     StyleCollection collection;
@@ -122,9 +122,9 @@ void JsonStyleTranslatorTest::translatesStyleCollectionToJsonDocument()
 
     QJsonObject expected;
     expected.insert("name", style.name);
-    //expected.insert("description", style.description);
-    //expected.insert("style", style.style);
-    //expected.insert("cursor", style.cursorPosition);
+    expected.insert("markdownHighlighting", style.markdownHighlighting);
+    expected.insert("codeHighlighting", style.codeHighlighting);
+    expected.insert("previewStylesheet", style.previewStylesheet);
     expected.insert("builtIn", style.builtIn);
 
     QJsonDocument actual = translator->createDocument(&collection);
@@ -135,9 +135,9 @@ void JsonStyleTranslatorTest::translatesStyleCollectionToJsonDocument()
 
     QJsonObject actualObject = actual.object().value("styles").toArray().first().toObject();
     QCOMPARE(actualObject["name"], expected["name"]);
-    //QCOMPARE(actualObject["description"], expected["description"]);
-    //QCOMPARE(actualObject["style"], expected["style"]);
-    //QCOMPARE(actualObject["cursorPosition"], expected["cursorPosition"]);
+    QCOMPARE(actualObject["markdownHighlighting"], expected["markdownHighlighting"]);
+    QCOMPARE(actualObject["codeHighlighting"], expected["codeHighlighting"]);
+    QCOMPARE(actualObject["previewStylesheet"], expected["previewStylesheet"]);
     QCOMPARE(actualObject["builtIn"], expected["builtIn"]);
 }
 

From 464295e289fc38cbd8e110d0da01405e2b8ea3bc Mon Sep 17 00:00:00 2001
From: Christian Loose <christian.loose@hamburg.de>
Date: Fri, 5 Dec 2014 17:11:43 +0100
Subject: [PATCH 20/34] Add missing include for QTextStream header

---
 app-static/jsonfile.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-static/jsonfile.h b/app-static/jsonfile.h
index ebc141b4..ffeb8c93 100644
--- a/app-static/jsonfile.h
+++ b/app-static/jsonfile.h
@@ -19,6 +19,7 @@
 
 #include <QFile>
 #include <QJsonDocument>
+#include <QTextStream>
 #include "collection.h"
 #include "jsontranslator.h"
 #include "jsontranslatorfactory.h"

From 94eb852a1b0bd97b01f612f1bb613482f86adf4c Mon Sep 17 00:00:00 2001
From: Christian Loose <christian.loose@hamburg.de>
Date: Fri, 5 Dec 2014 17:12:21 +0100
Subject: [PATCH 21/34] Load builtin HTML preview styles from JSON file

---
 app/builtin-htmlpreview-styles.json | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 app/builtin-htmlpreview-styles.json

diff --git a/app/builtin-htmlpreview-styles.json b/app/builtin-htmlpreview-styles.json
new file mode 100644
index 00000000..ad4b8624
--- /dev/null
+++ b/app/builtin-htmlpreview-styles.json
@@ -0,0 +1,11 @@
+{
+  "styles": [
+        {
+            "name": "Default",
+            "markdownHighlighting": "Default",
+            "codeHighlighting": "Default",
+            "previewStylesheet": "Default",
+            "builtIn": true
+        }
+  ]
+}

From 447acaee915071e7cef61eb186a3cdb4cc66f771 Mon Sep 17 00:00:00 2001
From: Christian Loose <Christian.Loose@hamburg.de>
Date: Fri, 5 Dec 2014 21:52:11 +0100
Subject: [PATCH 22/34] Load builtin styles from JSON files

---
 app-static/styles.cpp                | 36 ++++++++++++++++------------
 app/builtin-htmlpreview-styles.json  | 21 ++++++++++++++++
 app/builtin-presentation-styles.json | 12 ++++++++++
 app/resources.qrc                    |  2 ++
 4 files changed, 56 insertions(+), 15 deletions(-)
 create mode 100644 app/builtin-presentation-styles.json

diff --git a/app-static/styles.cpp b/app-static/styles.cpp
index ae5fcd92..e3cd52b2 100644
--- a/app-static/styles.cpp
+++ b/app-static/styles.cpp
@@ -16,6 +16,8 @@
  */
 #include "styles.h"
 
+#include <jsonfile.h>
+
 static const Style BUILTIN_DEFAULT_STYLE = Style("Default", "Default", "Default", "Default", true );
 static const Style BUILTIN_GITHUB_STYLE = Style("Github", "Default", "Github", "Github", true );
 static const Style BUILTIN_SOLARIZED_LIGHT_STYLE = Style("Solarized Light", "Solarized Light", "Solarized Light", "Solarized Light", true );
@@ -127,20 +129,24 @@ void Styles::setupBuiltinPreviewStylesheets()
 
 void Styles::setupBuiltinStyles()
 {
-    m_htmlPreviewStyles.insert(BUILTIN_DEFAULT_STYLE);
-    m_htmlPreviewStyles.insert(BUILTIN_GITHUB_STYLE);
-    m_htmlPreviewStyles.insert(BUILTIN_SOLARIZED_LIGHT_STYLE);
-    m_htmlPreviewStyles.insert(BUILTIN_SOLARIZED_DARK_STYLE);
-    m_htmlPreviewStyles.insert(BUILTIN_CLEARNESS_STYLE);
-    m_htmlPreviewStyles.insert(BUILTIN_CLEARNESS_DARK_STYLE);
-    m_htmlPreviewStyles.insert(BUILTIN_BYWORD_DARK_STYLE);
-
-    m_presentationStyles.insert(DEFAULT_PRESENTATION_STYLE);
-    m_presentationStyles.insert(BEIGE_PRESENTATION_STYLE);
-    m_presentationStyles.insert(SKY_PRESENTATION_STYLE);
-    m_presentationStyles.insert(NIGHT_PRESENTATION_STYLE);
-    m_presentationStyles.insert(SERIF_PRESENTATION_STYLE);
-    m_presentationStyles.insert(SIMPLE_PRESENTATION_STYLE);
-    m_presentationStyles.insert(SOLARIZED_PRESENTATION_STYLE);
+    if (!JsonFile<Style>::load(":/builtin-htmlpreview-styles.json", &m_htmlPreviewStyles)) {
+        m_htmlPreviewStyles.insert(BUILTIN_DEFAULT_STYLE);
+        m_htmlPreviewStyles.insert(BUILTIN_GITHUB_STYLE);
+        m_htmlPreviewStyles.insert(BUILTIN_SOLARIZED_LIGHT_STYLE);
+        m_htmlPreviewStyles.insert(BUILTIN_SOLARIZED_DARK_STYLE);
+        m_htmlPreviewStyles.insert(BUILTIN_CLEARNESS_STYLE);
+        m_htmlPreviewStyles.insert(BUILTIN_CLEARNESS_DARK_STYLE);
+        m_htmlPreviewStyles.insert(BUILTIN_BYWORD_DARK_STYLE);
+    }
+
+    if (!JsonFile<Style>::load(":/builtin-presentation-styles.json", &m_presentationStyles)) {
+        m_presentationStyles.insert(DEFAULT_PRESENTATION_STYLE);
+        m_presentationStyles.insert(BEIGE_PRESENTATION_STYLE);
+        m_presentationStyles.insert(SKY_PRESENTATION_STYLE);
+        m_presentationStyles.insert(NIGHT_PRESENTATION_STYLE);
+        m_presentationStyles.insert(SERIF_PRESENTATION_STYLE);
+        m_presentationStyles.insert(SIMPLE_PRESENTATION_STYLE);
+        m_presentationStyles.insert(SOLARIZED_PRESENTATION_STYLE);
+    }
 }
 
diff --git a/app/builtin-htmlpreview-styles.json b/app/builtin-htmlpreview-styles.json
index ad4b8624..4e9800ae 100644
--- a/app/builtin-htmlpreview-styles.json
+++ b/app/builtin-htmlpreview-styles.json
@@ -6,6 +6,27 @@
             "codeHighlighting": "Default",
             "previewStylesheet": "Default",
             "builtIn": true
+        },
+        {
+            "name": "Github",
+            "markdownHighlighting": "Default",
+            "codeHighlighting": "Github",
+            "previewStylesheet": "Github",
+            "builtIn": true
+        },
+        {
+            "name": "Solarized Light",
+            "markdownHighlighting": "Solarized Light",
+            "codeHighlighting": "Solarized Light",
+            "previewStylesheet": "Solarized Light",
+            "builtIn": true
+        },
+        {
+            "name": "Solarized Dark",
+            "markdownHighlighting": "Solarized Dark",
+            "codeHighlighting": "Solarized Dark",
+            "previewStylesheet": "Solarized Dark",
+            "builtIn": true
         }
   ]
 }
diff --git a/app/builtin-presentation-styles.json b/app/builtin-presentation-styles.json
new file mode 100644
index 00000000..d5f3021b
--- /dev/null
+++ b/app/builtin-presentation-styles.json
@@ -0,0 +1,12 @@
+{
+  "styles": [
+        {
+            "name": "Default Presentation",
+            "markdownHighlighting": "Default",
+            "codeHighlighting": "Default",
+            "previewStylesheet": "Default Presentation",
+            "builtIn": true
+        }
+  ]
+}
+
diff --git a/app/resources.qrc b/app/resources.qrc
index 997acbe0..684592de 100644
--- a/app/resources.qrc
+++ b/app/resources.qrc
@@ -30,6 +30,8 @@
         <file>syntax_es.html</file>
         <file>syntax_pt_BR.html</file>
         <file>template_presentation.html</file>
+        <file>builtin-htmlpreview-styles.json</file>
+        <file>builtin-presentation-styles.json</file>
     </qresource>
     <qresource prefix="/icons">
         <file alias="icon-close.png">images/icon-close.png</file>

From 87c657e76a68104d487ebbcbc7c5d29c179add6e Mon Sep 17 00:00:00 2001
From: Christian Loose <christian.loose@hamburg.de>
Date: Mon, 8 Dec 2014 14:15:24 +0100
Subject: [PATCH 23/34] Add all existing styles to JSON files

---
 app-static/styles.cpp                | 25 -----------------
 app/builtin-htmlpreview-styles.json  | 21 ++++++++++++++
 app/builtin-presentation-styles.json | 42 ++++++++++++++++++++++++++++
 3 files changed, 63 insertions(+), 25 deletions(-)

diff --git a/app-static/styles.cpp b/app-static/styles.cpp
index e3cd52b2..1b06558f 100644
--- a/app-static/styles.cpp
+++ b/app-static/styles.cpp
@@ -19,20 +19,7 @@
 #include <jsonfile.h>
 
 static const Style BUILTIN_DEFAULT_STYLE = Style("Default", "Default", "Default", "Default", true );
-static const Style BUILTIN_GITHUB_STYLE = Style("Github", "Default", "Github", "Github", true );
-static const Style BUILTIN_SOLARIZED_LIGHT_STYLE = Style("Solarized Light", "Solarized Light", "Solarized Light", "Solarized Light", true );
-static const Style BUILTIN_SOLARIZED_DARK_STYLE = Style("Solarized Dark", "Solarized Dark", "Solarized Dark", "Solarized Dark", true );
-static const Style BUILTIN_CLEARNESS_STYLE = Style("Clearness", "Default", "Default", "Clearness", true );
-static const Style BUILTIN_CLEARNESS_DARK_STYLE = Style("Clearness Dark", "Clearness Dark", "Default", "Clearness Dark", true );
-static const Style BUILTIN_BYWORD_DARK_STYLE = Style("Byword Dark", "Byword Dark", "Default", "Byword Dark", true );
-
 static const Style DEFAULT_PRESENTATION_STYLE = Style("Default Presentation", "Default", "Default", "Default Presentation", true );
-static const Style BEIGE_PRESENTATION_STYLE = Style("Beige", "Default", "Default", "Beige", true );
-static const Style SKY_PRESENTATION_STYLE = Style("Sky", "Default", "Default", "Sky", true );
-static const Style NIGHT_PRESENTATION_STYLE = Style("Night", "Default", "Default", "Night", true );
-static const Style SERIF_PRESENTATION_STYLE = Style("Serif", "Default", "Default", "Serif", true );
-static const Style SIMPLE_PRESENTATION_STYLE = Style("Simple", "Default", "Default", "Simple", true );
-static const Style SOLARIZED_PRESENTATION_STYLE = Style("Solarized", "Solarized Light", "Default", "Solarized", true);
 
 
 Styles::Styles() 
@@ -131,22 +118,10 @@ void Styles::setupBuiltinStyles()
 {
     if (!JsonFile<Style>::load(":/builtin-htmlpreview-styles.json", &m_htmlPreviewStyles)) {
         m_htmlPreviewStyles.insert(BUILTIN_DEFAULT_STYLE);
-        m_htmlPreviewStyles.insert(BUILTIN_GITHUB_STYLE);
-        m_htmlPreviewStyles.insert(BUILTIN_SOLARIZED_LIGHT_STYLE);
-        m_htmlPreviewStyles.insert(BUILTIN_SOLARIZED_DARK_STYLE);
-        m_htmlPreviewStyles.insert(BUILTIN_CLEARNESS_STYLE);
-        m_htmlPreviewStyles.insert(BUILTIN_CLEARNESS_DARK_STYLE);
-        m_htmlPreviewStyles.insert(BUILTIN_BYWORD_DARK_STYLE);
     }
 
     if (!JsonFile<Style>::load(":/builtin-presentation-styles.json", &m_presentationStyles)) {
         m_presentationStyles.insert(DEFAULT_PRESENTATION_STYLE);
-        m_presentationStyles.insert(BEIGE_PRESENTATION_STYLE);
-        m_presentationStyles.insert(SKY_PRESENTATION_STYLE);
-        m_presentationStyles.insert(NIGHT_PRESENTATION_STYLE);
-        m_presentationStyles.insert(SERIF_PRESENTATION_STYLE);
-        m_presentationStyles.insert(SIMPLE_PRESENTATION_STYLE);
-        m_presentationStyles.insert(SOLARIZED_PRESENTATION_STYLE);
     }
 }
 
diff --git a/app/builtin-htmlpreview-styles.json b/app/builtin-htmlpreview-styles.json
index 4e9800ae..ba3d4e93 100644
--- a/app/builtin-htmlpreview-styles.json
+++ b/app/builtin-htmlpreview-styles.json
@@ -27,6 +27,27 @@
             "codeHighlighting": "Solarized Dark",
             "previewStylesheet": "Solarized Dark",
             "builtIn": true
+        },
+        {
+            "name": "Clearness",
+            "markdownHighlighting": "Default",
+            "codeHighlighting": "Default",
+            "previewStylesheet": "Clearness",
+            "builtIn": true
+        },
+        {
+            "name": "Clearness Dark",
+            "markdownHighlighting": "Clearness Dark",
+            "codeHighlighting": "Default",
+            "previewStylesheet": "Clearness Dark",
+            "builtIn": true
+        },
+        {
+            "name": "Byword Dark",
+            "markdownHighlighting": "Byword Dark",
+            "codeHighlighting": "Default",
+            "previewStylesheet": "Byword Dark",
+            "builtIn": true
         }
   ]
 }
diff --git a/app/builtin-presentation-styles.json b/app/builtin-presentation-styles.json
index d5f3021b..1f37558f 100644
--- a/app/builtin-presentation-styles.json
+++ b/app/builtin-presentation-styles.json
@@ -6,6 +6,48 @@
             "codeHighlighting": "Default",
             "previewStylesheet": "Default Presentation",
             "builtIn": true
+        },
+        {
+            "name": "Beige",
+            "markdownHighlighting": "Default",
+            "codeHighlighting": "Default",
+            "previewStylesheet": "Beige",
+            "builtIn": true
+        },
+        {
+            "name": "Sky",
+            "markdownHighlighting": "Default",
+            "codeHighlighting": "Default",
+            "previewStylesheet": "Sky",
+            "builtIn": true
+        },
+        {
+            "name": "Night",
+            "markdownHighlighting": "Default",
+            "codeHighlighting": "Default",
+            "previewStylesheet": "Night",
+            "builtIn": true
+        },
+        {
+            "name": "Serif",
+            "markdownHighlighting": "Default",
+            "codeHighlighting": "Default",
+            "previewStylesheet": "Serif",
+            "builtIn": true
+        },
+        {
+            "name": "Simple",
+            "markdownHighlighting": "Default",
+            "codeHighlighting": "Default",
+            "previewStylesheet": "Simple",
+            "builtIn": true
+        },
+        {
+            "name": "Solarized",
+            "markdownHighlighting": "Solarized Light",
+            "codeHighlighting": "Default",
+            "previewStylesheet": "Solarized",
+            "builtIn": true
         }
   ]
 }

From 5bdc5745dd763307e116f0fef77cefb9cb8b2a6c Mon Sep 17 00:00:00 2001
From: Christian Loose <christian.loose@hamburg.de>
Date: Mon, 8 Dec 2014 20:17:09 +0100
Subject: [PATCH 24/34] Starting to rework styles tab on OptionsDialog

---
 app/app.pro           |   9 ++--
 app/optionsdialog.cpp |  26 +++++++---
 app/optionsdialog.h   |   3 ++
 app/optionsdialog.ui  | 112 +++++++++++++++++++++++++++++-------------
 app/styledialog.cpp   |  53 ++++++++++++++++++++
 app/styledialog.h     |  43 ++++++++++++++++
 app/styledialog.ui    | 108 ++++++++++++++++++++++++++++++++++++++++
 7 files changed, 312 insertions(+), 42 deletions(-)
 create mode 100644 app/styledialog.cpp
 create mode 100644 app/styledialog.h
 create mode 100644 app/styledialog.ui

diff --git a/app/app.pro b/app/app.pro
index 12dfb4ac..fce1cf83 100644
--- a/app/app.pro
+++ b/app/app.pro
@@ -56,7 +56,8 @@ SOURCES += \
     tabletooldialog.cpp \
     imagetooldialog.cpp \
     snippetcompleter.cpp \
-    aboutdialog.cpp
+    aboutdialog.cpp \
+    styledialog.cpp
 
 win32 {
     SOURCES += \
@@ -92,7 +93,8 @@ HEADERS  += \
     tabletooldialog.h \
     imagetooldialog.h \
     snippetcompleter.h \
-    aboutdialog.h
+    aboutdialog.h \
+    styledialog.h
 
 FORMS    += \
     mainwindow.ui \
@@ -103,7 +105,8 @@ FORMS    += \
     optionsdialog.ui \
     tabletooldialog.ui \
     imagetooldialog.ui \
-    aboutdialog.ui
+    aboutdialog.ui \
+    styledialog.ui
 
 RESOURCES += \
     resources.qrc \
diff --git a/app/optionsdialog.cpp b/app/optionsdialog.cpp
index 7c3b212e..bda978ac 100644
--- a/app/optionsdialog.cpp
+++ b/app/optionsdialog.cpp
@@ -30,8 +30,10 @@
 
 #include <snippets/snippetcollection.h>
 #include "options.h"
+#include "styledialog.h"
 #include "styles.h"
 
+
 class SnippetsTableModel : public QAbstractTableModel
 {
     Q_OBJECT
@@ -299,9 +301,6 @@ OptionsDialog::OptionsDialog(Options *opt, SnippetCollection *collection, const
 
     Styles *styles = new Styles();
     ui->htmlPreviewStylesComboBox->addItems(styles->htmlPreviewStyleNames());
-    ui->markdownHighlightingComboBox->addItems(styles->markdownHighlightings());
-    ui->codeHighlightingComboBox->addItems(styles->codeHighlightings());
-    ui->previewStylesheetComboBox->addItems(styles->previewStylesheets());
     ui->presentationStylesComboBox->addItems(styles->presentationStyleNames());
     ui->presentationMarkdownHighlightingComboBox->addItems(styles->markdownHighlightings());
     ui->presentationStylesheetComboBox->addItems(styles->previewStylesheets());
@@ -440,9 +439,8 @@ void OptionsDialog::currentHtmlPreviewStyleChanged(const QString &styleName)
 {
     Styles *styles = new Styles();
     Style htmlPreviewStyle = styles->style(styleName);
-    ui->markdownHighlightingComboBox->setCurrentText(htmlPreviewStyle.markdownHighlighting);
-    ui->codeHighlightingComboBox->setCurrentText(htmlPreviewStyle.codeHighlighting);
-    ui->previewStylesheetComboBox->setCurrentText(htmlPreviewStyle.previewStylesheet);
+    ui->editHtmlStyleButton->setEnabled(!htmlPreviewStyle.builtIn);
+    ui->removeHtmlStyleButton->setEnabled(!htmlPreviewStyle.builtIn);
 }
 
 void OptionsDialog::currentPresentationStyleChanged(const QString &styleName)
@@ -453,6 +451,22 @@ void OptionsDialog::currentPresentationStyleChanged(const QString &styleName)
     ui->presentationStylesheetComboBox->setCurrentText(presentationStyle.previewStylesheet);
 }
 
+void OptionsDialog::addHtmlStyleButtonClicked()
+{
+    StyleDialog dialog(QString(), this);
+    dialog.exec();
+}
+
+void OptionsDialog::editHtmlStyleButtonClicked()
+{
+    StyleDialog dialog(ui->htmlPreviewStylesComboBox->currentText(), this);
+    dialog.exec();
+}
+
+void OptionsDialog::removeHtmlStyleButtonClicked()
+{
+}
+
 void OptionsDialog::setupShortcutsTable()
 {
     QStyledItemDelegate *delegate = new QStyledItemDelegate(ui->shortcutsTable);
diff --git a/app/optionsdialog.h b/app/optionsdialog.h
index 9a6ea49e..8afaefa9 100644
--- a/app/optionsdialog.h
+++ b/app/optionsdialog.h
@@ -46,6 +46,9 @@ private slots:
     void validateShortcut(int row, int column);
     void currentHtmlPreviewStyleChanged(const QString &styleName);
     void currentPresentationStyleChanged(const QString &styleName);
+    void addHtmlStyleButtonClicked();
+    void editHtmlStyleButtonClicked();
+    void removeHtmlStyleButtonClicked();
 
 private:
     void setupShortcutsTable();
diff --git a/app/optionsdialog.ui b/app/optionsdialog.ui
index 724eab4f..d1a8dd7e 100644
--- a/app/optionsdialog.ui
+++ b/app/optionsdialog.ui
@@ -17,7 +17,7 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>6</number>
      </property>
      <widget class="QWidget" name="generalTab">
       <attribute name="title">
@@ -496,40 +496,35 @@
          <property name="title">
           <string>HTML Preview Styles</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout_3">
-          <item row="2" column="0">
-           <widget class="QLabel" name="label_4">
-            <property name="text">
-             <string>Code Highlighting:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="1">
-           <widget class="QComboBox" name="codeHighlightingComboBox"/>
-          </item>
-          <item row="1" column="1">
-           <widget class="QComboBox" name="markdownHighlightingComboBox"/>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="label_3">
-            <property name="text">
-             <string>Markdown Highlighting:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="0">
-           <widget class="QLabel" name="label_5">
-            <property name="text">
-             <string>Preview Stylesheet:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="1">
-           <widget class="QComboBox" name="previewStylesheetComboBox"/>
-          </item>
-          <item row="0" column="0">
+         <layout class="QHBoxLayout" name="horizontalLayout_5">
+          <item>
            <widget class="QComboBox" name="htmlPreviewStylesComboBox"/>
           </item>
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout_4">
+            <item>
+             <widget class="QPushButton" name="addHtmlStyleButton">
+              <property name="text">
+               <string>Add...</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QPushButton" name="removeHtmlStyleButton">
+              <property name="text">
+               <string>Edit...</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QPushButton" name="editHtmlStyleButton">
+              <property name="text">
+               <string>Remove</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
          </layout>
         </widget>
        </item>
@@ -676,9 +671,60 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>addHtmlStyleButton</sender>
+   <signal>clicked()</signal>
+   <receiver>OptionsDialog</receiver>
+   <slot>addHtmlStyleButtonClicked()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>403</x>
+     <y>75</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>349</x>
+     <y>249</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>editHtmlStyleButton</sender>
+   <signal>clicked()</signal>
+   <receiver>OptionsDialog</receiver>
+   <slot>editHtmlStyleButtonClicked()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>616</x>
+     <y>75</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>349</x>
+     <y>249</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>removeHtmlStyleButton</sender>
+   <signal>clicked()</signal>
+   <receiver>OptionsDialog</receiver>
+   <slot>removeHtmlStyleButtonClicked()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>509</x>
+     <y>75</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>349</x>
+     <y>249</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
  <slots>
   <slot>addSnippetButtonClicked()</slot>
   <slot>removeSnippetButtonClicked()</slot>
+  <slot>addHtmlStyleButtonClicked()</slot>
+  <slot>editHtmlStyleButtonClicked()</slot>
+  <slot>removeHtmlStyleButtonClicked()</slot>
  </slots>
 </ui>
diff --git a/app/styledialog.cpp b/app/styledialog.cpp
new file mode 100644
index 00000000..2bf1c53d
--- /dev/null
+++ b/app/styledialog.cpp
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2014 Christian Loose <christian.loose@hamburg.de>
+ *
+ * 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 program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "styledialog.h"
+#include "ui_styledialog.h"
+
+#include <styles/style.h>
+#include <styles.h>
+
+
+StyleDialog::StyleDialog(const QString &styleName, QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::StyleDialog)
+{
+    ui->setupUi(this);
+
+    Styles styles;
+    ui->markdownHighlightingComboBox->addItems(styles.htmlPreviewStyleNames());
+    ui->codeHighlightingComboBox->addItems(styles.codeHighlightings());
+    ui->previewStylesheetComboBox->addItems(styles.previewStylesheets());
+
+    if (!styleName.isEmpty()) {
+        Style style = styles.style(styleName);
+        ui->styleNameLineEdit->setText(styleName);
+    }
+}
+
+StyleDialog::~StyleDialog()
+{
+    delete ui;
+}
+
+void StyleDialog::done(int result)
+{
+    if (result == QDialog::Accepted) {
+    }
+
+    QDialog::done(result);
+}
+
diff --git a/app/styledialog.h b/app/styledialog.h
new file mode 100644
index 00000000..e47698ad
--- /dev/null
+++ b/app/styledialog.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2014 Christian Loose <christian.loose@hamburg.de>
+ *
+ * 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 program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef STYLEDIALOG_H
+#define STYLEDIALOG_H
+
+#include <QDialog>
+
+namespace Ui {
+class StyleDialog;
+}
+
+
+class StyleDialog : public QDialog
+{
+    Q_OBJECT
+    
+public:
+    explicit StyleDialog(const QString &styleName, QWidget *parent = 0);
+    ~StyleDialog();
+
+protected:
+    void done(int result);
+
+private:
+    Ui::StyleDialog *ui;
+};
+
+#endif // STYLEDIALOG_H
+
diff --git a/app/styledialog.ui b/app/styledialog.ui
new file mode 100644
index 00000000..cfb67a21
--- /dev/null
+++ b/app/styledialog.ui
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>StyleDialog</class>
+ <widget class="QDialog" name="StyleDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>398</width>
+    <height>147</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QFormLayout" name="formLayout">
+     <item row="1" column="0">
+      <widget class="QLabel" name="label_3">
+       <property name="text">
+        <string>Markdown Highlighting:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QComboBox" name="markdownHighlightingComboBox"/>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="label_4">
+       <property name="text">
+        <string>Code Highlighting:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QComboBox" name="codeHighlightingComboBox"/>
+     </item>
+     <item row="3" column="0">
+      <widget class="QLabel" name="label_5">
+       <property name="text">
+        <string>Preview Stylesheet:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1">
+      <widget class="QComboBox" name="previewStylesheetComboBox"/>
+     </item>
+     <item row="0" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Style Name:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QLineEdit" name="styleNameLineEdit"/>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>StyleDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>StyleDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

From 6077e915977fe7beae58d9a3f9af05f30d1865d8 Mon Sep 17 00:00:00 2001
From: Christian Loose <christian.loose@hamburg.de>
Date: Wed, 10 Dec 2014 20:10:01 +0100
Subject: [PATCH 25/34] Some more progress on style dialog

---
 app-static/styles.cpp |  5 +++++
 app-static/styles.h   |  1 +
 app/styledialog.cpp   | 14 ++++++++++++++
 app/styledialog.h     |  3 +++
 app/styledialog.ui    | 19 +++++++++++++++++++
 5 files changed, 42 insertions(+)

diff --git a/app-static/styles.cpp b/app-static/styles.cpp
index 1b06558f..f044e2bb 100644
--- a/app-static/styles.cpp
+++ b/app-static/styles.cpp
@@ -48,6 +48,11 @@ Style Styles::style(const QString &name) const
         return m_presentationStyles.style(name);
 }
 
+void Styles::addHtmlPreviewStyle(const Style &style)
+{
+    m_htmlPreviewStyles.insert(style);
+}
+
 QStringList Styles::markdownHighlightings() const 
 {
     return QStringList(m_markdownHighlightings.keys());
diff --git a/app-static/styles.h b/app-static/styles.h
index 719701dd..333a6f6a 100644
--- a/app-static/styles.h
+++ b/app-static/styles.h
@@ -33,6 +33,7 @@ class Styles
     QStringList htmlPreviewStyleNames() const;
     QStringList presentationStyleNames() const;
     Style style(const QString &name) const;
+    void addHtmlPreviewStyle(const Style &style);
 
     QStringList markdownHighlightings() const;
     QString pathForMarkdownHighlighting(const Style &style) const;
diff --git a/app/styledialog.cpp b/app/styledialog.cpp
index 2bf1c53d..1e9963c9 100644
--- a/app/styledialog.cpp
+++ b/app/styledialog.cpp
@@ -17,6 +17,8 @@
 #include "styledialog.h"
 #include "ui_styledialog.h"
 
+#include <QPushButton>
+
 #include <styles/style.h>
 #include <styles.h>
 
@@ -36,6 +38,8 @@ StyleDialog::StyleDialog(const QString &styleName, QWidget *parent) :
         Style style = styles.style(styleName);
         ui->styleNameLineEdit->setText(styleName);
     }
+
+    updateOkButtonEnabledState();
 }
 
 StyleDialog::~StyleDialog()
@@ -46,8 +50,18 @@ StyleDialog::~StyleDialog()
 void StyleDialog::done(int result)
 {
     if (result == QDialog::Accepted) {
+        Style newStyle;
+        newStyle.name = ui->styleNameLineEdit->text();
+
+        Styles styles;
+        styles.addHtmlPreviewStyle(newStyle);
     }
 
     QDialog::done(result);
 }
 
+void StyleDialog::updateOkButtonEnabledState()
+{
+    bool isNameEditFilled = !ui->styleNameLineEdit->text().isEmpty();
+    ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(isNameEditFilled);
+}
diff --git a/app/styledialog.h b/app/styledialog.h
index e47698ad..d7b20af6 100644
--- a/app/styledialog.h
+++ b/app/styledialog.h
@@ -35,6 +35,9 @@ class StyleDialog : public QDialog
 protected:
     void done(int result);
 
+private slots:
+    void updateOkButtonEnabledState();
+
 private:
     Ui::StyleDialog *ui;
 };
diff --git a/app/styledialog.ui b/app/styledialog.ui
index cfb67a21..d02cf5b2 100644
--- a/app/styledialog.ui
+++ b/app/styledialog.ui
@@ -104,5 +104,24 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>styleNameLineEdit</sender>
+   <signal>textChanged(QString)</signal>
+   <receiver>StyleDialog</receiver>
+   <slot>updateOkButtonEnabledState()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>257</x>
+     <y>19</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>198</x>
+     <y>73</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
+ <slots>
+  <slot>updateOkButtonEnabledState()</slot>
+ </slots>
 </ui>

From c3a199292100615a986e4e78c463ba9f48474170 Mon Sep 17 00:00:00 2001
From: Christian Loose <christian.loose@hamburg.de>
Date: Thu, 11 Dec 2014 16:45:15 +0100
Subject: [PATCH 26/34] Add update() and remove() method to Collection<T>
 interface and StyleCollection

---
 app-static/collection.h               |  3 +++
 app-static/styles/stylecollection.cpp | 11 +++++++++++
 app-static/styles/stylecollection.h   |  2 ++
 3 files changed, 16 insertions(+)

diff --git a/app-static/collection.h b/app-static/collection.h
index 54736e54..700a9812 100644
--- a/app-static/collection.h
+++ b/app-static/collection.h
@@ -24,6 +24,9 @@ class Collection
     virtual ~Collection() {}
 
     virtual int insert(const T &item) = 0;
+    virtual void update(const T &item) = 0;
+    virtual void remove(const T &item) = 0;
+
     virtual int count() const = 0;
     virtual const T &at(int offset) const = 0;
 };
diff --git a/app-static/styles/stylecollection.cpp b/app-static/styles/stylecollection.cpp
index 18a47f21..e16948b9 100644
--- a/app-static/styles/stylecollection.cpp
+++ b/app-static/styles/stylecollection.cpp
@@ -28,6 +28,17 @@ int StyleCollection::insert(const Style &style)
     return count(); 
 }
 
+void StyleCollection::update(const Style &style)
+{
+    styles.replace(stylesIndex.indexOf(style.name), style);
+}
+
+void StyleCollection::remove(const Style &style)
+{
+    styles.removeAt(stylesIndex.indexOf(style.name));
+    stylesIndex.removeOne(style.name);
+}
+
 int StyleCollection::count() const
 {
     return styles.count();
diff --git a/app-static/styles/stylecollection.h b/app-static/styles/stylecollection.h
index 234c427b..0b3916fc 100644
--- a/app-static/styles/stylecollection.h
+++ b/app-static/styles/stylecollection.h
@@ -29,6 +29,8 @@ class StyleCollection : public Collection<Style>
     StyleCollection();
 
     int insert(const Style &style);
+    void update(const Style &style);
+    void remove(const Style &style);
 
     int count() const;
     const Style &at(int offset) const;

From bb3cb261baa63675f9cbb68d23011ed799a6d565 Mon Sep 17 00:00:00 2001
From: Christian Loose <christian.loose@hamburg.de>
Date: Thu, 11 Dec 2014 16:47:00 +0100
Subject: [PATCH 27/34] It's now possible to add/edit/remove HTML preview
 styles via the options dialog

---
 app-static/styles.cpp | 54 ++++++++++++++++++++++++---------
 app-static/styles.h   | 14 +++++----
 app/optionsdialog.cpp | 27 +++++++++++++++--
 app/optionsdialog.ui  | 12 ++++----
 app/styledialog.cpp   | 70 +++++++++++++++++++++++++++++++++++--------
 app/styledialog.h     | 16 +++++++++-
 6 files changed, 151 insertions(+), 42 deletions(-)

diff --git a/app-static/styles.cpp b/app-static/styles.cpp
index f044e2bb..10591af0 100644
--- a/app-static/styles.cpp
+++ b/app-static/styles.cpp
@@ -16,41 +16,60 @@
  */
 #include "styles.h"
 
+#include <QSharedPointer>
 #include <jsonfile.h>
 
 static const Style BUILTIN_DEFAULT_STYLE = Style("Default", "Default", "Default", "Default", true );
 static const Style DEFAULT_PRESENTATION_STYLE = Style("Default Presentation", "Default", "Default", "Default Presentation", true );
 
+QMap<QString, QString> Styles::m_markdownHighlightings;
+QMap<QString, QString> Styles::m_codeHighlightings;
+QMap<QString, QString> Styles::m_previewStylesheets;
+QSharedPointer<StyleCollection> Styles::m_htmlPreviewStyles;
+QSharedPointer<StyleCollection> Styles::m_presentationStyles;
 
 Styles::Styles() 
 {
-    setupBuiltinMarkdownHighlightings();
-    setupBuiltinCodeHighlightings();
-    setupBuiltinPreviewStylesheets();
-    setupBuiltinStyles();
+    if (m_htmlPreviewStyles.isNull()) {
+        setupBuiltinMarkdownHighlightings();
+        setupBuiltinCodeHighlightings();
+        setupBuiltinPreviewStylesheets();
+        setupBuiltinStyles();
+    }
 }
 
 QStringList Styles::htmlPreviewStyleNames() const 
 {
-    return m_htmlPreviewStyles.styleNames();
+    return m_htmlPreviewStyles->styleNames();
 }
 
 QStringList Styles::presentationStyleNames() const
 {
-    return m_presentationStyles.styleNames();
+    return m_presentationStyles->styleNames();
 }
 
 Style Styles::style(const QString &name) const
 {
-    if (m_htmlPreviewStyles.contains(name))
-        return m_htmlPreviewStyles.style(name);
+    if (m_htmlPreviewStyles->contains(name))
+        return m_htmlPreviewStyles->style(name);
     else
-        return m_presentationStyles.style(name);
+        return m_presentationStyles->style(name);
 }
 
 void Styles::addHtmlPreviewStyle(const Style &style)
 {
-    m_htmlPreviewStyles.insert(style);
+    m_htmlPreviewStyles->insert(style);
+}
+
+void Styles::updateHtmlPreviewStyle(const Style &style)
+{
+    m_htmlPreviewStyles->update(style);
+}
+
+void Styles::removeHtmlPreviewStyle(const QString &styleName)
+{
+    Style style = this->style(styleName);
+    m_htmlPreviewStyles->remove(style);
 }
 
 QStringList Styles::markdownHighlightings() const 
@@ -83,6 +102,11 @@ QString Styles::pathForPreviewStylesheet(const Style &style) const
     return m_previewStylesheets[style.previewStylesheet];
 }
 
+QSharedPointer<StyleCollection> Styles::htmlPreviewStyles() const
+{
+    return m_htmlPreviewStyles;
+}
+
 void Styles::setupBuiltinMarkdownHighlightings() 
 {
     m_markdownHighlightings.insert("Default", ":/theme/default.txt");
@@ -121,12 +145,14 @@ void Styles::setupBuiltinPreviewStylesheets()
 
 void Styles::setupBuiltinStyles()
 {
-    if (!JsonFile<Style>::load(":/builtin-htmlpreview-styles.json", &m_htmlPreviewStyles)) {
-        m_htmlPreviewStyles.insert(BUILTIN_DEFAULT_STYLE);
+    m_htmlPreviewStyles = QSharedPointer<StyleCollection>::create();
+    if (!JsonFile<Style>::load(":/builtin-htmlpreview-styles.json", m_htmlPreviewStyles.data())) {
+        m_htmlPreviewStyles->insert(BUILTIN_DEFAULT_STYLE);
     }
 
-    if (!JsonFile<Style>::load(":/builtin-presentation-styles.json", &m_presentationStyles)) {
-        m_presentationStyles.insert(DEFAULT_PRESENTATION_STYLE);
+    m_presentationStyles = QSharedPointer<StyleCollection>::create();
+    if (!JsonFile<Style>::load(":/builtin-presentation-styles.json", m_presentationStyles.data())) {
+        m_presentationStyles->insert(DEFAULT_PRESENTATION_STYLE);
     }
 }
 
diff --git a/app-static/styles.h b/app-static/styles.h
index 333a6f6a..586f99b8 100644
--- a/app-static/styles.h
+++ b/app-static/styles.h
@@ -34,6 +34,8 @@ class Styles
     QStringList presentationStyleNames() const;
     Style style(const QString &name) const;
     void addHtmlPreviewStyle(const Style &style);
+    void updateHtmlPreviewStyle(const Style &style);
+    void removeHtmlPreviewStyle(const QString &styleName);
 
     QStringList markdownHighlightings() const;
     QString pathForMarkdownHighlighting(const Style &style) const;
@@ -44,17 +46,19 @@ class Styles
     QStringList previewStylesheets() const;
     QString pathForPreviewStylesheet(const Style &style) const;
 
+    QSharedPointer<StyleCollection> htmlPreviewStyles() const;
+
 private:
     void setupBuiltinMarkdownHighlightings();
     void setupBuiltinCodeHighlightings();
     void setupBuiltinPreviewStylesheets();
     void setupBuiltinStyles();
 
-    QMap<QString, QString> m_markdownHighlightings;
-    QMap<QString, QString> m_codeHighlightings;
-    QMap<QString, QString> m_previewStylesheets;
-    StyleCollection m_htmlPreviewStyles;
-    StyleCollection m_presentationStyles;
+    static QMap<QString, QString> m_markdownHighlightings;
+    static QMap<QString, QString> m_codeHighlightings;
+    static QMap<QString, QString> m_previewStylesheets;
+    static QSharedPointer<StyleCollection> m_htmlPreviewStyles;
+    static QSharedPointer<StyleCollection> m_presentationStyles;
 };
 
 #endif // STYLES_H
diff --git a/app/optionsdialog.cpp b/app/optionsdialog.cpp
index bda978ac..cedfa2e3 100644
--- a/app/optionsdialog.cpp
+++ b/app/optionsdialog.cpp
@@ -257,6 +257,8 @@ class KeySequenceEditFactory : public QItemEditorCreatorBase
 };
 
 
+#include <QDebug>
+
 OptionsDialog::OptionsDialog(Options *opt, SnippetCollection *collection, const QList<QAction*> &acts, QWidget *parent) :
     QDialog(parent),
     ui(new Ui::OptionsDialog),
@@ -437,6 +439,9 @@ void OptionsDialog::validateShortcut(int row, int column)
 
 void OptionsDialog::currentHtmlPreviewStyleChanged(const QString &styleName)
 {
+    if (styleName.isEmpty()) return;
+    qDebug() << "currentHtmlPreviewStyleChanged" << styleName;
+
     Styles *styles = new Styles();
     Style htmlPreviewStyle = styles->style(styleName);
     ui->editHtmlStyleButton->setEnabled(!htmlPreviewStyle.builtIn);
@@ -445,6 +450,8 @@ void OptionsDialog::currentHtmlPreviewStyleChanged(const QString &styleName)
 
 void OptionsDialog::currentPresentationStyleChanged(const QString &styleName)
 {
+    if (styleName.isEmpty()) return;
+    qDebug() << "currentPresentationStyleChanged" << styleName;
     Styles *styles = new Styles();
     Style presentationStyle = styles->style(styleName);
     ui->presentationMarkdownHighlightingComboBox->setCurrentText(presentationStyle.markdownHighlighting);
@@ -453,18 +460,32 @@ void OptionsDialog::currentPresentationStyleChanged(const QString &styleName)
 
 void OptionsDialog::addHtmlStyleButtonClicked()
 {
-    StyleDialog dialog(QString(), this);
-    dialog.exec();
+    StyleDialog dialog(StyleDialog::AddMode, QString(), this);
+    if (dialog.exec() == QDialog::Accepted) {
+        qDebug() << "addHtmlStyleButtonClicked" << "ACCEPTED";
+        Styles *styles = new Styles();
+        ui->htmlPreviewStylesComboBox->clear();
+        qDebug() << "addHtmlStyleButtonClicked" << "ACCEPTED" << "1";
+        ui->htmlPreviewStylesComboBox->addItems(styles->htmlPreviewStyleNames());
+    }
 }
 
 void OptionsDialog::editHtmlStyleButtonClicked()
 {
-    StyleDialog dialog(ui->htmlPreviewStylesComboBox->currentText(), this);
+    StyleDialog dialog(StyleDialog::EditMode, ui->htmlPreviewStylesComboBox->currentText(), this);
     dialog.exec();
 }
 
 void OptionsDialog::removeHtmlStyleButtonClicked()
 {
+    StyleDialog dialog(StyleDialog::RemoveMode, ui->htmlPreviewStylesComboBox->currentText(), this);
+    if (dialog.exec() == QDialog::Accepted) {
+        qDebug() << "removeHtmlStyleButtonClicked" << "ACCEPTED";
+        Styles *styles = new Styles();
+        ui->htmlPreviewStylesComboBox->clear();
+        qDebug() << "removeHtmlStyleButtonClicked" << "ACCEPTED" << "1";
+        ui->htmlPreviewStylesComboBox->addItems(styles->htmlPreviewStyleNames());
+    }
 }
 
 void OptionsDialog::setupShortcutsTable()
diff --git a/app/optionsdialog.ui b/app/optionsdialog.ui
index d1a8dd7e..6d13ab6f 100644
--- a/app/optionsdialog.ui
+++ b/app/optionsdialog.ui
@@ -510,14 +510,14 @@
              </widget>
             </item>
             <item>
-             <widget class="QPushButton" name="removeHtmlStyleButton">
+             <widget class="QPushButton" name="editHtmlStyleButton">
               <property name="text">
                <string>Edit...</string>
               </property>
              </widget>
             </item>
             <item>
-             <widget class="QPushButton" name="editHtmlStyleButton">
+             <widget class="QPushButton" name="removeHtmlStyleButton">
               <property name="text">
                <string>Remove</string>
               </property>
@@ -688,10 +688,10 @@
    </hints>
   </connection>
   <connection>
-   <sender>editHtmlStyleButton</sender>
+   <sender>removeHtmlStyleButton</sender>
    <signal>clicked()</signal>
    <receiver>OptionsDialog</receiver>
-   <slot>editHtmlStyleButtonClicked()</slot>
+   <slot>removeHtmlStyleButtonClicked()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>616</x>
@@ -704,10 +704,10 @@
    </hints>
   </connection>
   <connection>
-   <sender>removeHtmlStyleButton</sender>
+   <sender>editHtmlStyleButton</sender>
    <signal>clicked()</signal>
    <receiver>OptionsDialog</receiver>
-   <slot>removeHtmlStyleButtonClicked()</slot>
+   <slot>editHtmlStyleButtonClicked()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>509</x>
diff --git a/app/styledialog.cpp b/app/styledialog.cpp
index 1e9963c9..21af14c3 100644
--- a/app/styledialog.cpp
+++ b/app/styledialog.cpp
@@ -23,20 +23,24 @@
 #include <styles.h>
 
 
-StyleDialog::StyleDialog(const QString &styleName, QWidget *parent) :
+StyleDialog::StyleDialog(DialogMode mode, const QString &styleName, QWidget *parent) :
     QDialog(parent),
-    ui(new Ui::StyleDialog)
+    ui(new Ui::StyleDialog),
+    styles(new Styles()),
+    dialogMode(mode)
 {
     ui->setupUi(this);
 
-    Styles styles;
-    ui->markdownHighlightingComboBox->addItems(styles.htmlPreviewStyleNames());
-    ui->codeHighlightingComboBox->addItems(styles.codeHighlightings());
-    ui->previewStylesheetComboBox->addItems(styles.previewStylesheets());
+    ui->markdownHighlightingComboBox->addItems(styles->markdownHighlightings());
+    ui->codeHighlightingComboBox->addItems(styles->codeHighlightings());
+    ui->previewStylesheetComboBox->addItems(styles->previewStylesheets());
 
     if (!styleName.isEmpty()) {
-        Style style = styles.style(styleName);
+        Style style = styles->style(styleName);
         ui->styleNameLineEdit->setText(styleName);
+        ui->markdownHighlightingComboBox->setCurrentText(style.markdownHighlighting);
+        ui->codeHighlightingComboBox->setCurrentText(style.codeHighlighting);
+        ui->previewStylesheetComboBox->setCurrentText(style.previewStylesheet);
     }
 
     updateOkButtonEnabledState();
@@ -44,17 +48,27 @@ StyleDialog::StyleDialog(const QString &styleName, QWidget *parent) :
 
 StyleDialog::~StyleDialog()
 {
+    delete styles;
     delete ui;
 }
 
 void StyleDialog::done(int result)
 {
     if (result == QDialog::Accepted) {
-        Style newStyle;
-        newStyle.name = ui->styleNameLineEdit->text();
+        switch (dialogMode)
+        {
+            case AddMode:
+                addNewStyle();
+                break;
 
-        Styles styles;
-        styles.addHtmlPreviewStyle(newStyle);
+            case EditMode:
+                updateStyle();
+                break;
+
+            case RemoveMode:
+                removeStyle();
+                break;
+        }
     }
 
     QDialog::done(result);
@@ -62,6 +76,36 @@ void StyleDialog::done(int result)
 
 void StyleDialog::updateOkButtonEnabledState()
 {
-    bool isNameEditFilled = !ui->styleNameLineEdit->text().isEmpty();
-    ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(isNameEditFilled);
+    QString styleName = ui->styleNameLineEdit->text();
+
+    bool isNameFilled = !styleName.isEmpty();
+    bool nameDoesNotExists = dialogMode != AddMode || !styles->htmlPreviewStyleNames().contains(styleName);
+
+    ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(isNameFilled && nameDoesNotExists);
+}
+
+void StyleDialog::addNewStyle()
+{
+    Style newStyle;
+    newStyle.name = ui->styleNameLineEdit->text();
+    newStyle.markdownHighlighting = ui->markdownHighlightingComboBox->currentText();
+    newStyle.codeHighlighting = ui->codeHighlightingComboBox->currentText();
+    newStyle.previewStylesheet = ui->previewStylesheetComboBox->currentText();
+
+    styles->addHtmlPreviewStyle(newStyle);
+}
+
+void StyleDialog::updateStyle()
+{
+    Style style = styles->style(ui->styleNameLineEdit->text());
+    style.markdownHighlighting = ui->markdownHighlightingComboBox->currentText();
+    style.codeHighlighting = ui->codeHighlightingComboBox->currentText();
+    style.previewStylesheet = ui->previewStylesheetComboBox->currentText();
+
+    styles->updateHtmlPreviewStyle(style);
+}
+
+void StyleDialog::removeStyle()
+{
+    styles->removeHtmlPreviewStyle(ui->styleNameLineEdit->text());
 }
diff --git a/app/styledialog.h b/app/styledialog.h
index d7b20af6..f27313bc 100644
--- a/app/styledialog.h
+++ b/app/styledialog.h
@@ -22,6 +22,7 @@
 namespace Ui {
 class StyleDialog;
 }
+class Styles;
 
 
 class StyleDialog : public QDialog
@@ -29,7 +30,14 @@ class StyleDialog : public QDialog
     Q_OBJECT
     
 public:
-    explicit StyleDialog(const QString &styleName, QWidget *parent = 0);
+    enum DialogMode
+    {
+        AddMode,
+        EditMode,
+        RemoveMode
+    };
+
+    explicit StyleDialog(DialogMode mode, const QString &styleName, QWidget *parent = 0);
     ~StyleDialog();
 
 protected:
@@ -39,7 +47,13 @@ private slots:
     void updateOkButtonEnabledState();
 
 private:
+    void addNewStyle();
+    void updateStyle();
+    void removeStyle();
+
     Ui::StyleDialog *ui;
+    Styles *styles;
+    DialogMode dialogMode;
 };
 
 #endif // STYLEDIALOG_H

From b176ce168aa85e9f59b9ce7f6b9803a8c7993151 Mon Sep 17 00:00:00 2001
From: Christian Loose <christian.loose@hamburg.de>
Date: Fri, 12 Dec 2014 12:46:52 +0100
Subject: [PATCH 28/34] Move all JSON handling classes to a subfolder

---
 app-static/app-static.pro                     | 6 +++---
 app-static/{ => json}/jsonfile.h              | 0
 app-static/{ => json}/jsontranslator.h        | 0
 app-static/{ => json}/jsontranslatorfactory.h | 0
 app-static/snippets/jsonsnippettranslator.h   | 2 +-
 app-static/styles.cpp                         | 2 +-
 app-static/styles/jsonstyletranslator.h       | 2 +-
 app/mainwindow.cpp                            | 2 +-
 test/integration/jsonsnippetfiletest.cpp      | 2 +-
 test/integration/jsonstylefiletest.cpp        | 2 +-
 test/unit/jsontranslatorfactorytest.cpp       | 4 ++--
 11 files changed, 11 insertions(+), 11 deletions(-)
 rename app-static/{ => json}/jsonfile.h (100%)
 rename app-static/{ => json}/jsontranslator.h (100%)
 rename app-static/{ => json}/jsontranslatorfactory.h (100%)

diff --git a/app-static/app-static.pro b/app-static/app-static.pro
index 6158c17b..89966aa7 100644
--- a/app-static/app-static.pro
+++ b/app-static/app-static.pro
@@ -51,9 +51,9 @@ HEADERS += \
     htmlviewsynchronizer.h \
     styles.h \
     collection.h \
-    jsonfile.h \
-    jsontranslator.h \
-    jsontranslatorfactory.h
+    json/jsonfile.h \
+    json/jsontranslator.h \
+    json/jsontranslatorfactory.h
 
 #unix:!symbian {
 #    maemo5 {
diff --git a/app-static/jsonfile.h b/app-static/json/jsonfile.h
similarity index 100%
rename from app-static/jsonfile.h
rename to app-static/json/jsonfile.h
diff --git a/app-static/jsontranslator.h b/app-static/json/jsontranslator.h
similarity index 100%
rename from app-static/jsontranslator.h
rename to app-static/json/jsontranslator.h
diff --git a/app-static/jsontranslatorfactory.h b/app-static/json/jsontranslatorfactory.h
similarity index 100%
rename from app-static/jsontranslatorfactory.h
rename to app-static/json/jsontranslatorfactory.h
diff --git a/app-static/snippets/jsonsnippettranslator.h b/app-static/snippets/jsonsnippettranslator.h
index f21990ba..99b6b341 100644
--- a/app-static/snippets/jsonsnippettranslator.h
+++ b/app-static/snippets/jsonsnippettranslator.h
@@ -17,7 +17,7 @@
 #ifndef JSONSNIPPETTRANSLATOR_H
 #define JSONSNIPPETTRANSLATOR_H
 
-#include "jsontranslator.h"
+#include "json/jsontranslator.h"
 #include <QJsonObject>
 class QJsonDocument;
 class SnippetCollection;
diff --git a/app-static/styles.cpp b/app-static/styles.cpp
index 10591af0..4b204331 100644
--- a/app-static/styles.cpp
+++ b/app-static/styles.cpp
@@ -17,7 +17,7 @@
 #include "styles.h"
 
 #include <QSharedPointer>
-#include <jsonfile.h>
+#include <json/jsonfile.h>
 
 static const Style BUILTIN_DEFAULT_STYLE = Style("Default", "Default", "Default", "Default", true );
 static const Style DEFAULT_PRESENTATION_STYLE = Style("Default Presentation", "Default", "Default", "Default Presentation", true );
diff --git a/app-static/styles/jsonstyletranslator.h b/app-static/styles/jsonstyletranslator.h
index 45a043f1..04c4a462 100644
--- a/app-static/styles/jsonstyletranslator.h
+++ b/app-static/styles/jsonstyletranslator.h
@@ -17,7 +17,7 @@
 #ifndef JSONSTYLETRANSLATOR_H
 #define JSONSTYLETRANSLATOR_H
 
-#include "jsontranslator.h"
+#include "json/jsontranslator.h"
 #include <QJsonObject>
 class QJsonDocument;
 struct Style;
diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp
index cc892313..b3a5ef48 100644
--- a/app/mainwindow.cpp
+++ b/app/mainwindow.cpp
@@ -47,7 +47,7 @@
 #include <snippets/snippetcollection.h>
 #include <spellchecker/dictionary.h>
 #include <datalocation.h>
-#include <jsonfile.h>
+#include <json/jsonfile.h>
 #include "controls/activelabel.h"
 #include "controls/findreplacewidget.h"
 #include "controls/languagemenu.h"
diff --git a/test/integration/jsonsnippetfiletest.cpp b/test/integration/jsonsnippetfiletest.cpp
index b279e1fa..87778d4d 100644
--- a/test/integration/jsonsnippetfiletest.cpp
+++ b/test/integration/jsonsnippetfiletest.cpp
@@ -20,7 +20,7 @@
 #include <QTemporaryFile>
 #include <QTextStream>
 
-#include <jsonfile.h>
+#include <json/jsonfile.h>
 #include <snippets/snippetcollection.h>
 
 void JsonSnippetFileTest::loadsEmptySnippetsCollectionFromFile()
diff --git a/test/integration/jsonstylefiletest.cpp b/test/integration/jsonstylefiletest.cpp
index 155bf025..7878f862 100644
--- a/test/integration/jsonstylefiletest.cpp
+++ b/test/integration/jsonstylefiletest.cpp
@@ -20,7 +20,7 @@
 #include <QTemporaryFile>
 #include <QTextStream>
 
-#include <jsonfile.h>
+#include <json/jsonfile.h>
 #include <styles/stylecollection.h>
 
 void JsonStyleFileTest::loadsEmptyStylesCollectionFromFile()
diff --git a/test/unit/jsontranslatorfactorytest.cpp b/test/unit/jsontranslatorfactorytest.cpp
index f8e1d2c4..90c7067f 100644
--- a/test/unit/jsontranslatorfactorytest.cpp
+++ b/test/unit/jsontranslatorfactorytest.cpp
@@ -18,8 +18,8 @@
 
 #include <QTest>
 
-#include <jsontranslator.h>
-#include <jsontranslatorfactory.h>
+#include <json/jsontranslator.h>
+#include <json/jsontranslatorfactory.h>
 #include <snippets/snippet.h>
 #include <styles/style.h>
 

From dc68716c66438df1dfdda93f3ace7302f8cffe4f Mon Sep 17 00:00:00 2001
From: Christian Loose <christian.loose@hamburg.de>
Date: Fri, 12 Dec 2014 15:48:36 +0100
Subject: [PATCH 29/34] Renamed Collection<T> to JsonCollection<T> and also
 moved to subfolder

---
 app-static/app-static.pro                          |  2 +-
 app-static/{collection.h => json/jsoncollection.h} | 12 +++++-------
 app-static/json/jsonfile.h                         | 10 +++++-----
 app-static/json/jsontranslator.h                   |  6 +++---
 app-static/snippets/jsonsnippettranslator.cpp      |  4 ++--
 app-static/snippets/jsonsnippettranslator.h        |  4 ++--
 app-static/snippets/snippetcollection.h            |  4 ++--
 app-static/styles/jsonstyletranslator.cpp          |  6 +++---
 app-static/styles/jsonstyletranslator.h            |  4 ++--
 app-static/styles/stylecollection.h                |  4 ++--
 10 files changed, 27 insertions(+), 29 deletions(-)
 rename app-static/{collection.h => json/jsoncollection.h} (81%)

diff --git a/app-static/app-static.pro b/app-static/app-static.pro
index 89966aa7..4cd60be7 100644
--- a/app-static/app-static.pro
+++ b/app-static/app-static.pro
@@ -50,7 +50,7 @@ HEADERS += \
     revealviewsynchronizer.h \
     htmlviewsynchronizer.h \
     styles.h \
-    collection.h \
+    json/jsoncollection.h \
     json/jsonfile.h \
     json/jsontranslator.h \
     json/jsontranslatorfactory.h
diff --git a/app-static/collection.h b/app-static/json/jsoncollection.h
similarity index 81%
rename from app-static/collection.h
rename to app-static/json/jsoncollection.h
index 700a9812..9cf056fa 100644
--- a/app-static/collection.h
+++ b/app-static/json/jsoncollection.h
@@ -14,22 +14,20 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef COLLECTION_H
-#define COLLECTION_H
+#ifndef JSONCOLLECTION_H
+#define JSONCOLLECTION_H
 
 template <class T>
-class Collection
+class JsonCollection
 {
 public:
-    virtual ~Collection() {}
+    virtual ~JsonCollection() {}
 
     virtual int insert(const T &item) = 0;
-    virtual void update(const T &item) = 0;
-    virtual void remove(const T &item) = 0;
 
     virtual int count() const = 0;
     virtual const T &at(int offset) const = 0;
 };
 
-#endif // COLLECTION_H
+#endif // JSONCOLLECTION_H
 
diff --git a/app-static/json/jsonfile.h b/app-static/json/jsonfile.h
index ffeb8c93..c7cdc6ef 100644
--- a/app-static/json/jsonfile.h
+++ b/app-static/json/jsonfile.h
@@ -20,7 +20,7 @@
 #include <QFile>
 #include <QJsonDocument>
 #include <QTextStream>
-#include "collection.h"
+#include "jsoncollection.h"
 #include "jsontranslator.h"
 #include "jsontranslatorfactory.h"
 
@@ -31,15 +31,15 @@ template <class T>
 class JsonFile
 {
 public:
-    static bool load(const QString &fileName, Collection<T> *collection);
-    static bool save(const QString &fileName, Collection<T> *collection);
+    static bool load(const QString &fileName, JsonCollection<T> *collection);
+    static bool save(const QString &fileName, JsonCollection<T> *collection);
 
 private:
     JsonFile();
 };
 
 template <class T>
-bool JsonFile<T>::load(const QString &fileName, Collection<T> *collection)
+bool JsonFile<T>::load(const QString &fileName, JsonCollection<T> *collection)
 {
     QFile jsonFile(fileName);
     if (!jsonFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
@@ -53,7 +53,7 @@ bool JsonFile<T>::load(const QString &fileName, Collection<T> *collection)
 }
 
 template <class T>
-bool JsonFile<T>::save(const QString &fileName, Collection<T> *collection)
+bool JsonFile<T>::save(const QString &fileName, JsonCollection<T> *collection)
 {
     QFile jsonFile(fileName);
     if (!jsonFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
diff --git a/app-static/json/jsontranslator.h b/app-static/json/jsontranslator.h
index cdaa74a6..8d89d886 100644
--- a/app-static/json/jsontranslator.h
+++ b/app-static/json/jsontranslator.h
@@ -18,7 +18,7 @@
 #define JSONTRANSLATOR_H
 
 #include <QJsonObject>
-#include "collection.h"
+#include "jsoncollection.h"
 class QJsonDocument;
 
 template <class T>
@@ -27,8 +27,8 @@ class JsonTranslator
 public:
     virtual ~JsonTranslator() {}
 
-    virtual bool processDocument(const QJsonDocument &jsonDocument, Collection<T> *collection) = 0;
-    virtual QJsonDocument createDocument(Collection<T> *collection) = 0;
+    virtual bool processDocument(const QJsonDocument &jsonDocument, JsonCollection<T> *collection) = 0;
+    virtual QJsonDocument createDocument(JsonCollection<T> *collection) = 0;
 };
 
 #endif // JSONTRANSLATOR_H
diff --git a/app-static/snippets/jsonsnippettranslator.cpp b/app-static/snippets/jsonsnippettranslator.cpp
index 23776db9..23460a71 100644
--- a/app-static/snippets/jsonsnippettranslator.cpp
+++ b/app-static/snippets/jsonsnippettranslator.cpp
@@ -32,7 +32,7 @@ static const QLatin1String BUILTIN("builtIn");
 
 }
 
-bool JsonSnippetTranslator::processDocument(const QJsonDocument &jsonDocument, Collection<Snippet> *collection)
+bool JsonSnippetTranslator::processDocument(const QJsonDocument &jsonDocument, JsonCollection<Snippet> *collection)
 {
     if (!isValid(jsonDocument))
         return false;
@@ -46,7 +46,7 @@ bool JsonSnippetTranslator::processDocument(const QJsonDocument &jsonDocument, C
     return true;
 }
 
-QJsonDocument JsonSnippetTranslator::createDocument(Collection<Snippet> *collection)
+QJsonDocument JsonSnippetTranslator::createDocument(JsonCollection<Snippet> *collection)
 {
     QJsonArray snippetArray;
     for (int i = 0; i < collection->count(); ++i) {
diff --git a/app-static/snippets/jsonsnippettranslator.h b/app-static/snippets/jsonsnippettranslator.h
index 99b6b341..cf404159 100644
--- a/app-static/snippets/jsonsnippettranslator.h
+++ b/app-static/snippets/jsonsnippettranslator.h
@@ -27,8 +27,8 @@ struct Snippet;
 class JsonSnippetTranslator : public JsonTranslator<Snippet>
 {
 public:
-    bool processDocument(const QJsonDocument &jsonDocument, Collection<Snippet> *collection) Q_DECL_OVERRIDE;
-    QJsonDocument createDocument(Collection<Snippet> *collection) Q_DECL_OVERRIDE;
+    bool processDocument(const QJsonDocument &jsonDocument, JsonCollection<Snippet> *collection) Q_DECL_OVERRIDE;
+    QJsonDocument createDocument(JsonCollection<Snippet> *collection) Q_DECL_OVERRIDE;
 
 private:
     Snippet fromJsonObject(const QJsonObject &object);
diff --git a/app-static/snippets/snippetcollection.h b/app-static/snippets/snippetcollection.h
index b020f23c..76eb638c 100644
--- a/app-static/snippets/snippetcollection.h
+++ b/app-static/snippets/snippetcollection.h
@@ -19,11 +19,11 @@
 
 #include <QObject>
 #include <QMap>
-#include "collection.h"
+#include "json/jsoncollection.h"
 #include "snippet.h"
 
 
-class SnippetCollection : public QObject, public Collection<Snippet>
+class SnippetCollection : public QObject, public JsonCollection<Snippet>
 {
     Q_OBJECT
     Q_ENUMS(CollectionChangedType)
diff --git a/app-static/styles/jsonstyletranslator.cpp b/app-static/styles/jsonstyletranslator.cpp
index 83e3e83b..fa65ee51 100644
--- a/app-static/styles/jsonstyletranslator.cpp
+++ b/app-static/styles/jsonstyletranslator.cpp
@@ -19,8 +19,8 @@
 #include <QJsonArray>
 #include <QJsonDocument>
 
+#include "json/jsoncollection.h"
 #include "style.h"
-#include "collection.h"
 
 namespace {
 
@@ -32,7 +32,7 @@ static const QLatin1String BUILTIN("builtIn");
 
 }
 
-bool JsonStyleTranslator::processDocument(const QJsonDocument &jsonDocument, Collection<Style> *collection)
+bool JsonStyleTranslator::processDocument(const QJsonDocument &jsonDocument, JsonCollection<Style> *collection)
 {
     if (!isValid(jsonDocument))
         return false;
@@ -46,7 +46,7 @@ bool JsonStyleTranslator::processDocument(const QJsonDocument &jsonDocument, Col
     return true;
 }
 
-QJsonDocument JsonStyleTranslator::createDocument(Collection<Style> *collection)
+QJsonDocument JsonStyleTranslator::createDocument(JsonCollection<Style> *collection)
 {
     QJsonArray styleArray;
     for (int i = 0; i < collection->count(); ++i) {
diff --git a/app-static/styles/jsonstyletranslator.h b/app-static/styles/jsonstyletranslator.h
index 04c4a462..a8d770c5 100644
--- a/app-static/styles/jsonstyletranslator.h
+++ b/app-static/styles/jsonstyletranslator.h
@@ -26,8 +26,8 @@ struct Style;
 class JsonStyleTranslator : public JsonTranslator<Style>
 {
 public:
-    bool processDocument(const QJsonDocument &jsonDocument, Collection<Style> *collection) Q_DECL_OVERRIDE;
-    QJsonDocument createDocument(Collection<Style> *collection) Q_DECL_OVERRIDE;
+    bool processDocument(const QJsonDocument &jsonDocument, JsonCollection<Style> *collection) Q_DECL_OVERRIDE;
+    QJsonDocument createDocument(JsonCollection<Style> *collection) Q_DECL_OVERRIDE;
 
 private:
     Style fromJsonObject(const QJsonObject &object);
diff --git a/app-static/styles/stylecollection.h b/app-static/styles/stylecollection.h
index 0b3916fc..0ec0c9ec 100644
--- a/app-static/styles/stylecollection.h
+++ b/app-static/styles/stylecollection.h
@@ -19,11 +19,11 @@
 
 #include <QString>
 #include <QStringList>
-#include "collection.h"
+#include "json/jsoncollection.h"
 #include "style.h"
 
 
-class StyleCollection : public Collection<Style>
+class StyleCollection : public JsonCollection<Style>
 {
 public:
     StyleCollection();

From ce9663d76a60ab815d4d47b4e49dfe9056f5271a Mon Sep 17 00:00:00 2001
From: Christian Loose <christian.loose@hamburg.de>
Date: Fri, 12 Dec 2014 16:24:29 +0100
Subject: [PATCH 30/34] Add name() method to JsonCollection implementations and
 use it in the JSON translators

---
 app-static/json/jsoncollection.h              | 1 +
 app-static/snippets/jsonsnippettranslator.cpp | 4 ++--
 app-static/snippets/snippetcollection.cpp     | 5 +++++
 app-static/snippets/snippetcollection.h       | 1 +
 app-static/styles/jsonstyletranslator.cpp     | 4 ++--
 app-static/styles/stylecollection.cpp         | 5 +++++
 app-static/styles/stylecollection.h           | 1 +
 7 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/app-static/json/jsoncollection.h b/app-static/json/jsoncollection.h
index 9cf056fa..acc966e3 100644
--- a/app-static/json/jsoncollection.h
+++ b/app-static/json/jsoncollection.h
@@ -25,6 +25,7 @@ class JsonCollection
 
     virtual int insert(const T &item) = 0;
 
+    virtual const QString name() const = 0;
     virtual int count() const = 0;
     virtual const T &at(int offset) const = 0;
 };
diff --git a/app-static/snippets/jsonsnippettranslator.cpp b/app-static/snippets/jsonsnippettranslator.cpp
index 23460a71..1883ff87 100644
--- a/app-static/snippets/jsonsnippettranslator.cpp
+++ b/app-static/snippets/jsonsnippettranslator.cpp
@@ -37,7 +37,7 @@ bool JsonSnippetTranslator::processDocument(const QJsonDocument &jsonDocument, J
     if (!isValid(jsonDocument))
         return false;
 
-    QJsonArray snippetArray = jsonDocument.object().value("snippets").toArray();
+    QJsonArray snippetArray = jsonDocument.object().value(collection->name()).toArray();
     foreach (QJsonValue entry, snippetArray) {
         Snippet snippet = fromJsonObject(entry.toObject());
         collection->insert(snippet);
@@ -57,7 +57,7 @@ QJsonDocument JsonSnippetTranslator::createDocument(JsonCollection<Snippet> *col
     }
 
     QJsonObject object;
-    object.insert("snippets", snippetArray);
+    object.insert(collection->name(), snippetArray);
 
     QJsonDocument doc(object);
     return doc;
diff --git a/app-static/snippets/snippetcollection.cpp b/app-static/snippets/snippetcollection.cpp
index 2b4e06f8..7809d2a6 100644
--- a/app-static/snippets/snippetcollection.cpp
+++ b/app-static/snippets/snippetcollection.cpp
@@ -48,6 +48,11 @@ void SnippetCollection::remove(const Snippet &snippet)
     emit collectionChanged(SnippetCollection::ItemDeleted, snippet);
 }
 
+const QString SnippetCollection::name() const
+{
+    return QStringLiteral("snippets");
+}
+
 bool SnippetCollection::contains(const QString &trigger) const
 {
     return snippets.contains(trigger);
diff --git a/app-static/snippets/snippetcollection.h b/app-static/snippets/snippetcollection.h
index 76eb638c..89851a3a 100644
--- a/app-static/snippets/snippetcollection.h
+++ b/app-static/snippets/snippetcollection.h
@@ -44,6 +44,7 @@ class SnippetCollection : public QObject, public JsonCollection<Snippet>
     void update(const Snippet& snippet);
     void remove(const Snippet& snippet);
 
+    const QString name() const;
     bool contains(const QString &trigger) const;
     const Snippet snippet(const QString &trigger) const;
     const Snippet &at(int offset) const;
diff --git a/app-static/styles/jsonstyletranslator.cpp b/app-static/styles/jsonstyletranslator.cpp
index fa65ee51..8e8262dd 100644
--- a/app-static/styles/jsonstyletranslator.cpp
+++ b/app-static/styles/jsonstyletranslator.cpp
@@ -37,7 +37,7 @@ bool JsonStyleTranslator::processDocument(const QJsonDocument &jsonDocument, Jso
     if (!isValid(jsonDocument))
         return false;
 
-    QJsonArray styleArray = jsonDocument.object().value("styles").toArray();
+    QJsonArray styleArray = jsonDocument.object().value(collection->name()).toArray();
     foreach (QJsonValue entry, styleArray) {
         Style style = fromJsonObject(entry.toObject());
         collection->insert(style);
@@ -57,7 +57,7 @@ QJsonDocument JsonStyleTranslator::createDocument(JsonCollection<Style> *collect
     }
 
     QJsonObject object;
-    object.insert("styles", styleArray);
+    object.insert(collection->name(), styleArray);
 
     QJsonDocument doc(object);
     return doc;
diff --git a/app-static/styles/stylecollection.cpp b/app-static/styles/stylecollection.cpp
index e16948b9..c4d5d0a8 100644
--- a/app-static/styles/stylecollection.cpp
+++ b/app-static/styles/stylecollection.cpp
@@ -54,6 +54,11 @@ QStringList StyleCollection::styleNames() const
     return stylesIndex;
 }
 
+const QString StyleCollection::name() const
+{
+    return QStringLiteral("styles");
+}
+
 bool StyleCollection::contains(const QString &name) const
 {
     return stylesIndex.contains(name);
diff --git a/app-static/styles/stylecollection.h b/app-static/styles/stylecollection.h
index 0ec0c9ec..15c2e874 100644
--- a/app-static/styles/stylecollection.h
+++ b/app-static/styles/stylecollection.h
@@ -36,6 +36,7 @@ class StyleCollection : public JsonCollection<Style>
     const Style &at(int offset) const;
 
     QStringList styleNames() const;
+    const QString name() const;
     bool contains(const QString &name) const;
     const Style style(const QString &name) const;
 

From d3d89c0c94caee726b71e6eebb0f5895290bf6eb Mon Sep 17 00:00:00 2001
From: Christian Loose <christian.loose@hamburg.de>
Date: Fri, 12 Dec 2014 16:31:42 +0100
Subject: [PATCH 31/34] Also use name() in private isValid() methods

---
 app-static/snippets/jsonsnippettranslator.cpp | 8 ++++----
 app-static/snippets/jsonsnippettranslator.h   | 2 +-
 app-static/styles/jsonstyletranslator.cpp     | 8 ++++----
 app-static/styles/jsonstyletranslator.h       | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app-static/snippets/jsonsnippettranslator.cpp b/app-static/snippets/jsonsnippettranslator.cpp
index 1883ff87..89ad0250 100644
--- a/app-static/snippets/jsonsnippettranslator.cpp
+++ b/app-static/snippets/jsonsnippettranslator.cpp
@@ -34,7 +34,7 @@ static const QLatin1String BUILTIN("builtIn");
 
 bool JsonSnippetTranslator::processDocument(const QJsonDocument &jsonDocument, JsonCollection<Snippet> *collection)
 {
-    if (!isValid(jsonDocument))
+    if (!isValid(jsonDocument, collection->name()))
         return false;
 
     QJsonArray snippetArray = jsonDocument.object().value(collection->name()).toArray();
@@ -89,10 +89,10 @@ QJsonObject JsonSnippetTranslator::toJsonObject(const Snippet &snippet)
     return object;
 }
 
-bool JsonSnippetTranslator::isValid(const QJsonDocument &jsonDocument) const
+bool JsonSnippetTranslator::isValid(const QJsonDocument &jsonDocument, const QString &arrayName) const
 {
     return !jsonDocument.isEmpty() &&
            jsonDocument.isObject() &&
-           jsonDocument.object().contains("snippets") &&
-           jsonDocument.object().value("snippets").isArray();
+           jsonDocument.object().contains(arrayName) &&
+           jsonDocument.object().value(arrayName).isArray();
 }
diff --git a/app-static/snippets/jsonsnippettranslator.h b/app-static/snippets/jsonsnippettranslator.h
index cf404159..9ea76dbe 100644
--- a/app-static/snippets/jsonsnippettranslator.h
+++ b/app-static/snippets/jsonsnippettranslator.h
@@ -34,7 +34,7 @@ class JsonSnippetTranslator : public JsonTranslator<Snippet>
     Snippet fromJsonObject(const QJsonObject &object);
     QJsonObject toJsonObject(const Snippet &snippet);
 
-    bool isValid(const QJsonDocument &jsonDocument) const;
+    bool isValid(const QJsonDocument &jsonDocument, const QString &arrayName) const;
 };
 
 #endif // JSONSNIPPETTRANSLATOR_H
diff --git a/app-static/styles/jsonstyletranslator.cpp b/app-static/styles/jsonstyletranslator.cpp
index 8e8262dd..35c01093 100644
--- a/app-static/styles/jsonstyletranslator.cpp
+++ b/app-static/styles/jsonstyletranslator.cpp
@@ -34,7 +34,7 @@ static const QLatin1String BUILTIN("builtIn");
 
 bool JsonStyleTranslator::processDocument(const QJsonDocument &jsonDocument, JsonCollection<Style> *collection)
 {
-    if (!isValid(jsonDocument))
+    if (!isValid(jsonDocument, collection->name()))
         return false;
 
     QJsonArray styleArray = jsonDocument.object().value(collection->name()).toArray();
@@ -89,11 +89,11 @@ QJsonObject JsonStyleTranslator::toJsonObject(const Style &style)
     return object;
 }
 
-bool JsonStyleTranslator::isValid(const QJsonDocument &jsonDocument) const
+bool JsonStyleTranslator::isValid(const QJsonDocument &jsonDocument, const QString &arrayName) const
 {
     return !jsonDocument.isEmpty() &&
            jsonDocument.isObject() &&
-           jsonDocument.object().contains("styles") &&
-           jsonDocument.object().value("styles").isArray();
+           jsonDocument.object().contains(arrayName) &&
+           jsonDocument.object().value(arrayName).isArray();
 }
 
diff --git a/app-static/styles/jsonstyletranslator.h b/app-static/styles/jsonstyletranslator.h
index a8d770c5..bcaf3485 100644
--- a/app-static/styles/jsonstyletranslator.h
+++ b/app-static/styles/jsonstyletranslator.h
@@ -33,7 +33,7 @@ class JsonStyleTranslator : public JsonTranslator<Style>
     Style fromJsonObject(const QJsonObject &object);
     QJsonObject toJsonObject(const Style &style);
 
-    bool isValid(const QJsonDocument &jsonDocument) const;
+    bool isValid(const QJsonDocument &jsonDocument, const QString &arrayName) const;
 };
 
 #endif // JSONSTYLETRANSLATOR_H

From 2dd7a3b41ce60fe05e33fca856f25dc16b8f0795 Mon Sep 17 00:00:00 2001
From: Christian Loose <christian.loose@hamburg.de>
Date: Mon, 15 Dec 2014 11:26:04 +0100
Subject: [PATCH 32/34] Fix compile after merge

---
 test/unit/unit.pro | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/test/unit/unit.pro b/test/unit/unit.pro
index c593b013..b68aaffd 100644
--- a/test/unit/unit.pro
+++ b/test/unit/unit.pro
@@ -20,8 +20,7 @@ SOURCES += \
     dictionarytest.cpp \
     jsonstyletranslatortest.cpp \
     styletest.cpp \
-    stylecollectiontest.cpp \
-    jsontranslatorfactorytest.cpp
+    stylecollectiontest.cpp 
 
 HEADERS += \
     snippettest.h \
@@ -33,8 +32,7 @@ HEADERS += \
     dictionarytest.h \
     jsonstyletranslatortest.h \
     styletest.h \
-    stylecollectiontest.h \
-    jsontranslatorfactorytest.h
+    stylecollectiontest.h 
 
 target.CONFIG += no_default_install
 

From df3b017797aca945fa4147c17992f8ac0256b1a8 Mon Sep 17 00:00:00 2001
From: Christian Loose <christian.loose@hamburg.de>
Date: Mon, 15 Dec 2014 11:52:53 +0100
Subject: [PATCH 33/34] Remove duplicate headers from qmake project

---
 app-static/app-static.pro | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app-static/app-static.pro b/app-static/app-static.pro
index d7dc38bf..f2b94ce5 100644
--- a/app-static/app-static.pro
+++ b/app-static/app-static.pro
@@ -53,11 +53,7 @@ HEADERS += \
     viewsynchronizer.h \
     revealviewsynchronizer.h \
     htmlviewsynchronizer.h \
-    styles.h \
-    json/jsoncollection.h \
-    json/jsonfile.h \
-    json/jsontranslator.h \
-    json/jsontranslatorfactory.h
+    styles.h 
 
 #unix:!symbian {
 #    maemo5 {

From e38b22da6278b44d0f50f6ade1c4e825e94db3f6 Mon Sep 17 00:00:00 2001
From: Christian Loose <christian.loose@hamburg.de>
Date: Mon, 15 Dec 2014 14:55:49 +0100
Subject: [PATCH 34/34] Simplify JsonStyleTranslator based on the
 JsonTranslator changes

---
 app-static/styles/jsonstyletranslator.cpp | 43 -----------------------
 app-static/styles/jsonstyletranslator.h   |  7 ----
 2 files changed, 50 deletions(-)

diff --git a/app-static/styles/jsonstyletranslator.cpp b/app-static/styles/jsonstyletranslator.cpp
index 35c01093..b7c5c8cd 100644
--- a/app-static/styles/jsonstyletranslator.cpp
+++ b/app-static/styles/jsonstyletranslator.cpp
@@ -16,10 +16,6 @@
  */
 #include "jsonstyletranslator.h"
 
-#include <QJsonArray>
-#include <QJsonDocument>
-
-#include "json/jsoncollection.h"
 #include "style.h"
 
 namespace {
@@ -32,37 +28,6 @@ static const QLatin1String BUILTIN("builtIn");
 
 }
 
-bool JsonStyleTranslator::processDocument(const QJsonDocument &jsonDocument, JsonCollection<Style> *collection)
-{
-    if (!isValid(jsonDocument, collection->name()))
-        return false;
-
-    QJsonArray styleArray = jsonDocument.object().value(collection->name()).toArray();
-    foreach (QJsonValue entry, styleArray) {
-        Style style = fromJsonObject(entry.toObject());
-        collection->insert(style);
-    }
-
-    return true;
-}
-
-QJsonDocument JsonStyleTranslator::createDocument(JsonCollection<Style> *collection)
-{
-    QJsonArray styleArray;
-    for (int i = 0; i < collection->count(); ++i) {
-        Style style = collection->at(i);
-
-        QJsonObject entry = toJsonObject(style);
-        styleArray.append(entry);
-    }
-
-    QJsonObject object;
-    object.insert(collection->name(), styleArray);
-
-    QJsonDocument doc(object);
-    return doc;
-}
-
 Style JsonStyleTranslator::fromJsonObject(const QJsonObject &object)
 {
     Style style;
@@ -89,11 +54,3 @@ QJsonObject JsonStyleTranslator::toJsonObject(const Style &style)
     return object;
 }
 
-bool JsonStyleTranslator::isValid(const QJsonDocument &jsonDocument, const QString &arrayName) const
-{
-    return !jsonDocument.isEmpty() &&
-           jsonDocument.isObject() &&
-           jsonDocument.object().contains(arrayName) &&
-           jsonDocument.object().value(arrayName).isArray();
-}
-
diff --git a/app-static/styles/jsonstyletranslator.h b/app-static/styles/jsonstyletranslator.h
index bcaf3485..24710f28 100644
--- a/app-static/styles/jsonstyletranslator.h
+++ b/app-static/styles/jsonstyletranslator.h
@@ -19,21 +19,14 @@
 
 #include "json/jsontranslator.h"
 #include <QJsonObject>
-class QJsonDocument;
 struct Style;
 
 
 class JsonStyleTranslator : public JsonTranslator<Style>
 {
-public:
-    bool processDocument(const QJsonDocument &jsonDocument, JsonCollection<Style> *collection) Q_DECL_OVERRIDE;
-    QJsonDocument createDocument(JsonCollection<Style> *collection) Q_DECL_OVERRIDE;
-
 private:
     Style fromJsonObject(const QJsonObject &object);
     QJsonObject toJsonObject(const Style &style);
-
-    bool isValid(const QJsonDocument &jsonDocument, const QString &arrayName) const;
 };
 
 #endif // JSONSTYLETRANSLATOR_H