Mercurial Repositories > eric / changeset

Binary file Documentation/Help/source.qch has changed

--- a/Helpviewer/Bookmarks/NsHtmlWriter.py	Sat Mar 24 17:57:55 2012 +0100
+++ b/Helpviewer/Bookmarks/NsHtmlWriter.py	Sat Mar 24 19:30:26 2012 +0100
@@ -97,9 +97,22 @@
         @param node reference to the node to be written (BookmarkNode)
         @param indent size of the indentation (integer)
         """
+        if node.added.isValid():
+            added = " ADD_DATE=\"{0}\"".format(node.added.toTime_t())
+        else:
+            added = ""
+        if node.modified.isValid():
+            modified = " LAST_MODIFIED=\"{0}\"".format(node.modified.toTime_t())
+        else:
+            modified = ""
+        if node.visited.isValid():
+            visited = " LAST_VISIT=\"{0}\"".format(node.visited.toTime_t())
+        else:
+            visited = ""
+        
         self.__dev.write(" " * indent)
-        self.__dev.write("<DT><A HREF=\"{0}\">{1}</A>\n".format(
-            node.url, Utilities.html_uencode(node.title)
+        self.__dev.write("<DT><A HREF=\"{0}\"{1}{2}{3}>{4}</A>\n".format(
+            node.url, added, modified, visited, Utilities.html_uencode(node.title)
         ))
     
     def __writeFolder(self, node, indent):
@@ -114,9 +127,14 @@
         else:
             folded = " FOLDED"
         
+        if node.added.isValid():
+            added = " ADD_DATE=\"{0}\"".format(node.added.toTime_t())
+        else:
+            added = ""
+        
         self.__dev.write(" " * indent)
-        self.__dev.write("<DT><H3{0}>{1}</H3>\n".format(
-            folded, Utilities.html_uencode(node.title)
+        self.__dev.write("<DT><H3{0}{1}>{2}</H3>\n".format(
+            folded, added, Utilities.html_uencode(node.title)
         ))
         
         if node.desc:

--- a/Helpviewer/HelpBrowserWV.py	Sat Mar 24 17:57:55 2012 +0100
+++ b/Helpviewer/HelpBrowserWV.py	Sat Mar 24 19:30:26 2012 +0100
@@ -28,6 +28,7 @@
 import UI.PixmapCache
 
 from .Bookmarks.AddBookmarkDialog import AddBookmarkDialog
+from .Bookmarks.BookmarkNode import BookmarkNode
 from .JavaScriptResources import fetchLinks_js
 try:
     from .SslInfoDialog import SslInfoDialog
@@ -401,6 +402,15 @@
            reply.url() == self.mainFrame().url():
             self.__sslConfiguration = reply.sslConfiguration()
             self.__sslConfiguration.url = QUrl(reply.url())
+        
+        if reply.error() == QNetworkReply.NoError and \
+           mainFrameRequest and \
+           reply.url() == self.mainFrame().url():
+            modified = reply.header(QNetworkRequest.LastModifiedHeader)
+            if modified and modified.isValid():
+                manager = Helpviewer.HelpWindow.HelpWindow.bookmarksManager()
+                for bookmark in manager.bookmarksForUrl(reply.url()):
+                    manager.setTimestamp(bookmark, BookmarkNode.TsModified, modified)
     
     def getSslInfo(self):
         """

--- a/Helpviewer/UrlBar/UrlBar.py	Sat Mar 24 17:57:55 2012 +0100
+++ b/Helpviewer/UrlBar/UrlBar.py	Sat Mar 24 19:30:26 2012 +0100
@@ -148,9 +148,10 @@
         manager = Helpviewer.HelpWindow.HelpWindow.bookmarksManager()
         if manager.bookmarkForUrl(self.__browser.url()) is not None:
             self.__bookmarkButton.setIcon(self.__bmActiveIcon)
-            bookmark = manager.bookmarkForUrl(self.__browser.url())
-            manager.setTimestamp(bookmark, BookmarkNode.TsVisited,
-                                 QDateTime.currentDateTime())
+            bookmarks = manager.bookmarksForUrl(self.__browser.url())
+            for bookmark in bookmarks:
+                manager.setTimestamp(bookmark, BookmarkNode.TsVisited,
+                                     QDateTime.currentDateTime())
         elif Helpviewer.HelpWindow.HelpWindow.speedDial()\
            .pageForUrl(self.__browser.url()).url != "":
             self.__bookmarkButton.setIcon(self.__bmActiveIcon)