Merge pull request #871 from deXol/developBLEImplementNodes

[BLE] Adjust Notes UI, fix infinite loop after delete on Windows

Author: limpkin

img/note.png

@@ -354,7 +354,18 @@ void FilesManagement::onFileDeleted(bool success, const QString& file)
     updateButtonsUI();
     if (success)
     {
-        wsClient->sendListFilesCacheRequest();
+        // Remove delete file from cache and reload model
+        auto& fileCache = wsClient->getFilesCache();
+        for (int i = 0; i < fileCache.size(); ++i)
+        {
+            QJsonObject jsonObject = fileCache[i].toObject();
+            if (jsonObject.value("name").toString() == file)
+            {
+                fileCache.removeAt(i);
+                break;
+            }
+        }
+        loadFilesCacheModel(true);
         QMessageBox::information(this, tr("File Deleted"), tr("'%1' file was deleted successfully!").arg(file));
     }
     else

src/FilesManagement.cpp

@@ -37,12 +37,12 @@ NotesManagement::~NotesManagement()
 void NotesManagement::setWsClient(WSClient *c)
 {
     wsClient = c;
-    connect(wsClient, &WSClient::notesFetched, this, &NotesManagement::loadNodes);
+    connect(wsClient, &WSClient::notesFetched, this, &NotesManagement::loadNotes);
     connect(wsClient, &WSClient::noteSaved, this, &NotesManagement::onNoteSaved);
     connect(wsClient, &WSClient::noteDeleted, this, &NotesManagement::onNoteDeleted);
 }
 
-void NotesManagement::loadNodes(const QJsonArray &notes)
+void NotesManagement::loadNotes(const QJsonArray &notes)
 {
     clearNotes();
     for (auto noteObj : notes)
@@ -51,17 +51,28 @@ void NotesManagement::loadNodes(const QJsonArray &notes)
         QString noteName = jsonObject.value("name").toString();
 
         addNewIcon(noteName);
+        m_noteList.append(noteName);
+    }
+}
+
+void NotesManagement::refreshNotes()
+{
+    clearNotes(false);
+    for (const auto& noteName : m_noteList)
+    {
+        addNewIcon(noteName);
     }
 }
 
 void NotesManagement::addNewIcon(const QString &name)
 {
-    auto* vertLayout = new QVBoxLayout();
+
+    auto* vertIconNameLayout = new QVBoxLayout();
     auto* labelIcon = new ClickableLabel();
     labelIcon->setAlignment(Qt::AlignCenter);
     labelIcon->setPixmap(QString::fromUtf8(":/note.png"));
-    labelIcon->setMaximumSize(200,200);
-    labelIcon->setPixmap(labelIcon->pixmap()->scaled(200,200, Qt::KeepAspectRatio));
+    labelIcon->setMaximumSize(160,200);
+    labelIcon->setPixmap(labelIcon->pixmap()->scaled(160,200, Qt::KeepAspectRatio));
     labelIcon->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
     labelIcon->setAlignment(Qt::AlignCenter);
 
@@ -71,8 +82,17 @@ void NotesManagement::addNewIcon(const QString &name)
        emit changeNote();
     });
 
+    vertIconNameLayout->addWidget(labelIcon);
+
+    auto* labelName = new QLabel();
+    labelName->setAlignment(Qt::AlignCenter);
+    labelName->setText(name);
+
+    vertIconNameLayout->addWidget(labelName);
+    vertIconNameLayout->addItem(new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding));
+
     auto* iconHorizontalLayout = new QHBoxLayout();
-    iconHorizontalLayout->addWidget(labelIcon);
+    iconHorizontalLayout->addItem(vertIconNameLayout);
 
     QToolButton *buttonRemove = new QToolButton;
     buttonRemove->setToolButtonStyle(Qt::ToolButtonIconOnly);
@@ -90,36 +110,36 @@ void NotesManagement::addNewIcon(const QString &name)
 
     auto* removeLayout = new QVBoxLayout();
     removeLayout->addWidget(buttonRemove);
-    removeLayout->addItem(new QSpacerItem(20, 120, QSizePolicy::Minimum, QSizePolicy::Preferred));
-    iconHorizontalLayout->addItem(removeLayout);
-
-    vertLayout->addItem(iconHorizontalLayout);
+    removeLayout->addItem(new QSpacerItem(20, 60, QSizePolicy::Minimum, QSizePolicy::Expanding));
+    iconHorizontalLayout->addLayout(removeLayout);
 
-    auto* labelName = new QLabel();
-    labelName->setAlignment(Qt::AlignCenter);
-    labelName->setText(name);
-
-    vertLayout->addWidget(labelName);
-    vertLayout->addItem(new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding));
+    auto* vertLayout = new QVBoxLayout();
+    vertLayout->addLayout(iconHorizontalLayout);
 
     int row = ui->gridLayoutNotes->rowCount() - 1;
     if (m_actColumn == 4)
     {
         m_actColumn = 0;
         ++row;
     }
-    ui->gridLayoutNotes->addLayout(vertLayout, row, m_actColumn++, 1, 1);
-    m_noteList.append(name);
+
+    QWidget *iconWidget = new QWidget();
+    iconWidget->setLayout(vertLayout);
+    iconWidget->setMaximumWidth(190);
+    ui->gridLayoutNotes->addWidget(iconWidget, row, m_actColumn++, 1, 1);
 }
 
-void NotesManagement::clearNotes()
+void NotesManagement::clearNotes(bool clearNoteList /*= true*/)
 {
     for (int i = 0; i < ui->gridLayoutNotes->rowCount(); ++i)
     {
         GridLayoutUtil::removeRow(ui->gridLayoutNotes, i);
     }
     m_actColumn = 0;
-    m_noteList.clear();
+    if (clearNoteList)
+    {
+        m_noteList.clear();
+    }
 }
 
 void NotesManagement::on_pushButtonAddNote_clicked()
@@ -192,6 +212,7 @@ void NotesManagement::onNoteSaved(const QString &note, bool success)
         if (m_isNewFile)
         {
             addNewIcon(note);
+            m_noteList.append(note);
         }
     }
     else
@@ -238,7 +259,7 @@ void NotesManagement::onEditingFinished()
 void NotesManagement::on_textEditNote_textChanged()
 {
     QString note = ui->textEditNote->toPlainText();
-    if (note == m_noteContentClone || note.isEmpty() || !m_validNoteName)
+    if (note == m_noteContentClone || note.isEmpty() || (m_isNewFile && !m_validNoteName))
     {
         ui->pushButtonSave->hide();
     }
@@ -254,8 +275,8 @@ void NotesManagement::onNoteDeleted(bool success, const QString &note)
     emit updateTabs();
     if (success)
     {
-        clearNotes();
-        wsClient->sendFetchNotes();
+        m_noteList.removeOne(note);
+        refreshNotes();
         QMessageBox::information(this, tr("Note Deleted"), tr("'%1' note was deleted successfully!").arg(note));
     }
     else

src/NotesManagement.cpp

@@ -45,9 +45,10 @@ private slots:
     void onNoteDeleted(bool success, const QString& note);
 
 private:
-    void loadNodes(const QJsonArray& notes);
+    void loadNotes(const QJsonArray& notes);
+    void refreshNotes();
     void addNewIcon(const QString& name);
-    void clearNotes();
+    void clearNotes(bool clearNoteList = true);
 
 
     int m_actColumn = 0;

src/NotesManagement.h

@@ -87,6 +87,12 @@ border-right: none;
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_4">
+           <property name="leftMargin">
+            <number>0</number>
+           </property>
+           <property name="rightMargin">
+            <number>0</number>
+           </property>
            <item>
             <layout class="QGridLayout" name="gridLayoutNotes"/>
            </item>
@@ -138,9 +144,17 @@ border-right: none;
              <height>16777215</height>
             </size>
            </property>
+           <property name="font">
+            <font>
+             <pointsize>16</pointsize>
+            </font>
+           </property>
            <property name="frame">
             <bool>false</bool>
            </property>
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
+           </property>
            <property name="readOnly">
             <bool>true</bool>
            </property>