From 067b99a053b6f8b1ccab507be8e828b2f72a1e43 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Wed, 10 Feb 2010 10:57:57 +0100
Subject: Fix copyright for 0.4 beta release

---
 src/history/historymodels.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/history/historymodels.cpp')

diff --git a/src/history/historymodels.cpp b/src/history/historymodels.cpp
index cf8d1aed..709d0523 100644
--- a/src/history/historymodels.cpp
+++ b/src/history/historymodels.cpp
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
 * Copyright (C) 2008 Benjamin C. Meyer <ben@meyerhome.net>
-* Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2010 by Andrea Diamantini <adjam7 at gmail dot com>
 *
 *
 * This program is free software; you can redistribute it and/or
-- 
cgit v1.2.1


From e9670c51fef2c8447a04a30778a24646df4ef915 Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Tue, 23 Mar 2010 22:56:26 +0100
Subject: A lot of fix and improvements for the bookmark and the history panels

---
 src/history/historymodels.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src/history/historymodels.cpp')

diff --git a/src/history/historymodels.cpp b/src/history/historymodels.cpp
index 709d0523..736dbcd7 100644
--- a/src/history/historymodels.cpp
+++ b/src/history/historymodels.cpp
@@ -118,6 +118,8 @@ QVariant HistoryModel::data(const QModelIndex &index, int role) const
         return item.dateTime.date();
     case UrlRole:
         return QUrl(item.url);
+    case Qt::UserRole:
+	return KUrl(item.url);
     case UrlStringRole:
         return item.url;
     case Qt::DisplayRole:
@@ -144,6 +146,12 @@ QVariant HistoryModel::data(const QModelIndex &index, int role) const
         {
             return Application::icon(item.url);
         }
+    case Qt::ToolTipRole:
+        QString tooltip = "";
+        if(!item.title.isEmpty())
+            tooltip = item.title + "\n";
+        tooltip += item.dateTime.toString(Qt::SystemLocaleShortDate) + "\n" + item.url;
+        return tooltip;
     }
     return QVariant();
 }
-- 
cgit v1.2.1