flik/termora
1
0
Fork 0
mirror of https://github.com/TermoraDev/termora.git synced 2026-01-15 18:02:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: enhance terminal tab closing behavior to support reconnect option

Browse Source
This commit is contained in:
hstyi
2025-11-11 10:50:34 +08:00
committed by hstyi
parent 0615378a17
commit 9e2e104baa
3 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/kotlin/app/termora/PtyHostTerminalTab.kt
View File

@@ -179,7 +179,7 @@ abstract class PtyHostTerminalTab(
val tab = createReconnectTerminalTab() val tab = createReconnectTerminalTab()
manager.addTerminalTab(index, tab, true) manager.addTerminalTab(index, tab, true)
manager.closeTerminalTab(this, true) manager.closeTerminalTab(this, disposable = true, reconnect = true)
if (tab is HostTerminalTab) { if (tab is HostTerminalTab) {
tab.start() tab.start()

33
src/main/kotlin/app/termora/TerminalTabbed.kt
View File

@@ -141,25 +141,28 @@ class TerminalTabbed(
} }
private fun removeTabAt(index: Int, disposable: Boolean = true) { private fun removeTabAt(index: Int, disposable: Boolean = true, reconnect: Boolean = false) {
if (tabbedPane.isTabClosable(index)) { if (tabbedPane.isTabClosable(index)) {
val tab = tabs[index] val tab = tabs[index]
// 询问是否可以关闭 // 询问是否可以关闭
if (disposable) { if (disposable) {
// 如果开启了关闭确认，那么直接询问用户 // 如果是重连接，那么直接关闭不进行任何形式的询问
if (appearance.confirmTabClose) { if (reconnect.not()) {
if (OptionPane.showConfirmDialog( // 如果开启了关闭确认，那么直接询问用户
windowScope.window, if (appearance.confirmTabClose) {
I18n.getString("termora.tabbed.tab.close-prompt"), if (OptionPane.showConfirmDialog(
messageType = JOptionPane.QUESTION_MESSAGE, windowScope.window,
optionType = JOptionPane.OK_CANCEL_OPTION I18n.getString("termora.tabbed.tab.close-prompt"),
) != JOptionPane.OK_OPTION messageType = JOptionPane.QUESTION_MESSAGE,
) { optionType = JOptionPane.OK_CANCEL_OPTION
) != JOptionPane.OK_OPTION
) {
return
}
} else if (!tab.willBeClose()) { // 如果没有开启则询问用户
return return
} }
} else if (!tab.willBeClose()) { // 如果没有开启则询问用户
return
} }
} }
@@ -361,7 +364,7 @@ class TerminalTabbed(
} }
} }
override fun indexOfTerminalTab(tab: TerminalTab):Int { override fun indexOfTerminalTab(tab: TerminalTab): Int {
return tabbedPane.indexOfComponent(tab.getJComponent()) return tabbedPane.indexOfComponent(tab.getJComponent())
} }
@@ -451,10 +454,10 @@ class TerminalTabbed(
} }
} }
override fun closeTerminalTab(tab: TerminalTab, disposable: Boolean) { override fun closeTerminalTab(tab: TerminalTab, disposable: Boolean, reconnect: Boolean) {
for (i in 0 until tabs.size) { for (i in 0 until tabs.size) {
if (tabs[i] == tab) { if (tabs[i] == tab) {
removeTabAt(i, disposable) removeTabAt(i, disposable, reconnect)
break break
} }
} }

2
src/main/kotlin/app/termora/TerminalTabbedManager.kt
View File

@@ -6,7 +6,7 @@ interface TerminalTabbedManager {
fun getSelectedTerminalTab(): TerminalTab? fun getSelectedTerminalTab(): TerminalTab?
fun getTerminalTabs(): List<TerminalTab> fun getTerminalTabs(): List<TerminalTab>
fun setSelectedTerminalTab(tab: TerminalTab) fun setSelectedTerminalTab(tab: TerminalTab)
fun closeTerminalTab(tab: TerminalTab, disposable: Boolean = true) fun closeTerminalTab(tab: TerminalTab, disposable: Boolean = true, reconnect: Boolean = false)
fun refreshTerminalTabs() fun refreshTerminalTabs()
fun indexOfTerminalTab(tab: TerminalTab): Int fun indexOfTerminalTab(tab: TerminalTab): Int
} }