Compare commits

...

5 Commits

2 changed files with 11 additions and 15 deletions
+4 -4
View File
@@ -24,7 +24,7 @@ jobs:
strategy:
matrix:
include:
- os: ubuntu-latest
- os: ubuntu-22.04
artifact_name: SoftwareManager-dev-${{ github.sha }}-linux
asset_name: SoftwareManager-dev-${{ github.sha }}-linux
- os: windows-latest
@@ -159,7 +159,7 @@ jobs:
release:
name: Create Release
needs: build
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
if: success()
steps:
@@ -172,7 +172,7 @@ jobs:
run: |
mkdir -p release
SHORT_SHA="${{ needs.build.outputs.short_sha }}"
cp artifacts/ubuntu-latest-build/SoftwareManager-dev-*-linux release/SoftwareManager-dev-${SHORT_SHA}-linux
cp artifacts/ubuntu-22.04-build/SoftwareManager-dev-*-linux release/SoftwareManager-dev-${SHORT_SHA}-linux
cp artifacts/windows-latest-build/SoftwareManager-dev-*-windows.exe release/SoftwareManager-dev-${SHORT_SHA}-windows.exe
cp artifacts/macos-latest-build/SoftwareManager-dev-*-macos release/SoftwareManager-dev-${SHORT_SHA}-macos
chmod +x release/SoftwareManager-dev-*-linux release/SoftwareManager-dev-*-macos
@@ -207,4 +207,4 @@ jobs:
release/SoftwareManager-dev-${{ needs.build.outputs.short_sha }}-windows.exe
release/SoftwareManager-dev-${{ needs.build.outputs.short_sha }}-macos
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+7 -11
View File
@@ -93,8 +93,8 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
if platform.system() == "Windows":
try:
import ctypes
myappid = 'SoftwareManager.App.1'
ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(myappid)
appid = 'SoftwareManager'
ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(appid)
except Exception as e:
consoleLog(f"Could not set app ID: {e}")
@@ -210,9 +210,11 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
elif col == 4:
return f"{download.download_speed_string()}"
elif col == 5:
pass
return f"{download.completed_length_string()}"
elif col == 6:
return f"{download.total_length_string()}"
elif col == 7:
return f"{download.eta_string()}"
if role == Qt.UserRole and col == 0:
return download.is_paused
@@ -223,8 +225,10 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
download = state.downloads[row]
if download.is_paused:
download.resume()
consoleLog(f"Resumed download: {download.name}", True)
else:
download.pause()
consoleLog(f"Paused download: {download.name}", True)
idx = self.index(row, 0)
self.dataChanged.emit(idx, idx, [Qt.DisplayRole, Qt.UserRole])
@@ -266,12 +270,6 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
def on_pause_resume_clicked(row):
download_model.toggle_pause_resume(row)
download = state.downloads[row]
if download.is_paused:
download.pause()
else:
download.resume()
delegate = PauseResumeDelegate(self.downloadList)
self.downloadList.setItemDelegateForColumn(0, delegate)
delegate.clicked.connect(on_pause_resume_clicked)
@@ -401,8 +399,6 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
self.emptyDownload.show()
self.downloadList.hide()
# thank you claude
def resizeEvent(self, event):
super().resizeEvent(event)