Merge pull request sonic-pi-net#486 from josephwilk/remove_json

Replace JSON with properties file
e-vincent · May 15, 2015 · a764506 · a764506
2 parents e97307b + 46d4b05
commit a764506
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 16 deletions.
diff --git a/app/gui/qt/mainwindow.cpp b/app/gui/qt/mainwindow.cpp
@@ -156,20 +156,18 @@ MainWindow::MainWindow(QApplication &app, bool i18n, QSplashScreen* splash)
 
   // Syntax highlighting
 
-  QString themeFilename = QDir::homePath() + QDir::separator() + ".sonic-pi" + QDir::separator() + "theme.json";
+  QString themeFilename = QDir::homePath() + QDir::separator() + ".sonic-pi" + QDir::separator() + "theme.properties";
   QFile themeFile(themeFilename);
   SonicPiTheme *theme;
   if(themeFile.exists()){
     qDebug() << "[GUI] Custom colors";
-    themeFile.open(QIODevice::ReadOnly);
-    QByteArray rawData = themeFile.readAll();
-    QJsonDocument doc(QJsonDocument::fromJson(rawData));
-    theme = new SonicPiTheme(this, doc.object());
+    QSettings settings(themeFilename, QSettings::IniFormat);
+    theme = new SonicPiTheme(this, settings);
     lexer = new SonicPiLexer(theme);
   }
   else{
     qDebug() << "[GUI] Default colors";
-    theme = new SonicPiTheme(this, QJsonObject());
+    theme = new SonicPiTheme(this, QSettings());
     lexer = new SonicPiLexer(theme);
   }
 

diff --git a/app/gui/qt/sonicpilexer.h b/app/gui/qt/sonicpilexer.h
@@ -13,7 +13,6 @@
 
 
 #include  <Qsci/qscilexerruby.h>
-#include <QJsonObject>
 
 #include "sonicpitheme.h"
 

diff --git a/app/gui/qt/sonicpiscintilla.h b/app/gui/qt/sonicpiscintilla.h
@@ -13,7 +13,6 @@
 
 
 #include <Qsci/qsciscintilla.h>
-#include <QJsonObject>
 #include "sonicpitheme.h"
 
 class SonicPiLexer;

diff --git a/app/gui/qt/sonicpitheme.cpp b/app/gui/qt/sonicpitheme.cpp
@@ -1,9 +1,9 @@
 
 #include "sonicpitheme.h"
 
-SonicPiTheme::SonicPiTheme(QObject *parent, const QJsonObject& settings) : QObject(parent)
+SonicPiTheme::SonicPiTheme(QObject *parent, const QSettings& settings) : QObject(parent)
 {
-    QJsonObject themeSettings = QJsonObject();
+    QMap<QString, QString> themeSettings;
     themeSettings["Foreground"] = "black";
     themeSettings["Background"] = "white";
 
@@ -70,16 +70,16 @@ SonicPiTheme::SonicPiTheme(QObject *parent, const QJsonObject& settings) : QObje
     themeSettings["FoldMarginForeground"]        = "whitesmoke";
 
 
-    QStringList customSettings = settings.keys();
+    QStringList customSettings = settings.allKeys();
     for(int idx=0; idx < customSettings.size(); idx++){
-      themeSettings[customSettings[idx]] = settings[customSettings[idx]];
+      themeSettings[customSettings[idx]] = settings.value(customSettings[idx]).toString();
     }
 
     this->theme = themeSettings;
 }
 
 QColor SonicPiTheme::color(QString key){
-    return theme[key].toString();
+    return theme[key];
 }
 
 SonicPiTheme::~SonicPiTheme(){}

diff --git a/app/gui/qt/sonicpitheme.h b/app/gui/qt/sonicpitheme.h
@@ -4,18 +4,17 @@
 #include <QtCore>
 #include <QObject>
 #include <QColor>
-#include <QJsonObject>
 
 class SonicPiTheme : public QObject
 {
     Q_OBJECT
 public:
-    explicit SonicPiTheme(QObject *parent = 0, const QJsonObject& settings = QJsonObject());
+    explicit SonicPiTheme(QObject *parent = 0, const QSettings& settings = QSettings());
     ~SonicPiTheme();
     QColor color(QString);
 
 private:
-    QJsonObject theme;
+    QMap<QString, QString> theme;
 
 signals:
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,7 +13,6 @@


		#include <Qsci/qscilexerruby.h>
		#include <QJsonObject>

		#include "sonicpitheme.h"

Expand Down