diff -r 5a9325e00b48 -r 323d417d256b Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardCharactersDialog.py
--- a/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardCharactersDialog.py Thu Jul 25 19:08:05 2013 +0200
+++ b/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardCharactersDialog.py Fri Jul 26 18:52:45 2013 +0200
@@ -85,7 +85,7 @@
self.singlesBoxLayout = QVBoxLayout(self.singlesBox)
self.singlesBoxLayout.setObjectName("singlesBoxLayout")
self.singlesBoxLayout.setSpacing(6)
- self.singlesBoxLayout.setMargin(6)
+ self.singlesBoxLayout.setContentsMargins(6, 6, 6, 6)
self.singlesBox.setLayout(self.singlesBoxLayout)
self.singlesView = QScrollArea(self.singlesBox)
self.singlesView.setObjectName("singlesView")
@@ -96,14 +96,14 @@
self.singlesItemsBox.setObjectName("singlesItemsBox")
self.singlesItemsBox.setMinimumWidth(1000)
self.singlesItemsBoxLayout = QVBoxLayout(self.singlesItemsBox)
- self.singlesItemsBoxLayout.setMargin(6)
+ self.singlesItemsBoxLayout.setContentsMargins(6, 6, 6, 6)
self.singlesItemsBoxLayout.setSpacing(6)
self.singlesItemsBox.setLayout(self.singlesItemsBoxLayout)
self.singlesEntries = []
self.__addSinglesLine()
hlayout0 = QHBoxLayout()
- hlayout0.setMargin(0)
+ hlayout0.setContentsMargins(0, 0, 0, 0)
hlayout0.setSpacing(6)
hlayout0.setObjectName("hlayout0")
self.moreSinglesButton = QPushButton(self.trUtf8("Additional Entries"),
@@ -119,7 +119,7 @@
self.rangesBoxLayout = QVBoxLayout(self.rangesBox)
self.rangesBoxLayout.setObjectName("rangesBoxLayout")
self.rangesBoxLayout.setSpacing(6)
- self.rangesBoxLayout.setMargin(6)
+ self.rangesBoxLayout.setContentsMargins(6, 6, 6, 6)
self.rangesBox.setLayout(self.rangesBoxLayout)
self.rangesView = QScrollArea(self.rangesBox)
self.rangesView.setObjectName("rangesView")
@@ -130,14 +130,14 @@
self.rangesItemsBox.setObjectName("rangesItemsBox")
self.rangesItemsBox.setMinimumWidth(1000)
self.rangesItemsBoxLayout = QVBoxLayout(self.rangesItemsBox)
- self.rangesItemsBoxLayout.setMargin(6)
+ self.rangesItemsBoxLayout.setContentsMargins(6, 6, 6, 6)
self.rangesItemsBoxLayout.setSpacing(6)
self.rangesItemsBox.setLayout(self.rangesItemsBoxLayout)
self.rangesEntries = []
self.__addRangesLine()
hlayout1 = QHBoxLayout()
- hlayout1.setMargin(0)
+ hlayout1.setContentsMargins(0, 0, 0, 0)
hlayout1.setSpacing(6)
hlayout1.setObjectName("hlayout1")
self.moreRangesButton = QPushButton(self.trUtf8("Additional Entries"),
@@ -401,7 +401,7 @@
"""
hbox = QWidget(self.singlesItemsBox)
hboxLayout = QHBoxLayout(hbox)
- hboxLayout.setMargin(0)
+ hboxLayout.setContentsMargins(0, 0, 0, 0)
hboxLayout.setSpacing(6)
hbox.setLayout(hboxLayout)
cb1 = QComboBox(hbox)
@@ -445,7 +445,7 @@
"""
hbox = QWidget(self.rangesItemsBox)
hboxLayout = QHBoxLayout(hbox)
- hboxLayout.setMargin(0)
+ hboxLayout.setContentsMargins(0, 0, 0, 0)
hboxLayout.setSpacing(6)
hbox.setLayout(hboxLayout)
cb1 = QComboBox(hbox)
