diff --git a/rare/ui/components/dialogs/install_dialog.py b/rare/ui/components/dialogs/install_dialog.py index 23451e4b..934ebc94 100644 --- a/rare/ui/components/dialogs/install_dialog.py +++ b/rare/ui/components/dialogs/install_dialog.py @@ -14,7 +14,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets class Ui_InstallDialog(object): def setupUi(self, InstallDialog): InstallDialog.setObjectName("InstallDialog") - InstallDialog.resize(340, 314) + InstallDialog.resize(324, 344) InstallDialog.setWindowTitle("Rare") self.install_dialog_layout = QtWidgets.QFormLayout(InstallDialog) self.install_dialog_layout.setSizeConstraint(QtWidgets.QLayout.SetFixedSize) @@ -31,7 +31,7 @@ class Ui_InstallDialog(object): self.install_dialog_layout.setLayout(1, QtWidgets.QFormLayout.FieldRole, self.install_dir_layout) self.max_workers_label = QtWidgets.QLabel(InstallDialog) self.max_workers_label.setObjectName("max_workers_label") - self.install_dialog_layout.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.max_workers_label) + self.install_dialog_layout.setWidget(3, QtWidgets.QFormLayout.LabelRole, self.max_workers_label) self.max_workers_layout = QtWidgets.QHBoxLayout() self.max_workers_layout.setObjectName("max_workers_layout") self.max_workers_spin = QtWidgets.QSpinBox(InstallDialog) @@ -48,10 +48,10 @@ class Ui_InstallDialog(object): self.max_workers_info_label.setFont(font) self.max_workers_info_label.setObjectName("max_workers_info_label") self.max_workers_layout.addWidget(self.max_workers_info_label) - self.install_dialog_layout.setLayout(2, QtWidgets.QFormLayout.FieldRole, self.max_workers_layout) + self.install_dialog_layout.setLayout(3, QtWidgets.QFormLayout.FieldRole, self.max_workers_layout) self.force_download_label = QtWidgets.QLabel(InstallDialog) self.force_download_label.setObjectName("force_download_label") - self.install_dialog_layout.setWidget(3, QtWidgets.QFormLayout.LabelRole, self.force_download_label) + self.install_dialog_layout.setWidget(4, QtWidgets.QFormLayout.LabelRole, self.force_download_label) self.force_download_check = QtWidgets.QCheckBox(InstallDialog) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) @@ -59,7 +59,18 @@ class Ui_InstallDialog(object): sizePolicy.setHeightForWidth(self.force_download_check.sizePolicy().hasHeightForWidth()) self.force_download_check.setSizePolicy(sizePolicy) self.force_download_check.setObjectName("force_download_check") - self.install_dialog_layout.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.force_download_check) + self.install_dialog_layout.setWidget(4, QtWidgets.QFormLayout.FieldRole, self.force_download_check) + self.platform_label = QtWidgets.QLabel(InstallDialog) + self.platform_label.setObjectName("platform_label") + self.install_dialog_layout.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.platform_label) + self.platform_combo_box = QtWidgets.QComboBox(InstallDialog) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.platform_combo_box.sizePolicy().hasHeightForWidth()) + self.platform_combo_box.setSizePolicy(sizePolicy) + self.platform_combo_box.setObjectName("platform_combo_box") + self.install_dialog_layout.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.platform_combo_box) self.ignore_space_label = QtWidgets.QLabel(InstallDialog) self.ignore_space_label.setObjectName("ignore_space_label") self.install_dialog_layout.setWidget(5, QtWidgets.QFormLayout.LabelRole, self.ignore_space_label) @@ -101,9 +112,17 @@ class Ui_InstallDialog(object): self.download_only_info_label.setObjectName("download_only_info_label") self.download_only_layout.addWidget(self.download_only_info_label) self.install_dialog_layout.setLayout(6, QtWidgets.QFormLayout.FieldRole, self.download_only_layout) + self.shortcut_lbl = QtWidgets.QLabel(InstallDialog) + self.shortcut_lbl.setObjectName("shortcut_lbl") + self.install_dialog_layout.setWidget(7, QtWidgets.QFormLayout.LabelRole, self.shortcut_lbl) + self.shortcut_cb = QtWidgets.QCheckBox(InstallDialog) + self.shortcut_cb.setText("") + self.shortcut_cb.setChecked(True) + self.shortcut_cb.setObjectName("shortcut_cb") + self.install_dialog_layout.setWidget(7, QtWidgets.QFormLayout.FieldRole, self.shortcut_cb) self.sdl_list_label = QtWidgets.QLabel(InstallDialog) self.sdl_list_label.setObjectName("sdl_list_label") - self.install_dialog_layout.setWidget(7, QtWidgets.QFormLayout.LabelRole, self.sdl_list_label) + self.install_dialog_layout.setWidget(8, QtWidgets.QFormLayout.LabelRole, self.sdl_list_label) self.sdl_list_frame = QtWidgets.QFrame(InstallDialog) self.sdl_list_frame.setFrameShape(QtWidgets.QFrame.StyledPanel) self.sdl_list_frame.setFrameShadow(QtWidgets.QFrame.Raised) @@ -111,29 +130,26 @@ class Ui_InstallDialog(object): self.sdl_list_layout = QtWidgets.QVBoxLayout(self.sdl_list_frame) self.sdl_list_layout.setSpacing(0) self.sdl_list_layout.setObjectName("sdl_list_layout") - self.install_dialog_layout.setWidget(7, QtWidgets.QFormLayout.FieldRole, self.sdl_list_frame) + self.install_dialog_layout.setWidget(8, QtWidgets.QFormLayout.FieldRole, self.sdl_list_frame) self.download_size_label = QtWidgets.QLabel(InstallDialog) self.download_size_label.setObjectName("download_size_label") - self.install_dialog_layout.setWidget(8, QtWidgets.QFormLayout.LabelRole, self.download_size_label) + self.install_dialog_layout.setWidget(9, QtWidgets.QFormLayout.LabelRole, self.download_size_label) self.download_size_info_label = QtWidgets.QLabel(InstallDialog) font = QtGui.QFont() font.setItalic(True) self.download_size_info_label.setFont(font) self.download_size_info_label.setObjectName("download_size_info_label") - self.install_dialog_layout.setWidget(8, QtWidgets.QFormLayout.FieldRole, self.download_size_info_label) + self.install_dialog_layout.setWidget(9, QtWidgets.QFormLayout.FieldRole, self.download_size_info_label) self.install_size_label = QtWidgets.QLabel(InstallDialog) self.install_size_label.setObjectName("install_size_label") - self.install_dialog_layout.setWidget(9, QtWidgets.QFormLayout.LabelRole, self.install_size_label) + self.install_dialog_layout.setWidget(10, QtWidgets.QFormLayout.LabelRole, self.install_size_label) self.install_size_info_label = QtWidgets.QLabel(InstallDialog) font = QtGui.QFont() font.setItalic(True) self.install_size_info_label.setFont(font) self.install_size_info_label.setWordWrap(True) self.install_size_info_label.setObjectName("install_size_info_label") - self.install_dialog_layout.setWidget(9, QtWidgets.QFormLayout.FieldRole, self.install_size_info_label) - self.warn_label = QtWidgets.QLabel(InstallDialog) - self.warn_label.setObjectName("warn_label") - self.install_dialog_layout.setWidget(11, QtWidgets.QFormLayout.LabelRole, self.warn_label) + self.install_dialog_layout.setWidget(10, QtWidgets.QFormLayout.FieldRole, self.install_size_info_label) self.warn_message = QtWidgets.QLabel(InstallDialog) font = QtGui.QFont() font.setItalic(True) @@ -141,6 +157,9 @@ class Ui_InstallDialog(object): self.warn_message.setWordWrap(True) self.warn_message.setObjectName("warn_message") self.install_dialog_layout.setWidget(11, QtWidgets.QFormLayout.FieldRole, self.warn_message) + self.warn_label = QtWidgets.QLabel(InstallDialog) + self.warn_label.setObjectName("warn_label") + self.install_dialog_layout.setWidget(11, QtWidgets.QFormLayout.LabelRole, self.warn_label) self.button_layout = QtWidgets.QHBoxLayout() self.button_layout.setObjectName("button_layout") spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) @@ -154,21 +173,7 @@ class Ui_InstallDialog(object): self.install_button = QtWidgets.QPushButton(InstallDialog) self.install_button.setObjectName("install_button") self.button_layout.addWidget(self.install_button) - self.install_dialog_layout.setLayout(14, QtWidgets.QFormLayout.SpanningRole, self.button_layout) - self.platform_combo_box = QtWidgets.QComboBox(InstallDialog) - self.platform_combo_box.setObjectName("platform_combo_box") - self.install_dialog_layout.setWidget(4, QtWidgets.QFormLayout.FieldRole, self.platform_combo_box) - self.platform_label = QtWidgets.QLabel(InstallDialog) - self.platform_label.setObjectName("platform_label") - self.install_dialog_layout.setWidget(4, QtWidgets.QFormLayout.LabelRole, self.platform_label) - self.shortcut_lbl = QtWidgets.QLabel(InstallDialog) - self.shortcut_lbl.setObjectName("shortcut_lbl") - self.install_dialog_layout.setWidget(12, QtWidgets.QFormLayout.LabelRole, self.shortcut_lbl) - self.shortcut_cb = QtWidgets.QCheckBox(InstallDialog) - self.shortcut_cb.setText("") - self.shortcut_cb.setChecked(True) - self.shortcut_cb.setObjectName("shortcut_cb") - self.install_dialog_layout.setWidget(12, QtWidgets.QFormLayout.FieldRole, self.shortcut_cb) + self.install_dialog_layout.setLayout(12, QtWidgets.QFormLayout.SpanningRole, self.button_layout) self.retranslateUi(InstallDialog) QtCore.QMetaObject.connectSlotsByName(InstallDialog) @@ -180,22 +185,22 @@ class Ui_InstallDialog(object): self.max_workers_label.setText(_translate("InstallDialog", "Max workers")) self.max_workers_info_label.setText(_translate("InstallDialog", "Less is slower. (0: Default)")) self.force_download_label.setText(_translate("InstallDialog", "Force redownload")) + self.platform_label.setText(_translate("InstallDialog", "Platform")) self.ignore_space_label.setText(_translate("InstallDialog", "Ignore free space")) self.ignore_space_info_label.setText(_translate("InstallDialog", "Use with caution!")) self.download_only_label.setText(_translate("InstallDialog", "Download only")) self.download_only_info_label.setText(_translate("InstallDialog", "Do not try to install.")) + self.shortcut_lbl.setText(_translate("InstallDialog", "Create shortcut")) self.sdl_list_label.setText(_translate("InstallDialog", "Optional packs")) self.download_size_label.setText(_translate("InstallDialog", "Download size")) self.download_size_info_label.setText(_translate("InstallDialog", "Click verify...")) self.install_size_label.setText(_translate("InstallDialog", "Total install size")) self.install_size_info_label.setText(_translate("InstallDialog", "Click verify...")) - self.warn_label.setText(_translate("InstallDialog", "Warnings")) self.warn_message.setText(_translate("InstallDialog", "None")) + self.warn_label.setText(_translate("InstallDialog", "Warnings")) self.cancel_button.setText(_translate("InstallDialog", "Cancel")) self.verify_button.setText(_translate("InstallDialog", "Verify")) self.install_button.setText(_translate("InstallDialog", "Install")) - self.platform_label.setText(_translate("InstallDialog", "Platform")) - self.shortcut_lbl.setText(_translate("InstallDialog", "Create shortcut")) if __name__ == "__main__": diff --git a/rare/ui/components/dialogs/install_dialog.ui b/rare/ui/components/dialogs/install_dialog.ui index 886b4cf1..85f04a75 100644 --- a/rare/ui/components/dialogs/install_dialog.ui +++ b/rare/ui/components/dialogs/install_dialog.ui @@ -6,8 +6,8 @@ 0 0 - 340 - 314 + 324 + 344 @@ -37,14 +37,14 @@ - + Max workers - + @@ -70,14 +70,14 @@ - + Force redownload - + @@ -87,6 +87,23 @@ + + + + Platform + + + + + + + + 0 + 0 + + + + @@ -157,13 +174,30 @@ + + + Create shortcut + + + + + + + + + + true + + + + Optional packs - + QFrame::StyledPanel @@ -178,14 +212,14 @@ - + Download size - + @@ -197,61 +231,61 @@ - + Total install size - - - - - true - - - - Click verify... - - - true - - - - - - - Warnings - - - - - - - - true - - - - None - - + + + + + true + + + + Click verify... + + true - - - - - - Qt::Horizontal - - - - 40 - 20 + + + + + true + + + + None + + + true + + + + + + + Warnings + + + + + + + + + Qt::Horizontal + + + + 40 + 20 @@ -277,35 +311,8 @@ - - - - - - - - - Platform - - - - - - - Create shortcut - - - - - - - - - - true - - - + +