Merged with changes of Tobias.

Sat, 11 Feb 2017 18:19:56 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sat, 11 Feb 2017 18:19:56 +0100
changeset 5511
54632671aa3b
parent 5508
30626def80dc (diff)
parent 5510
cdcd0cd34e79 (current diff)
child 5512
f148796813d4

Merged with changes of Tobias.

--- a/DataViews/CodeMetricsDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/DataViews/CodeMetricsDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -171,7 +171,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
--- a/DataViews/PyCoverageDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/DataViews/PyCoverageDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -205,7 +205,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>excludeCombo</tabstop>
--- a/DataViews/PyProfileDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/DataViews/PyProfileDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -154,7 +154,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>resultList</tabstop>
--- a/Debugger/EditBreakpointDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Debugger/EditBreakpointDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -167,7 +167,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
--- a/Debugger/EditWatchpointDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Debugger/EditWatchpointDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -144,7 +144,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>conditionButton</tabstop>
--- a/Debugger/ExceptionsFilterDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Debugger/ExceptionsFilterDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -100,7 +100,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>exceptionList</tabstop>
--- a/Debugger/StartCoverageDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Debugger/StartCoverageDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -213,7 +213,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
--- a/Debugger/StartDebugDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Debugger/StartDebugDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -265,7 +265,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
--- a/Debugger/StartProfileDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Debugger/StartProfileDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -213,7 +213,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
--- a/Debugger/StartRunDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Debugger/StartRunDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -236,7 +236,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
--- a/Debugger/VariableDetailDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Debugger/VariableDetailDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -79,7 +79,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>eName</tabstop>
--- a/Debugger/VariablesFilterDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Debugger/VariablesFilterDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -104,7 +104,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>localsList</tabstop>
--- a/Graphics/UMLSceneSizeDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Graphics/UMLSceneSizeDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -68,7 +68,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <resources/>
  <connections>
--- a/Plugins/AboutPlugin/AboutDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/AboutPlugin/AboutDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -139,7 +139,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11"/>
  <tabstops>
   <tabstop>aboutTabWidget</tabstop>
   <tabstop>aboutEdit</tabstop>
--- a/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -677,7 +677,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
--- a/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -143,7 +143,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
--- a/Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -149,7 +149,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
--- a/Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -236,7 +236,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
--- a/Plugins/DocumentationPlugins/Ericapi/EricapiExecDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/DocumentationPlugins/Ericapi/EricapiExecDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -86,7 +86,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>contents</tabstop>
--- a/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -519,7 +519,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
--- a/Plugins/DocumentationPlugins/Ericdoc/EricdocExecDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/DocumentationPlugins/Ericdoc/EricdocExecDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -86,7 +86,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>contents</tabstop>
--- a/Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py	Sat Feb 11 18:19:56 2017 +0100
@@ -83,11 +83,14 @@
             if res:
                 dia.exec_()
     
-    def hgGpgSign(self, path):
+    def hgGpgSign(self, path, revisions=None):
         """
         Public method used to list the available bookmarks.
         
-        @param path directory name of the project (string)
+        @param path directory name of the project
+        @type str
+        @param revisions list containing the revisions to be signed
+        @type list of str
         """
         # find the root of the repo
         repodir = self.vcs.splitPath(path)[0]
@@ -96,30 +99,44 @@
             if os.path.splitdrive(repodir)[1] == os.sep:
                 return
         
-        from .HgGpgSignDialog import HgGpgSignDialog
-        dlg = HgGpgSignDialog(self.vcs.hgGetTagsList(repodir),
-                              self.vcs.hgGetBranchesList(repodir),
-                              self.vcs.hgGetBookmarksList(repodir))
-        if dlg.exec_() == QDialog.Accepted:
-            revision, noCommit, message, keyId, local, force = dlg.getData()
-            
-            args = self.vcs.initCommand("sign")
-            if noCommit:
-                args.append("--no-commit")
-            if message:
-                args.append("--message")
-                args.append(message)
-            if keyId:
-                args.append("--key")
-                args.append(keyId)
-            if local:
-                args.append("--local")
-            if force:
-                args.append("--force")
-            if revision:
-                args.append(revision)
-            
-            dia = HgDialog(self.tr('Sign Revision'), self.vcs)
-            res = dia.startProcess(args, repodir)
-            if res:
-                dia.exec_()
+        if revisions is None:
+            from .HgGpgSignDialog import HgGpgSignDialog
+            dlg = HgGpgSignDialog(self.vcs.hgGetTagsList(repodir),
+                                  self.vcs.hgGetBranchesList(repodir),
+                                  self.vcs.hgGetBookmarksList(repodir))
+            if dlg.exec_() == QDialog.Accepted:
+                revision, noCommit, message, keyId, local, force = \
+                    dlg.getData()
+                if revision:
+                    revisions = [revision]
+                else:
+                    revisions = []
+            else:
+                return
+        else:
+            noCommit = False
+            message = ""
+            keyId = ""
+            local = False
+            force = False
+        
+        args = self.vcs.initCommand("sign")
+        if noCommit:
+            args.append("--no-commit")
+        if message:
+            args.append("--message")
+            args.append(message)
+        if keyId:
+            args.append("--key")
+            args.append(keyId)
+        if local:
+            args.append("--local")
+        if force:
+            args.append("--force")
+        for rev in revisions:
+            args.append(rev)
+        
+        dia = HgDialog(self.tr('Sign Revision'), self.vcs)
+        res = dia.startProcess(args, repodir)
+        if res:
+            dia.exec_()
--- a/Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -148,7 +148,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>input</tabstop>
--- a/Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -165,7 +165,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>input</tabstop>
--- a/Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.py	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.py	Sat Feb 11 18:19:56 2017 +0100
@@ -138,7 +138,9 @@
             string, boolean)
         """
         if self.multipleButton.isChecked():
-            revs = self.multipleEdit.toPlainText().strip().splitlines()
+            revs = [rev.strip() for rev in
+                    self.multipleEdit.toPlainText().strip().splitlines()
+                    if rev.strip()]
         elif self.tagButton.isChecked():
             revs = [self.tagCombo.currentText()]
         elif self.branchButton.isChecked():
@@ -148,7 +150,9 @@
         else:
             revs = []
         
-        baseRevs = self.baseRevisionsEdit.toPlainText().strip().splitlines()
+        baseRevs = [rev.strip() for rev in
+                    self.baseRevisionsEdit.toPlainText().strip().splitlines()
+                    if rev.strip()]
         
         return (revs, baseRevs, self.compressionCombo.currentText(),
                 self.allCheckBox.isChecked())
--- a/Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -94,7 +94,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>commandCombo</tabstop>
--- a/Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -166,7 +166,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>logEdit</tabstop>
--- a/Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -87,7 +87,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
--- a/Plugins/VcsPlugins/vcsMercurial/HgDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -137,7 +137,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>resultbox</tabstop>
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Sat Feb 11 18:19:56 2017 +0100
@@ -17,12 +17,12 @@
 import re
 import collections
 
-from PyQt5.QtCore import pyqtSlot, Qt, QDate, QProcess, QTimer, QRegExp, \
-    QSize, QPoint, QFileInfo
+from PyQt5.QtCore import pyqtSlot, qVersion, Qt, QDate, QProcess, QTimer, \
+    QRegExp, QSize, QPoint, QFileInfo
 from PyQt5.QtGui import QCursor, QColor, QPixmap, QPainter, QPen, QBrush, \
     QIcon, QTextCursor
 from PyQt5.QtWidgets import QWidget, QDialogButtonBox, QHeaderView, \
-    QTreeWidgetItem, QApplication, QLineEdit, QMenu, QInputDialog
+    QTreeWidgetItem, QApplication, QLineEdit, QMenu, QInputDialog, QToolTip
 
 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox, E5FileDialog
@@ -73,6 +73,10 @@
         super(HgLogBrowserDialog, self).__init__(parent)
         self.setupUi(self)
         
+        windowFlags = self.windowFlags()
+        windowFlags |= Qt.WindowContextHelpButtonHint
+        self.setWindowFlags(windowFlags)
+        
         self.mainSplitter.setSizes([300, 400])
         self.mainSplitter.setStretchFactor(0, 1)
         self.mainSplitter.setStretchFactor(1, 2)
@@ -238,6 +242,11 @@
         Private method to initialize the actions menu.
         """
         self.__actionsMenu = QMenu()
+        self.__actionsMenu.setTearOffEnabled(True)
+        if qVersion() >= "5.1.0":
+            self.__actionsMenu.setToolTipsVisible(True)
+        else:
+            self.__actionsMenu.hovered.connect(self.__actionsMenuHovered)
         
         self.__graftAct = self.__actionsMenu.addAction(
             UI.PixmapCache.getIcon("vcsGraft.png"),
@@ -316,19 +325,64 @@
         
         self.__actionsMenu.addSeparator()
         
+        self.__bundleAct = self.__actionsMenu.addAction(
+            UI.PixmapCache.getIcon("vcsCreateChangegroup.png"),
+            self.tr("Create Changegroup"), self.__bundleActTriggered)
+        self.__bundleAct.setToolTip(self.tr(
+            "Create a changegroup file containing the selected changesets"))
+        self.__bundleAct.setWhatsThis(self.tr(
+            """<b>Create Changegroup</b>\n<p>This creates a changegroup"""
+            """ file containing the selected revisions. If no revisions"""
+            """ are selected, all changesets will be bundled. If one"""
+            """ revision is selected, it will be interpreted as the base"""
+            """ revision. Otherwise the lowest revision will be used as"""
+            """ the base revision and all other revision will be bundled."""
+            """ If the dialog is showing outgoing changesets, all"""
+            """ selected changesets will be bundled.</p>"""))
+        
+        self.__actionsMenu.addSeparator()
+        
+        self.__gpgSignAct = self.__actionsMenu.addAction(
+            UI.PixmapCache.getIcon("changesetSign.png"),
+            self.tr("Sign Revisions"), self.__gpgSignActTriggered)
+        self.__gpgSignAct.setToolTip(self.tr(
+            "Add a signature for the selected revisions"))
+        self.__gpgVerifyAct = self.__actionsMenu.addAction(
+            UI.PixmapCache.getIcon("changesetSignVerify.png"),
+            self.tr("Verify Signatures"), self.__gpgVerifyActTriggered)
+        self.__gpgVerifyAct.setToolTip(self.tr(
+            "Verify all signatures there may be for the selected revision"))
+        
+        self.__actionsMenu.addSeparator()
+        
         self.__stripAct = self.__actionsMenu.addAction(
             UI.PixmapCache.getIcon("fileDelete.png"),
             self.tr("Strip Changesets"), self.__stripActTriggered)
         self.__stripAct.setToolTip(self.tr(
             "Strip changesets from a repository"))
         
+        self.__actionsMenu.addSeparator()
+        
+        self.__selectAllAct = self.__actionsMenu.addAction(
+            self.tr("Select All Entries"), self.__selectAllActTriggered)
+        self.__unselectAllAct = self.__actionsMenu.addAction(
+            self.tr("Deselect All Entries"),
+            lambda: self.__selectAllActTriggered(False))
+        
         self.actionsButton.setIcon(
             UI.PixmapCache.getIcon("actionsToolButton.png"))
         self.actionsButton.setMenu(self.__actionsMenu)
     
-    # TODO: add action "Create Changegroup" (>=2 revs, lowest rev is base)
-    # TODO: add action "Sign Revision" (>= 1 revs) (GPG extension)
-    # TODO: add action "Verify Signature" (1 rev) (GPG extension)
+    def __actionsMenuHovered(self, action):
+        """
+        Private slot to show the tooltip for an action menu entry.
+        
+        @param action action to show tooltip for
+        @type QAction
+        """
+        QToolTip.showText(
+            QCursor.pos(), action.toolTip(),
+            self.__actionsMenu, self.__actionsMenu.actionGeometry(action))
     
     def __initData(self):
         """
@@ -1423,19 +1477,18 @@
                 # step 2: set the status of the graft action
                 self.__graftAct.setEnabled(otherBranches > 0)
             
-            self.__mergeAct.setEnabled(len(self.logTree.selectedItems()) == 1)
-            self.__tagAct.setEnabled(len(self.logTree.selectedItems()) == 1)
-            self.__switchAct.setEnabled(len(self.logTree.selectedItems()) == 1)
-            self.__bookmarkAct.setEnabled(
-                len(self.logTree.selectedItems()) == 1)
-            self.__bookmarkMoveAct.setEnabled(
-                len(self.logTree.selectedItems()) == 1)
+            selectedItemsCount = len(self.logTree.selectedItems())
+            self.__mergeAct.setEnabled(selectedItemsCount == 1)
+            self.__tagAct.setEnabled(selectedItemsCount == 1)
+            self.__switchAct.setEnabled(selectedItemsCount == 1)
+            self.__bookmarkAct.setEnabled(selectedItemsCount == 1)
+            self.__bookmarkMoveAct.setEnabled(selectedItemsCount == 1)
             
             if self.vcs.canPull():
                 self.__pullAct.setEnabled(True)
                 self.__lfPullAct.setEnabled(
                     self.vcs.isExtensionActive("largefiles") and
-                    bool(self.logTree.selectedItems()))
+                    selectedItemsCount > 0)
                 self.__fetchAct.setEnabled(
                     self.vcs.isExtensionActive("fetch"))
             else:
@@ -1445,7 +1498,7 @@
             
             if self.vcs.canPush():
                 self.__pushAct.setEnabled(
-                    len(self.logTree.selectedItems()) == 1 and
+                    selectedItemsCount == 1 and
                     self.logTree.selectedItems()[0].text(self.PhaseColumn) ==
                     self.phases["draft"])
                 self.__pushAllAct.setEnabled(True)
@@ -1455,11 +1508,21 @@
             
             self.__stripAct.setEnabled(
                 self.vcs.isExtensionActive("strip") and
-                len(self.logTree.selectedItems()) == 1)
+                selectedItemsCount == 1)
+            
+            self.__bundleAct.setEnabled(self.logTree.topLevelItemCount() > 0)
+            
+            self.__gpgSignAct.setEnabled(
+                self.vcs.isExtensionActive("gpg") and
+                selectedItemsCount > 0)
+            self.__gpgVerifyAct.setEnabled(
+                self.vcs.isExtensionActive("gpg") and
+                selectedItemsCount == 1)
             
             self.actionsButton.setEnabled(True)
         else:
             self.actionsButton.setEnabled(False)
+        # TODO: add code to enable menu in incoming / outgoing mode as well
     
     def __updateDetailsAndFiles(self):
         """
@@ -2134,6 +2197,93 @@
             itm.text(self.RevisionColumn).strip().split(":", 1)[0])
         self.vcs.vcsMerge(self.repodir, rev=rev)
     
+    @pyqtSlot()
+    def __bundleActTriggered(self):
+        """
+        Private slot to create a changegroup file.
+        """
+        if self.initialCommandMode == "log":
+            selectedItems = self.logTree.selectedItems()
+            if len(selectedItems) == 0:
+                # all revisions of the local repository will be bundled
+                bundleData = {
+                    "revs": [],
+                    "base": "",
+                    "all": True,
+                }
+            elif len(selectedItems) == 1:
+                # the selected changeset is the base
+                rev = selectedItems[0].text(self.RevisionColumn)\
+                    .split(":", 1)[0].strip()
+                bundleData = {
+                    "revs": [],
+                    "base": rev,
+                    "all": False,
+                }
+            else:
+                # lowest revision is the base, others will be bundled
+                revs = []
+                for itm in selectedItems:
+                    rev = itm.text(self.RevisionColumn).split(":", 1)[0]
+                    try:
+                        revs.append(int(rev))
+                    except ValueError:
+                        # ignore silently
+                        pass
+                baseRev = min(revs)
+                while baseRev in revs:
+                    revs.remove(baseRev)
+                
+                bundleData = {
+                    "revs": [str(rev) for rev in revs],
+                    "base": str(baseRev),
+                    "all": False,
+                }
+        elif self.initialCommandMode == "outgoing":
+            # TODO: implement bundle for outgoing mode
+            pass
+        
+        self.vcs.hgBundle(self.repodir, bundleData=bundleData)
+    
+    @pyqtSlot()
+    def __gpgSignActTriggered(self):
+        """
+        Private slot to sign the selected revisions.
+        """
+        revs = []
+        for itm in self.logTree.selectedItems():
+            rev = itm.text(self.RevisionColumn).split(":", 1)[0].strip()
+            if rev:
+                revs.append(rev)
+        
+        if revs:
+            self.vcs.getExtensionObject("gpg").hgGpgSign(
+                self.repodir, revisions=revs)
+    
+    @pyqtSlot()
+    def __gpgVerifyActTriggered(self):
+        """
+        Private slot to verify the signatures of a selected revisions.
+        """
+        rev = self.logTree.selectedItems()[0].text(self.RevisionColumn)\
+            .split(":", 1)[0].strip()
+        if rev:
+            self.vcs.getExtensionObject("gpg").hgGpgVerifySignatures(
+                self.repodir, rev=rev)
+    
+    def __selectAllActTriggered(self, select=True):
+        """
+        Private method to select or unselect all log entries.
+        
+        @param select flag indicating to select all entries
+        @type bool
+        """
+        blocked = self.logTree.blockSignals(True)
+        for row in range(self.logTree.topLevelItemCount()):
+            self.logTree.topLevelItem(row).setSelected(select)
+        self.logTree.blockSignals(blocked)
+        self.on_logTree_itemSelectionChanged()
+    
     def __actionMode(self):
         """
         Private method to get the selected action mode.
--- a/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -145,7 +145,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
--- a/Plugins/VcsPlugins/vcsMercurial/HgOptionsDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgOptionsDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -61,7 +61,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>vcsLogEdit</tabstop>
--- a/Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -381,7 +381,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>number1Button</tabstop>
--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py	Sat Feb 11 18:19:56 2017 +0100
@@ -32,6 +32,9 @@
 import Preferences
 
 
+# TODO: convert action buttons to a tool button with menu and delete status
+#       list context menu (i.e. make it the action menu)
+# TODO: save window geometry and splitter state
 class HgStatusDialog(QWidget, Ui_HgStatusDialog):
     """
     Class implementing a dialog to show the output of the hg status command
@@ -74,9 +77,7 @@
             self.process.readyReadStandardOutput.connect(self.__readStdout)
             self.process.readyReadStandardError.connect(self.__readStderr)
         
-        self.diffSplitter.setStretchFactor(0, 2)
-        self.diffSplitter.setStretchFactor(1, 1)
-        self.diffSplitter.setSizes([400, 250])
+        self.diffSplitter.setSizes([350, 350])
         self.__diffSplitterState = None
         
         self.statusList.headerItem().setText(self.__lastColumn, "")
--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>950</width>
-    <height>650</height>
+    <width>1000</width>
+    <height>700</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -19,6 +19,43 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_3">
    <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>&amp;Filter on Status:</string>
+       </property>
+       <property name="buddy">
+        <cstring>statusFilterCombo</cstring>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QComboBox" name="statusFilterCombo">
+       <property name="toolTip">
+        <string>Select the status of entries to be shown</string>
+       </property>
+       <property name="sizeAdjustPolicy">
+        <enum>QComboBox::AdjustToContents</enum>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
     <widget class="QSplitter" name="diffSplitter">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
@@ -29,63 +66,17 @@
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <widget class="QWidget" name="statusWidget" native="true">
+     <property name="childrenCollapsible">
+      <bool>false</bool>
+     </property>
+     <widget class="QWidget" name="">
       <layout class="QVBoxLayout" name="verticalLayout">
-       <property name="leftMargin">
-        <number>0</number>
-       </property>
-       <property name="topMargin">
-        <number>0</number>
-       </property>
-       <property name="rightMargin">
-        <number>0</number>
-       </property>
-       <property name="bottomMargin">
-        <number>0</number>
-       </property>
-       <item>
-        <layout class="QHBoxLayout" name="horizontalLayout_2">
-         <item>
-          <spacer name="horizontalSpacer_2">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>40</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item>
-          <widget class="QLabel" name="label">
-           <property name="text">
-            <string>&amp;Filter on Status:</string>
-           </property>
-           <property name="buddy">
-            <cstring>statusFilterCombo</cstring>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QComboBox" name="statusFilterCombo">
-           <property name="toolTip">
-            <string>Select the status of entries to be shown</string>
-           </property>
-           <property name="sizeAdjustPolicy">
-            <enum>QComboBox::AdjustToContents</enum>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
        <item>
         <widget class="QTreeWidget" name="statusList">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
            <horstretch>0</horstretch>
-           <verstretch>3</verstretch>
+           <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="alternatingRowColors">
@@ -212,24 +203,9 @@
         </layout>
        </item>
       </layout>
-      <zorder>statusList</zorder>
-      <zorder></zorder>
-      <zorder></zorder>
      </widget>
-     <widget class="QWidget" name="diffWidget" native="true">
+     <widget class="QWidget" name="">
       <layout class="QVBoxLayout" name="verticalLayout_2">
-       <property name="leftMargin">
-        <number>0</number>
-       </property>
-       <property name="topMargin">
-        <number>0</number>
-       </property>
-       <property name="rightMargin">
-        <number>0</number>
-       </property>
-       <property name="bottomMargin">
-        <number>0</number>
-       </property>
        <item>
         <widget class="QLabel" name="label_2">
          <property name="text">
@@ -242,7 +218,7 @@
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
            <horstretch>0</horstretch>
-           <verstretch>1</verstretch>
+           <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="tabChangesFocus">
@@ -358,7 +334,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>statusFilterCombo</tabstop>
--- a/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -165,7 +165,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>tagList</tabstop>
--- a/Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -155,7 +155,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>tagCombo</tabstop>
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -165,7 +165,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>input</tabstop>
--- a/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -434,7 +434,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>parentButton</tabstop>
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/hg.py	Sat Feb 11 18:19:56 2017 +0100
@@ -2518,11 +2518,14 @@
         
         return status
     
-    def hgBundle(self, name):
+    def hgBundle(self, name, bundleData=None):
         """
         Public method to create a changegroup file.
         
-        @param name file/directory name (string)
+        @param name file/directory name
+        @type str
+        @param bundleData dictionary containing the bundle creation information
+        @type dict
         """
         dname, fname = self.splitPath(name)
         
@@ -2533,60 +2536,71 @@
             if os.path.splitdrive(repodir)[1] == os.sep:
                 return
         
-        from .HgBundleDialog import HgBundleDialog
-        dlg = HgBundleDialog(self.hgGetTagsList(repodir),
-                             self.hgGetBranchesList(repodir),
-                             self.hgGetBookmarksList(repodir))
-        if dlg.exec_() == QDialog.Accepted:
-            revs, baseRevs, compression, all = dlg.getParameters()
-            
-            fname, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
-                None,
-                self.tr("Create changegroup"),
-                self.__lastChangeGroupPath or repodir,
-                self.tr("Mercurial Changegroup Files (*.hg)"),
-                None,
-                E5FileDialog.Options(E5FileDialog.DontConfirmOverwrite))
-            
-            if not fname:
-                return  # user aborted
+        if bundleData is None:
+            from .HgBundleDialog import HgBundleDialog
+            dlg = HgBundleDialog(self.hgGetTagsList(repodir),
+                                 self.hgGetBranchesList(repodir),
+                                 self.hgGetBookmarksList(repodir))
+            if dlg.exec_() != QDialog.Accepted:
+                return
             
-            ext = QFileInfo(fname).suffix()
-            if not ext:
-                ex = selectedFilter.split("(*")[1].split(")")[0]
-                if ex:
-                    fname += ex
-            if QFileInfo(fname).exists():
-                res = E5MessageBox.yesNo(
-                    self.__ui,
-                    self.tr("Create changegroup"),
-                    self.tr("<p>The Mercurial changegroup file <b>{0}</b> "
-                            "already exists. Overwrite it?</p>")
-                        .format(fname),
-                    icon=E5MessageBox.Warning)
-                if not res:
-                    return
-            fname = Utilities.toNativeSeparators(fname)
-            self.__lastChangeGroupPath = os.path.dirname(fname)
-            
-            args = self.initCommand("bundle")
-            if all:
-                args.append("--all")
-            for rev in revs:
-                args.append("--rev")
-                args.append(rev)
-            for baseRev in baseRevs:
-                args.append("--base")
-                args.append(baseRev)
-            if compression:
-                args.append("--type")
-                args.append(compression)
-            args.append(fname)
-            
-            dia = HgDialog(self.tr('Create changegroup'), self)
-            res = dia.startProcess(args, repodir)
-            if res:
-                dia.exec_()
+            revs, baseRevs, compression, all = dlg.getParameters()
+        else:
+            revs = bundleData["revs"]
+            if bundleData["base"]:
+                baseRevs = [bundleData["base"]]
+            else:
+                baseRevs = []
+            compression = ""
+            all = bundleData["all"]
+        
+        fname, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
+            None,
+            self.tr("Create changegroup"),
+            self.__lastChangeGroupPath or repodir,
+            self.tr("Mercurial Changegroup Files (*.hg)"),
+            None,
+            E5FileDialog.Options(E5FileDialog.DontConfirmOverwrite))
+        
+        if not fname:
+            return  # user aborted
+        
+        ext = QFileInfo(fname).suffix()
+        if not ext:
+            ex = selectedFilter.split("(*")[1].split(")")[0]
+            if ex:
+                fname += ex
+        if QFileInfo(fname).exists():
+            res = E5MessageBox.yesNo(
+                self.__ui,
+                self.tr("Create changegroup"),
+                self.tr("<p>The Mercurial changegroup file <b>{0}</b> "
+                        "already exists. Overwrite it?</p>")
+                    .format(fname),
+                icon=E5MessageBox.Warning)
+            if not res:
+                return
+        fname = Utilities.toNativeSeparators(fname)
+        self.__lastChangeGroupPath = os.path.dirname(fname)
+        
+        args = self.initCommand("bundle")
+        if all:
+            args.append("--all")
+        for rev in revs:
+            args.append("--rev")
+            args.append(rev)
+        for baseRev in baseRevs:
+            args.append("--base")
+            args.append(baseRev)
+        if compression:
+            args.append("--type")
+            args.append(compression)
+        args.append(fname)
+        
+        dia = HgDialog(self.tr('Create changegroup'), self)
+        res = dia.startProcess(args, repodir)
+        if res:
+            dia.exec_()
     
     def hgPreviewBundle(self, name):
         """
--- a/Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -123,7 +123,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
--- a/Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -92,7 +92,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>logEdit</tabstop>
--- a/Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -87,7 +87,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
--- a/Plugins/VcsPlugins/vcsPySvn/SvnDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -79,7 +79,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>resultbox</tabstop>
--- a/Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -129,7 +129,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>tag1Combo</tabstop>
--- a/Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -148,7 +148,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
--- a/Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -120,7 +120,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
--- a/Plugins/VcsPlugins/vcsPySvn/SvnPropDelDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnPropDelDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -59,7 +59,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>propNameEdit</tabstop>
--- a/Plugins/VcsPlugins/vcsPySvn/SvnPropListDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnPropListDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -93,7 +93,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>propsList</tabstop>
--- a/Plugins/VcsPlugins/vcsPySvn/SvnPropSetDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnPropSetDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -85,7 +85,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>propNameEdit</tabstop>
--- a/Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -327,7 +327,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>number1Button</tabstop>
--- a/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -266,7 +266,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>statusFilterCombo</tabstop>
--- a/Plugins/VcsPlugins/vcsPySvn/SvnSwitchDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnSwitchDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -99,7 +99,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>tagCombo</tabstop>
--- a/Plugins/VcsPlugins/vcsPySvn/SvnTagBranchListDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnTagBranchListDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -104,7 +104,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>tagList</tabstop>
--- a/Plugins/VcsPlugins/vcsPySvn/SvnTagDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnTagDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -126,7 +126,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>tagCombo</tabstop>
--- a/Plugins/VcsPlugins/vcsSubversion/SvnCommandDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnCommandDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -123,7 +123,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
--- a/Plugins/VcsPlugins/vcsSubversion/SvnCommitDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnCommitDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -92,7 +92,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>logEdit</tabstop>
--- a/Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -87,7 +87,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
--- a/Plugins/VcsPlugins/vcsSubversion/SvnDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -137,7 +137,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>resultbox</tabstop>
--- a/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -129,7 +129,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>tag1Combo</tabstop>
--- a/Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -148,7 +148,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
--- a/Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -120,7 +120,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
--- a/Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -93,7 +93,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>propsList</tabstop>
--- a/Plugins/VcsPlugins/vcsSubversion/SvnPropSetDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnPropSetDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -108,7 +108,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
--- a/Plugins/VcsPlugins/vcsSubversion/SvnRevisionSelectionDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnRevisionSelectionDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -327,7 +327,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>number1Button</tabstop>
--- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -321,7 +321,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>statusFilterCombo</tabstop>
--- a/Plugins/VcsPlugins/vcsSubversion/SvnSwitchDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnSwitchDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -99,7 +99,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>tagCombo</tabstop>
--- a/Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -162,7 +162,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>tagList</tabstop>
--- a/Plugins/VcsPlugins/vcsSubversion/SvnTagDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnTagDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -126,7 +126,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>tagCombo</tabstop>
--- a/Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -385,7 +385,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>rColor</tabstop>
--- a/Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -528,7 +528,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>rInformation</tabstop>
--- a/Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -400,7 +400,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>pyqtComboBox</tabstop>
--- a/Plugins/WizardPlugins/FontDialogWizard/FontDialogWizardDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/WizardPlugins/FontDialogWizard/FontDialogWizardDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -173,7 +173,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>eResultVar</tabstop>
--- a/Plugins/WizardPlugins/InputDialogWizard/InputDialogWizardDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/WizardPlugins/InputDialogWizard/InputDialogWizardDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -416,7 +416,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>rText</tabstop>
--- a/Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -380,7 +380,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>rInformation</tabstop>
--- a/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardCharactersDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardCharactersDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -112,7 +112,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>negativeCheckBox</tabstop>
--- a/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -511,7 +511,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>py2Button</tabstop>
--- a/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardRepeatDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardRepeatDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -178,7 +178,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>unlimitedButton</tabstop>
--- a/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardCharactersDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardCharactersDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -141,7 +141,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>negativeCheckBox</tabstop>
--- a/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -550,7 +550,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>variableLineEdit</tabstop>
--- a/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardRepeatDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardRepeatDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -171,7 +171,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>unlimitedButton</tabstop>
--- a/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardCharactersDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardCharactersDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -155,7 +155,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>negativeCheckBox</tabstop>
--- a/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -477,7 +477,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>variableLineEdit</tabstop>
--- a/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardRepeatDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardRepeatDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -196,7 +196,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>unlimitedButton</tabstop>
--- a/Preferences/ShortcutDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Preferences/ShortcutDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -110,7 +110,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>keyEdit</tabstop>
--- a/Preferences/ShortcutsDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Preferences/ShortcutsDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -123,7 +123,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
--- a/Preferences/ToolConfigurationDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Preferences/ToolConfigurationDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -316,7 +316,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
--- a/Preferences/ToolGroupConfigurationDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Preferences/ToolGroupConfigurationDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -186,7 +186,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>groupsList</tabstop>
--- a/Preferences/ViewProfileSidebarsDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Preferences/ViewProfileSidebarsDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -114,7 +114,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>eprtCheckBox</tabstop>
--- a/Preferences/ViewProfileToolboxesDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Preferences/ViewProfileToolboxesDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -114,7 +114,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>epltCheckBox</tabstop>
--- a/Project/AddDirectoryDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Project/AddDirectoryDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -121,7 +121,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
--- a/Project/AddFileDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Project/AddFileDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -113,7 +113,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
--- a/Project/AddFoundFilesDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Project/AddFoundFilesDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -51,7 +51,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <resources/>
  <connections>
--- a/Project/AddLanguageDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Project/AddLanguageDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -367,7 +367,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <resources/>
  <connections>
--- a/Project/DebuggerPropertiesDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Project/DebuggerPropertiesDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -252,7 +252,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
--- a/Project/FiletypeAssociationDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Project/FiletypeAssociationDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -117,7 +117,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>filetypeAssociationList</tabstop>
--- a/Project/PropertiesDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Project/PropertiesDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -364,7 +364,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
--- a/QScintilla/GotoDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/QScintilla/GotoDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -65,7 +65,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <resources/>
  <connections>
--- a/QScintilla/ZoomDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/QScintilla/ZoomDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -64,7 +64,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <resources/>
  <connections>
--- a/Tasks/TaskPropertiesDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Tasks/TaskPropertiesDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -178,7 +178,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>summaryEdit</tabstop>
--- a/Templates/TemplatePropertiesDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Templates/TemplatePropertiesDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -137,7 +137,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>nameEdit</tabstop>
--- a/Templates/TemplateSingleVariableDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/Templates/TemplateSingleVariableDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -51,7 +51,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>variableEdit</tabstop>
--- a/UI/DeleteFilesConfirmationDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/UI/DeleteFilesConfirmationDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -48,7 +48,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>filesList</tabstop>
--- a/UI/EmailDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/UI/EmailDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -177,7 +177,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>subject</tabstop>
--- a/UI/UserInterface.py	Wed Feb 08 21:39:58 2017 +0100
+++ b/UI/UserInterface.py	Sat Feb 11 18:19:56 2017 +0100
@@ -528,6 +528,11 @@
         e5App().registerObject("Symbols", self.symbolsViewer)
         e5App().registerObject("Numbers", self.numbersViewer)
         
+        # list of web addresses serving the versions file
+        self.__httpAlternatives = Preferences.getUI("VersionsUrls6")
+        self.__inVersionCheck = False
+        self.__versionCheckProgress = None
+        
         # Initialize the actions, menus, toolbars and statusbar
         splash.showMessage(self.tr("Initializing Actions..."))
         self.__initActions()
@@ -613,11 +618,6 @@
         # attribute for the help window
         self.helpWindow = None
         
-        # list of web addresses serving the versions file
-        self.__httpAlternatives = Preferences.getUI("VersionsUrls6")
-        self.__inVersionCheck = False
-        self.__versionCheckProgress = None
-        
         # set spellchecker defaults
         from QScintilla.SpellChecker import SpellChecker
         SpellChecker.setDefaultLanguage(
--- a/VCS/CommandOptionsDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/VCS/CommandOptionsDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -289,7 +289,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>globalEdit</tabstop>
--- a/VCS/RepositoryInfoDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/VCS/RepositoryInfoDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -35,7 +35,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <resources/>
  <connections>
--- a/ViewManager/BookmarkedFilesDialog.ui	Wed Feb 08 21:39:58 2017 +0100
+++ b/ViewManager/BookmarkedFilesDialog.ui	Sat Feb 11 18:19:56 2017 +0100
@@ -186,7 +186,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="6"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>

eric ide

mercurial