Skip to content

A modern terminal with a built-in multiplexer: close it and your sessions keep running. Run shells and tons of AI agents across your machines, then pick them up from desktop, browser, TUI and more. Written in Rust with no UI framework: interface drawn straight on the GPU. No Electron, GPUI or webview.

mobile: no more ⋯ menu; every action has a place of its own

RoversXeb85de313fdf
diff --git a/android/app/src/main/java/com/roversx/thinkterm/KeyPanel.kt b/android/app/src/main/java/com/roversx/thinkterm/KeyPanel.kt
index b21771d4..6620b492 100644
--- a/android/app/src/main/java/com/roversx/thinkterm/KeyPanel.kt
+++ b/android/app/src/main/java/com/roversx/thinkterm/KeyPanel.kt
@@ -77,6 +77,12 @@ sealed interface KeyCap {
/// Ctrl or Alt held for the next key only.
data class Sticky(override val label: String, val mod: Mod) : KeyCap
+ /// The clipboard, typed into the pane.
+ data class Paste(override val label: String) : KeyCap
+
+ /// One of the App's chrome actions (a split, a zoom, a new tab).
+ data class Chrome(override val label: String, val action: String) : KeyCap
+
enum class Mod { CTRL, ALT }
}
@@ -87,7 +93,7 @@ object KeyCaps {
KeyCap.Dom(label, name, ctrl, shift)
/// The bar under the terminal: the keys a soft keyboard has not got.
- val bar: List<KeyCap> = listOf(
+ val bar: List<KeyCap> get() = listOf(
dom("esc", "Escape"),
dom("tab", "Tab"),
KeyCap.Sticky("ctrl", KeyCap.Mod.CTRL),
@@ -109,6 +115,7 @@ object KeyCaps {
dom("^L", "l", ctrl = true),
dom("^Z", "z", ctrl = true),
dom("⌫", "Backspace"),
+ KeyCap.Paste(tr("paste")),
)
val functions: List<KeyCap> = (1..12).map { dom("F$it", "F$it") }
@@ -152,6 +159,11 @@ object KeyCaps {
KeyCap.Mod.CTRL -> model.ctrlSticky = !model.ctrlSticky
KeyCap.Mod.ALT -> model.altSticky = !model.altSticky
}
+ is KeyCap.Paste -> model.pasteFromClipboard()
+ is KeyCap.Chrome -> when (cap.action) {
+ "close-tab" -> model.tabs?.current?.tab?.let { model.chromeClick("close-tab", tab = it) }
+ else -> model.chromeClick(cap.action)
+ }
}
tap()
}
@@ -172,11 +184,12 @@ fun rememberKeyTap(model: TerminalModel): () -> Unit {
/// The four faces of the extension panel.
enum class KeyPanelTab {
- KEYS, SNIPPETS, HISTORY, COLORS;
+ KEYS, LAYOUT, SNIPPETS, HISTORY, COLORS;
val title: String
get() = when (this) {
KEYS -> tr("p.keys")
+ LAYOUT -> tr("p.layout")
SNIPPETS -> tr("p.snippets")
HISTORY -> tr("p.history")
COLORS -> tr("p.colors")
@@ -220,6 +233,7 @@ fun KeyPanel(
Box(Modifier.fillMaxWidth().weight(1f)) {
when (tab) {
KeyPanelTab.KEYS -> KeysFace(model, history, tap)
+ KeyPanelTab.LAYOUT -> LayoutFace(model, history, tap)
KeyPanelTab.SNIPPETS -> SnippetsFace(model, store, history, tap)
KeyPanelTab.HISTORY -> HistoryFace(model, history, tap)
KeyPanelTab.COLORS -> ColorsFace(model, tap)
@@ -265,6 +279,46 @@ private fun KeysFace(model: TerminalModel, history: KeyHistory, tap: () -> Unit)
}
}
+/// The panes and tabs: what the desktop keeps in its menus, as keys.
+@Composable
+private fun LayoutFace(model: TerminalModel, history: KeyHistory, tap: () -> Unit) {
+ val caps = listOf(
+ KeyCap.Chrome(tr("split.right"), "split-right"),
+ KeyCap.Chrome(tr("split.below"), "split-below"),
+ KeyCap.Chrome(tr("zoom"), "zoom"),
+ KeyCap.Chrome(tr("closepane"), "close"),
+ KeyCap.Chrome(tr("newtab"), "new-tab"),
+ KeyCap.Chrome(tr("closetab"), "close-tab"),
+ )
+ Column(
+ Modifier
+ .fillMaxSize()
+ .verticalScroll(rememberScrollState())
+ .padding(horizontal = 10.dp, vertical = 6.dp),
+ verticalArrangement = Arrangement.spacedBy(8.dp),
+ ) {
+ for (row in caps.chunked(2)) {
+ Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+ for (cap in row) {
+ Text(
+ cap.label,
+ color = Color.White,
+ fontSize = 14.sp,
+ maxLines = 1,
+ modifier = Modifier
+ .weight(1f)
+ .clip(RoundedCornerShape(10.dp))
+ .background(Color.White.copy(alpha = 0.07f))
+ .clickable { KeyCaps.send(cap, model, history, tap) }
+ .padding(vertical = 12.dp),
+ textAlign = androidx.compose.ui.text.style.TextAlign.Center,
+ )
+ }
+ }
+ }
+ }
+}
+
/// One titled block of keys, six to a row. Plain rows, not a lazy grid:
/// the face above scrolls, and sixty keys are cheap to lay out.
@Composable
diff --git a/android/app/src/main/java/com/roversx/thinkterm/TerminalScreen.kt b/android/app/src/main/java/com/roversx/thinkterm/TerminalScreen.kt
index ab102ee7..cc6b7e06 100644
--- a/android/app/src/main/java/com/roversx/thinkterm/TerminalScreen.kt
+++ b/android/app/src/main/java/com/roversx/thinkterm/TerminalScreen.kt
@@ -40,7 +40,6 @@ import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.filled.Add
import androidx.compose.material.icons.filled.Close
import androidx.compose.material.icons.filled.GridView
-import androidx.compose.material.icons.filled.MoreVert
import androidx.compose.material.icons.filled.Warning
import androidx.compose.material.icons.filled.CheckCircle
import androidx.compose.material.icons.outlined.Circle
@@ -115,8 +114,6 @@ fun TerminalScreen(host: Host, store: HostStore, onBack: () -> Unit) {
var showSettings by remember { mutableStateOf(false) }
val showLog = remember { mutableStateOf(false) }
var editingHost by remember { mutableStateOf<Host?>(null) }
- var moreOpen by remember { mutableStateOf(false) }
- var paneMenuOpen by remember { mutableStateOf(false) }
var hostView by remember { mutableStateOf<TerminalHostView?>(null) }
// The overview: the terminal shrinks into its thread's card and the
@@ -235,25 +232,7 @@ fun TerminalScreen(host: Host, store: HostStore, onBack: () -> Unit) {
onBack = { model.disconnect(); onBack() },
onTree = { showTree = true },
onOverview = { openOverview() },
- onMore = { moreOpen = true },
- moreMenu = {
- MoreMenu(
- model = model,
- expanded = moreOpen,
- onDismiss = { moreOpen = false },
- onTree = { showTree = true },
- onOverview = { openOverview() },
- onSettings = { showSettings = true },
- onPaneMenu = { paneMenuOpen = true },
- )
- AppContextMenu(
- model = model,
- kind = "pane",
- id = (model.tabs?.current?.target ?: 0).toString(),
- expanded = paneMenuOpen,
- onDismiss = { paneMenuOpen = false },
- )
- },
+ onEditHost = { editingHost = model.host },
)
if (twoLevel) TabSubstrip(model, onPinchOut = { openOverview() })
} else {
@@ -361,9 +340,9 @@ private fun TopBar(
onBack: () -> Unit,
onTree: () -> Unit,
onOverview: () -> Unit,
- onMore: () -> Unit,
- moreMenu: @Composable () -> Unit,
+ onEditHost: () -> Unit,
) {
+ var connectionMenu by remember { mutableStateOf(false) }
Row(
Modifier.fillMaxWidth().height(48.dp).padding(start = 2.dp, end = 2.dp),
verticalAlignment = Alignment.CenterVertically,
@@ -371,8 +350,19 @@ private fun TopBar(
IconButton(onClick = onBack) {
Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = tr("back"), tint = Color.White)
}
- Box(Modifier.size(7.dp).clip(CircleShape).background(statusColor(model)))
- Spacer(Modifier.width(6.dp))
+ // The dot is the connection: a tap opens what can be done with it.
+ Box {
+ Box(
+ Modifier
+ .size(28.dp)
+ .clip(CircleShape)
+ .clickable { connectionMenu = true }
+ .padding(10.dp)
+ .clip(CircleShape)
+ .background(statusColor(model))
+ )
+ ConnectionMenu(model, expanded = connectionMenu, onDismiss = { connectionMenu = false }, onEditHost = onEditHost)
+ }
val scroll = rememberScrollState()
val positions = remember { mutableStateMapOf<String, Int>() }
val currentKey = if (twoLevel) model.threads?.current?.id?.let { "thread:$it" } else model.tabs?.current?.tab?.let { "tab:$it" }
@@ -388,20 +378,51 @@ private fun TopBar(
ThreadPill(model, thread, onTree)
}
}
- PlusButton { model.sideClick("new-thread") }
+ PlusButton(onClick = { model.sideClick("new-thread") })
} else {
TabPills(model, size = 12.sp, height = 26.dp, positions = positions)
- PlusButton { model.chromeClick("new-tab") }
+ NewTabButton(model)
}
}
IconButton(onClick = onOverview) {
Icon(Icons.Default.GridView, contentDescription = tr("overview"), tint = Color.White)
}
- Box {
- IconButton(onClick = onMore) {
- Icon(Icons.Default.MoreVert, contentDescription = tr("more"), tint = Color.White)
- }
- moreMenu()
+ }
+}
+
+/// What the ⋯ menu used to hold about the host: reconnect or disconnect,
+/// and the host's editor.
+@Composable
+private fun ConnectionMenu(model: TerminalModel, expanded: Boolean, onDismiss: () -> Unit, onEditHost: () -> Unit) {
+ DropdownMenu(expanded = expanded, onDismissRequest = onDismiss) {
+ val connected = model.isConnected
+ Text(
+ model.host.display,
+ style = MaterialTheme.typography.labelSmall,
+ color = MaterialTheme.colorScheme.onSurfaceVariant,
+ modifier = Modifier.padding(horizontal = 16.dp, vertical = 6.dp),
+ )
+ DropdownMenuItem(
+ text = { Text(if (connected) tr("disconnect") else tr("reconnect")) },
+ onClick = { if (connected) model.disconnect() else model.connect(); onDismiss() },
+ )
+ if (model.host.id != Host.PROBE_ID) {
+ DropdownMenuItem(text = { Text(tr("edithost")) }, onClick = { onDismiss(); onEditHost() })
+ }
+ }
+}
+
+/// "+" opens a tab; held, it offers the splits too.
+@OptIn(ExperimentalFoundationApi::class)
+@Composable
+private fun NewTabButton(model: TerminalModel) {
+ var menu by remember { mutableStateOf(false) }
+ Box {
+ PlusButton(onClick = { model.chromeClick("new-tab") }, onLongClick = { menu = true })
+ DropdownMenu(expanded = menu, onDismissRequest = { menu = false }) {
+ DropdownMenuItem(text = { Text(tr("newtab")) }, onClick = { model.chromeClick("new-tab"); menu = false })
+ DropdownMenuItem(text = { Text(tr("split.right")) }, onClick = { model.chromeClick("split-right"); menu = false })
+ DropdownMenuItem(text = { Text(tr("split.below")) }, onClick = { model.chromeClick("split-below"); menu = false })
}
}
}
@@ -485,13 +506,18 @@ private fun TabPills(
}
}
+@OptIn(ExperimentalFoundationApi::class)
@Composable
-private fun PlusButton(onClick: () -> Unit) {
+private fun PlusButton(onClick: () -> Unit, onLongClick: (() -> Unit)? = null) {
Icon(
Icons.Default.Add,
contentDescription = tr("newtab"),
tint = Color.White.copy(alpha = 0.62f),
- modifier = Modifier.size(28.dp).clip(CircleShape).clickable(onClick = onClick).padding(5.dp),
+ modifier = Modifier
+ .size(28.dp)
+ .clip(CircleShape)
+ .combinedClickable(onClick = onClick, onLongClick = onLongClick)
+ .padding(5.dp),
)
}
@@ -527,7 +553,7 @@ private fun TabSubstrip(model: TerminalModel, onPinchOut: () -> Unit) {
) {
TabPills(model, size = 11.5.sp, height = 22.dp, positions = positions)
}
- PlusButton { model.chromeClick("new-tab") }
+ NewTabButton(model)
}
}
@@ -538,48 +564,6 @@ private fun statusColor(model: TerminalModel): Color = when {
else -> Color(0xFFFF453A)
}
-/// The ⋯ menu: the host's connection, the splits, the pane's own menu,
-/// the tree and the overview, paste, settings, and closing the pane.
-@Composable
-private fun MoreMenu(
- model: TerminalModel,
- expanded: Boolean,
- onDismiss: () -> Unit,
- onTree: () -> Unit,
- onOverview: () -> Unit,
- onSettings: () -> Unit,
- onPaneMenu: () -> Unit,
-) {
- DropdownMenu(expanded = expanded, onDismissRequest = onDismiss) {
- val connected = model.isConnected
- Text(
- model.host.display,
- style = MaterialTheme.typography.labelSmall,
- color = MaterialTheme.colorScheme.onSurfaceVariant,
- modifier = Modifier.padding(horizontal = 16.dp, vertical = 6.dp),
- )
- DropdownMenuItem(
- text = { Text(if (connected) tr("disconnect") else tr("reconnect")) },
- onClick = { if (connected) model.disconnect() else model.connect(); onDismiss() },
- )
- HorizontalDivider()
- DropdownMenuItem(text = { Text(tr("split.right")) }, onClick = { model.chromeClick("split-right"); onDismiss() })
- DropdownMenuItem(text = { Text(tr("split.below")) }, onClick = { model.chromeClick("split-below"); onDismiss() })
- DropdownMenuItem(text = { Text(tr("zoom")) }, onClick = { model.chromeClick("zoom"); onDismiss() })
- DropdownMenuItem(text = { Text(tr("pane")) }, onClick = { onDismiss(); onPaneMenu() })
- HorizontalDivider()
- DropdownMenuItem(text = { Text(tr("m.threadstabs")) }, onClick = { onDismiss(); onTree() })
- DropdownMenuItem(text = { Text(tr("m.overview")) }, onClick = { onDismiss(); onOverview() })
- DropdownMenuItem(text = { Text(tr("paste")) }, onClick = { model.pasteFromClipboard(); onDismiss() })
- HorizontalDivider()
- DropdownMenuItem(text = { Text(tr("m.settings")) }, onClick = { onDismiss(); onSettings() })
- DropdownMenuItem(
- text = { Text(tr("closepane"), color = MaterialTheme.colorScheme.error) },
- onClick = { model.chromeClick("close"); onDismiss() },
- )
- }
-}
-
// MARK: over the terminal
/// The bars over split panes, the scrollbar, the stats, the composition,
diff --git a/ios/Resources/strings.json b/ios/Resources/strings.json
index 46153ce1..8c9e1825 100644
--- a/ios/Resources/strings.json
+++ b/ios/Resources/strings.json
@@ -135,6 +135,7 @@
"p.customize": "Anpassen",
"p.history": "Verlauf",
"p.keys": "Tasten",
+ "p.layout": "Layout",
"p.panel": "Panel",
"p.run": "Start",
"p.snippets": "Schnipsel",
@@ -338,6 +339,7 @@
"p.customize": "Customize",
"p.history": "History",
"p.keys": "Keys",
+ "p.layout": "Layout",
"p.panel": "Panel",
"p.run": "Run",
"p.snippets": "Snippets",
@@ -541,6 +543,7 @@
"p.customize": "Personnaliser",
"p.history": "Historique",
"p.keys": "Touches",
+ "p.layout": "Disposition",
"p.panel": "Panneau",
"p.run": "Exécuter",
"p.snippets": "Extraits",
@@ -744,6 +747,7 @@
"p.customize": "カスタマイズ",
"p.history": "履歴",
"p.keys": "キー",
+ "p.layout": "レイアウト",
"p.panel": "パネル",
"p.run": "実行",
"p.snippets": "スニペット",
@@ -947,6 +951,7 @@
"p.customize": "自定义",
"p.history": "历史",
"p.keys": "按键",
+ "p.layout": "布局",
"p.panel": "面板",
"p.run": "运行",
"p.snippets": "片段",
diff --git a/ios/Sources/KeyPanel.swift b/ios/Sources/KeyPanel.swift
index 29d7dcbc..dd9516d8 100644
--- a/ios/Sources/KeyPanel.swift
+++ b/ios/Sources/KeyPanel.swift
@@ -14,6 +14,10 @@ struct KeyCap: Identifiable {
case text(String)
/// Ctrl or Alt held for the next key only.
case sticky(Sticky)
+ /// The clipboard, typed into the pane.
+ case paste
+ /// One of the App's chrome actions (a split, a zoom, a new tab).
+ case chrome(String)
}
enum Sticky {
@@ -27,13 +31,17 @@ struct KeyCap: Identifiable {
static func text(_ label: String) -> KeyCap {
KeyCap(label: label, action: .text(label))
}
+
+ static func chrome(_ label: String, _ action: String) -> KeyCap {
+ KeyCap(label: label, action: .chrome(action))
+ }
}
/// The key bar's row and the panel's grid, and the one place a cap turns
/// into input.
enum KeyCaps {
/// The bar under the terminal: the keys a soft keyboard has not got.
- static let bar: [KeyCap] = [
+ static var bar: [KeyCap] { [
.dom("esc", "Escape"),
.dom("tab", "Tab"),
KeyCap(label: "ctrl", action: .sticky(.ctrl)),
@@ -55,7 +63,18 @@ enum KeyCaps {
.dom("^L", "l", ctrl: true),
.dom("^Z", "z", ctrl: true),
.dom("⌫", "Backspace"),
- ]
+ KeyCap(label: tr("paste"), action: .paste),
+ ] }
+
+ /// The panes and tabs: what the desktop keeps in its menus, as keys.
+ static var layout: [KeyCap] { [
+ .chrome(tr("split.right"), "split-right"),
+ .chrome(tr("split.below"), "split-below"),
+ .chrome(tr("zoom"), "zoom"),
+ .chrome(tr("closepane"), "close"),
+ .chrome(tr("newtab"), "new-tab"),
+ .chrome(tr("closetab"), "close-tab"),
+ ] }
static let functions: [KeyCap] = (1...12).map { .dom("F\($0)", "F\($0)") }
@@ -110,6 +129,14 @@ enum KeyCaps {
model.ctrlSticky.toggle()
case .sticky(.alt):
model.altSticky.toggle()
+ case .paste:
+ model.pasteFromClipboard()
+ case .chrome(let action):
+ if action == "close-tab" {
+ if let tab = model.tabs?.tabs.first(where: { $0.current })?.tab { model.chromeClick("close-tab", tab: tab) }
+ } else {
+ model.chromeClick(action)
+ }
}
tap()
}
@@ -123,13 +150,14 @@ enum KeyCaps {
/// The four faces of the extension panel.
enum KeyPanelTab: String, CaseIterable, Identifiable {
- case keys, snippets, history, colors
+ case keys, layout, snippets, history, colors
var id: String { rawValue }
var title: String {
switch self {
case .keys: return tr("p.keys")
+ case .layout: return tr("p.layout")
case .snippets: return tr("p.snippets")
case .history: return tr("p.history")
case .colors: return tr("p.colors")
@@ -202,6 +230,7 @@ struct KeyPanel: View {
private func body(for tab: KeyPanelTab) -> some View {
switch tab {
case .keys: keysGrid
+ case .layout: layoutGrid
case .snippets: snippetList
case .history: historyList
case .colors: colorRow
@@ -223,6 +252,30 @@ struct KeyPanel: View {
}
}
+ /// Two to a row, wide enough for their words.
+ private var layoutGrid: some View {
+ ScrollView {
+ LazyVGrid(columns: [GridItem(.flexible(), spacing: 8), GridItem(.flexible(), spacing: 8)], spacing: 8) {
+ ForEach(KeyCaps.layout) { cap in
+ Button { KeyCaps.send(cap, to: model) } label: {
+ Text(cap.label)
+ .font(.system(size: 14))
+ .lineLimit(1)
+ .minimumScaleFactor(0.8)
+ .frame(maxWidth: .infinity)
+ .frame(height: 42)
+ .background(Color.white.opacity(0.07))
+ .clipShape(RoundedRectangle(cornerRadius: 10))
+ }
+ .buttonStyle(.plain)
+ .foregroundColor(.white)
+ }
+ }
+ .padding(.horizontal, 10)
+ .padding(.vertical, 6)
+ }
+ }
+
private func block(_ title: String, _ caps: [KeyCap]) -> some View {
VStack(alignment: .leading, spacing: 6) {
Text(title.uppercased())
diff --git a/ios/Sources/TerminalScreen.swift b/ios/Sources/TerminalScreen.swift
index f435af68..fecf1d50 100644
--- a/ios/Sources/TerminalScreen.swift
+++ b/ios/Sources/TerminalScreen.swift
@@ -95,12 +95,11 @@ struct TerminalScreen: View {
.toolbarBackground(model.background, for: .navigationBar)
.toolbarBackground(.visible, for: .navigationBar)
.toolbar {
- ToolbarItem(placement: .principal) { tabStrip.frame(width: max(barWidth - 190, 120)) }
- ToolbarItemGroup(placement: .topBarTrailing) {
+ ToolbarItem(placement: .principal) { tabStrip.frame(width: max(barWidth - 150, 120)) }
+ ToolbarItem(placement: .topBarTrailing) {
Button { if overviewShown { overviewShown = false } else { openOverview() } } label: {
Image(systemName: "square.grid.2x2")
}
- moreMenu
}
}
.ignoresSafeArea(.container, edges: .bottom)
@@ -180,9 +179,28 @@ struct TerminalScreen: View {
/// session state) shows its tabs in the bar instead.
private var twoLevel: Bool { settings.tabBarLevels == "two" && !(model.threads?.threads.isEmpty ?? true) }
- private var tabStrip: some View {
- HStack(spacing: 6) {
+ /// The dot is the connection: a tap opens what can be done with it.
+ private var connectionDot: some View {
+ Menu {
+ Section(hostName) {
+ Button(connected ? tr("disconnect") : tr("reconnect")) {
+ if connected { model.disconnect() } else { model.connect() }
+ }
+ if model.host != nil {
+ Button(tr("edithost")) { editingHost = model.host }
+ }
+ }
+ } label: {
Circle().fill(statusColor).frame(width: 7, height: 7)
+ .frame(width: 24, height: 24)
+ .contentShape(Rectangle())
+ }
+ .buttonStyle(.plain)
+ }
+
+ private var tabStrip: some View {
+ HStack(spacing: 2) {
+ connectionDot
ScrollViewReader { reader in
ScrollView(.horizontal, showsIndicators: false) {
HStack(spacing: 4) {
@@ -279,12 +297,18 @@ struct TerminalScreen: View {
}
}
+ /// "+" opens a tab; held, it offers the splits too.
private var newTabButton: some View {
Button { model.chromeClick("new-tab") } label: {
Image(systemName: "plus").font(.system(size: 13, weight: .semibold)).padding(6)
.foregroundColor(Color.white.opacity(0.62))
}
.buttonStyle(.plain)
+ .contextMenu {
+ Button(tr("newtab")) { model.chromeClick("new-tab") }
+ Button(tr("split.right")) { model.chromeClick("split-right") }
+ Button(tr("split.below")) { model.chromeClick("split-below") }
+ }
}
static func threadColor(status: String, live: Bool) -> Color {
@@ -298,29 +322,6 @@ struct TerminalScreen: View {
private func threadColor(_ t: ThreadView) -> Color { Self.threadColor(status: t.status, live: t.live) }
- private var moreMenu: some View {
- Menu {
- Section(hostName) {
- Button(connected ? tr("disconnect") : tr("reconnect")) {
- if connected { model.disconnect() } else { model.connect() }
- }
- }
- Button(tr("split.right")) { model.chromeClick("split-right") }
- Button(tr("split.below")) { model.chromeClick("split-below") }
- Button(tr("zoom")) { model.chromeClick("zoom") }
- Button(tr("pane")) { menu = MenuSheet(kind: "pane", id: String(model.tabs?.tabs.first(where: { $0.current })?.target ?? 0), title: tr("pane.title")) }
- Divider()
- Button(tr("m.threadstabs")) { showTree = true }
- Button(tr("m.overview")) { openOverview() }
- Button(tr("paste")) { model.pasteFromClipboard() }
- Divider()
- Button(tr("m.settings")) { showSettings = true }
- Button(tr("closepane"), role: .destructive) { model.chromeClick("close") }
- } label: {
- Image(systemName: "ellipsis")
- }
- }
-
// MARK: the overview's zoom
private var currentThreadId: String? { model.threads?.threads.first(where: { $0.current })?.id }
diff --git a/ios/tools/gen-strings.py b/ios/tools/gen-strings.py
index 100facfe..3326745d 100644
--- a/ios/tools/gen-strings.py
+++ b/ios/tools/gen-strings.py
@@ -27,6 +27,7 @@ EXTRA = {
# common
"ok": ["OK", "好", "OK", "OK", "OK"],
"copy": ["Copy", "复制", "コピー", "Copier", "Kopieren"],
+ "p.layout": ["Layout", "布局", "レイアウト", "Disposition", "Layout"],
"more": ["More…", "更多…", "その他…", "Plus…", "Mehr…"],
"rename": ["Rename", "重命名", "名前を変更", "Renommer", "Umbenennen"],
"none": ["None", "无", "なし", "Aucun", "Keine"],
diff --git a/thinkterm-mobile/src/core.rs b/thinkterm-mobile/src/core.rs
index 8c701132..9aabaef7 100644
--- a/thinkterm-mobile/src/core.rs
+++ b/thinkterm-mobile/src/core.rs
@@ -769,7 +769,7 @@ impl State {
// the install's id so it survives a relaunch.
let (epoch, id) = stable_identity(&self.device_id);
let me = thinkterm_proto::ClientId {
- hostname: "ios".into(),
+ hostname: if cfg!(target_os = "android") { "android" } else { "ios" }.into(),
username: "mobile".into(),
pid: 0,
epoch,