Skip to content
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.

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

v8.0.0 Moving to Qt6 #213

Merged
merged 29 commits into from
Apr 20, 2024
Merged
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
4a62109
started process of converting to PyQT6
djotaku Apr 15, 2024
0b0c8d3
Fixed QTMultimedia change in tracker
djotaku Apr 15, 2024
6ad6104
The GUI launches now with QT6.
djotaku Apr 15, 2024
b3151dd
Sound now works on tracker
djotaku Apr 17, 2024
bfaa5d9
Eliminated unnecessary line
djotaku Apr 17, 2024
cfe6c56
Changing python versions in github actions
djotaku Apr 17, 2024
5f46f6c
Updated setup.cfg to match new requirements.
djotaku Apr 17, 2024
2fe4479
Attempting to downgrade to fix windows audio issues
djotaku Apr 19, 2024
44566d1
Fixing requirements as well for the downgrade.
djotaku Apr 19, 2024
d5d744f
fixing artifact version
djotaku Apr 19, 2024
edca283
Trying to add ffmpeg as per QT instructions
djotaku Apr 19, 2024
cdbd9ff
including ffmpeg
djotaku Apr 19, 2024
5f85eb5
Fixing add-data synxtax
djotaku Apr 19, 2024
933fce0
Fixing typo
djotaku Apr 20, 2024
52e4822
Going back to 6.6.1
djotaku Apr 20, 2024
b5d66cf
DLLs for ffmpeg
djotaku Apr 20, 2024
8fe1d03
Seeing if this lets it find the dlls
djotaku Apr 20, 2024
aef285c
trying again to get it to see the dlls
djotaku Apr 20, 2024
7511d61
Adding DLL area to Windows path (I think)
djotaku Apr 20, 2024
5247b19
Adding DLL area to Windows path (2nd try)
djotaku Apr 20, 2024
a333fd8
Adding DLL area to Windows path (3rd try)
djotaku Apr 20, 2024
dcd571c
Updating python action versions
djotaku Apr 20, 2024
1bf759d
Updating checkout version
djotaku Apr 20, 2024
4ae11aa
echoing the right thing this time
djotaku Apr 20, 2024
d76047a
adding more backslashes
djotaku Apr 20, 2024
3c13170
throwing anything at the wall
djotaku Apr 20, 2024
e9785bd
OK, doing things manually might work
djotaku Apr 20, 2024
d9f7609
more DLLs for ffmpeg
djotaku Apr 20, 2024
ca0eb21
Gotta add a new DLL
djotaku Apr 20, 2024
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
Prev Previous commit
Next Next commit
Sound now works on tracker
djotaku committed Apr 17, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit b3151dd4492047a36a69045b6ff7f7a97d46d216
6 changes: 5 additions & 1 deletion eldonationtracker/ui/call_tracker.py
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@

from PyQt6.QtCore import QUrl
from PyQt6.QtGui import QColor, QFont
from PyQt6.QtMultimedia import QMediaPlayer # type: ignore
from PyQt6.QtMultimedia import QAudioOutput, QMediaPlayer # type: ignore
from PyQt6.QtWidgets import QDialog, QGraphicsPixmapItem, QGraphicsScene

from eldonationtracker import file_logging
@@ -60,7 +60,11 @@ def __init__(self, participant_conf, participant):
self.pixmap = QtGui.QPixmap()
self._load_image()
self.ui.graphicsView.setScene(self.scene)
# audio
self.donation_player = QMediaPlayer()
self.audioOutput = QAudioOutput()
self.donation_player.setAudioOutput(self.audioOutput)
#self.donation_player.positionChanged.connect(self.positionChanged)
self._load_sound()
# timer to update the main text
self.timer = QtCore.QTimer(self)