Merge pull request #1141 from deXol/develop

[BLE] Notes improvements

src/BleDev.cpp

@@ -194,7 +194,7 @@ void BleDev::on_btnFileBrowser_clicked()
                                             s.value("last_used_path/bundle_dir", QDir::homePath()).toString(),
                                             "*.img");
 
-    // Due to file selection dialog opened, release events are not catched
+    // Due to file selection dialog opened, release events are not caught
     DeviceDetector::instance().shiftReleased();
     DeviceDetector::instance().ctrlReleased();
 

src/NotesManagement.cpp

@@ -45,6 +45,7 @@ void NotesManagement::setWsClient(WSClient *c)
     connect(wsClient, &WSClient::notesFetched, this, &NotesManagement::loadNotes);
     connect(wsClient, &WSClient::noteSaved, this, &NotesManagement::onNoteSaved);
     connect(wsClient, &WSClient::noteDeleted, this, &NotesManagement::onNoteDeleted);
+    connect(wsClient, &WSClient::deviceDisconnected, this, &NotesManagement::onDeviceDisconnected);
 }
 
 void NotesManagement::loadNotes(const QJsonArray &notes)
@@ -223,8 +224,9 @@ void NotesManagement::onNoteSaved(const QString &note, bool success)
     {
         if (m_isNewFile)
         {
-            addNewIcon(note);
             m_noteList.append(note);
+            std::sort(std::begin(m_noteList), std::end(m_noteList));
+            refreshNotes();
         }
     }
     else
@@ -300,3 +302,12 @@ void NotesManagement::onNoteDeleted(bool success, const QString &note)
         QMessageBox::warning(this, tr("Failure"), tr("'%1' note delete failed!").arg(note));
     }
 }
+
+void NotesManagement::onDeviceDisconnected()
+{
+    if (m_isNoteEditing)
+    {
+        // Exit editing mode when device disconnected
+        on_pushButtonDiscard_clicked();
+    }
+}

src/NotesManagement.h

@@ -44,6 +44,8 @@ private slots:
 
     void onNoteDeleted(bool success, const QString& note);
 
+    void onDeviceDisconnected();
+
 private:
     void loadNotes(const QJsonArray& notes);
     void refreshNotes();