From cc5ea1dbc13d3ec0b13f04a2e80c71f16d31fc70 Mon Sep 17 00:00:00 2001 From: Virgil Dupras Date: Sat, 16 Nov 2013 13:38:07 -0500 Subject: [PATCH] Fixed qt5 migration for ME and PE --- qt/me/details_dialog.py | 4 ++-- qt/me/preferences_dialog.py | 2 +- qt/pe/details_dialog.py | 5 +++-- qt/pe/result_window.py | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/qt/me/details_dialog.py b/qt/me/details_dialog.py index a754d3e9..b651f234 100644 --- a/qt/me/details_dialog.py +++ b/qt/me/details_dialog.py @@ -7,7 +7,7 @@ # http://www.hardcoded.net/licenses/bsd_license from PyQt5.QtCore import QSize -from PyQt5.QtGui import QVBoxLayout, QAbstractItemView +from PyQt5.QtWidgets import QVBoxLayout, QAbstractItemView from hscommon.trans import trget from ..base.details_dialog import DetailsDialog as DetailsDialogBase @@ -22,7 +22,7 @@ class DetailsDialog(DetailsDialogBase): self.setMinimumSize(QSize(250, 250)) self.verticalLayout = QVBoxLayout(self) self.verticalLayout.setSpacing(0) - self.verticalLayout.setMargin(0) + self.verticalLayout.setContentsMargins(0, 0, 0, 0) self.tableView = DetailsTable(self) self.tableView.setAlternatingRowColors(True) self.tableView.setSelectionBehavior(QAbstractItemView.SelectRows) diff --git a/qt/me/preferences_dialog.py b/qt/me/preferences_dialog.py index 9fc9fed6..448c3de1 100644 --- a/qt/me/preferences_dialog.py +++ b/qt/me/preferences_dialog.py @@ -50,7 +50,7 @@ class PreferencesDialog(PreferencesDialogBase): self.widget.setMinimumSize(QSize(0, 40)) self.verticalLayout_4 = QVBoxLayout(self.widget) self.verticalLayout_4.setSpacing(0) - self.verticalLayout_4.setMargin(0) + self.verticalLayout_4.setContentsMargins(0, 0, 0, 0) self.label_6 = QLabel(self.widget) self.label_6.setText(tr("Tags to scan:")) self.verticalLayout_4.addWidget(self.label_6) diff --git a/qt/pe/details_dialog.py b/qt/pe/details_dialog.py index 44cb9f55..e9b01678 100644 --- a/qt/pe/details_dialog.py +++ b/qt/pe/details_dialog.py @@ -7,7 +7,8 @@ # http://www.hardcoded.net/licenses/bsd_license from PyQt5.QtCore import Qt, QSize -from PyQt5.QtGui import QVBoxLayout, QAbstractItemView, QHBoxLayout, QLabel, QSizePolicy, QPixmap +from PyQt5.QtGui import QPixmap +from PyQt5.QtWidgets import QVBoxLayout, QAbstractItemView, QHBoxLayout, QLabel, QSizePolicy from hscommon.trans import trget from ..base.details_dialog import DetailsDialog as DetailsDialogBase @@ -27,7 +28,7 @@ class DetailsDialog(DetailsDialogBase): self.setMinimumSize(QSize(250, 250)) self.verticalLayout = QVBoxLayout(self) self.verticalLayout.setSpacing(0) - self.verticalLayout.setMargin(0) + self.verticalLayout.setContentsMargins(0, 0, 0, 0) self.horizontalLayout = QHBoxLayout() self.horizontalLayout.setSpacing(4) self.selectedImage = QLabel(self) diff --git a/qt/pe/result_window.py b/qt/pe/result_window.py index 7fe43b69..ae7bce16 100644 --- a/qt/pe/result_window.py +++ b/qt/pe/result_window.py @@ -6,7 +6,7 @@ # which should be included with this package. The terms are also available at # http://www.hardcoded.net/licenses/bsd_license -from PyQt5.QtGui import QMessageBox, QAction +from PyQt5.QtWidgets import QMessageBox, QAction from hscommon.trans import trget from ..base.result_window import ResultWindow as ResultWindowBase