From e9d9fb06b7dbb0d2e24a2a25959e6a8ff955c7a7 Mon Sep 17 00:00:00 2001 From: Daniel Pizetta Date: Thu, 13 Dec 2018 18:00:54 -0200 Subject: [PATCH] Add issue #123 on example and update files --- example/ui/dw_buttons_pyqt5_ui.py | 3 +- example/ui/dw_buttons_pyside2_ui.py | 2 +- example/ui/dw_buttons_pyside_ui.py | 2 +- example/ui/dw_buttons_qtpy_ui.py | 3 +- example/ui/dw_containers_no_tabs_pyqt5_ui.py | 19 ++++- .../ui/dw_containers_no_tabs_pyside2_ui.py | 2 +- example/ui/dw_containers_no_tabs_pyside_ui.py | 2 +- example/ui/dw_containers_no_tabs_qtpy_ui.py | 19 ++++- example/ui/dw_containers_tabs_pyqt5_ui.py | 19 ++++- example/ui/dw_containers_tabs_pyside2_ui.py | 2 +- example/ui/dw_containers_tabs_pyside_ui.py | 2 +- example/ui/dw_containers_tabs_qtpy_ui.py | 19 ++++- example/ui/dw_displays_pyqt5_ui.py | 3 +- example/ui/dw_displays_pyside2_ui.py | 2 +- example/ui/dw_displays_pyside_ui.py | 2 +- example/ui/dw_displays_qtpy_ui.py | 3 +- example/ui/dw_inputs_fields_pyqt5_ui.py | 3 +- example/ui/dw_inputs_fields_pyside2_ui.py | 2 +- example/ui/dw_inputs_fields_pyside_ui.py | 2 +- example/ui/dw_inputs_fields_qtpy_ui.py | 3 +- example/ui/dw_inputs_no_fields_pyqt5_ui.py | 3 +- example/ui/dw_inputs_no_fields_pyside2_ui.py | 2 +- example/ui/dw_inputs_no_fields_pyside_ui.py | 2 +- example/ui/dw_inputs_no_fields_qtpy_ui.py | 3 +- example/ui/dw_views_pyqt5_ui.py | 3 +- example/ui/dw_views_pyside2_ui.py | 2 +- example/ui/dw_views_pyside_ui.py | 2 +- example/ui/dw_views_qtpy_ui.py | 3 +- example/ui/dw_widgets_pyqt5_ui.py | 3 +- example/ui/dw_widgets_pyside2_ui.py | 2 +- example/ui/dw_widgets_pyside_ui.py | 2 +- example/ui/dw_widgets_qtpy_ui.py | 3 +- example/ui/mw_menus.ui | 85 +++++++++++++++++-- example/ui/mw_menus_pyqt5_ui.py | 63 ++++++++++++-- example/ui/mw_menus_pyqt_ui.py | 58 +++++++++++-- example/ui/mw_menus_pyqtgraph_ui.py | 58 +++++++++++-- example/ui/mw_menus_pyside2_ui.py | 60 +++++++++++-- example/ui/mw_menus_pyside_ui.py | 60 +++++++++++-- example/ui/mw_menus_qtpy_ui.py | 63 ++++++++++++-- 39 files changed, 499 insertions(+), 92 deletions(-) diff --git a/example/ui/dw_buttons_pyqt5_ui.py b/example/ui/dw_buttons_pyqt5_ui.py index c11892047..e7e1939f2 100644 --- a/example/ui/dw_buttons_pyqt5_ui.py +++ b/example/ui/dw_buttons_pyqt5_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'dw_buttons.ui' # -# Created by: PyQt5 UI code generator 5.9.2 +# Created by: PyQt5 UI code generator 5.6 # # WARNING! All changes made in this file will be lost! @@ -15,6 +15,7 @@ class Ui_DockWidget(object): self.dockWidgetContents = QtWidgets.QWidget() self.dockWidgetContents.setObjectName("dockWidgetContents") self.gridLayout = QtWidgets.QGridLayout(self.dockWidgetContents) + self.gridLayout.setContentsMargins(0, 0, 0, 0) self.gridLayout.setObjectName("gridLayout") self.label_72 = QtWidgets.QLabel(self.dockWidgetContents) font = QtGui.QFont() diff --git a/example/ui/dw_buttons_pyside2_ui.py b/example/ui/dw_buttons_pyside2_ui.py index 3804138f3..76be5fd35 100644 --- a/example/ui/dw_buttons_pyside2_ui.py +++ b/example/ui/dw_buttons_pyside2_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'dw_buttons.ui' # -# Created: Fri Nov 9 18:42:55 2018 +# Created: Thu Dec 13 17:14:05 2018 # by: pyside2-uic 2.0.0 running on PySide2 5.6.0~a1 # # WARNING! All changes made in this file will be lost! diff --git a/example/ui/dw_buttons_pyside_ui.py b/example/ui/dw_buttons_pyside_ui.py index 937436a91..ea0a4bd2c 100644 --- a/example/ui/dw_buttons_pyside_ui.py +++ b/example/ui/dw_buttons_pyside_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'dw_buttons.ui' # -# Created: Fri Nov 9 18:42:55 2018 +# Created: Thu Dec 13 17:14:04 2018 # by: pyside-uic 0.2.15 running on PySide 1.2.2 # # WARNING! All changes made in this file will be lost! diff --git a/example/ui/dw_buttons_qtpy_ui.py b/example/ui/dw_buttons_qtpy_ui.py index a87a7c71f..f6f230030 100644 --- a/example/ui/dw_buttons_qtpy_ui.py +++ b/example/ui/dw_buttons_qtpy_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'dw_buttons.ui' # -# Created by: PyQt5 UI code generator 5.9.2 +# Created by: PyQt5 UI code generator 5.6 # # WARNING! All changes made in this file will be lost! @@ -15,6 +15,7 @@ class Ui_DockWidget(object): self.dockWidgetContents = QtWidgets.QWidget() self.dockWidgetContents.setObjectName("dockWidgetContents") self.gridLayout = QtWidgets.QGridLayout(self.dockWidgetContents) + self.gridLayout.setContentsMargins(0, 0, 0, 0) self.gridLayout.setObjectName("gridLayout") self.label_72 = QtWidgets.QLabel(self.dockWidgetContents) font = QtGui.QFont() diff --git a/example/ui/dw_containers_no_tabs_pyqt5_ui.py b/example/ui/dw_containers_no_tabs_pyqt5_ui.py index d5d8fb1d9..d94ed834b 100644 --- a/example/ui/dw_containers_no_tabs_pyqt5_ui.py +++ b/example/ui/dw_containers_no_tabs_pyqt5_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'dw_containers_no_tabs.ui' # -# Created by: PyQt5 UI code generator 5.9.2 +# Created by: PyQt5 UI code generator 5.6 # # WARNING! All changes made in this file will be lost! @@ -15,6 +15,7 @@ class Ui_DockWidget(object): self.dockWidgetContents = QtWidgets.QWidget() self.dockWidgetContents.setObjectName("dockWidgetContents") self.gridLayout_45 = QtWidgets.QGridLayout(self.dockWidgetContents) + self.gridLayout_45.setContentsMargins(0, 0, 0, 0) self.gridLayout_45.setObjectName("gridLayout_45") self.label_126 = QtWidgets.QLabel(self.dockWidgetContents) font = QtGui.QFont() @@ -51,6 +52,7 @@ class Ui_DockWidget(object): self.page1_2 = QtWidgets.QWidget() self.page1_2.setObjectName("page1_2") self.gridLayout_35 = QtWidgets.QGridLayout(self.page1_2) + self.gridLayout_35.setContentsMargins(0, 0, 0, 0) self.gridLayout_35.setObjectName("gridLayout_35") self.label_57 = QtWidgets.QLabel(self.page1_2) self.label_57.setObjectName("label_57") @@ -59,6 +61,7 @@ class Ui_DockWidget(object): self.page2_2 = QtWidgets.QWidget() self.page2_2.setObjectName("page2_2") self.gridLayout_36 = QtWidgets.QGridLayout(self.page2_2) + self.gridLayout_36.setContentsMargins(0, 0, 0, 0) self.gridLayout_36.setObjectName("gridLayout_36") self.label_58 = QtWidgets.QLabel(self.page2_2) self.label_58.setObjectName("label_58") @@ -71,6 +74,7 @@ class Ui_DockWidget(object): self.page1Dis_2 = QtWidgets.QWidget() self.page1Dis_2.setObjectName("page1Dis_2") self.gridLayout_37 = QtWidgets.QGridLayout(self.page1Dis_2) + self.gridLayout_37.setContentsMargins(0, 0, 0, 0) self.gridLayout_37.setObjectName("gridLayout_37") self.label_113 = QtWidgets.QLabel(self.page1Dis_2) self.label_113.setObjectName("label_113") @@ -79,6 +83,7 @@ class Ui_DockWidget(object): self.page2Dis_2 = QtWidgets.QWidget() self.page2Dis_2.setObjectName("page2Dis_2") self.gridLayout_38 = QtWidgets.QGridLayout(self.page2Dis_2) + self.gridLayout_38.setContentsMargins(0, 0, 0, 0) self.gridLayout_38.setObjectName("gridLayout_38") self.label_114 = QtWidgets.QLabel(self.page2Dis_2) self.label_114.setObjectName("label_114") @@ -134,6 +139,7 @@ class Ui_DockWidget(object): self.subwindow1Dis_2 = QtWidgets.QWidget() self.subwindow1Dis_2.setObjectName("subwindow1Dis_2") self.verticalLayout_9 = QtWidgets.QVBoxLayout(self.subwindow1Dis_2) + self.verticalLayout_9.setContentsMargins(0, 0, 0, 0) self.verticalLayout_9.setObjectName("verticalLayout_9") self.label_111 = QtWidgets.QLabel(self.subwindow1Dis_2) self.label_111.setObjectName("label_111") @@ -141,6 +147,7 @@ class Ui_DockWidget(object): self.subwindow2Dis_2 = QtWidgets.QWidget() self.subwindow2Dis_2.setObjectName("subwindow2Dis_2") self.verticalLayout_10 = QtWidgets.QVBoxLayout(self.subwindow2Dis_2) + self.verticalLayout_10.setContentsMargins(0, 0, 0, 0) self.verticalLayout_10.setObjectName("verticalLayout_10") self.label_112 = QtWidgets.QLabel(self.subwindow2Dis_2) self.label_112.setObjectName("label_112") @@ -156,6 +163,7 @@ class Ui_DockWidget(object): self.widget_2 = QtWidgets.QWidget(self.dockWidgetContents) self.widget_2.setObjectName("widget_2") self.gridLayout_39 = QtWidgets.QGridLayout(self.widget_2) + self.gridLayout_39.setContentsMargins(0, 0, 0, 0) self.gridLayout_39.setObjectName("gridLayout_39") self.label_59 = QtWidgets.QLabel(self.widget_2) self.label_59.setObjectName("label_59") @@ -165,6 +173,7 @@ class Ui_DockWidget(object): self.widgetDis_2.setEnabled(False) self.widgetDis_2.setObjectName("widgetDis_2") self.gridLayout_44 = QtWidgets.QGridLayout(self.widgetDis_2) + self.gridLayout_44.setContentsMargins(0, 0, 0, 0) self.gridLayout_44.setObjectName("gridLayout_44") self.label_125 = QtWidgets.QLabel(self.widgetDis_2) self.label_125.setObjectName("label_125") @@ -175,6 +184,7 @@ class Ui_DockWidget(object): self.subwindow1_2 = QtWidgets.QWidget() self.subwindow1_2.setObjectName("subwindow1_2") self.verticalLayout_11 = QtWidgets.QVBoxLayout(self.subwindow1_2) + self.verticalLayout_11.setContentsMargins(0, 0, 0, 0) self.verticalLayout_11.setObjectName("verticalLayout_11") self.label_29 = QtWidgets.QLabel(self.subwindow1_2) self.label_29.setObjectName("label_29") @@ -182,6 +192,7 @@ class Ui_DockWidget(object): self.subwindow2_2 = QtWidgets.QWidget() self.subwindow2_2.setObjectName("subwindow2_2") self.verticalLayout_12 = QtWidgets.QVBoxLayout(self.subwindow2_2) + self.verticalLayout_12.setContentsMargins(0, 0, 0, 0) self.verticalLayout_12.setObjectName("verticalLayout_12") self.label_56 = QtWidgets.QLabel(self.subwindow2_2) self.label_56.setObjectName("label_56") @@ -201,6 +212,7 @@ class Ui_DockWidget(object): self.scrollAreaWidgetContents_2.setGeometry(QtCore.QRect(0, 0, 181, 246)) self.scrollAreaWidgetContents_2.setObjectName("scrollAreaWidgetContents_2") self.verticalLayout_14 = QtWidgets.QVBoxLayout(self.scrollAreaWidgetContents_2) + self.verticalLayout_14.setContentsMargins(0, 0, 0, 0) self.verticalLayout_14.setObjectName("verticalLayout_14") self.label_70 = QtWidgets.QLabel(self.scrollAreaWidgetContents_2) self.label_70.setObjectName("label_70") @@ -239,6 +251,7 @@ class Ui_DockWidget(object): self.scrollAreaWidgetContentsDis_2.setGeometry(QtCore.QRect(0, 0, 181, 246)) self.scrollAreaWidgetContentsDis_2.setObjectName("scrollAreaWidgetContentsDis_2") self.verticalLayout_13 = QtWidgets.QVBoxLayout(self.scrollAreaWidgetContentsDis_2) + self.verticalLayout_13.setContentsMargins(0, 0, 0, 0) self.verticalLayout_13.setObjectName("verticalLayout_13") self.label_115 = QtWidgets.QLabel(self.scrollAreaWidgetContentsDis_2) self.label_115.setObjectName("label_115") @@ -282,6 +295,7 @@ class Ui_DockWidget(object): self.page_3.setGeometry(QtCore.QRect(0, 0, 196, 73)) self.page_3.setObjectName("page_3") self.gridLayout_41 = QtWidgets.QGridLayout(self.page_3) + self.gridLayout_41.setContentsMargins(0, 0, 0, 0) self.gridLayout_41.setObjectName("gridLayout_41") self.label_60 = QtWidgets.QLabel(self.page_3) self.label_60.setObjectName("label_60") @@ -291,6 +305,7 @@ class Ui_DockWidget(object): self.page_8.setGeometry(QtCore.QRect(0, 0, 163, 38)) self.page_8.setObjectName("page_8") self.gridLayout_42 = QtWidgets.QGridLayout(self.page_8) + self.gridLayout_42.setContentsMargins(0, 0, 0, 0) self.gridLayout_42.setObjectName("gridLayout_42") self.label_61 = QtWidgets.QLabel(self.page_8) self.label_61.setObjectName("label_61") @@ -304,6 +319,7 @@ class Ui_DockWidget(object): self.page_6.setGeometry(QtCore.QRect(0, 0, 196, 73)) self.page_6.setObjectName("page_6") self.gridLayout_29 = QtWidgets.QGridLayout(self.page_6) + self.gridLayout_29.setContentsMargins(0, 0, 0, 0) self.gridLayout_29.setObjectName("gridLayout_29") self.label_109 = QtWidgets.QLabel(self.page_6) self.label_109.setObjectName("label_109") @@ -313,6 +329,7 @@ class Ui_DockWidget(object): self.page_7.setGeometry(QtCore.QRect(0, 0, 163, 38)) self.page_7.setObjectName("page_7") self.gridLayout_34 = QtWidgets.QGridLayout(self.page_7) + self.gridLayout_34.setContentsMargins(0, 0, 0, 0) self.gridLayout_34.setObjectName("gridLayout_34") self.label_110 = QtWidgets.QLabel(self.page_7) self.label_110.setObjectName("label_110") diff --git a/example/ui/dw_containers_no_tabs_pyside2_ui.py b/example/ui/dw_containers_no_tabs_pyside2_ui.py index a210cfbd2..f9db9b257 100644 --- a/example/ui/dw_containers_no_tabs_pyside2_ui.py +++ b/example/ui/dw_containers_no_tabs_pyside2_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'dw_containers_no_tabs.ui' # -# Created: Fri Nov 9 18:42:56 2018 +# Created: Thu Dec 13 17:14:05 2018 # by: pyside2-uic 2.0.0 running on PySide2 5.6.0~a1 # # WARNING! All changes made in this file will be lost! diff --git a/example/ui/dw_containers_no_tabs_pyside_ui.py b/example/ui/dw_containers_no_tabs_pyside_ui.py index 19d13af48..8cc129983 100644 --- a/example/ui/dw_containers_no_tabs_pyside_ui.py +++ b/example/ui/dw_containers_no_tabs_pyside_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'dw_containers_no_tabs.ui' # -# Created: Fri Nov 9 18:42:56 2018 +# Created: Thu Dec 13 17:14:05 2018 # by: pyside-uic 0.2.15 running on PySide 1.2.2 # # WARNING! All changes made in this file will be lost! diff --git a/example/ui/dw_containers_no_tabs_qtpy_ui.py b/example/ui/dw_containers_no_tabs_qtpy_ui.py index 922a21d63..06f2636c0 100644 --- a/example/ui/dw_containers_no_tabs_qtpy_ui.py +++ b/example/ui/dw_containers_no_tabs_qtpy_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'dw_containers_no_tabs.ui' # -# Created by: PyQt5 UI code generator 5.9.2 +# Created by: PyQt5 UI code generator 5.6 # # WARNING! All changes made in this file will be lost! @@ -15,6 +15,7 @@ class Ui_DockWidget(object): self.dockWidgetContents = QtWidgets.QWidget() self.dockWidgetContents.setObjectName("dockWidgetContents") self.gridLayout_45 = QtWidgets.QGridLayout(self.dockWidgetContents) + self.gridLayout_45.setContentsMargins(0, 0, 0, 0) self.gridLayout_45.setObjectName("gridLayout_45") self.label_126 = QtWidgets.QLabel(self.dockWidgetContents) font = QtGui.QFont() @@ -51,6 +52,7 @@ class Ui_DockWidget(object): self.page1_2 = QtWidgets.QWidget() self.page1_2.setObjectName("page1_2") self.gridLayout_35 = QtWidgets.QGridLayout(self.page1_2) + self.gridLayout_35.setContentsMargins(0, 0, 0, 0) self.gridLayout_35.setObjectName("gridLayout_35") self.label_57 = QtWidgets.QLabel(self.page1_2) self.label_57.setObjectName("label_57") @@ -59,6 +61,7 @@ class Ui_DockWidget(object): self.page2_2 = QtWidgets.QWidget() self.page2_2.setObjectName("page2_2") self.gridLayout_36 = QtWidgets.QGridLayout(self.page2_2) + self.gridLayout_36.setContentsMargins(0, 0, 0, 0) self.gridLayout_36.setObjectName("gridLayout_36") self.label_58 = QtWidgets.QLabel(self.page2_2) self.label_58.setObjectName("label_58") @@ -71,6 +74,7 @@ class Ui_DockWidget(object): self.page1Dis_2 = QtWidgets.QWidget() self.page1Dis_2.setObjectName("page1Dis_2") self.gridLayout_37 = QtWidgets.QGridLayout(self.page1Dis_2) + self.gridLayout_37.setContentsMargins(0, 0, 0, 0) self.gridLayout_37.setObjectName("gridLayout_37") self.label_113 = QtWidgets.QLabel(self.page1Dis_2) self.label_113.setObjectName("label_113") @@ -79,6 +83,7 @@ class Ui_DockWidget(object): self.page2Dis_2 = QtWidgets.QWidget() self.page2Dis_2.setObjectName("page2Dis_2") self.gridLayout_38 = QtWidgets.QGridLayout(self.page2Dis_2) + self.gridLayout_38.setContentsMargins(0, 0, 0, 0) self.gridLayout_38.setObjectName("gridLayout_38") self.label_114 = QtWidgets.QLabel(self.page2Dis_2) self.label_114.setObjectName("label_114") @@ -134,6 +139,7 @@ class Ui_DockWidget(object): self.subwindow1Dis_2 = QtWidgets.QWidget() self.subwindow1Dis_2.setObjectName("subwindow1Dis_2") self.verticalLayout_9 = QtWidgets.QVBoxLayout(self.subwindow1Dis_2) + self.verticalLayout_9.setContentsMargins(0, 0, 0, 0) self.verticalLayout_9.setObjectName("verticalLayout_9") self.label_111 = QtWidgets.QLabel(self.subwindow1Dis_2) self.label_111.setObjectName("label_111") @@ -141,6 +147,7 @@ class Ui_DockWidget(object): self.subwindow2Dis_2 = QtWidgets.QWidget() self.subwindow2Dis_2.setObjectName("subwindow2Dis_2") self.verticalLayout_10 = QtWidgets.QVBoxLayout(self.subwindow2Dis_2) + self.verticalLayout_10.setContentsMargins(0, 0, 0, 0) self.verticalLayout_10.setObjectName("verticalLayout_10") self.label_112 = QtWidgets.QLabel(self.subwindow2Dis_2) self.label_112.setObjectName("label_112") @@ -156,6 +163,7 @@ class Ui_DockWidget(object): self.widget_2 = QtWidgets.QWidget(self.dockWidgetContents) self.widget_2.setObjectName("widget_2") self.gridLayout_39 = QtWidgets.QGridLayout(self.widget_2) + self.gridLayout_39.setContentsMargins(0, 0, 0, 0) self.gridLayout_39.setObjectName("gridLayout_39") self.label_59 = QtWidgets.QLabel(self.widget_2) self.label_59.setObjectName("label_59") @@ -165,6 +173,7 @@ class Ui_DockWidget(object): self.widgetDis_2.setEnabled(False) self.widgetDis_2.setObjectName("widgetDis_2") self.gridLayout_44 = QtWidgets.QGridLayout(self.widgetDis_2) + self.gridLayout_44.setContentsMargins(0, 0, 0, 0) self.gridLayout_44.setObjectName("gridLayout_44") self.label_125 = QtWidgets.QLabel(self.widgetDis_2) self.label_125.setObjectName("label_125") @@ -175,6 +184,7 @@ class Ui_DockWidget(object): self.subwindow1_2 = QtWidgets.QWidget() self.subwindow1_2.setObjectName("subwindow1_2") self.verticalLayout_11 = QtWidgets.QVBoxLayout(self.subwindow1_2) + self.verticalLayout_11.setContentsMargins(0, 0, 0, 0) self.verticalLayout_11.setObjectName("verticalLayout_11") self.label_29 = QtWidgets.QLabel(self.subwindow1_2) self.label_29.setObjectName("label_29") @@ -182,6 +192,7 @@ class Ui_DockWidget(object): self.subwindow2_2 = QtWidgets.QWidget() self.subwindow2_2.setObjectName("subwindow2_2") self.verticalLayout_12 = QtWidgets.QVBoxLayout(self.subwindow2_2) + self.verticalLayout_12.setContentsMargins(0, 0, 0, 0) self.verticalLayout_12.setObjectName("verticalLayout_12") self.label_56 = QtWidgets.QLabel(self.subwindow2_2) self.label_56.setObjectName("label_56") @@ -201,6 +212,7 @@ class Ui_DockWidget(object): self.scrollAreaWidgetContents_2.setGeometry(QtCore.QRect(0, 0, 181, 246)) self.scrollAreaWidgetContents_2.setObjectName("scrollAreaWidgetContents_2") self.verticalLayout_14 = QtWidgets.QVBoxLayout(self.scrollAreaWidgetContents_2) + self.verticalLayout_14.setContentsMargins(0, 0, 0, 0) self.verticalLayout_14.setObjectName("verticalLayout_14") self.label_70 = QtWidgets.QLabel(self.scrollAreaWidgetContents_2) self.label_70.setObjectName("label_70") @@ -239,6 +251,7 @@ class Ui_DockWidget(object): self.scrollAreaWidgetContentsDis_2.setGeometry(QtCore.QRect(0, 0, 181, 246)) self.scrollAreaWidgetContentsDis_2.setObjectName("scrollAreaWidgetContentsDis_2") self.verticalLayout_13 = QtWidgets.QVBoxLayout(self.scrollAreaWidgetContentsDis_2) + self.verticalLayout_13.setContentsMargins(0, 0, 0, 0) self.verticalLayout_13.setObjectName("verticalLayout_13") self.label_115 = QtWidgets.QLabel(self.scrollAreaWidgetContentsDis_2) self.label_115.setObjectName("label_115") @@ -282,6 +295,7 @@ class Ui_DockWidget(object): self.page_3.setGeometry(QtCore.QRect(0, 0, 196, 73)) self.page_3.setObjectName("page_3") self.gridLayout_41 = QtWidgets.QGridLayout(self.page_3) + self.gridLayout_41.setContentsMargins(0, 0, 0, 0) self.gridLayout_41.setObjectName("gridLayout_41") self.label_60 = QtWidgets.QLabel(self.page_3) self.label_60.setObjectName("label_60") @@ -291,6 +305,7 @@ class Ui_DockWidget(object): self.page_8.setGeometry(QtCore.QRect(0, 0, 163, 38)) self.page_8.setObjectName("page_8") self.gridLayout_42 = QtWidgets.QGridLayout(self.page_8) + self.gridLayout_42.setContentsMargins(0, 0, 0, 0) self.gridLayout_42.setObjectName("gridLayout_42") self.label_61 = QtWidgets.QLabel(self.page_8) self.label_61.setObjectName("label_61") @@ -304,6 +319,7 @@ class Ui_DockWidget(object): self.page_6.setGeometry(QtCore.QRect(0, 0, 196, 73)) self.page_6.setObjectName("page_6") self.gridLayout_29 = QtWidgets.QGridLayout(self.page_6) + self.gridLayout_29.setContentsMargins(0, 0, 0, 0) self.gridLayout_29.setObjectName("gridLayout_29") self.label_109 = QtWidgets.QLabel(self.page_6) self.label_109.setObjectName("label_109") @@ -313,6 +329,7 @@ class Ui_DockWidget(object): self.page_7.setGeometry(QtCore.QRect(0, 0, 163, 38)) self.page_7.setObjectName("page_7") self.gridLayout_34 = QtWidgets.QGridLayout(self.page_7) + self.gridLayout_34.setContentsMargins(0, 0, 0, 0) self.gridLayout_34.setObjectName("gridLayout_34") self.label_110 = QtWidgets.QLabel(self.page_7) self.label_110.setObjectName("label_110") diff --git a/example/ui/dw_containers_tabs_pyqt5_ui.py b/example/ui/dw_containers_tabs_pyqt5_ui.py index f40317154..ffb82a71f 100644 --- a/example/ui/dw_containers_tabs_pyqt5_ui.py +++ b/example/ui/dw_containers_tabs_pyqt5_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'dw_containers_tabs.ui' # -# Created by: PyQt5 UI code generator 5.9.2 +# Created by: PyQt5 UI code generator 5.6 # # WARNING! All changes made in this file will be lost! @@ -15,6 +15,7 @@ class Ui_DockWidget(object): self.dockWidgetContents = QtWidgets.QWidget() self.dockWidgetContents.setObjectName("dockWidgetContents") self.gridLayout_5 = QtWidgets.QGridLayout(self.dockWidgetContents) + self.gridLayout_5.setContentsMargins(0, 0, 0, 0) self.gridLayout_5.setObjectName("gridLayout_5") self.label_5 = QtWidgets.QLabel(self.dockWidgetContents) font = QtGui.QFont() @@ -37,6 +38,7 @@ class Ui_DockWidget(object): self.tab_7 = QtWidgets.QWidget() self.tab_7.setObjectName("tab_7") self.gridLayout_8 = QtWidgets.QGridLayout(self.tab_7) + self.gridLayout_8.setContentsMargins(0, 0, 0, 0) self.gridLayout_8.setObjectName("gridLayout_8") self.label_52 = QtWidgets.QLabel(self.tab_7) self.label_52.setObjectName("label_52") @@ -45,6 +47,7 @@ class Ui_DockWidget(object): self.tab_8 = QtWidgets.QWidget() self.tab_8.setObjectName("tab_8") self.gridLayout_4 = QtWidgets.QGridLayout(self.tab_8) + self.gridLayout_4.setContentsMargins(0, 0, 0, 0) self.gridLayout_4.setObjectName("gridLayout_4") self.label_48 = QtWidgets.QLabel(self.tab_8) self.label_48.setObjectName("label_48") @@ -59,6 +62,7 @@ class Ui_DockWidget(object): self.tab_9 = QtWidgets.QWidget() self.tab_9.setObjectName("tab_9") self.gridLayout_10 = QtWidgets.QGridLayout(self.tab_9) + self.gridLayout_10.setContentsMargins(0, 0, 0, 0) self.gridLayout_10.setObjectName("gridLayout_10") self.label_53 = QtWidgets.QLabel(self.tab_9) self.label_53.setObjectName("label_53") @@ -67,6 +71,7 @@ class Ui_DockWidget(object): self.tab_10 = QtWidgets.QWidget() self.tab_10.setObjectName("tab_10") self.gridLayout_19 = QtWidgets.QGridLayout(self.tab_10) + self.gridLayout_19.setContentsMargins(0, 0, 0, 0) self.gridLayout_19.setObjectName("gridLayout_19") self.label_49 = QtWidgets.QLabel(self.tab_10) self.label_49.setObjectName("label_49") @@ -79,6 +84,7 @@ class Ui_DockWidget(object): self.tab_5 = QtWidgets.QWidget() self.tab_5.setObjectName("tab_5") self.gridLayout_3 = QtWidgets.QGridLayout(self.tab_5) + self.gridLayout_3.setContentsMargins(0, 0, 0, 0) self.gridLayout_3.setObjectName("gridLayout_3") self.label_39 = QtWidgets.QLabel(self.tab_5) self.label_39.setObjectName("label_39") @@ -87,6 +93,7 @@ class Ui_DockWidget(object): self.tab_6 = QtWidgets.QWidget() self.tab_6.setObjectName("tab_6") self.gridLayout_9 = QtWidgets.QGridLayout(self.tab_6) + self.gridLayout_9.setContentsMargins(0, 0, 0, 0) self.gridLayout_9.setObjectName("gridLayout_9") self.label_54 = QtWidgets.QLabel(self.tab_6) self.label_54.setObjectName("label_54") @@ -100,6 +107,7 @@ class Ui_DockWidget(object): self.tab_11 = QtWidgets.QWidget() self.tab_11.setObjectName("tab_11") self.gridLayout_20 = QtWidgets.QGridLayout(self.tab_11) + self.gridLayout_20.setContentsMargins(0, 0, 0, 0) self.gridLayout_20.setObjectName("gridLayout_20") self.label_50 = QtWidgets.QLabel(self.tab_11) self.label_50.setObjectName("label_50") @@ -108,6 +116,7 @@ class Ui_DockWidget(object): self.tab_12 = QtWidgets.QWidget() self.tab_12.setObjectName("tab_12") self.gridLayout_21 = QtWidgets.QGridLayout(self.tab_12) + self.gridLayout_21.setContentsMargins(0, 0, 0, 0) self.gridLayout_21.setObjectName("gridLayout_21") self.label_72 = QtWidgets.QLabel(self.tab_12) self.label_72.setObjectName("label_72") @@ -120,6 +129,7 @@ class Ui_DockWidget(object): self.tab_3 = QtWidgets.QWidget() self.tab_3.setObjectName("tab_3") self.gridLayout_2 = QtWidgets.QGridLayout(self.tab_3) + self.gridLayout_2.setContentsMargins(0, 0, 0, 0) self.gridLayout_2.setObjectName("gridLayout_2") self.label_38 = QtWidgets.QLabel(self.tab_3) self.label_38.setObjectName("label_38") @@ -128,6 +138,7 @@ class Ui_DockWidget(object): self.tab_4 = QtWidgets.QWidget() self.tab_4.setObjectName("tab_4") self.gridLayout_11 = QtWidgets.QGridLayout(self.tab_4) + self.gridLayout_11.setContentsMargins(0, 0, 0, 0) self.gridLayout_11.setObjectName("gridLayout_11") self.label_55 = QtWidgets.QLabel(self.tab_4) self.label_55.setObjectName("label_55") @@ -141,6 +152,7 @@ class Ui_DockWidget(object): self.tab_13 = QtWidgets.QWidget() self.tab_13.setObjectName("tab_13") self.gridLayout_22 = QtWidgets.QGridLayout(self.tab_13) + self.gridLayout_22.setContentsMargins(0, 0, 0, 0) self.gridLayout_22.setObjectName("gridLayout_22") self.label_51 = QtWidgets.QLabel(self.tab_13) self.label_51.setObjectName("label_51") @@ -149,6 +161,7 @@ class Ui_DockWidget(object): self.tab_14 = QtWidgets.QWidget() self.tab_14.setObjectName("tab_14") self.gridLayout_30 = QtWidgets.QGridLayout(self.tab_14) + self.gridLayout_30.setContentsMargins(0, 0, 0, 0) self.gridLayout_30.setObjectName("gridLayout_30") self.label_73 = QtWidgets.QLabel(self.tab_14) self.label_73.setObjectName("label_73") @@ -162,6 +175,7 @@ class Ui_DockWidget(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.label_34 = QtWidgets.QLabel(self.tab) self.label_34.setObjectName("label_34") @@ -170,6 +184,7 @@ class Ui_DockWidget(object): self.tab_2 = QtWidgets.QWidget() self.tab_2.setObjectName("tab_2") self.gridLayout_18 = QtWidgets.QGridLayout(self.tab_2) + self.gridLayout_18.setContentsMargins(0, 0, 0, 0) self.gridLayout_18.setObjectName("gridLayout_18") self.label_62 = QtWidgets.QLabel(self.tab_2) self.label_62.setObjectName("label_62") @@ -184,6 +199,7 @@ class Ui_DockWidget(object): self.tab_15 = QtWidgets.QWidget() self.tab_15.setObjectName("tab_15") self.gridLayout_31 = QtWidgets.QGridLayout(self.tab_15) + self.gridLayout_31.setContentsMargins(0, 0, 0, 0) self.gridLayout_31.setObjectName("gridLayout_31") self.label_35 = QtWidgets.QLabel(self.tab_15) self.label_35.setObjectName("label_35") @@ -192,6 +208,7 @@ class Ui_DockWidget(object): self.tab_16 = QtWidgets.QWidget() self.tab_16.setObjectName("tab_16") self.gridLayout_32 = QtWidgets.QGridLayout(self.tab_16) + self.gridLayout_32.setContentsMargins(0, 0, 0, 0) self.gridLayout_32.setObjectName("gridLayout_32") self.label_74 = QtWidgets.QLabel(self.tab_16) self.label_74.setObjectName("label_74") diff --git a/example/ui/dw_containers_tabs_pyside2_ui.py b/example/ui/dw_containers_tabs_pyside2_ui.py index cfc9a1129..536962696 100644 --- a/example/ui/dw_containers_tabs_pyside2_ui.py +++ b/example/ui/dw_containers_tabs_pyside2_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'dw_containers_tabs.ui' # -# Created: Fri Nov 9 18:42:55 2018 +# Created: Thu Dec 13 17:14:04 2018 # by: pyside2-uic 2.0.0 running on PySide2 5.6.0~a1 # # WARNING! All changes made in this file will be lost! diff --git a/example/ui/dw_containers_tabs_pyside_ui.py b/example/ui/dw_containers_tabs_pyside_ui.py index 005fb7c4c..a4770a7ce 100644 --- a/example/ui/dw_containers_tabs_pyside_ui.py +++ b/example/ui/dw_containers_tabs_pyside_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'dw_containers_tabs.ui' # -# Created: Fri Nov 9 18:42:55 2018 +# Created: Thu Dec 13 17:14:04 2018 # by: pyside-uic 0.2.15 running on PySide 1.2.2 # # WARNING! All changes made in this file will be lost! diff --git a/example/ui/dw_containers_tabs_qtpy_ui.py b/example/ui/dw_containers_tabs_qtpy_ui.py index 7f10e4e85..5cd5ecdce 100644 --- a/example/ui/dw_containers_tabs_qtpy_ui.py +++ b/example/ui/dw_containers_tabs_qtpy_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'dw_containers_tabs.ui' # -# Created by: PyQt5 UI code generator 5.9.2 +# Created by: PyQt5 UI code generator 5.6 # # WARNING! All changes made in this file will be lost! @@ -15,6 +15,7 @@ class Ui_DockWidget(object): self.dockWidgetContents = QtWidgets.QWidget() self.dockWidgetContents.setObjectName("dockWidgetContents") self.gridLayout_5 = QtWidgets.QGridLayout(self.dockWidgetContents) + self.gridLayout_5.setContentsMargins(0, 0, 0, 0) self.gridLayout_5.setObjectName("gridLayout_5") self.label_5 = QtWidgets.QLabel(self.dockWidgetContents) font = QtGui.QFont() @@ -37,6 +38,7 @@ class Ui_DockWidget(object): self.tab_7 = QtWidgets.QWidget() self.tab_7.setObjectName("tab_7") self.gridLayout_8 = QtWidgets.QGridLayout(self.tab_7) + self.gridLayout_8.setContentsMargins(0, 0, 0, 0) self.gridLayout_8.setObjectName("gridLayout_8") self.label_52 = QtWidgets.QLabel(self.tab_7) self.label_52.setObjectName("label_52") @@ -45,6 +47,7 @@ class Ui_DockWidget(object): self.tab_8 = QtWidgets.QWidget() self.tab_8.setObjectName("tab_8") self.gridLayout_4 = QtWidgets.QGridLayout(self.tab_8) + self.gridLayout_4.setContentsMargins(0, 0, 0, 0) self.gridLayout_4.setObjectName("gridLayout_4") self.label_48 = QtWidgets.QLabel(self.tab_8) self.label_48.setObjectName("label_48") @@ -59,6 +62,7 @@ class Ui_DockWidget(object): self.tab_9 = QtWidgets.QWidget() self.tab_9.setObjectName("tab_9") self.gridLayout_10 = QtWidgets.QGridLayout(self.tab_9) + self.gridLayout_10.setContentsMargins(0, 0, 0, 0) self.gridLayout_10.setObjectName("gridLayout_10") self.label_53 = QtWidgets.QLabel(self.tab_9) self.label_53.setObjectName("label_53") @@ -67,6 +71,7 @@ class Ui_DockWidget(object): self.tab_10 = QtWidgets.QWidget() self.tab_10.setObjectName("tab_10") self.gridLayout_19 = QtWidgets.QGridLayout(self.tab_10) + self.gridLayout_19.setContentsMargins(0, 0, 0, 0) self.gridLayout_19.setObjectName("gridLayout_19") self.label_49 = QtWidgets.QLabel(self.tab_10) self.label_49.setObjectName("label_49") @@ -79,6 +84,7 @@ class Ui_DockWidget(object): self.tab_5 = QtWidgets.QWidget() self.tab_5.setObjectName("tab_5") self.gridLayout_3 = QtWidgets.QGridLayout(self.tab_5) + self.gridLayout_3.setContentsMargins(0, 0, 0, 0) self.gridLayout_3.setObjectName("gridLayout_3") self.label_39 = QtWidgets.QLabel(self.tab_5) self.label_39.setObjectName("label_39") @@ -87,6 +93,7 @@ class Ui_DockWidget(object): self.tab_6 = QtWidgets.QWidget() self.tab_6.setObjectName("tab_6") self.gridLayout_9 = QtWidgets.QGridLayout(self.tab_6) + self.gridLayout_9.setContentsMargins(0, 0, 0, 0) self.gridLayout_9.setObjectName("gridLayout_9") self.label_54 = QtWidgets.QLabel(self.tab_6) self.label_54.setObjectName("label_54") @@ -100,6 +107,7 @@ class Ui_DockWidget(object): self.tab_11 = QtWidgets.QWidget() self.tab_11.setObjectName("tab_11") self.gridLayout_20 = QtWidgets.QGridLayout(self.tab_11) + self.gridLayout_20.setContentsMargins(0, 0, 0, 0) self.gridLayout_20.setObjectName("gridLayout_20") self.label_50 = QtWidgets.QLabel(self.tab_11) self.label_50.setObjectName("label_50") @@ -108,6 +116,7 @@ class Ui_DockWidget(object): self.tab_12 = QtWidgets.QWidget() self.tab_12.setObjectName("tab_12") self.gridLayout_21 = QtWidgets.QGridLayout(self.tab_12) + self.gridLayout_21.setContentsMargins(0, 0, 0, 0) self.gridLayout_21.setObjectName("gridLayout_21") self.label_72 = QtWidgets.QLabel(self.tab_12) self.label_72.setObjectName("label_72") @@ -120,6 +129,7 @@ class Ui_DockWidget(object): self.tab_3 = QtWidgets.QWidget() self.tab_3.setObjectName("tab_3") self.gridLayout_2 = QtWidgets.QGridLayout(self.tab_3) + self.gridLayout_2.setContentsMargins(0, 0, 0, 0) self.gridLayout_2.setObjectName("gridLayout_2") self.label_38 = QtWidgets.QLabel(self.tab_3) self.label_38.setObjectName("label_38") @@ -128,6 +138,7 @@ class Ui_DockWidget(object): self.tab_4 = QtWidgets.QWidget() self.tab_4.setObjectName("tab_4") self.gridLayout_11 = QtWidgets.QGridLayout(self.tab_4) + self.gridLayout_11.setContentsMargins(0, 0, 0, 0) self.gridLayout_11.setObjectName("gridLayout_11") self.label_55 = QtWidgets.QLabel(self.tab_4) self.label_55.setObjectName("label_55") @@ -141,6 +152,7 @@ class Ui_DockWidget(object): self.tab_13 = QtWidgets.QWidget() self.tab_13.setObjectName("tab_13") self.gridLayout_22 = QtWidgets.QGridLayout(self.tab_13) + self.gridLayout_22.setContentsMargins(0, 0, 0, 0) self.gridLayout_22.setObjectName("gridLayout_22") self.label_51 = QtWidgets.QLabel(self.tab_13) self.label_51.setObjectName("label_51") @@ -149,6 +161,7 @@ class Ui_DockWidget(object): self.tab_14 = QtWidgets.QWidget() self.tab_14.setObjectName("tab_14") self.gridLayout_30 = QtWidgets.QGridLayout(self.tab_14) + self.gridLayout_30.setContentsMargins(0, 0, 0, 0) self.gridLayout_30.setObjectName("gridLayout_30") self.label_73 = QtWidgets.QLabel(self.tab_14) self.label_73.setObjectName("label_73") @@ -162,6 +175,7 @@ class Ui_DockWidget(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.label_34 = QtWidgets.QLabel(self.tab) self.label_34.setObjectName("label_34") @@ -170,6 +184,7 @@ class Ui_DockWidget(object): self.tab_2 = QtWidgets.QWidget() self.tab_2.setObjectName("tab_2") self.gridLayout_18 = QtWidgets.QGridLayout(self.tab_2) + self.gridLayout_18.setContentsMargins(0, 0, 0, 0) self.gridLayout_18.setObjectName("gridLayout_18") self.label_62 = QtWidgets.QLabel(self.tab_2) self.label_62.setObjectName("label_62") @@ -184,6 +199,7 @@ class Ui_DockWidget(object): self.tab_15 = QtWidgets.QWidget() self.tab_15.setObjectName("tab_15") self.gridLayout_31 = QtWidgets.QGridLayout(self.tab_15) + self.gridLayout_31.setContentsMargins(0, 0, 0, 0) self.gridLayout_31.setObjectName("gridLayout_31") self.label_35 = QtWidgets.QLabel(self.tab_15) self.label_35.setObjectName("label_35") @@ -192,6 +208,7 @@ class Ui_DockWidget(object): self.tab_16 = QtWidgets.QWidget() self.tab_16.setObjectName("tab_16") self.gridLayout_32 = QtWidgets.QGridLayout(self.tab_16) + self.gridLayout_32.setContentsMargins(0, 0, 0, 0) self.gridLayout_32.setObjectName("gridLayout_32") self.label_74 = QtWidgets.QLabel(self.tab_16) self.label_74.setObjectName("label_74") diff --git a/example/ui/dw_displays_pyqt5_ui.py b/example/ui/dw_displays_pyqt5_ui.py index 60f07e37f..6000e5f21 100644 --- a/example/ui/dw_displays_pyqt5_ui.py +++ b/example/ui/dw_displays_pyqt5_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'dw_displays.ui' # -# Created by: PyQt5 UI code generator 5.9.2 +# Created by: PyQt5 UI code generator 5.6 # # WARNING! All changes made in this file will be lost! @@ -15,6 +15,7 @@ class Ui_DockWidget(object): self.dockWidgetContents = QtWidgets.QWidget() self.dockWidgetContents.setObjectName("dockWidgetContents") self.gridLayout = QtWidgets.QGridLayout(self.dockWidgetContents) + self.gridLayout.setContentsMargins(0, 0, 0, 0) self.gridLayout.setObjectName("gridLayout") self.textBrowser = QtWidgets.QTextBrowser(self.dockWidgetContents) self.textBrowser.setMinimumSize(QtCore.QSize(0, 0)) diff --git a/example/ui/dw_displays_pyside2_ui.py b/example/ui/dw_displays_pyside2_ui.py index 7594f1117..29e63ea6e 100644 --- a/example/ui/dw_displays_pyside2_ui.py +++ b/example/ui/dw_displays_pyside2_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'dw_displays.ui' # -# Created: Fri Nov 9 18:42:56 2018 +# Created: Thu Dec 13 17:14:05 2018 # by: pyside2-uic 2.0.0 running on PySide2 5.6.0~a1 # # WARNING! All changes made in this file will be lost! diff --git a/example/ui/dw_displays_pyside_ui.py b/example/ui/dw_displays_pyside_ui.py index 0c01686bb..9061ea198 100644 --- a/example/ui/dw_displays_pyside_ui.py +++ b/example/ui/dw_displays_pyside_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'dw_displays.ui' # -# Created: Fri Nov 9 18:42:56 2018 +# Created: Thu Dec 13 17:14:05 2018 # by: pyside-uic 0.2.15 running on PySide 1.2.2 # # WARNING! All changes made in this file will be lost! diff --git a/example/ui/dw_displays_qtpy_ui.py b/example/ui/dw_displays_qtpy_ui.py index db3c27387..a4d6453bf 100644 --- a/example/ui/dw_displays_qtpy_ui.py +++ b/example/ui/dw_displays_qtpy_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'dw_displays.ui' # -# Created by: PyQt5 UI code generator 5.9.2 +# Created by: PyQt5 UI code generator 5.6 # # WARNING! All changes made in this file will be lost! @@ -15,6 +15,7 @@ class Ui_DockWidget(object): self.dockWidgetContents = QtWidgets.QWidget() self.dockWidgetContents.setObjectName("dockWidgetContents") self.gridLayout = QtWidgets.QGridLayout(self.dockWidgetContents) + self.gridLayout.setContentsMargins(0, 0, 0, 0) self.gridLayout.setObjectName("gridLayout") self.textBrowser = QtWidgets.QTextBrowser(self.dockWidgetContents) self.textBrowser.setMinimumSize(QtCore.QSize(0, 0)) diff --git a/example/ui/dw_inputs_fields_pyqt5_ui.py b/example/ui/dw_inputs_fields_pyqt5_ui.py index 90231dd07..01c59c5e9 100644 --- a/example/ui/dw_inputs_fields_pyqt5_ui.py +++ b/example/ui/dw_inputs_fields_pyqt5_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'dw_inputs_fields.ui' # -# Created by: PyQt5 UI code generator 5.9.2 +# Created by: PyQt5 UI code generator 5.6 # # WARNING! All changes made in this file will be lost! @@ -15,6 +15,7 @@ class Ui_DockWidget(object): self.dockWidgetContents = QtWidgets.QWidget() self.dockWidgetContents.setObjectName("dockWidgetContents") self.gridLayout = QtWidgets.QGridLayout(self.dockWidgetContents) + self.gridLayout.setContentsMargins(0, 0, 0, 0) self.gridLayout.setObjectName("gridLayout") self.label = QtWidgets.QLabel(self.dockWidgetContents) font = QtGui.QFont() diff --git a/example/ui/dw_inputs_fields_pyside2_ui.py b/example/ui/dw_inputs_fields_pyside2_ui.py index bd96428e8..edf4d2ac3 100644 --- a/example/ui/dw_inputs_fields_pyside2_ui.py +++ b/example/ui/dw_inputs_fields_pyside2_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'dw_inputs_fields.ui' # -# Created: Fri Nov 9 18:42:55 2018 +# Created: Thu Dec 13 17:14:04 2018 # by: pyside2-uic 2.0.0 running on PySide2 5.6.0~a1 # # WARNING! All changes made in this file will be lost! diff --git a/example/ui/dw_inputs_fields_pyside_ui.py b/example/ui/dw_inputs_fields_pyside_ui.py index 82da58362..7df92a7f6 100644 --- a/example/ui/dw_inputs_fields_pyside_ui.py +++ b/example/ui/dw_inputs_fields_pyside_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'dw_inputs_fields.ui' # -# Created: Fri Nov 9 18:42:55 2018 +# Created: Thu Dec 13 17:14:04 2018 # by: pyside-uic 0.2.15 running on PySide 1.2.2 # # WARNING! All changes made in this file will be lost! diff --git a/example/ui/dw_inputs_fields_qtpy_ui.py b/example/ui/dw_inputs_fields_qtpy_ui.py index 0ac61d1b2..2a16d2214 100644 --- a/example/ui/dw_inputs_fields_qtpy_ui.py +++ b/example/ui/dw_inputs_fields_qtpy_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'dw_inputs_fields.ui' # -# Created by: PyQt5 UI code generator 5.9.2 +# Created by: PyQt5 UI code generator 5.6 # # WARNING! All changes made in this file will be lost! @@ -15,6 +15,7 @@ class Ui_DockWidget(object): self.dockWidgetContents = QtWidgets.QWidget() self.dockWidgetContents.setObjectName("dockWidgetContents") self.gridLayout = QtWidgets.QGridLayout(self.dockWidgetContents) + self.gridLayout.setContentsMargins(0, 0, 0, 0) self.gridLayout.setObjectName("gridLayout") self.label = QtWidgets.QLabel(self.dockWidgetContents) font = QtGui.QFont() diff --git a/example/ui/dw_inputs_no_fields_pyqt5_ui.py b/example/ui/dw_inputs_no_fields_pyqt5_ui.py index 7e243e7bb..3f7b67cfc 100644 --- a/example/ui/dw_inputs_no_fields_pyqt5_ui.py +++ b/example/ui/dw_inputs_no_fields_pyqt5_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'dw_inputs_no_fields.ui' # -# Created by: PyQt5 UI code generator 5.9.2 +# Created by: PyQt5 UI code generator 5.6 # # WARNING! All changes made in this file will be lost! @@ -15,6 +15,7 @@ class Ui_DockWidget(object): self.dockWidgetContents = QtWidgets.QWidget() self.dockWidgetContents.setObjectName("dockWidgetContents") self.gridLayout = QtWidgets.QGridLayout(self.dockWidgetContents) + self.gridLayout.setContentsMargins(0, 0, 0, 0) self.gridLayout.setObjectName("gridLayout") self.dial = QtWidgets.QDial(self.dockWidgetContents) self.dial.setMinimumSize(QtCore.QSize(0, 0)) diff --git a/example/ui/dw_inputs_no_fields_pyside2_ui.py b/example/ui/dw_inputs_no_fields_pyside2_ui.py index a98c7c8c5..25eae2669 100644 --- a/example/ui/dw_inputs_no_fields_pyside2_ui.py +++ b/example/ui/dw_inputs_no_fields_pyside2_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'dw_inputs_no_fields.ui' # -# Created: Fri Nov 9 18:42:57 2018 +# Created: Thu Dec 13 17:14:06 2018 # by: pyside2-uic 2.0.0 running on PySide2 5.6.0~a1 # # WARNING! All changes made in this file will be lost! diff --git a/example/ui/dw_inputs_no_fields_pyside_ui.py b/example/ui/dw_inputs_no_fields_pyside_ui.py index 08d232a03..a09a5bd8f 100644 --- a/example/ui/dw_inputs_no_fields_pyside_ui.py +++ b/example/ui/dw_inputs_no_fields_pyside_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'dw_inputs_no_fields.ui' # -# Created: Fri Nov 9 18:42:57 2018 +# Created: Thu Dec 13 17:14:06 2018 # by: pyside-uic 0.2.15 running on PySide 1.2.2 # # WARNING! All changes made in this file will be lost! diff --git a/example/ui/dw_inputs_no_fields_qtpy_ui.py b/example/ui/dw_inputs_no_fields_qtpy_ui.py index 5809a8251..83d769cb2 100644 --- a/example/ui/dw_inputs_no_fields_qtpy_ui.py +++ b/example/ui/dw_inputs_no_fields_qtpy_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'dw_inputs_no_fields.ui' # -# Created by: PyQt5 UI code generator 5.9.2 +# Created by: PyQt5 UI code generator 5.6 # # WARNING! All changes made in this file will be lost! @@ -15,6 +15,7 @@ class Ui_DockWidget(object): self.dockWidgetContents = QtWidgets.QWidget() self.dockWidgetContents.setObjectName("dockWidgetContents") self.gridLayout = QtWidgets.QGridLayout(self.dockWidgetContents) + self.gridLayout.setContentsMargins(0, 0, 0, 0) self.gridLayout.setObjectName("gridLayout") self.dial = QtWidgets.QDial(self.dockWidgetContents) self.dial.setMinimumSize(QtCore.QSize(0, 0)) diff --git a/example/ui/dw_views_pyqt5_ui.py b/example/ui/dw_views_pyqt5_ui.py index cd8288450..7d0990c58 100644 --- a/example/ui/dw_views_pyqt5_ui.py +++ b/example/ui/dw_views_pyqt5_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'dw_views.ui' # -# Created by: PyQt5 UI code generator 5.9.2 +# Created by: PyQt5 UI code generator 5.6 # # WARNING! All changes made in this file will be lost! @@ -15,6 +15,7 @@ class Ui_DockWidget(object): self.dockWidgetContents = QtWidgets.QWidget() self.dockWidgetContents.setObjectName("dockWidgetContents") self.gridLayout = QtWidgets.QGridLayout(self.dockWidgetContents) + self.gridLayout.setContentsMargins(0, 0, 0, 0) self.gridLayout.setObjectName("gridLayout") self.label_70 = QtWidgets.QLabel(self.dockWidgetContents) font = QtGui.QFont() diff --git a/example/ui/dw_views_pyside2_ui.py b/example/ui/dw_views_pyside2_ui.py index 155a8e910..a5350d568 100644 --- a/example/ui/dw_views_pyside2_ui.py +++ b/example/ui/dw_views_pyside2_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'dw_views.ui' # -# Created: Fri Nov 9 18:42:57 2018 +# Created: Thu Dec 13 17:14:06 2018 # by: pyside2-uic 2.0.0 running on PySide2 5.6.0~a1 # # WARNING! All changes made in this file will be lost! diff --git a/example/ui/dw_views_pyside_ui.py b/example/ui/dw_views_pyside_ui.py index 4b618ca2c..217b53691 100644 --- a/example/ui/dw_views_pyside_ui.py +++ b/example/ui/dw_views_pyside_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'dw_views.ui' # -# Created: Fri Nov 9 18:42:56 2018 +# Created: Thu Dec 13 17:14:06 2018 # by: pyside-uic 0.2.15 running on PySide 1.2.2 # # WARNING! All changes made in this file will be lost! diff --git a/example/ui/dw_views_qtpy_ui.py b/example/ui/dw_views_qtpy_ui.py index 395263b13..78c447480 100644 --- a/example/ui/dw_views_qtpy_ui.py +++ b/example/ui/dw_views_qtpy_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'dw_views.ui' # -# Created by: PyQt5 UI code generator 5.9.2 +# Created by: PyQt5 UI code generator 5.6 # # WARNING! All changes made in this file will be lost! @@ -15,6 +15,7 @@ class Ui_DockWidget(object): self.dockWidgetContents = QtWidgets.QWidget() self.dockWidgetContents.setObjectName("dockWidgetContents") self.gridLayout = QtWidgets.QGridLayout(self.dockWidgetContents) + self.gridLayout.setContentsMargins(0, 0, 0, 0) self.gridLayout.setObjectName("gridLayout") self.label_70 = QtWidgets.QLabel(self.dockWidgetContents) font = QtGui.QFont() diff --git a/example/ui/dw_widgets_pyqt5_ui.py b/example/ui/dw_widgets_pyqt5_ui.py index e2fa10c5f..fa0d8bf78 100644 --- a/example/ui/dw_widgets_pyqt5_ui.py +++ b/example/ui/dw_widgets_pyqt5_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'dw_widgets.ui' # -# Created by: PyQt5 UI code generator 5.9.2 +# Created by: PyQt5 UI code generator 5.6 # # WARNING! All changes made in this file will be lost! @@ -15,6 +15,7 @@ class Ui_DockWidget(object): self.dockWidgetContents = QtWidgets.QWidget() self.dockWidgetContents.setObjectName("dockWidgetContents") self.gridLayout = QtWidgets.QGridLayout(self.dockWidgetContents) + self.gridLayout.setContentsMargins(0, 0, 0, 0) self.gridLayout.setObjectName("gridLayout") self.label_81 = QtWidgets.QLabel(self.dockWidgetContents) font = QtGui.QFont() diff --git a/example/ui/dw_widgets_pyside2_ui.py b/example/ui/dw_widgets_pyside2_ui.py index 7dac38590..3561329c1 100644 --- a/example/ui/dw_widgets_pyside2_ui.py +++ b/example/ui/dw_widgets_pyside2_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'dw_widgets.ui' # -# Created: Fri Nov 9 18:42:56 2018 +# Created: Thu Dec 13 17:14:05 2018 # by: pyside2-uic 2.0.0 running on PySide2 5.6.0~a1 # # WARNING! All changes made in this file will be lost! diff --git a/example/ui/dw_widgets_pyside_ui.py b/example/ui/dw_widgets_pyside_ui.py index 001e1da83..b47443816 100644 --- a/example/ui/dw_widgets_pyside_ui.py +++ b/example/ui/dw_widgets_pyside_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'dw_widgets.ui' # -# Created: Fri Nov 9 18:42:56 2018 +# Created: Thu Dec 13 17:14:05 2018 # by: pyside-uic 0.2.15 running on PySide 1.2.2 # # WARNING! All changes made in this file will be lost! diff --git a/example/ui/dw_widgets_qtpy_ui.py b/example/ui/dw_widgets_qtpy_ui.py index 7bd09bb73..5350a99b9 100644 --- a/example/ui/dw_widgets_qtpy_ui.py +++ b/example/ui/dw_widgets_qtpy_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'dw_widgets.ui' # -# Created by: PyQt5 UI code generator 5.9.2 +# Created by: PyQt5 UI code generator 5.6 # # WARNING! All changes made in this file will be lost! @@ -15,6 +15,7 @@ class Ui_DockWidget(object): self.dockWidgetContents = QtWidgets.QWidget() self.dockWidgetContents.setObjectName("dockWidgetContents") self.gridLayout = QtWidgets.QGridLayout(self.dockWidgetContents) + self.gridLayout.setContentsMargins(0, 0, 0, 0) self.gridLayout.setObjectName("gridLayout") self.label_81 = QtWidgets.QLabel(self.dockWidgetContents) font = QtGui.QFont() diff --git a/example/ui/mw_menus.ui b/example/ui/mw_menus.ui index 08f364463..9a3423df0 100644 --- a/example/ui/mw_menus.ui +++ b/example/ui/mw_menus.ui @@ -6,16 +6,16 @@ 0 0 - 742 - 439 + 596 + 569 MainWindow - - + + Issue #115 - Tabs scroller buttons @@ -24,17 +24,77 @@ - 11 + 1 Tab 1 + + + + + Issue #123 - Missing borders + + + + + + TextLabel + + + + + + + Inside tab, outside frame + + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + TextLabel + + + + + + + Inside tab and frame + + + + + + + + + + Tab 2 + + + + + TextLabel + + + + @@ -85,13 +145,14 @@ Page + - + Issue #112 - Hyperlinks color @@ -99,6 +160,9 @@ + + 0 + <html><head/><body><p align="center"><a href="https://github.com/ColinDuquesnoy/QDarkStyleSheet/issues/112"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">Hyperlink Example</span></a></p><p align="center"><span style=" font-size:10pt; color:#7d7d7d;">CSS for the documents (RichText) is not the same as the application. We cannot change the internal content CSS, e.g., hyperlinks. We suggest you use the middle tons (0-255, use 125), so this works for both white and dark theme (this color). The original color is the blue link on top.</span></p><p align="center"><br/></p></body></html> @@ -122,7 +186,7 @@ - + Inside Central Widget @@ -139,7 +203,7 @@ 0 0 - 742 + 596 28 @@ -308,6 +372,11 @@ + + lineEdit + tabWidget + lineEdit_2 + diff --git a/example/ui/mw_menus_pyqt5_ui.py b/example/ui/mw_menus_pyqt5_ui.py index 2a810bbde..d4331629a 100644 --- a/example/ui/mw_menus_pyqt5_ui.py +++ b/example/ui/mw_menus_pyqt5_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'mw_menus.ui' # -# Created by: PyQt5 UI code generator 5.9.2 +# Created by: PyQt5 UI code generator 5.6 # # WARNING! All changes made in this file will be lost! @@ -11,11 +11,11 @@ from PyQt5 import QtCore, QtGui, QtWidgets class Ui_MainWindow(object): def setupUi(self, MainWindow): MainWindow.setObjectName("MainWindow") - MainWindow.resize(742, 439) + MainWindow.resize(596, 569) self.centralwidget = QtWidgets.QWidget(MainWindow) self.centralwidget.setObjectName("centralwidget") - self.verticalLayout_4 = QtWidgets.QVBoxLayout(self.centralwidget) - self.verticalLayout_4.setObjectName("verticalLayout_4") + self.gridLayout_7 = QtWidgets.QGridLayout(self.centralwidget) + self.gridLayout_7.setObjectName("gridLayout_7") self.groupBox_2 = QtWidgets.QGroupBox(self.centralwidget) self.groupBox_2.setObjectName("groupBox_2") self.gridLayout = QtWidgets.QGridLayout(self.groupBox_2) @@ -24,9 +24,42 @@ class Ui_MainWindow(object): self.tabWidget.setObjectName("tabWidget") self.tab = QtWidgets.QWidget() self.tab.setObjectName("tab") + self.gridLayout_4 = QtWidgets.QGridLayout(self.tab) + self.gridLayout_4.setContentsMargins(0, 0, 0, 0) + self.gridLayout_4.setObjectName("gridLayout_4") + self.groupBox_3 = QtWidgets.QGroupBox(self.tab) + self.groupBox_3.setObjectName("groupBox_3") + self.gridLayout_5 = QtWidgets.QGridLayout(self.groupBox_3) + self.gridLayout_5.setObjectName("gridLayout_5") + self.label_2 = QtWidgets.QLabel(self.groupBox_3) + self.label_2.setObjectName("label_2") + self.gridLayout_5.addWidget(self.label_2, 0, 0, 1, 1) + self.lineEdit = QtWidgets.QLineEdit(self.groupBox_3) + self.lineEdit.setObjectName("lineEdit") + self.gridLayout_5.addWidget(self.lineEdit, 0, 1, 1, 1) + self.frame = QtWidgets.QFrame(self.groupBox_3) + self.frame.setFrameShape(QtWidgets.QFrame.StyledPanel) + self.frame.setFrameShadow(QtWidgets.QFrame.Raised) + self.frame.setObjectName("frame") + self.formLayout = QtWidgets.QFormLayout(self.frame) + self.formLayout.setObjectName("formLayout") + self.label_3 = QtWidgets.QLabel(self.frame) + self.label_3.setObjectName("label_3") + self.formLayout.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.label_3) + self.lineEdit_2 = QtWidgets.QLineEdit(self.frame) + self.lineEdit_2.setObjectName("lineEdit_2") + self.formLayout.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.lineEdit_2) + self.gridLayout_5.addWidget(self.frame, 1, 0, 1, 2) + self.gridLayout_4.addWidget(self.groupBox_3, 1, 0, 1, 1) self.tabWidget.addTab(self.tab, "") self.tab_2 = QtWidgets.QWidget() self.tab_2.setObjectName("tab_2") + self.gridLayout_6 = QtWidgets.QGridLayout(self.tab_2) + self.gridLayout_6.setContentsMargins(0, 0, 0, 0) + self.gridLayout_6.setObjectName("gridLayout_6") + self.label_4 = QtWidgets.QLabel(self.tab_2) + self.label_4.setObjectName("label_4") + self.gridLayout_6.addWidget(self.label_4, 0, 0, 1, 1) self.tabWidget.addTab(self.tab_2, "") self.tab_3 = QtWidgets.QWidget() self.tab_3.setObjectName("tab_3") @@ -57,14 +90,18 @@ class Ui_MainWindow(object): self.tabWidget.addTab(self.tab_11, "") self.tab_12 = QtWidgets.QWidget() self.tab_12.setObjectName("tab_12") + self.gridLayout_3 = QtWidgets.QGridLayout(self.tab_12) + self.gridLayout_3.setContentsMargins(0, 0, 0, 0) + self.gridLayout_3.setObjectName("gridLayout_3") self.tabWidget.addTab(self.tab_12, "") self.gridLayout.addWidget(self.tabWidget, 0, 0, 1, 1) - self.verticalLayout_4.addWidget(self.groupBox_2) + self.gridLayout_7.addWidget(self.groupBox_2, 0, 0, 1, 1) self.groupBox = QtWidgets.QGroupBox(self.centralwidget) self.groupBox.setObjectName("groupBox") self.gridLayout_2 = QtWidgets.QGridLayout(self.groupBox) self.gridLayout_2.setObjectName("gridLayout_2") self.label = QtWidgets.QLabel(self.groupBox) + self.label.setLineWidth(0) self.label.setTextFormat(QtCore.Qt.RichText) self.label.setAlignment(QtCore.Qt.AlignCenter) self.label.setWordWrap(True) @@ -72,14 +109,14 @@ class Ui_MainWindow(object): self.label.setTextInteractionFlags(QtCore.Qt.TextBrowserInteraction) self.label.setObjectName("label") self.gridLayout_2.addWidget(self.label, 0, 0, 1, 1) - self.verticalLayout_4.addWidget(self.groupBox) + self.gridLayout_7.addWidget(self.groupBox, 1, 0, 1, 1) self.label_71 = QtWidgets.QLabel(self.centralwidget) self.label_71.setAlignment(QtCore.Qt.AlignCenter) self.label_71.setObjectName("label_71") - self.verticalLayout_4.addWidget(self.label_71) + self.gridLayout_7.addWidget(self.label_71, 2, 0, 1, 1) MainWindow.setCentralWidget(self.centralwidget) self.menubar = QtWidgets.QMenuBar(MainWindow) - self.menubar.setGeometry(QtCore.QRect(0, 0, 742, 28)) + self.menubar.setGeometry(QtCore.QRect(0, 0, 596, 28)) self.menubar.setObjectName("menubar") self.menuMenu = QtWidgets.QMenu(self.menubar) self.menuMenu.setObjectName("menuMenu") @@ -155,14 +192,22 @@ class Ui_MainWindow(object): self.toolBarCheckable.addAction(self.actionActionCheckableSubAUnchecked) self.retranslateUi(MainWindow) - self.tabWidget.setCurrentIndex(11) + self.tabWidget.setCurrentIndex(1) QtCore.QMetaObject.connectSlotsByName(MainWindow) + MainWindow.setTabOrder(self.lineEdit, self.tabWidget) + MainWindow.setTabOrder(self.tabWidget, self.lineEdit_2) def retranslateUi(self, MainWindow): _translate = QtCore.QCoreApplication.translate MainWindow.setWindowTitle(_translate("MainWindow", "MainWindow")) self.groupBox_2.setTitle(_translate("MainWindow", "Issue #115 - Tabs scroller buttons")) + self.groupBox_3.setTitle(_translate("MainWindow", "Issue #123 - Missing borders")) + self.label_2.setText(_translate("MainWindow", "TextLabel")) + self.lineEdit.setText(_translate("MainWindow", "Inside tab, outside frame")) + self.label_3.setText(_translate("MainWindow", "TextLabel")) + self.lineEdit_2.setText(_translate("MainWindow", "Inside tab and frame")) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab), _translate("MainWindow", "Tab 1")) + self.label_4.setText(_translate("MainWindow", "TextLabel")) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_2), _translate("MainWindow", "Tab 2")) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_3), _translate("MainWindow", "Page")) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_4), _translate("MainWindow", "Page")) diff --git a/example/ui/mw_menus_pyqt_ui.py b/example/ui/mw_menus_pyqt_ui.py index 0fa5d2805..5945a51f7 100644 --- a/example/ui/mw_menus_pyqt_ui.py +++ b/example/ui/mw_menus_pyqt_ui.py @@ -25,11 +25,11 @@ except AttributeError: class Ui_MainWindow(object): def setupUi(self, MainWindow): MainWindow.setObjectName(_fromUtf8("MainWindow")) - MainWindow.resize(742, 439) + MainWindow.resize(596, 569) self.centralwidget = QtGui.QWidget(MainWindow) self.centralwidget.setObjectName(_fromUtf8("centralwidget")) - self.verticalLayout_4 = QtGui.QVBoxLayout(self.centralwidget) - self.verticalLayout_4.setObjectName(_fromUtf8("verticalLayout_4")) + self.gridLayout_7 = QtGui.QGridLayout(self.centralwidget) + self.gridLayout_7.setObjectName(_fromUtf8("gridLayout_7")) self.groupBox_2 = QtGui.QGroupBox(self.centralwidget) self.groupBox_2.setObjectName(_fromUtf8("groupBox_2")) self.gridLayout = QtGui.QGridLayout(self.groupBox_2) @@ -38,9 +38,40 @@ class Ui_MainWindow(object): self.tabWidget.setObjectName(_fromUtf8("tabWidget")) self.tab = QtGui.QWidget() self.tab.setObjectName(_fromUtf8("tab")) + self.gridLayout_4 = QtGui.QGridLayout(self.tab) + self.gridLayout_4.setObjectName(_fromUtf8("gridLayout_4")) + self.groupBox_3 = QtGui.QGroupBox(self.tab) + self.groupBox_3.setObjectName(_fromUtf8("groupBox_3")) + self.gridLayout_5 = QtGui.QGridLayout(self.groupBox_3) + self.gridLayout_5.setObjectName(_fromUtf8("gridLayout_5")) + self.label_2 = QtGui.QLabel(self.groupBox_3) + self.label_2.setObjectName(_fromUtf8("label_2")) + self.gridLayout_5.addWidget(self.label_2, 0, 0, 1, 1) + self.lineEdit = QtGui.QLineEdit(self.groupBox_3) + self.lineEdit.setObjectName(_fromUtf8("lineEdit")) + self.gridLayout_5.addWidget(self.lineEdit, 0, 1, 1, 1) + self.frame = QtGui.QFrame(self.groupBox_3) + self.frame.setFrameShape(QtGui.QFrame.StyledPanel) + self.frame.setFrameShadow(QtGui.QFrame.Raised) + self.frame.setObjectName(_fromUtf8("frame")) + self.formLayout = QtGui.QFormLayout(self.frame) + self.formLayout.setObjectName(_fromUtf8("formLayout")) + self.label_3 = QtGui.QLabel(self.frame) + self.label_3.setObjectName(_fromUtf8("label_3")) + self.formLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.label_3) + self.lineEdit_2 = QtGui.QLineEdit(self.frame) + self.lineEdit_2.setObjectName(_fromUtf8("lineEdit_2")) + self.formLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.lineEdit_2) + self.gridLayout_5.addWidget(self.frame, 1, 0, 1, 2) + self.gridLayout_4.addWidget(self.groupBox_3, 1, 0, 1, 1) self.tabWidget.addTab(self.tab, _fromUtf8("")) self.tab_2 = QtGui.QWidget() self.tab_2.setObjectName(_fromUtf8("tab_2")) + self.gridLayout_6 = QtGui.QGridLayout(self.tab_2) + self.gridLayout_6.setObjectName(_fromUtf8("gridLayout_6")) + self.label_4 = QtGui.QLabel(self.tab_2) + self.label_4.setObjectName(_fromUtf8("label_4")) + self.gridLayout_6.addWidget(self.label_4, 0, 0, 1, 1) self.tabWidget.addTab(self.tab_2, _fromUtf8("")) self.tab_3 = QtGui.QWidget() self.tab_3.setObjectName(_fromUtf8("tab_3")) @@ -71,14 +102,17 @@ class Ui_MainWindow(object): self.tabWidget.addTab(self.tab_11, _fromUtf8("")) self.tab_12 = QtGui.QWidget() self.tab_12.setObjectName(_fromUtf8("tab_12")) + self.gridLayout_3 = QtGui.QGridLayout(self.tab_12) + self.gridLayout_3.setObjectName(_fromUtf8("gridLayout_3")) self.tabWidget.addTab(self.tab_12, _fromUtf8("")) self.gridLayout.addWidget(self.tabWidget, 0, 0, 1, 1) - self.verticalLayout_4.addWidget(self.groupBox_2) + self.gridLayout_7.addWidget(self.groupBox_2, 0, 0, 1, 1) self.groupBox = QtGui.QGroupBox(self.centralwidget) self.groupBox.setObjectName(_fromUtf8("groupBox")) self.gridLayout_2 = QtGui.QGridLayout(self.groupBox) self.gridLayout_2.setObjectName(_fromUtf8("gridLayout_2")) self.label = QtGui.QLabel(self.groupBox) + self.label.setLineWidth(0) self.label.setTextFormat(QtCore.Qt.RichText) self.label.setAlignment(QtCore.Qt.AlignCenter) self.label.setWordWrap(True) @@ -86,14 +120,14 @@ class Ui_MainWindow(object): self.label.setTextInteractionFlags(QtCore.Qt.TextBrowserInteraction) self.label.setObjectName(_fromUtf8("label")) self.gridLayout_2.addWidget(self.label, 0, 0, 1, 1) - self.verticalLayout_4.addWidget(self.groupBox) + self.gridLayout_7.addWidget(self.groupBox, 1, 0, 1, 1) self.label_71 = QtGui.QLabel(self.centralwidget) self.label_71.setAlignment(QtCore.Qt.AlignCenter) self.label_71.setObjectName(_fromUtf8("label_71")) - self.verticalLayout_4.addWidget(self.label_71) + self.gridLayout_7.addWidget(self.label_71, 2, 0, 1, 1) MainWindow.setCentralWidget(self.centralwidget) self.menubar = QtGui.QMenuBar(MainWindow) - self.menubar.setGeometry(QtCore.QRect(0, 0, 742, 28)) + self.menubar.setGeometry(QtCore.QRect(0, 0, 596, 28)) self.menubar.setObjectName(_fromUtf8("menubar")) self.menuMenu = QtGui.QMenu(self.menubar) self.menuMenu.setObjectName(_fromUtf8("menuMenu")) @@ -169,13 +203,21 @@ class Ui_MainWindow(object): self.toolBarCheckable.addAction(self.actionActionCheckableSubAUnchecked) self.retranslateUi(MainWindow) - self.tabWidget.setCurrentIndex(11) + self.tabWidget.setCurrentIndex(1) QtCore.QMetaObject.connectSlotsByName(MainWindow) + MainWindow.setTabOrder(self.lineEdit, self.tabWidget) + MainWindow.setTabOrder(self.tabWidget, self.lineEdit_2) def retranslateUi(self, MainWindow): MainWindow.setWindowTitle(_translate("MainWindow", "MainWindow", None)) self.groupBox_2.setTitle(_translate("MainWindow", "Issue #115 - Tabs scroller buttons", None)) + self.groupBox_3.setTitle(_translate("MainWindow", "Issue #123 - Missing borders", None)) + self.label_2.setText(_translate("MainWindow", "TextLabel", None)) + self.lineEdit.setText(_translate("MainWindow", "Inside tab, outside frame", None)) + self.label_3.setText(_translate("MainWindow", "TextLabel", None)) + self.lineEdit_2.setText(_translate("MainWindow", "Inside tab and frame", None)) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab), _translate("MainWindow", "Tab 1", None)) + self.label_4.setText(_translate("MainWindow", "TextLabel", None)) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_2), _translate("MainWindow", "Tab 2", None)) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_3), _translate("MainWindow", "Page", None)) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_4), _translate("MainWindow", "Page", None)) diff --git a/example/ui/mw_menus_pyqtgraph_ui.py b/example/ui/mw_menus_pyqtgraph_ui.py index 2419f036c..b187aef1a 100644 --- a/example/ui/mw_menus_pyqtgraph_ui.py +++ b/example/ui/mw_menus_pyqtgraph_ui.py @@ -25,11 +25,11 @@ except AttributeError: class Ui_MainWindow(object): def setupUi(self, MainWindow): MainWindow.setObjectName(_fromUtf8("MainWindow")) - MainWindow.resize(742, 439) + MainWindow.resize(596, 569) self.centralwidget = QtGui.QWidget(MainWindow) self.centralwidget.setObjectName(_fromUtf8("centralwidget")) - self.verticalLayout_4 = QtGui.QVBoxLayout(self.centralwidget) - self.verticalLayout_4.setObjectName(_fromUtf8("verticalLayout_4")) + self.gridLayout_7 = QtGui.QGridLayout(self.centralwidget) + self.gridLayout_7.setObjectName(_fromUtf8("gridLayout_7")) self.groupBox_2 = QtGui.QGroupBox(self.centralwidget) self.groupBox_2.setObjectName(_fromUtf8("groupBox_2")) self.gridLayout = QtGui.QGridLayout(self.groupBox_2) @@ -38,9 +38,40 @@ class Ui_MainWindow(object): self.tabWidget.setObjectName(_fromUtf8("tabWidget")) self.tab = QtGui.QWidget() self.tab.setObjectName(_fromUtf8("tab")) + self.gridLayout_4 = QtGui.QGridLayout(self.tab) + self.gridLayout_4.setObjectName(_fromUtf8("gridLayout_4")) + self.groupBox_3 = QtGui.QGroupBox(self.tab) + self.groupBox_3.setObjectName(_fromUtf8("groupBox_3")) + self.gridLayout_5 = QtGui.QGridLayout(self.groupBox_3) + self.gridLayout_5.setObjectName(_fromUtf8("gridLayout_5")) + self.label_2 = QtGui.QLabel(self.groupBox_3) + self.label_2.setObjectName(_fromUtf8("label_2")) + self.gridLayout_5.addWidget(self.label_2, 0, 0, 1, 1) + self.lineEdit = QtGui.QLineEdit(self.groupBox_3) + self.lineEdit.setObjectName(_fromUtf8("lineEdit")) + self.gridLayout_5.addWidget(self.lineEdit, 0, 1, 1, 1) + self.frame = QtGui.QFrame(self.groupBox_3) + self.frame.setFrameShape(QtGui.QFrame.StyledPanel) + self.frame.setFrameShadow(QtGui.QFrame.Raised) + self.frame.setObjectName(_fromUtf8("frame")) + self.formLayout = QtGui.QFormLayout(self.frame) + self.formLayout.setObjectName(_fromUtf8("formLayout")) + self.label_3 = QtGui.QLabel(self.frame) + self.label_3.setObjectName(_fromUtf8("label_3")) + self.formLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.label_3) + self.lineEdit_2 = QtGui.QLineEdit(self.frame) + self.lineEdit_2.setObjectName(_fromUtf8("lineEdit_2")) + self.formLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.lineEdit_2) + self.gridLayout_5.addWidget(self.frame, 1, 0, 1, 2) + self.gridLayout_4.addWidget(self.groupBox_3, 1, 0, 1, 1) self.tabWidget.addTab(self.tab, _fromUtf8("")) self.tab_2 = QtGui.QWidget() self.tab_2.setObjectName(_fromUtf8("tab_2")) + self.gridLayout_6 = QtGui.QGridLayout(self.tab_2) + self.gridLayout_6.setObjectName(_fromUtf8("gridLayout_6")) + self.label_4 = QtGui.QLabel(self.tab_2) + self.label_4.setObjectName(_fromUtf8("label_4")) + self.gridLayout_6.addWidget(self.label_4, 0, 0, 1, 1) self.tabWidget.addTab(self.tab_2, _fromUtf8("")) self.tab_3 = QtGui.QWidget() self.tab_3.setObjectName(_fromUtf8("tab_3")) @@ -71,14 +102,17 @@ class Ui_MainWindow(object): self.tabWidget.addTab(self.tab_11, _fromUtf8("")) self.tab_12 = QtGui.QWidget() self.tab_12.setObjectName(_fromUtf8("tab_12")) + self.gridLayout_3 = QtGui.QGridLayout(self.tab_12) + self.gridLayout_3.setObjectName(_fromUtf8("gridLayout_3")) self.tabWidget.addTab(self.tab_12, _fromUtf8("")) self.gridLayout.addWidget(self.tabWidget, 0, 0, 1, 1) - self.verticalLayout_4.addWidget(self.groupBox_2) + self.gridLayout_7.addWidget(self.groupBox_2, 0, 0, 1, 1) self.groupBox = QtGui.QGroupBox(self.centralwidget) self.groupBox.setObjectName(_fromUtf8("groupBox")) self.gridLayout_2 = QtGui.QGridLayout(self.groupBox) self.gridLayout_2.setObjectName(_fromUtf8("gridLayout_2")) self.label = QtGui.QLabel(self.groupBox) + self.label.setLineWidth(0) self.label.setTextFormat(QtCore.Qt.RichText) self.label.setAlignment(QtCore.Qt.AlignCenter) self.label.setWordWrap(True) @@ -86,14 +120,14 @@ class Ui_MainWindow(object): self.label.setTextInteractionFlags(QtCore.Qt.TextBrowserInteraction) self.label.setObjectName(_fromUtf8("label")) self.gridLayout_2.addWidget(self.label, 0, 0, 1, 1) - self.verticalLayout_4.addWidget(self.groupBox) + self.gridLayout_7.addWidget(self.groupBox, 1, 0, 1, 1) self.label_71 = QtGui.QLabel(self.centralwidget) self.label_71.setAlignment(QtCore.Qt.AlignCenter) self.label_71.setObjectName(_fromUtf8("label_71")) - self.verticalLayout_4.addWidget(self.label_71) + self.gridLayout_7.addWidget(self.label_71, 2, 0, 1, 1) MainWindow.setCentralWidget(self.centralwidget) self.menubar = QtGui.QMenuBar(MainWindow) - self.menubar.setGeometry(QtCore.QRect(0, 0, 742, 28)) + self.menubar.setGeometry(QtCore.QRect(0, 0, 596, 28)) self.menubar.setObjectName(_fromUtf8("menubar")) self.menuMenu = QtGui.QMenu(self.menubar) self.menuMenu.setObjectName(_fromUtf8("menuMenu")) @@ -169,13 +203,21 @@ class Ui_MainWindow(object): self.toolBarCheckable.addAction(self.actionActionCheckableSubAUnchecked) self.retranslateUi(MainWindow) - self.tabWidget.setCurrentIndex(11) + self.tabWidget.setCurrentIndex(1) QtCore.QMetaObject.connectSlotsByName(MainWindow) + MainWindow.setTabOrder(self.lineEdit, self.tabWidget) + MainWindow.setTabOrder(self.tabWidget, self.lineEdit_2) def retranslateUi(self, MainWindow): MainWindow.setWindowTitle(_translate("MainWindow", "MainWindow", None)) self.groupBox_2.setTitle(_translate("MainWindow", "Issue #115 - Tabs scroller buttons", None)) + self.groupBox_3.setTitle(_translate("MainWindow", "Issue #123 - Missing borders", None)) + self.label_2.setText(_translate("MainWindow", "TextLabel", None)) + self.lineEdit.setText(_translate("MainWindow", "Inside tab, outside frame", None)) + self.label_3.setText(_translate("MainWindow", "TextLabel", None)) + self.lineEdit_2.setText(_translate("MainWindow", "Inside tab and frame", None)) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab), _translate("MainWindow", "Tab 1", None)) + self.label_4.setText(_translate("MainWindow", "TextLabel", None)) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_2), _translate("MainWindow", "Tab 2", None)) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_3), _translate("MainWindow", "Page", None)) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_4), _translate("MainWindow", "Page", None)) diff --git a/example/ui/mw_menus_pyside2_ui.py b/example/ui/mw_menus_pyside2_ui.py index 4fa3211a0..5d663e547 100644 --- a/example/ui/mw_menus_pyside2_ui.py +++ b/example/ui/mw_menus_pyside2_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'mw_menus.ui' # -# Created: Fri Nov 9 18:42:56 2018 +# Created: Thu Dec 13 17:14:05 2018 # by: pyside2-uic 2.0.0 running on PySide2 5.6.0~a1 # # WARNING! All changes made in this file will be lost! @@ -12,11 +12,11 @@ from PySide2 import QtCore, QtGui, QtWidgets class Ui_MainWindow(object): def setupUi(self, MainWindow): MainWindow.setObjectName("MainWindow") - MainWindow.resize(742, 439) + MainWindow.resize(596, 569) self.centralwidget = QtWidgets.QWidget(MainWindow) self.centralwidget.setObjectName("centralwidget") - self.verticalLayout_4 = QtWidgets.QVBoxLayout(self.centralwidget) - self.verticalLayout_4.setObjectName("verticalLayout_4") + self.gridLayout_7 = QtWidgets.QGridLayout(self.centralwidget) + self.gridLayout_7.setObjectName("gridLayout_7") self.groupBox_2 = QtWidgets.QGroupBox(self.centralwidget) self.groupBox_2.setObjectName("groupBox_2") self.gridLayout = QtWidgets.QGridLayout(self.groupBox_2) @@ -25,9 +25,40 @@ class Ui_MainWindow(object): self.tabWidget.setObjectName("tabWidget") self.tab = QtWidgets.QWidget() self.tab.setObjectName("tab") + self.gridLayout_4 = QtWidgets.QGridLayout(self.tab) + self.gridLayout_4.setObjectName("gridLayout_4") + self.groupBox_3 = QtWidgets.QGroupBox(self.tab) + self.groupBox_3.setObjectName("groupBox_3") + self.gridLayout_5 = QtWidgets.QGridLayout(self.groupBox_3) + self.gridLayout_5.setObjectName("gridLayout_5") + self.label_2 = QtWidgets.QLabel(self.groupBox_3) + self.label_2.setObjectName("label_2") + self.gridLayout_5.addWidget(self.label_2, 0, 0, 1, 1) + self.lineEdit = QtWidgets.QLineEdit(self.groupBox_3) + self.lineEdit.setObjectName("lineEdit") + self.gridLayout_5.addWidget(self.lineEdit, 0, 1, 1, 1) + self.frame = QtWidgets.QFrame(self.groupBox_3) + self.frame.setFrameShape(QtWidgets.QFrame.StyledPanel) + self.frame.setFrameShadow(QtWidgets.QFrame.Raised) + self.frame.setObjectName("frame") + self.formLayout = QtWidgets.QFormLayout(self.frame) + self.formLayout.setObjectName("formLayout") + self.label_3 = QtWidgets.QLabel(self.frame) + self.label_3.setObjectName("label_3") + self.formLayout.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.label_3) + self.lineEdit_2 = QtWidgets.QLineEdit(self.frame) + self.lineEdit_2.setObjectName("lineEdit_2") + self.formLayout.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.lineEdit_2) + self.gridLayout_5.addWidget(self.frame, 1, 0, 1, 2) + self.gridLayout_4.addWidget(self.groupBox_3, 1, 0, 1, 1) self.tabWidget.addTab(self.tab, "") self.tab_2 = QtWidgets.QWidget() self.tab_2.setObjectName("tab_2") + self.gridLayout_6 = QtWidgets.QGridLayout(self.tab_2) + self.gridLayout_6.setObjectName("gridLayout_6") + self.label_4 = QtWidgets.QLabel(self.tab_2) + self.label_4.setObjectName("label_4") + self.gridLayout_6.addWidget(self.label_4, 0, 0, 1, 1) self.tabWidget.addTab(self.tab_2, "") self.tab_3 = QtWidgets.QWidget() self.tab_3.setObjectName("tab_3") @@ -58,14 +89,17 @@ class Ui_MainWindow(object): self.tabWidget.addTab(self.tab_11, "") self.tab_12 = QtWidgets.QWidget() self.tab_12.setObjectName("tab_12") + self.gridLayout_3 = QtWidgets.QGridLayout(self.tab_12) + self.gridLayout_3.setObjectName("gridLayout_3") self.tabWidget.addTab(self.tab_12, "") self.gridLayout.addWidget(self.tabWidget, 0, 0, 1, 1) - self.verticalLayout_4.addWidget(self.groupBox_2) + self.gridLayout_7.addWidget(self.groupBox_2, 0, 0, 1, 1) self.groupBox = QtWidgets.QGroupBox(self.centralwidget) self.groupBox.setObjectName("groupBox") self.gridLayout_2 = QtWidgets.QGridLayout(self.groupBox) self.gridLayout_2.setObjectName("gridLayout_2") self.label = QtWidgets.QLabel(self.groupBox) + self.label.setLineWidth(0) self.label.setTextFormat(QtCore.Qt.RichText) self.label.setAlignment(QtCore.Qt.AlignCenter) self.label.setWordWrap(True) @@ -73,14 +107,14 @@ class Ui_MainWindow(object): self.label.setTextInteractionFlags(QtCore.Qt.TextBrowserInteraction) self.label.setObjectName("label") self.gridLayout_2.addWidget(self.label, 0, 0, 1, 1) - self.verticalLayout_4.addWidget(self.groupBox) + self.gridLayout_7.addWidget(self.groupBox, 1, 0, 1, 1) self.label_71 = QtWidgets.QLabel(self.centralwidget) self.label_71.setAlignment(QtCore.Qt.AlignCenter) self.label_71.setObjectName("label_71") - self.verticalLayout_4.addWidget(self.label_71) + self.gridLayout_7.addWidget(self.label_71, 2, 0, 1, 1) MainWindow.setCentralWidget(self.centralwidget) self.menubar = QtWidgets.QMenuBar(MainWindow) - self.menubar.setGeometry(QtCore.QRect(0, 0, 742, 28)) + self.menubar.setGeometry(QtCore.QRect(0, 0, 596, 28)) self.menubar.setObjectName("menubar") self.menuMenu = QtWidgets.QMenu(self.menubar) self.menuMenu.setObjectName("menuMenu") @@ -156,13 +190,21 @@ class Ui_MainWindow(object): self.toolBarCheckable.addAction(self.actionActionCheckableSubAUnchecked) self.retranslateUi(MainWindow) - self.tabWidget.setCurrentIndex(11) + self.tabWidget.setCurrentIndex(1) QtCore.QMetaObject.connectSlotsByName(MainWindow) + MainWindow.setTabOrder(self.lineEdit, self.tabWidget) + MainWindow.setTabOrder(self.tabWidget, self.lineEdit_2) def retranslateUi(self, MainWindow): MainWindow.setWindowTitle(QtWidgets.QApplication.translate("MainWindow", "MainWindow", None, -1)) self.groupBox_2.setTitle(QtWidgets.QApplication.translate("MainWindow", "Issue #115 - Tabs scroller buttons", None, -1)) + self.groupBox_3.setTitle(QtWidgets.QApplication.translate("MainWindow", "Issue #123 - Missing borders", None, -1)) + self.label_2.setText(QtWidgets.QApplication.translate("MainWindow", "TextLabel", None, -1)) + self.lineEdit.setText(QtWidgets.QApplication.translate("MainWindow", "Inside tab, outside frame", None, -1)) + self.label_3.setText(QtWidgets.QApplication.translate("MainWindow", "TextLabel", None, -1)) + self.lineEdit_2.setText(QtWidgets.QApplication.translate("MainWindow", "Inside tab and frame", None, -1)) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab), QtWidgets.QApplication.translate("MainWindow", "Tab 1", None, -1)) + self.label_4.setText(QtWidgets.QApplication.translate("MainWindow", "TextLabel", None, -1)) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_2), QtWidgets.QApplication.translate("MainWindow", "Tab 2", None, -1)) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_3), QtWidgets.QApplication.translate("MainWindow", "Page", None, -1)) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_4), QtWidgets.QApplication.translate("MainWindow", "Page", None, -1)) diff --git a/example/ui/mw_menus_pyside_ui.py b/example/ui/mw_menus_pyside_ui.py index f05702634..cf8fc22ab 100644 --- a/example/ui/mw_menus_pyside_ui.py +++ b/example/ui/mw_menus_pyside_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'mw_menus.ui' # -# Created: Fri Nov 9 18:42:56 2018 +# Created: Thu Dec 13 17:14:05 2018 # by: pyside-uic 0.2.15 running on PySide 1.2.2 # # WARNING! All changes made in this file will be lost! @@ -12,11 +12,11 @@ from PySide import QtCore, QtGui class Ui_MainWindow(object): def setupUi(self, MainWindow): MainWindow.setObjectName("MainWindow") - MainWindow.resize(742, 439) + MainWindow.resize(596, 569) self.centralwidget = QtGui.QWidget(MainWindow) self.centralwidget.setObjectName("centralwidget") - self.verticalLayout_4 = QtGui.QVBoxLayout(self.centralwidget) - self.verticalLayout_4.setObjectName("verticalLayout_4") + self.gridLayout_7 = QtGui.QGridLayout(self.centralwidget) + self.gridLayout_7.setObjectName("gridLayout_7") self.groupBox_2 = QtGui.QGroupBox(self.centralwidget) self.groupBox_2.setObjectName("groupBox_2") self.gridLayout = QtGui.QGridLayout(self.groupBox_2) @@ -25,9 +25,40 @@ class Ui_MainWindow(object): self.tabWidget.setObjectName("tabWidget") self.tab = QtGui.QWidget() self.tab.setObjectName("tab") + self.gridLayout_4 = QtGui.QGridLayout(self.tab) + self.gridLayout_4.setObjectName("gridLayout_4") + self.groupBox_3 = QtGui.QGroupBox(self.tab) + self.groupBox_3.setObjectName("groupBox_3") + self.gridLayout_5 = QtGui.QGridLayout(self.groupBox_3) + self.gridLayout_5.setObjectName("gridLayout_5") + self.label_2 = QtGui.QLabel(self.groupBox_3) + self.label_2.setObjectName("label_2") + self.gridLayout_5.addWidget(self.label_2, 0, 0, 1, 1) + self.lineEdit = QtGui.QLineEdit(self.groupBox_3) + self.lineEdit.setObjectName("lineEdit") + self.gridLayout_5.addWidget(self.lineEdit, 0, 1, 1, 1) + self.frame = QtGui.QFrame(self.groupBox_3) + self.frame.setFrameShape(QtGui.QFrame.StyledPanel) + self.frame.setFrameShadow(QtGui.QFrame.Raised) + self.frame.setObjectName("frame") + self.formLayout = QtGui.QFormLayout(self.frame) + self.formLayout.setObjectName("formLayout") + self.label_3 = QtGui.QLabel(self.frame) + self.label_3.setObjectName("label_3") + self.formLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.label_3) + self.lineEdit_2 = QtGui.QLineEdit(self.frame) + self.lineEdit_2.setObjectName("lineEdit_2") + self.formLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.lineEdit_2) + self.gridLayout_5.addWidget(self.frame, 1, 0, 1, 2) + self.gridLayout_4.addWidget(self.groupBox_3, 1, 0, 1, 1) self.tabWidget.addTab(self.tab, "") self.tab_2 = QtGui.QWidget() self.tab_2.setObjectName("tab_2") + self.gridLayout_6 = QtGui.QGridLayout(self.tab_2) + self.gridLayout_6.setObjectName("gridLayout_6") + self.label_4 = QtGui.QLabel(self.tab_2) + self.label_4.setObjectName("label_4") + self.gridLayout_6.addWidget(self.label_4, 0, 0, 1, 1) self.tabWidget.addTab(self.tab_2, "") self.tab_3 = QtGui.QWidget() self.tab_3.setObjectName("tab_3") @@ -58,14 +89,17 @@ class Ui_MainWindow(object): self.tabWidget.addTab(self.tab_11, "") self.tab_12 = QtGui.QWidget() self.tab_12.setObjectName("tab_12") + self.gridLayout_3 = QtGui.QGridLayout(self.tab_12) + self.gridLayout_3.setObjectName("gridLayout_3") self.tabWidget.addTab(self.tab_12, "") self.gridLayout.addWidget(self.tabWidget, 0, 0, 1, 1) - self.verticalLayout_4.addWidget(self.groupBox_2) + self.gridLayout_7.addWidget(self.groupBox_2, 0, 0, 1, 1) self.groupBox = QtGui.QGroupBox(self.centralwidget) self.groupBox.setObjectName("groupBox") self.gridLayout_2 = QtGui.QGridLayout(self.groupBox) self.gridLayout_2.setObjectName("gridLayout_2") self.label = QtGui.QLabel(self.groupBox) + self.label.setLineWidth(0) self.label.setTextFormat(QtCore.Qt.RichText) self.label.setAlignment(QtCore.Qt.AlignCenter) self.label.setWordWrap(True) @@ -73,14 +107,14 @@ class Ui_MainWindow(object): self.label.setTextInteractionFlags(QtCore.Qt.TextBrowserInteraction) self.label.setObjectName("label") self.gridLayout_2.addWidget(self.label, 0, 0, 1, 1) - self.verticalLayout_4.addWidget(self.groupBox) + self.gridLayout_7.addWidget(self.groupBox, 1, 0, 1, 1) self.label_71 = QtGui.QLabel(self.centralwidget) self.label_71.setAlignment(QtCore.Qt.AlignCenter) self.label_71.setObjectName("label_71") - self.verticalLayout_4.addWidget(self.label_71) + self.gridLayout_7.addWidget(self.label_71, 2, 0, 1, 1) MainWindow.setCentralWidget(self.centralwidget) self.menubar = QtGui.QMenuBar(MainWindow) - self.menubar.setGeometry(QtCore.QRect(0, 0, 742, 28)) + self.menubar.setGeometry(QtCore.QRect(0, 0, 596, 28)) self.menubar.setObjectName("menubar") self.menuMenu = QtGui.QMenu(self.menubar) self.menuMenu.setObjectName("menuMenu") @@ -156,13 +190,21 @@ class Ui_MainWindow(object): self.toolBarCheckable.addAction(self.actionActionCheckableSubAUnchecked) self.retranslateUi(MainWindow) - self.tabWidget.setCurrentIndex(11) + self.tabWidget.setCurrentIndex(1) QtCore.QMetaObject.connectSlotsByName(MainWindow) + MainWindow.setTabOrder(self.lineEdit, self.tabWidget) + MainWindow.setTabOrder(self.tabWidget, self.lineEdit_2) def retranslateUi(self, MainWindow): MainWindow.setWindowTitle(QtGui.QApplication.translate("MainWindow", "MainWindow", None, QtGui.QApplication.UnicodeUTF8)) self.groupBox_2.setTitle(QtGui.QApplication.translate("MainWindow", "Issue #115 - Tabs scroller buttons", None, QtGui.QApplication.UnicodeUTF8)) + self.groupBox_3.setTitle(QtGui.QApplication.translate("MainWindow", "Issue #123 - Missing borders", None, QtGui.QApplication.UnicodeUTF8)) + self.label_2.setText(QtGui.QApplication.translate("MainWindow", "TextLabel", None, QtGui.QApplication.UnicodeUTF8)) + self.lineEdit.setText(QtGui.QApplication.translate("MainWindow", "Inside tab, outside frame", None, QtGui.QApplication.UnicodeUTF8)) + self.label_3.setText(QtGui.QApplication.translate("MainWindow", "TextLabel", None, QtGui.QApplication.UnicodeUTF8)) + self.lineEdit_2.setText(QtGui.QApplication.translate("MainWindow", "Inside tab and frame", None, QtGui.QApplication.UnicodeUTF8)) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab), QtGui.QApplication.translate("MainWindow", "Tab 1", None, QtGui.QApplication.UnicodeUTF8)) + self.label_4.setText(QtGui.QApplication.translate("MainWindow", "TextLabel", None, QtGui.QApplication.UnicodeUTF8)) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_2), QtGui.QApplication.translate("MainWindow", "Tab 2", None, QtGui.QApplication.UnicodeUTF8)) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_3), QtGui.QApplication.translate("MainWindow", "Page", None, QtGui.QApplication.UnicodeUTF8)) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_4), QtGui.QApplication.translate("MainWindow", "Page", None, QtGui.QApplication.UnicodeUTF8)) diff --git a/example/ui/mw_menus_qtpy_ui.py b/example/ui/mw_menus_qtpy_ui.py index d4e4d0848..3b98756ae 100644 --- a/example/ui/mw_menus_qtpy_ui.py +++ b/example/ui/mw_menus_qtpy_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'mw_menus.ui' # -# Created by: PyQt5 UI code generator 5.9.2 +# Created by: PyQt5 UI code generator 5.6 # # WARNING! All changes made in this file will be lost! @@ -11,11 +11,11 @@ from qtpy import QtCore, QtGui, QtWidgets class Ui_MainWindow(object): def setupUi(self, MainWindow): MainWindow.setObjectName("MainWindow") - MainWindow.resize(742, 439) + MainWindow.resize(596, 569) self.centralwidget = QtWidgets.QWidget(MainWindow) self.centralwidget.setObjectName("centralwidget") - self.verticalLayout_4 = QtWidgets.QVBoxLayout(self.centralwidget) - self.verticalLayout_4.setObjectName("verticalLayout_4") + self.gridLayout_7 = QtWidgets.QGridLayout(self.centralwidget) + self.gridLayout_7.setObjectName("gridLayout_7") self.groupBox_2 = QtWidgets.QGroupBox(self.centralwidget) self.groupBox_2.setObjectName("groupBox_2") self.gridLayout = QtWidgets.QGridLayout(self.groupBox_2) @@ -24,9 +24,42 @@ class Ui_MainWindow(object): self.tabWidget.setObjectName("tabWidget") self.tab = QtWidgets.QWidget() self.tab.setObjectName("tab") + self.gridLayout_4 = QtWidgets.QGridLayout(self.tab) + self.gridLayout_4.setContentsMargins(0, 0, 0, 0) + self.gridLayout_4.setObjectName("gridLayout_4") + self.groupBox_3 = QtWidgets.QGroupBox(self.tab) + self.groupBox_3.setObjectName("groupBox_3") + self.gridLayout_5 = QtWidgets.QGridLayout(self.groupBox_3) + self.gridLayout_5.setObjectName("gridLayout_5") + self.label_2 = QtWidgets.QLabel(self.groupBox_3) + self.label_2.setObjectName("label_2") + self.gridLayout_5.addWidget(self.label_2, 0, 0, 1, 1) + self.lineEdit = QtWidgets.QLineEdit(self.groupBox_3) + self.lineEdit.setObjectName("lineEdit") + self.gridLayout_5.addWidget(self.lineEdit, 0, 1, 1, 1) + self.frame = QtWidgets.QFrame(self.groupBox_3) + self.frame.setFrameShape(QtWidgets.QFrame.StyledPanel) + self.frame.setFrameShadow(QtWidgets.QFrame.Raised) + self.frame.setObjectName("frame") + self.formLayout = QtWidgets.QFormLayout(self.frame) + self.formLayout.setObjectName("formLayout") + self.label_3 = QtWidgets.QLabel(self.frame) + self.label_3.setObjectName("label_3") + self.formLayout.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.label_3) + self.lineEdit_2 = QtWidgets.QLineEdit(self.frame) + self.lineEdit_2.setObjectName("lineEdit_2") + self.formLayout.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.lineEdit_2) + self.gridLayout_5.addWidget(self.frame, 1, 0, 1, 2) + self.gridLayout_4.addWidget(self.groupBox_3, 1, 0, 1, 1) self.tabWidget.addTab(self.tab, "") self.tab_2 = QtWidgets.QWidget() self.tab_2.setObjectName("tab_2") + self.gridLayout_6 = QtWidgets.QGridLayout(self.tab_2) + self.gridLayout_6.setContentsMargins(0, 0, 0, 0) + self.gridLayout_6.setObjectName("gridLayout_6") + self.label_4 = QtWidgets.QLabel(self.tab_2) + self.label_4.setObjectName("label_4") + self.gridLayout_6.addWidget(self.label_4, 0, 0, 1, 1) self.tabWidget.addTab(self.tab_2, "") self.tab_3 = QtWidgets.QWidget() self.tab_3.setObjectName("tab_3") @@ -57,14 +90,18 @@ class Ui_MainWindow(object): self.tabWidget.addTab(self.tab_11, "") self.tab_12 = QtWidgets.QWidget() self.tab_12.setObjectName("tab_12") + self.gridLayout_3 = QtWidgets.QGridLayout(self.tab_12) + self.gridLayout_3.setContentsMargins(0, 0, 0, 0) + self.gridLayout_3.setObjectName("gridLayout_3") self.tabWidget.addTab(self.tab_12, "") self.gridLayout.addWidget(self.tabWidget, 0, 0, 1, 1) - self.verticalLayout_4.addWidget(self.groupBox_2) + self.gridLayout_7.addWidget(self.groupBox_2, 0, 0, 1, 1) self.groupBox = QtWidgets.QGroupBox(self.centralwidget) self.groupBox.setObjectName("groupBox") self.gridLayout_2 = QtWidgets.QGridLayout(self.groupBox) self.gridLayout_2.setObjectName("gridLayout_2") self.label = QtWidgets.QLabel(self.groupBox) + self.label.setLineWidth(0) self.label.setTextFormat(QtCore.Qt.RichText) self.label.setAlignment(QtCore.Qt.AlignCenter) self.label.setWordWrap(True) @@ -72,14 +109,14 @@ class Ui_MainWindow(object): self.label.setTextInteractionFlags(QtCore.Qt.TextBrowserInteraction) self.label.setObjectName("label") self.gridLayout_2.addWidget(self.label, 0, 0, 1, 1) - self.verticalLayout_4.addWidget(self.groupBox) + self.gridLayout_7.addWidget(self.groupBox, 1, 0, 1, 1) self.label_71 = QtWidgets.QLabel(self.centralwidget) self.label_71.setAlignment(QtCore.Qt.AlignCenter) self.label_71.setObjectName("label_71") - self.verticalLayout_4.addWidget(self.label_71) + self.gridLayout_7.addWidget(self.label_71, 2, 0, 1, 1) MainWindow.setCentralWidget(self.centralwidget) self.menubar = QtWidgets.QMenuBar(MainWindow) - self.menubar.setGeometry(QtCore.QRect(0, 0, 742, 28)) + self.menubar.setGeometry(QtCore.QRect(0, 0, 596, 28)) self.menubar.setObjectName("menubar") self.menuMenu = QtWidgets.QMenu(self.menubar) self.menuMenu.setObjectName("menuMenu") @@ -155,14 +192,22 @@ class Ui_MainWindow(object): self.toolBarCheckable.addAction(self.actionActionCheckableSubAUnchecked) self.retranslateUi(MainWindow) - self.tabWidget.setCurrentIndex(11) + self.tabWidget.setCurrentIndex(1) QtCore.QMetaObject.connectSlotsByName(MainWindow) + MainWindow.setTabOrder(self.lineEdit, self.tabWidget) + MainWindow.setTabOrder(self.tabWidget, self.lineEdit_2) def retranslateUi(self, MainWindow): _translate = QtCore.QCoreApplication.translate MainWindow.setWindowTitle(_translate("MainWindow", "MainWindow")) self.groupBox_2.setTitle(_translate("MainWindow", "Issue #115 - Tabs scroller buttons")) + self.groupBox_3.setTitle(_translate("MainWindow", "Issue #123 - Missing borders")) + self.label_2.setText(_translate("MainWindow", "TextLabel")) + self.lineEdit.setText(_translate("MainWindow", "Inside tab, outside frame")) + self.label_3.setText(_translate("MainWindow", "TextLabel")) + self.lineEdit_2.setText(_translate("MainWindow", "Inside tab and frame")) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab), _translate("MainWindow", "Tab 1")) + self.label_4.setText(_translate("MainWindow", "TextLabel")) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_2), _translate("MainWindow", "Tab 2")) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_3), _translate("MainWindow", "Page")) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_4), _translate("MainWindow", "Page"))