Compare commits

..

4 Commits

3 changed files with 20 additions and 19 deletions
+3 -3
View File
@@ -24,7 +24,7 @@ jobs:
strategy: strategy:
matrix: matrix:
include: include:
- os: ubuntu-latest - os: ubuntu-22.04
artifact_name: SoftwareManager-dev-${{ github.sha }}-linux artifact_name: SoftwareManager-dev-${{ github.sha }}-linux
asset_name: SoftwareManager-dev-${{ github.sha }}-linux asset_name: SoftwareManager-dev-${{ github.sha }}-linux
- os: windows-latest - os: windows-latest
@@ -159,7 +159,7 @@ jobs:
release: release:
name: Create Release name: Create Release
needs: build needs: build
runs-on: ubuntu-latest runs-on: ubuntu-22.04
if: success() if: success()
steps: steps:
@@ -172,7 +172,7 @@ jobs:
run: | run: |
mkdir -p release mkdir -p release
SHORT_SHA="${{ needs.build.outputs.short_sha }}" 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/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 cp artifacts/macos-latest-build/SoftwareManager-dev-*-macos release/SoftwareManager-dev-${SHORT_SHA}-macos
chmod +x release/SoftwareManager-dev-*-linux release/SoftwareManager-dev-*-macos chmod +x release/SoftwareManager-dev-*-linux release/SoftwareManager-dev-*-macos
+11 -8
View File
@@ -13,6 +13,7 @@ from PySide6.QtWidgets import (
QSpinBox, QSpinBox,
QCheckBox, QCheckBox,
) )
import platform
def settings_dialog(self): def settings_dialog(self):
@@ -32,14 +33,16 @@ def settings_dialog(self):
update_checkbox_layout = QHBoxLayout() update_checkbox_layout = QHBoxLayout()
# ignore updates checkbox # ignore updates checkbox
update_checkbox = QCheckBox()
update_checkbox_container.setLayout(update_checkbox_layout) if platform.system() == "Windows":
update_checkbox_layout.addWidget(QLabel("Ignore Updates: ")) update_checkbox = QCheckBox()
update_checkbox_layout.addStretch() update_checkbox_container.setLayout(update_checkbox_layout)
update_checkbox.setChecked(state.ignore_updates) update_checkbox_layout.addWidget(QLabel("Ignore Updates: "))
update_checkbox.toggled.connect(lambda checked: setattr(state, 'ignore_updates', checked)) update_checkbox_layout.addStretch()
update_checkbox_layout.addWidget(update_checkbox) update_checkbox.setChecked(state.ignore_updates)
dialog.layout().addWidget(update_checkbox_container) update_checkbox.toggled.connect(lambda checked: setattr(state, 'ignore_updates', checked))
update_checkbox_layout.addWidget(update_checkbox)
dialog.layout().addWidget(update_checkbox_container)
# auto-resume downloads checkbox # auto-resume downloads checkbox
+5 -7
View File
@@ -210,9 +210,11 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
elif col == 4: elif col == 4:
return f"{download.download_speed_string()}" return f"{download.download_speed_string()}"
elif col == 5: elif col == 5:
pass return f"{download.completed_length_string()}"
elif col == 6: elif col == 6:
return f"{download.total_length_string()}" return f"{download.total_length_string()}"
elif col == 7:
return f"{download.eta_string()}"
if role == Qt.UserRole and col == 0: if role == Qt.UserRole and col == 0:
return download.is_paused return download.is_paused
@@ -223,8 +225,10 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
download = state.downloads[row] download = state.downloads[row]
if download.is_paused: if download.is_paused:
download.resume() download.resume()
consoleLog(f"Resumed download: {download.name}", True)
else: else:
download.pause() download.pause()
consoleLog(f"Paused download: {download.name}", True)
idx = self.index(row, 0) idx = self.index(row, 0)
self.dataChanged.emit(idx, idx, [Qt.DisplayRole, Qt.UserRole]) self.dataChanged.emit(idx, idx, [Qt.DisplayRole, Qt.UserRole])
@@ -266,12 +270,6 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
def on_pause_resume_clicked(row): def on_pause_resume_clicked(row):
download_model.toggle_pause_resume(row) download_model.toggle_pause_resume(row)
download = state.downloads[row]
if download.is_paused:
download.pause()
else:
download.resume()
delegate = PauseResumeDelegate(self.downloadList) delegate = PauseResumeDelegate(self.downloadList)
self.downloadList.setItemDelegateForColumn(0, delegate) self.downloadList.setItemDelegateForColumn(0, delegate)
delegate.clicked.connect(on_pause_resume_clicked) delegate.clicked.connect(on_pause_resume_clicked)