Skip to content

Convert to qt5 by adjusting namespaces #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mp15 wants to merge 17 commits into from
Closed

Convert to qt5 by adjusting namespaces #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
fea0685
Correct namespaces for qt5
mp15 Sep 17, 2018
2565057
Fix to make file compatible with Qt5
DanielFaulkner Oct 28, 2020
93560d8
Updating settings to make compatible with Qt5
DanielFaulkner Oct 28, 2020
5ce98e9
Further updates to make this Qt5 compatible
DanielFaulkner Oct 28, 2020
fd98840
Merge pull request #1 from DanielFaulkner/AutoGenFixes
DanielFaulkner Oct 28, 2020
82a34df
Fixes to dialog window returned file paths
DanielFaulkner Oct 28, 2020
94a4cf9
Merge pull request #2 from DanielFaulkner/dialog-box-fixes
DanielFaulkner Oct 28, 2020
be79311
Fixes to make App file compatible with Qt5
DanielFaulkner Oct 28, 2020
57c6e97
Merge pull request #3 from DanielFaulkner/qt5-fixes
DanielFaulkner Oct 28, 2020
880c5b0
Fixes to Appv file for Qt5 compatibility.
DanielFaulkner Oct 28, 2020
d356723
Merge pull request #4 from DanielFaulkner/qt5-fixes
DanielFaulkner Oct 28, 2020
1484b3d
Updated Qt reference
DanielFaulkner Oct 28, 2020
490a4d6
Fixes to statistics panel text
DanielFaulkner Oct 29, 2020
e53eb2d
Merge pull request #6 from DanielFaulkner/master
DanielFaulkner Oct 30, 2020
048d879
Updating references to PySide
DanielFaulkner Oct 30, 2020
ad3577d
Updating readme text
DanielFaulkner Oct 30, 2020
0e8010f
Merge pull request #1 from DanielFaulkner/qt5_conversion
mp15 Oct 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ Biopython ($pip install biopython or http://biopython.org/)

Image ($pip install Image)

PyQt4 or PySide (https://www.riverbankcomputing.com/software/pyqt/download or $pip install PySide. If you have problem in installing this package, please refer [Issue #1](https://github.com/AppliedBioinformatics/BioNanoAnalyst/issues/1)
PyQt5 or PySide2 (https://www.riverbankcomputing.com/software/pyqt/download or $pip install PySide2)

# Run BioNanoAnalyst

Expand Down
22 changes: 11 additions & 11 deletions scripts/About.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
# WARNING! All changes made in this file will be lost!

try:
from PyQt4 import QtGui,QtCore
from PyQt5 import QtGui,QtCore,QtWidgets
except ImportError:
from PySide import QtGui,QtCore
from PySide2 import QtGui,QtCore,QtWidgets

try:
_fromUtf8 = QtCore.QString.fromUtf8
Expand All @@ -18,20 +18,20 @@ def _fromUtf8(s):
return s

try:
_encoding = QtGui.QApplication.UnicodeUTF8
_encoding = QtWidgets.QApplication.UnicodeUTF8
def _translate(context, text, disambig):
return QtGui.QApplication.translate(context, text, disambig, _encoding)
return QtWidgets.QApplication.translate(context, text, disambig, _encoding)
except AttributeError:
def _translate(context, text, disambig):
return QtGui.QApplication.translate(context, text, disambig)
return QtWidgets.QApplication.translate(context, text, disambig)

class Ui_About(object):
def setupUi(self, About):
About.setObjectName(_fromUtf8("About"))
About.resize(378, 342)
About.setMinimumSize(QtCore.QSize(378, 342))
About.setMaximumSize(QtCore.QSize(378, 342))
self.label = QtGui.QLabel(About)
self.label = QtWidgets.QLabel(About)
self.label.setGeometry(QtCore.QRect(10, 10, 191, 21))
font = QtGui.QFont()
font.setFamily(_fromUtf8("Arial"))
Expand All @@ -40,7 +40,7 @@ def setupUi(self, About):
font.setWeight(50)
self.label.setFont(font)
self.label.setObjectName(_fromUtf8("label"))
self.label_2 = QtGui.QLabel(About)
self.label_2 = QtWidgets.QLabel(About)
self.label_2.setGeometry(QtCore.QRect(10, 30, 181, 21))
font = QtGui.QFont()
font.setFamily(_fromUtf8("Arial"))
Expand All @@ -49,26 +49,26 @@ def setupUi(self, About):
font.setWeight(50)
self.label_2.setFont(font)
self.label_2.setObjectName(_fromUtf8("label_2"))
self.label_3 = QtGui.QLabel(About)
self.label_3 = QtWidgets.QLabel(About)
self.label_3.setGeometry(QtCore.QRect(10, 50, 211, 16))
font = QtGui.QFont()
font.setFamily(_fromUtf8("Arial"))
font.setPointSize(8)
font.setItalic(False)
self.label_3.setFont(font)
self.label_3.setObjectName(_fromUtf8("label_3"))
self.label_4 = QtGui.QLabel(About)
self.label_4 = QtWidgets.QLabel(About)
self.label_4.setGeometry(QtCore.QRect(10, 60, 261, 31))
font = QtGui.QFont()
font.setFamily(_fromUtf8("Arial"))
font.setPointSize(8)
font.setItalic(False)
self.label_4.setFont(font)
self.label_4.setObjectName(_fromUtf8("label_4"))
self.textBrowser = QtGui.QTextBrowser(About)
self.textBrowser = QtWidgets.QTextBrowser(About)
self.textBrowser.setGeometry(QtCore.QRect(10, 90, 361, 211))
self.textBrowser.setObjectName(_fromUtf8("textBrowser"))
self.about_bn = QtGui.QPushButton(About)
self.about_bn = QtWidgets.QPushButton(About)
self.about_bn.setGeometry(QtCore.QRect(290, 310, 75, 23))
self.about_bn.setObjectName(_fromUtf8("about_bn"))

Expand Down
Loading