proprocessor cryptopp

src/frames/aboutdialog.cpp

@@ -6,7 +6,8 @@ AboutDialog::AboutDialog(QWidget *parent) :
     ui(new Ui::AboutDialog)
 {
     ui->setupUi(this);
-    ui->appNameLabel->setText(QString("TaskNote (%1)").arg(QSysInfo::currentCpuArchitecture()));
+    ui->appNameLabel->setText(QString("%1 (%2)").arg(APP_NAME, APP_ARCH));
+    ui->versionLabel->setText(QString("Version %1").arg(APP_VERSION));
 }
 
 AboutDialog::~AboutDialog()

src/frames/aboutdialog.ui

@@ -69,7 +69,7 @@
       </widget>
      </item>
      <item>
-      <widget class="QLabel" name="label_3">
+      <widget class="QLabel" name="versionLabel">
        <property name="text">
         <string>Version 1.2.0.0</string>
        </property>

src/frames/mainwindow.cpp

@@ -14,7 +14,9 @@ MainWindow::MainWindow(QWidget *parent)
     connect(ui->noteList, &QListWidget::currentRowChanged, this, &MainWindow::selectionChanged);
     connect(ui->titleEdit, &QLineEdit::textChanged, this, &MainWindow::titleChanged);
     connect(ui->contentEdit, &QPlainTextEdit::textChanged, this, &MainWindow::contentChanged);
+    #ifdef __SECURED
     connect(ui->actionEncrypt, &QAction::triggered, this, &MainWindow::encryptNote);
+    #endif
     const QFont fixedFont = QFontDatabase::systemFont(QFontDatabase::FixedFont);
     ui->contentEdit->setFont(fixedFont);
     this->savemng = new SaveManager();
@@ -56,12 +58,16 @@ void MainWindow::selectionChanged(int i)
     ui->titleEdit->setDisabled(false);
     ui->contentEdit->setDisabled(false);
     ui->titleEdit->setText(n->getTitle());
+#ifdef __SECURED
     if (n->isEncrypted())
     {
       ui->contentEdit->setPlainText(n->getEncryptedContent("azertyuiop"));
     } else {
       ui->contentEdit->setPlainText(n->getContent());
     }
+#else
+    ui->contentEdit->setPlainText(n->getContent());
+#endif
     ui->markdownViewer->setMarkdown(ui->contentEdit->toPlainText());
 }
 
@@ -107,6 +113,7 @@ void MainWindow::showAboutBox()
     dialog.exec();
 }
 
+#ifdef __SECURED
 void MainWindow::encryptNote()
 {
   if (this->currentIndex > -1)
@@ -116,6 +123,7 @@ void MainWindow::encryptNote()
       savemng->flushSave();
   }
 }
+#endif
 
 void MainWindow::contentChanged()
 {

src/frames/mainwindow.h

@@ -30,7 +30,9 @@ private slots:
     void contentChanged();
     void titleChanged();
     void showAboutBox();
+#ifdef __SECURED
     void encryptNote();
+#endif
 
 private:
     Ui::MainWindow *ui;

src/frames/mainwindow.ui

@@ -222,6 +222,9 @@
    </property>
   </action>
   <action name="actionEncrypt">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
    <property name="icon">
     <iconset resource="../../icons.qrc">
      <normaloff>:/icon/resources/outline_shield_black_48dp.png</normaloff>:/icon/resources/outline_shield_black_48dp.png</iconset>

src/models/note.cpp

@@ -12,7 +12,9 @@ QJsonObject Note::toJson()
     o["uuid"] = this->uuid;
     o["title"] = this->title;
     o["content"] = this->content;
+    #ifdef __SECURED
     o["encrypted"] = this->encrypted;
+    #endif
     return o;
 }
 
@@ -44,7 +46,7 @@ QString Note::getContent()
     }
     return "";
 }
-
+#ifdef __SECURED
 QString Note::getEncryptedContent(QString passwd)
 {
     if (this->encrypted)
@@ -80,7 +82,7 @@ bool Note::isEncrypted()
 {
   return this->encrypted;
 }
-
+#endif
 void Note::setTitle(QString value)
 {
     this->title = value;
@@ -92,7 +94,7 @@ void Note::setContent(QString value)
     this->content = value;
   }
 }
-
+#ifdef __SECURED
 // TODO encrypt avec le mot de passe
 bool Note::setEncryptedContent(QString value, QString passwd)
 {
@@ -141,4 +143,4 @@ void Note::encrypt(QString password)
     }
   }
 }
-
+#endif

src/models/note.h

@@ -11,6 +11,7 @@
 #include <QUuid>
 #include <QMessageBox>
 
+#ifdef __SECURED
 #include <crypto++/modes.h>
 #include <crypto++/aes.h>
 #include <crypto++/filters.h>
@@ -20,6 +21,7 @@
 #include <crypto++/osrng.h>
 #include <crypto++/gcm.h>
 #include <crypto++/rijndael.h>
+#endif
 
 class Note
 {
@@ -32,15 +34,19 @@ public:
     QString getUuid();
     QString getTitle();
     QString getContent();
+
+    #ifdef __SECURED
     QString getEncryptedContent(QString passwd);
     bool isEncrypted();
+    #endif
 
     void setTitle(QString value);
     void setContent(QString value);
+
+    #ifdef __SECURED
     bool setEncryptedContent(QString value, QString passwd);
-
     void encrypt(QString password);
-
+    #endif
 private:
     QString uuid;
     QString title;