mirror of
https://github.com/TermoraDev/termora.git
synced 2026-01-16 02:12:58 +08:00
Compare commits
35 Commits
2.0.0-beta
...
dependabot
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
683c333955 | ||
|
|
029e570551 | ||
|
|
905c570e4c | ||
|
|
a3069229b8 | ||
|
|
1e930d61c9 | ||
|
|
0015c3a7fb | ||
|
|
4bfb87e5c7 | ||
|
|
4fbb626c42 | ||
|
|
35b175d944 | ||
|
|
5939297550 | ||
|
|
e6e5867742 | ||
|
|
bd9b73ad6a | ||
|
|
dbea769994 | ||
|
|
9cd83c4025 | ||
|
|
d4cc080e7b | ||
|
|
a324bc3d96 | ||
|
|
36929e9ea3 | ||
|
|
dd73b933d9 | ||
|
|
117a9ea692 | ||
|
|
2f932de295 | ||
|
|
679b24a74d | ||
|
|
c6b33ea828 | ||
|
|
a4ea8f2491 | ||
|
|
1c2315b5e9 | ||
|
|
d48e412580 | ||
|
|
3b3fb41384 | ||
|
|
190ac697fb | ||
|
|
8cdbf24cdc | ||
|
|
6e182b6813 | ||
|
|
3fa4064655 | ||
|
|
a77a03d8b3 | ||
|
|
5f8b9d36e2 | ||
|
|
1ed5e164de | ||
|
|
c67d5b0276 | ||
|
|
9646a98f6d |
@@ -233,9 +233,10 @@ tasks.register<Copy>("copy-dependencies") {
|
||||
exec { commandLine("zip", "-d", file.absolutePath, "com/sun/jna/aix-*") }
|
||||
} else if ("${pty4j.name}-${pty4j.version}" == file.nameWithoutExtension) {
|
||||
val osName = if (os.isWindows) "win32" else if (os.isMacOsX) "darwin" else "linux"
|
||||
val targetDir = FileUtils.getFile(dylib, pty4j.name, osName)
|
||||
FileUtils.forceMkdir(targetDir)
|
||||
val myArchName = if (arch.isArm) "aarch64" else "x86-64"
|
||||
val targetDir = if (os.isMacOsX) FileUtils.getFile(dylib, pty4j.name, osName)
|
||||
else FileUtils.getFile(dylib, pty4j.name, osName, myArchName)
|
||||
FileUtils.forceMkdir(targetDir)
|
||||
if (os.isWindows) {
|
||||
// @formatter:off
|
||||
exec { commandLine("unzip", "-j" , "-o", file.absolutePath, "resources/*win/${myArchName}/*", "-d", targetDir.absolutePath) }
|
||||
@@ -383,6 +384,7 @@ tasks.register<Exec>("jpackage") {
|
||||
}
|
||||
|
||||
if (os.isLinux) {
|
||||
options.add("--add-opens=java.desktop/sun.awt.X11=ALL-UNNAMED")
|
||||
if (isDeb) {
|
||||
options.add("-Djpackage.app-layout=deb")
|
||||
}
|
||||
@@ -402,18 +404,6 @@ tasks.register<Exec>("jpackage") {
|
||||
arguments.addAll(listOf("--copyright", "TermoraDev"))
|
||||
arguments.addAll(listOf("--app-content", "$buildDir/plugins"))
|
||||
|
||||
if (os.isWindows) {
|
||||
arguments.addAll(
|
||||
listOf(
|
||||
"--description",
|
||||
"${project.name.uppercaseFirstChar()}: A terminal emulator and SSH client"
|
||||
)
|
||||
)
|
||||
} else {
|
||||
arguments.addAll(listOf("--description", "A terminal emulator and SSH client."))
|
||||
}
|
||||
|
||||
|
||||
if (os.isMacOsX) {
|
||||
arguments.addAll(listOf("--mac-package-name", project.name.uppercaseFirstChar()))
|
||||
arguments.addAll(listOf("--mac-app-category", "developer-tools"))
|
||||
@@ -680,17 +670,24 @@ fun packOnLinux(distributionDir: Directory, finalFilenameWithoutExtension: Strin
|
||||
exec { commandLine("chmod", "+x", appimagetool.absolutePath) }
|
||||
}
|
||||
|
||||
|
||||
// Desktop file
|
||||
val termoraName = project.name.uppercaseFirstChar()
|
||||
|
||||
// copy icon
|
||||
FileUtils.copyFile(
|
||||
File("${projectDir.absolutePath}/src/main/resources/icons/termora_256x256.png"),
|
||||
distributionDir.file(termoraName + File.separator + termoraName + ".png").asFile
|
||||
)
|
||||
|
||||
val desktopFile = distributionDir.file(termoraName + File.separator + termoraName + ".desktop").asFile
|
||||
desktopFile.writeText(
|
||||
"""[Desktop Entry]
|
||||
Type=Application
|
||||
Name=${termoraName}
|
||||
Comment=Terminal emulator and SSH client
|
||||
Icon=/lib/${termoraName}
|
||||
Icon=${termoraName}
|
||||
Categories=Development;
|
||||
StartupWMClass=${termoraName}
|
||||
Terminal=false
|
||||
""".trimIndent()
|
||||
)
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
[versions]
|
||||
kotlin = "2.2.0"
|
||||
kotlin = "2.2.10"
|
||||
slf4j = "2.0.17"
|
||||
pty4j = "0.13.10"
|
||||
tinylog = "2.7.0"
|
||||
@@ -23,10 +23,10 @@ jSystemThemeDetector = "3.9.1"
|
||||
commons-io = "2.20.0"
|
||||
jbr-api = "17.1.10.1"
|
||||
hutool = "5.8.39"
|
||||
jsch = "2.27.2"
|
||||
jsch = "2.27.3"
|
||||
okhttp = "5.1.0"
|
||||
sshj = "0.39.0"
|
||||
sshd-core = "2.15.0"
|
||||
sshd-core = "2.16.0"
|
||||
jgit = "7.2.0.202503040940-r"
|
||||
commonmark = "0.25.1"
|
||||
jnafilechooser = "1.1.2"
|
||||
|
||||
@@ -3,7 +3,7 @@ plugins {
|
||||
}
|
||||
|
||||
|
||||
project.version = "0.0.5"
|
||||
project.version = "0.0.6"
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -18,4 +18,8 @@ object Appearance {
|
||||
set(value) {
|
||||
enableManager.setFlag("Plugins.bg.interval", value)
|
||||
}
|
||||
|
||||
var fillMode: String
|
||||
get() = enableManager.getFlag("Plugins.bg.fillMode", FillMode.STRETCH.name)
|
||||
set(value) = enableManager.setFlag("Plugins.bg.fillMode", value)
|
||||
}
|
||||
@@ -2,6 +2,8 @@ package app.termora.plugins.bg
|
||||
|
||||
import app.termora.GlassPaneExtension
|
||||
import app.termora.WindowScope
|
||||
import app.termora.restore
|
||||
import app.termora.save
|
||||
import com.formdev.flatlaf.FlatLaf
|
||||
import java.awt.AlphaComposite
|
||||
import java.awt.Graphics2D
|
||||
@@ -12,15 +14,52 @@ class BGGlassPaneExtension private constructor() : GlassPaneExtension {
|
||||
val instance = BGGlassPaneExtension()
|
||||
}
|
||||
|
||||
|
||||
override fun paint(scope: WindowScope, c: JComponent, g2d: Graphics2D) {
|
||||
|
||||
val img = BackgroundManager.getInstance().getBackgroundImage() ?: return
|
||||
g2d.save()
|
||||
g2d.composite = AlphaComposite.getInstance(
|
||||
AlphaComposite.SRC_OVER,
|
||||
if (FlatLaf.isLafDark()) 0.2f else 0.1f
|
||||
)
|
||||
g2d.drawImage(img, 0, 0, c.width, c.height, null)
|
||||
g2d.composite = AlphaComposite.getInstance(AlphaComposite.SRC_OVER)
|
||||
|
||||
when (Appearance.fillMode) {
|
||||
FillMode.STRETCH.name -> {
|
||||
g2d.drawImage(img, 0, 0, c.width, c.height, null)
|
||||
}
|
||||
|
||||
FillMode.CENTER.name -> {
|
||||
val x = (c.width - img.width) / 2
|
||||
val y = (c.height - img.height) / 2
|
||||
g2d.drawImage(img, x, y, null)
|
||||
}
|
||||
|
||||
FillMode.TILE.name -> {
|
||||
val iw = img.width
|
||||
val ih = img.height
|
||||
var y = 0
|
||||
while (y < c.height) {
|
||||
var x = 0
|
||||
while (x < c.width) {
|
||||
g2d.drawImage(img, x, y, null)
|
||||
x += iw
|
||||
}
|
||||
y += ih
|
||||
}
|
||||
}
|
||||
|
||||
FillMode.FIT.name -> {
|
||||
val scale = maxOf(c.width.toDouble() / img.width, c.height.toDouble() / img.height)
|
||||
val newW = (img.width * scale).toInt()
|
||||
val newH = (img.height * scale).toInt()
|
||||
val x = (c.width - newW) / 2
|
||||
val y = (c.height - newH) / 2
|
||||
g2d.drawImage(img, x, y, newW, newH, null)
|
||||
}
|
||||
}
|
||||
|
||||
g2d.restore()
|
||||
|
||||
}
|
||||
}
|
||||
@@ -10,6 +10,8 @@ import org.apache.commons.lang3.StringUtils
|
||||
import org.apache.commons.lang3.exception.ExceptionUtils
|
||||
import org.slf4j.LoggerFactory
|
||||
import java.awt.BorderLayout
|
||||
import java.awt.Component
|
||||
import java.awt.event.ItemEvent
|
||||
import java.io.File
|
||||
import java.nio.file.StandardCopyOption
|
||||
import javax.swing.*
|
||||
@@ -23,6 +25,7 @@ class BackgroundOption : JPanel(BorderLayout()), OptionsPane.PluginOption {
|
||||
private val owner get() = SwingUtilities.getWindowAncestor(this)
|
||||
|
||||
val backgroundImageTextField = OutlineTextField()
|
||||
val fillModeComboBox = OutlineComboBox<FillMode>()
|
||||
val intervalSpinner = NumberSpinner(360, minimum = 30, maximum = 86400)
|
||||
|
||||
private val backgroundButton = JButton(Icons.folder)
|
||||
@@ -36,6 +39,38 @@ class BackgroundOption : JPanel(BorderLayout()), OptionsPane.PluginOption {
|
||||
|
||||
private fun initView() {
|
||||
|
||||
fillModeComboBox.addItem(FillMode.STRETCH)
|
||||
fillModeComboBox.addItem(FillMode.FIT)
|
||||
fillModeComboBox.addItem(FillMode.CENTER)
|
||||
fillModeComboBox.addItem(FillMode.TILE)
|
||||
|
||||
fillModeComboBox.selectedItem = runCatching { FillMode.valueOf(Appearance.fillMode) }
|
||||
.getOrNull() ?: FillMode.STRETCH
|
||||
|
||||
fillModeComboBox.renderer = object : DefaultListCellRenderer() {
|
||||
override fun getListCellRendererComponent(
|
||||
list: JList<*>?,
|
||||
value: Any?,
|
||||
index: Int,
|
||||
isSelected: Boolean,
|
||||
cellHasFocus: Boolean
|
||||
): Component? {
|
||||
var text = value?.toString()
|
||||
|
||||
if (value == FillMode.STRETCH) {
|
||||
text = BGI18n.getString("termora.plugins.bg.fill-mode.stretch")
|
||||
} else if (value == FillMode.FIT) {
|
||||
text = BGI18n.getString("termora.plugins.bg.fill-mode.fit")
|
||||
} else if (value == FillMode.CENTER) {
|
||||
text = BGI18n.getString("termora.plugins.bg.fill-mode.center")
|
||||
} else if (value == FillMode.TILE) {
|
||||
text = BGI18n.getString("termora.plugins.bg.fill-mode.tile")
|
||||
}
|
||||
|
||||
return super.getListCellRendererComponent(list, text, index, isSelected, cellHasFocus)
|
||||
}
|
||||
}
|
||||
|
||||
backgroundImageTextField.isEditable = false
|
||||
backgroundImageTextField.trailingComponent = backgroundButton
|
||||
backgroundImageTextField.text = Appearance.backgroundImage
|
||||
@@ -80,6 +115,15 @@ class BackgroundOption : JPanel(BorderLayout()), OptionsPane.PluginOption {
|
||||
Appearance.interval = value
|
||||
}
|
||||
}
|
||||
|
||||
fillModeComboBox.addItemListener {
|
||||
if (it.stateChange == ItemEvent.SELECTED) {
|
||||
Appearance.fillMode = fillModeComboBox.selectedItem?.toString() ?: FillMode.STRETCH.name
|
||||
for (frame in TermoraFrameManager.getInstance().getWindows()) {
|
||||
SwingUtilities.invokeLater { SwingUtilities.updateComponentTreeUI(frame) }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun onSelectedBackgroundImage(file: File) {
|
||||
@@ -124,7 +168,7 @@ class BackgroundOption : JPanel(BorderLayout()), OptionsPane.PluginOption {
|
||||
private fun getFormPanel(): JPanel {
|
||||
val layout = FormLayout(
|
||||
"left:pref, $FORM_MARGIN, default:grow, $FORM_MARGIN, default",
|
||||
"pref, $FORM_MARGIN, pref"
|
||||
"pref, $FORM_MARGIN, pref, $FORM_MARGIN, pref"
|
||||
)
|
||||
|
||||
var rows = 1
|
||||
@@ -138,6 +182,10 @@ class BackgroundOption : JPanel(BorderLayout()), OptionsPane.PluginOption {
|
||||
.add(bgClearBox).xy(5, rows)
|
||||
.apply { rows += step }
|
||||
|
||||
builder.add("${BGI18n.getString("termora.plugins.bg.fill-mode")}:").xy(1, rows)
|
||||
.add(fillModeComboBox).xy(3, rows)
|
||||
.apply { rows += step }
|
||||
|
||||
builder.add("${BGI18n.getString("termora.plugins.bg.interval")}:").xy(1, rows)
|
||||
.add(intervalSpinner).xy(3, rows)
|
||||
.apply { rows += step }
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
package app.termora.plugins.bg
|
||||
|
||||
enum class FillMode {
|
||||
STRETCH, // 拉伸
|
||||
FIT, // 等比例铺满
|
||||
CENTER, // 居中
|
||||
TILE, // 平铺
|
||||
}
|
||||
@@ -1,2 +1,7 @@
|
||||
termora.plugins.bg.interval=Interval
|
||||
termora.plugins.bg.fill-mode=Fill Mode
|
||||
termora.plugins.bg.fill-mode.stretch=Stretch
|
||||
termora.plugins.bg.fill-mode.fit=Fit
|
||||
termora.plugins.bg.fill-mode.center=Center
|
||||
termora.plugins.bg.fill-mode.tile=Tile
|
||||
termora.plugins.bg.background-image=Background Image
|
||||
|
||||
@@ -1,2 +1,8 @@
|
||||
termora.plugins.bg.background-image=背景图
|
||||
termora.plugins.bg.interval=切换间隔
|
||||
|
||||
termora.plugins.bg.fill-mode=填充模式
|
||||
termora.plugins.bg.fill-mode.stretch=拉伸
|
||||
termora.plugins.bg.fill-mode.fit=适合
|
||||
termora.plugins.bg.fill-mode.center=居中
|
||||
termora.plugins.bg.fill-mode.tile=平铺
|
||||
|
||||
@@ -1,2 +1,8 @@
|
||||
termora.plugins.bg.background-image=背景圖
|
||||
termora.plugins.bg.interval=切換間隔
|
||||
|
||||
termora.plugins.bg.fill-mode=填充模式
|
||||
termora.plugins.bg.fill-mode.stretch=拉伸
|
||||
termora.plugins.bg.fill-mode.fit=適合
|
||||
termora.plugins.bg.fill-mode.center=居中
|
||||
termora.plugins.bg.fill-mode.tile=平鋪
|
||||
|
||||
@@ -8,7 +8,7 @@ project.version = "0.0.4"
|
||||
|
||||
dependencies {
|
||||
testImplementation(kotlin("test"))
|
||||
implementation("com.qcloud:cos_api:5.6.249")
|
||||
implementation("com.qcloud:cos_api:5.6.251")
|
||||
compileOnly(project(":"))
|
||||
}
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ dependencies {
|
||||
compileOnly(project(":"))
|
||||
implementation("com.maxmind.geoip2:geoip2:4.3.1")
|
||||
// https://github.com/hstyi/geolite2
|
||||
implementation("com.github.hstyi:geolite2:v1.0-202508040102")
|
||||
implementation("com.github.hstyi:geolite2:v1.0-202508110059")
|
||||
}
|
||||
|
||||
apply(from = "$rootDir/plugins/common.gradle.kts")
|
||||
|
||||
@@ -8,7 +8,7 @@ project.version = "0.0.2"
|
||||
|
||||
dependencies {
|
||||
testImplementation(kotlin("test"))
|
||||
implementation("com.huaweicloud:esdk-obs-java-bundle:3.25.5")
|
||||
implementation("com.huaweicloud:esdk-obs-java-bundle:3.25.7")
|
||||
compileOnly(project(":"))
|
||||
}
|
||||
|
||||
|
||||
@@ -2,13 +2,6 @@ termora.plugins.sync.disabled-sync=You are already logged in and cannot use this
|
||||
|
||||
termora.settings.sync=Sync
|
||||
termora.settings.sync.done=Synchronized data successfully
|
||||
termora.settings.sync.export=${termora.keymgr.export}
|
||||
termora.settings.sync.import=${termora.keymgr.import}
|
||||
termora.settings.sync.import.file-too-large=The file is too large
|
||||
termora.settings.sync.import.successful=Import data successfully
|
||||
termora.settings.sync.export-done=The export was successful
|
||||
termora.settings.sync.export-encrypt=Enter password to encrypt file (optional)
|
||||
termora.settings.sync.export-done-open-folder=The export was successful. Do you want to open the folder?
|
||||
termora.settings.sync.range=Range
|
||||
termora.settings.sync.range.keys=My keys
|
||||
termora.settings.sync.range.keyword-highlights=${termora.highlight}
|
||||
|
||||
@@ -2,15 +2,10 @@ termora.plugins.sync.disabled-sync=你已登录,无法使用此功能
|
||||
|
||||
|
||||
termora.settings.sync=同步
|
||||
termora.settings.sync.export-done=导出成功
|
||||
termora.settings.sync.export-encrypt=输入密码加密文件 (可选)
|
||||
termora.settings.sync.export-done-open-folder=导出成功,是否需要打开所在文件夹?
|
||||
termora.settings.sync.range=范围
|
||||
termora.settings.sync.range.keys=我的密钥
|
||||
termora.settings.sync.last-sync-time=最后同步时间
|
||||
termora.settings.sync.done=同步数据成功
|
||||
termora.settings.sync.import.file-too-large=文件太大
|
||||
termora.settings.sync.import.successful=导入数据成功
|
||||
termora.settings.sync.gist=片段
|
||||
termora.settings.sync.token=令牌
|
||||
termora.settings.sync.type=类型
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
termora.plugins.sync.disabled-sync=你已登錄,無法使用此功能
|
||||
|
||||
termora.settings.sync=同步
|
||||
termora.settings.sync.export-done=匯出成功
|
||||
termora.settings.sync.export-encrypt=輸入密碼加密檔案 (可選)
|
||||
termora.settings.sync.export-done-open-folder=匯出成功,是否需要打開所在資料夾?
|
||||
termora.settings.sync.range=範圍
|
||||
termora.settings.sync.range.keys=我的密鑰
|
||||
termora.settings.sync.last-sync-time=最後同步時間
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
package app.termora
|
||||
|
||||
import com.formdev.flatlaf.util.SystemInfo
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.launch
|
||||
|
||||
internal class ApplePressAndHoldEnabledApplicationRunnerExtension private constructor() : ApplicationRunnerExtension {
|
||||
companion object {
|
||||
val instance = ApplePressAndHoldEnabledApplicationRunnerExtension()
|
||||
}
|
||||
|
||||
override fun ready() {
|
||||
if (SystemInfo.isMacOS.not()) return
|
||||
|
||||
swingCoroutineScope.launch(Dispatchers.IO) {
|
||||
Runtime.getRuntime()
|
||||
.exec(arrayOf("defaults", "write", "app.termora", "ApplePressAndHoldEnabled", "-bool", "false"))
|
||||
.waitFor()
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -9,6 +9,7 @@ import org.apache.commons.lang3.SystemUtils
|
||||
import org.apache.commons.lang3.math.NumberUtils
|
||||
import org.slf4j.LoggerFactory
|
||||
import org.tinylog.configuration.Configuration
|
||||
import java.awt.Toolkit
|
||||
import java.io.File
|
||||
import kotlin.system.exitProcess
|
||||
import kotlin.system.measureTimeMillis
|
||||
@@ -35,10 +36,20 @@ class ApplicationInitializr {
|
||||
// 检查是否单例
|
||||
checkSingleton()
|
||||
|
||||
if (SystemUtils.IS_OS_MAC_OSX) {
|
||||
if (SystemInfo.isMacOS) {
|
||||
System.setProperty("apple.awt.application.name", Application.getName())
|
||||
}
|
||||
|
||||
if (SystemInfo.isLinux) {
|
||||
// https://stackoverflow.com/questions/10593075
|
||||
runCatching {
|
||||
val toolkit = Toolkit.getDefaultToolkit()
|
||||
val awtAppClassNameField = toolkit.javaClass.getDeclaredField("awtAppClassName")
|
||||
awtAppClassNameField.setAccessible(true)
|
||||
awtAppClassNameField.set(toolkit, Application.getName())
|
||||
}
|
||||
}
|
||||
|
||||
// 启动
|
||||
val runtime = measureTimeMillis { ApplicationRunner().run() }
|
||||
val log = LoggerFactory.getLogger(javaClass)
|
||||
|
||||
@@ -9,6 +9,7 @@ internal class FramePlugin : InternalPlugin() {
|
||||
init {
|
||||
support.addExtension(DatabasePropertiesChangedExtension::class.java) { KeymapRefresher.getInstance() }
|
||||
support.addExtension(DatabaseChangedExtension::class.java) { KeymapRefresher.getInstance() }
|
||||
support.addExtension(ApplicationRunnerExtension::class.java) { ApplePressAndHoldEnabledApplicationRunnerExtension.instance }
|
||||
}
|
||||
|
||||
override fun getName(): String {
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package app.termora
|
||||
|
||||
import app.termora.database.DatabaseManager
|
||||
import com.formdev.flatlaf.util.UIScale
|
||||
import java.awt.BorderLayout
|
||||
import java.awt.Dimension
|
||||
import java.awt.Window
|
||||
@@ -14,7 +15,10 @@ internal class SettingsDialog(owner: Window) : DialogWrapper(owner) {
|
||||
private val properties get() = DatabaseManager.getInstance().properties
|
||||
|
||||
init {
|
||||
size = Dimension(UIManager.getInt("Dialog.width"), UIManager.getInt("Dialog.height"))
|
||||
size = Dimension(
|
||||
UIScale.scale(UIManager.getInt("Dialog.width")),
|
||||
UIScale.scale(UIManager.getInt("Dialog.height"))
|
||||
)
|
||||
isModal = true
|
||||
title = I18n.getString("termora.setting")
|
||||
setLocationRelativeTo(null)
|
||||
|
||||
@@ -21,6 +21,7 @@ import com.jgoodies.forms.layout.FormLayout
|
||||
import com.jthemedetecor.OsThemeDetector
|
||||
import com.sun.jna.LastErrorException
|
||||
import com.sun.jna.Native
|
||||
import com.sun.jna.platform.WindowUtils
|
||||
import com.sun.jna.platform.win32.Shell32
|
||||
import com.sun.jna.platform.win32.ShlObj
|
||||
import com.sun.jna.platform.win32.WinDef
|
||||
@@ -169,7 +170,8 @@ class SettingsOptionsPane : OptionsPane() {
|
||||
|
||||
backgroundComBoBox.isEnabled = SystemInfo.isWindows || SystemInfo.isMacOS
|
||||
|
||||
opacitySpinner.isEnabled = SystemInfo.isMacOS || SystemInfo.isWindows
|
||||
opacitySpinner.isEnabled = (SystemInfo.isMacOS || SystemInfo.isWindows)
|
||||
|| (SystemInfo.isLinux && WindowUtils.isWindowAlphaSupported())
|
||||
opacitySpinner.model = object : SpinnerNumberModel(appearance.opacity, 0.1, 1.0, 0.1) {
|
||||
override fun getNextValue(): Any {
|
||||
return super.getNextValue() ?: maximum
|
||||
|
||||
@@ -2,6 +2,7 @@ package app.termora
|
||||
|
||||
import app.termora.actions.AnAction
|
||||
import app.termora.actions.AnActionEvent
|
||||
import app.termora.plugin.internal.extension.DynamicExtensionHandler
|
||||
import app.termora.tree.NewHostTree
|
||||
import com.formdev.flatlaf.extras.components.FlatTabbedPane
|
||||
import com.formdev.flatlaf.extras.components.FlatToolBar
|
||||
@@ -9,15 +10,14 @@ import com.formdev.flatlaf.util.SystemInfo
|
||||
import java.awt.BorderLayout
|
||||
import java.awt.Dimension
|
||||
import java.awt.Font
|
||||
import java.awt.event.ComponentAdapter
|
||||
import java.awt.event.ComponentEvent
|
||||
import java.awt.event.KeyEvent
|
||||
import java.awt.event.MouseAdapter
|
||||
import java.awt.event.*
|
||||
import javax.swing.*
|
||||
import javax.swing.tree.TreePath
|
||||
import kotlin.math.max
|
||||
|
||||
|
||||
class TermoraFencePanel(
|
||||
private val ws: WindowScope,
|
||||
private val terminalTabbed: TerminalTabbed,
|
||||
private val tabbed: FlatTabbedPane,
|
||||
private val moveMouseAdapter: MouseAdapter,
|
||||
@@ -72,10 +72,12 @@ class TermoraFencePanel(
|
||||
leftTreePanel.addComponentListener(object : ComponentAdapter() {
|
||||
override fun componentHidden(e: ComponentEvent) {
|
||||
toolbar.isVisible = true
|
||||
enableManager.setFlag("Termora.Fence.colspan", true)
|
||||
}
|
||||
|
||||
override fun componentShown(e: ComponentEvent) {
|
||||
toolbar.isVisible = false
|
||||
enableManager.setFlag("Termora.Fence.colspan", false)
|
||||
}
|
||||
})
|
||||
|
||||
@@ -86,6 +88,50 @@ class TermoraFencePanel(
|
||||
toolkit.menuShortcutKeyMaskEx or KeyEvent.SHIFT_DOWN_MASK
|
||||
), "toggle"
|
||||
)
|
||||
|
||||
splitPane.addPropertyChangeListener("dividerLocation") {
|
||||
if (leftTreePanel.isVisible)
|
||||
enableManager.setFlag("Termora.Fence.dividerLocation", max(splitPane.dividerLocation, 10))
|
||||
}
|
||||
|
||||
if (enableManager.getFlag("Termora.Fence.colspan", false)) {
|
||||
toggle()
|
||||
}
|
||||
|
||||
|
||||
DynamicExtensionHandler.getInstance()
|
||||
.register(TerminalTabbedContextMenuExtension::class.java, object : TerminalTabbedContextMenuExtension {
|
||||
override fun createJMenuItem(
|
||||
windowScope: WindowScope,
|
||||
tab: TerminalTab
|
||||
): JMenuItem {
|
||||
if (windowScope != ws) throw UnsupportedOperationException()
|
||||
if (tab !is HostTerminalTab) throw UnsupportedOperationException()
|
||||
if (tab.host.isTemporary) throw UnsupportedOperationException()
|
||||
if (tab.host.id == "local") throw UnsupportedOperationException()
|
||||
|
||||
val item = JMenuItem(I18n.getString("termora.tabbed.contextmenu.select-host"))
|
||||
item.addActionListener(object : AbstractAction() {
|
||||
override fun actionPerformed(e: ActionEvent) {
|
||||
val tree = getHostTree()
|
||||
for (node in tree.simpleTreeModel.root.getAllChildren()) {
|
||||
if (node.id == tab.host.id) {
|
||||
tree.selectionPath = TreePath(tree.simpleTreeModel.getPathToRoot(node))
|
||||
tree.requestFocusInWindow()
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
return item
|
||||
}
|
||||
|
||||
override fun ordered(): Long {
|
||||
return Long.MAX_VALUE
|
||||
}
|
||||
|
||||
}).let { Disposer.register(this, it) }
|
||||
}
|
||||
|
||||
private inner class LeftTreePanel : JPanel(BorderLayout()), Disposable {
|
||||
@@ -144,19 +190,19 @@ class TermoraFencePanel(
|
||||
}
|
||||
|
||||
override fun actionPerformed(evt: AnActionEvent) {
|
||||
if (leftTreePanel.isVisible) dividerLocation = splitPane.dividerLocation
|
||||
leftTreePanel.isVisible = leftTreePanel.isVisible.not()
|
||||
if (leftTreePanel.isVisible) splitPane.dividerLocation = dividerLocation
|
||||
toggle()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
override fun dispose() {
|
||||
if (leftTreePanel.isVisible)
|
||||
enableManager.setFlag("Termora.Fence.dividerLocation", max(splitPane.dividerLocation, 10))
|
||||
private fun toggle() {
|
||||
if (leftTreePanel.isVisible) dividerLocation = splitPane.dividerLocation
|
||||
leftTreePanel.isVisible = leftTreePanel.isVisible.not()
|
||||
if (leftTreePanel.isVisible) splitPane.dividerLocation = dividerLocation
|
||||
mySplitPane.doLayout()
|
||||
}
|
||||
|
||||
|
||||
fun getHostTree(): NewHostTree {
|
||||
return leftTreePanel.hostTree
|
||||
}
|
||||
|
||||
@@ -212,7 +212,7 @@ class TermoraFrame : JFrame(), DataProvider {
|
||||
}
|
||||
|
||||
if (layout == TermoraLayout.Fence) {
|
||||
val fencePanel = TermoraFencePanel(terminalTabbed, tabbedPane, moveMouseAdapter)
|
||||
val fencePanel = TermoraFencePanel(windowScope, terminalTabbed, tabbedPane, moveMouseAdapter)
|
||||
add(fencePanel, BorderLayout.CENTER)
|
||||
dataProviderSupport.addData(DataProviders.Welcome.HostTree, fencePanel.getHostTree())
|
||||
Disposer.register(windowScope, fencePanel)
|
||||
|
||||
@@ -5,6 +5,7 @@ import app.termora.plugin.ExtensionManager
|
||||
import com.formdev.flatlaf.ui.FlatNativeWindowsLibrary
|
||||
import com.formdev.flatlaf.util.SystemInfo
|
||||
import com.sun.jna.Pointer
|
||||
import com.sun.jna.platform.WindowUtils
|
||||
import com.sun.jna.platform.win32.User32
|
||||
import com.sun.jna.platform.win32.WinDef
|
||||
import com.sun.jna.platform.win32.WinUser.*
|
||||
@@ -206,7 +207,7 @@ class TermoraFrameManager : Disposable {
|
||||
}
|
||||
|
||||
fun setOpacity(opacity: Double) {
|
||||
if (opacity < 0 || opacity > 1 || SystemInfo.isLinux) return
|
||||
if (opacity < 0 || opacity > 1) return
|
||||
for (window in getWindows()) {
|
||||
setOpacity(window, opacity)
|
||||
}
|
||||
@@ -227,6 +228,8 @@ class TermoraFrameManager : Disposable {
|
||||
User32.INSTANCE.SetWindowLong(hwnd, GWL_EXSTYLE, exStyle or WS_EX_LAYERED)
|
||||
}
|
||||
User32.INSTANCE.SetLayeredWindowAttributes(hwnd, 0, alpha, LWA_ALPHA)
|
||||
} else if (SystemInfo.isLinux && WindowUtils.isWindowAlphaSupported()) {
|
||||
WindowUtils.setWindowAlpha(window, opacity.toFloat())
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -139,6 +139,7 @@ object AccountHttp {
|
||||
}
|
||||
|
||||
} catch (e: Exception) {
|
||||
if (cidr == "localhost" || cidr == "127.0.0.1") continue
|
||||
if (log.isDebugEnabled) {
|
||||
log.debug(e.message, e)
|
||||
}
|
||||
|
||||
@@ -126,7 +126,7 @@ class PullService private constructor() : SyncService(), Disposable, Application
|
||||
while (true) {
|
||||
val request = Request.Builder()
|
||||
.get()
|
||||
.url("${accountManager.getServer()}/v1/data/changes?since=${since}&after=${after}&limit=${limit}")
|
||||
.url("${accountManager.getServer()}/v1/data/changes?since=${nextSince}&after=${after}&limit=${limit}")
|
||||
.build()
|
||||
val text = AccountHttp.execute(request = request)
|
||||
val response = ohMyJson.decodeFromString<DataChangesResponse>(text)
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
package app.termora.actions
|
||||
|
||||
import app.termora.ApplicationScope
|
||||
import app.termora.I18n
|
||||
import app.termora.Icons
|
||||
import app.termora.SettingsDialog
|
||||
import app.termora.*
|
||||
import com.formdev.flatlaf.extras.FlatDesktop
|
||||
import org.apache.commons.lang3.StringUtils
|
||||
import java.awt.KeyboardFocusManager
|
||||
@@ -32,13 +29,13 @@ class SettingsAction private constructor() : AnAction(
|
||||
private val action get() = this
|
||||
|
||||
init {
|
||||
FlatDesktop.setPreferencesHandler {
|
||||
val owner = KeyboardFocusManager.getCurrentKeyboardFocusManager().focusOwner
|
||||
// Doorman 的情况下不允许打开
|
||||
if (owner != null && ApplicationScope.windowScopes().isNotEmpty()) {
|
||||
actionPerformed(ActionEvent(owner, ActionEvent.ACTION_PERFORMED, StringUtils.EMPTY))
|
||||
FlatDesktop.setPreferencesHandler(object : Runnable {
|
||||
override fun run() {
|
||||
val focusedWindow = KeyboardFocusManager.getCurrentKeyboardFocusManager().focusedWindow ?: return
|
||||
if (focusedWindow !is TermoraFrame) return
|
||||
actionPerformed(ActionEvent(focusedWindow, ActionEvent.ACTION_PERFORMED, StringUtils.EMPTY))
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
override fun actionPerformed(evt: AnActionEvent) {
|
||||
|
||||
@@ -101,6 +101,16 @@ internal class KeywordHighlightPaintListener private constructor() : TerminalPai
|
||||
// -1 表示不使用高亮集
|
||||
if (keywordHighlightSetId == "-1") return
|
||||
|
||||
try {
|
||||
doFind(offset, count, terminal, keywordHighlightSetId)
|
||||
} catch (e: Exception) {
|
||||
if (log.isDebugEnabled) {
|
||||
log.debug(e.message, e)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun doFind(offset: Int, count: Int, terminal: Terminal, keywordHighlightSetId: String) {
|
||||
for (highlight in keywordHighlights) {
|
||||
if (highlight.enabled.not()) continue
|
||||
if (highlight.type != KeywordHighlightType.Highlight) continue
|
||||
@@ -151,7 +161,6 @@ internal class KeywordHighlightPaintListener private constructor() : TerminalPai
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
override fun after(
|
||||
|
||||
@@ -262,8 +262,8 @@ class KeyManagerPanel(private val accountOwner: AccountOwner) : JPanel(BorderLay
|
||||
|
||||
OptionPane.openFileInFolder(
|
||||
SwingUtilities.getWindowAncestor(this),
|
||||
file, I18n.getString("termora.settings.sync.export-done-open-folder"),
|
||||
I18n.getString("termora.settings.sync.export-done")
|
||||
file, I18n.getString("termora.keymgr.export-done-open-folder"),
|
||||
I18n.getString("termora.keymgr.export-done")
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
@@ -103,9 +103,20 @@ class SFTPPtyTerminalTab(windowScope: WindowScope, host: Host) : PtyHostTerminal
|
||||
commands.add("Compression=yes")
|
||||
|
||||
// HostKeyAlgorithms 让 SFTP 命令的顺序和 sshd 的一致 这样可以避免 known_hosts 文件不一致问题
|
||||
val hostKeyAlgorithms = ClientBuilder.setUpDefaultSignatureFactories(true).joinToString(",") { it.name }
|
||||
val hostKeyAlgorithms = ClientBuilder.setUpDefaultSignatureFactories(true).map { it.name }.toMutableList()
|
||||
val localHostKeyAlgorithms = getLocalSSHHostKeyAlgorithms()
|
||||
// 删除本地 ssh 不存在的算法
|
||||
hostKeyAlgorithms.removeIf { localHostKeyAlgorithms.contains(it).not() }
|
||||
|
||||
// 把本地支持的再添加进去
|
||||
for (algorithm in localHostKeyAlgorithms) {
|
||||
if (hostKeyAlgorithms.contains(algorithm).not()) {
|
||||
hostKeyAlgorithms.add(algorithm)
|
||||
}
|
||||
}
|
||||
|
||||
commands.add("-o")
|
||||
commands.add("HostKeyAlgorithms=${hostKeyAlgorithms}")
|
||||
commands.add("HostKeyAlgorithms=${hostKeyAlgorithms.joinToString(",")}")
|
||||
|
||||
// 不使用配置文件
|
||||
commands.add("-F")
|
||||
@@ -143,6 +154,15 @@ class SFTPPtyTerminalTab(windowScope: WindowScope, host: Host) : PtyHostTerminal
|
||||
return ptyConnector
|
||||
}
|
||||
|
||||
private fun getLocalSSHHostKeyAlgorithms(): Set<String> {
|
||||
val pb = ProcessBuilder("ssh", "-Q", "key")
|
||||
val process = pb.start()
|
||||
if (process.waitFor() != 0) {
|
||||
return emptySet()
|
||||
}
|
||||
return String(process.inputStream.readAllBytes()).lines().filter { it.isNotBlank() }.toSet()
|
||||
}
|
||||
|
||||
private fun setAuthentication(commands: MutableList<String>, host: Host) {
|
||||
// 如果通过公钥连接
|
||||
if (host.authentication.type == AuthenticationType.PublicKey) {
|
||||
|
||||
@@ -8,6 +8,7 @@ import app.termora.keymgr.KeyManagerDialog
|
||||
import app.termora.plugin.internal.AltKeyModifier
|
||||
import app.termora.plugin.internal.BasicProxyOption
|
||||
import app.termora.plugin.internal.BasicTerminalOption
|
||||
import app.termora.plugin.internal.telnet.TelnetHostOptionsPane.Backspace
|
||||
import app.termora.tree.Filter
|
||||
import app.termora.tree.HostTreeNode
|
||||
import app.termora.tree.NewHostTreeDialog
|
||||
@@ -24,6 +25,7 @@ import org.eclipse.jgit.internal.transport.sshd.agent.connector.WinPipeConnector
|
||||
import java.awt.*
|
||||
import java.awt.event.*
|
||||
import javax.swing.*
|
||||
import javax.swing.event.DocumentEvent
|
||||
import javax.swing.table.DefaultTableCellRenderer
|
||||
import javax.swing.table.DefaultTableModel
|
||||
|
||||
@@ -35,6 +37,7 @@ internal class SSHHostOptionsPane(private val accountOwner: AccountOwner) : Opti
|
||||
private val terminalOption = BasicTerminalOption().apply {
|
||||
showCharsetComboBox = true
|
||||
showLoginScripts = true
|
||||
showBackspaceComboBox = true
|
||||
showEnvironmentTextArea = true
|
||||
showStartupCommandTextField = true
|
||||
showHeartbeatIntervalTextField = true
|
||||
@@ -46,6 +49,7 @@ internal class SSHHostOptionsPane(private val accountOwner: AccountOwner) : Opti
|
||||
private val jumpHostsOption = JumpHostsOption()
|
||||
private val sftpOption = SFTPOption()
|
||||
private val owner: Window get() = SwingUtilities.getWindowAncestor(this)
|
||||
private var setHostMode = false
|
||||
|
||||
init {
|
||||
addOption(generalOption)
|
||||
@@ -110,11 +114,13 @@ internal class SSHHostOptionsPane(private val accountOwner: AccountOwner) : Opti
|
||||
x11Forwarding = tunnelingOption.x11ServerTextField.text,
|
||||
loginScripts = terminalOption.loginScripts,
|
||||
extras = mutableMapOf(
|
||||
"backspace" to (terminalOption.backspaceComboBox.selectedItem as Backspace).name,
|
||||
"altModifier" to (terminalOption.altModifierComboBox.selectedItem?.toString()
|
||||
?: AltKeyModifier.EightBit.name),
|
||||
"keywordHighlightSetId" to ((terminalOption.highlightSetComboBox.selectedItem as? KeywordHighlight)?.id
|
||||
?: "-1"),
|
||||
"timeout" to (terminalOption.timeoutTextField.value ?: 60).toString()
|
||||
"timeout" to (terminalOption.timeoutTextField.value ?: 60).toString(),
|
||||
"forwardAgent" to tunnelingOption.forwardAgentCheckBox.isSelected.toString(),
|
||||
)
|
||||
)
|
||||
|
||||
@@ -134,6 +140,7 @@ internal class SSHHostOptionsPane(private val accountOwner: AccountOwner) : Opti
|
||||
}
|
||||
|
||||
fun setHost(host: Host) {
|
||||
setHostMode = true
|
||||
generalOption.portTextField.value = host.port
|
||||
generalOption.nameTextField.text = host.name
|
||||
generalOption.usernameTextField.text = host.username
|
||||
@@ -165,6 +172,9 @@ internal class SSHHostOptionsPane(private val accountOwner: AccountOwner) : Opti
|
||||
.getOrNull() ?: AltKeyModifier.EightBit
|
||||
|
||||
|
||||
terminalOption.backspaceComboBox.selectedItem =
|
||||
Backspace.valueOf(host.options.extras["backspace"] ?: Backspace.Delete.name)
|
||||
|
||||
val timeout = host.options.extras["timeout"] ?: "60"
|
||||
terminalOption.timeoutTextField.value = timeout.toIntOrNull() ?: 60
|
||||
|
||||
@@ -182,6 +192,7 @@ internal class SSHHostOptionsPane(private val accountOwner: AccountOwner) : Opti
|
||||
tunnelingOption.tunnelings.addAll(host.tunnelings)
|
||||
tunnelingOption.x11ForwardingCheckBox.isSelected = host.options.enableX11Forwarding
|
||||
tunnelingOption.x11ServerTextField.text = StringUtils.defaultIfBlank(host.options.x11Forwarding, "localhost:0")
|
||||
tunnelingOption.forwardAgentCheckBox.isSelected = host.options.extras["forwardAgent"]?.toBoolean() ?: false
|
||||
|
||||
if (host.options.jumpHosts.isNotEmpty()) {
|
||||
val hosts = HostManager.getInstance().hosts().associateBy { it.id }
|
||||
@@ -296,6 +307,8 @@ internal class SSHHostOptionsPane(private val accountOwner: AccountOwner) : Opti
|
||||
val remarkTextArea = FixedLengthTextArea(512)
|
||||
val authenticationTypeComboBox = FlatComboBox<AuthenticationType>()
|
||||
|
||||
private var hostFocused = false
|
||||
|
||||
init {
|
||||
initView()
|
||||
initEvents()
|
||||
@@ -403,6 +416,26 @@ internal class SSHHostOptionsPane(private val accountOwner: AccountOwner) : Opti
|
||||
removeComponentListener(this)
|
||||
}
|
||||
})
|
||||
|
||||
hostTextField.addFocusListener(object : FocusAdapter() {
|
||||
override fun focusGained(e: FocusEvent) {
|
||||
hostTextField.removeFocusListener(this)
|
||||
hostFocused = true
|
||||
}
|
||||
})
|
||||
|
||||
nameTextField.document.addDocumentListener(object : DocumentAdaptor() {
|
||||
override fun changedUpdate(e: DocumentEvent) {
|
||||
if (nameTextField.hasFocus().not()) return
|
||||
|
||||
if (hostFocused || setHostMode) {
|
||||
nameTextField.document.removeDocumentListener(this)
|
||||
return
|
||||
}
|
||||
|
||||
hostTextField.text = nameTextField.text
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
private fun chooseKeyPair() {
|
||||
@@ -570,9 +603,10 @@ internal class SSHHostOptionsPane(private val accountOwner: AccountOwner) : Opti
|
||||
}
|
||||
}
|
||||
|
||||
protected inner class TunnelingOption : JPanel(BorderLayout()), Option {
|
||||
private inner class TunnelingOption : JPanel(BorderLayout()), Option {
|
||||
val tunnelings = mutableListOf<Tunneling>()
|
||||
val x11ForwardingCheckBox = JCheckBox("X DISPLAY:")
|
||||
val forwardAgentCheckBox = JCheckBox("Enable ForwardAgent")
|
||||
val x11ServerTextField = OutlineTextField(255)
|
||||
|
||||
private val model = object : DefaultTableModel() {
|
||||
@@ -649,6 +683,7 @@ internal class SSHHostOptionsPane(private val accountOwner: AccountOwner) : Opti
|
||||
box.add(deleteBtn)
|
||||
|
||||
x11ForwardingCheckBox.isFocusable = false
|
||||
forwardAgentCheckBox.isFocusable = false
|
||||
|
||||
if (x11ServerTextField.text.isBlank()) {
|
||||
x11ServerTextField.text = "localhost:0"
|
||||
@@ -662,6 +697,13 @@ internal class SSHHostOptionsPane(private val accountOwner: AccountOwner) : Opti
|
||||
x11Forwarding.add(x11ForwardingCheckBox)
|
||||
x11Forwarding.add(x11ServerTextField)
|
||||
|
||||
val forwardAgent = Box.createHorizontalBox()
|
||||
forwardAgent.border = BorderFactory.createCompoundBorder(
|
||||
BorderFactory.createTitledBorder("Agent Forwarding"),
|
||||
BorderFactory.createEmptyBorder(4, 4, 4, 4)
|
||||
)
|
||||
forwardAgent.add(forwardAgentCheckBox)
|
||||
|
||||
x11ServerTextField.isEnabled = x11ForwardingCheckBox.isSelected
|
||||
|
||||
val panel = JPanel(BorderLayout())
|
||||
@@ -670,8 +712,13 @@ internal class SSHHostOptionsPane(private val accountOwner: AccountOwner) : Opti
|
||||
panel.add(box, BorderLayout.SOUTH)
|
||||
panel.border = BorderFactory.createEmptyBorder(0, 0, 8, 0)
|
||||
|
||||
val forwardingBox = Box.createHorizontalBox()
|
||||
forwardingBox.add(x11Forwarding)
|
||||
forwardingBox.add(Box.createHorizontalStrut(4))
|
||||
forwardingBox.add(forwardAgent)
|
||||
|
||||
add(panel, BorderLayout.CENTER)
|
||||
add(x11Forwarding, BorderLayout.SOUTH)
|
||||
add(forwardingBox, BorderLayout.SOUTH)
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -7,9 +7,8 @@ import app.termora.addons.zmodem.ZModemPtyConnectorAdaptor
|
||||
import app.termora.database.DatabaseManager
|
||||
import app.termora.keymap.KeyShortcut
|
||||
import app.termora.keymap.KeymapManager
|
||||
import app.termora.terminal.ControlCharacters
|
||||
import app.termora.terminal.DataKey
|
||||
import app.termora.terminal.PtyConnector
|
||||
import app.termora.plugin.internal.telnet.TelnetHostOptionsPane
|
||||
import app.termora.terminal.*
|
||||
import kotlinx.coroutines.*
|
||||
import kotlinx.coroutines.swing.Swing
|
||||
import kotlinx.coroutines.sync.Mutex
|
||||
@@ -20,6 +19,7 @@ import org.apache.sshd.client.session.ClientSession
|
||||
import org.apache.sshd.common.future.CloseFuture
|
||||
import org.apache.sshd.common.future.SshFutureListener
|
||||
import org.slf4j.LoggerFactory
|
||||
import java.awt.event.KeyEvent
|
||||
import java.nio.charset.StandardCharsets
|
||||
import javax.swing.Icon
|
||||
import javax.swing.JComponent
|
||||
@@ -110,7 +110,18 @@ class SSHTerminalTab(
|
||||
// clear screen
|
||||
terminal.clearScreen()
|
||||
// show cursor
|
||||
terminalModel.setData(DataKey.Companion.ShowCursor, true)
|
||||
terminalModel.setData(DataKey.ShowCursor, true)
|
||||
|
||||
val encoder = terminal.getKeyEncoder()
|
||||
if (encoder is KeyEncoderImpl) {
|
||||
val backspace = host.options.extras["backspace"]
|
||||
if (backspace == TelnetHostOptionsPane.Backspace.Backspace.name) {
|
||||
encoder.putCode(TerminalKeyEvent(keyCode = KeyEvent.VK_BACK_SPACE), String(byteArrayOf(0x08)))
|
||||
} else if (backspace == TelnetHostOptionsPane.Backspace.VT220.name) {
|
||||
encoder.putCode(TerminalKeyEvent(keyCode = KeyEvent.VK_BACK_SPACE), "${ControlCharacters.ESC}[3~")
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return ptyConnectorFactory.decorate(
|
||||
|
||||
@@ -69,4 +69,7 @@ class SftpCommandTerminalTabbedContextMenuExtension private constructor() : Term
|
||||
openHostAction.actionPerformed(OpenHostActionEvent(evt.source, host, evt))
|
||||
}
|
||||
|
||||
override fun ordered(): Long {
|
||||
return 1
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
package app.termora.plugin.internal.ssh
|
||||
|
||||
import org.apache.sshd.agent.local.ChannelAgentForwardingFactory
|
||||
import org.apache.sshd.common.FactoryManager
|
||||
import org.apache.sshd.common.channel.ChannelFactory
|
||||
import org.eclipse.jgit.internal.transport.sshd.agent.JGitSshAgentFactory
|
||||
import org.eclipse.jgit.transport.sshd.agent.ConnectorFactory
|
||||
import java.io.File
|
||||
|
||||
internal class SshAgentFactory(factory: ConnectorFactory, homeDir: File?) : JGitSshAgentFactory(factory, homeDir) {
|
||||
override fun getChannelForwardingFactories(manager: FactoryManager?): List<ChannelFactory> {
|
||||
return listOf(ChannelAgentForwardingFactory.OPENSSH, ChannelAgentForwardingFactory.IETF)
|
||||
}
|
||||
}
|
||||
@@ -56,7 +56,6 @@ import org.apache.sshd.server.forward.AcceptAllForwardingFilter
|
||||
import org.apache.sshd.server.forward.RejectAllForwardingFilter
|
||||
import org.eclipse.jgit.internal.transport.sshd.JGitClientSession
|
||||
import org.eclipse.jgit.internal.transport.sshd.JGitSshClient
|
||||
import org.eclipse.jgit.internal.transport.sshd.agent.JGitSshAgentFactory
|
||||
import org.eclipse.jgit.internal.transport.sshd.agent.connector.PageantConnector
|
||||
import org.eclipse.jgit.internal.transport.sshd.agent.connector.UnixDomainSocketConnector
|
||||
import org.eclipse.jgit.internal.transport.sshd.proxy.AbstractClientProxyConnector
|
||||
@@ -112,6 +111,8 @@ object SshClients {
|
||||
env.putAll(host.options.envs())
|
||||
|
||||
val channel = session.createShellChannel(configuration, env)
|
||||
channel.isAgentForwarding = host.options.extras["forwardAgent"]?.toBoolean() == true
|
||||
|
||||
if (host.options.enableX11Forwarding) {
|
||||
if (channel is app.termora.x11.ChannelShell) {
|
||||
channel.xForwarding = true
|
||||
@@ -386,7 +387,7 @@ object SshClients {
|
||||
|
||||
val channelFactories = mutableListOf<ChannelFactory>()
|
||||
channelFactories.addAll(ClientBuilder.DEFAULT_CHANNEL_FACTORIES)
|
||||
channelFactories.add(X11ChannelFactory.Companion.INSTANCE)
|
||||
channelFactories.add(X11ChannelFactory.INSTANCE)
|
||||
builder.channelFactories(channelFactories)
|
||||
|
||||
val sshClient = builder.build() as JGitSshClient
|
||||
@@ -395,12 +396,14 @@ object SshClients {
|
||||
// JGit 会尝试读取本地的私钥或缓存的私钥
|
||||
sshClient.keyIdentityProvider = KeyIdentityProvider { mutableListOf() }
|
||||
|
||||
// https://github.com/TermoraDev/termora/issues/1001
|
||||
if (host.authentication.type == AuthenticationType.SSHAgent || host.options.extras["forwardAgent"]?.toBoolean() == true) {
|
||||
// ssh-agent
|
||||
sshClient.agentFactory = SshAgentFactory(ConnectorFactory.getDefault(), null)
|
||||
}
|
||||
|
||||
// 设置优先级
|
||||
if (host.authentication.type == AuthenticationType.PublicKey || host.authentication.type == AuthenticationType.SSHAgent) {
|
||||
if (host.authentication.type == AuthenticationType.SSHAgent) {
|
||||
// ssh-agent
|
||||
sshClient.agentFactory = JGitSshAgentFactory(ConnectorFactory.getDefault(), null)
|
||||
}
|
||||
CoreModuleProperties.PREFERRED_AUTHS.set(
|
||||
sshClient,
|
||||
listOf(
|
||||
@@ -422,8 +425,11 @@ object SshClients {
|
||||
|
||||
|
||||
val heartbeatInterval = max(host.options.heartbeatInterval, 3)
|
||||
val timeout = Duration.ofSeconds(host.options.extras["timeout"]?.toLongOrNull() ?: 60)
|
||||
|
||||
CoreModuleProperties.HEARTBEAT_INTERVAL.set(sshClient, Duration.ofSeconds(heartbeatInterval.toLong()))
|
||||
CoreModuleProperties.ALLOW_DHG1_KEX_FALLBACK.set(sshClient, true)
|
||||
CoreModuleProperties.IO_CONNECT_TIMEOUT.set(sshClient, timeout)
|
||||
|
||||
sshClient.setKeyPasswordProviderFactory { IdentityPasswordProvider(CredentialsProvider.getDefault()) }
|
||||
|
||||
|
||||
@@ -520,9 +520,13 @@ class ControlSequenceIntroducerProcessor(terminal: Terminal, reader: TerminalRea
|
||||
|
||||
val writer = terminalModel.getData(DataKey.TerminalWriter)
|
||||
|
||||
// VT102_RESPONSE
|
||||
val bytes = "${ControlCharacters.ESC}[?6c".toByteArray(writer.getCharset())
|
||||
writer.write(TerminalWriter.WriteRequest.fromBytes(bytes))
|
||||
if (args.startsWith('>')) {
|
||||
val bytes = "${ControlCharacters.ESC}[>0;276;0c".toByteArray(writer.getCharset())
|
||||
writer.write(TerminalWriter.WriteRequest.fromBytes(bytes))
|
||||
} else {
|
||||
val bytes = "${ControlCharacters.ESC}[?1;2c".toByteArray(writer.getCharset())
|
||||
writer.write(TerminalWriter.WriteRequest.fromBytes(bytes))
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -172,7 +172,7 @@ class TerminalFindPanel(
|
||||
}
|
||||
} else {
|
||||
if (index - 1 <= 0) {
|
||||
index = 0
|
||||
index = kinds.size - 1
|
||||
} else {
|
||||
index--
|
||||
}
|
||||
|
||||
@@ -185,8 +185,9 @@ class TerminalPanel(val tab: TerminalTab?, val terminal: Terminal, private val w
|
||||
this.addMouseMotionListener(mouseAdapter)
|
||||
|
||||
// 超链接
|
||||
val hyperlinkAdapter = TerminalPanelMouseHyperlinkAdapter(this, terminal)
|
||||
val hyperlinkAdapter = TerminalPanelMouseHyperlinkAdapter(this, terminalDisplay, terminal)
|
||||
this.addMouseListener(hyperlinkAdapter)
|
||||
this.addMouseMotionListener(hyperlinkAdapter)
|
||||
|
||||
// 鼠标跟踪
|
||||
val trackingAdapter = TerminalPanelMouseTrackingAdapter(this, terminal, writer)
|
||||
|
||||
@@ -2,6 +2,8 @@ package app.termora.terminal.panel
|
||||
|
||||
import app.termora.terminal.ClickableHighlighter
|
||||
import app.termora.terminal.Terminal
|
||||
import com.formdev.flatlaf.util.SystemInfo
|
||||
import java.awt.Cursor
|
||||
import java.awt.event.MouseAdapter
|
||||
import java.awt.event.MouseEvent
|
||||
import javax.swing.SwingUtilities
|
||||
@@ -11,19 +13,42 @@ import javax.swing.SwingUtilities
|
||||
*/
|
||||
class TerminalPanelMouseHyperlinkAdapter(
|
||||
private val terminalPanel: TerminalPanel,
|
||||
private val terminalDisplay: TerminalDisplay,
|
||||
private val terminal: Terminal,
|
||||
) : MouseAdapter() {
|
||||
|
||||
override fun mouseClicked(e: MouseEvent) {
|
||||
if (SwingUtilities.isLeftMouseButton(e)) {
|
||||
val position = terminalPanel.pointToPosition(e.point)
|
||||
for (highlighter in terminal.getMarkupModel().getHighlighters(position)) {
|
||||
if (highlighter is ClickableHighlighter) {
|
||||
highlighter.onClicked(position)
|
||||
}
|
||||
if (SwingUtilities.isLeftMouseButton(e).not()) {
|
||||
return
|
||||
}
|
||||
|
||||
if (SystemInfo.isMacOS) {
|
||||
if (e.isMetaDown.not())
|
||||
return
|
||||
} else if (e.isControlDown.not()) {
|
||||
return
|
||||
}
|
||||
|
||||
val position = terminalPanel.pointToPosition(e.point)
|
||||
for (highlighter in terminal.getMarkupModel().getHighlighters(position)) {
|
||||
if (highlighter is ClickableHighlighter) {
|
||||
highlighter.onClicked(position)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override fun mouseMoved(e: MouseEvent) {
|
||||
val position = terminalPanel.pointToPosition(e.point)
|
||||
var cursor = Cursor.getPredefinedCursor(Cursor.TEXT_CURSOR)
|
||||
for (highlighter in terminal.getMarkupModel().getHighlighters(position)) {
|
||||
if (highlighter is ClickableHighlighter) {
|
||||
cursor = if (SystemInfo.isMacOS) Cursor.getDefaultCursor()
|
||||
else Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)
|
||||
break
|
||||
}
|
||||
}
|
||||
terminalDisplay.cursor = cursor
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -2,6 +2,7 @@ package app.termora.transfer
|
||||
|
||||
import app.termora.*
|
||||
import app.termora.transfer.InternalTransferManager.TransferMode
|
||||
import app.termora.transfer.TransportPanel.Companion.isWindowsFileSystem
|
||||
import com.jgoodies.forms.builder.FormBuilder
|
||||
import com.jgoodies.forms.layout.FormLayout
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
@@ -95,8 +96,12 @@ internal class DefaultInternalTransferManager(
|
||||
val context = AskTransferContext(TransferAction.Overwrite, false)
|
||||
for (pair in paths) {
|
||||
if (mode == TransferMode.Transfer && context.applyAll.not()) {
|
||||
var name = pair.first.name
|
||||
if (targetWorkdir.fileSystem.isWindowsFileSystem()) {
|
||||
name = name.replace(":", "-")
|
||||
}
|
||||
val action = withContext(Dispatchers.Swing) {
|
||||
getTransferAction(context, targetWorkdir.resolve(pair.first.name), pair.second)
|
||||
getTransferAction(context, targetWorkdir.resolve(name), pair.second)
|
||||
}
|
||||
if (action == null) {
|
||||
break
|
||||
@@ -272,8 +277,11 @@ internal class DefaultInternalTransferManager(
|
||||
val isDirectory = pair.second.isDirectory
|
||||
val path = pair.first
|
||||
if (isDirectory.not() || mode == TransferMode.Rmrf) {
|
||||
val transfer =
|
||||
createTransfer(path, workdir.resolve(path.name), isDirectory, StringUtils.EMPTY, mode, action)
|
||||
var name = path.name
|
||||
if (workdir.fileSystem.isWindowsFileSystem()) {
|
||||
name = name.replace(":", "-")
|
||||
}
|
||||
val transfer = createTransfer(path, workdir.resolve(name), isDirectory, StringUtils.EMPTY, mode, action)
|
||||
return if (transferManager.addTransfer(transfer)) FileVisitResult.CONTINUE else FileVisitResult.TERMINATE
|
||||
}
|
||||
|
||||
|
||||
@@ -106,6 +106,7 @@ internal class TransportPanel(
|
||||
private val loadingPanel = LoadingPanel()
|
||||
private val model = TransportTableModel()
|
||||
private val table = JTable(model)
|
||||
private val tableScrollPane = JScrollPane(table)
|
||||
private val sorter = TableRowSorter(table.model)
|
||||
private var hasParent = false
|
||||
private val panel get() = this
|
||||
@@ -211,7 +212,7 @@ internal class TransportPanel(
|
||||
|
||||
|
||||
table.setDefaultRenderer(Any::class.java, MyDefaultTableCellRenderer())
|
||||
val scrollPane = JScrollPane(table)
|
||||
val scrollPane = tableScrollPane
|
||||
scrollPane.apply { border = BorderFactory.createMatteBorder(1, 0, 0, 0, DynamicColor.BorderColor) }
|
||||
|
||||
layeredPane.add(scrollPane, JLayeredPane.DEFAULT_LAYER as Any)
|
||||
@@ -241,7 +242,11 @@ internal class TransportPanel(
|
||||
|
||||
Disposer.register(this, editTransferListener)
|
||||
|
||||
refreshBtn.addActionListener { reload(requestFocus = true) }
|
||||
refreshBtn.addActionListener {
|
||||
val filename = getSelectFilename()
|
||||
if (filename != null) registerSelectRow(filename)
|
||||
reload(requestFocus = true)
|
||||
}
|
||||
|
||||
prevBtn.addActionListener { navigator.back() }
|
||||
nextBtn.addActionListener { navigator.forward() }
|
||||
@@ -303,11 +308,16 @@ internal class TransportPanel(
|
||||
if (target.fileSystem != loader.getSyncTransportSupport().getFileSystem()) return
|
||||
}
|
||||
if (target.pathString == workdir?.pathString || target.parent.pathString == workdir?.pathString) {
|
||||
if (loading) {
|
||||
registerNextReloadCallback { reload(requestFocus = false) }
|
||||
} else {
|
||||
val c = {
|
||||
val filename = getSelectFilename()
|
||||
if (filename != null) registerSelectRow(filename)
|
||||
reload(requestFocus = false)
|
||||
}
|
||||
if (loading) {
|
||||
registerNextReloadCallback { c.invoke() }
|
||||
} else {
|
||||
c.invoke()
|
||||
}
|
||||
}
|
||||
}
|
||||
}).let { Disposer.register(this, it) }
|
||||
@@ -497,6 +507,28 @@ internal class TransportPanel(
|
||||
}
|
||||
})
|
||||
|
||||
table.actionMap.put("Delete", object : AbstractAction() {
|
||||
override fun actionPerformed(e: ActionEvent) {
|
||||
val rows = table.selectedRows.map { sorter.convertRowIndexToModel(it) }.toTypedArray()
|
||||
val files = rows.map { model.getPath(it) to model.getAttributes(it) }
|
||||
// 排除父目录
|
||||
val validFiles = files.filter { !it.second.isParent }
|
||||
if (validFiles.isNotEmpty()) {
|
||||
// 显示删除确认对话框
|
||||
if (OptionPane.showConfirmDialog(
|
||||
owner,
|
||||
I18n.getString("termora.keymgr.delete-warning"),
|
||||
messageType = JOptionPane.WARNING_MESSAGE
|
||||
) == JOptionPane.YES_OPTION
|
||||
) {
|
||||
// 直接执行删除操作
|
||||
val future = internalTransferManager.addTransfer(validFiles, InternalTransferManager.TransferMode.Delete)
|
||||
mountFuture(future)
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
// 快速导航
|
||||
table.addKeyListener(object : KeyAdapter() {
|
||||
override fun keyPressed(e: KeyEvent) {
|
||||
@@ -520,12 +552,25 @@ internal class TransportPanel(
|
||||
}
|
||||
})
|
||||
|
||||
// 重写全选行为,排除".."父目录
|
||||
table.actionMap.put("selectAll", object : AbstractAction() {
|
||||
override fun actionPerformed(e: ActionEvent) {
|
||||
table.clearSelection()
|
||||
val startRow = if (hasParent) 1 else 0 // 跳过".."行
|
||||
if (startRow < table.rowCount) {
|
||||
table.setRowSelectionInterval(startRow, table.rowCount - 1)
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
val inputMap = table.getInputMap(WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
|
||||
if (SystemInfo.isMacOS.not()) {
|
||||
inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_F5, 0), "Reload")
|
||||
}
|
||||
inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "EnterSelectionFolder")
|
||||
inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_R, toolkit.menuShortcutKeyMaskEx), "Reload")
|
||||
inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), "Delete")
|
||||
inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_BACK_SPACE, 0), "Delete")
|
||||
}
|
||||
|
||||
private fun initTransferHandler() {
|
||||
@@ -658,6 +703,9 @@ internal class TransportPanel(
|
||||
}
|
||||
|
||||
fun registerSelectRow(name: String) {
|
||||
val verticalValue = tableScrollPane.verticalScrollBar.value
|
||||
val horizontalValue = tableScrollPane.horizontalScrollBar.value
|
||||
|
||||
registerNextReloadCallback {
|
||||
for (i in 0 until model.rowCount) {
|
||||
if (model.getAttributes(i).name == name) {
|
||||
@@ -665,12 +713,22 @@ internal class TransportPanel(
|
||||
table.clearSelection()
|
||||
table.setRowSelectionInterval(c, c)
|
||||
table.scrollRectToVisible(table.getCellRect(c, TransportTableModel.COLUMN_NAME, true))
|
||||
tableScrollPane.verticalScrollBar.value = verticalValue
|
||||
tableScrollPane.horizontalScrollBar.value = horizontalValue
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fun getSelectFilename(): String? {
|
||||
val row = table.selectedRow
|
||||
if (row < 0) return null
|
||||
val c = sorter.convertRowIndexToModel(row)
|
||||
if (c < 0) return null
|
||||
return model.getAttributes(c).name
|
||||
}
|
||||
|
||||
private fun registerNextReloadCallback(block: () -> Unit) {
|
||||
nextReloadCallbacks.computeIfAbsent(mod.get()) { mutableListOf() }
|
||||
.add(block)
|
||||
@@ -1083,6 +1141,8 @@ internal class TransportPanel(
|
||||
} else if (actionCommand == TransportPopupMenu.ActionCommand.Delete) {
|
||||
transfer(InternalTransferManager.TransferMode.Delete)
|
||||
} else if (actionCommand == TransportPopupMenu.ActionCommand.Refresh) {
|
||||
val filename = getSelectFilename()
|
||||
if (filename != null) registerSelectRow(filename)
|
||||
reload(requestFocus = true)
|
||||
} else if (actionCommand == TransportPopupMenu.ActionCommand.Edit) {
|
||||
edit()
|
||||
@@ -1139,7 +1199,9 @@ internal class TransportPanel(
|
||||
|
||||
private fun edit() {
|
||||
for (path in files.map { it.first }) {
|
||||
val target = Application.createSubTemporaryDir().resolve(path.name)
|
||||
var name = path.name
|
||||
if (SystemInfo.isWindows) name = name.replace(":", "-")
|
||||
val target = Application.createSubTemporaryDir().resolve(name)
|
||||
val transferId = internalTransferManager.addHighTransfer(path, target)
|
||||
editTransferListener.addListenTransfer(transferId)
|
||||
}
|
||||
|
||||
@@ -3,6 +3,8 @@ package app.termora.tree
|
||||
import app.termora.*
|
||||
import app.termora.Application.ohMyJson
|
||||
import app.termora.account.AccountManager
|
||||
import app.termora.actions.AnAction
|
||||
import app.termora.actions.AnActionEvent
|
||||
import app.termora.actions.OpenHostAction
|
||||
import app.termora.database.DatabaseChangedExtension
|
||||
import app.termora.database.DatabaseManager
|
||||
@@ -32,6 +34,10 @@ import org.jdesktop.swingx.action.ActionManager
|
||||
import org.slf4j.LoggerFactory
|
||||
import org.w3c.dom.Element
|
||||
import org.w3c.dom.NodeList
|
||||
import java.awt.datatransfer.DataFlavor
|
||||
import java.awt.datatransfer.StringSelection
|
||||
import java.awt.datatransfer.Transferable
|
||||
import java.awt.datatransfer.UnsupportedFlavorException
|
||||
import java.awt.event.*
|
||||
import java.io.*
|
||||
import java.util.*
|
||||
@@ -140,6 +146,41 @@ class NewHostTree : SimpleTree(), Disposable {
|
||||
}
|
||||
})
|
||||
|
||||
actionMap.put("copy", object : AnAction() {
|
||||
override fun actionPerformed(evt: AnActionEvent) {
|
||||
toolkit.systemClipboard.setContents(StringSelection(StringUtils.EMPTY), null)
|
||||
val nodes = getSelectionSimpleTreeNodes(false).toMutableList()
|
||||
nodes.removeIf { e -> e.getParents().any { nodes.contains(it) } }
|
||||
if (nodes.isEmpty() || nodes.any { it is TeamTreeNode }) return
|
||||
if (nodes.any { it.id == "0" || it.id.isBlank() }) return
|
||||
toolkit.systemClipboard.setContents(NodesTransferable(nodes), null)
|
||||
}
|
||||
})
|
||||
|
||||
actionMap.put("paste", object : AnAction() {
|
||||
override fun actionPerformed(evt: AnActionEvent) {
|
||||
val lastNode = getLastSelectedPathNode() ?: return
|
||||
val folder = if (lastNode.isFolder) lastNode.parent ?: simpleTreeModel.root
|
||||
else lastNode.parent ?: return
|
||||
|
||||
if (toolkit.systemClipboard.isDataFlavorAvailable(NodesTransferable.FLAVOR).not()) return
|
||||
val nodes = (toolkit.systemClipboard.getData(NodesTransferable.FLAVOR) as? List<*>)
|
||||
?.filterIsInstance<HostTreeNode>() ?: return
|
||||
|
||||
for (node in nodes) {
|
||||
val newNode = copyNode(node, folder.id)
|
||||
// 复制的是文件夹,就在最后面
|
||||
if (newNode.isFolder) {
|
||||
simpleTreeModel.insertNodeInto(newNode, folder, folder.folderCount)
|
||||
} else if (lastNode.isFolder) { // 用户选的节点是文件夹,那就在最后一个child下面
|
||||
simpleTreeModel.insertNodeInto(newNode, folder, folder.childCount)
|
||||
} else { // 用户选的是主机并且复制的是主机
|
||||
simpleTreeModel.insertNodeInto(newNode, folder, folder.getIndex(lastNode) + 1)
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
fun restoreExpansions() {
|
||||
@@ -198,10 +239,12 @@ class NewHostTree : SimpleTree(), Disposable {
|
||||
val sshMenu = importMenu.add(".ssh/config")
|
||||
val mobaXtermMenu = importMenu.add("MobaXterm")
|
||||
|
||||
|
||||
// 为了避免误导,如果是 SSH 右键时显示 SFTP
|
||||
val sftpText = if (SSHProtocolProvider.PROTOCOL.equals(lastHost.protocol, true))
|
||||
"SFTP" else I18n.getString("termora.transport.sftp")
|
||||
val open = popupMenu.add(I18n.getString("termora.welcome.contextmenu.connect"))
|
||||
val openWith = popupMenu.add(JMenu(I18n.getString("termora.welcome.contextmenu.connect-with"))) as JMenu
|
||||
val openWithSFTP = openWith.add(I18n.getString("termora.transport.sftp"))
|
||||
val openWithSFTP = openWith.add(sftpText)
|
||||
val openWithSFTPCommand = openWith.add(I18n.getString("termora.tabbed.contextmenu.sftp-command"))
|
||||
val openInNewWindow = popupMenu.add(I18n.getString("termora.welcome.contextmenu.open-in-new-window"))
|
||||
popupMenu.addSeparator()
|
||||
@@ -389,6 +432,20 @@ class NewHostTree : SimpleTree(), Disposable {
|
||||
|
||||
})
|
||||
|
||||
val mnemonics = mapOf(
|
||||
refresh to KeyEvent.VK_R,
|
||||
newMenu to KeyEvent.VK_W,
|
||||
newFolder to KeyEvent.VK_F,
|
||||
rename to KeyEvent.VK_M,
|
||||
remove to KeyEvent.VK_D,
|
||||
property to KeyEvent.VK_I,
|
||||
)
|
||||
|
||||
for ((item, mnemonic) in mnemonics) {
|
||||
item.text = "${item.text}(${KeyEvent.getKeyText(mnemonic)})"
|
||||
item.setMnemonic(mnemonic)
|
||||
}
|
||||
|
||||
popupMenu.show(this, evt.x, evt.y)
|
||||
}
|
||||
|
||||
@@ -1075,5 +1132,23 @@ class NewHostTree : SimpleTree(), Disposable {
|
||||
electerm,
|
||||
}
|
||||
|
||||
private class NodesTransferable(val nodes: List<HostTreeNode>) : Transferable {
|
||||
companion object {
|
||||
val FLAVOR = DataFlavor("termora/host-tree", "Termora host tree transfers")
|
||||
}
|
||||
|
||||
override fun getTransferDataFlavors(): Array<out DataFlavor> {
|
||||
return arrayOf(FLAVOR)
|
||||
}
|
||||
|
||||
override fun isDataFlavorSupported(flavor: DataFlavor?): Boolean {
|
||||
return flavor == FLAVOR
|
||||
}
|
||||
|
||||
override fun getTransferData(flavor: DataFlavor?): Any {
|
||||
return if (flavor == FLAVOR) nodes else throw UnsupportedFlavorException(flavor)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -2,6 +2,7 @@ package app.termora.tree
|
||||
|
||||
import javax.swing.Icon
|
||||
import javax.swing.tree.DefaultMutableTreeNode
|
||||
import javax.swing.tree.TreeNode
|
||||
|
||||
abstract class SimpleTreeNode<T>(data: T) : DefaultMutableTreeNode(data) {
|
||||
@Suppress("UNCHECKED_CAST")
|
||||
@@ -35,4 +36,15 @@ abstract class SimpleTreeNode<T>(data: T) : DefaultMutableTreeNode(data) {
|
||||
return children
|
||||
}
|
||||
|
||||
open fun getParents(): List<SimpleTreeNode<T>> {
|
||||
val parents = mutableListOf<SimpleTreeNode<T>>()
|
||||
var p = parent as TreeNode?
|
||||
while (p != null) {
|
||||
if (p is SimpleTreeNode<T>) {
|
||||
parents.add(p)
|
||||
}
|
||||
p = p.parent
|
||||
}
|
||||
return parents
|
||||
}
|
||||
}
|
||||
@@ -239,6 +239,8 @@ termora.keymgr.table.name=Name
|
||||
termora.keymgr.table.type=Type
|
||||
termora.keymgr.table.length=Length
|
||||
termora.keymgr.table.remark=Description
|
||||
termora.keymgr.export-done=The export was successful
|
||||
termora.keymgr.export-done-open-folder=The export was successful. Do you want to open the folder?
|
||||
|
||||
termora.keymgr.ssh-copy-id.number=Number of hosts [{0}] Number of public keys [{1}]
|
||||
termora.keymgr.ssh-copy-id.successful=${termora.terminal.copied}
|
||||
@@ -248,6 +250,7 @@ termora.keymgr.ssh-copy-id.end=End of public key copying
|
||||
|
||||
# Tabbed
|
||||
termora.tabbed.contextmenu.rename=Rename
|
||||
termora.tabbed.contextmenu.select-host=Select Host
|
||||
termora.tabbed.contextmenu.sftp-command=SFTP Command
|
||||
termora.tabbed.contextmenu.sftp-not-install=SFTP programme not found, please install and try again
|
||||
termora.tabbed.contextmenu.clone=Clone
|
||||
|
||||
@@ -69,27 +69,6 @@ termora.settings.terminal.floating-toolbar=Плавающая панель
|
||||
termora.settings.terminal.auto-close-tab=Автозакрытие вкладки
|
||||
termora.settings.terminal.auto-close-tab-description=Автоматически закрывать вкладку при обычном отключении терминала
|
||||
|
||||
termora.settings.sync=Синхронизация
|
||||
termora.settings.sync.done=Синхронизация успешна
|
||||
termora.settings.sync.export=${termora.keymgr.export}
|
||||
termora.settings.sync.import=${termora.keymgr.import}
|
||||
termora.settings.sync.import.file-too-large=Файл слишком большой
|
||||
termora.settings.sync.import.successful=Импортировано успешно
|
||||
termora.settings.sync.export-done=Экспортировано успешно
|
||||
termora.settings.sync.export-encrypt=Введите пароль для расшифровки файла (выборочно)
|
||||
termora.settings.sync.export-done-open-folder=Экспорт прошел успешно. Открыть папку?
|
||||
termora.settings.sync.range=Диапазон
|
||||
termora.settings.sync.range.keys=Мои ключи
|
||||
termora.settings.sync.range.keyword-highlights=${termora.highlight}
|
||||
termora.settings.sync.last-sync-time=Последняя синхронизация
|
||||
termora.settings.sync.gist=Gist
|
||||
termora.settings.sync.token=Токен
|
||||
termora.settings.sync.type=Сервис
|
||||
termora.settings.sync.webdav.help=WebDAV адрес, https://yourhost/webdav/termora.json
|
||||
termora.settings.sync.policy=Тип синхронизации
|
||||
termora.settings.sync.policy.manual=Вручную
|
||||
termora.settings.sync.policy.on-change=При изменениях
|
||||
|
||||
termora.settings.about=О программе
|
||||
termora.settings.about.author=Автор
|
||||
termora.settings.about.source=Ссылка
|
||||
@@ -204,6 +183,8 @@ termora.keymgr.table.name=Название
|
||||
termora.keymgr.table.type=Тип
|
||||
termora.keymgr.table.length=Длина
|
||||
termora.keymgr.table.remark=Описание
|
||||
termora.keymgr.export-done=Экспорт выполнен успешно
|
||||
termora.keymgr.export-done-open-folder=Экспорт выполнен успешно. Открыть папку?
|
||||
|
||||
termora.keymgr.ssh-copy-id.number=Кол-во хостов [{0}] Кол-во публичных ключей [{1}]
|
||||
termora.keymgr.ssh-copy-id.successful=${termora.terminal.copied}
|
||||
@@ -212,6 +193,7 @@ termora.keymgr.ssh-copy-id.end=Копирования открытого клю
|
||||
|
||||
# Tabbed
|
||||
termora.tabbed.contextmenu.rename=Переименовать
|
||||
termora.tabbed.contextmenu.select-host=Выбрать хост
|
||||
termora.tabbed.contextmenu.sftp-command=SFTP Команда
|
||||
termora.tabbed.contextmenu.sftp-not-install=Программа SFTP не найдена, пожалуйста, установите и повторите попытку.
|
||||
termora.tabbed.contextmenu.clone=Дублировать
|
||||
|
||||
@@ -232,6 +232,8 @@ termora.keymgr.table.name=名称
|
||||
termora.keymgr.table.type=类型
|
||||
termora.keymgr.table.length=长度
|
||||
termora.keymgr.table.remark=备注
|
||||
termora.keymgr.export-done=导出成功
|
||||
termora.keymgr.export-done-open-folder=导出成功,是否需要打开所在文件夹?
|
||||
|
||||
termora.keymgr.ssh-copy-id.number=主机数量 [{0}] 公钥数量 [{1}]
|
||||
termora.keymgr.ssh-copy-id.failed=复制失败
|
||||
@@ -244,6 +246,7 @@ termora.tools.multiple=将命令发送到当前窗口会话
|
||||
|
||||
# Tabbed
|
||||
termora.tabbed.contextmenu.rename=重命名
|
||||
termora.tabbed.contextmenu.select-host=选中主机
|
||||
termora.tabbed.contextmenu.sftp-command=SFTP 终端
|
||||
termora.tabbed.contextmenu.sftp-not-install=没有找到 SFTP 程序,请安装后重试
|
||||
termora.tabbed.contextmenu.clone=克隆
|
||||
|
||||
@@ -228,6 +228,8 @@ termora.keymgr.table.name=名稱
|
||||
termora.keymgr.table.type=型別
|
||||
termora.keymgr.table.length=長度
|
||||
termora.keymgr.table.remark=備註
|
||||
termora.keymgr.export-done=匯出成功
|
||||
termora.keymgr.export-done-open-folder=匯出成功,是否需要打開所在資料夾?
|
||||
|
||||
termora.keymgr.ssh-copy-id.number=主機數量 [{0}] 公鑰數量 [{1}]
|
||||
termora.keymgr.ssh-copy-id.failed=複製失敗
|
||||
@@ -239,6 +241,7 @@ termora.tools.multiple=將命令傳送到目前視窗會話
|
||||
|
||||
# Tabbed
|
||||
termora.tabbed.contextmenu.rename=重新命名
|
||||
termora.tabbed.contextmenu.select-host=選取主機
|
||||
termora.tabbed.contextmenu.sftp-command=SFTP 終端
|
||||
termora.tabbed.contextmenu.sftp-not-install=沒有找到 SFTP 程序,請安裝後重試
|
||||
termora.tabbed.contextmenu.clone=克隆
|
||||
|
||||
BIN
src/main/resources/icons/termora_256x256.png
Normal file
BIN
src/main/resources/icons/termora_256x256.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 13 KiB |
@@ -34,6 +34,7 @@ DisableProgramGroupPage=yes
|
||||
;PrivilegesRequired=lowest
|
||||
OutputDir={#MyOutputDir}
|
||||
OutputBaseFilename={#MyAppName}-{#MyAppVersion}
|
||||
Compression=lzma2/max
|
||||
SolidCompression=yes
|
||||
WizardStyle=classic
|
||||
;WizardStyle=modern
|
||||
|
||||
12
src/test/resources/issue-1055/Dockerfile
Normal file
12
src/test/resources/issue-1055/Dockerfile
Normal file
@@ -0,0 +1,12 @@
|
||||
FROM debian:bookworm
|
||||
ENV DEBIAN_FRONTEND=noninteractive
|
||||
ENV TZ=Asia/Shanghai
|
||||
|
||||
RUN sed -i 's|http://deb.debian.org/debian|http://mirrors.aliyun.com/debian|g' /etc/apt/sources.list.d/debian.sources \
|
||||
&& sed -i 's|http://security.debian.org/debian-security|http://mirrors.aliyun.com/debian-security|g' /etc/apt/sources.list.d/debian.sources
|
||||
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends git ca-certificates autoconf libevent-dev bison automake libtool pkg-config build-essential libncurses-dev
|
||||
|
||||
RUN git clone https://github.com/tmux/tmux.git && cd tmux && sh autogen.sh && ./configure && make && make install
|
||||
|
||||
|
||||
Reference in New Issue
Block a user