1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 18:56:34 +01:00

[Bookmarks] Added default bookmarks.json file

Default browsedata.db now also contains icons for default bookmarks.
This commit is contained in:
nowrep 2014-02-10 17:51:52 +01:00
parent c39c8d66fb
commit 283960f33e
5 changed files with 79 additions and 0 deletions

View File

@ -204,6 +204,9 @@ void BookmarksToolbarButton::init()
QString BookmarksToolbarButton::createTooltip() const
{
if (!m_bookmark->description().isEmpty()) {
if (!m_bookmark->urlString().isEmpty()) {
return QString("%1\n%2").arg(m_bookmark->description(), m_bookmark->urlString());
}
return m_bookmark->description();
}

View File

@ -2,5 +2,6 @@
<qresource prefix="/">
<file>data/browsedata.db</file>
<file>data/profiles.ini</file>
<file>data/bookmarks.json</file>
</qresource>
</RCC>

View File

@ -0,0 +1,74 @@
{
"roots" : {
"bookmark_bar" : {
"children" : [
{
"description" : "Source code of QupZilla",
"keyword" : "qz-git",
"name" : "QupZilla Git",
"type" : "url",
"url" : "https://github.com/QupZilla/qupzilla",
"visit_count" : 0
},
{
"description" : "GitHub Issue Tracker for QupZilla",
"keyword" : "qz-issues",
"name" : "QupZilla Issues",
"type" : "url",
"url" : "https://github.com/QupZilla/qupzilla/issues",
"visit_count" : 0
},
{
"description" : "",
"keyword" : "qz-wiki",
"name" : "QupZilla Wiki",
"type" : "url",
"url" : "https://github.com/QupZilla/qupzilla/wiki",
"visit_count" : 0
},
{
"description" : "Blog with development updates",
"keyword" : "qz-blog",
"name" : "QupZilla Blog",
"type" : "url",
"url" : "http://blog.qupzilla.com/",
"visit_count" : 0
},
{
"description" : "QupZilla Homepage",
"keyword" : "qz-home",
"name" : "QupZilla Home",
"type" : "url",
"url" : "http://www.qupzilla.com/",
"visit_count" : 0
}
],
"description" : "Bookmarks located in Bookmarks Toolbar",
"expanded" : true,
"expanded_sidebar" : true,
"name" : "Bookmarks Toolbar",
"type" : "folder"
},
"bookmark_menu" : {
"children" : [
],
"description" : "Bookmarks located in Bookmarks Menu",
"expanded" : true,
"expanded_sidebar" : true,
"name" : "Bookmarks Menu",
"type" : "folder"
},
"other" : {
"children" : [
],
"description" : "All other bookmarks",
"expanded" : true,
"expanded_sidebar" : true,
"name" : "Unsorted Bookmarks",
"type" : "folder"
}
},
"version" : 1
}

Binary file not shown.

View File

@ -108,6 +108,7 @@ void BrowsingLibrary::importBookmarks()
void BrowsingLibrary::exportBookmarks()
{
qDebug("BrowsingLibrary::exportBookmarks() NOT IMPLEMENTED");
}
void BrowsingLibrary::showHistory(QupZilla* mainClass)