Skip to content

Commit

Permalink
v1.3.0 migrated to PyQt6
Browse files Browse the repository at this point in the history
  • Loading branch information
emendir committed Mar 25, 2024
1 parent 3c2fcb5 commit 00d631a
Show file tree
Hide file tree
Showing 7 changed files with 244 additions and 200 deletions.
3 changes: 3 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# v1.2.0 (2024-03-25)
- migrate to PyQt6

# v1.2.0 (2023-10-17)
- save QR code to file by clicking it

Expand Down
77 changes: 37 additions & 40 deletions QR-ScanGen.spec
Original file line number Diff line number Diff line change
@@ -1,40 +1,37 @@
# -*- mode: python ; coding: utf-8 -*-


block_cipher = None


a = Analysis(['__main__.py'],
pathex=[],
binaries=[('C:\\Users\\weden\\AppData\\Local\\Programs\\Python\\Python39\\lib\\site-packages\\pyzbar\\libiconv.dll', '.'), ('C:\\Users\\weden\\AppData\\Local\\Programs\\Python\\Python39\\lib\\site-packages\\pyzbar\\libzbar-64.dll', '.')],
datas=[('Icon.svg', '.')],
hiddenimports=['pywifi', 'pyzbar', 'qrcode'],
hookspath=[],
hooksconfig={},
runtime_hooks=[],
excludes=[],
win_no_prefer_redirects=False,
win_private_assemblies=False,
cipher=block_cipher,
noarchive=False)
pyz = PYZ(a.pure, a.zipped_data,
cipher=block_cipher)

exe = EXE(pyz,
a.scripts,
a.binaries,
a.zipfiles,
a.datas,
[],
name='QR-ScanGen',
debug=False,
bootloader_ignore_signals=False,
strip=False,
upx=True,
upx_exclude=[],
runtime_tmpdir=None,
console=False,
disable_windowed_traceback=False,
target_arch=None,
codesign_identity=None,
entitlements_file=None )
# -*- mode: python ; coding: utf-8 -*-


a = Analysis(
['__main__.py'],
pathex=[],
binaries=[],
datas=[('Icon.svg', '.')],
hiddenimports=['pywifi', 'pyzbar', 'qrcode'],
hookspath=[],
hooksconfig={},
runtime_hooks=[],
excludes=['PyQt5'],
noarchive=False,
)
pyz = PYZ(a.pure)

exe = EXE(
pyz,
a.scripts,
a.binaries,
a.datas,
[],
name='QR-ScanGen',
debug=False,
bootloader_ignore_signals=False,
strip=False,
upx=True,
upx_exclude=[],
runtime_tmpdir=None,
console=False,
disable_windowed_traceback=False,
argv_emulation=False,
target_arch=None,
codesign_identity=None,
entitlements_file=None,
)
142 changes: 70 additions & 72 deletions ScanGen.py
Original file line number Diff line number Diff line change
@@ -1,72 +1,70 @@
# -*- coding: utf-8 -*-

# Form implementation generated from reading ui file '.\ScanGen.ui'
#
# Created by: PyQt5 UI code generator 5.15.10
#
# WARNING: Any manual changes made to this file will be lost when pyuic5 is
# run again. Do not edit this file unless you know what you are doing.


from PyQt5 import QtCore, QtGui, QtWidgets


class Ui_MainWindow(object):
def setupUi(self, MainWindow):
MainWindow.setObjectName("MainWindow")
MainWindow.resize(800, 600)
self.centralwidget = QtWidgets.QWidget(MainWindow)
self.centralwidget.setObjectName("centralwidget")
self.verticalLayout = QtWidgets.QVBoxLayout(self.centralwidget)
self.verticalLayout.setObjectName("verticalLayout")
self.images_frm = QtWidgets.QFrame(self.centralwidget)
self.images_frm.setFrameShape(QtWidgets.QFrame.StyledPanel)
self.images_frm.setFrameShadow(QtWidgets.QFrame.Raised)
self.images_frm.setObjectName("images_frm")
self.horizontalLayout = QtWidgets.QHBoxLayout(self.images_frm)
self.horizontalLayout.setObjectName("horizontalLayout")
self.scanner_video_lbl = QtWidgets.QLabel(self.images_frm)
self.scanner_video_lbl.setText("")
self.scanner_video_lbl.setObjectName("scanner_video_lbl")
self.horizontalLayout.addWidget(self.scanner_video_lbl)
self.right_frame = QtWidgets.QFrame(self.images_frm)
self.right_frame.setFrameShape(QtWidgets.QFrame.StyledPanel)
self.right_frame.setFrameShadow(QtWidgets.QFrame.Raised)
self.right_frame.setObjectName("right_frame")
self.right_frame_lyt = QtWidgets.QVBoxLayout(self.right_frame)
self.right_frame_lyt.setObjectName("right_frame_lyt")
self.qr_code_lbl = QtWidgets.QLabel(self.right_frame)
self.qr_code_lbl.setText("")
self.qr_code_lbl.setObjectName("qr_code_lbl")
self.right_frame_lyt.addWidget(self.qr_code_lbl)
self.label = QtWidgets.QLabel(self.right_frame)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.label.sizePolicy().hasHeightForWidth())
self.label.setSizePolicy(sizePolicy)
self.label.setMaximumSize(QtCore.QSize(16777215, 30))
self.label.setObjectName("label")
self.right_frame_lyt.addWidget(self.label)
self.horizontalLayout.addWidget(self.right_frame)
self.verticalLayout.addWidget(self.images_frm)
self.text_txbx = QtWidgets.QPlainTextEdit(self.centralwidget)
self.text_txbx.setMaximumSize(QtCore.QSize(16777215, 200))
self.text_txbx.setObjectName("text_txbx")
self.verticalLayout.addWidget(self.text_txbx)
MainWindow.setCentralWidget(self.centralwidget)
self.menubar = QtWidgets.QMenuBar(MainWindow)
self.menubar.setGeometry(QtCore.QRect(0, 0, 800, 26))
self.menubar.setObjectName("menubar")
MainWindow.setMenuBar(self.menubar)
self.statusbar = QtWidgets.QStatusBar(MainWindow)
self.statusbar.setObjectName("statusbar")
MainWindow.setStatusBar(self.statusbar)

self.retranslateUi(MainWindow)
QtCore.QMetaObject.connectSlotsByName(MainWindow)

def retranslateUi(self, MainWindow):
_translate = QtCore.QCoreApplication.translate
MainWindow.setWindowTitle(_translate("MainWindow", "MainWindow"))
self.label.setText(_translate("MainWindow", "Available Cameras:"))
# Form implementation generated from reading ui file './ScanGen.ui'
#
# Created by: PyQt6 UI code generator 6.5.2
#
# WARNING: Any manual changes made to this file will be lost when pyuic6 is
# run again. Do not edit this file unless you know what you are doing.


from PyQt6 import QtCore, QtGui, QtWidgets


class Ui_MainWindow(object):
def setupUi(self, MainWindow):
MainWindow.setObjectName("MainWindow")
MainWindow.resize(800, 600)
self.centralwidget = QtWidgets.QWidget(parent=MainWindow)
self.centralwidget.setObjectName("centralwidget")
self.verticalLayout = QtWidgets.QVBoxLayout(self.centralwidget)
self.verticalLayout.setObjectName("verticalLayout")
self.images_frm = QtWidgets.QFrame(parent=self.centralwidget)
self.images_frm.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel)
self.images_frm.setFrameShadow(QtWidgets.QFrame.Shadow.Raised)
self.images_frm.setObjectName("images_frm")
self.horizontalLayout = QtWidgets.QHBoxLayout(self.images_frm)
self.horizontalLayout.setObjectName("horizontalLayout")
self.scanner_video_lbl = QtWidgets.QLabel(parent=self.images_frm)
self.scanner_video_lbl.setText("")
self.scanner_video_lbl.setObjectName("scanner_video_lbl")
self.horizontalLayout.addWidget(self.scanner_video_lbl)
self.right_frame = QtWidgets.QFrame(parent=self.images_frm)
self.right_frame.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel)
self.right_frame.setFrameShadow(QtWidgets.QFrame.Shadow.Raised)
self.right_frame.setObjectName("right_frame")
self.right_frame_lyt = QtWidgets.QVBoxLayout(self.right_frame)
self.right_frame_lyt.setObjectName("right_frame_lyt")
self.qr_code_lbl = QtWidgets.QLabel(parent=self.right_frame)
self.qr_code_lbl.setText("")
self.qr_code_lbl.setObjectName("qr_code_lbl")
self.right_frame_lyt.addWidget(self.qr_code_lbl)
self.label = QtWidgets.QLabel(parent=self.right_frame)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.label.sizePolicy().hasHeightForWidth())
self.label.setSizePolicy(sizePolicy)
self.label.setMaximumSize(QtCore.QSize(16777215, 30))
self.label.setObjectName("label")
self.right_frame_lyt.addWidget(self.label)
self.horizontalLayout.addWidget(self.right_frame)
self.verticalLayout.addWidget(self.images_frm)
self.text_txbx = QtWidgets.QPlainTextEdit(parent=self.centralwidget)
self.text_txbx.setMaximumSize(QtCore.QSize(16777215, 200))
self.text_txbx.setObjectName("text_txbx")
self.verticalLayout.addWidget(self.text_txbx)
MainWindow.setCentralWidget(self.centralwidget)
self.menubar = QtWidgets.QMenuBar(parent=MainWindow)
self.menubar.setGeometry(QtCore.QRect(0, 0, 800, 26))
self.menubar.setObjectName("menubar")
MainWindow.setMenuBar(self.menubar)
self.statusbar = QtWidgets.QStatusBar(parent=MainWindow)
self.statusbar.setObjectName("statusbar")
MainWindow.setStatusBar(self.statusbar)

self.retranslateUi(MainWindow)
QtCore.QMetaObject.connectSlotsByName(MainWindow)

def retranslateUi(self, MainWindow):
_translate = QtCore.QCoreApplication.translate
MainWindow.setWindowTitle(_translate("MainWindow", "MainWindow"))
self.label.setText(_translate("MainWindow", "Available Cameras:"))
Loading

0 comments on commit 00d631a

Please sign in to comment.