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.

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

v8.0.0 Moving to Qt6 #213

Merged
merged 29 commits into from
Apr 20, 2024
Merged

v8.0.0 Moving to Qt6 #213

Show file tree
Hide file tree
Changes from all commits
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
8 changes: 4 additions & 4 deletions .github/workflows/linttest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- name: Set up Python 3.11.2
uses: actions/setup-python@v1
- uses: actions/checkout@v4
- name: Set up Python 3.11.9
uses: actions/setup-python@v5
with:
python-version: 3.11.2
python-version: 3.11.9
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pythonpublish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v1
uses: actions/setup-python@v5
with:
python-version: '3.x'
- name: Install dependencies
Expand Down
16 changes: 11 additions & 5 deletions .github/workflows/windowsbuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,27 @@ jobs:
runs-on: windows-latest

steps:
- uses: actions/checkout@v1
- name: Set up Python 3.11.2
uses: actions/setup-python@v1
- uses: actions/checkout@v4
- name: Set up Python 3.11.9
uses: actions/setup-python@v5
with:
python-version: 3.11.2
python-version: 3.11.9
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
- name: Build Single Executable with Pyinstaller
run: |
cp ffmpeg/avutil-58.dll C:\\hostedtoolcache\\windows\\Python\\3.11.9\\x64\\Lib\\site-packages\\PyQt6\\Qt6\\bin
cp ffmpeg/avcodec-60.dll C:\\hostedtoolcache\\windows\\Python\\3.11.9\\x64\\Lib\\site-packages\\PyQt6\\Qt6\\bin
cp ffmpeg/swresample-4.dll C:\\hostedtoolcache\\windows\\Python\\3.11.9\\x64\\Lib\\site-packages\\PyQt6\\Qt6\\bin
cp ffmpeg/swscale-7.dll C:\\hostedtoolcache\\windows\\Python\\3.11.9\\x64\\Lib\\site-packages\\PyQt6\\Qt6\\bin
cp ffmpeg/avformat-60.dll C:\\hostedtoolcache\\windows\\Python\\3.11.9\\x64\\Lib\\site-packages\\PyQt6\\Qt6\\bin
cp ffmpeg/libsoxr.dll C:\\hostedtoolcache\\windows\\Python\\3.11.9\\x64\\Lib\\site-packages\\PyQt6\\Qt6\\bin
pip install pyinstaller
pyinstaller -F -p eldonationtracker -n "eldonationtracker" --icon=icon.ico --add-data="eldonationtracker/icon.png;." eldonationtracker/gui.py
- name: Upload artifact
uses: actions/upload-artifact@v1.0.0
uses: actions/upload-artifact@v4.0.0
with:
name: eldonationtracker for Windows
path: dist/
83 changes: 0 additions & 83 deletions QTdesignerfiles/about.ui
View file
Open in desktop

This file was deleted.

148 changes: 60 additions & 88 deletions QTdesignerfiles/design.ui → QTdesignerfiles/main.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>789</width>
<height>749</height>
<height>778</height>
</rect>
</property>
<property name="windowTitle">
Expand Down Expand Up @@ -52,20 +52,20 @@
<property name="verticalSpacing">
<number>6</number>
</property>
<item row="3" column="1">
<widget class="QLabel" name="label_avg_donations">
<item row="1" column="1">
<widget class="QLabel" name="label_total_num_donations">
<property name="text">
<string>Average Donation</string>
<string>Total # of Donations</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QTextBrowser" name="TotalRaised">
<item row="4" column="1">
<widget class="QTextBrowser" name="AvgDonation">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
Expand All @@ -81,41 +81,10 @@
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_totalraised">
<property name="text">
<string>Total Raised</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QWebEngineView" name="participant_avatar">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="autoFillBackground">
<bool>false</bool>
</property>
<property name="url">
<url>
<string>about:blank</string>
</url>
</property>
<property name="zoomFactor">
<double>0.630000000000000</double>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QTextBrowser" name="AvgDonation">
<item row="4" column="0">
<widget class="QTextBrowser" name="TotalRaised">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
Expand All @@ -131,45 +100,16 @@
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="label_total_num_donations">
<property name="text">
<string>Total # of Donations</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_goal">
<item row="3" column="1">
<widget class="QLabel" name="label_avg_donations">
<property name="text">
<string>Goal</string>
<string>Average Donation</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QTextBrowser" name="TotalNumDonations">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>100</width>
<height>50</height>
</size>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QTextBrowser" name="Goal">
<property name="sizePolicy">
Expand Down Expand Up @@ -214,6 +154,45 @@
</property>
</spacer>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_goal">
<property name="text">
<string>Goal</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_totalraised">
<property name="text">
<string>Total Raised</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QTextBrowser" name="TotalNumDonations">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>100</width>
<height>50</height>
</size>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
Expand Down Expand Up @@ -551,7 +530,7 @@
</rect>
</property>
<property name="text">
<string>© 2015-2022 Eric Mesa; Licensed GPLv3; http://extralife.ericmesa.com</string>
<string>© 2015-2024 Eric Mesa; Licensed GPLv3; http://extralife.ericmesa.com</string>
</property>
</widget>
<widget class="QWidget" name="layoutWidget">
Expand Down Expand Up @@ -621,12 +600,12 @@
<x>0</x>
<y>0</y>
<width>789</width>
<height>30</height>
<height>32</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">
<property name="title">
<string>File</string>
<string>Fi&amp;le</string>
</property>
<addaction name="actionShow_Logs"/>
<addaction name="actionQuit"/>
Expand All @@ -644,43 +623,36 @@
</widget>
<action name="actionQuit">
<property name="text">
<string>Quit</string>
<string>&amp;Quit</string>
</property>
</action>
<action name="actionDocumentation">
<property name="text">
<string>Documentation</string>
<string>&amp;Documentation</string>
</property>
<property name="toolTip">
<string>Open Documentation in your default browser</string>
</property>
</action>
<action name="actionCheck_for_Update">
<property name="text">
<string>Check for Update</string>
<string>&amp;Check for Update</string>
</property>
<property name="toolTip">
<string>Checks for Updates</string>
</property>
</action>
<action name="actionAbout">
<property name="text">
<string>About ELDonationTracker</string>
<string>&amp;About ELDonationTracker</string>
</property>
</action>
<action name="actionShow_Logs">
<property name="text">
<string>Show Logs</string>
<string>&amp;Show Logs</string>
</property>
</action>
</widget>
<customwidgets>
<customwidget>
<class>QWebEngineView</class>
<extends>QWidget</extends>
<header location="global">QtWebEngineWidgets/QWebEngineView</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>
Loading
Loading