diff --git a/AutoConfig.py b/AutoConfig.py index 4c9df87..75380f5 100755 --- a/AutoConfig.py +++ b/AutoConfig.py @@ -551,7 +551,7 @@ if __name__ == "__main__": ui = Ui_MainWindow() pinLunLayout = QtWidgets.QHBoxLayout() ui.setupUi(window) - window.setWindowTitle(f"UEngine 运行器 {version}——容器自动配置部署脚本") + window.setWindowTitle(f"UEngine 运行器 {version}——微型应用商店") window.setWindowIcon(QtGui.QIcon(f"{programPath}/deepin-wine-runner.svg")) iconPath = "{}/runner.svg".format(programPath) window.show() diff --git a/UI/AutoConfig.py b/UI/AutoConfig.py index 3419fc3..657eece 100755 --- a/UI/AutoConfig.py +++ b/UI/AutoConfig.py @@ -108,7 +108,7 @@ class Ui_MainWindow(object): self.saerchBotton.setText(_translate("MainWindow", "搜索")) self.getInfoButton.setText(_translate("MainWindow", "获取选中项介绍")) self.getFen.setText(_translate("MainWindow", "获取/提交选中项的评分和评论")) - self.runBotton.setText(_translate("MainWindow", "部署此方案")) + self.runBotton.setText(_translate("MainWindow", "安装")) self.menu.setTitle(_translate("MainWindow", "程序")) self.menu_2.setTitle(_translate("MainWindow", "切换源")) self.about.setText(_translate("MainWindow", "关于")) diff --git a/UI/AutoConfig.ui b/UI/AutoConfig.ui index ea5b234..7642e3a 100755 --- a/UI/AutoConfig.ui +++ b/UI/AutoConfig.ui @@ -71,7 +71,7 @@ - 部署此方案 + 安装 diff --git a/UI/__pycache__/AutoConfig.cpython-37.pyc b/UI/__pycache__/AutoConfig.cpython-37.pyc index 7cb1f2c..dfeb1e3 100644 Binary files a/UI/__pycache__/AutoConfig.cpython-37.pyc and b/UI/__pycache__/AutoConfig.cpython-37.pyc differ diff --git a/mainwindow.py b/mainwindow.py index 1dfcf44..b755224 100755 --- a/mainwindow.py +++ b/mainwindow.py @@ -1714,6 +1714,7 @@ FrmInstall = QtWidgets.QGridLayout() BtnFindApk = QtWidgets.QPushButton(langFile[lang]["Main"]["MainWindow"]["BtnFindApk"]) BtnInstall = QtWidgets.QPushButton(langFile[lang]["Main"]["MainWindow"]["BtnInstall"]) BtnShowUengineApp = QtWidgets.QPushButton(langFile[lang]["Main"]["MainWindow"]["BtnShowUengineApp"]) +BtnAppStore = QtWidgets.QPushButton("微型应用商店") BtnUninstall = QtWidgets.QPushButton(langFile[lang]["Main"]["MainWindow"]["BtnUninstall"]) Btngeticon = QtWidgets.QPushButton(langFile[lang]["Main"]["MainWindow"]["Btngeticon"]) BtnSaveApk = QtWidgets.QPushButton(langFile[lang]["Main"]["MainWindow"]["BtnSaveApk"]) @@ -1722,6 +1723,7 @@ BtnApkInformation = QtWidgets.QPushButton(langFile[lang]["Main"]["MainWindow"][" FrmInstallWidget.setLayout(FrmInstall) FrmInstallWidget.setSizePolicy(size) BtnShowUengineApp.setSizePolicy(size) +BtnAppStore.setSizePolicy(size) ComboInstallPath.setEditable(True) ComboInstallPath.addItems(findApkHistory) ComboInstallPath.setEditText("") @@ -1745,11 +1747,13 @@ BtnUninstall.clicked.connect(ButtonClick8) Btngeticon.clicked.connect(SaveIconToOtherPath) BtnSaveApk.clicked.connect(SaveInstallUengineApp) BtnApkInformation.clicked.connect(ApkInformation.ShowWindows) +BtnAppStore.clicked.connect(lambda: threading.Thread(target=os.system, args=[f"python3 '{programPath}/AutoConfig.py'"]).start()) # 布局控件 -widgetLayout.addWidget(LabApkPath, 0, 0, 1, 2) -widgetLayout.addWidget(ComboInstallPath, 1, 0, 1, 2) +widgetLayout.addWidget(LabApkPath, 0, 0, 1, 3) +widgetLayout.addWidget(ComboInstallPath, 1, 0, 1, 3) widgetLayout.addWidget(BtnShowUengineApp, 2, 0, 1, 1) -widgetLayout.addWidget(FrmInstallWidget, 0, 2, 3, 1) +widgetLayout.addWidget(BtnAppStore, 2, 1, 1, 1) +widgetLayout.addWidget(FrmInstallWidget, 0, 3, 3, 1) FrmInstall.addWidget(BtnFindApk, 0, 0, 1, 1) FrmInstall.addWidget(BtnInstall, 0, 1, 1, 1) FrmInstall.addWidget(BtnUninstall, 1, 0, 1, 1)