Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 09:32:12 +01:00
Code Releases Activity

[Bookmarks] Save bookmarks with AutoSaver

Browse Source 
Also implement loading & saving expanded property of top-level
internal folders (toolbar, menu, unsorted).
This commit is contained in:
nowrep 2014-02-08 21:11:13 +01:00
parent 9348f1d4fc
commit 1536cd0c46
4 changed files with 70 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/lib/app/mainapplication.cpp
View File

@ -1187,8 +1187,9 @@ bool MainApplication::saveStateSlot()
qupzilla_->tabWidget()->savePinnedTabs();
}
// Saving cookies
// Save cookies & bookmarks
m_cookiejar->saveCookies();
m_bookmarks->saveBookmarks();
return true;
}

103
src/lib/bookmarks/bookmarks.cpp
View File

@ -73,31 +73,37 @@ void Bookmarks::loadBookmarks()
return;
}
const QVariantMap map = res.toMap();
const QVariantMap bookmarksMap = map.value("roots").toMap();
const QVariantMap bookmarksMap = res.toMap().value("roots").toMap();
readBookmarks(bookmarksMap.value("bookmark_bar").toMap().value("children").toList(), m_folderToolbar);
readBookmarks(bookmarksMap.value("bookmark_menu").toMap().value("children").toList(), m_folderMenu);
readBookmarks(bookmarksMap.value("other").toMap().value("children").toList(), m_folderUnsorted);
#define READ_FOLDER(name, folder) \
readBookmarks(bookmarksMap.value(name).toMap().value("children").toList(), folder); \
folder->setExpanded(bookmarksMap.value(name).toMap().value("expanded").toBool());
READ_FOLDER("bookmark_bar", m_folderToolbar)
READ_FOLDER("bookmark_menu", m_folderMenu)
READ_FOLDER("other", m_folderUnsorted)
#undef READ_FOLDER
m_model = new BookmarksModel(this, this);
}
void Bookmarks::saveBookmarks()
{
QVariantMap toolbarMap;
toolbarMap.insert("children", writeBookmarks(m_folderToolbar));
QVariantMap menuMap;
menuMap.insert("children", writeBookmarks(m_folderMenu));
QVariantMap unsortedMap;
unsortedMap.insert("children", writeBookmarks(m_folderUnsorted));
QVariantMap bookmarksMap;
bookmarksMap.insert("bookmark_bar", toolbarMap);
bookmarksMap.insert("bookmark_menu", menuMap);
bookmarksMap.insert("other", unsortedMap);
#define WRITE_FOLDER(name, mapName, folder) \
QVariantMap mapName; \
mapName.insert("children", writeBookmarks(folder)); \
mapName.insert("expanded", folder->isExpanded()); \
mapName.insert("name", folder->title()); \
mapName.insert("description", folder->description()); \
mapName.insert("type", "folder"); \
bookmarksMap.insert(name, mapName);
WRITE_FOLDER("bookmark_bar", toolbarMap, m_folderToolbar)
WRITE_FOLDER("bookmark_menu", menuMap, m_folderMenu)
WRITE_FOLDER("other", unsortedMap, m_folderUnsorted)
#undef CREATE_VARIANTMAP
QVariantMap map;
map.insert("version", Qz::bookmarksVersion);
@ -123,9 +129,7 @@ void Bookmarks::saveBookmarks()
void Bookmarks::readBookmarks(const QVariantList &list, BookmarkItem* parent)
{
if (!parent) {
return;
}
Q_ASSERT(parent);
foreach (const QVariant &entry, list) {
const QVariantMap map = entry.toMap();
@ -136,11 +140,24 @@ void Bookmarks::readBookmarks(const QVariantList &list, BookmarkItem* parent)
}
BookmarkItem* item = new BookmarkItem(type, parent);
item->setUrl(map.value("url").toUrl());
item->setTitle(map.value("name").toString());
item->setDescription(map.value("description").toString());
item->setKeyword(map.value("keyword").toString());
item->setExpanded(map.value("expanded").toBool());
switch (type) {
case BookmarkItem::Url:
item->setUrl(map.value("url").toUrl());
item->setTitle(map.value("name").toString());
item->setDescription(map.value("description").toString());
item->setKeyword(map.value("keyword").toString());
break;
case BookmarkItem::Folder:
item->setTitle(map.value("name").toString());
item->setDescription(map.value("description").toString());
item->setExpanded(map.value("expanded").toBool());
break;
default:
break;
}
if (map.contains("children")) {
readBookmarks(map.value("children").toList(), item);
@ -150,20 +167,31 @@ void Bookmarks::readBookmarks(const QVariantList &list, BookmarkItem* parent)
QVariantList Bookmarks::writeBookmarks(BookmarkItem* parent)
{
QVariantList list;
Q_ASSERT(parent);
if (!parent) {
return list;
}
QVariantList list;
foreach (BookmarkItem* child, parent->children()) {
QVariantMap map;
map.insert("type", BookmarkItem::typeToString(child->type()));
map.insert("url", child->url());
map.insert("name", child->title());
map.insert("description", child->description());
map.insert("keyword", child->keyword());
map.insert("expanded", child->isExpanded());
switch (child->type()) {
case BookmarkItem::Url:
map.insert("url", child->url());
map.insert("name", child->title());
map.insert("description", child->description());
map.insert("keyword", child->keyword());
break;
case BookmarkItem::Folder:
map.insert("name", child->title());
map.insert("description", child->description());
map.insert("expanded", child->isExpanded());
break;
default:
break;
}
if (!child->children().isEmpty()) {
map.insert("children", writeBookmarks(child));
@ -787,13 +815,16 @@ bool Bookmarks::removeBookmark(BookmarkItem* item)
void Bookmarks::notifyBookmarkChanged(BookmarkItem* item)
{
Q_ASSERT(item);
emit bookmarkChanged(item);
}
bool Bookmarks::canBeModified(BookmarkItem* item) const
{
return item &&
item != m_root &&
Q_ASSERT(item);
return item != m_root &&
item != m_folderToolbar &&
item != m_folderMenu &&
item != m_folderUnsorted;

2
src/lib/bookmarks/bookmarks.h
View File

@ -60,6 +60,7 @@ public:
};
void loadSettings();
void saveBookmarks();
bool isShowingMostVisited() const;
void setShowingMostVisited(bool state);
@ -143,7 +144,6 @@ public slots:
private:
void loadBookmarks();
void saveBookmarks();
void readBookmarks(const QVariantList &list, BookmarkItem* parent);
QVariantList writeBookmarks(BookmarkItem* parent);

3
src/lib/bookmarks/bookmarksmanager.cpp
View File

@ -178,7 +178,6 @@ void BookmarksManager::addBookmark()
BookmarkItem* item = new BookmarkItem(BookmarkItem::Url);
item->setTitle(tr("New Bookmark"));
item->setUrl(QUrl("http://"));
addBookmark(item);
}
@ -186,14 +185,12 @@ void BookmarksManager::addFolder()
{
BookmarkItem* item = new BookmarkItem(BookmarkItem::Folder);
item->setTitle(tr("New Folder"));
addBookmark(item);
}
void BookmarksManager::addSeparator()
{
BookmarkItem* item = new BookmarkItem(BookmarkItem::Separator);
addBookmark(item);
}