diff --git a/example/ui/example.ui b/example/ui/example.ui index 4263b18af..d842db251 100644 --- a/example/ui/example.ui +++ b/example/ui/example.ui @@ -47,8 +47,8 @@ 0 0 - 718 - 227 + 98 + 44 @@ -65,8 +65,8 @@ 0 0 - 718 - 227 + 697 + 210 @@ -211,6 +211,9 @@ + + + @@ -357,7 +360,7 @@ 0 0 1068 - 29 + 23 diff --git a/example/ui/example_pyqt5_ui.py b/example/ui/example_pyqt5_ui.py index ebdf3252a..c06567b71 100644 --- a/example/ui/example_pyqt5_ui.py +++ b/example/ui/example_pyqt5_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'example.ui' # -# Created by: PyQt5 UI code generator 5.4.2 +# Created by: PyQt5 UI code generator 5.7 # # WARNING! All changes made in this file will be lost! @@ -23,6 +23,7 @@ class Ui_MainWindow(object): self.tab = QtWidgets.QWidget() self.tab.setObjectName("tab") self.gridLayout = QtWidgets.QGridLayout(self.tab) + self.gridLayout.setContentsMargins(0, 0, 0, 0) self.gridLayout.setObjectName("gridLayout") self.groupBox = QtWidgets.QGroupBox(self.tab) self.groupBox.setObjectName("groupBox") @@ -31,18 +32,20 @@ class Ui_MainWindow(object): self.toolBox = QtWidgets.QToolBox(self.groupBox) self.toolBox.setObjectName("toolBox") self.page = QtWidgets.QWidget() - self.page.setGeometry(QtCore.QRect(0, 0, 718, 227)) + self.page.setGeometry(QtCore.QRect(0, 0, 98, 44)) self.page.setObjectName("page") self.gridLayout_4 = QtWidgets.QGridLayout(self.page) + self.gridLayout_4.setContentsMargins(0, 0, 0, 0) self.gridLayout_4.setObjectName("gridLayout_4") self.lineEdit = QtWidgets.QLineEdit(self.page) self.lineEdit.setObjectName("lineEdit") self.gridLayout_4.addWidget(self.lineEdit, 0, 0, 1, 1) self.toolBox.addItem(self.page, "") self.page_2 = QtWidgets.QWidget() - self.page_2.setGeometry(QtCore.QRect(0, 0, 718, 227)) + self.page_2.setGeometry(QtCore.QRect(0, 0, 697, 210)) self.page_2.setObjectName("page_2") self.gridLayout_5 = QtWidgets.QGridLayout(self.page_2) + self.gridLayout_5.setContentsMargins(0, 0, 0, 0) self.gridLayout_5.setObjectName("gridLayout_5") self.listWidget = QtWidgets.QListWidget(self.page_2) self.listWidget.setObjectName("listWidget") @@ -71,6 +74,7 @@ class Ui_MainWindow(object): self.tab_3 = QtWidgets.QWidget() self.tab_3.setObjectName("tab_3") self.gridLayout_6 = QtWidgets.QGridLayout(self.tab_3) + self.gridLayout_6.setContentsMargins(0, 0, 0, 0) self.gridLayout_6.setObjectName("gridLayout_6") self.checkableButton = QtWidgets.QPushButton(self.tab_3) self.checkableButton.setCheckable(True) @@ -87,6 +91,7 @@ class Ui_MainWindow(object): self.tab_5 = QtWidgets.QWidget() self.tab_5.setObjectName("tab_5") self.gridLayout_7 = QtWidgets.QGridLayout(self.tab_5) + self.gridLayout_7.setContentsMargins(0, 0, 0, 0) self.gridLayout_7.setObjectName("gridLayout_7") self.tableWidget = QtWidgets.QTableWidget(self.tab_5) self.tableWidget.setObjectName("tableWidget") @@ -110,10 +115,14 @@ class Ui_MainWindow(object): self.tab_4.setObjectName("tab_4") self.tabWidget_2.addTab(self.tab_4, "") self.gridLayout.addWidget(self.tabWidget_2, 0, 0, 1, 1) + self.dateEdit = QtWidgets.QDateEdit(self.tab) + self.dateEdit.setObjectName("dateEdit") + self.gridLayout.addWidget(self.dateEdit, 2, 0, 1, 1) self.tabWidget.addTab(self.tab, "") self.tab_2 = QtWidgets.QWidget() self.tab_2.setObjectName("tab_2") self.gridLayout_2 = QtWidgets.QGridLayout(self.tab_2) + self.gridLayout_2.setContentsMargins(0, 0, 0, 0) self.gridLayout_2.setObjectName("gridLayout_2") self.groupBox_2 = QtWidgets.QGroupBox(self.tab_2) self.groupBox_2.setObjectName("groupBox_2") @@ -175,7 +184,7 @@ class Ui_MainWindow(object): self.verticalLayout_5.addLayout(self.horizontalLayout) MainWindow.setCentralWidget(self.centralwidget) self.menubar = QtWidgets.QMenuBar(MainWindow) - self.menubar.setGeometry(QtCore.QRect(0, 0, 1068, 29)) + self.menubar.setGeometry(QtCore.QRect(0, 0, 1068, 23)) self.menubar.setObjectName("menubar") self.menuMenu = QtWidgets.QMenu(self.menubar) self.menuMenu.setObjectName("menuMenu") @@ -190,6 +199,7 @@ class Ui_MainWindow(object): self.dockWidgetContents = QtWidgets.QWidget() self.dockWidgetContents.setObjectName("dockWidgetContents") self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.dockWidgetContents) + self.verticalLayout_2.setContentsMargins(0, 0, 0, 0) self.verticalLayout_2.setObjectName("verticalLayout_2") self.verticalLayout = QtWidgets.QVBoxLayout() self.verticalLayout.setObjectName("verticalLayout") @@ -232,6 +242,7 @@ class Ui_MainWindow(object): self.dockWidgetContents_2 = QtWidgets.QWidget() self.dockWidgetContents_2.setObjectName("dockWidgetContents_2") self.gridLayout_3 = QtWidgets.QGridLayout(self.dockWidgetContents_2) + self.gridLayout_3.setContentsMargins(0, 0, 0, 0) self.gridLayout_3.setObjectName("gridLayout_3") self.verticalSlider = QtWidgets.QSlider(self.dockWidgetContents_2) self.verticalSlider.setOrientation(QtCore.Qt.Vertical) diff --git a/example/ui/example_pyqt_ui.py b/example/ui/example_pyqt_ui.py index a11b5525c..bb45fb0cc 100644 --- a/example/ui/example_pyqt_ui.py +++ b/example/ui/example_pyqt_ui.py @@ -45,7 +45,7 @@ class Ui_MainWindow(object): self.toolBox = QtGui.QToolBox(self.groupBox) self.toolBox.setObjectName(_fromUtf8("toolBox")) self.page = QtGui.QWidget() - self.page.setGeometry(QtCore.QRect(0, 0, 718, 227)) + self.page.setGeometry(QtCore.QRect(0, 0, 98, 44)) self.page.setObjectName(_fromUtf8("page")) self.gridLayout_4 = QtGui.QGridLayout(self.page) self.gridLayout_4.setObjectName(_fromUtf8("gridLayout_4")) @@ -54,7 +54,7 @@ class Ui_MainWindow(object): self.gridLayout_4.addWidget(self.lineEdit, 0, 0, 1, 1) self.toolBox.addItem(self.page, _fromUtf8("")) self.page_2 = QtGui.QWidget() - self.page_2.setGeometry(QtCore.QRect(0, 0, 718, 227)) + self.page_2.setGeometry(QtCore.QRect(0, 0, 697, 210)) self.page_2.setObjectName(_fromUtf8("page_2")) self.gridLayout_5 = QtGui.QGridLayout(self.page_2) self.gridLayout_5.setObjectName(_fromUtf8("gridLayout_5")) @@ -124,6 +124,9 @@ class Ui_MainWindow(object): self.tab_4.setObjectName(_fromUtf8("tab_4")) self.tabWidget_2.addTab(self.tab_4, _fromUtf8("")) self.gridLayout.addWidget(self.tabWidget_2, 0, 0, 1, 1) + self.dateEdit = QtGui.QDateEdit(self.tab) + self.dateEdit.setObjectName(_fromUtf8("dateEdit")) + self.gridLayout.addWidget(self.dateEdit, 2, 0, 1, 1) self.tabWidget.addTab(self.tab, _fromUtf8("")) self.tab_2 = QtGui.QWidget() self.tab_2.setObjectName(_fromUtf8("tab_2")) @@ -189,7 +192,7 @@ class Ui_MainWindow(object): self.verticalLayout_5.addLayout(self.horizontalLayout) MainWindow.setCentralWidget(self.centralwidget) self.menubar = QtGui.QMenuBar(MainWindow) - self.menubar.setGeometry(QtCore.QRect(0, 0, 1068, 29)) + self.menubar.setGeometry(QtCore.QRect(0, 0, 1068, 23)) self.menubar.setObjectName(_fromUtf8("menubar")) self.menuMenu = QtGui.QMenu(self.menubar) self.menuMenu.setObjectName(_fromUtf8("menuMenu")) diff --git a/example/ui/example_pyside_ui.py b/example/ui/example_pyside_ui.py index 6fb907aa2..aede5c54f 100644 --- a/example/ui/example_pyside_ui.py +++ b/example/ui/example_pyside_ui.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'example.ui' # -# Created: Tue Jun 23 21:43:26 2015 -# by: pyside-uic 0.2.15 running on PySide 1.2.2 +# Created: Sun Nov 27 13:09:31 2016 +# by: pyside-uic 0.2.15 running on PySide 1.2.4 # # WARNING! All changes made in this file will be lost! @@ -32,7 +32,7 @@ class Ui_MainWindow(object): self.toolBox = QtGui.QToolBox(self.groupBox) self.toolBox.setObjectName("toolBox") self.page = QtGui.QWidget() - self.page.setGeometry(QtCore.QRect(0, 0, 718, 227)) + self.page.setGeometry(QtCore.QRect(0, 0, 98, 44)) self.page.setObjectName("page") self.gridLayout_4 = QtGui.QGridLayout(self.page) self.gridLayout_4.setObjectName("gridLayout_4") @@ -41,7 +41,7 @@ class Ui_MainWindow(object): self.gridLayout_4.addWidget(self.lineEdit, 0, 0, 1, 1) self.toolBox.addItem(self.page, "") self.page_2 = QtGui.QWidget() - self.page_2.setGeometry(QtCore.QRect(0, 0, 718, 227)) + self.page_2.setGeometry(QtCore.QRect(0, 0, 697, 210)) self.page_2.setObjectName("page_2") self.gridLayout_5 = QtGui.QGridLayout(self.page_2) self.gridLayout_5.setObjectName("gridLayout_5") @@ -103,6 +103,9 @@ class Ui_MainWindow(object): self.tab_4.setObjectName("tab_4") self.tabWidget_2.addTab(self.tab_4, "") self.gridLayout.addWidget(self.tabWidget_2, 0, 0, 1, 1) + self.dateEdit = QtGui.QDateEdit(self.tab) + self.dateEdit.setObjectName("dateEdit") + self.gridLayout.addWidget(self.dateEdit, 2, 0, 1, 1) self.tabWidget.addTab(self.tab, "") self.tab_2 = QtGui.QWidget() self.tab_2.setObjectName("tab_2") @@ -168,7 +171,7 @@ class Ui_MainWindow(object): self.verticalLayout_5.addLayout(self.horizontalLayout) MainWindow.setCentralWidget(self.centralwidget) self.menubar = QtGui.QMenuBar(MainWindow) - self.menubar.setGeometry(QtCore.QRect(0, 0, 1068, 29)) + self.menubar.setGeometry(QtCore.QRect(0, 0, 1068, 23)) self.menubar.setObjectName("menubar") self.menuMenu = QtGui.QMenu(self.menubar) self.menuMenu.setObjectName("menuMenu")