1
0
Fork 0
mirror of synced 2024-06-26 18:20:50 +12:00

QueueWidgets: Re-text Update now to Download now

Also rename the widget classes and files for clarity
This commit is contained in:
loathingKernel 2023-02-20 14:52:45 +02:00
parent 3e827f4ece
commit c2da5bceb8
5 changed files with 93 additions and 93 deletions

View file

@ -10,15 +10,15 @@ from qtawesome import icon
from rare.models.install import InstallQueueItemModel, InstallOptionsModel, InstallDownloadModel
from rare.shared import RareCore, ImageManagerSingleton
from rare.shared.workers.install_info import InstallInfoWorker
from rare.ui.components.tabs.downloads.base_widget import Ui_BaseWidget
from rare.ui.components.tabs.downloads.info_widget import Ui_InfoWidget
from rare.ui.components.tabs.downloads.queue_base_widget import Ui_QueueBaseWidget
from rare.ui.components.tabs.downloads.queue_info_widget import Ui_QueueInfoWidget
from rare.utils.misc import get_size, widget_object_name, elide_text
from rare.widgets.image_widget import ImageWidget, ImageSize
logger = getLogger("DownloadWidgets")
class InfoWidget(QWidget):
class QueueInfoWidget(QWidget):
def __init__(
self,
game: Optional[Game],
@ -27,8 +27,8 @@ class InfoWidget(QWidget):
old_igame: Optional[InstalledGame] = None,
parent=None,
):
super(InfoWidget, self).__init__(parent=parent)
self.ui = Ui_InfoWidget()
super(QueueInfoWidget, self).__init__(parent=parent)
self.ui = Ui_QueueInfoWidget()
self.ui.setupUi(self)
self.image_manager = ImageManagerSingleton()
@ -37,7 +37,7 @@ class InfoWidget(QWidget):
self.image.setFixedSize(ImageSize.Icon)
self.ui.image_layout.addWidget(self.image)
self.ui.info_widget_layout.setAlignment(Qt.AlignTop)
self.ui.queue_info_layout.setAlignment(Qt.AlignTop)
if game and igame:
self.update_information(game, igame, analysis, old_igame)
@ -65,7 +65,7 @@ class UpdateWidget(QFrame):
def __init__(self, game: Game, igame: InstalledGame, parent=None):
super(UpdateWidget, self).__init__(parent=parent)
self.ui = Ui_BaseWidget()
self.ui = Ui_QueueBaseWidget()
self.ui.setupUi(self)
# lk: setObjectName has to be after `setupUi` because it is also set in that function
self.setObjectName(widget_object_name(self, game.app_name))
@ -76,7 +76,7 @@ class UpdateWidget(QFrame):
self.ui.queue_buttons.setVisible(False)
self.ui.move_buttons.setVisible(False)
self.info_widget = InfoWidget(game, igame, parent=self)
self.info_widget = QueueInfoWidget(game, igame, parent=self)
self.ui.info_layout.addWidget(self.info_widget)
self.ui.update_button.clicked.connect(lambda: self.update_game(True))
@ -107,7 +107,7 @@ class QueueWidget(QFrame):
def __init__(self, item: InstallQueueItemModel, old_igame: InstalledGame, parent=None):
super(QueueWidget, self).__init__(parent=parent)
self.ui = Ui_BaseWidget()
self.ui = Ui_QueueBaseWidget()
self.ui.setupUi(self)
# lk: setObjectName has to be after `setupUi` because it is also set in that function
self.setObjectName(widget_object_name(self, item.options.app_name))
@ -124,9 +124,9 @@ class QueueWidget(QFrame):
lambda: logger.info(f"Download requeue worker finished for {item.options.app_name}")
)
QThreadPool.globalInstance().start(worker)
self.info_widget = InfoWidget(None, None, None, old_igame, parent=self)
self.info_widget = QueueInfoWidget(None, None, None, old_igame, parent=self)
else:
self.info_widget = InfoWidget(
self.info_widget = QueueInfoWidget(
item.download.game, item.download.igame, item.download.analysis, old_igame, parent=self
)
self.ui.info_layout.addWidget(self.info_widget)

View file

@ -1,8 +1,8 @@
# -*- coding: utf-8 -*-
# Form implementation generated from reading ui file 'rare/ui/components/tabs/downloads/base_widget.ui'
# Form implementation generated from reading ui file 'rare/ui/components/tabs/downloads/queue_base_widget.ui'
#
# Created by: PyQt5 UI code generator 5.15.8
# Created by: PyQt5 UI code generator 5.15.9
#
# 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.
@ -11,19 +11,19 @@
from PyQt5 import QtCore, QtGui, QtWidgets
class Ui_BaseWidget(object):
def setupUi(self, BaseWidget):
BaseWidget.setObjectName("BaseWidget")
BaseWidget.resize(332, 70)
BaseWidget.setWindowTitle("BaseWidget")
BaseWidget.setFrameShape(QtWidgets.QFrame.StyledPanel)
self.download_widget_layout = QtWidgets.QHBoxLayout(BaseWidget)
self.download_widget_layout.setContentsMargins(0, 0, 0, 0)
self.download_widget_layout.setObjectName("download_widget_layout")
class Ui_QueueBaseWidget(object):
def setupUi(self, QueueBaseWidget):
QueueBaseWidget.setObjectName("QueueBaseWidget")
QueueBaseWidget.resize(354, 72)
QueueBaseWidget.setWindowTitle("QueueBaseWidget")
QueueBaseWidget.setFrameShape(QtWidgets.QFrame.StyledPanel)
self.queue_base_layout = QtWidgets.QHBoxLayout(QueueBaseWidget)
self.queue_base_layout.setContentsMargins(0, 0, 0, 0)
self.queue_base_layout.setObjectName("queue_base_layout")
self.info_layout = QtWidgets.QHBoxLayout()
self.info_layout.setObjectName("info_layout")
self.download_widget_layout.addLayout(self.info_layout)
self.move_buttons = QtWidgets.QWidget(BaseWidget)
self.queue_base_layout.addLayout(self.info_layout)
self.move_buttons = QtWidgets.QWidget(QueueBaseWidget)
self.move_buttons.setObjectName("move_buttons")
self.move_buttons_layout = QtWidgets.QVBoxLayout(self.move_buttons)
self.move_buttons_layout.setContentsMargins(0, 0, 0, 0)
@ -48,8 +48,8 @@ class Ui_BaseWidget(object):
self.move_down_button.setProperty("isSquare", 1)
self.move_down_button.setObjectName("move_down_button")
self.move_buttons_layout.addWidget(self.move_down_button, 0, QtCore.Qt.AlignLeft|QtCore.Qt.AlignBottom)
self.download_widget_layout.addWidget(self.move_buttons)
self.queue_buttons = QtWidgets.QWidget(BaseWidget)
self.queue_base_layout.addWidget(self.move_buttons)
self.queue_buttons = QtWidgets.QWidget(QueueBaseWidget)
self.queue_buttons.setObjectName("queue_buttons")
self.queue_buttons_layout = QtWidgets.QVBoxLayout(self.queue_buttons)
self.queue_buttons_layout.setContentsMargins(0, 0, 0, 0)
@ -60,8 +60,8 @@ class Ui_BaseWidget(object):
self.remove_button = QtWidgets.QPushButton(self.queue_buttons)
self.remove_button.setObjectName("remove_button")
self.queue_buttons_layout.addWidget(self.remove_button, 0, QtCore.Qt.AlignTop)
self.download_widget_layout.addWidget(self.queue_buttons)
self.update_buttons = QtWidgets.QWidget(BaseWidget)
self.queue_base_layout.addWidget(self.queue_buttons)
self.update_buttons = QtWidgets.QWidget(QueueBaseWidget)
self.update_buttons.setObjectName("update_buttons")
self.update_buttons_layout = QtWidgets.QVBoxLayout(self.update_buttons)
self.update_buttons_layout.setContentsMargins(0, 0, 0, 0)
@ -72,24 +72,24 @@ class Ui_BaseWidget(object):
self.settings_button = QtWidgets.QPushButton(self.update_buttons)
self.settings_button.setObjectName("settings_button")
self.update_buttons_layout.addWidget(self.settings_button, 0, QtCore.Qt.AlignTop)
self.download_widget_layout.addWidget(self.update_buttons)
self.download_widget_layout.setStretch(0, 1)
self.queue_base_layout.addWidget(self.update_buttons)
self.queue_base_layout.setStretch(0, 1)
self.retranslateUi(BaseWidget)
self.retranslateUi(QueueBaseWidget)
def retranslateUi(self, BaseWidget):
def retranslateUi(self, QueueBaseWidget):
_translate = QtCore.QCoreApplication.translate
self.force_button.setText(_translate("BaseWidget", "Update now"))
self.remove_button.setText(_translate("BaseWidget", "Remove from queue"))
self.update_button.setText(_translate("BaseWidget", "Update game"))
self.settings_button.setText(_translate("BaseWidget", "Update with settings"))
self.force_button.setText(_translate("QueueBaseWidget", "Download now"))
self.remove_button.setText(_translate("QueueBaseWidget", "Remove from queue"))
self.update_button.setText(_translate("QueueBaseWidget", "Update game"))
self.settings_button.setText(_translate("QueueBaseWidget", "Update with settings"))
if __name__ == "__main__":
import sys
app = QtWidgets.QApplication(sys.argv)
BaseWidget = QtWidgets.QFrame()
ui = Ui_BaseWidget()
ui.setupUi(BaseWidget)
BaseWidget.show()
QueueBaseWidget = QtWidgets.QFrame()
ui = Ui_QueueBaseWidget()
ui.setupUi(QueueBaseWidget)
QueueBaseWidget.show()
sys.exit(app.exec_())

View file

@ -1,22 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>BaseWidget</class>
<widget class="QFrame" name="BaseWidget">
<class>QueueBaseWidget</class>
<widget class="QFrame" name="QueueBaseWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>332</width>
<height>70</height>
<width>354</width>
<height>72</height>
</rect>
</property>
<property name="windowTitle">
<string notr="true">BaseWidget</string>
<string notr="true">QueueBaseWidget</string>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<layout class="QHBoxLayout" name="download_widget_layout" stretch="1,0,0,0">
<layout class="QHBoxLayout" name="queue_base_layout" stretch="1,0,0,0">
<property name="leftMargin">
<number>0</number>
</property>
@ -100,7 +100,7 @@
<item>
<widget class="QPushButton" name="force_button">
<property name="text">
<string>Update now</string>
<string>Download now</string>
</property>
</widget>
</item>

View file

@ -1,8 +1,8 @@
# -*- coding: utf-8 -*-
# Form implementation generated from reading ui file 'rare/ui/components/tabs/downloads/info_widget.ui'
# Form implementation generated from reading ui file 'rare/ui/components/tabs/downloads/queue_info_widget.ui'
#
# Created by: PyQt5 UI code generator 5.15.7
# Created by: PyQt5 UI code generator 5.15.9
#
# 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.
@ -11,103 +11,103 @@
from PyQt5 import QtCore, QtGui, QtWidgets
class Ui_InfoWidget(object):
def setupUi(self, InfoWidget):
InfoWidget.setObjectName("InfoWidget")
InfoWidget.resize(624, 60)
class Ui_QueueInfoWidget(object):
def setupUi(self, QueueInfoWidget):
QueueInfoWidget.setObjectName("QueueInfoWidget")
QueueInfoWidget.resize(624, 60)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(InfoWidget.sizePolicy().hasHeightForWidth())
InfoWidget.setSizePolicy(sizePolicy)
InfoWidget.setWindowTitle("InfoWidget")
self.info_widget_layout = QtWidgets.QGridLayout(InfoWidget)
self.info_widget_layout.setContentsMargins(0, 0, 0, 0)
self.info_widget_layout.setObjectName("info_widget_layout")
self.dl_size_label = QtWidgets.QLabel(InfoWidget)
sizePolicy.setHeightForWidth(QueueInfoWidget.sizePolicy().hasHeightForWidth())
QueueInfoWidget.setSizePolicy(sizePolicy)
QueueInfoWidget.setWindowTitle("QueueInfoWidget")
self.queue_info_layout = QtWidgets.QGridLayout(QueueInfoWidget)
self.queue_info_layout.setContentsMargins(0, 0, 0, 0)
self.queue_info_layout.setObjectName("queue_info_layout")
self.dl_size_label = QtWidgets.QLabel(QueueInfoWidget)
font = QtGui.QFont()
font.setBold(True)
font.setWeight(75)
self.dl_size_label.setFont(font)
self.dl_size_label.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
self.dl_size_label.setObjectName("dl_size_label")
self.info_widget_layout.addWidget(self.dl_size_label, 1, 3, 1, 1)
self.title = QtWidgets.QLabel(InfoWidget)
self.queue_info_layout.addWidget(self.dl_size_label, 1, 3, 1, 1)
self.title = QtWidgets.QLabel(QueueInfoWidget)
font = QtGui.QFont()
font.setBold(True)
font.setWeight(75)
self.title.setFont(font)
self.title.setText("title")
self.title.setObjectName("title")
self.info_widget_layout.addWidget(self.title, 0, 1, 1, 4)
self.local_version_label = QtWidgets.QLabel(InfoWidget)
self.queue_info_layout.addWidget(self.title, 0, 1, 1, 4)
self.local_version_label = QtWidgets.QLabel(QueueInfoWidget)
font = QtGui.QFont()
font.setBold(True)
font.setWeight(75)
self.local_version_label.setFont(font)
self.local_version_label.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
self.local_version_label.setObjectName("local_version_label")
self.info_widget_layout.addWidget(self.local_version_label, 2, 1, 1, 1)
self.queue_info_layout.addWidget(self.local_version_label, 2, 1, 1, 1)
self.image_layout = QtWidgets.QVBoxLayout()
self.image_layout.setSizeConstraint(QtWidgets.QLayout.SetFixedSize)
self.image_layout.setObjectName("image_layout")
self.info_widget_layout.addLayout(self.image_layout, 0, 0, 3, 1)
self.install_size_label = QtWidgets.QLabel(InfoWidget)
self.queue_info_layout.addLayout(self.image_layout, 0, 0, 3, 1)
self.install_size_label = QtWidgets.QLabel(QueueInfoWidget)
font = QtGui.QFont()
font.setBold(True)
font.setWeight(75)
self.install_size_label.setFont(font)
self.install_size_label.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
self.install_size_label.setObjectName("install_size_label")
self.info_widget_layout.addWidget(self.install_size_label, 2, 3, 1, 1)
self.install_size = QtWidgets.QLabel(InfoWidget)
self.queue_info_layout.addWidget(self.install_size_label, 2, 3, 1, 1)
self.install_size = QtWidgets.QLabel(QueueInfoWidget)
self.install_size.setMinimumSize(QtCore.QSize(160, 0))
self.install_size.setText("install_size")
self.install_size.setObjectName("install_size")
self.info_widget_layout.addWidget(self.install_size, 2, 4, 1, 1)
self.queue_info_layout.addWidget(self.install_size, 2, 4, 1, 1)
spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
self.info_widget_layout.addItem(spacerItem, 0, 5, 3, 1)
self.dl_size = QtWidgets.QLabel(InfoWidget)
self.queue_info_layout.addItem(spacerItem, 0, 5, 3, 1)
self.dl_size = QtWidgets.QLabel(QueueInfoWidget)
self.dl_size.setMinimumSize(QtCore.QSize(160, 0))
self.dl_size.setText("dl_size")
self.dl_size.setObjectName("dl_size")
self.info_widget_layout.addWidget(self.dl_size, 1, 4, 1, 1)
self.remote_version_label = QtWidgets.QLabel(InfoWidget)
self.queue_info_layout.addWidget(self.dl_size, 1, 4, 1, 1)
self.remote_version_label = QtWidgets.QLabel(QueueInfoWidget)
font = QtGui.QFont()
font.setBold(True)
font.setWeight(75)
self.remote_version_label.setFont(font)
self.remote_version_label.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
self.remote_version_label.setObjectName("remote_version_label")
self.info_widget_layout.addWidget(self.remote_version_label, 1, 1, 1, 1)
self.local_version = QtWidgets.QLabel(InfoWidget)
self.queue_info_layout.addWidget(self.remote_version_label, 1, 1, 1, 1)
self.local_version = QtWidgets.QLabel(QueueInfoWidget)
self.local_version.setMinimumSize(QtCore.QSize(160, 0))
self.local_version.setMaximumSize(QtCore.QSize(160, 16777215))
self.local_version.setText("local_version")
self.local_version.setObjectName("local_version")
self.info_widget_layout.addWidget(self.local_version, 2, 2, 1, 1)
self.remote_version = QtWidgets.QLabel(InfoWidget)
self.queue_info_layout.addWidget(self.local_version, 2, 2, 1, 1)
self.remote_version = QtWidgets.QLabel(QueueInfoWidget)
self.remote_version.setMinimumSize(QtCore.QSize(160, 0))
self.remote_version.setMaximumSize(QtCore.QSize(160, 16777215))
self.remote_version.setText("remote_version")
self.remote_version.setObjectName("remote_version")
self.info_widget_layout.addWidget(self.remote_version, 1, 2, 1, 1)
self.queue_info_layout.addWidget(self.remote_version, 1, 2, 1, 1)
self.retranslateUi(InfoWidget)
self.retranslateUi(QueueInfoWidget)
def retranslateUi(self, InfoWidget):
def retranslateUi(self, QueueInfoWidget):
_translate = QtCore.QCoreApplication.translate
self.dl_size_label.setText(_translate("InfoWidget", "Download size"))
self.local_version_label.setText(_translate("InfoWidget", "Local version"))
self.install_size_label.setText(_translate("InfoWidget", "Installed size"))
self.remote_version_label.setText(_translate("InfoWidget", "Remote version"))
self.dl_size_label.setText(_translate("QueueInfoWidget", "Download size"))
self.local_version_label.setText(_translate("QueueInfoWidget", "Local version"))
self.install_size_label.setText(_translate("QueueInfoWidget", "Installed size"))
self.remote_version_label.setText(_translate("QueueInfoWidget", "Remote version"))
if __name__ == "__main__":
import sys
app = QtWidgets.QApplication(sys.argv)
InfoWidget = QtWidgets.QWidget()
ui = Ui_InfoWidget()
ui.setupUi(InfoWidget)
InfoWidget.show()
QueueInfoWidget = QtWidgets.QWidget()
ui = Ui_QueueInfoWidget()
ui.setupUi(QueueInfoWidget)
QueueInfoWidget.show()
sys.exit(app.exec_())

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>InfoWidget</class>
<widget class="QWidget" name="InfoWidget">
<class>QueueInfoWidget</class>
<widget class="QWidget" name="QueueInfoWidget">
<property name="geometry">
<rect>
<x>0</x>
@ -17,9 +17,9 @@
</sizepolicy>
</property>
<property name="windowTitle">
<string notr="true">InfoWidget</string>
<string notr="true">QueueInfoWidget</string>
</property>
<layout class="QGridLayout" name="info_widget_layout" columnstretch="0,0,0,0,0,0">
<layout class="QGridLayout" name="queue_info_layout" columnstretch="0,0,0,0,0,0">
<property name="leftMargin">
<number>0</number>
</property>