Mercurial Repositories > eric / changeset

--- a/E4Gui/E4ModelMenu.py	Thu Jan 07 19:03:58 2010 +0000
+++ b/E4Gui/E4ModelMenu.py	Fri Jan 08 14:44:33 2010 +0000
@@ -316,7 +316,10 @@
                 row = self.__model.rowCount(self.__root)
             else:
                 idx = self.index(act)
-                assert idx.isValid()
+                if not idx.isValid():
+                    QMenu.dropEvent(self, evt)
+                    return
+                
                 row = idx.row()
                 if self.__model.hasChildren(idx):
                     parentIndex = idx
@@ -327,6 +330,7 @@
             evt.acceptProposedAction()
             self.__model.dropMimeData(evt.mimeData(), evt.dropAction(), 
                                       row, 0, parentIndex)
+            self.close()
         
         QMenu.dropEvent(self, evt)
     

--- a/Helpviewer/HelpBrowserWV.py	Thu Jan 07 19:03:58 2010 +0000
+++ b/Helpviewer/HelpBrowserWV.py	Fri Jan 08 14:44:33 2010 +0000
@@ -874,8 +874,8 @@
             imageBuffer = QBuffer()
             imageBuffer.open(QIODevice.ReadWrite)
             if pixmap.save(imageBuffer, "PNG"):
-                html.replace("IMAGE_BINARY_DATA_HERE", 
-                             str(imageBuffer.buffer().toBase64()))
+                html = html.replace("IMAGE_BINARY_DATA_HERE", 
+                             bytes(imageBuffer.buffer().toBase64()).decode())
             html = html.format(
                 title, 
                 reply.errorString(), 

--- a/Helpviewer/History/HistoryManager.py	Thu Jan 07 19:03:58 2010 +0000
+++ b/Helpviewer/History/HistoryManager.py	Fri Jan 08 14:44:33 2010 +0000
@@ -134,7 +134,7 @@
         
         @return reference to the list of history entries (list of HistoryEntry)
         """
-        return self.__history
+        return self.__history[:]
     
     def setHistory(self, history, loadedAndSorted = False):
         """

--- a/Helpviewer/Network/PyrcAccessHandler.py	Thu Jan 07 19:03:58 2010 +0000
+++ b/Helpviewer/Network/PyrcAccessHandler.py	Fri Jan 08 14:44:33 2010 +0000
@@ -38,8 +38,8 @@
             imageBuffer = QBuffer()
             imageBuffer.open(QIODevice.ReadWrite)
             if pixmap.save(imageBuffer, "PNG"):
-                html.replace("IMAGE_BINARY_DATA_HERE", 
-                             str(imageBuffer.buffer().toBase64()))
+                html = html.replace("IMAGE_BINARY_DATA_HERE", 
+                             bytes(imageBuffer.buffer().toBase64()).decode())
             return NetworkReply(request, QByteArray(html), "text/html")
         
         return NetworkProtocolUnknownErrorReply("pyrc")