Mercurial Repositories > eric / changeset

Binary file Documentation/Help/source.qch has changed

--- a/Documentation/Help/source.qhp	Wed Jul 13 14:09:52 2016 +0200
+++ b/Documentation/Help/source.qhp	Thu Jul 14 18:56:39 2016 +0200
@@ -3192,6 +3192,7 @@
       <keyword name="CookiesDialog (Module)" id="CookiesDialog (Module)" ref="eric6.WebBrowser.CookieJar.CookiesDialog.html" />
       <keyword name="CookiesDialog.__addCookie" id="CookiesDialog.__addCookie" ref="eric6.WebBrowser.CookieJar.CookiesDialog.html#CookiesDialog.__addCookie" />
       <keyword name="CookiesDialog.__cookieDomain" id="CookiesDialog.__cookieDomain" ref="eric6.WebBrowser.CookieJar.CookiesDialog.html#CookiesDialog.__cookieDomain" />
+      <keyword name="CookiesDialog.__resizeColumns" id="CookiesDialog.__resizeColumns" ref="eric6.WebBrowser.CookieJar.CookiesDialog.html#CookiesDialog.__resizeColumns" />
       <keyword name="CookiesDialog.__showCookieDetails" id="CookiesDialog.__showCookieDetails" ref="eric6.Helpviewer.CookieJar.CookiesDialog.html#CookiesDialog.__showCookieDetails" />
       <keyword name="CookiesDialog.__tableModelReset" id="CookiesDialog.__tableModelReset" ref="eric6.Helpviewer.CookieJar.CookiesDialog.html#CookiesDialog.__tableModelReset" />
       <keyword name="CookiesDialog.__tableSelectionChanged" id="CookiesDialog.__tableSelectionChanged" ref="eric6.Helpviewer.CookieJar.CookiesDialog.html#CookiesDialog.__tableSelectionChanged" />

--- a/Documentation/Source/eric6.WebBrowser.CookieJar.CookiesDialog.html	Wed Jul 13 14:09:52 2016 +0200
+++ b/Documentation/Source/eric6.WebBrowser.CookieJar.CookiesDialog.html	Thu Jul 14 18:56:39 2016 +0200
@@ -66,6 +66,9 @@
 <td><a href="#CookiesDialog.__cookieDomain">__cookieDomain</a></td>
 <td>Private method to extract the cookie domain.</td>
 </tr><tr>
+<td><a href="#CookiesDialog.__resizeColumns">__resizeColumns</a></td>
+<td>Private slot to resize the columns.</td>
+</tr><tr>
 <td><a href="#CookiesDialog.on_addButton_clicked">on_addButton_clicked</a></td>
 <td>Private slot to add a new exception.</td>
 </tr><tr>
@@ -129,7 +132,12 @@
 <dd>
 str
 </dd>
-</dl><a NAME="CookiesDialog.on_addButton_clicked" ID="CookiesDialog.on_addButton_clicked"></a>
+</dl><a NAME="CookiesDialog.__resizeColumns" ID="CookiesDialog.__resizeColumns"></a>
+<h4>CookiesDialog.__resizeColumns</h4>
+<b>__resizeColumns</b>(<i></i>)
+<p>
+        Private slot to resize the columns.
+</p><a NAME="CookiesDialog.on_addButton_clicked" ID="CookiesDialog.on_addButton_clicked"></a>
 <h4>CookiesDialog.on_addButton_clicked</h4>
 <b>on_addButton_clicked</b>(<i></i>)
 <p>

--- a/WebBrowser/CookieJar/CookiesDialog.py	Wed Jul 13 14:09:52 2016 +0200
+++ b/WebBrowser/CookieJar/CookiesDialog.py	Thu Jul 14 18:56:39 2016 +0200
@@ -10,7 +10,7 @@
 from __future__ import unicode_literals
 
 from PyQt5.QtCore import pyqtSlot, Qt, QByteArray
-from PyQt5.QtWidgets import QDialog, QTreeWidgetItem
+from PyQt5.QtWidgets import QDialog, QTreeWidgetItem,  QHeaderView
 
 from E5Gui import E5MessageBox
 
@@ -40,8 +40,23 @@
         
         self.__domainDict = {}
         
+        self.cookiesTree.headerItem().setText(
+            self.cookiesTree.columnCount(), "")
+        
         for cookie in self.__cookieJar.cookies():
             self.__addCookie(cookie)
+        self.__resizeColumns()
+        
+        self.cookiesTree.itemExpanded.connect(self.__resizeColumns)
+        self.cookiesTree.itemCollapsed.connect(self.__resizeColumns)
+    
+    @pyqtSlot()
+    def __resizeColumns(self):
+        """
+        Private slot to resize the columns.
+        """
+        self.cookiesTree.header().resizeSections(QHeaderView.ResizeToContents)
+        self.cookiesTree.header().setStretchLastSection(True)
     
     def __cookieDomain(self, cookie):
         """