Writing BookmarksModel to xbel

1 files changed, 4 insertions, 23 deletions

diff --git a/lib/bookmarks/bookmarkswidget.cpp b/lib/bookmarks/bookmarkswidget.cpp
index 27f00c3..575f52f 100644
--- a/lib/bookmarks/bookmarkswidget.cpp
+++ b/lib/bookmarks/bookmarkswidget.cpp
@@ -32,10 +32,8 @@ BookmarksWidget::BookmarksWidget(const QString &path, QWidget *parent)
     ui->treeView->setModel(m_model);
 
     xbel = new Xbel(path);
-    BookmarkItem *rootNode = xbel->read();
-    m_model->setRoot(rootNode);
-    expandNodes(rootNode);
-    //qDebug("Reading bookmarks [%s] %s", qUtf8Printable(m_path), xbel->read(m_path) ? "ok" : "failed");
+    qDebug("Reading bookmarks [%s] %s", qUtf8Printable(path), m_model->read(xbel) ? "ok" : "failed");
+    m_model->expandItems(ui->treeView);
 
     connect(ui->treeView, &QTreeView::activated, this, [this](const QModelIndex &index) {
         if(ui->treeView->isPersistentEditorOpen(index))
@@ -67,8 +65,8 @@ BookmarksWidget::~BookmarksWidget()
 
 void BookmarksWidget::save()
 {
-    // TODO: check if saving is needed
-    //qDebug("Writing bookmarks [%s] %s", qUtf8Printable(m_path), xbel->write(m_path) ? "ok" : "failed");
+    if(m_model->isModified())
+        qDebug("Writing bookmarks %s", m_model->write(xbel) ? "ok" : "failed");
 }
 
 QAbstractItemModel *BookmarksWidget::model() const
@@ -77,23 +75,6 @@ QAbstractItemModel *BookmarksWidget::model() const
     return m_model;
 }
 
-void BookmarksWidget::expandNodes(BookmarkItem *node)
-{
-    // iterate through children
-    for(int i = 0; i < node->childCount(); ++i) {
-        BookmarkItem *childNode = node->child(i);
-
-        // and if it's a folder
-        if(childNode->type() == BookmarkItem::Folder) {
-            QModelIndex index = m_model->index(childNode);
-            ui->treeView->setExpanded(index, !childNode->folded);
-
-            // only folders have children, so go through them
-            expandNodes(childNode);
-        }
-    }
-}
-
 void BookmarksWidget::closeOthers()
 {
     emit closeOthersSignal();