diff --git a/rare/components/tabs/games/game_info/__init__.py b/rare/components/tabs/games/game_info/__init__.py index b1fbda3e..1dfb8fd1 100644 --- a/rare/components/tabs/games/game_info/__init__.py +++ b/rare/components/tabs/games/game_info/__init__.py @@ -79,10 +79,9 @@ class GameInfo(QWidget, Ui_GameInfo): self.widget = QWidget() self.core = core - if os.name != "nt": - self.grade = QLabel("Error") - right_layout.addWidget(self.grade) - self.grade.setTextInteractionFlags(Qt.TextSelectableByMouse) + if os.name == "nt": + self.lbl_grade.setVisible(False) + self.grade.setVisible(False) self.uninstall_button.clicked.connect(self.uninstall) self.verify_button.clicked.connect(self.verify) @@ -158,10 +157,11 @@ class GameInfo(QWidget, Ui_GameInfo): self.install_path.setText(self.igame.install_path) if os.name != "nt": - if grade := self.ratings.get(self.grade_table[app_name].get("grade")): - self.grade.setText(self.tr("ProtonDB rating: ") + grade) - else: - self.grade.setText(self.tr("ProtonDB rating: Error")) + try: + grade = self.ratings.get(self.grade_table[app_name].get("grade")) + except KeyError: + grade = (self.tr("Error")) + self.grade.setText(grade) if len(self.verify_threads.keys()) == 0 or not self.verify_threads.get(app_name): self.verify_widget.setCurrentIndex(0) diff --git a/rare/ui/components/tabs/games/game_info/game_info.py b/rare/ui/components/tabs/games/game_info/game_info.py index e4ed446f..b5bad854 100644 --- a/rare/ui/components/tabs/games/game_info/game_info.py +++ b/rare/ui/components/tabs/games/game_info/game_info.py @@ -20,22 +20,11 @@ class Ui_GameInfo(object): self.layout_game_info_form.setContentsMargins(6, 6, 6, 6) self.layout_game_info_form.setSpacing(12) self.layout_game_info_form.setObjectName("layout_game_info_form") - self.install_path = QtWidgets.QLabel(GameInfo) - self.install_path.setText("error") - self.install_path.setWordWrap(True) - self.install_path.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse) - self.install_path.setObjectName("install_path") - self.layout_game_info_form.addWidget(self.install_path, 4, 1, 1, 1) - self.version = QtWidgets.QLabel(GameInfo) - self.version.setText("error") - self.version.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse) - self.version.setObjectName("version") - self.layout_game_info_form.addWidget(self.version, 2, 1, 1, 1) self.install_size = QtWidgets.QLabel(GameInfo) self.install_size.setText("error") self.install_size.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse) self.install_size.setObjectName("install_size") - self.layout_game_info_form.addWidget(self.install_size, 3, 1, 1, 1) + self.layout_game_info_form.addWidget(self.install_size, 4, 1, 1, 1) self.lbl_dev = QtWidgets.QLabel(GameInfo) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred) sizePolicy.setHorizontalStretch(0) @@ -48,28 +37,11 @@ class Ui_GameInfo(object): self.lbl_dev.setFont(font) self.lbl_dev.setObjectName("lbl_dev") self.layout_game_info_form.addWidget(self.lbl_dev, 0, 0, 1, 1, QtCore.Qt.AlignRight) - self.dev = QtWidgets.QLabel(GameInfo) - self.dev.setText("error") - self.dev.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse) - self.dev.setObjectName("dev") - self.layout_game_info_form.addWidget(self.dev, 0, 1, 1, 1) - self.app_name = QtWidgets.QLabel(GameInfo) - self.app_name.setText("error") - self.app_name.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse) - self.app_name.setObjectName("app_name") - self.layout_game_info_form.addWidget(self.app_name, 1, 1, 1, 1) - self.lbl_version = QtWidgets.QLabel(GameInfo) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.lbl_version.sizePolicy().hasHeightForWidth()) - self.lbl_version.setSizePolicy(sizePolicy) - font = QtGui.QFont() - font.setBold(True) - font.setWeight(75) - self.lbl_version.setFont(font) - self.lbl_version.setObjectName("lbl_version") - self.layout_game_info_form.addWidget(self.lbl_version, 2, 0, 1, 1, QtCore.Qt.AlignRight) + self.version = QtWidgets.QLabel(GameInfo) + self.version.setText("error") + self.version.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse) + self.version.setObjectName("version") + self.layout_game_info_form.addWidget(self.version, 2, 1, 1, 1) self.lbl_install_path = QtWidgets.QLabel(GameInfo) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred) sizePolicy.setHorizontalStretch(0) @@ -81,33 +53,7 @@ class Ui_GameInfo(object): font.setWeight(75) self.lbl_install_path.setFont(font) self.lbl_install_path.setObjectName("lbl_install_path") - self.layout_game_info_form.addWidget(self.lbl_install_path, 4, 0, 1, 1, QtCore.Qt.AlignRight) - spacerItem = QtWidgets.QSpacerItem(0, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.layout_game_info_form.addItem(spacerItem, 6, 1, 1, 1) - self.lbl_game_actions = QtWidgets.QLabel(GameInfo) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.lbl_game_actions.sizePolicy().hasHeightForWidth()) - self.lbl_game_actions.setSizePolicy(sizePolicy) - font = QtGui.QFont() - font.setBold(True) - font.setWeight(75) - self.lbl_game_actions.setFont(font) - self.lbl_game_actions.setObjectName("lbl_game_actions") - self.layout_game_info_form.addWidget(self.lbl_game_actions, 5, 0, 1, 1, QtCore.Qt.AlignRight) - self.lbl_app_name = QtWidgets.QLabel(GameInfo) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.lbl_app_name.sizePolicy().hasHeightForWidth()) - self.lbl_app_name.setSizePolicy(sizePolicy) - font = QtGui.QFont() - font.setBold(True) - font.setWeight(75) - self.lbl_app_name.setFont(font) - self.lbl_app_name.setObjectName("lbl_app_name") - self.layout_game_info_form.addWidget(self.lbl_app_name, 1, 0, 1, 1, QtCore.Qt.AlignRight) + self.layout_game_info_form.addWidget(self.lbl_install_path, 5, 0, 1, 1, QtCore.Qt.AlignRight) self.lbl_install_size = QtWidgets.QLabel(GameInfo) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred) sizePolicy.setHorizontalStretch(0) @@ -119,9 +65,11 @@ class Ui_GameInfo(object): font.setWeight(75) self.lbl_install_size.setFont(font) self.lbl_install_size.setObjectName("lbl_install_size") - self.layout_game_info_form.addWidget(self.lbl_install_size, 3, 0, 1, 1, QtCore.Qt.AlignRight) + self.layout_game_info_form.addWidget(self.lbl_install_size, 4, 0, 1, 1, QtCore.Qt.AlignRight) + spacerItem = QtWidgets.QSpacerItem(0, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.layout_game_info_form.addItem(spacerItem, 7, 1, 1, 1) spacerItem1 = QtWidgets.QSpacerItem(20, 0, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) - self.layout_game_info_form.addItem(spacerItem1, 6, 0, 1, 1) + self.layout_game_info_form.addItem(spacerItem1, 7, 0, 1, 1) self.wg_game_actions = QtWidgets.QWidget(GameInfo) self.wg_game_actions.setMinimumSize(QtCore.QSize(250, 0)) self.wg_game_actions.setObjectName("wg_game_actions") @@ -158,7 +106,71 @@ class Ui_GameInfo(object): self.repair_button = QtWidgets.QPushButton(self.wg_game_actions) self.repair_button.setObjectName("repair_button") self.layout_game_actions.addWidget(self.repair_button) - self.layout_game_info_form.addWidget(self.wg_game_actions, 5, 1, 1, 1, QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop) + self.layout_game_info_form.addWidget(self.wg_game_actions, 6, 1, 1, 1, QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop) + self.lbl_version = QtWidgets.QLabel(GameInfo) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.lbl_version.sizePolicy().hasHeightForWidth()) + self.lbl_version.setSizePolicy(sizePolicy) + font = QtGui.QFont() + font.setBold(True) + font.setWeight(75) + self.lbl_version.setFont(font) + self.lbl_version.setObjectName("lbl_version") + self.layout_game_info_form.addWidget(self.lbl_version, 2, 0, 1, 1, QtCore.Qt.AlignRight) + self.lbl_app_name = QtWidgets.QLabel(GameInfo) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.lbl_app_name.sizePolicy().hasHeightForWidth()) + self.lbl_app_name.setSizePolicy(sizePolicy) + font = QtGui.QFont() + font.setBold(True) + font.setWeight(75) + self.lbl_app_name.setFont(font) + self.lbl_app_name.setObjectName("lbl_app_name") + self.layout_game_info_form.addWidget(self.lbl_app_name, 1, 0, 1, 1, QtCore.Qt.AlignRight) + self.dev = QtWidgets.QLabel(GameInfo) + self.dev.setText("error") + self.dev.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse) + self.dev.setObjectName("dev") + self.layout_game_info_form.addWidget(self.dev, 0, 1, 1, 1) + self.app_name = QtWidgets.QLabel(GameInfo) + self.app_name.setText("error") + self.app_name.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse) + self.app_name.setObjectName("app_name") + self.layout_game_info_form.addWidget(self.app_name, 1, 1, 1, 1) + self.install_path = QtWidgets.QLabel(GameInfo) + self.install_path.setText("error") + self.install_path.setWordWrap(True) + self.install_path.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse) + self.install_path.setObjectName("install_path") + self.layout_game_info_form.addWidget(self.install_path, 5, 1, 1, 1) + self.lbl_game_actions = QtWidgets.QLabel(GameInfo) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.lbl_game_actions.sizePolicy().hasHeightForWidth()) + self.lbl_game_actions.setSizePolicy(sizePolicy) + font = QtGui.QFont() + font.setBold(True) + font.setWeight(75) + self.lbl_game_actions.setFont(font) + self.lbl_game_actions.setObjectName("lbl_game_actions") + self.layout_game_info_form.addWidget(self.lbl_game_actions, 6, 0, 1, 1, QtCore.Qt.AlignRight) + self.lbl_grade = QtWidgets.QLabel(GameInfo) + font = QtGui.QFont() + font.setBold(True) + font.setWeight(75) + self.lbl_grade.setFont(font) + self.lbl_grade.setObjectName("lbl_grade") + self.layout_game_info_form.addWidget(self.lbl_grade, 3, 0, 1, 1, QtCore.Qt.AlignRight) + self.grade = QtWidgets.QLabel(GameInfo) + self.grade.setText("error") + self.grade.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse) + self.grade.setObjectName("grade") + self.layout_game_info_form.addWidget(self.grade, 3, 1, 1, 1) self.layout_game_info.addLayout(self.layout_game_info_form, 2, 1, 1, 1) self.image = QtWidgets.QLabel(GameInfo) self.image.setFrameShape(QtWidgets.QFrame.StyledPanel) @@ -180,14 +192,15 @@ class Ui_GameInfo(object): _translate = QtCore.QCoreApplication.translate GameInfo.setWindowTitle(_translate("GameInfo", "Game Info")) self.lbl_dev.setText(_translate("GameInfo", "Developer")) - self.lbl_version.setText(_translate("GameInfo", "Version")) self.lbl_install_path.setText(_translate("GameInfo", "Installation Path")) - self.lbl_game_actions.setText(_translate("GameInfo", "Actions")) - self.lbl_app_name.setText(_translate("GameInfo", "Application Name")) self.lbl_install_size.setText(_translate("GameInfo", "Installation Size")) self.uninstall_button.setText(_translate("GameInfo", "Uninstall Game")) self.verify_button.setText(_translate("GameInfo", "Verify Installation")) self.repair_button.setText(_translate("GameInfo", "Repair Instalation")) + self.lbl_version.setText(_translate("GameInfo", "Version")) + self.lbl_app_name.setText(_translate("GameInfo", "Application Name")) + self.lbl_game_actions.setText(_translate("GameInfo", "Actions")) + self.lbl_grade.setText(_translate("GameInfo", "ProtonDB Grade")) if __name__ == "__main__": diff --git a/rare/ui/components/tabs/games/game_info/game_info.ui b/rare/ui/components/tabs/games/game_info/game_info.ui index 09955772..d20c92fa 100644 --- a/rare/ui/components/tabs/games/game_info/game_info.ui +++ b/rare/ui/components/tabs/games/game_info/game_info.ui @@ -32,29 +32,6 @@ 12 - - - error - - - true - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse - - - - - - - error - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse - - - - error @@ -83,8 +60,8 @@ - - + + error @@ -93,36 +70,7 @@ - - - - error - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse - - - - - - - - 0 - 0 - - - - - 75 - true - - - - Version - - - - + @@ -141,58 +89,7 @@ - - - - Qt::Horizontal - - - - 0 - 20 - - - - - - - - - 0 - 0 - - - - - 75 - true - - - - Actions - - - - - - - - 0 - 0 - - - - - 75 - true - - - - Application Name - - - - + @@ -211,7 +108,20 @@ - + + + + Qt::Horizontal + + + + 0 + 20 + + + + + Qt::Vertical @@ -224,7 +134,7 @@ - + @@ -321,6 +231,119 @@ + + + + + 0 + 0 + + + + + 75 + true + + + + Version + + + + + + + + 0 + 0 + + + + + 75 + true + + + + Application Name + + + + + + + error + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + + + + + + + error + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + + + + + + + error + + + true + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + + + + + + + + 0 + 0 + + + + + 75 + true + + + + Actions + + + + + + + + 75 + true + + + + ProtonDB Grade + + + + + + + error + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + + +