use QSettings

Odizinne · Oct 25, 2024 · e547675 · e547675
1 parent a8bab54
commit e547675
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 97 deletions.
diff --git a/src/NoteWidget/notewidget.cpp b/src/NoteWidget/notewidget.cpp
@@ -14,18 +14,10 @@
 #include <QRandomGenerator>
 #include <QFont>
 #include <QTextBlock>
-#include <QGraphicsBlurEffect>
+#include <QSettings>
 
 using namespace Utils;
 const int resizeMargin = 7;
-#ifdef _WIN32
-const QString NoteWidget::settingsFile = QStandardPaths::writableLocation(
-                                               QStandardPaths::AppDataLocation)
-                                           + "/Qwote/settings.json";
-#elif __linux__
-const QString NoteWidget::settingsFile = QDir::homePath() + "/.config/Qwote/settings.json";
-
-#endif
 
 QList<NoteWidget*> NoteWidget::existingNotes;
 
@@ -467,47 +459,25 @@ void NoteWidget::loadSettings()
 #elif __linux__
     defaultFontFamily = "Monospace";
 #endif
-    QFont currentFont = ui->noteTextEdit->font();
-    int currentSize = currentFont.pointSize();
-    int titleSize = 11;
 
-    QDir settingsDir(QFileInfo(settingsFile).absolutePath());
-    if (!settingsDir.exists()) {
-        settingsDir.mkpath(settingsDir.absolutePath());
-    }
+    QSettings settings("Odizinne", "Qwote");
 
-    QFile file(settingsFile);
-    if (!file.exists()) {
-        QFont defaultFont;
-        defaultFont.setFamily(defaultFontFamily);
-        defaultFont.setPointSize(11);
-        ui->noteTextEdit->setFont(defaultFont);
-        defaultFont.setBold(true);
-        ui->noteTitleLineEdit->setFont(defaultFont);
+    QFont font;
+    font.setFamily(settings.value("font", defaultFontFamily).toString());
+    font.setPointSize(settings.value("fontSize", 11).toInt());
+    ui->noteTextEdit->setFont(font);
 
-    } else {
-        if (file.open(QIODevice::ReadOnly)) {
-            QJsonParseError parseError;
-            QJsonDocument doc = QJsonDocument::fromJson(file.readAll(), &parseError);
-            if (parseError.error == QJsonParseError::NoError) {
-                settings = doc.object();
-                QFont userFont;
-                userFont.setFamily(settings.value("font").toString());
-                opacity = settings.contains("opacity") ? settings.value("opacity").toInt() : 255;
-                roundedCorners = settings.contains("roundedCorners") ? settings.value("roundedCorners").toBool() : true;
-                userFont.setPointSize(currentSize);
-                ui->noteTextEdit->setFont(userFont);
-                userFont.setPointSize(titleSize);
-                userFont.setBold(true);
-                ui->noteTitleLineEdit->setFont(userFont);
-                setContentTransparency();
-                setTitleTransparency();
-                update();
-            }
-            file.close();
-        }
-    }
+    QFont titleFont = font;
+    titleFont.setPointSize(settings.value("titleFontSize", 11).toInt());
+    titleFont.setBold(true);
+    ui->noteTitleLineEdit->setFont(titleFont);
 
+    opacity = settings.value("opacity", 255).toInt();
+    roundedCorners = settings.value("roundedCorners", true).toBool();
+
+    setContentTransparency();
+    setTitleTransparency();
+    update();
 }
 
 void NoteWidget::updateFormat() {

diff --git a/src/NoteWidget/notewidget.h b/src/NoteWidget/notewidget.h
@@ -50,8 +50,6 @@ private slots:
     bool ctrlPressed;
     Qt::Edges resizeDirection;
     QPoint dragStartPosition;
-    QJsonObject settings;
-    static const QString settingsFile;
     int opacity;
     bool roundedCorners;
 

diff --git a/src/SettingsPage/settingspage.cpp b/src/SettingsPage/settingspage.cpp
@@ -1,19 +1,7 @@
 #include "settingspage.h"
 #include "ui_settingspage.h"
-#include <QFile>
-#include <QJsonDocument>
-#include <QDir>
 #include <QFontDatabase>
-#include <QStandardPaths>
-
-#ifdef _WIN32
-const QString SettingsPage::settingsFile = QStandardPaths::writableLocation(
-                                               QStandardPaths::AppDataLocation)
-                                           + "/Qwote/settings.json";
-#elif __linux__
-const QString SettingsPage::settingsFile = QDir::homePath() + "/.config/Qwote/settings.json";
-
-#endif
+#include <QSettings>
 
 SettingsPage::SettingsPage(QWidget *parent)
     : QMainWindow(parent)
@@ -36,10 +24,8 @@ SettingsPage::~SettingsPage()
 
 void SettingsPage::populateFontComboBox() {
     QStringList fonts = QFontDatabase::families();
-
     ui->fontComboBox->clear();
-
-    foreach (const QString &font, fonts) {
+    for (const QString &font : fonts) {
         ui->fontComboBox->addItem(font);
     }
 }
@@ -51,46 +37,27 @@ void SettingsPage::onFontComboBoxIndexChanged() {
 
 void SettingsPage::loadSettings()
 {
-    QDir settingsDir(QFileInfo(settingsFile).absolutePath());
-    if (!settingsDir.exists()) {
-        settingsDir.mkpath(settingsDir.absolutePath());
-    }
+    QSettings settings("Odizinne", "Qwote");
 
-    QFile file(settingsFile);
-    if (!file.exists()) {
+    QString defaultFont;
 #ifdef _WIN32
-        ui->fontComboBox->setCurrentText("Consolas");
+    defaultFont = "Consolas";
 #elif __linux__
-        ui->fontComboBox->setCurrentText("Monospace");
+    defaultFont = "Monospace";
 #endif
 
-    } else {
-        if (file.open(QIODevice::ReadOnly)) {
-            QJsonParseError parseError;
-            QJsonDocument doc = QJsonDocument::fromJson(file.readAll(), &parseError);
-            if (parseError.error == QJsonParseError::NoError) {
-                settings = doc.object();
-                ui->fontComboBox->setCurrentText(settings.value("font").toString());
-                ui->opacitySlider->setValue(settings.value("opacity").toInt());
-                ui->roundedCornersCheckbox->setChecked(settings.value("roundedCorners").toBool());
-            }
-            file.close();
-        }
-    }
+    ui->fontComboBox->setCurrentText(settings.value("font", defaultFont).toString());
+    ui->opacitySlider->setValue(settings.value("opacity", 255).toInt());
+    ui->roundedCornersCheckbox->setChecked(settings.value("roundedCorners", true).toBool());
 }
 
 void SettingsPage::saveSettings()
 {
-    settings["font"] = ui->fontComboBox->currentText();
-    settings["opacity"] = ui->opacitySlider->value();
-    settings["roundedCorners"] = ui->roundedCornersCheckbox->isChecked();
+    QSettings settings("Odizinne", "Qwote");
 
-    QFile file(settingsFile);
-    if (file.open(QIODevice::WriteOnly)) {
-        QJsonDocument doc(settings);
-        file.write(doc.toJson(QJsonDocument::Indented));
-        file.close();
-    }
+    settings.setValue("font", ui->fontComboBox->currentText());
+    settings.setValue("opacity", ui->opacitySlider->value());
+    settings.setValue("roundedCorners", ui->roundedCornersCheckbox->isChecked());
 }
 
 void SettingsPage::onOpacitySliderValueChanged() {

diff --git a/src/SettingsPage/settingspage.h b/src/SettingsPage/settingspage.h
@@ -2,7 +2,6 @@
 #define SETTINGSPAGE_H
 
 #include <QMainWindow>
-#include <QJsonObject>
 
 namespace Ui {
 class SettingsPage;
@@ -20,8 +19,6 @@ class SettingsPage : public QMainWindow
     Ui::SettingsPage *ui;
     void loadSettings();
     void saveSettings();
-    QJsonObject settings;
-    static const QString settingsFile;
     void populateFontComboBox();
 
 private slots: