Merge commit 'refs/merge-requests/2246' of git://gitorious.org/rekonq/mainline into m2246

2 files changed, 37 insertions, 0 deletions

diff --git a/src/data/home.html b/src/data/home.html
index 97bec22d..25236743 100644
--- a/src/data/home.html
+++ b/src/data/home.html
@@ -189,6 +189,13 @@ margin-right: 5px;
 }
 
 /* -------------------------------------------------------- */
+/* Empty pages : in the end : need to overwrite */
+#content.empty {
+margin-top: 10%;
+text-align: center;
+}
+
+
 </style>
 </head>
 
diff --git a/src/newtabpage.cpp b/src/newtabpage.cpp
index d7671937..b709375a 100644
--- a/src/newtabpage.cpp
+++ b/src/newtabpage.cpp
@@ -180,6 +180,13 @@ void NewTabPage::favoritesPage()
     QStringList names = ReKonfig::previewNames();
     QStringList urls = ReKonfig::previewUrls();
     
+    if(urls.isEmpty())
+    {
+        m_root.addClass("empty");
+        m_root.setPlainText(i18n("You can add a preview by clicking the \"Add Preview\" button in the top-right corner of this page"));
+        return;
+    }
+    
     for(int i=0; i < urls.count() ; ++i)
     {
         KUrl url = urls.at(i);
@@ -396,6 +403,13 @@ void NewTabPage::historyPage()
     
     HistoryTreeModel *model = Application::historyManager()->historyTreeModel();
     
+    if(model->rowCount() == 0)
+    {
+        m_root.addClass("empty");
+        m_root.setPlainText(i18n("Your browsing history is empty"));
+        return;
+    }
+    
     int i = 0;
     do
     {
@@ -436,6 +450,8 @@ void NewTabPage::bookmarksPage()
     KBookmarkGroup bookGroup = Application::bookmarkProvider()->rootGroup();
     if (bookGroup.isNull())
     {
+        m_root.addClass("empty");
+        m_root.setPlainText(i18n("You have no bookmarks"));
         return;
     }
 
@@ -483,6 +499,13 @@ void NewTabPage::closedTabsPage()
     
     QList<HistoryItem> links = Application::instance()->mainWindow()->mainView()->recentlyClosedTabs();
     
+    if(links.isEmpty())
+    {
+        m_root.addClass("empty");
+        m_root.setPlainText(i18n("There are no recently closed tabs"));
+        return;
+    }
+    
     for(int i=0; i < links.count(); ++i)
     {
         HistoryItem item = links.at(i);
@@ -527,6 +550,13 @@ void NewTabPage::downloadsPage()
 
     DownloadList list = Application::historyManager()->downloads();
     
+    if(list.isEmpty())
+    {
+        m_root.addClass("empty");
+        m_root.setPlainText(i18n("There are no recently downloaded files to show"));
+        return;
+    }
+    
     foreach(const DownloadItem &item, list)
     {
         m_root.prependInside(markup("div"));