Skip to content
This repository has been archived by the owner on Apr 21, 2023. It is now read-only.

Commit

Permalink
2.3.0 update
Browse files Browse the repository at this point in the history
  • Loading branch information
@NiceneNerd
NiceneNerd committed Sep 23, 2019
2 parents e526938 + 4f54241 commit a6399ad
Show file tree
Hide file tree
Showing 19 changed files with 1,953 additions and 1,124 deletions.
166 changes: 55 additions & 111 deletions bcml/Ui_install.py
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
# pylint: skip-file
# -*- coding: utf-8 -*-

from PySide2 import QtCore, QtGui, QtWidgets
from bcml import install
# Form implementation generated from reading ui file 'c:\Users\macad\Documents\Git\BCML-2\.vscode\install.ui',
# licensing of 'c:\Users\macad\Documents\Git\BCML-2\.vscode\install.ui' applies.
#
# Created: Fri Sep 13 20:33:44 2019
# by: pyside2-uic running on PySide2 5.13.0
#
# WARNING! All changes made in this file will be lost!

from PySide2 import QtCore, QtGui, QtWidgets

class Ui_InstallDialog(object):
def setupUi(self, InstallDialog):
InstallDialog.setObjectName("InstallDialog")
InstallDialog.resize(587, 267)
sizePolicy = QtWidgets.QSizePolicy(
QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
InstallDialog.resize(226, 358)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(
InstallDialog.sizePolicy().hasHeightForWidth())
sizePolicy.setHeightForWidth(InstallDialog.sizePolicy().hasHeightForWidth())
InstallDialog.setSizePolicy(sizePolicy)
self.horizontalLayout_2 = QtWidgets.QHBoxLayout(InstallDialog)
self.horizontalLayout_2.setObjectName("horizontalLayout_2")
Expand All @@ -25,129 +29,69 @@ def setupUi(self, InstallDialog):
self.lstQueue = QtWidgets.QListWidget(InstallDialog)
self.lstQueue.setDragDropMode(QtWidgets.QAbstractItemView.InternalMove)
self.lstQueue.setAlternatingRowColors(True)
self.lstQueue.setSelectionMode(
QtWidgets.QAbstractItemView.ExtendedSelection)
self.lstQueue.setSelectionMode(QtWidgets.QAbstractItemView.ExtendedSelection)
self.lstQueue.setObjectName("lstQueue")
self.verticalLayout_3.addWidget(self.lstQueue)
self.horizontalLayout_3 = QtWidgets.QHBoxLayout()
self.horizontalLayout_3.setObjectName("horizontalLayout_3")
self.gridLayout = QtWidgets.QGridLayout()
self.gridLayout.setObjectName("gridLayout")
self.btnAddFile = QtWidgets.QPushButton(InstallDialog)
self.btnAddFile.setStyleSheet("padding: 4px 8px;")
self.btnAddFile.setObjectName("btnAddFile")
self.horizontalLayout_3.addWidget(self.btnAddFile)
self.gridLayout.addWidget(self.btnAddFile, 0, 0, 1, 1)
self.btnAddFolder = QtWidgets.QPushButton(InstallDialog)
self.btnAddFolder.setStyleSheet("padding: 4px 8px;")
self.btnAddFolder.setObjectName("btnAddFolder")
self.horizontalLayout_3.addWidget(self.btnAddFolder)
self.gridLayout.addWidget(self.btnAddFolder, 0, 1, 1, 1)
self.btnRemove = QtWidgets.QPushButton(InstallDialog)
self.btnRemove.setStyleSheet("padding: 4px 12px;")
self.btnRemove.setObjectName("btnRemove")
self.horizontalLayout_3.addWidget(self.btnRemove)
self.gridLayout.addWidget(self.btnRemove, 1, 1, 1, 1)
self.btnClear = QtWidgets.QPushButton(InstallDialog)
self.btnClear.setStyleSheet("padding: 4px 12px;")
self.btnClear.setObjectName("btnClear")
self.horizontalLayout_3.addWidget(self.btnClear)
self.verticalLayout_3.addLayout(self.horizontalLayout_3)
self.horizontalLayout_2.addLayout(self.verticalLayout_3)
self.verticalLayout = QtWidgets.QVBoxLayout()
self.verticalLayout.setObjectName("verticalLayout")
self.groupBox = QtWidgets.QGroupBox(InstallDialog)
self.groupBox.setObjectName("groupBox")
self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.groupBox)
self.verticalLayout_2.setSpacing(4)
self.verticalLayout_2.setObjectName("verticalLayout_2")
self.horizontalLayout_4 = QtWidgets.QHBoxLayout()
self.horizontalLayout_4.setObjectName("horizontalLayout_4")
self.lblInsertPriority = QtWidgets.QLabel(self.groupBox)
self.lblInsertPriority.setStyleSheet("margin: 0px 0px 4px 0px;")
self.lblInsertPriority.setObjectName("lblInsertPriority")
self.horizontalLayout_4.addWidget(self.lblInsertPriority)
self.spnInsertPriority = QtWidgets.QSpinBox(self.groupBox)
self.spnInsertPriority.setGeometry(QtCore.QRect(0, 0, 51, 22))
self.spnInsertPriority.setRange(100,install.get_next_priority())
self.spnInsertPriority.setProperty("value", self.spnInsertPriority.maximum())
self.spnInsertPriority.setObjectName("spnInsertPriority")
self.horizontalLayout_4.addWidget(self.spnInsertPriority)
self.verticalLayout_2.addLayout(self.horizontalLayout_4)
self.chkRstbShrink = QtWidgets.QCheckBox(self.groupBox)
self.chkRstbShrink.setObjectName("chkRstbShrink")
self.verticalLayout_2.addWidget(self.chkRstbShrink)
self.chkRstbGuess = QtWidgets.QCheckBox(self.groupBox)
self.chkRstbGuess.setObjectName("chkRstbGuess")
self.verticalLayout_2.addWidget(self.chkRstbGuess)
self.chkEnableDeepMerge = QtWidgets.QCheckBox(self.groupBox)
self.chkEnableDeepMerge.setObjectName("chkEnableDeepMerge")
self.verticalLayout_2.addWidget(self.chkEnableDeepMerge)
self.chkRstbLeave = QtWidgets.QCheckBox(self.groupBox)
self.chkRstbLeave.setObjectName("chkRstbLeave")
self.verticalLayout_2.addWidget(self.chkRstbLeave)
self.chkDisablePack = QtWidgets.QCheckBox(self.groupBox)
self.chkDisablePack.setObjectName("chkDisablePack")
self.verticalLayout_2.addWidget(self.chkDisablePack)
self.chkDisableTexts = QtWidgets.QCheckBox(self.groupBox)
self.chkDisableTexts.setObjectName("chkDisableTexts")
self.verticalLayout_2.addWidget(self.chkDisableTexts)
self.chkDisableActorInfo = QtWidgets.QCheckBox(self.groupBox)
self.chkDisableActorInfo.setObjectName("chkDisableActorInfo")
self.verticalLayout_2.addWidget(self.chkDisableActorInfo)
self.chkDisableGamedata = QtWidgets.QCheckBox(self.groupBox)
self.chkDisableGamedata.setObjectName("chkDisableGamedata")
self.verticalLayout_2.addWidget(self.chkDisableGamedata)
self.chkDisableMap = QtWidgets.QCheckBox(self.groupBox)
self.chkDisableMap.setObjectName("chkDisableMap")
self.verticalLayout_2.addWidget(self.chkDisableMap)
self.verticalLayout.addWidget(self.groupBox)
self.gridLayout.addWidget(self.btnClear, 1, 0, 1, 1)
self.verticalLayout_3.addLayout(self.gridLayout)
self.horizontalLayout = QtWidgets.QHBoxLayout()
self.horizontalLayout.setObjectName("horizontalLayout")
self.btnAdvanced = QtWidgets.QPushButton(InstallDialog)
self.btnAdvanced.setObjectName("btnAdvanced")
self.horizontalLayout.addWidget(self.btnAdvanced)
self.label_2 = QtWidgets.QLabel(InstallDialog)
self.label_2.setObjectName("label_2")
self.horizontalLayout.addWidget(self.label_2)
self.spnPriority = QtWidgets.QSpinBox(InstallDialog)
self.spnPriority.setMinimum(1)
self.spnPriority.setMaximum(9998)
self.spnPriority.setObjectName("spnPriority")
self.horizontalLayout.addWidget(self.spnPriority)
self.horizontalLayout.setStretch(0, 2)
self.horizontalLayout.setStretch(1, 1)
self.horizontalLayout.setStretch(2, 1)
self.verticalLayout_3.addLayout(self.horizontalLayout)
self.buttonBox = QtWidgets.QDialogButtonBox(InstallDialog)
self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
self.buttonBox.setStandardButtons(
QtWidgets.QDialogButtonBox.Cancel | QtWidgets.QDialogButtonBox.Ok)
self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok)
self.buttonBox.setObjectName("buttonBox")
self.verticalLayout.addWidget(self.buttonBox)
self.verticalLayout_3.addWidget(self.buttonBox)
self.horizontalLayout_2.addLayout(self.verticalLayout_3)
self.verticalLayout = QtWidgets.QVBoxLayout()
self.verticalLayout.setObjectName("verticalLayout")
self.horizontalLayout_2.addLayout(self.verticalLayout)

self.retranslateUi(InstallDialog)
QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(
"accepted()"), InstallDialog.accept)
QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(
"rejected()"), InstallDialog.reject)
QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL("accepted()"), InstallDialog.accept)
QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL("rejected()"), InstallDialog.reject)
QtCore.QMetaObject.connectSlotsByName(InstallDialog)

def retranslateUi(self, InstallDialog):
InstallDialog.setWindowTitle(QtWidgets.QApplication.translate(
"InstallDialog", "Mod Install", None, -1))
self.label.setText(QtWidgets.QApplication.translate(
"InstallDialog", "Mod(s) to install ", None, -1))
self.btnAddFile.setToolTip(QtWidgets.QApplication.translate(
"InstallDialog", "Browse for a mod", None, -1))
self.btnAddFile.setText(QtWidgets.QApplication.translate(
"InstallDialog", "Add Mod File...", None, -1))
self.btnAddFolder.setText(QtWidgets.QApplication.translate(
"InstallDialog", "Add Mod Folder...", None, -1))
self.btnRemove.setText(QtWidgets.QApplication.translate(
"InstallDialog", "Remove", None, -1))
self.btnClear.setText(QtWidgets.QApplication.translate(
"InstallDialog", "Clear All", None, -1))
self.groupBox.setTitle(QtWidgets.QApplication.translate(
"InstallDialog", "Advanced Install Options", None, -1))
self.chkRstbShrink.setText(QtWidgets.QApplication.translate(
"InstallDialog", "Shrink RSTB values where possible", None, -1))
self.chkRstbGuess.setText(QtWidgets.QApplication.translate(
"InstallDialog", "Estimate complex RSTB values", None, -1))
self.chkEnableDeepMerge.setToolTip(QtWidgets.QApplication.translate(
"InstallDialog", "Deep merge attempts to merge changes made to individual AAMP files. This can be a powerful tool to resolve conflicts but might cause unexpected bugs or issues. ", None, -1))
self.chkEnableDeepMerge.setText(QtWidgets.QApplication.translate(
"InstallDialog", "Disable deep merge", None, -1))
self.chkRstbLeave.setText(QtWidgets.QApplication.translate(
"InstallDialog", "Don\'t remove complex RSTB entries", None, -1))
self.chkDisablePack.setText(QtWidgets.QApplication.translate(
"InstallDialog", "Don\'t merge pack files", None, -1))
self.chkDisableTexts.setText(QtWidgets.QApplication.translate(
"InstallDialog", "Don\'t merge game texts", None, -1))
self.chkDisableActorInfo.setText(QtWidgets.QApplication.translate(
"InstallDialog", "Don\'t merge actor info", None, -1))
self.chkDisableGamedata.setText(QtWidgets.QApplication.translate(
"InstallDialog", "Don\'t merge game/save data", None, -1))
self.chkDisableMap.setText(QtWidgets.QApplication.translate(
"InstallDialog", "Don\'t merge map units", None, -1))
self.lblInsertPriority.setText(QtWidgets.QApplication.translate(
"InstallDialog", "Insert at priority", None, -1))
InstallDialog.setWindowTitle(QtWidgets.QApplication.translate("InstallDialog", "Mod Install", None, -1))
self.label.setText(QtWidgets.QApplication.translate("InstallDialog", "Mod(s) to install ", None, -1))
self.btnAddFile.setToolTip(QtWidgets.QApplication.translate("InstallDialog", "Browse to add a mod in ZIP, RAR, 7z, or BNP format", None, -1))
self.btnAddFile.setText(QtWidgets.QApplication.translate("InstallDialog", "Add File...", None, -1))
self.btnAddFolder.setToolTip(QtWidgets.QApplication.translate("InstallDialog", "Browse to add an unpacked mod from a folder containing a \"content\" folder and a rules.txt", None, -1))
self.btnAddFolder.setText(QtWidgets.QApplication.translate("InstallDialog", "Add Folder...", None, -1))
self.btnRemove.setText(QtWidgets.QApplication.translate("InstallDialog", "Remove", None, -1))
self.btnClear.setText(QtWidgets.QApplication.translate("InstallDialog", "Clear All", None, -1))
self.btnAdvanced.setText(QtWidgets.QApplication.translate("InstallDialog", "Advanced...", None, -1))
self.label_2.setText(QtWidgets.QApplication.translate("InstallDialog", "Start Priority:", None, -1))

32 changes: 15 additions & 17 deletions bcml/Ui_main.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,42 +30,40 @@ def setupUi(self, MainWindow):
self.listWidget.setSelectionMode(QtWidgets.QAbstractItemView.ExtendedSelection)
self.listWidget.setObjectName("listWidget")
self.verticalLayout_2.addWidget(self.listWidget)
self.horizontalLayout_3 = QtWidgets.QHBoxLayout()
self.horizontalLayout_3.setObjectName("horizontalLayout_3")
self.gridLayout_3 = QtWidgets.QGridLayout()
self.gridLayout_3.setSpacing(4)
self.gridLayout_3.setObjectName("gridLayout_3")
self.btnExport = QtWidgets.QPushButton(self.centralwidget)
self.btnExport.setEnabled(False)
self.btnExport.setObjectName("btnExport")
self.gridLayout_3.addWidget(self.btnExport, 0, 3, 1, 1)
self.btnInstall = QtWidgets.QPushButton(self.centralwidget)
self.btnInstall.setObjectName("btnInstall")
self.horizontalLayout_3.addWidget(self.btnInstall)
self.gridLayout_3.addWidget(self.btnInstall, 0, 0, 1, 1)
self.btnRemerge = QtWidgets.QToolButton(self.centralwidget)
self.btnRemerge.setStyleSheet("padding: 3px 10px 2px;")
self.btnRemerge.setPopupMode(QtWidgets.QToolButton.MenuButtonPopup)
self.btnRemerge.setToolButtonStyle(QtCore.Qt.ToolButtonTextBesideIcon)
self.btnRemerge.setArrowType(QtCore.Qt.NoArrow)
self.btnRemerge.setObjectName("btnRemerge")
self.horizontalLayout_3.addWidget(self.btnRemerge)
self.gridLayout_3.addWidget(self.btnRemerge, 0, 1, 1, 1)
self.btnChange = QtWidgets.QPushButton(self.centralwidget)
self.btnChange.setEnabled(False)
self.btnChange.setObjectName("btnChange")
self.horizontalLayout_3.addWidget(self.btnChange)
self.btnExport = QtWidgets.QPushButton(self.centralwidget)
self.btnExport.setEnabled(False)
self.btnExport.setObjectName("btnExport")
self.horizontalLayout_3.addWidget(self.btnExport)
self.verticalLayout_2.addLayout(self.horizontalLayout_3)
self.horizontalLayout_5 = QtWidgets.QHBoxLayout()
self.horizontalLayout_5.setObjectName("horizontalLayout_5")
self.gridLayout_3.addWidget(self.btnChange, 0, 2, 1, 1)
self.btnBackup = QtWidgets.QPushButton(self.centralwidget)
self.btnBackup.setObjectName("btnBackup")
self.horizontalLayout_5.addWidget(self.btnBackup)
self.gridLayout_3.addWidget(self.btnBackup, 1, 0, 1, 1)
self.btnRestore = QtWidgets.QPushButton(self.centralwidget)
self.btnRestore.setObjectName("btnRestore")
self.horizontalLayout_5.addWidget(self.btnRestore)
self.gridLayout_3.addWidget(self.btnRestore, 1, 1, 1, 1)
self.btnRemoveAll = QtWidgets.QPushButton(self.centralwidget)
self.btnRemoveAll.setObjectName("btnRemoveAll")
self.horizontalLayout_5.addWidget(self.btnRemoveAll)
self.gridLayout_3.addWidget(self.btnRemoveAll, 1, 2, 1, 1)
self.btnCemu = QtWidgets.QPushButton(self.centralwidget)
self.btnCemu.setObjectName("btnCemu")
self.horizontalLayout_5.addWidget(self.btnCemu)
self.verticalLayout_2.addLayout(self.horizontalLayout_5)
self.gridLayout_3.addWidget(self.btnCemu, 1, 3, 1, 1)
self.verticalLayout_2.addLayout(self.gridLayout_3)
self.horizontalLayout.addLayout(self.verticalLayout_2)
self.groupBox = QtWidgets.QGroupBox(self.centralwidget)
self.groupBox.setMaximumSize(QtCore.QSize(276, 16777215))
Expand Down
58 changes: 58 additions & 0 deletions bcml/Ui_options.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
# -*- coding: utf-8 -*-

# Form implementation generated from reading ui file 'c:\Users\macad\Documents\Git\BCML-2\.vscode\options.ui',
# licensing of 'c:\Users\macad\Documents\Git\BCML-2\.vscode\options.ui' applies.
#
# Created: Thu Sep 12 14:31:57 2019
# by: pyside2-uic running on PySide2 5.13.0
#
# WARNING! All changes made in this file will be lost!

from bcml import mergers
from PySide2 import QtCore, QtGui, QtWidgets

class Ui_OptionsDialog(object):
def setupUi(self, OptionsDialog):
OptionsDialog.setObjectName("OptionsDialog")
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(OptionsDialog.sizePolicy().hasHeightForWidth())
OptionsDialog.setSizePolicy(sizePolicy)
self.verticalLayout = QtWidgets.QVBoxLayout(OptionsDialog)
self.verticalLayout.setObjectName("verticalLayout")
self.label = QtWidgets.QLabel(OptionsDialog)
self.label.setObjectName("label")
self.verticalLayout.addWidget(self.label)
self.checkboxes = []
for merger_class in mergers.get_mergers():
merger = merger_class()
chkMerger = QtWidgets.QCheckBox(OptionsDialog)
chkMerger.setObjectName('chkDisable' + merger.NAME)
chkMerger.setText('Disable ' + merger.friendly_name())
setattr(chkMerger, 'disable_name', merger.NAME)
self.verticalLayout.addWidget(chkMerger)
self.checkboxes.append(chkMerger)
for option in merger.get_checkbox_options():
chkOption = QtWidgets.QCheckBox(OptionsDialog)
chkOption.setObjectName('chk' + merger.NAME + option[0])
setattr(chkOption, 'option_name', option[0])
setattr(chkOption, 'merger', merger.NAME)
chkOption.setText(option[1])
self.verticalLayout.addWidget(chkOption)
self.checkboxes.append(chkOption)
self.buttonBox = QtWidgets.QDialogButtonBox(OptionsDialog)
self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok)
self.buttonBox.setObjectName("buttonBox")
self.verticalLayout.addWidget(self.buttonBox)

self.retranslateUi(OptionsDialog)
QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL("accepted()"), OptionsDialog.accept)
QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL("rejected()"), OptionsDialog.reject)
QtCore.QMetaObject.connectSlotsByName(OptionsDialog)

def retranslateUi(self, OptionsDialog):
OptionsDialog.setWindowTitle(QtWidgets.QApplication.translate("OptionsDialog", "Advanced Options", None, -1))
self.label.setText(QtWidgets.QApplication.translate("OptionsDialog", "Select Advanced Mod Options", None, -1))

Loading

0 comments on commit a6399ad

Please sign in to comment.