Skip to content

修复点击启动服务器不跳转到终端界面的bug #122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 11, 2023
Merged

修复点击启动服务器不跳转到终端界面的bug #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7dd5d03
修复点击启动服务器不跳转到终端界面的bug
kitUIN Sep 10, 2023
20f8a5a
F | 修正部分方法与逻辑
LxHTT Sep 10, 2023
ee5db58
修复下载页面更改核心而不置空构建列表的bug
kitUIN Sep 10, 2023
56db9f8
Merge remote-tracking branch 'origin/master'
kitUIN Sep 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion MCSL2Lib/Pages/downloadPage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -948,7 +948,15 @@ def initFastMirrorCoreListWidget(self):
def fastMirrorCoreNameProcessor(self):
downloadVariables.selectedName = self.sender().objectName()
self.initFastMirrorMCVersionsListWidget()

try:
self.buildLayout.removeItem(self.scrollAreaSpacer)
except AttributeError:
pass
try:
for i in reversed(range(self.buildLayout.count())):
self.buildLayout.itemAt(i).widget().deleteLater()
except AttributeError:
pass
def initFastMirrorMCVersionsListWidget(self):
try:
self.versionLayout.removeItem(self.scrollAreaSpacer)
Expand Down
6 changes: 4 additions & 2 deletions MCSL2Lib/windowInterface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,11 +610,12 @@ def startServer(self):
if not firstTry:
w = MessageBox(
title="提示",
content="你并未同意Minecraft的最终用户许可协议。\n未同意，服务器将无法启动。\n可点击下方的按钮查看Eula。\n同意Eula后，请尝试再次开启服务器",
content="你并未同意Minecraft的最终用户许可协议。\n未同意，服务器将无法启动。\n可点击下方的按钮查看Eula。\n同意Eula后，服务器将会启动。",
parent=self,
)
w.yesButton.setText("同意")
w.yesSignal.connect(lambda: MojangEula().acceptEula())
w.yesSignal.connect(MojangEula().acceptEula)
w.yesSignal.connect(self.startServer)
w.cancelButton.setText("拒绝")
eulaBtn = HyperlinkButton(
url="https://aka.ms/MinecraftEULA", text="Eula", icon=FIF.LINK
Expand All @@ -623,6 +624,7 @@ def startServer(self):
w.exec()
else:
self.switchTo(self.consoleInterface)
self.navigationInterface.setCurrentItem(self.consoleInterface.objectName())
self.consoleInterface.serverOutput.setPlainText("")
self.serverMemThread = MinecraftServerResMonitorUtil(self)
self.serverMemThread.memPercent.connect(self.consoleInterface.setMemView)
Expand Down