Fixed qt5 migration for ME and PE

This commit is contained in:
Virgil Dupras 2013-11-16 13:38:07 -05:00
parent 3b8d355b9e
commit cc5ea1dbc1
4 changed files with 7 additions and 6 deletions

View File

@ -7,7 +7,7 @@
# http://www.hardcoded.net/licenses/bsd_license # http://www.hardcoded.net/licenses/bsd_license
from PyQt5.QtCore import QSize from PyQt5.QtCore import QSize
from PyQt5.QtGui import QVBoxLayout, QAbstractItemView from PyQt5.QtWidgets import QVBoxLayout, QAbstractItemView
from hscommon.trans import trget from hscommon.trans import trget
from ..base.details_dialog import DetailsDialog as DetailsDialogBase from ..base.details_dialog import DetailsDialog as DetailsDialogBase
@ -22,7 +22,7 @@ class DetailsDialog(DetailsDialogBase):
self.setMinimumSize(QSize(250, 250)) self.setMinimumSize(QSize(250, 250))
self.verticalLayout = QVBoxLayout(self) self.verticalLayout = QVBoxLayout(self)
self.verticalLayout.setSpacing(0) self.verticalLayout.setSpacing(0)
self.verticalLayout.setMargin(0) self.verticalLayout.setContentsMargins(0, 0, 0, 0)
self.tableView = DetailsTable(self) self.tableView = DetailsTable(self)
self.tableView.setAlternatingRowColors(True) self.tableView.setAlternatingRowColors(True)
self.tableView.setSelectionBehavior(QAbstractItemView.SelectRows) self.tableView.setSelectionBehavior(QAbstractItemView.SelectRows)

View File

@ -50,7 +50,7 @@ class PreferencesDialog(PreferencesDialogBase):
self.widget.setMinimumSize(QSize(0, 40)) self.widget.setMinimumSize(QSize(0, 40))
self.verticalLayout_4 = QVBoxLayout(self.widget) self.verticalLayout_4 = QVBoxLayout(self.widget)
self.verticalLayout_4.setSpacing(0) 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 = QLabel(self.widget)
self.label_6.setText(tr("Tags to scan:")) self.label_6.setText(tr("Tags to scan:"))
self.verticalLayout_4.addWidget(self.label_6) self.verticalLayout_4.addWidget(self.label_6)

View File

@ -7,7 +7,8 @@
# http://www.hardcoded.net/licenses/bsd_license # http://www.hardcoded.net/licenses/bsd_license
from PyQt5.QtCore import Qt, QSize 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 hscommon.trans import trget
from ..base.details_dialog import DetailsDialog as DetailsDialogBase from ..base.details_dialog import DetailsDialog as DetailsDialogBase
@ -27,7 +28,7 @@ class DetailsDialog(DetailsDialogBase):
self.setMinimumSize(QSize(250, 250)) self.setMinimumSize(QSize(250, 250))
self.verticalLayout = QVBoxLayout(self) self.verticalLayout = QVBoxLayout(self)
self.verticalLayout.setSpacing(0) self.verticalLayout.setSpacing(0)
self.verticalLayout.setMargin(0) self.verticalLayout.setContentsMargins(0, 0, 0, 0)
self.horizontalLayout = QHBoxLayout() self.horizontalLayout = QHBoxLayout()
self.horizontalLayout.setSpacing(4) self.horizontalLayout.setSpacing(4)
self.selectedImage = QLabel(self) self.selectedImage = QLabel(self)

View File

@ -6,7 +6,7 @@
# which should be included with this package. The terms are also available at # which should be included with this package. The terms are also available at
# http://www.hardcoded.net/licenses/bsd_license # 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 hscommon.trans import trget
from ..base.result_window import ResultWindow as ResultWindowBase from ..base.result_window import ResultWindow as ResultWindowBase